[pkg-horde] [COMMIT opal imp--upstream--4--patch-1] Import upstream imp 4.1.1

Mon Apr 24 19:55:14 UTC 2006

A/ themes/graphics/audio
A/ locale/km_KH/LC_MESSAGES
A/ locale/he_IL/LC_MESSAGES/.arch-ids
A/ templates/stationery/.arch-ids
A/ locale/km_KH/.arch-ids
A/ locale/km_KH/LC_MESSAGES/.arch-ids
A/ templates/stationery
A/ locale/he_IL/LC_MESSAGES
A/ templates/saveimage
A/ locale/he_IL
A/ themes/graphics/audio/.arch-ids
A/ locale/km_KH
A/ locale/he_IL/.arch-ids
A/ templates/saveimage/.arch-ids
A  locale/km_KH/LC_MESSAGES/.arch-ids/=id
A  locale/he_IL/LC_MESSAGES/.arch-ids/=id
A  themes/graphics/audio/.arch-ids/=id
A  po/he_IL.po
A  po/km_KH.po
A  lib/IMAP/Thread.php
A  saveimage.php
A  templates/javascript/popup.js
A  locale/km_KH/LC_MESSAGES/imp.mo
A  lib/IMAP/.arch-ids/Sort.php.id
A  .arch-ids/saveimage.php.id
A  templates/javascript/.arch-ids/folders.js.id
A  templates/prefs/.arch-ids/defaultsearchselect.inc.id
A  templates/saveimage/.arch-ids/=id
A  locale/he_IL/.arch-ids/=id
A  templates/stationery/.arch-ids/=id
A  locale/km_KH/.arch-ids/=id
A  locale/he_IL/LC_MESSAGES/.arch-ids/imp.mo.id
A  config/.arch-ids/header.php.dist.id
A  themes/graphics/.arch-ids/mail_forwarded.png.id
A  locale/km_KH/LC_MESSAGES/.arch-ids/imp.mo.id
A  po/.arch-ids/km_KH.po.id
A  templates/javascript/addressesBlocks.js
A  themes/graphics/empty_spam.png
A  themes/graphics/.arch-ids/addressbook_add.png.id
A  stationery.php
A  lib/IMAP/Sort.php
A  locale/tr_TR/help.xml
A  lib/IMAP/.arch-ids/Search.php.id
A  lib/IMAP/Client.php
A  .arch-ids/stationery.php.id
A  themes/graphics/addressbook_add.png
A  templates/javascript/folders.js
A  templates/saveimage/saveimage.inc
A  config/header.php.dist
A  themes/graphics/audio/theetone.wav
A  templates/javascript/.arch-ids/addressesBlocks.js.id
A  lib/IMAP/Search.php
A  templates/stationery/.arch-ids/prefs.inc.id
A  lib/IMAP/.arch-ids/Client.php.id
A  themes/rtl.css
A  templates/saveimage/.arch-ids/saveimage.inc.id
A  themes/graphics/addressbook_browse.png
A  lib/IMAP/.arch-ids/Thread.php.id
A  themes/graphics/mail_forwarded.png
A  themes/graphics/.arch-ids/empty_spam.png.id
A  themes/graphics/audio/.arch-ids/theetone.wav.id
A  themes/graphics/.arch-ids/addressbook_browse.png.id
A  {arch}/imp/imp--upstream/imp--upstream--4/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
A  po/.arch-ids/he_IL.po.id
A  templates/prefs/defaultsearchselect.inc
A  templates/stationery/prefs.inc
A  themes/.arch-ids/rtl.css.id
A  templates/javascript/.arch-ids/popup.js.id
A  locale/he_IL/LC_MESSAGES/imp.mo
A  locale/tr_TR/.arch-ids/help.xml.id
D  themes/graphics/forward.png
D  templates/javascript/.arch-ids/open_print_win.js.id
D  themes/graphics/.arch-ids/addressbook-red.png.id
D  templates/smime/.arch-ids/open_smime_import.js.id
D  templates/smime/open_smime_import.js
D  config/header.txt.dist
D  themes/graphics/addressbook-blue.png
D  templates/thread/.arch-ids/bottom.inc.id
D  templates/folders/.arch-ids/javascript.inc.id
D  themes/graphics/folders/.arch-ids/templates.png.id
D  templates/javascript/.arch-ids/open_compose_win.js.id
D  templates/pgp/open_pgp_win.js
D  templates/pgp/.arch-ids/open_pgp_win.js.id
D  templates/thread/bottom.inc
D  config/.arch-ids/header.txt.dist.id
D  templates/pgp/open_pgp_import.js
D  scripts/singlescript.php
D  lib/.arch-ids/VFolder.php.id
D  templates/javascript/open_compose_win.js
D  templates/smime/open_smime_win.js
D  templates/folders/javascript.inc
D  templates/javascript/open_print_win.js
D  templates/pgp/.arch-ids/open_pgp_import.js.id
D  themes/graphics/.arch-ids/reply.png.id
D  themes/graphics/reply.png
D  themes/graphics/folders/templates.png
D  templates/thread/.arch-ids/top.inc.id
D  lib/VFolder.php
D  scripts/.arch-ids/singlescript.php.id
D  themes/graphics/.arch-ids/addressbook-blue.png.id
D  themes/graphics/.arch-ids/forward.png.id
D  templates/smime/.arch-ids/open_smime_win.js.id
D  themes/graphics/addressbook-red.png
D  templates/thread/top.inc
M  templates/folders/head.inc
M  po/it_IT.po
M  lib/Maintenance/imp.php
M  templates/message/headers.inc
M  po/bg_BG.po
M  locale/ru_RU/help.xml
M  lib/Block/summary.php
M  templates/pgp/notactive.inc
M  po/sv_SE.po
M  fetchmail.php
M  lib/base.php
M  lib/MIME/Viewer/related.php
M  po/fa_IR.po
M  templates/compose/spelling.js
M  templates/search/javascript.inc
M  lib/Quota/cyrus.php
M  lib/MIME/Viewer/html.php
M  po/imp.pot
M  templates/mailbox/actions_deleted.inc
M  templates/thread/thread.html
M  filterprefs.php
M  docs/TODO
M  templates/common-header.inc
M  locale/fr_FR/help.xml
M  locale/pl_PL/help.xml
M  lib/Identity/imp.php
M  lib/Maillog.php
M  compose.php
M  lib/Block/tree_folders.php
M  docs/CHANGES
M  templates/prefs/initialpageselect.inc
M  templates/prefs/spamselect.inc
M  templates/fetchmail/manage.inc
M  lib/Spam.php
M  lib/MIME/Viewer/partial.php
M  locale/et_EE/help.xml
M  po/es_ES.po
M  README
M  docs/RELEASE_NOTES
M  templates/message/navbar_top.inc
M  templates/mailbox/message_footers.inc
M  spelling.php
M  locale/el_GR/help.xml
M  po/mk_MK.po
M  templates/fetchmail/top.inc
M  templates/mailbox/empty_mailbox.inc
M  lib/Quota/mdaemon.php
M  folders.php
M  po/sk_SK.po
M  po/ca_ES.po
M  login.php
M  locale/pt_BR/help.xml
M  po/zh_TW.po
M  po/th_TH.po
M  locale/sk_SK/help.xml
M  lib/prefs.php
M  po/gl_ES.po
M  lib/MIME/Viewer/enriched.php
M  templates/mailbox/mailbox.html
M  po/nl_NL.po
M  locale/zh_CN/help.xml
M  config/mime_drivers.php.dist
M  lib/Maintenance/Task/fetchmail_login.php
M  lib/Maintenance/Task/tos_agreement.php
M  locale/sv_SE/help.xml
M  lib/MIME/Viewer/tnef.php
M  expand.php
M  locale/cs_CZ/help.xml
M  themes/lucblue/screen.css
M  config/motd.php.dist
M  lib/Fetchmail.php
M  po/lv_LV.po
M  po/is_IS.po
M  locale/de_DE/help.xml
M  locale/da_DK/help.xml
M  lib/Quota/courier.php
M  po/tr_TR.po
M  templates/search/main.inc
M  templates/mailbox/javascript.inc
M  templates/prefs/sentmailselect.inc
M  lib/IMAP.php
M  search.php
M  lib/IMAP/Tree.php
M  templates/folders/actions.inc
M  index.php
M  po/et_EE.po
M  templates/folders/foot.inc
M  lib/MIME/Viewer/pgp.php
M  lib/MIME/Viewer/alternative.php
M  lib/MIME/Viewer/zip.php
M  lib/MIME/Viewer/notification.php
M  templates/fetchmail/fetchmail.inc
M  lib/Auth/imp.php
M  po/ru_RU.po
M  docs/INSTALL
M  docs/CREDITS
M  acl.php
M  locale/pt_PT/help.xml
M  mailbox.php
M  lib/Message.php
M  templates/mailbox/alert.inc
M  lib/Quota.php
M  po/uk_UA.po
M  config/prefs.php.dist
M  lib/Maintenance/Task/delete_sentmail_monthly.php
M  lib/Compose.php
M  lib/Quota/mercury32.php
M  lib/Crypt/PGP.php
M  po/hu_HU.po
M  templates/mailbox/legend.inc
M  po/fr_FR.po
M  attachment.php
M  lib/Fetchmail/imap.php
M  lib/Maintenance/Task/rename_sentmail_monthly.php
M  templates/mailbox/searchfolder.inc
M  lib/Notification/Listener/status.php
M  lib/MIME/Viewer/pkcs7.php
M  templates/compose/redirect.inc
M  lib/Quota/command.php
M  config/conf.xml
M  locale/en_US/help.xml
M  po/ar_OM.po
M  po/cs_CZ.po
M  recompose.php
M  locale/ca_ES/help.xml
M  templates/message/navbar_actions.inc
M  lib/Filter.php
M  templates/compose/compose_expand.js
M  templates/mailbox/actions.inc
M  lib/MIME/Viewer/itip.php
M  templates/filters/notactive.inc
M  templates/prefs/trashselect.inc
M  po/pl_PL.po
M  lib/MIME/Viewer/rfc822.php
M  lib/MIME/Contents.php
M  message.php
M  locale/ko_KR/help.xml
M  lib/Mailbox.php
M  templates/search/header.inc
M  po/lt_LT.po
M  templates/message/javascript.inc
M  view.php
M  locale/nb_NO/help.xml
M  lib/api.php
M  scripts/custom_login.php
M  templates/fetchmail/driver_select.inc
M  lib/Search.php
M  redirect.php
M  test.php
M  contacts.php
M  lib/Folder.php
M  locale/hu_HU/help.xml
M  lib/Maintenance/Task/purge_trash.php
M  templates/menu.inc
M  lib/MIME/Viewer/multipart.php
M  lib/MIME/Viewer/plain.php
M  templates/compose/spelling.inc
M  templates/pgp/import_key.inc
M  po/da_DK.po
M  po/nb_NO.po
M  locale/zh_TW/help.xml
M  templates/fetchmail/account_select.inc
M  templates/filters/prefs.inc
M  lib/Crypt/SMIME.php
M  templates/folders/import.inc
M  po/zh_CN.po
M  po/el_GR.po
M  templates/contacts/contacts.inc
M  po/pt_BR.po
M  templates/smime/import_key.inc
M  po/ro_RO.po
M  po/id_ID.po
M  pgp.php
M  templates/login/login.inc
M  themes/luc/screen.css
M  templates/pgp/pgp.inc
M  smime.php
M  js/ieEscGuard.js
M  templates/compose/attachments.inc
M  templates/mailbox/navbar.inc
M  templates/smime/passphrase.inc
M  lib/MIME/Viewer/images.php
M  templates/compose/recompose.inc
M  templates/compose/compose.inc
M  lib/version.php
M  config/servers.php.dist
M  po/ja_JP.po
M  lib/Quota/logfile.php
M  themes/cornflower/screen.css
M  locale/it_IT/help.xml
M  po/fi_FI.po
M  templates/prefs/folderselect.inc
M  templates/compose/expand.inc
M  locale/es_ES/help.xml
M  locale/fa_IR/help.xml
M  themes/bluewhite/screen.css
M  po/de_DE.po
M  docs/UPGRADING
M  templates/compose/attachments.js
M  templates/message/navbar_navigate.inc
M  lib/IMP.php
M  po/pt_PT.po
M  templates/mailbox/header.inc
M  fetchmailprefs.php
M  locale/fi_FI/help.xml
M  lib/Maintenance/Task/delete_attachments_monthly.php
M  templates/pgp/passphrase.inc
M  locale/nl_NL/help.xml
M  thread.php
M  lib/MIME/Viewer/status.php
M  templates/compose/compose.js
M  po/bs_BA.po
M  lib/MIME/Viewer/appledouble.php
M  po/ar_SY.po
M  templates/acl/acl.inc
M  locale/uk_UA/help.xml
M  themes/screen.css
M  po/sl_SI.po
M  lib/Session.php
M  lib/MIME/Headers.php
M  templates/prefs/sourceselect.inc
M  templates/smime/notactive.inc
M  templates/smime/smime.inc
M  po/nn_NO.po
M  templates/mailbox/message_headers.inc
M  templates/search/fields.inc
M  po/ko_KR.po

--- /dev/null
+++ locale/km_KH/LC_MESSAGES/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4872.0


--- /dev/null
+++ locale/he_IL/LC_MESSAGES/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4869.0


--- /dev/null
+++ themes/graphics/audio/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4889.0


--- /dev/null
+++ po/he_IL.po
@@ -0,0 +1,4957 @@
+# Hebrew translations for Imp package.
+# Copyright (C) 2006 Matt Selsky <selsky at columbia.edu>
+# This file is distributed under the same license as the Imp package.
+# Automatically generated, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Imp H3 (4.2-cvs)\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2006-01-24 16:57+0100\n"
+"PO-Revision-Date: 2006-01-24 16:57+0100\n"
+"Last-Translator: Matt Selsky <selsky at columbia.edu>\n"
+"Language-Team: i18n at lists.horde.org\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: lib/Compose.php:1558
+msgid "      Cc: "
+msgstr "      ×”×¢×ª×§×™×: "
+
+#: lib/Compose.php:1555
+msgid "      To: "
+msgstr "      ××œ: "
+
+#: lib/Compose.php:1543
+msgid "    Date: "
+msgstr "    ×ª××¨×™×š: "
+
+#: lib/Compose.php:1546
+msgid "    From: "
+msgstr "    ×ž××ª: "
+
+#: folders.php:274 mailbox.php:331
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
+
+#: lib/Compose.php:1552
+msgid " Subject: "
+msgstr " × ×•×©×: "
+
+#: lib/MIME/Viewer/pgp.php:169
+msgid " [ Save the key to your Address book ] "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid " [ View the raw key ] "
+msgstr ""
+
+#: mailbox.php:560
+msgid "#"
+msgstr ""
+
+#: thread.php:153
+#, php-format
+msgid "%d Messages"
+msgstr ""
+
+#: lib/Spam.php:218
+#, php-format
+msgid "%d messages have been deleted."
+msgstr ""
+
+#: lib/Spam.php:200
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:180
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr ""
+
+#: lib/Spam.php:192
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:172
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr ""
+
+#: mailbox.php:278
+#, php-format
+msgid "%d to %d of %d Messages"
+msgstr ""
+
+#: lib/MIME/Contents.php:567
+#, php-format
+msgid "%s Attachments, %s"
+msgstr ""
+
+#: mailbox.php:784 lib/MIME/Contents.php:558
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: mailbox.php:782 lib/MIME/Contents.php:556
+#, php-format
+msgid "%s MB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
+msgid "%s already exists. Your %s folder was not renamed."
+msgstr ""
+
+#: lib/MIME/Contents.php:561
+#, php-format
+msgid "%s bytes"
+msgstr ""
+
+#: lib/Message.php:723
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
+msgid "%s folder being renamed at the start of the month."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+#, php-format
+msgid "%s has cancelled \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:263
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:492
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:609
+#, php-format
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:483
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:269
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:580
+#, php-format
+msgid "%s requests your presence at \"%s\"."
+msgstr ""
+
+#: lib/Message.php:472
+#, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:592
+#, php-format
+msgid "%s wishes to ammend \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:571
+#, php-format
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:596
+#, php-format
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr ""
+
+#: message.php:254 message.php:259
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: message.php:491
+#, php-format
+msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
+msgstr ""
+
+#: templates/compose/spelling.html:73
+msgid "(Apply these changes and move to next screen.)"
+msgstr ""
+
+#: templates/compose/spelling.html:60
+msgid "(Discard all changes and return to the compose screen.)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:249
+msgid ""
+"(Return to the compose screen after applying all changes made thus far.  "
+"Changes on the current screen will NOT be applied.)"
+msgstr ""
+
+#: spelling.php:246
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+
+#: templates/contacts/contacts.html:47
+msgid "* Add these by clicking OK *"
+msgstr ""
+
+#: templates/contacts/contacts.html:32
+msgid "* Please select address(es) *"
+msgstr ""
+
+#: lib/MIME/Contents.php:565
+#, php-format
+msgid "1 Attachment, %s"
+msgstr ""
+
+#: config/prefs.php.dist:831
+msgid "100 characters"
+msgstr ""
+
+#: config/prefs.php.dist:834
+msgid "1000 characters"
+msgstr ""
+
+#: config/prefs.php.dist:832
+msgid "250 characters"
+msgstr ""
+
+#: config/prefs.php.dist:833
+msgid "500 characters"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/search.html:49
+msgid "AND"
+msgstr ""
+
+#: config/prefs.php.dist:705
+msgid "Above the message text"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:746
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
+msgid "Actions"
+msgstr ""
+
+#: lib/MIME/Headers.php:201 lib/MIME/Headers.php:202
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:573
+msgid "Add this to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr ""
+
+#: compose.php:323
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr ""
+
+#: config/prefs.php.dist:199
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+msgid "Additional information details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: compose.php:867 compose.php:1230 contacts.php:77
+#: templates/contacts/contacts.html:8
+msgid "Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:135
+msgid "Address Books"
+msgstr ""
+
+#: config/prefs.php.dist:190
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:182
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.html:7
+msgid "All"
+msgstr "×”×›×œ"
+
+#: templates/javascript/folders.js:13
+msgid ""
+"All messages in the following folder(s) will be downloaded into one MBOX "
+"file:"
+msgstr ""
+
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
+msgid ""
+"All messages in your \"%s\" folder older than %s days will be permanently "
+"deleted."
+msgstr ""
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
+msgid "All old sent-mail folders more than %s months old will be deleted."
+msgstr ""
+
+#: acl.php:84
+#, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr ""
+
+#: lib/api.php:81
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: filterprefs.php:98
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:111
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:569
+msgid "Always save attachments"
+msgstr ""
+
+#: lib/Message.php:563
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
+
+#: lib/Message.php:446
+msgid "An unknown error occured while creating the new note."
+msgstr ""
+
+#: lib/Message.php:445
+msgid "An unknown error occured while creating the new task."
+msgstr ""
+
+#: message.php:472 mailbox.php:818 mailbox.php:971
+#: templates/message/navbar_navigate.html:9 templates/mailbox/navbar.html:15
+#: templates/mailbox/navbar.html:30 templates/mailbox/legend.html:4
+msgid "Answered"
+msgstr ""
+
+#: search.php:329
+msgid "Answered messages"
+msgstr ""
+
+#: mailbox.php:351
+msgid "Apply Filters"
+msgstr ""
+
+#: mailbox.php:351
+#, php-format
+msgid "Apply Filters to %s"
+msgstr ""
+
+#: filterprefs.php:96
+msgid "Apply filter rules upon logging on?"
+msgstr ""
+
+#: filterprefs.php:97
+msgid "Apply filter rules whenever Inbox is displayed?"
+msgstr ""
+
+#: mailbox.php:361
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+msgid "Are you sure you want to delete this public key?"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+
+#: templates/compose/javascript.inc:6
+msgid "Are you sure you want to do this?"
+msgstr ""
+
+#: message.php:537 templates/mailbox/javascript.inc:80
+msgid "Are you sure you wish to PERMANENTLY delete these messages?"
+msgstr ""
+
+#: lib/MIME/Contents.php:242
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr ""
+
+#: mailbox.php:464
+msgid "Are you sure you wish to empty this folder?"
+msgstr ""
+
+#: lib/IMP.php:787
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr ""
+
+#: lib/IMP.php:777
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr ""
+
+#: mailbox.php:463
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr ""
+
+#: templates/message/javascript.inc:36 templates/mailbox/javascript.inc:91
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr ""
+
+#: templates/message/javascript.inc:31 templates/mailbox/javascript.inc:86
+msgid "Are you sure you wish to report this message as spam?"
+msgstr ""
+
+#: config/prefs.php.dist:927
+msgid "Arrival Time"
+msgstr ""
+
+#: config/prefs.php.dist:942
+msgid "Ascending"
+msgstr ""
+
+#: config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: compose.php:1300
+msgid "Attach Files"
+msgstr ""
+
+#: compose.php:1292
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:111
+msgid "Attached File:"
+msgstr ""
+
+#: lib/Compose.php:1591 lib/Compose.php:1687
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:377
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: mailbox.php:983 templates/compose/javascript.inc:242
+#: templates/mailbox/legend.html:14 templates/compose/compose.html:269
+#: templates/compose/compose.html:325
+msgid "Attachment"
+msgstr ""
+
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr ""
+
+#: lib/Compose.php:2256
+msgid "Attachment Information"
+msgstr ""
+
+#: lib/Message.php:524 lib/Compose.php:640
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: compose.php:1241 lib/Compose.php:2224 templates/compose/compose.html:242
+msgid "Attachments"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:678
+msgid "Attendees"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:53
+msgid "Attention"
+msgstr ""
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:714
+msgid "Awaiting Response"
+msgstr ""
+
+#: message.php:510
+#, php-format
+msgid "Bac_k to %s"
+msgstr ""
+
+#: message.php:510 thread.php:135
+#, php-format
+msgid "Back to %s"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:130
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:573
+#, php-format
+msgid "Bad login name or password."
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: lib/IMAP/Client.php:577
+#, php-format
+msgid "Bad request: %s."
+msgstr ""
+
+#: message.php:235 lib/Search.php:615 templates/contacts/contacts.html:42
+#: templates/login/recompose.html:32
+msgid "Bcc"
+msgstr "×”×¢×ª×§×™× ×¢×™×•×•×¨×™×"
+
+#: lib/MIME/Viewer/status.php:163
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: config/prefs.php.dist:706
+msgid "Below the message text"
+msgstr ""
+
+#: message.php:565 mailbox.php:490
+msgid "Blacklist"
+msgstr "×¨×©×™×ž×” ×©×—×•×¨×”"
+
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:623
+msgid "Body"
+msgstr ""
+
+#: search.php:326 search.php:331 search.php:336 search.php:341
+msgid "Both"
+msgstr ""
+
+#: config/prefs.php.dist:696
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: compose.php:1188
+msgid "C_harset"
+msgstr ""
+
+#: search.php:312
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:155
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:153
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/pgp/passphrase.inc:32 templates/contacts/contacts.html:74
+#: templates/folders/folders_confirm.html:23 templates/folders/import.html:17
+#: templates/saveimage/saveimage.html:19 templates/compose/spelling.html:60
+#: templates/pgp/import_key.html:49
+msgid "Cancel"
+msgstr "×©× ×”"
+
+#: templates/compose/redirect.html:78 templates/compose/compose.html:25
+#: templates/compose/compose.html:208
+msgid "Cancel Message"
+msgstr ""
+
+#: templates/compose/javascript.inc:6
+msgid "Cancelling this message will permanently discard its contents."
+msgstr ""
+
+#: message.php:234 lib/Search.php:611 templates/contacts/contacts.html:41
+#: templates/login/recompose.html:23
+msgid "Cc"
+msgstr "×”×¢×ª×§×™×"
+
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:696
+msgid "Chair Person"
+msgstr ""
+
+#: templates/compose/spelling.html:34
+msgid "Change"
+msgstr ""
+
+#: templates/compose/spelling.html:35
+msgid "Change All"
+msgstr ""
+
+#: templates/acl/acl.inc:92
+msgid "Change Folder"
+msgstr ""
+
+#: config/prefs.php.dist:113
+msgid ""
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
+msgstr ""
+
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr ""
+
+#: config/prefs.php.dist:15
+msgid ""
+"Change the name, address, and signature that people see when they read and "
+"reply to your email."
+msgstr ""
+
+#: config/prefs.php.dist:835
+msgid "Characters to display:"
+msgstr ""
+
+#: templates/folders/actions.html:17
+msgid "Check Folder(s) for New Mail"
+msgstr ""
+
+#: folders.php:286 mailbox.php:640
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:464
+msgid "Check spelling before sending a message?"
+msgstr ""
+
+#: templates/folders/actions.html:6
+msgid "Choose Action"
+msgstr ""
+
+#: config/servers.php.dist:179
+msgid "Choose a mail server:"
+msgstr ""
+
+#: templates/compose/compose.html:64
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:115
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:104
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:102
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:164
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:423
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:961
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:962
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+msgid "Close"
+msgstr "×¡×’×•×¨"
+
+#: compose.php:150
+msgid "Close this window"
+msgstr "×¡×’×™×¨×ª ×—×œ×•×Ÿ ×–×”"
+
+#: lib/IMAP/Tree.php:425
+msgid "Closed Folder"
+msgstr ""
+
+#: lib/IMAP/Tree.php:448
+msgid "Collapse"
+msgstr ""
+
+#: folders.php:304
+msgid "Collapse All"
+msgstr ""
+
+#: folders.php:304
+msgid "Collapse All Folders"
+msgstr ""
+
+#: lib/IMAP/Tree.php:448
+msgid "Collapse Folder"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr "×ª×’×•×‘×”"
+
+#: lib/MIME/Viewer/itip.php:762
+msgid "Completed"
+msgstr ""
+
+#: compose.php:149
+msgid "Compose another message"
+msgstr ""
+
+#: config/prefs.php.dist:435
+msgid "Compose messages in a separate window?"
+msgstr ""
+
+#: config/prefs.php.dist:444
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:98
+msgid "Configure mail preview options."
+msgstr ""
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:188
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:144
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:153
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:122
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:90
+msgid ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+msgstr ""
+
+#: config/prefs.php.dist:686
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: message.php:504 message.php:696 mailbox.php:420 mailbox.php:998
+msgid "Copy"
+msgstr ""
+
+#: message.php:504 message.php:696 mailbox.php:420 mailbox.php:998
+msgid "Copy to folder"
+msgstr ""
+
+#: templates/compose/spelling.html:28
+msgid "Correct"
+msgstr ""
+
+#: templates/compose/spelling.html:82
+msgid "Corrected Text"
+msgstr ""
+
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr ""
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:715
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr ""
+
+#: lib/Session.php:322
+msgid "Could not execute maintenance operations."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr ""
+
+#: lib/Session.php:270
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
+msgid "Create"
+msgstr ""
+
+#: templates/folders/actions.html:8
+msgid "Create Folder"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid "Create Keys"
+msgstr ""
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr ""
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
+msgid "Create a new drafts folder"
+msgstr ""
+
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
+msgid "Create a new sent mail folder"
+msgstr ""
+
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
+msgid "Create a new trash folder"
+msgstr ""
+
+#: config/prefs.php.dist:129
+msgid ""
+"Create filtering rules to organize your incoming mail, sort it into folders, "
+"and delete spam."
+msgstr ""
+
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr ""
+
+#: config/prefs.php.dist:450
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:106
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
+
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr ""
+
+#: config/prefs.php.dist:40
+#, php-format
+msgid "Customize tasks to run upon logon to %s."
+msgstr ""
+
+#: mailbox.php:565
+msgid "Dat_e"
+msgstr "×ª××¨×™×š"
+
+#: message.php:231 thread.php:150
+msgid "Date"
+msgstr "×ª××¨×™×š"
+
+#: lib/MIME/Viewer/itip.php:750
+msgid "Declined"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:549
+msgid "Default"
+msgstr ""
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:934
+msgid "Default sorting criteria:"
+msgstr ""
+
+#: config/prefs.php.dist:944
+msgid "Default sorting direction:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:758
+msgid "Delegated"
+msgstr ""
+
+#: message.php:537 mailbox.php:463 mailbox.php:466
+#: templates/fetchmail/manage.inc:68 templates/smime/smime.inc:25
+#: templates/pgp/pgp.inc:27 lib/IMAP/Tree.php:412
+#: templates/contacts/contacts.html:64
+msgid "Delete"
+msgstr "×ž×—×§"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.html:11
+msgid "Delete Folder(s)"
+msgstr ""
+
+#: templates/folders/folders_confirm.html:22
+msgid "Delete Selected Folders"
+msgstr ""
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr ""
+
+#: lib/IMAP/Tree.php:412
+msgid "Delete Virtual Folder"
+msgstr ""
+
+#: mailbox.php:361
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:619
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:369
+msgid "Delete old linked attachments at beginning of month?"
+msgstr ""
+
+#: config/prefs.php.dist:351
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr ""
+
+#: config/prefs.php.dist:617
+msgid "Delete spam messages"
+msgstr ""
+
+#: templates/compose/compose.html:337
+msgid "Delete?"
+msgstr ""
+
+#: message.php:475 mailbox.php:841 mailbox.php:973
+#: templates/mailbox/navbar.html:17 templates/mailbox/navbar.html:33
+#: templates/mailbox/legend.html:6
+msgid "Deleted"
+msgstr ""
+
+#: search.php:339
+msgid "Deleted messages"
+msgstr ""
+
+#: compose.php:303
+#, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr ""
+
+#: config/prefs.php.dist:80
+msgid "Deleting and Moving Messages"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:542
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:943
+msgid "Descending"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:666
+msgid "Description"
+msgstr ""
+
+#: templates/compose/compose.html:331
+msgid "Description:"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: compose.php:315
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr ""
+
+#: config/prefs.php.dist:677
+msgid "Dim signatures?"
+msgstr ""
+
+#: templates/contacts/contacts.html:56
+msgid "Display"
+msgstr ""
+
+#: config/prefs.php.dist:480
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:695
+msgid "Display in Body of Message"
+msgstr ""
+
+#: config/prefs.php.dist:804
+msgid "Display pop-up notification of new mail?"
+msgstr ""
+
+#: config/prefs.php.dist:770
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:762
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/compose.html:322
+msgid "Disposition:"
+msgstr ""
+
+#: templates/search/search.html:68
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.html:18
+msgid "Do Not Check Folder(s) for New Mail"
+msgstr ""
+
+#: config/prefs.php.dist:963
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:958
+msgid "Do you want to open that folder?"
+msgstr ""
+
+#: login.php:355
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.html:66
+msgid "Done"
+msgstr ""
+
+#: lib/MIME/Contents.php:219
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: message.php:664
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
+
+#: templates/folders/actions.html:22
+msgid "Download Folder(s)"
+msgstr ""
+
+#: templates/folders/actions.html:23
+msgid "Download Folder(s) [.zip format]"
+msgstr ""
+
+#: lib/MIME/Contents.php:219
+msgid "Download in .zip Format"
+msgstr ""
+
+#: message.php:473 mailbox.php:823 mailbox.php:974
+#: templates/message/navbar_navigate.html:11 templates/mailbox/navbar.html:19
+#: templates/mailbox/navbar.html:36 templates/mailbox/legend.html:7
+msgid "Draft"
+msgstr ""
+
+#: lib/IMAP/Tree.php:374
+msgid "Draft folder"
+msgstr ""
+
+#: templates/prefs/folderselect.inc:23
+msgid "Drafts folder:"
+msgstr ""
+
+#: templates/pgp/pgp.inc:108
+msgid "E-mail Address"
+msgstr "×“×•××¨-××œ×§×˜×¨×•× ×™"
+
+#: mailbox.php:895
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: templates/stationery/prefs.inc:19 lib/IMAP/Tree.php:413
+msgid "Edit"
+msgstr ""
+
+#: mailbox.php:364 templates/search/search.html:19
+msgid "Edit Search Query"
+msgstr ""
+
+#: lib/IMAP/Tree.php:413 templates/search/search.html:17
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: mailbox.php:360
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: filterprefs.php:79
+msgid "Edit your Blacklist"
+msgstr ""
+
+#: filterprefs.php:78
+msgid "Edit your Filter Rules"
+msgstr ""
+
+#: filterprefs.php:80
+msgid "Edit your Whitelist"
+msgstr ""
+
+#: config/prefs.php.dist:872
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/contacts/contacts.html:59
+msgid "Email Address"
+msgstr ""
+
+#: lib/Message.php:731
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr ""
+
+#: lib/Message.php:708
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr ""
+
+#: templates/folders/actions.html:24
+msgid "Empty Folder(s)"
+msgstr ""
+
+#: templates/folders/folders_confirm.html:22
+msgid "Empty Selected Folders"
+msgstr ""
+
+#: mailbox.php:464
+msgid "Empty Trash folder"
+msgstr ""
+
+#: lib/IMP.php:787
+msgid "Empty _Spam"
+msgstr ""
+
+#: lib/IMP.php:777
+msgid "Empty _Trash"
+msgstr ""
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:823
+msgid "Enable message previews?"
+msgstr ""
+
+#: compose.php:1286
+msgid "Encr_yption Options"
+msgstr ""
+
+#: mailbox.php:985 templates/mailbox/legend.html:16
+msgid "Encrypted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:1484
+msgid "End forwarded message"
+msgstr ""
+
+#: lib/Compose.php:1403
+msgid "End message"
+msgstr ""
+
+#: lib/Compose.php:1401
+#, php-format
+msgid "End message from %s"
+msgstr ""
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr ""
+
+#: templates/prefs/folderselect.inc:9
+msgid "Enter the name for your new drafts folder"
+msgstr ""
+
+#: templates/prefs/sentmailselect.inc:23
+msgid "Enter the name for your new sent mail folder"
+msgstr ""
+
+#: templates/prefs/trashselect.inc:9
+msgid "Enter the name for your new trash folder"
+msgstr ""
+
+#: lib/Search.php:627
+msgid "Entire Message"
+msgstr ""
+
+#: message.php:157 thread.php:70 lib/Compose.php:713 lib/Compose.php:970
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
+msgstr ""
+
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:394
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:165
+msgid "Error"
+msgstr ""
+
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Contents.php:124
+msgid "Error displaying message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:102
+msgid "Event successfully deleted."
+msgstr ""
+
+#: config/prefs.php.dist:794
+msgid "Every 15 minutes"
+msgstr ""
+
+#: config/prefs.php.dist:791
+msgid "Every 30 seconds"
+msgstr ""
+
+#: config/prefs.php.dist:531 config/prefs.php.dist:793
+msgid "Every 5 minutes"
+msgstr ""
+
+#: config/prefs.php.dist:795
+msgid "Every half hour"
+msgstr ""
+
+#: config/prefs.php.dist:792
+msgid "Every minute"
+msgstr ""
+
+#: lib/IMAP/Tree.php:456
+msgid "Expand"
+msgstr ""
+
+#: folders.php:303
+msgid "Expand All"
+msgstr ""
+
+#: folders.php:303
+msgid "Expand All Folders"
+msgstr ""
+
+#: lib/IMAP/Tree.php:456
+msgid "Expand Folder"
+msgstr ""
+
+#: compose.php:868 compose.php:1231
+msgid "Expand Names"
+msgstr ""
+
+#: config/prefs.php.dist:1074
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:991
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr ""
+
+#: templates/compose/redirect.html:67 templates/compose/compose.html:82
+msgid "Expanding"
+msgstr ""
+
+#: lib/IMP.php:798 lib/IMP.php:800
+msgid "F_etch Mail"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:105
+msgid "Fetch Mail"
+msgstr ""
+
+#: config/prefs.php.dist:880
+msgid "Fetch Mail in a separate window?"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr ""
+
+#: lib/Fetchmail.php:291
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr ""
+
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr ""
+
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
+msgid "Fetchmail: "
+msgstr ""
+
+#: lib/Fetchmail.php:293
+msgid "Fetchmail: no new messages."
+msgstr ""
+
+#: lib/IMP.php:804
+msgid "Fi_lters"
+msgstr ""
+
+#: templates/compose/javascript.inc:227 templates/compose/compose.html:265
+msgid "File"
+msgstr ""
+
+#: templates/filters/prefs.html:48
+msgid "Filter Options"
+msgstr ""
+
+#: templates/filters/prefs.html:36
+msgid "Filter Settings"
+msgstr ""
+
+#: config/prefs.php.dist:600
+msgid "Filter message content for profanity?"
+msgstr ""
+
+#: templates/filters/prefs.html:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:128
+msgid "Filters"
+msgstr ""
+
+#: templates/filters/prefs.html:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:101
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.html:13
+msgid "Find:"
+msgstr ""
+
+#: config/prefs.php.dist:916
+msgid "First Mailbox Page"
+msgstr ""
+
+#: mailbox.php:432
+msgid "First Page"
+msgstr ""
+
+#: message.php:554 mailbox.php:501
+msgid "Fo_rward"
+msgstr ""
+
+#: folders.php:216 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:249 templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10 templates/folders/head.html:2
+msgid "Folder Navigator"
+msgstr ""
+
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr ""
+
+#: acl.php:23
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:24
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:980
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: message.php:554 mailbox.php:501 lib/Compose.php:1455
+msgid "Forward"
+msgstr "×”×¤×¥"
+
+#: lib/Compose.php:1441
+msgid "Forward:"
+msgstr "×”×¤×¥:"
+
+#: lib/Compose.php:1469
+msgid "Forwarded message"
+msgstr ""
+
+#: lib/Compose.php:1467
+#, php-format
+msgid "Forwarded message from %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:402
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: mailbox.php:575
+msgid "Fro_m"
+msgstr "×ž××ª"
+
+#: message.php:232 thread.php:151 lib/Search.php:603
+#: templates/compose/compose.html:31
+msgid "From"
+msgstr "×ž××ª"
+
+#: config/prefs.php.dist:929
+msgid "From Address"
+msgstr ""
+
+#: lib/Compose.php:1452 lib/Compose.php:1456
+msgid "Fwd:"
+msgstr ""
+
+#: compose.php:619
+msgid "Fwd: "
+msgstr ""
+
+#: compose.php:621
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr ""
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "××¤×©×¨×•×™×•×ª ×›×œ×œ×™×•×ª"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: folders.php:288 lib/MIME/Viewer/itip.php:554 lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "×œ×š"
+
+#: thread.php:134
+msgid "Go to Message"
+msgstr ""
+
+#: lib/IMP.php:363
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr ""
+
+#: templates/acl/acl.inc:136
+msgid "Grant access"
+msgstr ""
+
+#: message.php:428 lib/Filter.php:101 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/notification.php:62
+#: lib/MIME/Viewer/notification.php:68 lib/MIME/Viewer/related.php:79
+#: lib/MIME/Viewer/pkcs7.php:423 lib/MIME/Viewer/appledouble.php:41
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:129
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: lib/Compose.php:360
+msgid "HTML Version of Message"
+msgstr ""
+
+#: message.php:683
+msgid "Headers"
+msgstr "×›×•×ª×¨×•×ª"
+
+#: templates/login/recompose.html:7
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr ""
+
+#: mailbox.php:272
+msgid "Hide Deleted"
+msgstr ""
+
+#: folders.php:294
+msgid "Hide Unsubscribed"
+msgstr ""
+
+#: compose.php:1204
+msgid "High"
+msgstr ""
+
+#: message.php:264 mailbox.php:828 mailbox.php:977
+#: templates/mailbox/legend.html:10
+msgid "High Priority"
+msgstr ""
+
+#: compose.php:1203
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:697
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:505
+msgid "How to attribute quoted lines in a reply"
+msgstr ""
+
+#: lib/IMAP.php:199
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:107
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: lib/IMAP.php:211
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/IMAP.php:217
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: lib/IMAP.php:205
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:657
+msgid "INBOX"
+msgstr "×“×•××¨ × ×›× ×¡"
+
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
+
+#: templates/compose/spelling.html:36
+msgid "Ignore"
+msgstr ""
+
+#: templates/compose/spelling.html:37
+msgid "Ignore All"
+msgstr ""
+
+#: saveimage.php:46
+msgid "Image"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:96
+#, php-format
+msgid "Images are blocked: %s to protect your privacy. %s"
+msgstr ""
+
+#: templates/folders/import.html:16
+msgid "Import"
+msgstr "×™×‘×"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.html:48
+msgid "Import Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:139
+msgid "Import Keypair"
+msgstr ""
+
+#: templates/folders/actions.html:29
+msgid "Import Messages"
+msgstr ""
+
+#: pgp.php:39
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.html:11
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.html:18
+msgid "Import Personal Private PGP Key Here:"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.html:11
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.html:18
+msgid "Import Public PGP Key Here:"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.html:6
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.html:11
+msgid "Import mbox file"
+msgstr ""
+
+#: message.php:474 mailbox.php:836 mailbox.php:972
+#: templates/message/navbar_navigate.html:7 templates/mailbox/navbar.html:13
+#: templates/mailbox/navbar.html:28 templates/mailbox/legend.html:5
+msgid "Important"
+msgstr ""
+
+#: search.php:334
+msgid "Important messages"
+msgstr ""
+
+#: folders.php:115
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:766
+msgid "In Process"
+msgstr ""
+
+#: templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:308 lib/IMAP/Tree.php:110
+#: lib/IMAP/Tree.php:213 lib/IMAP/Tree.php:359
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:493
+msgid "Include a brief summary of the header in a reply?"
+msgstr ""
+
+#: config/prefs.php.dist:488
+msgid "Include original message in a reply?"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:132
+msgid "Info"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/javascript.inc:243 templates/compose/compose.html:270
+#: templates/compose/compose.html:326
+msgid "Inline"
+msgstr ""
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:413
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:724 mailbox.php:766
+msgid "Invalid Address"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:261
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: lib/Compose.php:1036
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:78 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: lib/Compose.php:197
+msgid "Invalid message, can not resume draft."
+msgstr ""
+
+#: pgp.php:202
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:177
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.html:9
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.html:314 templates/compose/compose.html:349
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:324
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.html:113
+msgid "Language"
+msgstr ""
+
+#: config/prefs.php.dist:917
+msgid "Last Mailbox Page"
+msgstr ""
+
+#: mailbox.php:444
+msgid "Last Page"
+msgstr ""
+
+#: compose.php:1327
+msgid "Link Attachments?"
+msgstr ""
+
+#: attachment.php:34 lib/Compose.php:2215
+msgid "Linked attachments are forbidden."
+msgstr ""
+
+#: lib/Compose.php:2231
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1093
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:694
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:671
+msgid "Location"
+msgstr ""
+
+#: lib/Block/summary.php:104
+#, php-format
+msgid "Log in to %s"
+msgstr ""
+
+#: login.php:352
+msgid "Login"
+msgstr ""
+
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr ""
+
+#: compose.php:1206
+msgid "Low"
+msgstr ""
+
+#: message.php:266 mailbox.php:831 mailbox.php:978
+#: templates/mailbox/legend.html:11
+msgid "Low Priority"
+msgstr ""
+
+#: compose.php:1207
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Mail Previews"
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: lib/IMAP/Tree.php:365 lib/IMAP/Tree.php:393
+msgid "Mailbox"
+msgstr ""
+
+#: config/prefs.php.dist:112
+msgid "Mailbox and Folder Display Options"
+msgstr ""
+
+#: templates/folders/actions.html:20
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.html:21
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
+
+#: templates/message/navbar_navigate.html:5 templates/mailbox/navbar.html:25
+msgid "Mark as:"
+msgstr ""
+
+#: config/prefs.php.dist:650
+msgid "Mark different levels of quoting with different colors?"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: search.php:226
+msgid "Match All Queries"
+msgstr ""
+
+#: search.php:224
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.html:276
+msgid "Maximum Attachment Size"
+msgstr ""
+
+#: lib/api.php:84
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: lib/api.php:87
+msgid "Maximum Number of Recipients per Message"
+msgstr ""
+
+#: lib/api.php:90
+msgid "Maximum Number of Recipients per Time Period"
+msgstr ""
+
+#: templates/compose/compose.html:258
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.html:253
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr ""
+
+#: lib/Compose.php:1393
+msgid "Message"
+msgstr ""
+
+#: compose.php:331 compose.php:358 compose.php:367 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr ""
+
+#: config/prefs.php.dist:928
+msgid "Message Date"
+msgstr ""
+
+#: templates/search/search.html:112
+msgid "Message Flags"
+msgstr ""
+
+#: templates/search/search.html:137
+msgid "Message Folders"
+msgstr ""
+
+#: templates/search/search.html:33
+msgid "Message Matches"
+msgstr ""
+
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:79
+#: config/prefs.php.dist:88 config/prefs.php.dist:96 config/prefs.php.dist:104
+msgid "Message Options"
+msgstr ""
+
+#: search.php:406
+msgid "Message Search"
+msgstr ""
+
+#: config/prefs.php.dist:932
+msgid "Message Size"
+msgstr ""
+
+#: message.php:578
+msgid "Message Source"
+msgstr ""
+
+#: config/prefs.php.dist:66
+msgid "Message Viewing"
+msgstr ""
+
+#: lib/Compose.php:1391
+#, php-format
+msgid "Message from %s"
+msgstr ""
+
+#: mailbox.php:866
+msgid "Message has attachments"
+msgstr ""
+
+#: mailbox.php:858
+msgid "Message is encrypted"
+msgstr ""
+
+#: mailbox.php:854
+msgid "Message is signed"
+msgstr ""
+
+#: compose.php:474 compose.php:481
+msgid "Message redirected successfully."
+msgstr ""
+
+#: lib/Compose.php:660
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr ""
+
+#: compose.php:542 compose.php:550
+msgid "Message sent successfully."
+msgstr ""
+
+#: config/prefs.php.dist:952
+msgid "Messages per page in the mailbox view."
+msgstr ""
+
+#: mailbox.php:245
+msgid "Messages to"
+msgstr ""
+
+#: templates/acl/acl.inc:29
+msgid "Modify"
+msgstr ""
+
+#: expand.php:40
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: message.php:503 message.php:695 mailbox.php:419 mailbox.php:997
+msgid "Move"
+msgstr "×”×¢×‘×¨"
+
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr ""
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: message.php:503 message.php:695 mailbox.php:419 mailbox.php:997
+msgid "Move to folder"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:128
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:75 thread.php:154
+msgid "Multiple Message View"
+msgstr ""
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:683 templates/contacts/contacts.html:58
+msgid "Name"
+msgstr "×©×"
+
+#: pgp.php:116
+msgid "Name and/or email cannot be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:771
+msgid "Needs Action"
+msgstr ""
+
+#: config/prefs.php.dist:582 config/prefs.php.dist:790
+msgid "Never"
+msgstr ""
+
+#: config/prefs.php.dist:572
+msgid "Never save attachments"
+msgstr ""
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr ""
+
+#: lib/IMP.php:428
+msgid "New Folder"
+msgstr ""
+
+#: config/prefs.php.dist:89
+msgid "New Mail"
+msgstr ""
+
+#: lib/Block/summary.php:26 lib/Block/summary.php:27
+#: lib/Block/tree_folders.php:31
+msgid "New Message"
+msgstr "×”×•×“×¢×” ×—×“×©×”"
+
+#: mailbox.php:919 lib/MIME/Headers.php:193
+#, php-format
+msgid "New Message to %s"
+msgstr ""
+
+#: search.php:325
+msgid "New messages"
+msgstr ""
+
+#: templates/compose/spelling.html:73
+msgid "Next"
+msgstr ""
+
+#: message.php:521 message.php:702
+msgid "Next Message"
+msgstr ""
+
+#: mailbox.php:442
+msgid "Next Page"
+msgstr ""
+
+#: config/prefs.php.dist:530 config/prefs.php.dist:988
+#: templates/compose/compose.html:296
+msgid "No"
+msgstr ""
+
+#: smime.php:222
+msgid "No Certificate found"
+msgstr ""
+
+#: lib/IMP.php:1313
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:280
+#, php-format
+msgid "No Messages"
+msgstr ""
+
+#: pgp.php:143
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: mailbox.php:876
+msgid "No Preview Text"
+msgstr ""
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:147
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:92
+msgid "No attachments found."
+msgstr ""
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:71 acl.php:97
+msgid "No folder selected."
+msgstr ""
+
+#: lib/Block/summary.php:132
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:165 lib/Folder.php:511 lib/Folder.php:561
+msgid "No folders were specified"
+msgstr ""
+
+#: lib/Block/summary.php:138
+msgid "No folders with new messages"
+msgstr ""
+
+#: lib/Block/summary.php:135
+msgid "No folders with unseen messages"
+msgstr ""
+
+#: lib/Compose.php:1387
+msgid "No message body text"
+msgstr ""
+
+#: lib/IMAP/Client.php:569
+msgid "No message returned."
+msgstr ""
+
+#: mailbox.php:258
+msgid "No messages matched your search."
+msgstr ""
+
+#: pgp.php:195
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:171
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:197
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:246
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+
+#: spelling.php:190
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: compose.php:993
+msgid "No suggestions"
+msgstr ""
+
+#: lib/IMAP/Client.php:561
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:67 acl.php:93
+msgid "No user specified."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:704
+msgid "Non Participant"
+msgstr ""
+
+#: templates/prefs/folderselect.inc:24 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: templates/prefs/trashselect.inc:24 lib/MIME/Viewer/itip.php:661
+#: templates/mailbox/navbar.html:8
+msgid "None"
+msgstr ""
+
+#: compose.php:1205
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.html:18 templates/mailbox/navbar.html:34
+msgid "Not Deleted"
+msgstr ""
+
+#: templates/message/navbar_navigate.html:12 templates/mailbox/navbar.html:20
+#: templates/mailbox/navbar.html:37
+msgid "Not Draft"
+msgstr ""
+
+#: templates/message/navbar_navigate.html:8 templates/mailbox/navbar.html:14
+#: templates/mailbox/navbar.html:29
+msgid "Not Important"
+msgstr ""
+
+#: templates/mailbox/navbar.html:22
+msgid "Not Personal"
+msgstr ""
+
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: config/prefs.php.dist:707
+msgid "Not at all"
+msgstr ""
+
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr ""
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr ""
+
+#: config/prefs.php.dist:378
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+
+#: config/prefs.php.dist:360
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+
+#: templates/contacts/contacts.html:73
+msgid "OK"
+msgstr "××™×©×•×¨"
+
+#: templates/smime/import_key.inc:49 templates/search/search.html:49
+#: templates/pgp/import_key.html:30
+msgid "OR"
+msgstr "××•"
+
+#: search.php:324
+msgid "Old messages"
+msgstr ""
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr ""
+
+#: lib/Block/summary.php:33
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:81
+msgid "Only one folder should be selected for this action."
+msgstr ""
+
+#: lib/IMP.php:858 lib/IMP.php:863
+msgid "Open Fo_lder"
+msgstr ""
+
+#: lib/IMAP/Tree.php:422
+msgid "Opened Folder"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:700
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr ""
+
+#: config/prefs.php.dist:111 config/prefs.php.dist:120
+#: config/prefs.php.dist:127 config/prefs.php.dist:134
+#: config/prefs.php.dist:142 config/prefs.php.dist:151
+msgid "Other Options"
+msgstr ""
+
+#: templates/login/login.html:101
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:212 lib/MIME/Viewer/pgp.php:293
+msgid "PGP"
+msgstr ""
+
+#: lib/IMP.php:1316
+msgid "PGP Encrypt Message"
+msgstr ""
+
+#: lib/Compose.php:1144
+msgid "PGP Error: "
+msgstr ""
+
+#: lib/Compose.php:1123
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:143
+msgid "PGP Options"
+msgstr ""
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: pgp.php:155
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr ""
+
+#: pgp.php:251
+#, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: lib/IMP.php:1317
+msgid "PGP Sign Message"
+msgstr ""
+
+#: lib/IMP.php:1318
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:208
+msgid "PGP private key successfully added."
+msgstr ""
+
+#: pgp.php:183
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/IMAP.php:175
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:102
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP.php:187
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/IMAP.php:193
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
+
+#: lib/IMAP.php:181
+msgid "POP3, no TLS"
+msgstr ""
+
+#: mailbox.php:374
+#, php-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: config/prefs.php.dist:914
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:915
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: message.php:666
+msgid "Part(s)"
+msgstr ""
+
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:231 pgp.php:316
+msgid "Passphrase successfully unloaded."
+msgstr ""
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:118
+msgid "Passphrases cannot be empty"
+msgstr ""
+
+#: pgp.php:120
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.html:90
+msgid "Password"
+msgstr "×¡×™×¡×ž×"
+
+#: templates/fetchmail/manage.inc:48
+msgid "Perform maintenance operations on login?"
+msgstr ""
+
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
+msgstr ""
+
+#: message.php:460 mailbox.php:806 mailbox.php:975
+#: templates/mailbox/navbar.html:21 templates/mailbox/legend.html:8
+msgid "Personal"
+msgstr ""
+
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr ""
+
+#: pgp.php:126
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:133
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:203
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:128
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:223
+msgid "Place your signature before replies and forwards?"
+msgstr ""
+
+#: lib/Compose.php:358
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:70 templates/mailbox/javascript.inc:195
+msgid "Please enter a name for the new folder:"
+msgstr ""
+
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
+msgid "Please enter the name of the new folder:"
+msgstr ""
+
+#: templates/javascript/folders.js:139
+msgid "Please enter the new name:"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: login.php:180
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/javascript.inc:36
+msgid "Please provide your password."
+msgstr ""
+
+#: templates/login/javascript.inc:32
+msgid "Please provide your username."
+msgstr ""
+
+#: compose.php:106 lib/Compose.php:2398
+msgid "Please resolve ambiguous or invalid addresses."
+msgstr ""
+
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr ""
+
+#: templates/search/javascript.inc:41
+msgid "Please select at least one folder to search."
+msgstr ""
+
+#: templates/javascript/folders.js:12
+msgid "Please select only one folder for this operation."
+msgstr ""
+
+#: templates/compose/redirect.html:39
+msgid "Please select or edit in the box to the right:"
+msgstr ""
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:215
+msgid "Precede your signature with dashes ('-- ')?"
+msgstr ""
+
+#: smime.php:237 pgp.php:263 filterprefs.php:41
+msgid "Preferences successfully updated."
+msgstr ""
+
+#: compose.php:1347 templates/compose/compose.html:314
+msgid "Preview"
+msgstr ""
+
+#: message.php:513 message.php:699
+msgid "Previous Message"
+msgstr ""
+
+#: mailbox.php:434
+msgid "Previous Page"
+msgstr ""
+
+#: message.php:594
+msgid "Print"
+msgstr "×”×“×¤×¡"
+
+#: message.php:655
+msgid "Priority"
+msgstr ""
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:571
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:570
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:430
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: mailbox.php:388 mailbox.php:483
+msgid "Pur_ge Deleted"
+msgstr ""
+
+#: mailbox.php:388 mailbox.php:483
+msgid "Purge Deleted"
+msgstr ""
+
+#: templates/folders/actions.html:26
+msgid "Purge Folder(s)"
+msgstr ""
+
+#: config/prefs.php.dist:397
+msgid "Purge Trash how often:"
+msgstr ""
+
+#: config/prefs.php.dist:406
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr ""
+
+#: config/prefs.php.dist:387
+msgid "Purge old messages in the Trash folder?"
+msgstr ""
+
+#: lib/Maintenance/Task/purge_trash.php:65
+#, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr ""
+
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr ""
+
+#: lib/IMP.php:917
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: lib/IMP.php:921
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: lib/IMP.php:924
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:501
+#, php-format
+msgid "Quoting %f:"
+msgstr ""
+
+#: templates/folders/actions.html:31
+msgid "Rebuild Folder Tree"
+msgstr ""
+
+#: lib/Search.php:631
+msgid "Received On"
+msgstr ""
+
+#: lib/Search.php:639
+msgid "Received Since"
+msgstr ""
+
+#: lib/Search.php:635
+msgid "Received Until"
+msgstr ""
+
+#: message.php:556
+msgid "Redirec_t"
+msgstr ""
+
+#: message.php:556
+msgid "Redirect"
+msgstr ""
+
+#: templates/compose/redirect.html:77
+msgid "Redirect Message"
+msgstr ""
+
+#: compose.php:433
+msgid "Redirect this message"
+msgstr ""
+
+#: compose.php:496
+msgid "Redirecting failed."
+msgstr ""
+
+#: folders.php:276
+msgid "Refresh"
+msgstr ""
+
+#: config/prefs.php.dist:796
+msgid "Refresh Folder Views:"
+msgstr ""
+
+#: mailbox.php:349
+msgid "Reload"
+msgstr ""
+
+#: folders.php:266
+msgid "Reload View"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:990
+msgid "Remember the last view"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr ""
+
+#: search.php:320
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr ""
+
+#: templates/folders/actions.html:10
+msgid "Rename Folder(s)"
+msgstr ""
+
+#: config/prefs.php.dist:342
+msgid "Rename sent-mail folder at beginning of month?"
+msgstr ""
+
+#: lib/Folder.php:463
+#, php-format
+msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
+msgstr ""
+
+#: message.php:543
+msgid "Repl_y to List"
+msgstr ""
+
+#: templates/compose/spelling.html:50
+msgid "Replace with:"
+msgstr ""
+
+#: message.php:540
+msgid "Reply"
+msgstr "×”×©×‘"
+
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
+msgid "Reply Sent."
+msgstr ""
+
+#: message.php:549
+msgid "Reply to All"
+msgstr "×”×©×‘ ×œ×›×œ"
+
+#: compose.php:406
+msgid "Reply to All:"
+msgstr ""
+
+#: message.php:543
+msgid "Reply to List"
+msgstr ""
+
+#: compose.php:408
+msgid "Reply to List:"
+msgstr ""
+
+#: message.php:549
+msgid "Reply to _All"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:537
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:536
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:236
+msgid "Reply-To"
+msgstr ""
+
+#: lib/Compose.php:1549
+msgid "Reply-To: "
+msgstr ""
+
+#: compose.php:404
+msgid "Reply:"
+msgstr ""
+
+#: message.php:607 mailbox.php:514
+msgid "Report as Innocent"
+msgstr ""
+
+#: message.php:599 mailbox.php:506
+msgid "Report as Spam"
+msgstr ""
+
+#: compose.php:1270
+msgid "Request a _Read Receipt"
+msgstr ""
+
+#: config/prefs.php.dist:585
+msgid "Request read receipts?"
+msgstr ""
+
+#: mailbox.php:131
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:692
+msgid "Required Participant"
+msgstr ""
+
+#: templates/acl/acl.inc:162 templates/search/search.html:29
+#: templates/search/search.html:181
+msgid "Reset"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:116
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: message.php:587
+msgid "Resume"
+msgstr ""
+
+#: login.php:181
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: filterprefs.php:53 templates/smime/smime.inc:101
+#: templates/smime/notactive.inc:15 templates/pgp/pgp.inc:149
+#: templates/pgp/notactive.inc:15 templates/acl/acl.inc:163
+#: templates/acl/acl.inc:175
+msgid "Return to Options"
+msgstr ""
+
+#: config/prefs.php.dist:730
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:683
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
+msgid "S/MIME"
+msgstr ""
+
+#: lib/IMP.php:1321
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: lib/Compose.php:1176
+msgid "S/MIME Error: "
+msgstr ""
+
+#: lib/Compose.php:1155
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:152
+msgid "S/MIME Options"
+msgstr ""
+
+#: smime.php:46
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:136
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr ""
+
+#: smime.php:158
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:207
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: lib/IMP.php:1322
+msgid "S/MIME Sign Message"
+msgstr ""
+
+#: lib/IMP.php:1323
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message cannot "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.html:105
+msgid "SMTP"
+msgstr ""
+
+#: compose.php:1179
+msgid "S_ubject"
+msgstr ""
+
+#: compose.php:1249
+msgid "Sa_ve a copy in "
+msgstr ""
+
+#: message.php:592
+msgid "Sa_ve as"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:67 templates/search/search.html:28
+#: templates/search/search.html:180
+msgid "Save"
+msgstr ""
+
+#: compose.php:1323
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.html:23 templates/compose/compose.html:206
+msgid "Save Draft"
+msgstr ""
+
+#: saveimage.php:51
+msgid "Save Image"
+msgstr ""
+
+#: lib/MIME/Contents.php:231
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: filterprefs.php:114 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+msgid "Save Options"
+msgstr ""
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: compose.php:1094
+msgid "Save _Draft"
+msgstr ""
+
+#: message.php:592
+msgid "Save as"
+msgstr ""
+
+#: config/prefs.php.dist:522
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:532
+msgid "Save drafts automatically while composing?"
+msgstr ""
+
+#: config/prefs.php.dist:1083
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/search.html:172
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:231
+msgid "Save sent mail?"
+msgstr ""
+
+#: lib/Compose.php:150
+msgid "Saving the draft failed. Could not create a drafts folder."
+msgstr ""
+
+#: lib/Compose.php:89
+msgid "Saving the draft failed. No draft folder specified."
+msgstr ""
+
+#: lib/Compose.php:165
+#, php-format
+msgid "Saving the draft failed. This is what the server said: %s"
+msgstr ""
+
+#: mailbox.php:356 lib/Block/tree_folders.php:39
+#: templates/contacts/contacts.html:25
+msgid "Search"
+msgstr "×—×¤×©"
+
+#: mailbox.php:356 search.php:219
+#, php-format
+msgid "Search %s"
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Search Options"
+msgstr ""
+
+#: search.php:165
+msgid "Search Results"
+msgstr ""
+
+#: templates/mailbox/navbar.html:11 templates/mailbox/navbar.html:26
+msgid "Seen"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr ""
+
+#: search.php:311
+msgid "Select a date"
+msgstr ""
+
+#: templates/search/search.html:55
+msgid "Select a field"
+msgstr ""
+
+#: config/prefs.php.dist:136
+msgid "Select address book sources for adding and searching for addresses."
+msgstr ""
+
+#: templates/search/search.html:141
+msgid "Select all"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr ""
+
+#: templates/search/search.html:142
+msgid "Select none"
+msgstr ""
+
+#: templates/compose/compose.html:133
+msgid "Select stationery:"
+msgstr ""
+
+#: templates/saveimage/saveimage.html:8
+msgid "Select the gallery to save the image in."
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
+
+#: templates/mailbox/navbar.html:6
+msgid "Select:"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
+msgstr ""
+
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:597
+msgid "Send Latest Information"
+msgstr ""
+
+#: templates/compose/compose.html:21 templates/compose/compose.html:204
+msgid "Send Message"
+msgstr ""
+
+#: templates/compose/javascript.inc:119
+msgid "Send message without a Subject?"
+msgstr ""
+
+#: config/prefs.php.dist:715
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: lib/IMAP/Tree.php:385
+msgid "Sent mail folder"
+msgstr ""
+
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr ""
+
+#: templates/login/login.html:36 templates/login/login.html:50
+#: templates/login/login.html:62
+msgid "Server"
+msgstr ""
+
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:23
+msgid "Server:"
+msgstr ""
+
+#: config/prefs.php.dist:81
+msgid "Set preferences for what happens when you move and delete messages."
+msgstr ""
+
+#: config/prefs.php.dist:541
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr ""
+
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr ""
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
+
+#: config/prefs.php.dist:514
+msgid "Should the compose window be closed after saving a draft?"
+msgstr ""
+
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/search.html:144
+msgid "Show All Folders"
+msgstr ""
+
+#: message.php:678
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:270
+msgid "Show Deleted"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:98
+msgid "Show Images?"
+msgstr ""
+
+#: message.php:672
+msgid "Show Limited Headers"
+msgstr ""
+
+#: message.php:681
+msgid "Show Mailing List Information"
+msgstr ""
+
+#: templates/search/search.html:144
+msgid "Show Only Subscribed Folders"
+msgstr ""
+
+#: folders.php:294
+msgid "Show Unsubscribed"
+msgstr ""
+
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
+
+#: config/prefs.php.dist:1013
+msgid "Show legend in the mailbox view?"
+msgstr ""
+
+#: config/prefs.php.dist:851
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:859
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:888
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: filterprefs.php:99
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:36
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: mailbox.php:590
+msgid "Si_ze"
+msgstr ""
+
+#: mailbox.php:984 templates/mailbox/legend.html:15
+msgid "Signed"
+msgstr ""
+
+#: templates/compose/compose.html:314
+msgid "Size:"
+msgstr "×’×•×“×œ:"
+
+#: mailbox.php:559
+msgid "Sort by Arrival"
+msgstr ""
+
+#: mailbox.php:564
+msgid "Sort by Date"
+msgstr ""
+
+#: mailbox.php:574
+msgid "Sort by From Address"
+msgstr ""
+
+#: mailbox.php:589
+msgid "Sort by Message Size"
+msgstr ""
+
+#: mailbox.php:584
+msgid "Sort by Subject"
+msgstr ""
+
+#: mailbox.php:579
+msgid "Sort by Thread"
+msgstr ""
+
+#: mailbox.php:569
+msgid "Sort by To Address"
+msgstr ""
+
+#: lib/IMAP/Tree.php:379
+msgid "Spam folder"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:23
+msgid "Spam folder:"
+msgstr ""
+
+#: compose.php:1238
+msgid "Special Characters"
+msgstr ""
+
+#: search.php:53
+msgid "Special Virtual Folders cannot be edited."
+msgstr ""
+
+#: compose.php:1234
+msgid "Spell Check"
+msgstr ""
+
+#: templates/compose/spelling.html:19
+msgid "Spell Checker"
+msgstr ""
+
+#: compose.php:973
+msgid "Spell check complete"
+msgstr ""
+
+#: templates/compose/spelling.html:21
+msgid "Spell check complete - No spelling errors"
+msgstr ""
+
+#: config/prefs.php.dist:472
+msgid "Spelling errors per screen when spell checking."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
+msgid "Start"
+msgstr ""
+
+#: compose.php:1219 templates/stationery/prefs.inc:9
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:683
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:242
+msgid "Strip Attachment"
+msgstr ""
+
+#: config/prefs.php.dist:843
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: mailbox.php:585
+msgid "Sub_ject"
+msgstr "× ×•×©×"
+
+#: message.php:237 thread.php:152 lib/Search.php:619
+#: templates/login/recompose.html:41
+msgid "Subject"
+msgstr "× ×•×©×"
+
+#: config/prefs.php.dist:931
+msgid "Subject Field"
+msgstr ""
+
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#: templates/search/search.html:28 templates/search/search.html:180
+#: templates/saveimage/saveimage.html:18
+msgid "Submit"
+msgstr ""
+
+#: templates/folders/actions.html:13
+msgid "Subscribe to Folder(s)"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:397
+#: lib/MIME/Viewer/status.php:87
+msgid "Success"
+msgstr ""
+
+#: templates/compose/spelling.html:40
+msgid "Suggestions"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
+msgid "Summary"
+msgstr ""
+
+#: compose.php:1275 compose.php:1276
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.html:189
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.html:189
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: compose.php:1280
+msgid "Te_xt"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:586
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:754
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr ""
+
+#: config/prefs.php.dist:965
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:530
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr ""
+
+#: fetchmailprefs.php:74
+#, php-format
+msgid "The account \"%s\" has been saved."
+msgstr ""
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
+msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
+msgstr ""
+
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: lib/Compose.php:178
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: expand.php:38
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr ""
+
+#: lib/Folder.php:337
+#, php-format
+msgid "The folder \"%s\" already exists"
+msgstr ""
+
+#: lib/Folder.php:162
+#, php-format
+msgid ""
+"The folder \"%s\" contains illegal characters in its name. It may cause "
+"problems. Please see your system administrator."
+msgstr ""
+
+#: lib/Folder.php:356
+#, php-format
+msgid "The folder \"%s\" was created but you were not subscribed to it."
+msgstr ""
+
+#: lib/Folder.php:269
+#, php-format
+msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
+msgstr ""
+
+#: lib/Folder.php:343
+#, php-format
+msgid "The folder \"%s\" was not created. This is what the server said"
+msgstr ""
+
+#: lib/Folder.php:262
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr ""
+
+#: lib/Folder.php:359
+#, php-format
+msgid "The folder \"%s\" was successfully created."
+msgstr ""
+
+#: lib/Folder.php:272
+#, php-format
+msgid "The folder \"%s\" was successfully deleted."
+msgstr ""
+
+#: lib/Folder.php:461
+#, php-format
+msgid "The folder \"%s\" was successfully renamed to \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:94
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:725
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr ""
+
+#: lib/Fetchmail.php:247
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/javascript.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr ""
+
+#: templates/compose/javascript.inc:119
+msgid "The message does not have a Subject entered."
+msgstr ""
+
+#: lib/Spam.php:216
+msgid "The message has been deleted."
+msgstr ""
+
+#: lib/Spam.php:202
+msgid "The message has been reported as not spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:182
+msgid "The message has been reported as not spam."
+msgstr ""
+
+#: lib/Spam.php:194
+msgid "The message has been reported as spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:174
+msgid "The message has been reported as spam."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:401
+msgid "The message has been verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:389
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/javascript/open_pgp_win.js:8
+#: templates/javascript/open_smime_win.js:8
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:429
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/javascript.inc:83
+msgid "The signature could not be replaced."
+msgstr ""
+
+#: templates/compose/javascript.inc:81
+msgid "The signature was successfully replaced."
+msgstr ""
+
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr ""
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr ""
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:170
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+msgid "The text of the message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+msgid "The text of the sent message"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:155
+msgid "The user's free/busy information was sucessfully stored."
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.html:2
+msgid "There are no messages in this mailbox."
+msgstr ""
+
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:729
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr ""
+
+#: lib/Message.php:114
+#, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+
+#: lib/Message.php:238
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr ""
+
+#: lib/Message.php:329
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:100
+#, php-format
+msgid "There was an error deleting the event: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
+msgid "There was an error displaying this message part"
+msgstr ""
+
+#: lib/Message.php:607
+#, php-format
+msgid ""
+"There was an error flagging messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+
+#: folders.php:113
+#, php-format
+msgid "There was an error importing %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:137
+#, php-format
+msgid "There was an error importing the event: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:167
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:153
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr ""
+
+#: lib/Message.php:107
+#, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+
+#: lib/Compose.php:567
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:114
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/plain.php:59
+msgid "There was no text in this message part"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:165
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:415
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:162
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:323
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:243 lib/MIME/Viewer/pgp.php:358
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:200
+msgid ""
+"This message has been digitally signed and encrypted with PGP, but the "
+"signature cannot be verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:206
+msgid "This message has been digitally signed and encrypted with PGP."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:202
+msgid ""
+"This message has been digitally signed via PGP, but the signature cannot be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:424
+msgid "This message has been digitally signed via PGP."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:298
+msgid ""
+"This message has been encrypted with PGP, however, PGP support is disabled "
+"so the message cannot be decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:303
+msgid ""
+"This message has been encrypted with PGP, however, no personal private key "
+"exists so the message cannot be decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:294
+msgid "This message has been encrypted with PGP."
+msgstr ""
+
+#: message.php:505
+msgid "This message to"
+msgstr ""
+
+#: acl.php:45
+msgid "This server does not support sharing folders."
+msgstr ""
+
+#: templates/contacts/javascript.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
+
+#: thread.php:154
+msgid "Thread Display"
+msgstr ""
+
+#: thread.php:75 config/prefs.php.dist:933
+msgid "Thread View"
+msgstr ""
+
+#: message.php:233 compose.php:879 mailbox.php:570 mailbox.php:746
+#: lib/Search.php:607 templates/contacts/contacts.html:39
+#: templates/login/recompose.html:14
+msgid "To"
+msgstr "××œ"
+
+#: config/prefs.php.dist:930
+msgid "To Address"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.html:349
+msgid "Total Attachments Size:"
+msgstr ""
+
+#: lib/IMAP/Tree.php:368
+msgid "Trash folder"
+msgstr ""
+
+#: templates/prefs/trashselect.inc:23
+msgid "Trash folder:"
+msgstr ""
+
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
+
+#: templates/message/navbar_navigate.html:10 templates/mailbox/navbar.html:16
+#: templates/mailbox/navbar.html:31
+msgid "Unanswered"
+msgstr ""
+
+#: search.php:330
+msgid "Unanswered messages"
+msgstr ""
+
+#: message.php:535 mailbox.php:471
+msgid "Undelete"
+msgstr ""
+
+#: search.php:340
+msgid "Undeleted messages"
+msgstr ""
+
+#: mailbox.php:729 mailbox.php:742 lib/MIME/Headers.php:213
+msgid "Undisclosed Recipients"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:448
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: search.php:335
+msgid "Unimportant messages"
+msgstr ""
+
+#: mailbox.php:709
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:758
+msgid "Unknown Recipient"
+msgstr ""
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
+
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr ""
+
+#: message.php:469 mailbox.php:811 mailbox.php:970
+#: templates/message/navbar_navigate.html:6 templates/mailbox/navbar.html:12
+#: templates/mailbox/navbar.html:27 templates/mailbox/legend.html:3
+msgid "Unseen"
+msgstr ""
+
+#: templates/folders/actions.html:14
+msgid "Unsubscribe from Folder(s)"
+msgstr ""
+
+#: templates/compose/compose.html:284
+msgid "Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:612
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58
+msgid "Upload"
+msgstr "×”×¢×œ××”"
+
+#: templates/pgp/import_key.html:38
+msgid "Upload:"
+msgstr "×”×¢×œ××”:"
+
+#: templates/prefs/sentmailselect.inc:41
+msgid "Use Default Value"
+msgstr ""
+
+#: config/prefs.php.dist:257
+msgid "Use IMAP folder subscriptions?"
+msgstr ""
+
+#: config/prefs.php.dist:747
+msgid "Use Virtual Trash Folder?"
+msgstr ""
+
+#: templates/acl/acl.inc:143
+msgid "User"
+msgstr ""
+
+#: acl.php:86
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.html:83
+msgid "Username"
+msgstr "×§×•×“ ×–×™×”×•×™ ×ž×©×ª×ž×©"
+
+#: templates/fetchmail/manage.inc:17
+msgid "Username:"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "View"
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
+#, php-format
+msgid "View %s"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: mailbox.php:519
+msgid "View Messages"
+msgstr ""
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: message.php:559
+msgid "View Thread"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:423
+msgid "View attachment in a separate window"
+msgstr ""
+
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:141
+msgid "View event"
+msgstr ""
+
+#: mailbox.php:669 lib/IMAP/Tree.php:351
+#, php-format
+msgid "View messages in %s"
+msgstr ""
+
+#: templates/prefs/initialpageselect.inc:23
+msgid "View or mailbox to display after login:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:171
+msgid "View task"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:118
+msgid "View this HTML content in a separate window."
+msgstr ""
+
+#: search.php:162
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr ""
+
+#: lib/IMAP/Tree.php:132 lib/IMAP/Tree.php:145 lib/IMAP/Tree.php:147
+#: lib/IMAP/Tree.php:151 lib/IMAP/Tree.php:152 lib/IMAP/Tree.php:613
+#: lib/IMAP/Tree.php:637 lib/IMAP/Tree.php:675
+#: templates/search/search.html:165
+msgid "Virtual Folders"
+msgstr ""
+
+#: search.php:154
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/Search.php:434
+msgid "Virtual INBOX"
+msgstr ""
+
+#: lib/IMAP/Tree.php:409
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: lib/Search.php:380
+msgid "Virtual Trash"
+msgstr ""
+
+#: lib/IMAP/Tree.php:405
+msgid "Virtual Trash Folder"
+msgstr ""
+
+#: templates/search/search.html:176
+msgid "Virtual folder label:"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr ""
+
+#: login.php:184 login.php:266
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:739
+msgid ""
+"When deleting messages, move them to your Trash folder instead of marking "
+"them as deleted?"
+msgstr ""
+
+#: config/prefs.php.dist:918
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:427
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: config/prefs.php.dist:708
+msgid "Where do you want to display links to alternative formats of a message?"
+msgstr ""
+
+#: message.php:571 mailbox.php:496
+msgid "Whitelist"
+msgstr ""
+
+#: config/prefs.php.dist:989 templates/compose/compose.html:295
+msgid "Yes"
+msgstr ""
+
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr ""
+
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr ""
+
+#: templates/message/javascript.inc:70 templates/mailbox/javascript.inc:195
+msgid "You are copying/moving to a new folder."
+msgstr ""
+
+#: templates/javascript/folders.js:104
+msgid "You are creating a sub-folder to "
+msgstr ""
+
+#: templates/javascript/folders.js:106
+msgid "You are creating a top-level folder."
+msgstr ""
+
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr ""
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: lib/Compose.php:826
+#, php-format
+msgid ""
+"You are not allowed to send messages to more than %d recipients within %d "
+"hours."
+msgstr ""
+
+#: lib/Compose.php:1049
+#, php-format
+msgid "You are not allowed to send messages to more than %d recipients."
+msgstr ""
+
+#: templates/javascript/folders.js:137
+msgid "You are renaming the folder: "
+msgstr ""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Folder.php:568
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:170
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:130
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: mailbox.php:1009
+#, php-format
+msgid "You have %s new messages."
+msgstr ""
+
+#: mailbox.php:1009
+msgid "You have 1 new message."
+msgstr "×™×©× ×œ×š ×“×•××¨ ×—×“×©."
+
+#: compose.php:216
+msgid "You have already submitted this page."
+msgstr ""
+
+#: lib/IMP.php:957
+msgid "You have new mail in the following folder:"
+msgstr ""
+
+#: lib/IMP.php:962
+msgid "You have new mail in the following folders:"
+msgstr ""
+
+#: lib/Compose.php:1031
+msgid "You must enter at least one recipient."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:310
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:254
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+
+#: templates/message/javascript.inc:79 templates/mailbox/javascript.inc:204
+msgid "You must select a target mailbox first."
+msgstr ""
+
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr ""
+
+#: templates/contacts/javascript.inc:81
+msgid "You must select an address first."
+msgstr ""
+
+#: templates/mailbox/javascript.inc:74 templates/mailbox/javascript.inc:211
+#: templates/mailbox/javascript.inc:268
+msgid "You must select at least one message first."
+msgstr ""
+
+#: templates/compose/javascript.inc:18
+msgid "You must specify a recipient."
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:138
+#, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr ""
+
+#: lib/Maillog.php:142
+#, php-format
+msgid "You replied to this message on %s."
+msgstr ""
+
+#: lib/Folder.php:518
+#, php-format
+msgid "You were not subscribed to \"%s\". Here is what the server said"
+msgstr ""
+
+#: lib/Folder.php:570
+#, php-format
+msgid "You were not unsubscribed from \"%s\". Here is what the server said"
+msgstr ""
+
+#: lib/Folder.php:521
+#, php-format
+msgid "You were successfully subscribed to \"%s\""
+msgstr ""
+
+#: lib/Folder.php:573
+#, php-format
+msgid "You were successfully unsubscribed from \"%s\""
+msgstr ""
+
+#: templates/pgp/pgp.inc:98
+msgid "Your Name"
+msgstr ""
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
+
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+msgid "Your Public Key"
+msgstr ""
+
+#: config/prefs.php.dist:166
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr ""
+
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
+
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr ""
+
+#: config/prefs.php.dist:174
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:101
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+
+#: config/prefs.php.dist:551
+msgid "Your default charset for sending messages:"
+msgstr ""
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
+
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:89
+msgid "Your message was successfully delivered."
+msgstr ""
+
+#: config/prefs.php.dist:207
+msgid "Your signature:"
+msgstr ""
+
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr ""
+
+#: message.php:257 compose.php:609 mailbox.php:691 lib/Compose.php:1968
+msgid "[No Subject]"
+msgstr ""
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr ""
+
+#: lib/MIME/Headers.php:222
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr ""
+
+#: compose.php:1130
+msgid "_Bcc"
+msgstr "×”×¢×ª×§×™× ×¢×™×•×•×¨×™×"
+
+#: message.php:565 mailbox.php:490
+msgid "_Blacklist"
+msgstr "×¨×©×™×ž×” ×©×—×•×¨×”"
+
+#: compose.php:1127
+msgid "_Cc"
+msgstr "×”×¢×ª×§×™×"
+
+#: message.php:537 mailbox.php:463 mailbox.php:466
+msgid "_Delete"
+msgstr "×ž×—×§"
+
+#: lib/IMP.php:793
+msgid "_Folders"
+msgstr "×ª×™×§×™×•×ª"
+
+#: compose.php:1107
+msgid "_Identity"
+msgstr ""
+
+#: lib/IMP.php:758
+msgid "_Inbox"
+msgstr "×“×•××¨ × ×›× ×¡"
+
+#: lib/IMP.php:834
+msgid "_Log out"
+msgstr "×”×ª× ×ª×§×•×ª"
+
+#: message.php:578
+msgid "_Message Source"
+msgstr ""
+
+#: lib/IMP.php:790
+msgid "_New Message"
+msgstr "×”×•×“×¢×” ×—×“×©×”"
+
+#: message.php:594
+msgid "_Print"
+msgstr "×”×“×¤×¡"
+
+#: compose.php:1198
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:327
+#, php-format
+msgid "_Refresh %s"
+msgstr ""
+
+#: message.php:540
+msgid "_Reply"
+msgstr "×”×©×‘"
+
+#: lib/IMP.php:795
+msgid "_Search"
+msgstr "×—×¤×©"
+
+#: compose.php:1092 compose.php:1096
+msgid "_Send Message"
+msgstr ""
+
+#: mailbox.php:580
+msgid "_Thread"
+msgstr ""
+
+#: compose.php:1123 compose.php:1125
+msgid "_To"
+msgstr "××œ"
+
+#: mailbox.php:471
+msgid "_Undelete"
+msgstr ""
+
+#: message.php:559
+msgid "_View Thread"
+msgstr ""
+
+#: message.php:571 mailbox.php:496
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:853
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:1580
+msgid "attachment"
+msgstr ""
+
+#: view.php:114
+msgid "attachments.zip"
+msgstr ""
+
+#: templates/compose/compose.html:276
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:877
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:849
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:841
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:897
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:873
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:845
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:901
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.html:16
+msgid "from"
+msgstr "×ž××ª"
+
+#: lib/Compose.php:857
+msgid "host name unknown"
+msgstr ""
+
+#: templates/compose/spelling.html:31
+msgid "in"
+msgstr ""
+
+#: lib/Compose.php:881
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:865
+msgid "internal software error"
+msgstr ""
+
+#: templates/folders/import.html:13
+msgid "into folder"
+msgstr ""
+
+#: smime.php:29 pgp.php:77
+msgid "key"
+msgstr ""
+
+#: folders.php:109
+msgid "mailbox file"
+msgstr ""
+
+#: lib/Message.php:524 lib/Compose.php:640
+msgid "name"
+msgstr "×©×"
+
+#: templates/compose/spelling.html:32
+msgid "none"
+msgstr ""
+
+#: templates/compose/spelling.html:50
+msgid "or"
+msgstr "××•"
+
+#: lib/Compose.php:893
+msgid "permission denied"
+msgstr ""
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr ""
+
+#: lib/Compose.php:889
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:861
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.html:19
+msgid "spelling error"
+msgstr ""
+
+#: templates/compose/spelling.html:19
+msgid "spelling errors"
+msgstr ""
+
+#: lib/Compose.php:869
+msgid "system error"
+msgstr ""
+
+#: lib/Compose.php:885
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+msgid "your blacklist"
+msgstr ""
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- /dev/null
+++ po/km_KH.po
@@ -0,0 +1,5029 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Horde Project
+# This file is distributed under the same license as the PACKAGE package.
+# Keo Sophon <keosophon at khmeros.info>, 2005.
+# Leang Chumsoben <soben at khmeros.info>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: IMP\n"
+"POT-Creation-Date: 2004-12-08 10:28+0100\n"
+"PO-Revision-Date: 2005-06-15 11:53+0700\n"
+"Last-Translator: Leang Chumsoben <soben at khmeros.info>\n"
+"Language-Team: Khmer <support at khmeros.info>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: lib/Compose.php:1558
+msgid "      Cc: "
+msgstr "      áž…áž˜áŸ’áž›áž„Â áŸ– "
+
+#: lib/Compose.php:1555
+msgid "      To: "
+msgstr "      áž‘áŸ…Â áŸ– "
+
+#: lib/Compose.php:1543
+msgid "    Date: "
+msgstr "    áž€áž¶áž›áž”ážšáž·áž…áŸ’áž†áŸáž‘Â áŸ– "
+
+#: lib/Compose.php:1546
+msgid "    From: "
+msgstr "    áž–áž¸Â áŸ– "
+
+#: folders.php:274 mailbox.php:331
+#, php-format
+msgid " (Accesskey %s)"
+msgstr "(áž‚áŸ’ážšáž¶áž”áŸ‹â€‹áž…áž»áž…â€‹áž•áŸ’áž›áž¼ážœâ€‹áž€áž¶ážáŸ‹ %s)"
+
+#: lib/Compose.php:1552
+msgid " Subject: "
+msgstr " áž”áŸ’ážšáž’áž¶áž“áž”áž‘Â áŸ– "
+
+#: lib/MIME/Viewer/pgp.php:169
+msgid " [ Save the key to your Address book ] "
+msgstr " [ ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹áž€áž¼áž“ážŸáŸ„â€‹áž‘áŸ…â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ] "
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid " [ View the raw key ] "
+msgstr " [ áž˜áž¾áž›â€‹áž‚áŸ’ážšáž¶áž”áŸ‹áž…áž»áž…â€‹ážŠáž¾áž˜áŸ… ] "
+
+#: mailbox.php:560
+msgid "#"
+msgstr "#"
+
+#: thread.php:153
+#, php-format
+msgid "%d Messages"
+msgstr "ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“ %d"
+
+#: lib/Spam.php:218
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“ %d ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”Â áŸ”"
+
+#: lib/Spam.php:200
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "ážŸáž¶ážš %d ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™â€‹áž€áž¶ážšážŽáŸâ€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‚áŸ’ážšáž”áŸ‹â€‹áž‚áŸ’ážšáž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážáž¶â€‹áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšÂ áŸ”"
+
+#: lib/Spam.php:180
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "ážŸáž¶ážš %d ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™â€‹áž€áž¶ážšážŽáŸâ€‹ážáž¶â€‹áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšÂ áŸ”"
+
+#: lib/Spam.php:192
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "ážŸáž¶ážš %d ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™â€‹áž€áž¶ážšážŽáŸâ€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‚áŸ’ážšáž”áŸ‹â€‹áž‚áŸ’ážšáž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážáž¶â€‹â€‹áž‡áž¶â€‹â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“áž€áž¶ážš"
+
+#: lib/Spam.php:172
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "ážŸáž¶ážš %d ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™â€‹áž€áž¶ážšážŽáŸâ€‹ážáž¶â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšÂ áŸ”"
+
+#: mailbox.php:278
+#, php-format
+msgid "%d to %d of %d Messages"
+msgstr "%d ážŠáž›áŸ‹ %d áž“áŸƒâ€‹ážŸáž¶ážš %d"
+
+#: lib/MIME/Contents.php:567
+#, php-format
+msgid "%s Attachments, %s"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áŸ†áž“áž½áž“ %s, %s"
+
+#: mailbox.php:784 lib/MIME/Contents.php:558
+#, php-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: mailbox.php:782 lib/MIME/Contents.php:556
+#, php-format
+msgid "%s MB"
+msgstr "%s áž˜áŸáž€áž¶áž”áŸƒ"
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
+msgid "%s already exists. Your %s folder was not renamed."
+msgstr "%s áž˜áž¶áž“â€‹ážšáž½áž…â€‹áž áž¾áž™Â áŸ” ážáž %s ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Contents.php:561
+#, php-format
+msgid "%s bytes"
+msgstr "%s áž”áŸƒ"
+
+#: lib/Message.php:723
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr "%s áž‘áŸ†áž“áž„â€‹áž‡áž¶â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœÂ áŸ”"
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
+msgid "%s folder being renamed at the start of the month."
+msgstr "ážáž %s áž“áž¹áž„â€‹â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ áž“áŸ…â€‹áž–áŸáž›â€‹áž…áž¶áž”áŸ‹â€‹áž•áŸ’ážáž¾áž˜â€‹áž“áŸƒâ€‹ážáŸ‚Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:257
+#, php-format
+msgid "%s has accepted."
+msgstr "%s áž”áž¶áž“â€‹áž‘áž‘áž½áž›Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:617
+#, php-format
+msgid "%s has cancelled \"%s\"."
+msgstr "%s áž”áž¶áž“â€‹áž”áŸ„áŸ‡áž”áž„áŸ‹ \"%s\"Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:263
+#, php-format
+msgid "%s has declined."
+msgstr "%s áž”áž¶áž“â€‹áž”ážŠáž·ážŸáŸáž’Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:492
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr "%s áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž“áž¹áž„â€‹ážŸáŸ†ážŽáž¾ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹ áž˜áž½áž™Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:609
+#, php-format
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™ážáž”â€‹áž‘áŸ…â€‹ážŸáŸáž…áž€áŸ’ážŠáž¸â€‹áž¢áž‰áŸ’áž‡áž¾áž‰â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹ \"%s\"Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:483
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr "%s áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹áž²áŸ’áž™â€‹áž¢áŸ’áž“áž€â€‹áž“áž¼ážœâ€‹áž–áŸážáŸŒáž˜áž¶áž“ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:269
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr "%s áž”áž¶áž“â€‹áž‘áž‘áž½áž›â€‹áž‡áž¶â€‹áž”ážŽáŸ’ážáŸ„áŸ‡â€‹áž¢áž¶ážŸáž“áŸ’áž“Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:488
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹â€‹ ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:580
+#, php-format
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s ážŸáž»áŸ†â€‹áž²áŸ’áž™â€‹áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹ážœážáŸ’ážáž˜áž¶áž“â€‹áž“áŸ… \"%s\"Â áŸ”"
+
+#: lib/Message.php:472
+#, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹ \"%s\"Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:592
+#, php-format
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s áž…áž„áŸ‹â€‹áž²áŸ’áž™ ammend \"%s\"Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:571
+#, php-format
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s áž…áž„áŸ‹â€‹áž²áŸ’áž™â€‹áž¢áŸ’áž“áž€â€‹ážŠáž¹áž„â€‹áž¢áŸ†áž–áž¸ \"%s\"Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:596
+#, php-format
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s áž…áž„áŸ‹â€‹áž‘áž‘áž½áž›â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž…áž»áž„áž€áŸ’ážšáŸ„áž™â€‹áž”áŸ†áž•áž»ážâ€‹áž¢áŸ†áž–áž¸ \"%s\"Â áŸ”"
+
+#: message.php:254 message.php:259
+#, php-format
+msgid "%s: %s"
+msgstr "%sÂ áŸ– %s"
+
+#: message.php:491
+#, php-format
+msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
+msgstr "%sÂ áŸ– %s (%d&nbsp;of&nbsp;%d)"
+
+#: templates/compose/spelling.html:73
+msgid "(Apply these changes and move to next screen.)"
+msgstr "(áž¢áž“áž»ážœážáŸ’ážâ€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž“áŸáŸ‡ áž“áž·áž„ áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž¢áŸáž€áŸ’ážšáž„áŸ‹â€‹áž”áž“áŸ’áž‘áž¶áž”áŸ‹Â áŸ”)"
+
+#: templates/compose/spelling.html:60
+msgid "(Discard all changes and return to the compose screen.)"
+msgstr "(áž”áŸ„áŸ‡áž…áŸ„áž›â€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ áž“áž·áž„ ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž¢áŸáž€áŸ’ážšáž„áŸ‹â€‹â€‹ážáŸ‚áž„Â áŸ”)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(áž¢ážáŸ’ážáž”áž‘â€‹áž’áž˜áŸ’áž˜ážáž¶)"
+
+#: spelling.php:249
+msgid ""
+"(Return to the compose screen after applying all changes made thus far.  "
+"Changes on the current screen will NOT be applied.)"
+msgstr ""
+"ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž¢áŸáž€áŸ’ážšáž„áŸ‹â€‹ážáŸ‚áž„ áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž–áž¸â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹â€‹â€‹ážšáž áž¼ážâ€‹ážŠáž›áŸ‹â€‹áž–áŸáž›â€‹áž“áŸáŸ‡Â áŸ” áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž›áž¾â€‹"
+"áž¢áŸáž€áŸ’ážšáž„áŸ‹â€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“ áž“áž¹áž„â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: spelling.php:246
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážš áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž–áž¸áž¢áž“áž»ážœážáŸ’ážâ€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹ážšáž áž¼ážâ€‹ážŠáž›áŸ‹â€‹áž–áŸáž›â€‹áž“áŸáŸ‡Â áŸ” áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážáž¼ážšâ€‹áž›áž¾â€‹áž¢áŸáž€áŸ’ážšáž„áŸ‹â€‹"
+"áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“ áž“áž¹áž„â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: templates/contacts/contacts.html:47
+msgid "* Add these by clicking OK *"
+msgstr "* áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áž¶áŸ†áž„â€‹áž“áŸáŸ‡ ážŠáŸ„áž™â€‹áž…áž»áž…â€‹áž™áž›áŸ‹áž–áŸ’ážšáž˜ *"
+
+#: templates/contacts/contacts.html:32
+msgid "* Please select address(es) *"
+msgstr "* ážŸáž¼áž˜â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ *"
+
+#: lib/MIME/Contents.php:565
+#, php-format
+msgid "1 Attachment, %s"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áŸ†áž“áž½áž“ áŸ¡, %s"
+
+#: config/prefs.php.dist:831
+msgid "100 characters"
+msgstr "áŸ¡áŸ áŸ  ážáž½â€‹áž¢áž€áŸ’ážŸážš"
+
+#: config/prefs.php.dist:834
+msgid "1000 characters"
+msgstr "áŸ¡áŸ áŸ áŸ  ážáž½â€‹áž¢áž€áŸ’ážŸážš"
+
+#: config/prefs.php.dist:832
+msgid "250 characters"
+msgstr "áŸ¢áŸ¥áŸ  ážáž½â€‹áž¢áž€áŸ’ážŸážš"
+
+#: config/prefs.php.dist:833
+msgid "500 characters"
+msgstr "áŸ¥áŸ áŸ  ážáž½â€‹áž¢áž€áŸ’ážŸážš"
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr "ážšáž¼áž”áž—áž¶áž–â€‹áž’áŸ†â€‹áž˜áž½áž™â€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážˆáŸ’áž˜áŸ„áŸ‡ %s ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“áž—áŸ’áž‡áž¶áž”áŸ‹â€‹â€‹áž‡áž¶áž˜áž½áž™â€‹â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡Â áŸ”"
+
+#: lib/MIME/Viewer/notification.php:50
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr "ážŸáž¶ážšâ€‹áž˜áž½áž™â€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾ áž”áž¶áž“â€‹áž•áŸ’ážáž›áŸ‹â€‹áž›áž‘áŸ’áž’áž•áž›â€‹áž‡áž¶â€‹áž€áž¶ážšâ€‹áž‡áž¼áž“ážŠáŸ†ážŽáž¹áž„â€‹ážáŸ’ážšáž¡áž”áŸ‹â€‹áž˜áž½áž™ â€‹áž–áž¸â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›Â áŸ”"
+
+#: templates/search/search.html:49
+msgid "AND"
+msgstr "áž“áž·áž„"
+
+#: config/prefs.php.dist:705
+msgid "Above the message text"
+msgstr "ážáž¶áž„â€‹áž›áž¾â€‹áž¢ážáŸ’ážáž”áž‘â€‹ážŸáž¶ážš"
+
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "áž–áŸ’ážšáž˜â€‹áž‘áž‘áž½áž› áž áž¾áž™â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ…â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹ážšáž”ážŸáŸ‹â€‹ážáŸ’áž‰áž»áŸ†"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Accept request"
+msgstr "áž–áŸ’ážšáž˜â€‹â€‹áž‘áž‘áž½áž›â€‹â€‹ážŸáŸ†ážŽáž¾"
+
+#: lib/MIME/Viewer/itip.php:746
+msgid "Accepted"
+msgstr "áž”áž¶áž“â€‹áž‘áž‘áž½áž›"
+
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr "áž”áž¶áž“â€‹áž‘áž‘áž½áž›Â áŸ– "
+
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž‚ážŽáž“áž¸Â áŸ–"
+
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
+msgid "Actions"
+msgstr "áž¢áŸ†áž–áž¾"
+
+#: lib/MIME/Headers.php:201 lib/MIME/Headers.php:202
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "áž”áž“áŸ’ážáŸ‚áž˜ %s áž‘áŸ…â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážšáž”ážŸáŸ‹â€‹ážáŸ’áž‰áž»áŸ†"
+
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "áž”áž“áŸ’ážáŸ‚áž˜â€‹áž”áŸ’ážšáž—áž–"
+
+#: lib/MIME/Viewer/itip.php:573
+msgid "Add this to my calendar"
+msgstr "áž”áž“áŸ’ážáŸ‚áž˜â€‹áž“áŸáŸ‡â€‹áž‘áŸ…â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹ážšáž”ážŸáŸ‹â€‹ážáŸ’áž‰áž»áŸ†"
+
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ…â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹ážšáž”ážŸáŸ‹â€‹ážáŸ’áž‰áž»áŸ†"
+
+#: compose.php:323
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr "áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜ \"%s\" áž‡áž¶â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž˜áž½áž™Â áŸ”"
+
+#: config/prefs.php.dist:199
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+"áž€áŸ’áž”áž¶áž›â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ€áž ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž“áŸ…â€‹áž–áŸáž›â€‹áž˜áž¾áž›Â áŸ– <em>(ážŸáŸ’ážšáŸáž…â€‹áž…áž·ážáŸ’áž áž”áž‰áŸ’áž…áž¼áž›â€‹áž€áŸ’áž”áž¶áž›â€‹áž“áž¸áž˜áž½áž™áŸ—â€‹áž›áž¾â€‹áž‡áž½ážšâ€‹ážáŸ’áž˜áž¸)</em>"
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹ %sÂ áŸ”"
+
+#: lib/MIME/Viewer/notification.php:62
+msgid "Additional information details"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážážšáž”ážŸáŸ‹â€‹â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž”áž“áŸ’ážáŸ‚áž˜"
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹ %sÂ áŸ”"
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹áž¢áŸ†áž–áž¸â€‹áž€áŸ†áž áž»ážŸâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž”áž“áŸ’ážáŸ‚áž˜"
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹áž¢áŸ†áž–áž¸â€‹áž€áŸ†áž áž»ážŸâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž”áž“áŸ’ážáŸ‚áž˜ áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹â€‹ %s â€‹áŸ”"
+
+#: compose.php:867 compose.php:1230 contacts.php:77
+#: templates/contacts/contacts.html:8
+msgid "Address Book"
+msgstr "ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“"
+
+#: config/prefs.php.dist:135
+msgid "Address Books"
+msgstr "ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“"
+
+#: config/prefs.php.dist:190
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr "áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž›áž¶áž€áŸ‹â€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹Â áŸ– <em>(ážŸáŸ’ážšáŸáž…â€‹áž…áž·ážáŸ’áž, áž”áž‰áŸ’áž…áž¼áž›â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž“áž¸áž˜áž½áž™áŸ—â€‹áž›áž¾â€‹áž‡áž½ážšâ€‹ážáŸ’áž˜áž¸)</em>"
+
+#: config/prefs.php.dist:182
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+"áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž…áž„â€‹áž‡áž¶áž€áŸ‹áž›áž¶áž€áŸ‹â€‹áž“áž¹áž„â€‹áž¢ážáŸ’ážážŸáž‰áŸ’áž‰áž¶ážŽâ€‹áž“áŸáŸ‡Â áŸ– <em>(ážŸáŸ’ážšáŸáž…â€‹áž…áž·ážáŸ’áž, áž”áž‰áŸ’áž…áž¼áž›â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž“áž¸áž˜áž½áž™áŸ—â€‹áž›áž¾â€‹áž‡áž½ážšâ€‹ážáŸ’áž˜áž¸)</"
+"em>"
+
+#: templates/mailbox/navbar.html:7
+msgid "All"
+msgstr "áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: templates/javascript/folders.js:13
+msgid ""
+"All messages in the following folder(s) will be downloaded into one MBOX "
+"file:"
+msgstr "ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹â€‹áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážáž¶áž„áž€áŸ’ážšáŸ„áž˜ áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž¶áž‰â€‹áž™áž€ážŠáŸ„áž™â€‹ážŠáž¶áž€áŸ‹â€‹áž‘áŸ…áž€áŸ’áž“áž»áž„â€‹áž¯áž€ážŸáž¶ážš MBOX áž˜áž½áž™Â áŸ”"
+
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
+msgid ""
+"All messages in your \"%s\" folder older than %s days will be permanently "
+"deleted."
+msgstr "ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž€áŸ’áž“áž»áž„â€‹ážáž \"%s\" ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážŠáŸ‚áž›â€‹áž…áž¶ážŸáŸ‹â€‹áž‡áž¶áž„ %s ážáŸ’áž„áŸƒ áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹áž…áŸ„áž›â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸÂ áŸ”"
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áž¶ážŸáŸ‹â€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹â€‹ážŠáŸ‚áž›â€‹áž…áž¶ážŸáŸ‹â€‹áž‡áž¶áž„ %s ážáŸ‚ áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹Â áŸ”"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
+msgid "All old sent-mail folders more than %s months old will be deleted."
+msgstr "ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹ ážŠáŸ‚áž›â€‹áž…áž¶ážŸáŸ‹â€‹áž‡áž¶áž„ %s ážáŸ‚ áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”Â áŸ”"
+
+#: acl.php:84
+#, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "ážŸáž·áž‘áŸ’áž’áž·â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž“áŸ…â€‹áž›áž¾â€‹ážáž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž™áž€â€‹áž…áŸáž‰â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾ \"%s\"Â áŸ”"
+
+#: lib/api.php:81
+msgid "Allow Folder Creation?"
+msgstr "áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážážÂ ?"
+
+#: filterprefs.php:98
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr "áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž€áŸ’áž”áž½áž“â€‹ážáž˜áŸ’ážšáž„â€‹áž€áŸ’áž“áž»áž„â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŽáž¶áž˜áž½áž™â€‹áž¬â€‹áž‘áŸÂ ?"
+
+#: lib/MIME/Viewer/alternative.php:111
+msgid "Alternative parts for this section:"
+msgstr "áž•áŸ’áž“áŸ‚áž€â€‹áž“áŸƒâ€‹áž‡áž˜áŸ’ážšáž¾ážŸ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž—áž¶áž‚â€‹áž“áŸáŸ‡Â áŸ–"
+
+#: config/prefs.php.dist:584
+msgid "Always"
+msgstr "áž‡áž¶áž“áž·áž…áŸ’áž…"
+
+#: config/prefs.php.dist:569
+msgid "Always save attachments"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶áž“áž·áž…áŸ’áž…"
+
+#: lib/Message.php:563
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™â€‹áž”áž¶áž“â€‹áž€áž¾ážâ€‹áž¡áž¾áž„ ážážŽáŸˆáž–áŸáž›â€‹áž”áŸ‰áž»áž“áž”áŸ‰áž„â€‹áž…áŸ’áž”áž½ážâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áŸáž‰Â áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAP áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™Â áŸ–"
+
+#: lib/Message.php:446
+msgid "An unknown error occured while creating the new note."
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹â€‹áž˜áž½áž™â€‹áž”áž¶áž“â€‹áž€áž¾ážáž¡áž¾áž„ ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž…áŸ†ážŽáž¶áŸ†â€‹ážáŸ’áž˜áž¸Â áŸ”"
+
+#: lib/Message.php:445
+msgid "An unknown error occured while creating the new task."
+msgstr "áž€áŸ†áž áž»ážŸâ€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹â€‹áž˜áž½áž™â€‹áž”áž¶áž“â€‹áž€áž¾ážâ€‹áž¡áž¾áž„ ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž—áž¶ážšáž€áž·áž…áŸ’áž…â€‹ážáŸ’áž˜áž¸Â áŸ”"
+
+#: message.php:472 mailbox.php:818 mailbox.php:971
+#: templates/message/navbar_navigate.html:9 templates/mailbox/navbar.html:15
+#: templates/mailbox/navbar.html:30 templates/mailbox/legend.html:4
+msgid "Answered"
+msgstr "áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: search.php:329
+msgid "Answered messages"
+msgstr "ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: mailbox.php:351
+msgid "Apply Filters"
+msgstr "áž¢áž“áž»ážœážáŸ’ážâ€‹ážáž˜áŸ’ážšáž„"
+
+#: mailbox.php:351
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "áž¢áž“áž»ážœážáŸ’ážâ€‹ážáž˜áŸ’ážšáž„â€‹áž‘áŸ… %s"
+
+#: filterprefs.php:96
+msgid "Apply filter rules upon logging on?"
+msgstr "áž¢áž“áž»ážœážáŸ’ážâ€‹áž€áŸ’áž”áž½áž“â€‹ážáž˜áŸ’ážšáž„â€‹ áž¢áž¶ážŸáŸ’ážšáŸáž™â€‹áž›áž¾â€‹áž€áž¶ážšâ€‹áž…áž¼áž›Â ?"
+
+#: filterprefs.php:97
+msgid "Apply filter rules whenever Inbox is displayed?"
+msgstr "áž¢áž“áž»ážœážáŸ’ážâ€‹áž€áŸ’áž”áž½áž“â€‹ážáž˜áŸ’ážšáž„ áž–áŸáž›â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž›Â ?"
+
+#: mailbox.php:361
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž›áž»áž”â€‹áž“áž·áž™áž˜áž“áŸáž™â€‹ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážâ€‹áž“áŸáŸ‡â€‹áž¬Â ?"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+msgid "Are you sure you want to delete this public key?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž›áž»áž”â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹áž“áŸáŸ‡â€‹áž¬Â ?"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž›áž»áž”â€‹áž‚áž¼â€‹áž€áž¼áž“ážŸáŸ„â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž¬Â ? (áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹áž‡áž¶â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸ!)"
+
+#: templates/compose/javascript.inc:6
+msgid "Are you sure you want to do this?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž’áŸ’ážœáž¾â€‹ážŠáž¼áž…â€‹áž“áŸáŸ‡â€‹áž¬Â ?"
+
+#: message.php:537 templates/mailbox/javascript.inc:80
+msgid "Are you sure you wish to PERMANENTLY delete these messages?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸâ€‹áž¬â€‹Â ?â€‹"
+
+#: lib/MIME/Contents.php:242
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž›áž»áž”â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸâ€‹áž¬Â ?"
+
+#: mailbox.php:464
+msgid "Are you sure you wish to empty this folder?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážážâ€‹áž“áŸáŸ‡â€‹áž¬Â ?"
+
+#: lib/IMP.php:787
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž¬Â ?"
+
+#: lib/IMP.php:777
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž¬Â ?"
+
+#: mailbox.php:463
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸâ€‹áž¬Â ?"
+
+#: templates/message/javascript.inc:36 templates/mailbox/javascript.inc:91
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹ážšáž¶áž™â€‹áž€áž¶ážšážŽáŸâ€‹áž¢áŸ†áž–áž¸â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáž¶â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž›áŸ’áž¢â€‹áž¬Â ?"
+
+#: templates/message/javascript.inc:31 templates/mailbox/javascript.inc:86
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹ážšáž¶áž™â€‹áž€áž¶ážšážŽáŸâ€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáž¶ áž‡áž¶â€‹ážŸáž¶ážšáž¥ážâ€‹áž”áž¶áž“áž€áž¶ážšâ€‹áž¬Â ?"
+
+#: config/prefs.php.dist:927
+msgid "Arrival Time"
+msgstr "áž–áŸáž›â€‹ážœáŸáž›áž¶â€‹áž˜áž€â€‹ážŠáž›áŸ‹"
+
+#: config/prefs.php.dist:942
+msgid "Ascending"
+msgstr "áž¡áž¾áž„"
+
+#: config/prefs.php.dist:583
+msgid "Ask"
+msgstr "ážŸáž½ážš"
+
+#: compose.php:1300
+msgid "Attach Files"
+msgstr "áž—áŸ’áž‡áž¶áž”áŸ‹â€‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž‡áž¶áž˜áž½áž™"
+
+#: compose.php:1292
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶áž˜áž½áž™â€‹áž“áž¼ážœâ€‹áž…áŸ’áž”áž¶áž”áŸ‹â€‹áž…áž˜áŸ’áž›áž„â€‹áž˜áž½áž™â€‹áž“áŸƒâ€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ áž‘áŸ…â€‹ážŸáž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â ?"
+
+#: lib/MIME/Viewer/tnef.php:111
+msgid "Attached File:"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶áž˜áž½áž™Â áŸ–"
+
+#: lib/Compose.php:1591 lib/Compose.php:1687
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ \"%s\" ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶áž˜áž½áž™ áž›áž¾ážŸâ€‹áž€áž˜áŸ’ážšáž·ážâ€‹áž‘áŸ†áž áŸ†â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ” áž¯áž€ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:377
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹ áž‚ážºâ€‹áž‡áž¶â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž˜áž½áž™â€‹áž‘áŸ…â€‹ážŸáŸ†ážŽáž¾â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹ážŠáŸ‚áž›áž¢áŸ’áž“áž€áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾Â áŸ”"
+
+#: mailbox.php:983 templates/compose/javascript.inc:242
+#: templates/mailbox/legend.html:14 templates/compose/compose.html:269
+#: templates/compose/compose.html:325
+msgid "Attachment"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹"
+
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ %s ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”Â áŸ”"
+
+#: lib/Compose.php:2256
+msgid "Attachment Information"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹"
+
+#: lib/Message.php:524 lib/Compose.php:640
+msgid "Attachment stripped: Original attachment type"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž…áŸ’áž”áž¼ážâ€‹áž™áž€â€‹áž…áŸáž‰Â áŸ– áž”áŸ’ážšáž—áŸáž‘â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŠáž¾áž˜"
+
+#: compose.php:1241 lib/Compose.php:2224 templates/compose/compose.html:242
+msgid "Attachments"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹"
+
+#: lib/MIME/Viewer/itip.php:678
+msgid "Attendees"
+msgstr "áž¢áŸ’áž“áž€áž…áž¼áž›ážšáž½áž˜"
+
+#: lib/MIME/Viewer/notification.php:53
+msgid "Attention"
+msgstr "áž€áž¶ážšâ€‹áž”áŸ’ážšáž»áž„â€‹áž”áŸ’ážšáž™áŸážáŸ’áž“"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr "Auth_imp: ážšáž€â€‹áž˜áž·áž“â€‹ážƒáž¾áž‰â€‹áž•áŸ’áž“áŸ‚áž€â€‹áž”áž“áŸ’ážáŸ‚áž˜ IMAP ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœáž€áž¶ážšâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
+"áž”áž„áŸ’áž áž¶áž‰â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž€áŸ’áž“áž»áž„â€‹ážŸáž¶ážš HTML ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž· áž–áŸáž›â€‹áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‰áž¾â€‹ážŸáŸ’ážáž·ážâ€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážšáž”ážŸáŸ‹â€‹ážáŸ’áž‰áž»áŸ†Â ?"
+
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
+msgstr "ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“"
+
+#: lib/MIME/Viewer/itip.php:714
+msgid "Awaiting Response"
+msgstr "áž€áŸ†áž–áž»áž„â€‹ážšáž„áž…áž¶áŸ†â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: message.php:510
+#, php-format
+msgid "Bac_k to %s"
+msgstr "_KážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ… %s "
+
+#: message.php:510 thread.php:135
+#, php-format
+msgid "Back to %s"
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ… %s"
+
+#: thread.php:132
+msgid "Back to Multiple Message View Index"
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž›áž·áž”áž·áž€áŸ’ážšáž˜â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹ážŸáž¶ážšâ€‹áž…áŸ’ážšáž¾áž“"
+
+#: thread.php:130
+msgid "Back to Thread Display"
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž€áž¶ážšâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž‡áž¶â€‹ážáŸ’ážŸáŸ‚â€‹ážŸáŸ’ážšáž¡áž¶áž™"
+
+#: lib/IMAP/Client.php:573
+#, php-format
+msgid "Bad login name or password."
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž…áž¼áž› áž¬ áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž˜áž·áž“â€‹áž›áŸ’áž¢Â áŸ”"
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "ážŸáŸ†ážŽáž¾â€‹áž˜áž·áž“â€‹áž›áŸ’áž¢ áž¬ áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœÂ áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™ážáž”â€‹ážáž¶Â áŸ– %s"
+
+#: lib/IMAP/Client.php:577
+#, php-format
+msgid "Bad request: %s."
+msgstr "ážŸáŸ†ážŽáž¾â€‹áž˜áž·áž“â€‹áž›áŸ’áž¢Â áŸ– %sÂ áŸ”"
+
+#: message.php:235 lib/Search.php:615 templates/contacts/contacts.html:42
+#: templates/login/recompose.html:32
+msgid "Bcc"
+msgstr "áž›áž¶áž€áŸ‹"
+
+#: lib/MIME/Viewer/status.php:163
+msgid "Below is the raw text of the status information message."
+msgstr "ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž†áŸ…ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž“áŸƒâ€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹ážŸáŸ’ážáž¶áž“áž—áž¶áž–Â áŸ”"
+
+#: config/prefs.php.dist:706
+msgid "Below the message text"
+msgstr "ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜â€‹áž¢ážáŸ’ážáž”áž‘â€‹ážŸáž¶ážš"
+
+#: message.php:565 mailbox.php:490
+msgid "Blacklist"
+msgstr "áž”áž‰áŸ’áž‡áž¸â€‹ážáŸ’áž˜áŸ…"
+
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr "áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž€áŸ’áž“áž»áž„â€‹ážŸáž¶ážš HTML áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž–áž½áž€â€‹ážœáž¶â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†â€‹áž‡áž¶â€‹áž–áž·ážŸáŸážŸÂ ?"
+
+#: lib/Search.php:623
+msgid "Body"
+msgstr "ážáž½"
+
+#: search.php:326 search.php:331 search.php:336 search.php:341
+msgid "Both"
+msgstr "áž‘áž¶áŸ†áž„áž–áž¸ážš"
+
+#: config/prefs.php.dist:696
+msgid "Both Header Listing and Body of Message"
+msgstr "áž‘áž¶áŸ†áž„â€‹áž€áž¶ážšâ€‹ážšáž¶áž™â€‹áž”áž‹áž˜áž€ážáž¶ áž“áž·áž„ ážáž½â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: compose.php:1188
+msgid "C_harset"
+msgstr "_HážŸáŸ†ážŽáž»áŸ†â€‹ážáž½â€‹áž¢áž€áŸ’ážŸážš "
+
+#: search.php:312
+msgid "Calendar"
+msgstr "áž”áŸ’ážšážáž·áž‘áž·áž“"
+
+#: lib/Fetchmail/imap.php:155
+msgid "Can not connect to the remote mail server."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž†áŸ’áž„áž¶áž™Â áŸ”"
+
+#: lib/Fetchmail/imap.php:153
+msgid "Can not connect to the remote mail server: "
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž†áŸ’áž„áž¶áž™Â áŸ–"
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž„áŸ’áž áž¶áž‰ - ážšáž€â€‹ážƒáž¾áž‰â€‹ážáŸ‚ %s áž“áŸƒâ€‹áž•áŸ’áž“áŸ‚áž€ %s ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡ áž€áŸ’áž“áž»áž„â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“Â áŸ”"
+
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/pgp/passphrase.inc:32 templates/contacts/contacts.html:74
+#: templates/folders/folders_confirm.html:23 templates/folders/import.html:17
+#: templates/saveimage/saveimage.html:19 templates/compose/spelling.html:60
+#: templates/pgp/import_key.html:49
+msgid "Cancel"
+msgstr "áž”áŸ„áŸ‡áž”áž„áŸ‹"
+
+#: templates/compose/redirect.html:78 templates/compose/compose.html:25
+#: templates/compose/compose.html:208
+msgid "Cancel Message"
+msgstr "áž”áŸ„áŸ‡áž”áž„áŸ‹â€‹ážŸáž¶ážš"
+
+#: templates/compose/javascript.inc:6
+msgid "Cancelling this message will permanently discard its contents."
+msgstr "áž”áŸ„áŸ‡áž”áž„áŸ‹â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡ áž“áž¹áž„â€‹áž”áŸ„áŸ‡áž…áŸ„áž›â€‹áž˜áž¶ážáž·áž€áž¶â€‹ážšáž”ážŸáŸ‹â€‹ážœáž¶â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸÂ áŸ”"
+
+#: message.php:234 lib/Search.php:611 templates/contacts/contacts.html:41
+#: templates/login/recompose.html:23
+msgid "Cc"
+msgstr "áž…áž˜áŸ’áž›áž„"
+
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áž¶ážšâ€‹áž“áž¶áŸ†áž…áž¼áž›â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹áž¡áž¾áž™Â áŸ” áž€áž¶ážšâ€‹áž•áŸ’áž‘áž»áž€â€‹áž¯áž€ážŸáž¶ážšâ€‹áž¡áž¾áž„ áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž¡áž¾áž™â€‹áž›áž¾â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹"
+"áž“áŸáŸ‡Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:696
+msgid "Chair Person"
+msgstr "áž”áŸ’ážšáž’áž¶áž“"
+
+#: templates/compose/spelling.html:34
+msgid "Change"
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážš"
+
+#: templates/compose/spelling.html:35
+msgid "Change All"
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹"
+
+#: templates/acl/acl.inc:92
+msgid "Change Folder"
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹ážáž"
+
+#: config/prefs.php.dist:113
+msgid ""
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
+msgstr ""
+"áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹ážŠáž¼áž…áž‡áž¶ ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“â€‹áž”áŸ‰áž»áž“áŸ’áž˜áž¶áž“â€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹ážƒáž¾áž‰â€‹áž›áž¾â€‹áž‘áŸ†áž–áŸážšâ€‹áž“áž·áž˜áž½áž™áŸ— áž“áž·áž„ ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážáž˜áŸ’ážšáŸ€áž”â€‹áž™áŸ‰áž¶áž„â€‹"
+"ážŠáž¼áž…áž˜áŸ’ážáŸáž…Â áŸ”"
+
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážš áž“áž·áž„ ážážÂ áŸ”"
+
+#: config/prefs.php.dist:15
+msgid ""
+"Change the name, address, and signature that people see when they read and "
+"reply to your email."
+msgstr ""
+"áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡ áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ áž“áž·áž„ áž ážáŸ’ážáž›áŸážáž¶â€‹ážŠáŸ‚áž›â€‹áž˜áž“áž»ážŸáŸ’ážŸâ€‹ážƒáž¾áž‰â€‹ áž–áŸáž›â€‹áž–áž½áž€â€‹áž‚áŸâ€‹áž¢áž¶áž“ áž“áž·áž„ áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›â€‹ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: config/prefs.php.dist:835
+msgid "Characters to display:"
+msgstr "ážáž½â€‹áž¢áž€áŸ’ážŸážšâ€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž„áŸ’áž áž¶áž‰Â áŸ–"
+
+#: templates/folders/actions.html:17
+msgid "Check Folder(s) for New Mail"
+msgstr "áž–áž·áž“áž·ážáŸ’áž™â€‹áž˜áž¾áž›â€‹ážážâ€‹ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: folders.php:286 mailbox.php:640
+msgid "Check _All/None"
+msgstr "_Aáž’áž¸áž€â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹/áž˜áž·áž“â€‹áž’áž¸áž€â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ "
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr "áž–áž·áž“áž·ážáŸ’áž™â€‹áž˜áž¾áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹â€‹áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž–áž¸Â áŸ–"
+
+#: config/prefs.php.dist:464
+msgid "Check spelling before sending a message?"
+msgstr "áž–áž·áž“áž·ážáŸ’áž™â€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’ áž˜áž»áž“â€‹áž–áŸáž›â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšáž˜áž½áž™Â ?"
+
+#: templates/folders/actions.html:6
+msgid "Choose Action"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž¢áŸ†áž–áž¾"
+
+#: config/servers.php.dist:179
+msgid "Choose a mail server:"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ–"
+
+#: templates/compose/compose.html:64
+msgid "Choose a match or edit the address to the right:"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹ážŠáŸ†ážŽáž¼áž…â€‹áž˜áž½áž™ áž¬ áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž“áŸ…â€‹ážáž¶áž„â€‹ážŸáŸ’ážŠáž¶áŸ†Â áŸ–"
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áŸ’ážšáž¾ áž–áŸáž›â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“Â áŸ”"
+
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž›áŸ†ážŠáž¶áž”áŸ‹â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€ áž–áŸáž›â€‹áž–áž„áŸ’ážšáž¸áž€â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“Â áŸ”"
+
+#: lib/MIME/Viewer/images.php:115
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr "áž…áž»áž… %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž¯áž€ážŸáž¶ážšâ€‹ážšáž¼áž”áž—áž¶áž–â€‹áž‘áŸ…â€‹áž‡áž¶â€‹áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™â€‹ážŠáŸ‚áž›â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž¢áž¶áž…áž”áž„áŸ’áž áž¶áž‰Â áŸ”"
+
+#: lib/MIME/Viewer/images.php:104
+#, php-format
+msgid "Click %s to download the image."
+msgstr "áž…áž»áž… %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž‘áž¶áž‰áž™áž€ážšáž¼áž”áž—áž¶áž–Â áŸ”"
+
+#: lib/Filter.php:102
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr "áž…áž»áž… %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹áž‘áŸ†áž–áŸážšâ€‹áž‚áŸ’ážšáž”áŸ‹â€‹áž‚áŸ’ážšáž„ %sÂ áŸ”â€‹"
+
+#: lib/MIME/Viewer/images.php:164
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr "áž…áž»áž… %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž˜áž¾áž›â€‹ážšáž¼áž”áž—áž¶áž–â€‹ážáž¼áž…â€‹ážšáž”ážŸáŸ‹â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:423
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "áž…áž»áž… %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž˜áž¾áž›â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž•áŸ’ážŸáŸáž„Â áŸ”"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "áž…áž»áž… %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž˜áž¾áž›â€‹áž•áŸ’áž“áŸ‚áž€â€‹áž…áŸ’ážšáž¾áž“â€‹áž•áŸ’áž“áŸ‚áž€ áž¬ áž•áŸ’áž“áŸ‚áž€â€‹áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‚áŸ’áž“áž¶â€‹áž“áŸáŸ‡â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž•áŸ’ážŸáŸáž„Â áŸ”"
+
+#: templates/prefs/sourceselect.inc:321
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"áž…áž»áž…â€‹áž›áž¾â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž…áŸ†ážŽáŸ„áž˜â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž“áž·áž„ áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž˜áž€â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž€áŸ’ážšáž¡áž¶â€‹"
+"áž‘áž‘áž¹áž„â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr "áž…áž»áž… ážŠáž¾áž˜áŸ’áž”áž¸â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹ážšáž”ážŸáŸ‹ S/MIME áž“áŸƒ %s áž€áŸ’áž“áž»áž„â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: config/prefs.php.dist:961
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr "áž…áž»áž…â€‹áž›áž¾â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ áž“áž¹áž„â€‹ážáŸ‚áž„â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™â€‹áž‘áŸ…â€‹áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‰áž¾"
+
+#: config/prefs.php.dist:962
+msgid "Clicking on the address will open the message to be read"
+msgstr "áž…áž»áž…â€‹áž›áž¾â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ áž“áž¹áž„â€‹áž”áž¾áž€â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž¢áž¶áž“"
+
+#: templates/fetchmail/fetchmail.inc:28
+msgid "Close"
+msgstr "áž”áž·áž‘"
+
+#: compose.php:150
+msgid "Close this window"
+msgstr "áž”áž·áž‘â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž“áŸáŸ‡"
+
+#: lib/IMAP/Tree.php:425
+msgid "Closed Folder"
+msgstr "ážážâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž·áž‘"
+
+#: lib/IMAP/Tree.php:448
+msgid "Collapse"
+msgstr "ážœáŸáž‰"
+
+#: folders.php:304
+msgid "Collapse All"
+msgstr "ážœáŸáž‰â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: folders.php:304
+msgid "Collapse All Folders"
+msgstr "ážœáŸáž‰â€‹ážážâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: lib/IMAP/Tree.php:448
+msgid "Collapse Folder"
+msgstr "ážœáŸáž‰â€‹ážáž"
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr "áž‘áŸ’ážšáž“áž·áž…áž”áž„áŸ’áž áž¶áž‰â€‹â€‹áž–ážŽáŸŒÂ áŸ–"
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž¢áž’áž·áž”áŸ’áž”áž¶áž™"
+
+#: lib/MIME/Viewer/itip.php:762
+msgid "Completed"
+msgstr "áž‘áž¶áŸ†áž„ážŸáŸ’ážšáž»áž„"
+
+#: compose.php:149
+msgid "Compose another message"
+msgstr "ážáŸ‚áž„â€‹ážŸáž¶ážšâ€‹áž˜áž½áž™â€‹áž•áŸ’ážŸáŸáž„"
+
+#: config/prefs.php.dist:435
+msgid "Compose messages in a separate window?"
+msgstr "ážáŸ‚áž„â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž•áŸ’ážŸáŸáž„â€‹áž¬Â ?"
+
+#: config/prefs.php.dist:444
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr "ážáŸ‚áž„â€‹ážŸáž¶ážšâ€‹áž‡áž¶áž˜áž½áž™ HTML GUI ážŠáŸ„áž™â€‹áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜ (áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸâ€‹áž“áŸáŸ‡)Â ?"
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr "áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶â€‹ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ážáž¶ â€‹ážáž¾â€‹ážŸáž¶ážšâ€‹áž”áŸ‰áž»áž“áŸ’áž˜áž¶áž“â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž„áŸ’áž áž¶áž‰Â áŸ”"
+
+#: config/prefs.php.dist:98
+msgid "Configure mail preview options."
+msgstr "áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶â€‹ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž˜áž¾áž›â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž‡áž¶â€‹áž˜áž»áž“Â áŸ”"
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž˜áŸ’áž›áž¶áž€áŸ‹â€‹áž…áŸ„áž›â€‹ážŠáŸ„áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAPÂ áŸ”"
+
+#: lib/Fetchmail/imap.php:188
+msgid "Connection to server failed"
+msgstr "áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™"
+
+#: config/prefs.php.dist:144
+#, php-format
+msgid "Control PGP support for %s."
+msgstr "ážáŸ’ážšáž½ážâ€‹áž–áž·áž“áž·ážáŸ’áž™â€‹áž€áž¶ážšáž‚áž¶áŸ†áž‘áŸ’ážš PGP ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ %sÂ áŸ”"
+
+#: config/prefs.php.dist:153
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr "ážáŸ’ážšáž½ážâ€‹áž–áž·áž“áž·ážáŸ’áž™áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš S/MIME ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ %sÂ áŸ”"
+
+#: config/prefs.php.dist:122
+msgid "Control options relating to messages searching."
+msgstr "áž”áž‰áŸ’áž‡áž¶â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážŠáŸ‚áž›â€‹áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‘áŸ…â€‹áž“áž¹áž„â€‹áž€áž¶ážšâ€‹ážŸáŸ’ážœáŸ‚áž„ážšáž€â€‹ážŸáž¶ážšÂ áŸ”"
+
+#: config/prefs.php.dist:90
+msgid ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+msgstr "ážáŸ’ážšáž½ážâ€‹áž–áž·áž“áž·ážáŸ’áž™ áž–áŸáž›â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž–áž·áž“áž·ážáŸ’áž™â€‹áž˜áž¾áž› áž“áž·áž„ ážáž¶â€‹ážáž¾â€‹ážáŸ’ážšáž¼ážœâ€‹áž‡áž¼áž“â€‹ážŠáŸ†ážŽáž¹áž„â€‹ážŠáž›áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž¬â€‹áž¢ážáŸ‹ áž–áŸáž›â€‹ážœáž¶â€‹áž˜áž€â€‹ážŠáž›áŸ‹Â áŸ”"
+
+#: config/prefs.php.dist:686
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "áž”áž˜áŸ’áž›áŸ‚áž„â€‹ážŸáž‰áŸ’áž‰áž¶â€‹áž¢áž¶ážšáž˜áŸ’áž˜ážŽáŸâ€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœâ€‹â€‹ážáž¶áž˜â€‹áž¢ážáŸ’ážáž”áž‘ áž‘áŸ…â€‹áž‡áž¶â€‹ážŸáž‰áŸ’áž‰áž¶â€‹áž¢áž¶ážšáž˜áŸ’áž˜ážŽáŸâ€‹áž€áŸ’ážšáž¶áž áŸ’ážœáž·áž€Â ?"
+
+#: message.php:504 message.php:696 mailbox.php:420 mailbox.php:998
+msgid "Copy"
+msgstr "áž…áž˜áŸ’áž›áž„"
+
+#: message.php:504 message.php:696 mailbox.php:420 mailbox.php:998
+msgid "Copy to folder"
+msgstr "áž…áž˜áŸ’áž›áž„â€‹áž‘áŸ…â€‹ážáž"
+
+#: templates/compose/spelling.html:28
+msgid "Correct"
+msgstr "áž€áŸ‚"
+
+#: templates/compose/spelling.html:82
+msgid "Corrected Text"
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž€áŸ‚"
+
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž‰áŸ’áž…áž”áŸ‹â€‹ážŸáŸ†ážŽáž¾Â áŸ” áž˜áž¼áž›áž áŸážáž»â€‹áž‚ážºÂ áŸ– %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž…áž»áž„â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™ VFSÂ áŸ– %s"
+
+#: lib/Message.php:715
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž–áž¸ %sÂ áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™â€‹ážáž¶Â áŸ– %s"
+
+#: lib/Session.php:322
+msgid "Could not execute maintenance operations."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž”áŸ’ážšážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹ážáŸ†áž áŸ‚áž‘áž¶áŸ†Â áŸ”"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážŸáŸ’ážšáž„áŸ‹â€‹áž…áŸáž‰â€‹áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾ážŸáž»áŸ† áž–áž¸â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ MS-TNEFÂ áŸ”"
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážŸáŸ’ážšáž„áŸ‹â€‹áž…áŸáž‰â€‹áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†áž–áž¸áž”áŸážŽáŸ’ážŽážŸáž¶ážš ZipÂ áŸ”"
+
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¾áž€â€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAP áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ” %sÂ áŸ– %sÂ áŸ”"
+
+#: lib/Session.php:270
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž‘áŸ…â€‹áž™áž€â€‹áž–áŸážáŸŒáž˜áž¶áž“ namespace áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAPÂ áŸ”"
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
+msgid "Create"
+msgstr "áž”áž„áŸ’áž€áž¾áž"
+
+#: templates/folders/actions.html:8
+msgid "Create Folder"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹ážáž"
+
+#: templates/pgp/pgp.inc:137
+msgid "Create Keys"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹áž€áž¼áž“ážŸáŸ„"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹áž‚ážŽáž“áž¸â€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
+msgid "Create a new drafts folder"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„â€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™"
+
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
+msgid "Create a new sent mail folder"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™"
+
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
+msgid "Create a new trash folder"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™"
+
+#: config/prefs.php.dist:129
+msgid ""
+"Create filtering rules to organize your incoming mail, sort it into folders, "
+"and delete spam."
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹áž€áŸ’áž”áž½áž“â€‹ážáž˜áŸ’ážšáž„ ážŠáž¾áž˜áŸ’áž”áž¸â€‹ážšáŸ€áž”â€‹áž…áŸ†â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž…áž¼áž›â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážáž˜áŸ’ážšáŸ€áž”â€‹ážœáž¶â€‹áž…áž¼áž›â€‹áž€áŸ’áž“áž»áž„â€‹ážáž áž“áž·áž„ áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšÂ áŸ”"
+
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: config/prefs.php.dist:450
+msgid "Create stationery and form responses."
+msgstr "áž”áž„áŸ’áž€áž¾ážâ€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš áž áž¾áž™â€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™ážáž”Â áŸ”"
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr "áž€áž¶ážšâ€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“â€‹áž‘áŸ… %s"
+
+#: config/prefs.php.dist:106
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž‚ážŽáž“áž¸â€‹ážáž¶áž˜â€‹áž”áŸ†ážŽáž„ ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž–áž¸áž‚ážŽáž“áž¸â€‹áž•áŸ’ážŸáŸáž„Â áŸ”"
+
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr "áž”áŸ’ážáž¼ážšâ€‹â€‹â€‹ážšáž”áŸ€áž”â€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšâ€‹ážáž¶áž˜â€‹áž”áŸ†ážŽáž„Â áŸ”"
+
+#: config/prefs.php.dist:40
+#, php-format
+msgid "Customize tasks to run upon logon to %s."
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž—áž¶ážšáž€áž·áž…áŸ’áž…â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹ážšážáŸ‹â€‹ážáž¶áž˜â€‹áž”áŸ†ážŽáž„ áž¢áž¶ážŸáŸ’ážšáŸáž™â€‹áž›áž¾â€‹áž€áž¶ážšâ€‹áž…áž¼áž›â€‹áž‘áŸ…â€‹ %sÂ áŸ”"
+
+#: mailbox.php:565
+msgid "Dat_e"
+msgstr "_Eáž€áž¶áž›áž”ážšáž·áž…áŸ’áž†áŸáž‘ "
+
+#: message.php:231 thread.php:150
+msgid "Date"
+msgstr "áž€áž¶áž›áž”ážšáž·áž…áŸ’áž†áŸáž‘"
+
+#: lib/MIME/Viewer/itip.php:750
+msgid "Declined"
+msgstr "áž”áž¶áž“â€‹áž”ážŠáž·ážŸáŸáž’"
+
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr "áž”áž¶áž“â€‹áž”ážŠáž·ážŸáŸáž’Â áŸ– "
+
+#: config/prefs.php.dist:549
+msgid "Default"
+msgstr "áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "ážœáž¶áž›â€‹ážŸáŸ’ážœáŸ‚áž„ážšáž€â€‹áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜"
+
+#: config/prefs.php.dist:934
+msgid "Default sorting criteria:"
+msgstr "áž›áž€áŸ’ážážŽáŸˆâ€‹ážœáž·áž“áž·áž…áŸ’áž†áŸáž™â€‹ážáž˜áŸ’ážšáŸ€áž”â€‹áž›áŸ†áž“áž¶áŸ†â€‹ážŠáž¾áž˜Â áŸ–"
+
+#: config/prefs.php.dist:944
+msgid "Default sorting direction:"
+msgstr "áž‘áž·ážŸâ€‹ážáž˜áŸ’ážšáŸ€áž”â€‹áž›áŸ†áž“áž¶áŸ†â€‹ážŠáž¾áž˜Â áŸ–"
+
+#: lib/MIME/Viewer/itip.php:758
+msgid "Delegated"
+msgstr "áž”áž¶áž“â€‹áž•áŸ’ážáž›áŸ‹â€‹ážŸáž·áž‘áž·áŸ’áž’"
+
+#: message.php:537 mailbox.php:463 mailbox.php:466
+#: templates/fetchmail/manage.inc:68 templates/smime/smime.inc:25
+#: templates/pgp/pgp.inc:27 lib/IMAP/Tree.php:412
+#: templates/contacts/contacts.html:64
+msgid "Delete"
+msgstr "áž›áž»áž”"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr "áž›áž»áž”â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ %s"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr "áž›áž»áž”â€‹áž€áž¼áž“ážŸáŸ„â€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“"
+
+#: templates/folders/actions.html:11
+msgid "Delete Folder(s)"
+msgstr "áž›áž»áž”â€‹ážážâ€‹"
+
+#: templates/folders/folders_confirm.html:22
+msgid "Delete Selected Folders"
+msgstr "áž›áž»áž”â€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸ"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "áž›áž»áž”â€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: lib/IMAP/Tree.php:412
+msgid "Delete Virtual Folder"
+msgstr "áž›áž»áž”â€‹ážážâ€‹áž“áž·áž˜áž·áŸ’áž˜áž"
+
+#: mailbox.php:361
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "áž›áž»áž”â€‹áž“áž·áž™áž˜áž“áŸáž™â€‹ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážâ€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ %s"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr "áž›áž»áž”â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž†áŸ’áž„áž¶áž™Â ?"
+
+#: lib/MIME/Viewer/itip.php:619
+msgid "Delete from my calendar"
+msgstr "áž›áž»áž”â€‹áž–áž¸â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹ážšáž”ážŸáŸ‹â€‹ážáŸ’áž‰áž»áŸ†"
+
+#: config/prefs.php.dist:369
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "áž›áž»áž”â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áž¶ážŸáŸ‹ áž“áŸ…â€‹áž–áŸáž›â€‹áž…áž¶áž”áŸ‹â€‹áž•áŸ’ážáž¾áž˜â€‹áž“áŸƒâ€‹ážáŸ‚áž¬Â ?"
+
+#: config/prefs.php.dist:351
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "áž›áž»áž”â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹áž…áž¶ážŸáŸ‹ áž“áŸ…â€‹áž–áŸáž›â€‹áž…áž¶áž”áŸ‹â€‹áž•áŸ’ážáž¾áž˜â€‹áž“áŸƒâ€‹ážáŸ‚â€‹áž¬Â ?"
+
+#: config/prefs.php.dist:617
+msgid "Delete spam messages"
+msgstr "áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš"
+
+#: templates/compose/compose.html:337
+msgid "Delete?"
+msgstr "áž›áž»áž”Â ?"
+
+#: message.php:475 mailbox.php:841 mailbox.php:973
+#: templates/mailbox/navbar.html:17 templates/mailbox/navbar.html:33
+#: templates/mailbox/legend.html:6
+msgid "Deleted"
+msgstr "áž”áž¶áž“â€‹áž›áž»áž”"
+
+#: search.php:339
+msgid "Deleted messages"
+msgstr "ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž›áž»áž”"
+
+#: compose.php:303
+#, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "áž”áž¶áž“â€‹áž›áž»áž”â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ \"%s\"Â áŸ”"
+
+#: config/prefs.php.dist:80
+msgid "Deleting and Moving Messages"
+msgstr "áž€áŸ†áž–áž»áž„â€‹áž›áž»áž” áž“áž·áž„ áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸â€‹ážŸáž¶ážš"
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Deny request"
+msgstr "áž”ážŠáž·ážŸáŸáž’â€‹ážŸáŸ†ážŽáž¾"
+
+#: lib/MIME/Viewer/itip.php:542
+msgid "Deny request for free/busy information"
+msgstr "áž”ážŠáž·ážŸáŸáž’â€‹ážŸáŸ†ážŽáž¾â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž–áŸážáŸŒáž˜áž¶áž“ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹"
+
+#: config/prefs.php.dist:943
+msgid "Descending"
+msgstr "áž…áž»áŸ‡"
+
+#: lib/MIME/Viewer/itip.php:666
+msgid "Description"
+msgstr "áž–áž·áž–ážŽáŸŒáž“áž¶"
+
+#: templates/compose/compose.html:331
+msgid "Description:"
+msgstr "áž–áž·áž–ážŽáŸŒáž“áž¶Â áŸ–"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·áž"
+
+#: compose.php:315
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹ \"%s\" áž¡áž¾áž™ ážŠáŸ„áž™â€‹ážŸáž¶ážšâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž‘áž‘áŸÂ áŸ”"
+
+#: config/prefs.php.dist:677
+msgid "Dim signatures?"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹áž–áž·áž”áž¶áž€â€‹áž˜áž¾áž›â€‹áž¬Â ?"
+
+#: templates/contacts/contacts.html:56
+msgid "Display"
+msgstr "áž”áž„áŸ’áž áž¶áž‰"
+
+#: config/prefs.php.dist:480
+msgid "Display confirmation after sending a message?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž€áž¶ážšâ€‹áž¢áŸ‡áž¢áž¶áž„ áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž–áž¸áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšáž˜áž½áž™Â ?"
+
+#: config/prefs.php.dist:695
+msgid "Display in Body of Message"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž€áŸ’áž“áž»áž„â€‹ážáž½â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: config/prefs.php.dist:804
+msgid "Display pop-up notification of new mail?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž€áž¶ážšâ€‹â€‹áž‡áž¼áž“ážŠáŸ†ážŽáž¹áž„â€‹ážŠáŸ‚áž›â€‹áž›áŸáž…áž¡áž¾áž„â€‹ážšáž”ážŸáŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸Â ?"
+
+#: config/prefs.php.dist:770
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážáŸ†ážŽ \"ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš\" áž€áŸ’áž“áž»áž„â€‹ážšáž”áž¶ážšâ€‹áž˜áŸ‰ážºáž“áž»áž™Â ?"
+
+#: config/prefs.php.dist:762
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážáŸ†ážŽ \"ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážŸáŸ†ážšáž¶áž˜\" áž€áŸ’áž“áž»áž„â€‹ážšáž”áž¶ážšâ€‹áž˜áŸ‰ážºáž“áž»áž™Â ?"
+
+#: templates/compose/compose.html:322
+msgid "Disposition:"
+msgstr "áž…ážšáž·ážÂ áŸ–"
+
+#: templates/search/search.html:68
+msgid "Do NOT match"
+msgstr "áž˜áž·áž“â€‹áž•áŸ’áž‚áž¼áž•áŸ’áž‚áž„"
+
+#: templates/folders/actions.html:18
+msgid "Do Not Check Folder(s) for New Mail"
+msgstr "áž€áž»áŸ†â€‹áž–áž·áž“áž·ážáŸ’áž™â€‹áž˜áž¾áž›â€‹ážáž ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: config/prefs.php.dist:963
+msgid "Do not generate a link in the From: column"
+msgstr "áž€áž»áŸ†â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážáŸ†ážŽâ€‹áž˜áž½áž™â€‹áž€áŸ’áž“áž»áž„â€‹áž‡áž½ážšâ€‹ážˆážšâ€‹ \"áž–áž¸Â áŸ–\""
+
+#: lib/IMP.php:958
+msgid "Do you want to open that folder?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž”áž¾áž€â€‹ážážâ€‹áž“áŸ„áŸ‡â€‹áž¬Â ?"
+
+#: login.php:355
+msgid "Don't have an account? Sign up."
+msgstr "áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž‚ážŽáž“áž¸Â ? ážŸáž¼áž˜â€‹áž…áž»áŸ‡ážˆáŸ’áž˜áŸ„áŸ‡Â áŸ”"
+
+#: templates/compose/spelling.html:66
+msgid "Done"
+msgstr "áž’áŸ’ážœáž¾â€‹ážšáž½áž…"
+
+#: lib/MIME/Contents.php:219
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr "áž‘áž¶áž‰áž™áž€ %s áž‡áž¶â€‹áž‘áŸ’ážšáž„áŸ‹áž‘áŸ’ážšáž¶áž™ .zip"
+
+#: message.php:664
+msgid "Download All Attachments (in .zip file)"
+msgstr "áž‘áž¶áž‰áž™áž€â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ (áž‡áž¶â€‹áž¯áž€ážŸáž¶ážš .zip)"
+
+#: templates/folders/actions.html:22
+msgid "Download Folder(s)"
+msgstr "áž‘áž¶áž‰áž™áž€ â€‹ážáž"
+
+#: templates/folders/actions.html:23
+msgid "Download Folder(s) [.zip format]"
+msgstr "áž‘áž¶áž‰áž™áž€â€‹ ážážâ€‹áž•áŸ’ážŸáŸáž„áŸ— [áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™ .zip]"
+
+#: lib/MIME/Contents.php:219
+msgid "Download in .zip Format"
+msgstr "áž‘áž¶áž‰áž™áž€â€‹áž‡áž¶â€‹áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™ .zip"
+
+#: message.php:473 mailbox.php:823 mailbox.php:974
+#: templates/message/navbar_navigate.html:11 templates/mailbox/navbar.html:19
+#: templates/mailbox/navbar.html:36 templates/mailbox/legend.html:7
+msgid "Draft"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„"
+
+#: lib/IMAP/Tree.php:374
+msgid "Draft folder"
+msgstr "ážážâ€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„"
+
+#: templates/prefs/folderselect.inc:23
+msgid "Drafts folder:"
+msgstr "ážážâ€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„Â áŸ–"
+
+#: templates/pgp/pgp.inc:108
+msgid "E-mail Address"
+msgstr "áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›"
+
+#: mailbox.php:895
+msgid "END"
+msgstr "áž…áž»áž„áž”áž‰áŸ’áž…áž”áŸ‹"
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr "áž€áŸ†áž áž»ážŸÂ áŸ– ážŸáž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž‘áŸ…ážŠáž›áŸ‹Â áŸ”"
+
+#: templates/stationery/prefs.inc:19 lib/IMAP/Tree.php:413
+msgid "Edit"
+msgstr "áž€áŸ‚â€‹ážŸáž˜áŸ’ážšáž½áž›"
+
+#: mailbox.php:364 templates/search/search.html:19
+msgid "Edit Search Query"
+msgstr "áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹ážŸáŸ†ážŽáž½ážšâ€‹ážŸáŸ’ážœáŸ‚áž„ážšáž€"
+
+#: lib/IMAP/Tree.php:413 templates/search/search.html:17
+msgid "Edit Virtual Folder"
+msgstr "áž€áŸ‚â€‹ážŸáž˜áŸ’ážšáž½áž›â€‹ážážâ€‹áž“áž·áž˜áž·áŸ’áž˜áž"
+
+#: mailbox.php:360
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr "áž€áŸ‚â€‹ážŸáž˜áŸ’ážšáž½áž›â€‹áž“áž·áž™áž˜áž“áŸáž™â€‹ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážâ€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ %s"
+
+#: filterprefs.php:79
+msgid "Edit your Blacklist"
+msgstr "áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹áž”áž‰áŸ’áž‡áž¸â€‹ážáŸ’áž˜áŸ…â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: filterprefs.php:78
+msgid "Edit your Filter Rules"
+msgstr "áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹áž€áŸ’áž”áž½áž“â€‹ážáž˜áŸ’ážšáž„â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: filterprefs.php:80
+msgid "Edit your Whitelist"
+msgstr "áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹áž”áž‰áŸ’áž‡áž¸â€‹ážŸâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: config/prefs.php.dist:872
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr "áž€áŸ‚â€‹ážŸáž˜áŸ’ážšáž½áž›â€‹áž…áŸ†ážŽáž„áŸ‹â€‹áž…áŸ†ážŽáž¼áž›â€‹áž…áž·ážáŸ’ážâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹áž‚ážŽáž“áž¸â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž•áŸ’ážŸáŸáž„áŸ—Â áŸ”"
+
+#: templates/contacts/contacts.html:59
+msgid "Email Address"
+msgstr "áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›"
+
+#: lib/Message.php:731
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "áž”áž¶áž“â€‹â€‹áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž–áž¸ %sÂ áŸ”"
+
+#: lib/Message.php:708
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "áž”áž¶áž“â€‹ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž–áž¸â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹áž“áž·áž˜áŸ’áž˜áž·ážÂ áŸ”"
+
+#: templates/folders/actions.html:24
+msgid "Empty Folder(s)"
+msgstr "ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážáž"
+
+#: templates/folders/folders_confirm.html:22
+msgid "Empty Selected Folders"
+msgstr "ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸ"
+
+#: mailbox.php:464
+msgid "Empty Trash folder"
+msgstr "ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜"
+
+#: lib/IMP.php:787
+msgid "Empty _Spam"
+msgstr "_SážŸáž˜áŸ’áž¢áž¶ážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš "
+
+#: lib/IMP.php:777
+msgid "Empty _Trash"
+msgstr "_TážŸáž˜áŸ’áž¢áž¶ážâ€‹â€‹ážŸáŸ†ážšáž¶áž˜ "
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž˜áž»ážâ€‹áž„áž¶ážš PGP áž”áŸ’ážšáž¾â€‹áž”áž¶áž“Â ?"
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž˜áž»ážáž„áž¶ážš S/MIME áž”áŸ’ážšáž¾â€‹áž”áž¶áž“Â ?"
+
+#: config/prefs.php.dist:823
+msgid "Enable message previews?"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž€áž¶ážšâ€‹áž˜áž¾áž›â€‹ážŸáž¶ážšâ€‹áž‡áž¶â€‹áž˜áž»áž“â€‹áž”áŸ’ážšáž¾â€‹áž”áž¶áž“Â ?"
+
+#: compose.php:1286
+msgid "Encr_yption Options"
+msgstr "_Yáž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠ "
+
+#: mailbox.php:985 templates/mailbox/legend.html:16
+msgid "Encrypted"
+msgstr "áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠ"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
+msgid "End"
+msgstr "áž”áž‰áŸ’áž…áž”áŸ‹"
+
+#: lib/Compose.php:1484
+msgid "End forwarded message"
+msgstr "áž”áž‰áŸ’áž…áž”áŸ‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’áž"
+
+#: lib/Compose.php:1403
+msgid "End message"
+msgstr "áž”áž‰áŸ’áž…áž”áŸ‹â€‹ážŸáž¶ážš"
+
+#: lib/Compose.php:1401
+#, php-format
+msgid "End message from %s"
+msgstr "áž”áž‰áŸ’áž…áž”áŸ‹â€‹ážŸáž¶ážšâ€‹áž–áž¸ %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr "áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹"
+
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážáŸ’áž˜áž¸ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹ážáŸ’áž˜áž¸â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/prefs/folderselect.inc:9
+msgid "Enter the name for your new drafts folder"
+msgstr "áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážážâ€‹ážŸáŸáž…áž€áŸ’ážáž¸áž–áŸ’ážšáž¶áž„â€‹ážáŸ’áž˜áž¸â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/prefs/sentmailselect.inc:23
+msgid "Enter the name for your new sent mail folder"
+msgstr "áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ážáŸ’áž˜áž¸â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/prefs/trashselect.inc:9
+msgid "Enter the name for your new trash folder"
+msgstr "áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹ážáŸ’áž˜áž¸â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: lib/Search.php:627
+msgid "Entire Message"
+msgstr "ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž˜áž¼áž›"
+
+#: message.php:157 thread.php:70 lib/Compose.php:713 lib/Compose.php:970
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
+msgstr "áž’áž¶ážáž» \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™ áž‘áŸ…â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“"
+
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:394
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:165
+msgid "Error"
+msgstr "áž€áŸ†áž áž»ážŸ"
+
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAPÂ áŸ” %sÂ áŸ– %sÂ áŸ”"
+
+#: lib/MIME/Contents.php:124
+msgid "Error displaying message."
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹ážŸáž¶ážšÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
+#, php-format
+msgid "Error sending reply: %s."
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…Â áŸ– %sÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:102
+msgid "Event successfully deleted."
+msgstr "áž”áž¶áž“â€‹áž›áž»áž”â€‹áž–áŸ’ážšáž¹ážáŸ’ážáž·áž€áž¶ážšážŽáŸâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: config/prefs.php.dist:794
+msgid "Every 15 minutes"
+msgstr "ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹â€‹ áŸ¡áŸ¥ áž“áž¶áž‘áž¸"
+
+#: config/prefs.php.dist:791
+msgid "Every 30 seconds"
+msgstr "ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹â€‹ áŸ£áŸ  ážœáž·áž“áž¶áž‘áž¸"
+
+#: config/prefs.php.dist:531 config/prefs.php.dist:793
+msgid "Every 5 minutes"
+msgstr "ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹ áŸ¥ áž“áž¶áž‘áž¸"
+
+#: config/prefs.php.dist:795
+msgid "Every half hour"
+msgstr "ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹â€‹áž€áž“áŸ’áž›áŸ‡â€‹áž˜áŸ‰áŸ„áž„"
+
+#: config/prefs.php.dist:792
+msgid "Every minute"
+msgstr "ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹áž“áž¶áž‘áž¸"
+
+#: lib/IMAP/Tree.php:456
+msgid "Expand"
+msgstr "áž”áž“áŸ’áž›áž¶áž™"
+
+#: folders.php:303
+msgid "Expand All"
+msgstr "áž”áž“áŸ’áž›áž¶áž™â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: folders.php:303
+msgid "Expand All Folders"
+msgstr "áž”áž“áŸ’áž›áž¶áž™â€‹ážážâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: lib/IMAP/Tree.php:456
+msgid "Expand Folder"
+msgstr "áž”áž“áŸ’áž›áž¶áž™â€‹ážáž"
+
+#: compose.php:868 compose.php:1231
+msgid "Expand Names"
+msgstr "áž”áž“áŸ’áž›áž¶áž™â€‹ážˆáŸ’áž˜áŸ„áŸ‡"
+
+#: config/prefs.php.dist:1074
+msgid "Expand names in the compose window automatically in the background?"
+msgstr "áž”áž“áŸ’áž›áž¶áž™â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážáŸ‚áž„ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž· áž€áŸ’áž“áž»áž„â€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™Â ?"
+
+#: config/prefs.php.dist:991
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr "áž”áž“áŸ’áž›áž¶áž™â€‹áž˜áŸ‚áž€â€‹áž’áž¶áž„â€‹ážážâ€‹áž‘áž¶áŸ†áž„â€‹áž˜áž¼áž›â€‹áž‡áž¶â€‹áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜ áž€áŸ’áž“áž»áž„â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹ážážÂ ?"
+
+#: templates/compose/redirect.html:67 templates/compose/compose.html:82
+msgid "Expanding"
+msgstr "áž€áž¶ážšâ€‹áž”áž“áŸ’áž›áž¶áž™"
+
+#: lib/IMP.php:798 lib/IMP.php:800
+msgid "F_etch Mail"
+msgstr "_Eáž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážš "
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:105
+msgid "Fetch Mail"
+msgstr "\"áž‘áŸ…â€‹â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážš\""
+
+#: config/prefs.php.dist:880
+msgid "Fetch Mail in a separate window?"
+msgstr "\"áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážš\" â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž•áŸ’ážŸáŸáž„áž¬Â ?"
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáž¶ážš áž¢áž¶ážŸáŸ’ážšáŸáž™â€‹áž›áž¾â€‹áž€áž¶ážšâ€‹áž…áž¼áž›áž¬Â ?"
+
+#: lib/Fetchmail.php:291
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "áž”áž¶áž“â€‹áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“ %d áž–áž¸ %s"
+
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "áž”áž¶áž“â€‹áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“ áŸ¡ áž–áž¸ %s"
+
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
+msgid "Fetchmail: "
+msgstr "áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ–"
+
+#: lib/Fetchmail.php:293
+msgid "Fetchmail: no new messages."
+msgstr "áž‘áŸ…â€‹â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ– áž‚áŸ’áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸Â áŸ”"
+
+#: lib/IMP.php:804
+msgid "Fi_lters"
+msgstr "_Lážáž˜áŸ’ážšáž„ "
+
+#: templates/compose/javascript.inc:227 templates/compose/compose.html:265
+msgid "File"
+msgstr "áž¯áž€ážŸáž¶ážš"
+
+#: templates/filters/prefs.html:48
+msgid "Filter Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážšáž”ážŸáŸ‹â€‹ážáž˜áŸ’ážšáž„"
+
+#: templates/filters/prefs.html:36
+msgid "Filter Settings"
+msgstr "áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážáž˜áŸ’ážšáž„"
+
+#: config/prefs.php.dist:600
+msgid "Filter message content for profanity?"
+msgstr "ážáŸ’ážšáž„â€‹áž˜áž¶ážáž·áž€áž¶â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž—áž¶áž–â€‹áž¢áž¶ážŸáž‚áŸ’ážšáž¶áž˜Â ?"
+
+#: templates/filters/prefs.html:11
+msgid "Filter support is disabled on this system."
+msgstr "áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹ážáž˜áŸ’ážšáž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž›áŸ‚áž„â€‹áž”áž¶áž“ â€‹áž›áž¾â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: config/prefs.php.dist:128
+msgid "Filters"
+msgstr "ážáž˜áŸ’ážšáž„"
+
+#: templates/filters/prefs.html:3
+msgid "Filters NOT Active"
+msgstr "ážáž˜áŸ’ážšáž„â€‹áž˜áž·áž“â€‹ážŸáž€áž˜áŸ’áž˜"
+
+#: lib/Filter.php:101
+#, php-format
+msgid "Filters: %s management page"
+msgstr "ážáž˜áŸ’ážšáž„Â áŸ– áž‘áŸ†áž–áŸážšâ€‹áž‚áŸ’ážšáž”áŸ‹â€‹áž‚áŸ’ážšáž„ %s"
+
+#: templates/contacts/contacts.html:13
+msgid "Find:"
+msgstr "ážšáž€Â áŸ–"
+
+#: config/prefs.php.dist:916
+msgid "First Mailbox Page"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ†áž”áž¼áž„"
+
+#: mailbox.php:432
+msgid "First Page"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹ážŠáŸ†áž”áž¼áž„"
+
+#: message.php:554 mailbox.php:501
+msgid "Fo_rward"
+msgstr "_Ráž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’áž "
+
+#: folders.php:216 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "áž¢áŸ†áž–áž¾â€‹ážáž - áž¢áŸ‡áž¢áž¶áž„"
+
+#: folders.php:249 templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10 templates/folders/head.html:2
+msgid "Folder Navigator"
+msgstr "áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€â€‹ážšáž€â€‹ážáž"
+
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹ážŸáž„áŸ’ážáŸáž”â€‹ážšáž”ážŸáŸ‹â€‹ážáž"
+
+#: acl.php:23
+msgid "Folder sharing is not enabled."
+msgstr "áž€áž¶ážšâ€‹áž…áŸ‚áž€â€‹ážšáŸ†áž›áŸ‚áž€â€‹ážážâ€‹áž‚ážºâ€‹áž¢ážŸáž€áž˜áŸ’áž˜Â áŸ”"
+
+#: folders.php:24
+msgid "Folder use is not enabled."
+msgstr "áž€áž¶ážšâ€‹áž”áŸ’ážšáž¾â€‹ážážâ€‹áž‚ážºâ€‹áž¢ážŸáž€áž˜áŸ’áž˜Â áŸ”"
+
+#: config/prefs.php.dist:980
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+"áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™â€‹â€‹áž“áŸƒâ€‹áž€áž¶áž›â€‹áž”ážšáž·áž…áŸ’áž†áŸáž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš áž€áŸ’áž“áž»áž„â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹áž”áŸ’ážšáž¢áž”áŸ‹ážŸáŸ†áž”áž»ážáŸ’ážš ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž€áž¶áž›â€‹áž”ážšáž·áž…áŸ’áž†áŸáž‘â€‹ážáŸ’áž„áŸƒâ€‹áž“áŸáŸ‡"
+
+#: message.php:554 mailbox.php:501 lib/Compose.php:1455
+msgid "Forward"
+msgstr "áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’áž"
+
+#: lib/Compose.php:1441
+msgid "Forward:"
+msgstr "áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážÂ áŸ–"
+
+#: lib/Compose.php:1469
+msgid "Forwarded message"
+msgstr "ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’áž"
+
+#: lib/Compose.php:1467
+#, php-format
+msgid "Forwarded message from %s"
+msgstr "ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážâ€‹áž–áž¸ %s"
+
+#: lib/MIME/Viewer/itip.php:402
+msgid "Free/Busy Request Response"
+msgstr "áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹ážŸáŸ†ážŽáž¾ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹"
+
+#: mailbox.php:575
+msgid "Fro_m"
+msgstr "_Máž–áž¸ "
+
+#: message.php:232 thread.php:151 lib/Search.php:603
+#: templates/compose/compose.html:31
+msgid "From"
+msgstr "áž–áž¸"
+
+#: config/prefs.php.dist:929
+msgid "From Address"
+msgstr "áž–áž¸â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“"
+
+#: lib/Compose.php:1452 lib/Compose.php:1456
+msgid "Fwd:"
+msgstr "áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážÂ áŸ–"
+
+#: compose.php:619
+msgid "Fwd: "
+msgstr "áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážÂ áŸ–"
+
+#: compose.php:621
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážÂ áŸ– ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’áž %u"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž‘áž¼áž‘áŸ…"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "áž™áž€â€‹ážáŸ‚â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸Â ? (ážáŸ‚ IMAP)"
+
+#: folders.php:288 lib/MIME/Viewer/itip.php:554 lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "áž‘áŸ…"
+
+#: thread.php:134
+msgid "Go to Message"
+msgstr "áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹ážŸáž¶ážš"
+
+#: lib/IMP.php:363
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž’áž¶ážáž»â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž“áŸƒ \"%s\""
+
+#: templates/acl/acl.inc:136
+msgid "Grant access"
+msgstr "áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážš"
+
+#: message.php:428 lib/Filter.php:101 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/notification.php:62
+#: lib/MIME/Viewer/notification.php:68 lib/MIME/Viewer/related.php:79
+#: lib/MIME/Viewer/pkcs7.php:423 lib/MIME/Viewer/appledouble.php:41
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:129
+msgid "HERE"
+msgstr "áž‘áž¸áž“áŸáŸ‡"
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr "HTML"
+
+#: lib/Compose.php:360
+msgid "HTML Version of Message"
+msgstr "áž€áŸ†ážŽáŸ‚ HTML ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: message.php:683
+msgid "Headers"
+msgstr "áž”áž‹áž˜áž€ážáž¶"
+
+#: templates/login/recompose.html:7
+msgid "Here is the message you were composing:"
+msgstr "áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž€áŸ†áž–áž»áž„â€‹ážáŸ‚áž„Â áŸ–"
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr "áž›áž¶áž€áŸ‹"
+
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr "áž›áž¶áž€áŸ‹â€‹áž€áŸ’áž“áž»áž„â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹â€‹ážáŸ’ážŸáŸ‚â€‹áž¢áŸ†áž”áŸ„áŸ‡"
+
+#: mailbox.php:272
+msgid "Hide Deleted"
+msgstr "áž›áž¶áž€áŸ‹ \"áž”áž¶áž“â€‹áž›áž»áž”\""
+
+#: folders.php:294
+msgid "Hide Unsubscribed"
+msgstr "áž›áž¶áž€áŸ‹ \"áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž‡áž¶ážœ\""
+
+#: compose.php:1204
+msgid "High"
+msgstr "ážáŸ’áž–ážŸáŸ‹"
+
+#: message.php:264 mailbox.php:828 mailbox.php:977
+#: templates/mailbox/legend.html:10
+msgid "High Priority"
+msgstr "áž¢áž¶áž‘áž·áž—áž¶áž–â€‹ážáŸ’áž–ážŸáŸ‹"
+
+#: compose.php:1203
+msgid "Highest"
+msgstr "ážáŸ’áž–ážŸáŸ‹â€‹áž”áŸ†áž•áž»áž"
+
+#: config/prefs.php.dist:697
+msgid "How do you want to display attachments?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž™áŸ‰áž¶áž„â€‹ážŠáž¼áž…áž˜áŸ’ážáŸáž…Â ?"
+
+#: config/prefs.php.dist:505
+msgid "How to attribute quoted lines in a reply"
+msgstr "ážšáž”áŸ€áž”â€‹áž€áŸ†ážŽážáŸ‹â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŠáž€â€‹ážŸáŸ’ážšáž„áŸ‹ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: lib/IMAP.php:199
+msgid "IMAP"
+msgstr "IMAP"
+
+#: lib/Fetchmail/imap.php:107
+msgid "IMAP (Auto Detect Protocols)"
+msgstr "IMAP (Auto Detect Protocols)"
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAP áž”áž¶áž“â€‹áž”áž·áž‘â€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™ážáž”â€‹ážáž¶Â áŸ– %s"
+
+#: lib/IMAP.php:211
+msgid "IMAP over SSL"
+msgstr "IMAP áž›áž¾ SSL"
+
+#: lib/IMAP.php:217
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP áž›áž¾ SSL (ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŠáŸ„áž™â€‹ážáŸ’áž›áž½áž“â€‹áž¯áž„)"
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAP áž”áž¶áž“â€‹áž”áž·áž‘â€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ”"
+
+#: lib/IMAP.php:205
+msgid "IMAP, no TLS"
+msgstr "IMAP áž‚áŸ’áž˜áž¶áž“ TLS"
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážš IMAP/POP3"
+
+#: lib/IMP.php:657
+msgid "INBOX"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž›"
+
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr "áž”áž¾â€‹áž”áŸ’ážšáž¾ SSL áž¬ TLS, áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž¶áž“â€‹áž•áŸ’áž‘áž»áž€â€‹áž•áŸ’áž“áŸ‚áž€â€‹áž”áž“áŸ’ážáŸ‚áž˜ openssl ážšáž”ážŸáŸ‹ PHPÂ áŸ”"
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž”áž“áŸ’áž ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹ážážâ€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž¶ážáŸ‹áž”áž„áŸ‹Â !"
+
+#: templates/compose/spelling.html:36
+msgid "Ignore"
+msgstr "áž˜áž·áž“â€‹áž¢áž¾áž–áž¾"
+
+#: templates/compose/spelling.html:37
+msgid "Ignore All"
+msgstr "áž˜áž·áž“â€‹áž¢áž¾áž–áž¾â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: saveimage.php:46
+msgid "Image"
+msgstr "ážšáž¼áž”áž—áž¶áž–"
+
+#: lib/MIME/Viewer/html.php:96
+#, php-format
+msgid "Images are blocked: %s to protect your privacy. %s"
+msgstr "ážšáž¼áž”áž—áž¶áž–â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹Â áŸ– %s ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž€áž¶ážšáž–áž¶ážšâ€‹áž—áž¶áž–â€‹áž¯áž€áž‡áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ” %s"
+
+#: templates/folders/import.html:16
+msgid "Import"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.html:48
+msgid "Import Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„"
+
+#: templates/pgp/pgp.inc:139
+msgid "Import Keypair"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž‚áž¼â€‹áž€áž¼áž“ážŸáŸ„"
+
+#: templates/folders/actions.html:29
+msgid "Import Messages"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹ážŸáž¶ážš"
+
+#: pgp.php:39
+msgid "Import PGP Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„â€‹ážšáž”ážŸáŸ‹ PGP"
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: templates/pgp/import_key.html:11
+msgid "Import Personal Private PGP Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„ PGP áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: templates/pgp/import_key.html:18
+msgid "Import Personal Private PGP Key Here:"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„ PGP áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ áž“áŸ…â€‹áž‘áž¸áž“áŸáŸ‡Â áŸ–"
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážš S/MIME áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ"
+
+#: templates/pgp/import_key.html:11
+msgid "Import Public PGP Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„ PGP ážŸáž¶áž’áž¶ážšážŽáŸˆ"
+
+#: templates/pgp/import_key.html:18
+msgid "Import Public PGP Key Here:"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„ PGP ážŸáž¶áž’áž¶ážšážŽáŸˆ áž“áŸ…â€‹áž‘áž¸áž“áŸáŸ‡Â áŸ–"
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„ S/MIME ážŸáž¶áž’áž¶ážšážŽáŸˆ"
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„ S/MIME"
+
+#: templates/folders/import.html:6
+msgid "Import mbox File"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž¯áž€ážŸáž¶ážš mbox"
+
+#: templates/folders/import.html:11
+msgid "Import mbox file"
+msgstr "áž“áž¶áŸ†áž…áž¼áž›â€‹áž¯áž€ážŸáž¶ážš mbox"
+
+#: message.php:474 mailbox.php:836 mailbox.php:972
+#: templates/message/navbar_navigate.html:7 templates/mailbox/navbar.html:13
+#: templates/mailbox/navbar.html:28 templates/mailbox/legend.html:5
+msgid "Important"
+msgstr "ážŸáŸ†ážáž¶áž“áŸ‹"
+
+#: search.php:334
+msgid "Important messages"
+msgstr "ážŸáž¶ážšâ€‹ážŸáŸ†ážáž¶áž“áŸ‹"
+
+#: folders.php:115
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr "áž”áž¶áž“â€‹áž“áž¶áŸ†áž…áž¼áž›â€‹ážŸáž¶ážš %d áž–áž¸ %sÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:766
+msgid "In Process"
+msgstr "ážŸáŸ’ážáž·ážâ€‹áž€áŸ’áž“áž»áž„â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážš"
+
+#: templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:308 lib/IMAP/Tree.php:110
+#: lib/IMAP/Tree.php:213 lib/IMAP/Tree.php:359
+msgid "Inbox"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž›"
+
+#: config/prefs.php.dist:493
+msgid "Include a brief summary of the header in a reply?"
+msgstr "ážšáž½áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹ážŸáž„áŸ’ážáŸáž”â€‹ážáŸ’áž›áž¸â€‹ážšáž”ážŸáŸ‹â€‹áž”áž‹áž˜áž€ážáž¶â€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”Â ?"
+
+#: config/prefs.php.dist:488
+msgid "Include original message in a reply?"
+msgstr "ážšáž½áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážŸáž¶ážšâ€‹áž”áŸ’ážšáž—áž–â€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”Â ?"
+
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:132
+msgid "Info"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸ†áž–áž¸â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹ %s"
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸ†áž–áž¸â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹ážáŸ’áž›áž½áž“"
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸ†áž–áž¸â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: templates/compose/javascript.inc:243 templates/compose/compose.html:270
+#: templates/compose/compose.html:326
+msgid "Inline"
+msgstr "áž€áŸ’áž“áž»áž„â€‹ážáž½"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr "áž”áž‰áŸ’áž…áž¼áž›â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹áž‘áž¸áž“áŸáŸ‡"
+
+#: lib/MIME/Viewer/itip.php:413
+msgid "Invalid Action selected for this component."
+msgstr "áž¢áŸ†áž–áž¾â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážŸáž˜áž¶ážŸáž—áž¶áž‚â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: mailbox.php:724 mailbox.php:766
+msgid "Invalid Address"
+msgstr "áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ"
+
+#: lib/Fetchmail/imap.php:261
+msgid "Invalid Remote Mailbox"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž†áŸ’áž„áž¶áž™â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ"
+
+#: lib/Compose.php:1036
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr "ážáž½â€‹áž¢áž€áŸ’ážŸážšâ€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ â€‹áž€áŸ’áž“áž»áž„â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›Â áŸ– %sÂ áŸ”"
+
+#: smime.php:78 pgp.php:16
+msgid "Invalid key"
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ"
+
+#: lib/Compose.php:197
+msgid "Invalid message, can not resume draft."
+msgstr "ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ, áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž“áŸ’ážâ€‹ážŸáŸáž…áž€áŸ’ážŠáž¸â€‹áž–áŸ’ážšáž¶áž„"
+
+#: pgp.php:202
+msgid "Invalid personal PGP private key."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ PGP áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“â€‹áž˜áž·áž“ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœÂ áŸ”"
+
+#: pgp.php:177
+msgid "Invalid personal PGP public key."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹ PGP áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“â€‹áž˜áž·áž“ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœÂ áŸ”"
+
+#: templates/mailbox/navbar.html:9
+msgid "Invert"
+msgstr "ážŠáž¶áž€áŸ‹áž”áž‰áŸ’áž…áŸ’ážšáž¶ážŸ"
+
+#: templates/compose/compose.html:314 templates/compose/compose.html:349
+msgid "KB"
+msgstr "KB"
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr "áž”áŸ’ážšážœáŸ‚áž„â€‹áž€áž¼áž“ážŸáŸ„"
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "áž€áž¶ážšâ€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž€áž¼áž“ážŸáŸ„â€‹áž¢áž¶áž…â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹ážšáž™áŸˆáž–áŸáž›â€‹áž™áž¼ážšÂ áŸ”  áž”áž“áŸ’ážâ€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž€áž¼áž“ážŸáŸ„Â ?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áž¶ážšâ€‹áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¡áž¾áž™Â áŸ” áž€áž¶ážšâ€‹áž‘áž¶áž‰áž™áž€â€‹áž¯áž€ážŸáž¶ážš áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž¡áž¾áž™â€‹áž›áž¾â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áž¶ážšâ€‹áž“áž¶áŸ†áž…áž¼áž›â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¡áž¾áž™Â áŸ” áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ†áž“áž¶áž€áŸ‹â€‹áž‘áŸ†áž“áž„â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž¡áž¾áž™Â áŸ”"
+
+#: pgp.php:324
+msgid "Key successfully sent to the public keyserver."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™ â€‹áž‘áŸ…â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆÂ áŸ”"
+
+#: templates/login/login.html:113
+msgid "Language"
+msgstr "áž—áž¶ážŸáž¶"
+
+#: config/prefs.php.dist:917
+msgid "Last Mailbox Page"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž…áž»áž„â€‹áž€áŸ’ážšáŸ„áž™"
+
+#: mailbox.php:444
+msgid "Last Page"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹áž…áž»áž„â€‹áž€áŸ’ážšáŸ„áž™"
+
+#: compose.php:1327
+msgid "Link Attachments?"
+msgstr "ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â ?"
+
+#: attachment.php:34 lib/Compose.php:2215
+msgid "Linked attachments are forbidden."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž áž¶áž˜ážƒáž¶ážáŸ‹Â áŸ”"
+
+#: lib/Compose.php:2231
+#, php-format
+msgid "Links will expire on %s"
+msgstr "ážáŸ†ážŽâ€‹áž“áž¹áž„â€‹áž•áž»ážáž€áŸ†ážŽážáŸ‹â€‹áž“áŸ… %s"
+
+#: config/prefs.php.dist:1093
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+"ážšáž¶áž™â€‹áž€áž¶ážšâ€‹áž‘áž¶áž€áŸ‹â€‹áž‘áž„â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ áž–áŸáž›â€‹áž•áŸ’áž‘áž»áž€â€‹áž¢áŸáž€áŸ’ážšáž„áŸ‹â€‹áž€áž¶ážšâ€‹áž‘áž¶áž€áŸ‹áž‘áž„Â ? (áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢ážŸáž€áž˜áŸ’áž˜ áž¢áŸ’áž“áž€â€‹áž“áž¹áž„â€‹ážƒáž¾áž‰â€‹ážáŸ‚â€‹áž€áž¶ážšâ€‹áž‘áž¶áž€áŸ‹â€‹áž‘áž„â€‹ážŠáŸ‚áž›â€‹"
+"áž¢áŸ’áž“áž€ážŸáŸ’ážœáŸ‚áž„ážšáž€â€‹áž™áŸ‰áž¶áž„â€‹áž‡áž¶áž€áŸ‹â€‹áž›áž¶áž€áŸ‹)"
+
+#: config/prefs.php.dist:694
+msgid "Listing in the Header"
+msgstr "ážšáž¶áž™â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž‹áž˜áž€ážáž¶"
+
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž˜áž¼áž›ážŠáŸ’áž‹áž¶áž“Â áŸ–"
+
+#: lib/MIME/Viewer/itip.php:671
+msgid "Location"
+msgstr "áž‘áž¸ážáž¶áŸ†áž„"
+
+#: lib/Block/summary.php:104
+#, php-format
+msgid "Log in to %s"
+msgstr "áž…áž¼áž›â€‹áž‘áŸ… %s"
+
+#: login.php:352
+msgid "Login"
+msgstr "áž…áž¼áž›"
+
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr "áž—áž¶ážšáž€áž·áž…áŸ’áž…â€‹áž…áž¼áž›"
+
+#: compose.php:1206
+msgid "Low"
+msgstr "áž‘áž¶áž”"
+
+#: message.php:266 mailbox.php:831 mailbox.php:978
+#: templates/mailbox/legend.html:11
+msgid "Low Priority"
+msgstr "áž¢áž¶áž‘áž·áž—áž¶áž–â€‹áž‘áž¶áž”"
+
+#: compose.php:1207
+msgid "Lowest"
+msgstr "áž‘áž¶áž”â€‹áž”áŸ†áž•áž»áž"
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr "áž¯áž€ážŸáž¶ážš Macintosh"
+
+#: templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: config/prefs.php.dist:97
+msgid "Mail Previews"
+msgstr "áž˜áž¾áž›â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž‡áž¶â€‹áž˜áž»áž“"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr "áž”áŸ’ážšáž—áŸáž‘â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹Â áŸ–"
+
+#: lib/IMAP/Tree.php:365 lib/IMAP/Tree.php:393
+msgid "Mailbox"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: config/prefs.php.dist:112
+msgid "Mailbox and Folder Display Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážš áž“áž·áž„ ážáž"
+
+#: templates/folders/actions.html:20
+msgid "Mark All Messages in Folder as Seen"
+msgstr "ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹ áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážáž¶â€‹áž”áž¶áž“â€‹áž˜áž¾áž›"
+
+#: templates/folders/actions.html:21
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž€áŸ’áž“áž»áž„â€‹ážážážáž¶ \"áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž˜áž¾áž›\""
+
+#: templates/message/navbar_navigate.html:5 templates/mailbox/navbar.html:25
+msgid "Mark as:"
+msgstr "ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹áž‡áž¶Â áŸ–"
+
+#: config/prefs.php.dist:650
+msgid "Mark different levels of quoting with different colors?"
+msgstr "ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹áž€áž˜áŸ’ážšáž·ážâ€‹ážáž»ážŸáŸ—â€‹áž‚áŸ’áž“áž¶â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž˜áŸ’ážšáž„áŸ‹ ážŠáŸ„áž™â€‹áž–ážŽáŸŒâ€‹ážáž»ážŸâ€‹áž‚áŸ’áž“áž¶Â ?"
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹ážŸáž¶ážšâ€‹áž‡áž¶ \"áž”áž¶áž“â€‹áž˜áž¾áž›\" áž¬Â ? (ážáŸ‚ IMAP)"
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr "ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹áž€áž¶ážšâ€‹ážáž˜áŸ’áž›áž¾áž„â€‹ážáž˜áŸ’áž›áŸƒâ€‹ážŸáž¶áž˜áž‰áŸ’áž‰Â ?"
+
+#: search.php:226
+msgid "Match All Queries"
+msgstr "ážŠáž¼áž…â€‹ážŸáŸ†ážŽáž½ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: search.php:224
+msgid "Match Any Query"
+msgstr "ážŠáž¼áž…â€‹ážŸáŸ†ážŽáž½ážšâ€‹ážŽáž¶áž˜áž½áž™"
+
+#: templates/compose/compose.html:276
+msgid "Maximum Attachment Size"
+msgstr "áž‘áŸ†áž áŸ†â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž¢ážáž·áž”ážšáž˜áž¶"
+
+#: lib/api.php:84
+msgid "Maximum Number of Folders"
+msgstr "áž…áŸ†áž“áž½áž“â€‹ážážâ€‹áž¢ážáž·áž”ážšáž˜áž¶"
+
+#: lib/api.php:87
+msgid "Maximum Number of Recipients per Message"
+msgstr "áž…áŸ†áž“áž½áž“â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž¢ážáž·áž”ážšáž˜áž¶â€‹áž€áŸ’áž“áž»áž„â€‹ážŸáž¶ážšâ€‹áž˜áž½áž™"
+
+#: lib/api.php:90
+msgid "Maximum Number of Recipients per Time Period"
+msgstr "áž…áŸ†áž“áž½áž“â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž…áŸ’ážšáž¾áž“â€‹áž”áŸ†áž•áž»ážâ€‹áž€áŸ’áž“áž»áž„â€‹áž˜áž½áž™â€‹ážšáž™áŸˆáž–áŸáž›"
+
+#: templates/compose/compose.html:258
+msgid "Maximum number of attachments reached."
+msgstr "áž”áž¶áž“â€‹áž˜áž€â€‹ážŠáž›áŸ‹â€‹áž€áž˜áŸ’ážšáž·ážâ€‹áž“áŸƒâ€‹áž…áŸ†áž“áž½áž“â€‹áž¢ážáž·áž”ážšáž˜áž¶â€‹ážšáž”ážŸáŸ‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ”"
+
+#: templates/compose/compose.html:253
+msgid "Maximum total attachment size reached."
+msgstr "áž”áž¶áž“â€‹áž˜áž€â€‹ážŠáž›áŸ‹â€‹áž€áž˜áŸ’ážšáž·ážâ€‹áž“áŸƒâ€‹áž‘áŸ†áž áŸ†â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŸážšáž»áž”áž¢ážáž·áž”ážšáž˜áž¶"
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr "áž”áž‰áŸ’áž‡áž¸â€‹ážážâ€‹áž˜áŸ‰ážºáž“áž»áž™"
+
+#: lib/Compose.php:1393
+msgid "Message"
+msgstr "ážŸáž¶ážš"
+
+#: compose.php:331 compose.php:358 compose.php:367 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr "áž€áž¶ážšâ€‹ážáŸ‚áž„â€‹ážŸáž¶ážš"
+
+#: config/prefs.php.dist:928
+msgid "Message Date"
+msgstr "áž€áž¶áž›â€‹áž”ážšáž·áž…áŸ’áž†áŸáž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: templates/search/search.html:112
+msgid "Message Flags"
+msgstr "áž‘áž„áŸ‹â€‹ážŸáž¶ážš"
+
+#: templates/search/search.html:137
+msgid "Message Folders"
+msgstr "ážážâ€‹ážŸáž¶ážš"
+
+#: templates/search/search.html:33
+msgid "Message Matches"
+msgstr "ážŠáŸ†ážŽáž¼áž…â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:79
+#: config/prefs.php.dist:88 config/prefs.php.dist:96 config/prefs.php.dist:104
+msgid "Message Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: search.php:406
+msgid "Message Search"
+msgstr "áž€áž¶ážšâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€ážŸáž¶ážš"
+
+#: config/prefs.php.dist:932
+msgid "Message Size"
+msgstr "áž‘áŸ†áž áŸ†â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: message.php:578
+msgid "Message Source"
+msgstr "áž”áŸ’ážšáž—áž–â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: config/prefs.php.dist:66
+msgid "Message Viewing"
+msgstr "áž€áž¶ážšâ€‹áž˜áž¾áž›â€‹ážŸáž¶ážš"
+
+#: lib/Compose.php:1391
+#, php-format
+msgid "Message from %s"
+msgstr "ážŸáž¶ážšâ€‹áž–áž¸ %s"
+
+#: mailbox.php:866
+msgid "Message has attachments"
+msgstr "ážŸáž¶ážšâ€‹áž˜áž¶áž“â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹"
+
+#: mailbox.php:858
+msgid "Message is encrypted"
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠ"
+
+#: mailbox.php:854
+msgid "Message is signed"
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡áž ážáŸ’ážáž›áŸážáž¶"
+
+#: compose.php:474 compose.php:481
+msgid "Message redirected successfully."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: lib/Compose.php:660
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™ áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž‘áŸ… %s"
+
+#: compose.php:542 compose.php:550
+msgid "Message sent successfully."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: config/prefs.php.dist:952
+msgid "Messages per page in the mailbox view."
+msgstr "ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹áž˜áž½áž™â€‹áž‘áŸ†áž–áŸážš áž€áŸ’áž“áž»áž„â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹Â áŸ”"
+
+#: mailbox.php:245
+msgid "Messages to"
+msgstr "ážŸáž¶ážšâ€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹"
+
+#: templates/acl/acl.inc:29
+msgid "Modify"
+msgstr "áž€áŸ‚áž”áŸ’ážšáŸ‚"
+
+#: expand.php:40
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "áž”áž¶áž“â€‹ážšáž€ážƒáž¾áž‰â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž…áŸ’ážšáž¾áž“â€‹áž‡áž¶áž„â€‹áž˜áž½áž™ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážœáž¶áž› \"%s\"Â áŸ”"
+
+#: message.php:503 message.php:695 mailbox.php:419 mailbox.php:997
+msgid "Move"
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸"
+
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr "áž…áž»áŸ‡â€‹áž€áŸ’ážšáŸ„áž˜"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹áž‘áŸ…â€‹ážážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš áž áž¾áž™â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸â€‹ážŸáž¶ážšâ€‹áž›áŸ’áž¢â€‹áž‘áŸ…â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž›"
+
+#: message.php:503 message.php:695 mailbox.php:419 mailbox.php:997
+msgid "Move to folder"
+msgstr "áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸â€‹ážáž"
+
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr "áž¡áž¾áž„â€‹áž›áž¾"
+
+#: lib/MIME/Viewer/alternative.php:128
+msgid "Multipart/alternative"
+msgstr "áž…áŸ’ážšáž¾áž“â€‹áž•áŸ’áž“áŸ‚áž€/áž†áŸ’áž›áž¶ážŸáŸ‹"
+
+#: thread.php:75 thread.php:154
+msgid "Multiple Message View"
+msgstr "áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹ážŸáž¶ážšâ€‹áž…áŸ’ážšáž¾áž“"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "áž‚áŸ’áž˜áž¶áž“"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr "áž…áŸ†ážŽáž¶áŸ†"
+
+#: lib/MIME/Viewer/itip.php:683 templates/contacts/contacts.html:58
+msgid "Name"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡"
+
+#: pgp.php:116
+msgid "Name and/or email cannot be empty"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡ áž“áž·áž„/áž¬ áž¢áŸŠáž¸áž˜áŸ‚áž›â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž‘áž‘áŸâ€‹áž”áž¶áž“â€‹áž¡áž¾áž™"
+
+#: lib/MIME/Viewer/itip.php:771
+msgid "Needs Action"
+msgstr "ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹áž¢áŸ†áž–áž¾"
+
+#: config/prefs.php.dist:582 config/prefs.php.dist:790
+msgid "Never"
+msgstr "áž€áž»áŸ†"
+
+#: config/prefs.php.dist:572
+msgid "Never save attachments"
+msgstr "áž€áž»áŸ†â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "ážáŸ’áž˜áž¸"
+
+#: lib/IMP.php:428
+msgid "New Folder"
+msgstr "ážážâ€‹ážáŸ’áž˜áž¸"
+
+#: config/prefs.php.dist:89
+msgid "New Mail"
+msgstr "ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: lib/Block/summary.php:26 lib/Block/summary.php:27
+#: lib/Block/tree_folders.php:31
+msgid "New Message"
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: mailbox.php:919 lib/MIME/Headers.php:193
+#, php-format
+msgid "New Message to %s"
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸â€‹áž‘áŸ… %s"
+
+#: search.php:325
+msgid "New messages"
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: templates/compose/spelling.html:73
+msgid "Next"
+msgstr "áž”áž“áŸ’áž‘áž¶áž”áŸ‹"
+
+#: message.php:521 message.php:702
+msgid "Next Message"
+msgstr "ážŸáž¶ážšâ€‹áž”áž“áŸ’áž‘áž¶áž”áŸ‹"
+
+#: mailbox.php:442
+msgid "Next Page"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹áž”áž“áŸ’áž‘áž¶áž”áŸ‹"
+
+#: config/prefs.php.dist:530 config/prefs.php.dist:988
+#: templates/compose/compose.html:296
+msgid "No"
+msgstr "áž‚áŸ’áž˜áž¶áž“"
+
+#: smime.php:222
+msgid "No Certificate found"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€ážƒáž¾áž‰"
+
+#: lib/IMP.php:1313
+msgid "No Encryption"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¶ážšâ€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠ"
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¼áž“â€‹ážŸáŸ„â€‹áž€áŸ’áž“áž»áž„ Keyring"
+
+#: mailbox.php:280
+#, php-format
+msgid "No Messages"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážŸáž¶ážš"
+
+#: pgp.php:143
+msgid "No PGP public key imported."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž“áž¶áŸ†áž…áž¼áž›Â áŸ”"
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážœážáŸ’ážáž˜áž¶áž“â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: mailbox.php:876
+msgid "No Preview Text"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž˜áž¾áž›â€‹áž‡áž¶â€‹áž˜áž»áž“"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€ážƒáž¾áž‰"
+
+#: smime.php:147
+msgid "No S/MIME public key imported."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ S/MIME ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž“áž¶áŸ†áž…áž¼áž›Â áŸ”"
+
+#: lib/MIME/Viewer/tnef.php:92
+msgid "No attachments found."
+msgstr "ážšáž€â€‹áž˜áž·áž“â€‹ážƒáž¾áž‰â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ”"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: acl.php:71 acl.php:97
+msgid "No folder selected."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážáž ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸÂ áŸ”"
+
+#: lib/Block/summary.php:132
+msgid "No folders are being checked for new mail."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážážâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž–áž·áž“áž·ážáŸ’áž™â€‹áž˜áž¾áž› ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸Â áŸ”"
+
+#: folders.php:165 lib/Folder.php:511 lib/Folder.php:561
+msgid "No folders were specified"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážáž ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹"
+
+#: lib/Block/summary.php:138
+msgid "No folders with new messages"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸"
+
+#: lib/Block/summary.php:135
+msgid "No folders with unseen messages"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹áž˜áž¾áž›"
+
+#: lib/Compose.php:1387
+msgid "No message body text"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž“áŸƒâ€‹ážáž½â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: lib/IMAP/Client.php:569
+msgid "No message returned."
+msgstr "áž˜áž·áž“â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹ážáŸ’ážšáž¡áž”áŸ‹â€‹áž˜áž€â€‹ážœáž·áž‰â€‹áž¡áž¾áž™Â áŸ”"
+
+#: mailbox.php:258
+msgid "No messages matched your search."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážŸáž¶ážšážŠáŸ‚áž›â€‹â€‹áž•áŸ’áž‚áž¼áž•áŸ’áž‚áž„â€‹áž‘áŸ…â€‹áž“áž¹áž„â€‹áž€áž¶ážšâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: pgp.php:195
+msgid "No personal PGP private key imported."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ PGP áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž“áž¶áŸ†áž…áž¼áž›Â áŸ”"
+
+#: pgp.php:171
+msgid "No personal PGP public key imported."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“â€‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž“áž¶áŸ†áž…áž¼áž›Â áŸ”"
+
+#: smime.php:197
+msgid "No personal S/MIME certificates imported."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážš S/MIME áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž“áž¶áŸ†áž…áž¼áž›Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:246
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr "áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“â€‹áž¡áž¾áž™ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹ážŸáž¶ážšâ€‹áž“áž¹áž„â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž˜áž€â€‹áž‡áž¶â€‹áž—áž¶áž–â€‹áž’áž˜áŸ’áž˜ážáž¶â€‹ážœáž·áž‰â€‹áž¡áž¾áž™Â áŸ”"
+
+#: spelling.php:190
+msgid "No spellchecking program configured."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹áž–áž·áž“áž·ážáŸ’áž™â€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶â€‹ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’Â áŸ”"
+
+#: compose.php:993
+msgid "No suggestions"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž™áŸ„áž”áž›áŸ‹"
+
+#: lib/IMAP/Client.php:561
+msgid "No supported IMAP authentication method could be found."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážšáž€ážƒáž¾áž‰â€‹ážœáž·áž’áž¸ážŸáž¶ážŸáŸ’ážáŸ’ážšâ€‹áž•áŸ’áž‘áŸ€áž„áž•áŸ’áž‘áž¶ážáŸ‹ IMAP ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážšÂ áŸ”"
+
+#: acl.php:67 acl.php:93
+msgid "No user specified."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:704
+msgid "Non Participant"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž¢áŸ’áž“áž€â€‹áž…áž¼áž›ážšáž½áž˜"
+
+#: templates/prefs/folderselect.inc:24 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: templates/prefs/trashselect.inc:24 lib/MIME/Viewer/itip.php:661
+#: templates/mailbox/navbar.html:8
+msgid "None"
+msgstr "áž‚áŸ’áž˜áž¶áž“"
+
+#: compose.php:1205
+msgid "Normal"
+msgstr "áž’áž˜áŸ’áž˜ážáž¶"
+
+#: templates/mailbox/navbar.html:18 templates/mailbox/navbar.html:34
+msgid "Not Deleted"
+msgstr "áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž›áž»áž”"
+
+#: templates/message/navbar_navigate.html:12 templates/mailbox/navbar.html:20
+#: templates/mailbox/navbar.html:37
+msgid "Not Draft"
+msgstr "áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„"
+
+#: templates/message/navbar_navigate.html:8 templates/mailbox/navbar.html:14
+#: templates/mailbox/navbar.html:29
+msgid "Not Important"
+msgstr "áž˜áž·áž“â€‹ážŸáŸ†ážáž¶áž“áŸ‹"
+
+#: templates/mailbox/navbar.html:22
+msgid "Not Personal"
+msgstr "áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr "áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœâ€‹áž˜áž½áž™Â áŸ”"
+
+#: config/prefs.php.dist:707
+msgid "Not at all"
+msgstr "áž¢ážáŸ‹â€‹ážŸáŸ„áŸ‡"
+
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr "áž…áŸ†ážŽáž¶áŸ†â€‹ážáž¶â€‹ ážœáž¶â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹áž–áŸáž›â€‹ážœáŸáž›áž¶â€‹áž”áž“áŸ’ážáž·áž…â€‹áž”áž“áŸ’ážáž½áž…"
+
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž¢áŸ’ážœáž¸â€‹ážŸáŸ„áŸ‡"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "ážŸáŸáž…áž€áŸ’ážŠáž¸â€‹áž‡áž¼áž“â€‹ážŠáŸ†ážŽáž¹áž„Â áŸ– áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž¶áž‰áž™áž€â€‹áž áž¾áž™Â áŸ”"
+
+#: config/prefs.php.dist:378
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "áž…áŸ†áž“áž½áž“â€‹ážáŸ‚â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹ážšáž€áŸ’ážŸáž¶áž¯áž€ážŸáž¶ážšáž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áž¶ážŸáŸ‹ áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž›áž»áž”â€‹ážšáž¶áž›áŸ‹â€‹ážáŸ‚Â áŸ”"
+
+#: config/prefs.php.dist:360
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr "áž…áŸ†áž“áž½áž“áž“áŸƒâ€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€ áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾áž›áž»áž”â€‹ážšáž¶áž›áŸ‹â€‹ážáŸ‚Â áŸ”"
+
+#: templates/contacts/contacts.html:73
+msgid "OK"
+msgstr "áž™áž›áŸ‹â€‹áž–áŸ’ážšáž˜"
+
+#: templates/smime/import_key.inc:49 templates/search/search.html:49
+#: templates/pgp/import_key.html:30
+msgid "OR"
+msgstr "áž¬"
+
+#: search.php:324
+msgid "Old messages"
+msgstr "ážŸáž¶ážšâ€‹áž…áž¶ážŸáŸ‹"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "ážáž \"ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾\" áž…áž¶ážŸáŸ‹â€‹áž€áŸ†áž–áž»áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹Â áŸ”"
+
+#: lib/Block/summary.php:33
+msgid "Only display folders with unread messages in them?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážáŸ‚â€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹áž¢áž¶áž“Â ?"
+
+#: templates/javascript/folders.js:81
+msgid "Only one folder should be selected for this action."
+msgstr "ážáŸ‚â€‹ážážâ€‹áž˜áž½áž™â€‹áž”áŸ‰áž»ážŽáŸ’ážŽáŸ„áŸ‡ áž‚áž½ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž¢áŸ†áž–áž¾â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: lib/IMP.php:858 lib/IMP.php:863
+msgid "Open Fo_lder"
+msgstr "_Láž”áž¾áž€â€‹ážáž "
+
+#: lib/IMAP/Tree.php:422
+msgid "Opened Folder"
+msgstr "ážážâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž¾áž€"
+
+#: lib/MIME/Viewer/itip.php:700
+msgid "Optional Participant"
+msgstr "áž¢áŸ’áž“áž€â€‹áž…áž¼áž›â€‹ážšáž½áž˜â€‹ážŸáŸ’ážšáŸáž…â€‹áž›áž¾â€‹áž…áž·ážáŸ’áž"
+
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr "áž‚ážŽáž“áž¸â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž•áŸ’ážŸáŸáž„áŸ—"
+
+#: config/prefs.php.dist:111 config/prefs.php.dist:120
+#: config/prefs.php.dist:127 config/prefs.php.dist:134
+#: config/prefs.php.dist:142 config/prefs.php.dist:151
+msgid "Other Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž•áŸ’ážŸáŸáž„áŸ—"
+
+#: templates/login/login.html:101
+msgid "Outbound Server"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ…"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:212 lib/MIME/Viewer/pgp.php:293
+msgid "PGP"
+msgstr "PGP"
+
+#: lib/IMP.php:1316
+msgid "PGP Encrypt Message"
+msgstr "PGP Encrypt Message"
+
+#: lib/Compose.php:1144
+msgid "PGP Error: "
+msgstr "áž€áŸ†áž áž»ážŸ PGPÂ áŸ– "
+
+#: lib/Compose.php:1123
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr "áž€áŸ†áž áž»ážŸ PGPÂ áŸ– ážáŸ’ážšáž¼ážœáž€áž¶ážšâ€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“Â áŸ”"
+
+#: config/prefs.php.dist:143
+msgid "PGP Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸ PGP"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr "áž€áž¶ážšâ€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážšáž”ážŸáŸ‹ PGP"
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr "áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážšáž‚áž¼â€‹áž€áž¼áž“ážŸáŸ„â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ PGP áž‘áž¶áž˜áž‘áž¶ážšâ€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž”ážŽáŸ’ážáž¶áž‰â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–Â áŸ”"
+
+#: pgp.php:155
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ \"%s (%s)\"  ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: pgp.php:251
+#, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr "PGP Public Keyring"
+
+#: lib/IMP.php:1317
+msgid "PGP Sign Message"
+msgstr "PGP Sign Message"
+
+#: lib/IMP.php:1318
+msgid "PGP Sign/Encrypt Message"
+msgstr "PGP Sign/Encrypt Message"
+
+#: pgp.php:208
+msgid "PGP private key successfully added."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ PGP ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: pgp.php:183
+msgid "PGP public key successfully added."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr "áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš PGP ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž›áŸ‚áž„â€‹áž”áž¶áž“â€‹ áž›áž¾â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+"áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš PGP áž‘áž¶áž˜áž‘áž¶ážšâ€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž›áŸáž…áž¡áž¾áž„Â áŸ” áž”áž¾â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž›áŸáž…áž¡áž¾áž„â€‹áž”áŸ’ážšáž¾â€‹áž›áŸ‚áž„â€‹"
+"áž”áž¶áž“ áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž“áŸáŸ‡ áž”áž¾â€‹áž–áž»áŸ†â€‹áž“áŸ„áŸ‡â€‹áž‘áŸâ€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸ PGP áž“áž¹áž„â€‹áž˜áž·áž“â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/IMAP.php:175
+msgid "POP3"
+msgstr "POP3"
+
+#: lib/Fetchmail/imap.php:102
+msgid "POP3 (Auto Detect Protocols)"
+msgstr "POP3 (Auto Detect Protocols)"
+
+#: lib/IMAP.php:187
+msgid "POP3 over SSL"
+msgstr "POP3 áž›áž¾ SSL"
+
+#: lib/IMAP.php:193
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 áž›áž¾ SSL (ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŠáŸ„áž™â€‹ážáŸ’áž›áž½áž“â€‹áž¯áž„)"
+
+#: lib/IMAP.php:181
+msgid "POP3, no TLS"
+msgstr "POP3 áž‚áŸ’áž˜áž¶áž“ TLS"
+
+#: mailbox.php:374
+#, php-format
+msgid "Page %d of %d"
+msgstr "áž‘áŸ†áž–áŸážš %d áž“áŸƒ %d"
+
+#: config/prefs.php.dist:914
+msgid "Page with the First Unseen Message"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹ážŠáŸ†áž”áž¼áž„"
+
+#: config/prefs.php.dist:915
+msgid "Page with the Last Unseen Message"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž”áž¶áž“áž˜áž¾áž›â€‹â€‹áž…áž»áž„â€‹áž€áŸ’ážšáŸ„áž™"
+
+#: message.php:666
+msgid "Part(s)"
+msgstr "áž•áŸ’áž“áŸ‚áž€"
+
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr "ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹"
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr "ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹ (áž˜áŸ’ážáž„â€‹áž‘áŸ€áž)"
+
+#: smime.php:231 pgp.php:316
+msgid "Passphrase successfully unloaded."
+msgstr "ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¾â€‹áž…áŸáž‰â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr "ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹Â áŸ–"
+
+#: pgp.php:118
+msgid "Passphrases cannot be empty"
+msgstr "ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž‘áž‘áŸâ€‹áž”áž¶áž“â€‹áž¡áž¾áž™"
+
+#: pgp.php:120
+msgid "Passphrases do not match"
+msgstr "ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž˜áž·áž“â€‹áž•áŸ’áž‚áž¼áž•áŸ’áž‚áž„"
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.html:90
+msgid "Password"
+msgstr "áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹"
+
+#: templates/fetchmail/manage.inc:48
+msgid "Perform maintenance operations on login?"
+msgstr "áž’áŸ’ážœáž¾â€‹áž”áŸ’ážšážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹ážáŸ†áž áŸ‚áž‘áž¶áŸ† áž–áŸáž›â€‹áž…áž¼áž›Â ?"
+
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
+msgstr "ážŸáž·áž‘áŸ’áž’áž·â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾â€‹áž“áŸáŸ‡ áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: message.php:460 mailbox.php:806 mailbox.php:975
+#: templates/mailbox/navbar.html:21 templates/mailbox/legend.html:8
+msgid "Personal"
+msgstr "áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: pgp.php:126
+msgid "Personal PGP keypair generated successfully."
+msgstr "áž‚áž¼â€‹áž€áž¼áž“ážŸáŸ„ PGP áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: pgp.php:133
+msgid "Personal PGP keys deleted successfully."
+msgstr "áž€áž¼áž“ážŸáŸ„ PGP áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: smime.php:203
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážš S/MIME áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž“áž¶áŸ†â€‹áž…áž¼áž›â€‹áž¡áž¾áž™Â áŸ–"
+
+#: smime.php:128
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "áž€áž¼áž“ážŸáŸ„ S/MIME áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“â€‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: config/prefs.php.dist:223
+msgid "Place your signature before replies and forwards?"
+msgstr "ážŠáž¶áž€áŸ‹â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž˜áž»áž“â€‹áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž” áž“áž·áž„ áž”áž‰áŸ’áž‡áž¼áž“áž”áž“áŸ’ážÂ ?"
+
+#: lib/Compose.php:358
+msgid "Plaintext Version of Message"
+msgstr "áž€áŸ†ážŽáŸ‚â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž’áž˜áŸ’áž˜ážáž¶â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: config/prefs.php.dist:811
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"áž…áž¶áž€áŸ‹â€‹ážŸáž˜áŸ’áž›áŸáž„â€‹áž–áŸáž›â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸Â ?  ážœáž¶â€‹áž‘áž¶áž˜áž‘áž¶ážšâ€‹áž²áŸ’áž™â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž¯áž€ážŸáž¶ážšâ€‹ážŸáž˜áŸ’áž›áŸáž„â€‹áž”áž„áŸ’áž€áž”áŸ‹Â áŸ”  áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹"
+"ážšáž»áž€ážšáž€â€‹ážŸáŸ’áž‘áž¾ážšâ€‹ážáŸ‚â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹â€‹áž“áŸ…â€‹áž›áž¾ Windows áž“áž·áž„ Mac áž”áž¶áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážš áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹ážœáŸáž‘áž·áž€áž¶â€‹áž•áŸ’ážŸáŸáž„â€‹áž‘áŸ€ážâ€‹áž“áž¹áž„â€‹áž‘áž¶áž˜áž‘áž¶ážšâ€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹áž‡áŸ†áž“áž½áž™â€‹"
+"ážáž¶áž„â€‹áž€áŸ’áž“áž»áž„â€‹áž˜áž½áž™Â áŸ”"
+
+#: templates/message/javascript.inc:70 templates/mailbox/javascript.inc:195
+msgid "Please enter a name for the new folder:"
+msgstr "ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž˜áž½áž™ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážážâ€‹ážáŸ’áž˜áž¸Â áŸ–"
+
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
+msgid "Please enter the name of the new folder:"
+msgstr "ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážšáž”ážŸáŸ‹â€‹ážážâ€‹ážáŸ’áž˜áž¸Â áŸ–"
+
+#: templates/javascript/folders.js:139
+msgid "Please enter the new name:"
+msgstr "ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážáŸ’áž˜áž¸Â áŸ–"
+
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+"ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ PGP ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ” áž¢áŸ’áž“áž€â€‹áž…áž¶áŸ†áž”áž¶áž…áŸ‹â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž“áŸáŸ‡â€‹ážáŸ‚â€‹áž˜áž½áž™â€‹ážŠáž„ áž€áŸ’áž“áž»áž„â€‹áž˜áž½áž™â€‹"
+"ážŸáž˜áŸáž™ %sÂ áŸ”"
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+"ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ S/MIME ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ” áž¢áŸ’áž“áž€â€‹áž…áž¶áŸ†áž”áž¶áž…áŸ‹â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž“áŸáŸ‡â€‹ážáŸ‚â€‹áž˜áž½áž™â€‹ážŠáž„ áž€áŸ’áž“áž»áž„â€‹"
+"áž˜áž½áž™â€‹ážŸáž˜áŸáž™ %sÂ áŸ”"
+
+#: login.php:180
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+"ážŸáž¼áž˜â€‹áž…áž¼áž›â€‹áž˜áŸ’ážáž„â€‹áž‘áŸ€áž ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áž“áŸ’ážâ€‹ážáŸ‚áž„â€‹ážŸáž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž€áŸ†áž–áž»áž„â€‹áž”áŸ’ážšáž¾â€‹ážáž¼áž‚áž¸ áž“áž·áž„ áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹ážáŸ‚áž„â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹"
+"áž›áŸáž…áž¡áž¾áž„ áž¢áŸ’áž“áž€áž…áž¶áŸ†áž”áž¶áž…áŸ‹ážáŸ’ážšáž¼ážœâ€‹áž…áž¼áž›â€‹áž˜áŸ’ážáž„â€‹áž‘áŸ€áž áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž˜áŸâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž•áž„â€‹ážŠáŸ‚ážšÂ áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹ážšáž¶ážšáž¶áŸ†áž„â€‹áž¢áŸ’áž“áž€â€‹ážœáž¶áž™â€‹áž”áŸ’ážšáž áž¶ážšâ€‹áž–áž¸â€‹"
+"áž€áž¶ážšâ€‹áž”áŸ’áž›áž“áŸ‹â€‹áž¢ážáŸ’ážážŸáž‰áŸ’áž‰áž¶ážŽâ€‹ážŸáž˜áŸáž™â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ” áž™áž¾â€‹áž„â€‹ážŸáž¼áž˜â€‹áž‘áŸ„ážŸâ€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž—áž¶áž–â€‹áž˜áž·áž“â€‹áž„áž¶áž™ážŸáŸ’ážšáž½áž›â€‹ážŽáž¶áž˜áž½áž™Â áŸ”"
+
+#: templates/login/javascript.inc:36
+msgid "Please provide your password."
+msgstr "ážŸáž¼áž˜â€‹áž•áŸ’ážáž›áŸ‹â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: templates/login/javascript.inc:32
+msgid "Please provide your username."
+msgstr "ážŸáž¼áž˜â€‹áž•áŸ’ážáž›áŸ‹â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾â€‹ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: compose.php:106 lib/Compose.php:2398
+msgid "Please resolve ambiguous or invalid addresses."
+msgstr "ážŸáž¼áž˜â€‹ážŠáŸ„áŸ‡â€‹ážŸáŸ’ážšáž¶áž™â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž…áŸ’áž”áž¶ážŸáŸ‹ áž¬ áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœÂ áŸ”"
+
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "ážŸáž¼áž˜â€‹áž‡áŸ’ážšáž¾ážŸâ€‹ážážâ€‹áž˜áž½áž™ áž˜áž»áž“â€‹áž“áž¹áž„â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšážáž·áž”ážáŸ’ážáž·â€‹áž¢áŸ†áž–áž¾â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: templates/search/javascript.inc:41
+msgid "Please select at least one folder to search."
+msgstr "ážŸáž¼áž˜â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž™áŸ‰áž¶áž„â€‹áž áŸ„áž…â€‹ážŽáž¶ážŸáŸ‹â€‹ážážâ€‹áž˜áž½áž™ ážŠáž¾áž˜áŸ’áž”áž¸â€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€Â áŸ”"
+
+#: templates/javascript/folders.js:12
+msgid "Please select only one folder for this operation."
+msgstr "ážŸáž¼áž˜â€‹áž‡áŸ’ážšáž¾ážŸâ€‹ážážâ€‹ážáŸ‚â€‹áž˜áž½áž™â€‹áž‚ážáŸ‹ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž”áŸ’ážšážáž·áž”ážáŸ’ážáž·áž€áž¶ážšâ€‹áž“áŸáŸ‡Â áŸ”"
+
+#: templates/compose/redirect.html:39
+msgid "Please select or edit in the box to the right:"
+msgstr "ážŸáž¼áž˜â€‹áž‡áŸ’ážšáž¾ážŸ áž¬ áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹áž€áŸ’áž“áž»áž„â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áŸ…â€‹ážáž¶áž„â€‹ážŸáŸ’ážáž¶áŸ†Â áŸ–"
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹ážŠáž¾ážšâ€‹ážŠáŸ„áž™ Horde"
+
+#: config/prefs.php.dist:215
+msgid "Precede your signature with dashes ('-- ')?"
+msgstr "áž“áž¶áŸ†â€‹áž˜áž»ážâ€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážŠáŸ„áž™â€‹ážŸáž‰áŸ’áž‰áž¶â€‹ážŠáž¶áž…áŸ‹áŸ— ('-- ')Â ?"
+
+#: smime.php:237 pgp.php:263 filterprefs.php:41
+msgid "Preferences successfully updated."
+msgstr "áž…áŸ†ážŽáž„áŸ‹â€‹áž…áŸ†ážŽáž¼áž›áž…áž·ážáŸ’áž â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž‘áž¶áž“áŸ‹â€‹ážŸáž˜áŸáž™â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·Â áŸ”"
+
+#: compose.php:1347 templates/compose/compose.html:314
+msgid "Preview"
+msgstr "áž˜áž¾áž›â€‹áž‡áž¶â€‹áž˜áž»áž“"
+
+#: message.php:513 message.php:699
+msgid "Previous Message"
+msgstr "ážŸáž¶ážšâ€‹áž˜áž»áž“"
+
+#: mailbox.php:434
+msgid "Previous Page"
+msgstr "áž‘áŸ†áž–áŸážšâ€‹áž˜áž»áž“"
+
+#: message.php:594
+msgid "Print"
+msgstr "áž”áŸ„áŸ‡áž–áž»áž˜áŸ’áž–"
+
+#: message.php:655
+msgid "Priority"
+msgstr "áž¢áž¶áž‘áž·áž—áž¶áž–"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr "áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážšáž”ážŸáŸ‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“"
+
+#: config/prefs.php.dist:571
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr "ážšáŸ†áž›áž¹áž€â€‹ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹â€‹áž–áŸáž›â€‹ážŠáŸ‚áž›â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž˜áž½áž™â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾Â áŸ” áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜áž‚ážºâ€‹áž‘áŸÂ áŸ”"
+
+#: config/prefs.php.dist:570
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr "ážšáŸ†áž›áž¹áž€â€‹ážšáŸ€áž„â€‹ážšáž¶áž›áŸ‹â€‹áž–áŸáž›â€‹ážŠáŸ‚áž›â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž˜áž½áž™â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾Â áŸ” áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜áž‚ážºâ€‹áž”áž¶áž‘Â áŸ”"
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr "áž–áž·áž’áž¸áž€áž¶ážšÂ áŸ–"
+
+#: lib/Crypt/PGP.php:430
+msgid "Public PGP keyserver support has been disabled."
+msgstr "áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž€áž¼áž“ážŸáŸ„ PGP ážŸáž¶áž’áž¶ážšážŽáŸˆ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž›áŸ‚áž„â€‹áž”áž¶áž“Â áŸ”"
+
+#: mailbox.php:388 mailbox.php:483
+msgid "Pur_ge Deleted"
+msgstr "_Gáž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹ \"áž”áž¶áž“â€‹áž›áž»áž”\" "
+
+#: mailbox.php:388 mailbox.php:483
+msgid "Purge Deleted"
+msgstr "áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹ \"áž”áž¶áž“â€‹áž›áž»áž”\" "
+
+#: templates/folders/actions.html:26
+msgid "Purge Folder(s)"
+msgstr "áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹ážáž"
+
+#: config/prefs.php.dist:397
+msgid "Purge Trash how often:"
+msgstr "áž…áŸ†áž“áž½áž“â€‹ážŠáž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹ážŸáŸ†ážšáž¶áž˜Â áŸ–"
+
+#: config/prefs.php.dist:406
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr "áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜ ážŠáŸ‚áž›â€‹áž…áž¶ážŸáŸ‹â€‹áž‡áž¶áž„â€‹áž…áŸ†áž“áž½áž“â€‹ážáŸ’áž„áŸƒâ€‹áž“áŸáŸ‡Â áŸ”"
+
+#: config/prefs.php.dist:387
+msgid "Purge old messages in the Trash folder?"
+msgstr "áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹ážŸáž¶ážšâ€‹áž…áž¶ážŸáŸ‹â€‹áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜Â ?"
+
+#: lib/Maintenance/Task/purge_trash.php:65
+#, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "áž€áŸ†áž–áž»áž„â€‹áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“ %d áž–áž¸â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜Â áŸ”"
+
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "áž€áŸ†áž–áž»áž„â€‹áž›áž»áž”â€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹ážŸáž¶ážšâ€‹áž…áŸ†áž“áž½áž“ áŸ¡ áž–áž¸â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜Â áŸ”"
+
+#: lib/IMP.php:917
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "ážŸáŸ’ážáž¶áž“áž—áž¶áž–â€‹áž€áž¼ážáž¶Â áŸ– %.2fMB / %.2fMB  (%.2f%%)"
+
+#: lib/IMP.php:921
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "ážŸáŸ’ážáž¶áž“áž—áž¶áž–â€‹áž€áž¼ážáž¶Â áŸ– %.2fMB / áž‚áŸ’áž˜áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹"
+
+#: lib/IMP.php:924
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr "ážŸáŸ’ážáž¶áž“áž—áž¶áž–â€‹áž€áž¼ážáž¶Â áŸ– áž‚áŸ’áž˜áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹"
+
+#: config/prefs.php.dist:501
+#, php-format
+msgid "Quoting %f:"
+msgstr "ážŸáž˜áŸ’ážšáž„áŸ‹ %fÂ áŸ–"
+
+#: templates/folders/actions.html:31
+msgid "Rebuild Folder Tree"
+msgstr "ážŸáŸ’ážáž¶áž”áž“áž¶â€‹áž˜áŸ‚áž€áž’áž¶áž„â€‹ážážâ€‹áž¡áž¾áž„â€‹ážœáž·áž‰"
+
+#: lib/Search.php:631
+msgid "Received On"
+msgstr "áž”áž¶áž“â€‹áž‘áž‘áž½áž› â€‹áž“áŸ…â€‹ážáŸ’áž„áŸƒ"
+
+#: lib/Search.php:639
+msgid "Received Since"
+msgstr "áž”áž¶áž“â€‹áž‘áž‘áž½áž›â€‹ áž…áž¶áž”áŸ‹â€‹ážáž¶áŸ†áž„â€‹áž–áž¸"
+
+#: lib/Search.php:635
+msgid "Received Until"
+msgstr "áž”áž¶áž“â€‹áž‘áž‘áž½áž› ážšáž áž¼ážážŠáž›áŸ‹"
+
+#: message.php:556
+msgid "Redirec_t"
+msgstr "_Táž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸ "
+
+#: message.php:556
+msgid "Redirect"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸ"
+
+#: templates/compose/redirect.html:77
+msgid "Redirect Message"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸâ€‹ážŸáž¶ážš"
+
+#: compose.php:433
+msgid "Redirect this message"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸâ€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡"
+
+#: compose.php:496
+msgid "Redirecting failed."
+msgstr "áž€áž¶ážšâ€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸâ€‹áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™Â áŸ”"
+
+#: folders.php:276
+msgid "Refresh"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹ážŸáŸ’ážšážŸáŸ‹"
+
+#: config/prefs.php.dist:796
+msgid "Refresh Folder Views:"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹ážšáž”ážŸáŸ‹â€‹ážážâ€‹ážŸáŸ’ážšážŸáŸ‹Â áŸ–"
+
+#: mailbox.php:349
+msgid "Reload"
+msgstr "áž•áŸ’áž‘áž»áž€â€‹áž¡áž¾áž„â€‹ážœáž·áž‰"
+
+#: folders.php:266
+msgid "Reload View"
+msgstr "áž•áŸ’áž‘áž»áž€â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹áž¡áž¾áž„â€‹ážœáž·áž‰"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
+msgid "Remember the free/busy information."
+msgstr "áž…áž„áž…áž¶áŸ†â€‹áž–áŸážáŸŒáž˜áž¶áž“ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹Â áŸ”"
+
+#: config/prefs.php.dist:990
+msgid "Remember the last view"
+msgstr "áž…áž„áž…áž¶áŸ†â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹áž…áž»áž„â€‹áž€áŸ’ážšáŸ„áž™"
+
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž†áŸ’áž„áž¶áž™Â áŸ–"
+
+#: search.php:320
+msgid "Remove Field From Search"
+msgstr "áž™áž€â€‹ážœáž¶áž›â€‹áž…áŸáž‰â€‹áž–áž¸â€‹áž€áž¶ážšâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "áž™áž€â€‹áž”áŸ’ážšáž—áž–â€‹áž…áŸáž‰"
+
+#: templates/folders/actions.html:10
+msgid "Rename Folder(s)"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážáž"
+
+#: config/prefs.php.dist:342
+msgid "Rename sent-mail folder at beginning of month?"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾ áž“áŸ…â€‹áž–áŸáž›â€‹áž…áž¶áž”áŸ‹â€‹áž•áŸ’ážáž¾áž˜â€‹áž“áŸƒâ€‹ážáŸ‚Â ?"
+
+#: lib/Folder.php:463
+#, php-format
+msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
+msgstr "áž€áž¶ážšâ€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡ \"%s\" áž‘áŸ… \"%s\" áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: message.php:543
+msgid "Repl_y to List"
+msgstr "_Yáž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž”áž‰áŸ’áž‡áž¸ "
+
+#: templates/compose/spelling.html:50
+msgid "Replace with:"
+msgstr "áž‡áŸ†áž“áž½ážŸâ€‹ážŠáŸ„áž™Â áŸ–"
+
+#: message.php:540
+msgid "Reply"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
+msgid "Reply Sent."
+msgstr "áž€áž¶ážšâ€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾"
+
+#: message.php:549
+msgid "Reply to All"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹"
+
+#: compose.php:406
+msgid "Reply to All:"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹Â áŸ–"
+
+#: message.php:543
+msgid "Reply to List"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž”áž‰áŸ’áž‡áž¸"
+
+#: compose.php:408
+msgid "Reply to List:"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹áž”áž‰áŸ’áž‡áž¸Â áŸ–"
+
+#: message.php:549
+msgid "Reply to _All"
+msgstr "_Aáž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ "
+
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
+msgid "Reply with Not Supported Message"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹ážŠáŸ„áž™â€‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážš"
+
+#: lib/MIME/Viewer/itip.php:537
+msgid "Reply with free/busy for next 2 months."
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”ážŠáŸ„áž™ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ áŸ¢ ážáŸ‚â€‹áž”áž“áŸ’áž‘áž¶áž”áŸ‹Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:536
+msgid "Reply with requested free/busy information."
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹ážŠáŸ„áž™â€‹â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹ ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†Â áŸ”"
+
+#: message.php:236
+msgid "Reply-To"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹-áž‘áŸ…"
+
+#: lib/Compose.php:1549
+msgid "Reply-To: "
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹-áž‘áŸ…Â áŸ– "
+
+#: compose.php:404
+msgid "Reply:"
+msgstr "áž†áŸ’áž›áž¾áž™â€‹ážáž”Â áŸ–"
+
+#: message.php:607 mailbox.php:514
+msgid "Report as Innocent"
+msgstr "ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹ážáž¶â€‹áž›áŸ’áž¢"
+
+#: message.php:599 mailbox.php:506
+msgid "Report as Spam"
+msgstr "ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš"
+
+#: compose.php:1270
+msgid "Request a _Read Receipt"
+msgstr "_RážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†â€‹áž”áž„áŸ’áž€áž¶áž“áŸ‹â€‹ážŠáŸƒâ€‹áž¢áž¶áž“â€‹áž˜áž½áž™ "
+
+#: config/prefs.php.dist:585
+msgid "Request read receipts?"
+msgstr "ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†â€‹áž”áž„áŸ’áž€áž¶áž“áŸ‹â€‹ážŠáŸƒâ€‹áž¢áž¶áž“Â ?"
+
+#: mailbox.php:131
+msgid "Requested message not found."
+msgstr "ážšáž€â€‹áž˜áž·áž“â€‹ážƒáž¾áž‰â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:692
+msgid "Required Participant"
+msgstr "áž¢áŸ’áž“áž€â€‹áž…áž¼áž›â€‹ážšáž½áž˜â€‹ážŠáŸ‚áž›â€‹áž‘áž¶áž˜áž‘áž¶ážš"
+
+#: templates/acl/acl.inc:162 templates/search/search.html:29
+#: templates/search/search.html:181
+msgid "Reset"
+msgstr "áž€áŸ†ážŽážáŸ‹â€‹áž¡áž¾áž„â€‹ážœáž·áž‰"
+
+#: lib/MIME/Viewer/itip.php:116
+msgid "Respondent Status Updated."
+msgstr "ážŸáŸ’ážáž¶áž“áž—áž¶áž–â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž‘áž¶áž“áŸ‹â€‹ážŸáž˜áŸáž™Â áŸ”"
+
+#: message.php:587
+msgid "Resume"
+msgstr "áž’áŸ’ážœáž¾â€‹áž”áž“áŸ’áž"
+
+#: login.php:181
+msgid "Resume your session"
+msgstr "áž’áŸ’ážœáž¾â€‹áž”áž“áŸ’ážâ€‹ážŸáž˜áŸáž™â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ… \"áž€áž¶ážšâ€‹ážáŸ‚áž„â€‹ážŸáž¶ážš\""
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹ \"áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážš\""
+
+#: filterprefs.php:53 templates/smime/smime.inc:101
+#: templates/smime/notactive.inc:15 templates/pgp/pgp.inc:149
+#: templates/pgp/notactive.inc:15 templates/acl/acl.inc:163
+#: templates/acl/acl.inc:175
+msgid "Return to Options"
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž‡áž˜áŸ’ážšáž¾ážŸ"
+
+#: config/prefs.php.dist:730
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr "ážáŸ’ážšáž¡áž”áŸ‹â€‹áž‘áŸ…â€‹áž€áž¶ážšâ€‹ážšáž¶áž™â€‹ážšáž”ážŸáŸ‹â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážš áž”áž“áŸ’áž‘áž¶áž”áŸ‹áž–áž¸â€‹áž›áž»áž” áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸ áž¬ áž…áž˜áŸ’áž›áž„â€‹ážŸáž¶ážšâ€‹áž˜áž½áž™Â ?"
+
+#: lib/MIME/Viewer/itip.php:683
+msgid "Role"
+msgstr "ážáž½áž“áž¶áž‘áž¸"
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: lib/IMP.php:1321
+msgid "S/MIME Encrypt Message"
+msgstr "S/MIME Encrypt Message"
+
+#: lib/Compose.php:1176
+msgid "S/MIME Error: "
+msgstr "áž€áŸ†áž áž»ážŸ S/MIMEÂ áŸ– "
+
+#: lib/Compose.php:1155
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "áž€áŸ†áž áž»ážŸ S/MIMEÂ áŸ– ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“Â áŸ”"
+
+#: config/prefs.php.dist:152
+msgid "S/MIME Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸ S/MIME"
+
+#: smime.php:46
+msgid "S/MIME Passphrase Input"
+msgstr "áž€áž¶ážšâ€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹ S/MIME"
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr "áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž‚áž¼â€‹áž€áž¼áž“ážŸáŸ„â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“ S/MIME áž‘áž¶áž˜â€‹áž‘áž¶ážšâ€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážáž¶áž˜â€‹áž”ážŽáŸ’ážáž¶áž‰â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–Â áŸ”"
+
+#: smime.php:136
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ S/MIME ážŸáž˜áŸ’ážšáž¶áž”áŸ‹ \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: smime.php:158
+msgid "S/MIME Public Key successfully added."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ S/MIME ážáŸ’ážšáž¼â€‹ážœáž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr "S/MIME Public Keyring"
+
+#: smime.php:207
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "áž‚áž¼â€‹áž€áž¼áž“ážŸáŸ„ ážŸáž¶áž’áž¶ážšážŽáŸˆ/áž¯áž€áž‡áž“ S/MIME ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: lib/IMP.php:1322
+msgid "S/MIME Sign Message"
+msgstr "S/MIME Sign Message"
+
+#: lib/IMP.php:1323
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "S/MIME Sign/Encrypt Message"
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr "áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš S/MIMEâ€‹ áž‚ážºâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž›áŸ‚áž„â€‹áž”áž¶áž“â€‹áž›áž¾â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+"áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš S/MIME áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™áž”áŸ’ážšáž¾â€‹áž”áž¶áž“ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž˜áž€â€‹áž‡áž¶â€‹áž—áž¶áž–â€‹áž’áž˜áŸ’áž˜ážáž¶Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message cannot "
+"be displayed."
+msgstr ""
+"áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš S/MIME áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž¡áž¾áž™ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹áž˜áž¶ážáž·áž€áž¶â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹áž“áŸáŸ‡ áž“áž¹áž„â€‹áž˜áž·áž“â€‹"
+"áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš S/MIME áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž¡áž¾áž™ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŒáž¸áž‡áž¸ážáž›â€‹áž“áž¹áž„â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‘áŸ€áž„áž•áŸ’áž‘áž¶ážáŸ‹â€‹"
+"áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+"áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš S/MIME áž‘áž¶áž˜áž‘áž¶ážšâ€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž›áŸáž…áž¡áž¾áž„Â áŸ” áž”áž¾â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž›áŸáž…áž¡áž¾áž„â€‹áž”áŸ’ážšáž¾â€‹"
+"áž›áŸ‚áž„â€‹áž”áž¶áž“ áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹áž“áŸáŸ‡ áž”áž¾â€‹áž–áž»áŸ†â€‹áž“áŸ„áŸ‡â€‹áž‘áŸâ€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸ S/MIME áž“áž¹áž„â€‹áž˜áž·áž“â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœâ€‹"
+"áž¡áž¾áž™Â áŸ”"
+
+#: templates/login/login.html:105
+msgid "SMTP"
+msgstr "SMTP"
+
+#: compose.php:1179
+msgid "S_ubject"
+msgstr "_Uáž”áŸ’ážšáž’áž¶áž“â€‹áž”áž‘ "
+
+#: compose.php:1249
+msgid "Sa_ve a copy in "
+msgstr "_Vážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž…áŸ’áž”áž¶áž”áŸ‹â€‹áž…áž˜áŸ’áž›áž„â€‹áž€áŸ’áž“áž»áž„ "
+
+#: message.php:592
+msgid "Sa_ve as"
+msgstr "_Vážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž‡áž¶ "
+
+#: templates/fetchmail/manage.inc:67 templates/search/search.html:28
+#: templates/search/search.html:180
+msgid "Save"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€"
+
+#: compose.php:1323
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶áž˜áž½áž™â€‹ážŸáž¶ážšâ€‹ áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾Â ?"
+
+#: templates/compose/compose.html:23 templates/compose/compose.html:206
+msgid "Save Draft"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€ â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„"
+
+#: saveimage.php:51
+msgid "Save Image"
+msgstr "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážšáž¼áž”áž—áž¶áž–"
+
+#: lib/MIME/Contents.php:231
+msgid "Save Image in Gallery"
+msgstr "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž€áŸ’áž“áž»áž„â€‹ážœáž·áž…áž·ážáŸ’ážšážŸáž¶áž›"
+
+#: filterprefs.php:114 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+msgid "Save Options"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ áž‡áž˜áŸ’ážšáž¾ážŸ"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: compose.php:1094
+msgid "Save _Draft"
+msgstr "_Dážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážáž¸áž–áŸ’ážšáž¶áž„ "
+
+#: message.php:592
+msgid "Save as"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž‡áž¶"
+
+#: config/prefs.php.dist:522
+msgid "Save drafts as unseen?"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„â€‹áž‡áž¶â€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹áž¬Â ?"
+
+#: config/prefs.php.dist:532
+msgid "Save drafts automatically while composing?"
+msgstr "ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážŠáž¸áž–áŸ’ážšáž¶áž„â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™áž”áŸ’ážšážœážáŸ’ážáž· ážážŽáŸˆâ€‹áž–áŸáž›â€‹ážáŸ‚áž„Â ?"
+
+#: config/prefs.php.dist:1083
+msgid "Save recipients automatically to the default address book?"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž¢áŸ’áž“áž€áž‘áž‘áž½áž›â€‹áž‘áž¶áŸ†áž„áž¡áž¶áž™ áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž›áŸ†áž“áž¶áŸ†â€‹ážŠáž¾áž˜â€‹â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·Â ?"
+
+#: templates/search/search.html:172
+msgid "Save search as a virtual folder?"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž€áž¶ážšâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€ áž‡áž¶â€‹ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážáž˜áž½áž™áž¬Â ?"
+
+#: config/prefs.php.dist:231
+msgid "Save sent mail?"
+msgstr "ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“áž•áŸ’áž‰áž¾â€‹áž¬â€‹áž‘áŸÂ ?"
+
+#: lib/Compose.php:150
+msgid "Saving the draft failed. Could not create a drafts folder."
+msgstr "áž€áž¶ážšâ€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážŠáž¸áž–áŸ’ážšáž¶áž„â€‹áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™Â áŸ” áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹ážŸáŸáž…áž€áŸ’ážŠáž¸áž–áŸ’ážšáž¶áž„â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Compose.php:89
+msgid "Saving the draft failed. No draft folder specified."
+msgstr "áž€áž¶ážšâ€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážŠáž¸áž–áŸ’ážšáž¶áž„â€‹áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™Â áŸ” áž˜áž·áž“â€‹áž˜áž¶áž“â€‹ážážâ€‹ážŸáŸáž…áž€áŸ’ážŠáž¸áž–áŸ’ážšáž¶áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž›áž˜áŸ’áž¢áž·ážÂ áŸ”"
+
+#: lib/Compose.php:165
+#, php-format
+msgid "Saving the draft failed. This is what the server said: %s"
+msgstr "áž€áž¶ážšâ€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážáž¸áž–áŸ’ážšáž¶áž„â€‹áž”áž¶áž“â€‹áž”ážšáž¶áž‡áŸáž™Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“áž“áž·áž™áž¶áž™Â áŸ– %s"
+
+#: mailbox.php:356 lib/Block/tree_folders.php:39
+#: templates/contacts/contacts.html:25
+msgid "Search"
+msgstr "ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€"
+
+#: mailbox.php:356 search.php:219
+#, php-format
+msgid "Search %s"
+msgstr "ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€ %s"
+
+#: config/prefs.php.dist:121
+msgid "Search Options"
+msgstr "áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážŸáŸ’ážœáŸ‚áž„ážšáž€"
+
+#: search.php:165
+msgid "Search Results"
+msgstr "áž›áž‘áŸ’áž’áž•áž›â€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€"
+
+#: templates/mailbox/navbar.html:11 templates/mailbox/navbar.html:26
+msgid "Seen"
+msgstr "áž”áž¶áž“â€‹áž˜áž¾áž›"
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž‚ážŽáž“áž¸â€‹áž˜áž½áž™â€‹áž•áŸ’ážŸáŸáž„"
+
+#: search.php:311
+msgid "Select a date"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž€áž¶áž›áž”ážšáž·áž…áŸ’áž†áŸáž‘"
+
+#: templates/search/search.html:55
+msgid "Select a field"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹ážœáž¶áž›"
+
+#: config/prefs.php.dist:136
+msgid "Select address book sources for adding and searching for addresses."
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž”áŸ’ážšáž—áž–â€‹ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž”áž“áŸ’ážáŸ‚áž˜ áž“áž·áž„ ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“Â áŸ”â€‹"
+
+#: templates/search/search.html:141
+msgid "Select all"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹ážœáž¶áž›â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹ážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ áž–áŸáž›â€‹áž–áž„áŸ’ážšáž¸áž€â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“Â áŸ”"
+
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž‚ážŽáž“áž¸"
+
+#: templates/search/search.html:142
+msgid "Select none"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž‚áŸ’áž˜áž¶áž“"
+
+#: templates/compose/compose.html:133
+msgid "Select stationery:"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ–"
+
+#: templates/saveimage/saveimage.html:8
+msgid "Select the gallery to save the image in."
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹ážœáž·áž…áž·ážáŸ’ážšážŸáž¶áž› ážŠáž¾áž˜áŸ’áž”áž¸â€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„Â áŸ”"
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž”áŸ’ážšáž—áŸáž‘â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: templates/mailbox/navbar.html:6
+msgid "Select:"
+msgstr "áž‡áŸ’ážšáž¾ážŸÂ áŸ–"
+
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
+msgstr "ážŸáŸ€ážœáž—áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸÂ áŸ–"
+
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr "áž”áž‰áŸ’áž‡áž¼áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹áž‘áŸ…â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ"
+
+#: lib/MIME/Viewer/itip.php:597
+msgid "Send Latest Information"
+msgstr "áž•áŸ’áž‰áž¾â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹ážáŸ’áž˜áž¸â€‹áž”áŸ†áž•áž»áž"
+
+#: templates/compose/compose.html:21 templates/compose/compose.html:204
+msgid "Send Message"
+msgstr "áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážš"
+
+#: templates/compose/javascript.inc:119
+msgid "Send message without a Subject?"
+msgstr "áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšâ€‹ážŠáŸ„áž™â€‹áž‚áŸ’áž˜áž¶áž“â€‹áž”áŸ’ážšáž’áž¶áž“áž”áž‘Â ?"
+
+#: config/prefs.php.dist:715
+msgid "Send read receipt when requested by the sender?"
+msgstr "áž•áŸ’áž‰áž¾â€‹áž”áž„áŸ’áž€áž¶áž“áŸ‹ážŠáŸƒâ€‹áž”áž¶áž“â€‹áž¢áž¶áž“ áž“áŸ…â€‹áž–áŸáž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŠáŸ„áž™â€‹áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‰áž¾Â ?"
+
+#: lib/IMAP/Tree.php:385
+msgid "Sent mail folder"
+msgstr "ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾"
+
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾Â áŸ–"
+
+#: templates/login/login.html:36 templates/login/login.html:50
+#: templates/login/login.html:62
+msgid "Server"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾"
+
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ áž“áž·áž„ ážáž"
+
+#: templates/fetchmail/manage.inc:23
+msgid "Server:"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾Â áŸ–"
+
+#: config/prefs.php.dist:81
+msgid "Set preferences for what happens when you move and delete messages."
+msgstr "áž€áŸ†ážŽážáŸ‹â€‹áž…áŸ†ážŽáž„áŸ‹â€‹áž…áŸ†ážŽáž¼áž›áž…áž·ážáŸ’ážážáž¶â€‹áž¢áŸ’ážœáž¸â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¾ážáž¡áž¾áž„ áž–áŸáž›â€‹áž¢áŸ’áž“áž€â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸ áž“áž·áž„ áž›áž»áž”â€‹ážŸáž¶ážšÂ áŸ”"
+
+#: config/prefs.php.dist:541
+msgid "Set the X-Priority header when composing messages?"
+msgstr "áž€áŸ†ážŽážáŸ‹â€‹áž”áž‹áž˜áž€ážáž¶â€‹áž¢áž¶áž‘áž·áž—áž¶áž– X áž–áŸáž›â€‹ážáŸ‚áž„â€‹ážŸáž¶ážšÂ ?"
+
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr "áž…áŸ‚áž€â€‹ážšáŸ†áž›áŸ‚áž€â€‹ážáž"
+
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr "áž…áŸ‚áž€â€‹ážšáŸ†áž›áŸ‚áž€â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr "áž…áŸ‚áž€â€‹ážšáŸ†áž›áŸ‚áž€â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž‡áž¶áž˜áž½áž™â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾â€‹áž•áŸ’ážŸáŸáž„Â áŸ”"
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+"áž‡áž¶â€‹áž›áŸ†áž“áž¶áŸ†â€‹ážŠáž¾áž˜â€‹ ážáž¾â€‹áž”ážŽáŸ’ážáž»áŸ†â€‹áž’áŸ†áž“áŸƒâ€‹áž¢ážáŸ’ážáž”áž‘â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’ážšáž„áŸ‹ áž‚áž½ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž áž¶áž‰ áž¬ áž›áž¶áž€áŸ‹â€‹áž¬â€‹áž‘áŸÂ ? áž˜áž½áž™â€‹ážŽáž¶â€‹áž€áŸâ€‹ážŠáŸ„áž™â€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž‡áŸ’ážšáž¾ážŸ "
+"ážœáž¶â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž·áž‘â€‹áž”áž¾áž€â€‹ážŠáŸ„áž™â€‹áž„áž¶áž™ážŸáŸ’ážšáž½áž›Â áŸ”"
+
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr "ážáž¾â€‹ážáž½â€‹áž“áŸƒâ€‹ážŸáž¶ážšâ€‹áž¢ážáŸ’ážáž”áž‘/áž’áž˜áŸ’áž˜ážáž¶ áž‚áž½ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážœáž·áž—áž¶áž‚ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž‘áž·áž“áŸ’áž“áž“áŸáž™ PGP áž¬â€‹áž‘áŸÂ ?â€‹"
+
+#: config/prefs.php.dist:514
+msgid "Should the compose window be closed after saving a draft?"
+msgstr "ážáž¾â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážáŸ‚áž„â€‹áž‚áž½ážšâ€‹ážáŸ‚â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž·áž‘ áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž–áž¸â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„â€‹áž¬áž‘áŸÂ ?"
+
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr "ážáž¾â€‹áž€áž¼áž“â€‹ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ áž‚áž½ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹ážŸáž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹â€‹áž‡áž¶â€‹áž›áŸ†áž“áž¶áŸ†â€‹ážŠáž¾áž˜â€‹áž¬â€‹áž‘áŸÂ ?"
+
+#: templates/search/search.html:144
+msgid "Show All Folders"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážážâ€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹"
+
+#: message.php:678
+msgid "Show All Headers"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž”áž‹áž˜áž€ážáž¶â€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹"
+
+#: mailbox.php:270
+msgid "Show Deleted"
+msgstr "áž”áž„áŸ’áž áž¶áž‰ \"áž”áž¶áž“â€‹áž›áž»áž”\""
+
+#: lib/MIME/Viewer/html.php:98
+msgid "Show Images?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážšáž¼áž”áž—áž¶áž–Â ?"
+
+#: message.php:672
+msgid "Show Limited Headers"
+msgstr "áž”áž„áŸ’áž áž¶áž‰ \"áž”áž‹áž˜áž€ážáž¶â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž€áž˜áŸ’ážšáž·áž\""
+
+#: message.php:681
+msgid "Show Mailing List Information"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹ážšáž”ážŸáŸ‹â€‹áž”áž‰áŸ’áž‡áž¸â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážšáž½áž˜"
+
+#: templates/search/search.html:144
+msgid "Show Only Subscribed Folders"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážáŸ‚â€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áž¶ážœ"
+
+#: folders.php:294
+msgid "Show Unsubscribed"
+msgstr "áž”áž„áŸ’áž áž¶áž‰ \"áž”áž¶áž“â€‹ážˆáž”áŸ‹â€‹áž‡áž¶ážœ\""
+
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážšáž¼áž”â€‹ážáŸ†ážŽáž¶áž„â€‹ážŠáŸ‚áž›â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž…áŸ’áž”áž¼ážâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áŸáž‰â€‹áž–áž¸â€‹ážŸáž¶ážšâ€‹áž¬Â ?"
+
+#: config/prefs.php.dist:1013
+msgid "Show legend in the mailbox view?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážáž¶áž„ áž€áŸ’áž“áž»áž„â€‹áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ ?"
+
+#: config/prefs.php.dist:851
+msgid "Show previews for unread messages only?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž˜áž¾áž›â€‹áž‡áž¶â€‹áž˜áž»áž“ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážáŸ‚â€‹ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹áž¢áž¶áž“Â ?"
+
+#: config/prefs.php.dist:859
+msgid "Show previews in tooltips?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž˜áž¾áž›â€‹áž‡áž¶â€‹áž˜áž»áž“ áž‡áž¶â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž‡áŸ†áž“áž½áž™Â ?"
+
+#: config/prefs.php.dist:888
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážšáž¼áž”â€‹ážáŸ†ážŽáž¶áž„ \"áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážš\" áž›áž¾â€‹ážšáž”áž¶ážšâ€‹áž˜áŸ‰ážºáž“áž»áž™Â ?"
+
+#: filterprefs.php:99
+msgid "Show the filter icon on the menubar?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹ážšáž¼áž”ážáŸ†ážŽáž¶áž„â€‹ážšáž”ážŸáŸ‹â€‹ážáž˜áŸ’ážšáž„â€‹áž›áž¾â€‹ážšáž”áž¶ážšâ€‹áž˜áŸ‰ážºáž“áž»áž™Â ?"
+
+#: lib/Block/summary.php:36
+msgid "Show total number of mails in folder?"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž…áŸ†áž“áž½áž“â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŸážšáž»áž”â€‹áž€áŸ’áž“áž»áž„â€‹ážážÂ ?"
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr "áž”áž¶áž“â€‹áž”áž„áŸ’áž áž¶áž‰"
+
+#: mailbox.php:590
+msgid "Si_ze"
+msgstr "_Záž‘áŸ†áž áŸ† "
+
+#: mailbox.php:984 templates/mailbox/legend.html:15
+msgid "Signed"
+msgstr "áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶"
+
+#: templates/compose/compose.html:314
+msgid "Size:"
+msgstr "áž‘áŸ†áž áŸ†Â áŸ–"
+
+#: mailbox.php:559
+msgid "Sort by Arrival"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹áž€áž¶ážšâ€‹áž˜áž€â€‹ážŠáž›áŸ‹"
+
+#: mailbox.php:564
+msgid "Sort by Date"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹áž€áž¶áž›â€‹áž”ážšáž·áž…áŸ’áž†áŸáž‘"
+
+#: mailbox.php:574
+msgid "Sort by From Address"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ \"áž–áž¸\""
+
+#: mailbox.php:589
+msgid "Sort by Message Size"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹áž‘áŸ†áž áŸ†â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: mailbox.php:584
+msgid "Sort by Subject"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹áž”áŸ’ážšáž’áž¶áž“â€‹áž”áž‘"
+
+#: mailbox.php:579
+msgid "Sort by Thread"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹ážáŸ’ážŸáŸ‚â€‹áž¢áŸ†áž”áŸ„áŸ‡"
+
+#: mailbox.php:569
+msgid "Sort by To Address"
+msgstr "ážáž˜áŸ’ážšáŸ€áž”â€‹ážáž¶áž˜â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ \"áž‘áŸ…\""
+
+#: lib/IMAP/Tree.php:379
+msgid "Spam folder"
+msgstr "ážážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹"
+
+#: templates/prefs/spamselect.inc:23
+msgid "Spam folder:"
+msgstr "ážážâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“áž€áž¶ážšÂ áŸ–"
+
+#: compose.php:1238
+msgid "Special Characters"
+msgstr "ážáž½áž¢áž€áŸ’ážŸážšâ€‹áž–áž·ážŸáŸážŸ"
+
+#: search.php:53
+msgid "Special Virtual Folders cannot be edited."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž›â€‹ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážâ€‹áž–áž·ážŸáŸážŸâ€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: compose.php:1234
+msgid "Spell Check"
+msgstr "áž–áž·áž“áž·ážáŸ’áž™â€‹â€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’"
+
+#: templates/compose/spelling.html:19
+msgid "Spell Checker"
+msgstr "áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹áž–áž·áž“áž·ážáŸ’áž™â€‹â€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’"
+
+#: compose.php:973
+msgid "Spell check complete"
+msgstr "áž€áž¶ážšâ€‹áž–áž·áž“áž·ážáŸ’áž™â€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž…áž”áŸ‹â€‹áž‘áž¶áŸ†áž„â€‹ážŸáŸ’ážšáž»áž„"
+
+#: templates/compose/spelling.html:21
+msgid "Spell check complete - No spelling errors"
+msgstr "áž€áž¶ážšâ€‹áž–áž·áž“áž·ážáŸ’áž™áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž…áž”áŸ‹â€‹áž áž¾áž™ - áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’â€‹áž¡áž¾áž™"
+
+#: config/prefs.php.dist:472
+msgid "Spelling errors per screen when spell checking."
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’â€‹áž€áŸ’áž“áž»áž„â€‹áž˜áž½áž™â€‹áž¢áŸáž€áŸ’ážšáž„áŸ‹ áž–áŸáž›â€‹áž–áž·áž“áž·ážáŸ’áž™áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
+msgid "Start"
+msgstr "áž…áž¶áž”áŸ‹áž•áŸ’ážáž¾áž˜"
+
+#: compose.php:1219 templates/stationery/prefs.inc:9
+msgid "Stationery"
+msgstr "áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ–"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "áž”áŸ’ážšáž—áŸáž‘â€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ–"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ–"
+
+#: lib/MIME/Viewer/itip.php:683
+msgid "Status"
+msgstr "ážŸáŸ’ážáž¶áž“áž—áž¶áž–"
+
+#: lib/MIME/Contents.php:242
+msgid "Strip Attachment"
+msgstr "áž…áŸ’áž”áž¼ážâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž…áŸáž‰"
+
+#: config/prefs.php.dist:843
+msgid "Strip linebreaks?"
+msgstr "áž…áŸ’áž”áž¼ážâ€‹áž€áž¶ážšâ€‹áž…áž»áŸ‡â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹â€‹áž…áŸáž‰Â ?"
+
+#: mailbox.php:585
+msgid "Sub_ject"
+msgstr "_Jáž”áŸ’ážšáž’áž¶áž“áž”áž‘ "
+
+#: message.php:237 thread.php:152 lib/Search.php:619
+#: templates/login/recompose.html:41
+msgid "Subject"
+msgstr "áž”áŸ’ážšáž’áž¶áž“áž”áž‘"
+
+#: config/prefs.php.dist:931
+msgid "Subject Field"
+msgstr "ážœáž¶áž›â€‹â€‹áž”áŸ’ážšáž’áž¶áž“áž”áž‘"
+
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#: templates/search/search.html:28 templates/search/search.html:180
+#: templates/saveimage/saveimage.html:18
+msgid "Submit"
+msgstr "ážŠáž¶áž€áŸ‹â€‹ážŸáŸ’áž“áž¾"
+
+#: templates/folders/actions.html:13
+msgid "Subscribe to Folder(s)"
+msgstr "áž‡áž¶ážœâ€‹áž”áŸ’ážšáž…áž¶áŸ†â€‹áž‘áŸ…â€‹ážáž"
+
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:397
+#: lib/MIME/Viewer/status.php:87
+msgid "Success"
+msgstr "áž‡áŸ„áž‚áž‡áŸáž™"
+
+#: templates/compose/spelling.html:40
+msgid "Suggestions"
+msgstr "áž™áŸ„áž”áž›áŸ‹"
+
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
+msgid "Summary"
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹ážŸáž„áŸ’ážáŸáž”"
+
+#: compose.php:1275 compose.php:1276
+msgid "Switch Composition Method"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹ážœáž·áž’áž¸â€‹ážŸáž¶ážŸáŸ’ážáŸ’ážšâ€‹ážáŸ‚áž„"
+
+#: templates/compose/compose.html:189
+msgid "Switch to HTML composition"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž‘áŸ…â€‹â€‹áž€áž¶ážšážáŸ‚áž„â€‹ HTML"
+
+#: templates/compose/compose.html:189
+msgid "Switch to plain text composition"
+msgstr "áž”áŸ’ážáž¼ážšâ€‹áž‘áŸ…â€‹áž€áž¶ážšâ€‹ážáŸ‚áž„â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž’áž˜áŸ’áž˜ážáž¶"
+
+#: compose.php:1280
+msgid "Te_xt"
+msgstr "_Xáž¢ážáŸ’ážáž”áž‘ "
+
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr "áž”ážŽáŸ’ážŠáŸ„áŸ‡áž¢áž¶ážŸáž“áŸ’áž“Â áŸ– "
+
+#: lib/MIME/Viewer/itip.php:586
+msgid "Tentatively Accept request"
+msgstr "áž–áŸ’ážšáž˜â€‹áž‘áž‘áž½áž›â€‹ážŸáŸ†ážŽáž¾â€‹áž‡áž¶â€‹áž”ážŽáŸ’ážŠáŸ„áŸ‡â€‹áž¢áž¶ážŸáž“áŸ’áž“"
+
+#: lib/MIME/Viewer/itip.php:754
+msgid "Tentatively Accepted"
+msgstr "áž”áž¶áž“â€‹áž‘áž‘áž½áž›â€‹áž‡áž¶â€‹áž”ážŽáŸ’ážáŸ„áŸ‡â€‹áž¢áž¶ážŸáž“áŸ’áž“"
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž›áž€áŸ’ážážážŽáŸ’ážŒâ€‹áž“áŸƒâ€‹ážŸáŸážœáž¶ áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž€áŸ’áž“áž»áž„ conf.php"
+
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "áž¢ážáŸ’ážáž”áž‘"
+
+#: config/prefs.php.dist:965
+msgid "The From: column of the message should be linked:"
+msgstr "áž–áž¸Â áŸ– áž‡áž½ážšážˆážšâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž‚áž½ážšâ€‹ážáŸ‚â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ–"
+
+#: lib/IMAP/Client.php:530
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ IMAP áž‘áŸ†áž“áž„â€‹áž‡áž¶â€‹áž˜áž·áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹ážœáž·áž’áž¸ážŸáž¶ážŸáŸ’ážáŸ’ážšâ€‹áž•áŸ’áž‘áŸ€áž„áž•áŸ’áž‘áž¶ážáŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž¡áž¾áž™Â áŸ” ážŸáž¼áž˜â€‹áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž¢áŸ’áž“áž€â€‹áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹"
+"ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr "áž•áŸ’áž“áŸ‚áž€â€‹áž’áž“áž’áž¶áž“â€‹ážšáž”ážŸáŸ‹ Macintosh"
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr "áž•áŸ’áž“áŸ‚áž€â€‹áž’áž“áž’áž¶áž“â€‹ážšáž”ážŸáŸ‹ Macintosh áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž¶áž‰áž™áž€â€‹ %sÂ áŸ”"
+
+#: fetchmailprefs.php:81
+#, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "áž‚ážŽáž“áž¸ \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”Â áŸ”"
+
+#: fetchmailprefs.php:74
+#, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "áž‚ážŽáž“áž¸ \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€Â áŸ”"
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€ážƒáž¾áž‰Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr "áž‘áž·áž“áŸ’áž“áž“áŸáž™â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœâ€‹áž¡áž¾áž™"
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¾áž€â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážáŸ‚áž„â€‹áž”áž¶áž“â€‹áž‘áŸÂ áŸ” áž”áŸ’ážšáž áŸ‚áž›â€‹áž‡áž¶â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ áž²áŸ’áž™â€‹áž‘áž”áŸ‹â€‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž›áŸáž…â€‹áž¡áž¾áž„Â ?"
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr "áž˜áž¶ážáž·áž€áž¶â€‹ážšáž”ážŸáŸ‹â€‹áž¯áž€ážŸáž¶ážš Macintosh áž‚ážºâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ”"
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
+msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
+msgstr "ážážâ€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“ \"%s\" áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž‘áŸ…â€‹áž‡áž¶ \"%s\"Â áŸ”"
+
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž‘áŸ…â€‹áž™áž€â€‹áž”áž‰áŸ’áž‡áž¸â€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€áž”áŸ’ážšáž¾ â€‹ážŠáŸ‚áž›â€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹áž‘áŸ…â€‹ážážâ€‹áž“áŸáŸ‡"
+
+#: lib/Compose.php:178
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž–áŸ’ážšáž¶áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž‘áŸ…â€‹ážáž \"%s\"Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "The event was added to your calendar."
+msgstr "áž–áŸ’ážšáž¹ážáŸ’ážáž·áž€áž¶ážšážŽáŸâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ…â€‹áž”áŸ’ážšážáž·áž‘áž·áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: expand.php:38
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž“áŸ’áž›áž¶áž™â€‹ážœáž¶áž› \"%s\" áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Folder.php:337
+#, php-format
+msgid "The folder \"%s\" already exists"
+msgstr "ážáž \"%s\" áž˜áž¶áž“â€‹ážšáž½áž…â€‹áž áž¾áž™"
+
+#: lib/Folder.php:162
+#, php-format
+msgid ""
+"The folder \"%s\" contains illegal characters in its name. It may cause "
+"problems. Please see your system administrator."
+msgstr ""
+"ážáž \"%s\" áž˜áž¶áž“â€‹ážáž½â€‹áž¢áž€áŸ’ážŸážšâ€‹ážáž»ážŸâ€‹áž…áŸ’áž”áž¶áž”áŸ‹áž€áŸ’áž“áž»áž„â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážšáž”ážŸáŸ‹â€‹ážœáž¶Â áŸ” ážœáž¶â€‹áž¢áž¶áž…â€‹áž”áž„áŸ’áž€â€‹áž”áž‰áŸ’áž áž¶Â áŸ” ážŸáž¼áž˜â€‹áž‡áž½áž”â€‹áž‡áž¶áž˜áž½áž™â€‹áž¢áŸ’áž“áž€â€‹áž‚áŸ’ážšáž”áŸ‹â€‹áž‚áŸ’ážšáž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹"
+"ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: lib/Folder.php:356
+#, php-format
+msgid "The folder \"%s\" was created but you were not subscribed to it."
+msgstr "ážáž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾áž áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‡áž¶ážœâ€‹áž”áŸ’ážšáž…áž¶áŸ†â€‹áž‘áŸ…ážœáž¶Â áŸ”"
+
+#: lib/Folder.php:269
+#, php-format
+msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
+msgstr "ážáž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž” áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážˆáž”áŸ‹â€‹áž‡áž¶ážœâ€‹áž–áž¸ážœáž¶Â áŸ”"
+
+#: lib/Folder.php:343
+#, php-format
+msgid "The folder \"%s\" was not created. This is what the server said"
+msgstr "áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážáž \"%s\" áž¡áž¾áž™â€‹Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“áž“áž·áž™áž¶áž™"
+
+#: lib/Folder.php:262
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "ážáž \"%s\" áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹ážáž¶â€‹áž¢áž‰áŸ’áž…áž¹áž„"
+
+#: lib/Folder.php:359
+#, php-format
+msgid "The folder \"%s\" was successfully created."
+msgstr "ážáž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: lib/Folder.php:272
+#, php-format
+msgid "The folder \"%s\" was successfully deleted."
+msgstr "ážáž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: lib/Folder.php:461
+#, php-format
+msgid "The folder \"%s\" was successfully renamed to \"%s\"."
+msgstr "ážáž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž‘áŸ…â€‹áž‡áž¶ \"%s\" ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: lib/MIME/Viewer/tnef.php:94
+msgid "The following files were attached to this part:"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜â€‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹áž‡áž¶áž˜áž½áž™â€‹áž•áŸ’áž“áŸ‚áž€â€‹áž“áŸáŸ‡Â áŸ–"
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¾áž€â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážšáž€áŸ’ážŸáž¶áž‘áž»áž€â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ” áž”áŸ’ážšáž áŸ‚áž›â€‹áž‡áž¶â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹áž²áŸ’áž™â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž”áž„áŸ’áž¢áž½áž…â€‹"
+"áž›áŸáž…áž¡áž¾áž„â€‹áž áž¾áž™â€‹áž˜áž¾áž›â€‹áž‘áŸ…Â ?"
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŸáž¶ážšâ€‹áž€áŸ†áž áž»ážŸâ€‹ážŠáž¼áž…â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ–"
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŸáž¶ážšâ€‹áž“áŸƒáž–áŸážáŸŒáž˜áž¶áž“â€‹ážŠáž¼áž…ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ–"
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŸáž¶ážšâ€‹ážŠáž¼áž…â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ–"
+
+#: lib/Message.php:725
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážš %s áž‚ážºâ€‹áž‘áž‘áŸâ€‹ážšáž½áž…áž áž¾áž™Â áŸ”"
+
+#: lib/Fetchmail.php:247
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr "ážŸáž¶ážš \"%s\" áž–áž¸ \"%s\" áž›áž¾ážŸ (%d áž”áŸƒ) áž€áž˜áŸ’ážšáž·ážâ€‹áž‘áŸ†áž áŸ†â€‹áž‘áž¶áž‰â€‹áž™áž€â€‹Â áŸ”"
+
+#: templates/contacts/javascript.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr "ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž€áŸ†áž–áž»áž„â€‹ážáŸ‚áž„â€‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž·áž‘Â áŸ” áž…áŸáž‰Â áŸ”"
+
+#: templates/compose/javascript.inc:119
+msgid "The message does not have a Subject entered."
+msgstr "ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž”áŸ’ážšáž’áž¶áž“áž”áž‘â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Spam.php:216
+msgid "The message has been deleted."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”Â áŸ”"
+
+#: lib/Spam.php:202
+msgid "The message has been reported as not spam to your system administrator."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹áž‘áŸ…â€‹áž¢áŸ’áž“áž€â€‹áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážáž¶ áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Spam.php:182
+msgid "The message has been reported as not spam."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹ážáž¶ áž˜áž·áž“â€‹áž˜áŸ‚áž“â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Spam.php:194
+msgid "The message has been reported as spam to your system administrator."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹áž‘áŸ…â€‹áž¢áŸ’áž“áž€â€‹áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž„â€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážáž¶ áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšÂ áŸ”"
+
+#: lib/Spam.php:174
+msgid "The message has been reported as spam."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹ážáž¶ áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážšÂ áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:401
+msgid "The message has been verified."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‘áŸ€áž„â€‹áž•áŸ’áž‘áž¶ážáŸ‹Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:389
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "ážŸáž¶ážšâ€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‘áŸ€áž„â€‹áž•áŸ’áž‘áž¶ážáŸ‹Â áŸ” áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‰áž¾Â áŸ– %sÂ áŸ”"
+
+#: templates/javascript/open_pgp_win.js:8
+#: templates/javascript/open_smime_win.js:8
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¾áž€â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹Â áŸ” áž”áŸ’ážšáž áŸ‚áž›â€‹áž‡áž¶â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€â€‹ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž²áŸ’áž™â€‹áž‘áž”áŸ‹ážŸáŸ’áž€áž¶ážáŸ‹â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž›áŸáž…áž¡áž¾áž„Â ?"
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ† áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áŸ’áž“áž»áž„â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ MS-TNEFÂ áŸ”"
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†â€‹ áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž€áŸ’áž“áž»áž„â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ ZipÂ áŸ”"
+
+#: message.php:429
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+"áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž€áŸ†áž–áž»áž„â€‹ážŸáŸ’áž“áž¾â€‹ážŸáž»áŸ†â€‹ \"áž€áž¶ážšâ€‹áž‡áž¼áž“â€‹ážŠáŸ†ážŽáž¹áž„â€‹áž…ážšáž·ážâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš\" áž–áž¸â€‹áž¢áŸ’áž“áž€ áž–áŸáž›áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž¢áž¶áž“â€‹ážŸáž¶ážšáž“áŸáŸ‡Â áŸ” ážŸáž¼áž˜â€‹áž…áž»áž… %s "
+"ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšâ€‹áž‡áž¼áž“â€‹ážŠáŸ†ážŽáž¹áž„Â áŸ”"
+
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážšáž¼áž”áž—áž¶áž–â€‹ážáž¼áž…áŸ—â€‹áž“áŸƒâ€‹ážšáž¼áž”áž—áž¶áž–â€‹áž“áŸáŸ‡â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: templates/compose/javascript.inc:83
+msgid "The signature could not be replaced."
+msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‡áŸ†áž“áž½ážŸÂ áŸ”"
+
+#: templates/compose/javascript.inc:81
+msgid "The signature was successfully replaced."
+msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‡áŸ†áž“áž½ážŸâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜Â áŸ”"
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž›áž»áž”Â áŸ”"
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážš \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž‘áž¶áž“áŸ‹ážŸáž˜áŸáž™Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:170
+msgid "The task has been added to your tasklist."
+msgstr "áž—áž¶ážšáž€áž·áž…áŸ’áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ…â€‹áž”áž‰áŸ’áž‡áž¸â€‹áž—áž¶ážšáž€áž·áž…áŸ’áž…â€‹ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: lib/MIME/Viewer/status.php:95
+msgid "The text of the message"
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž˜áž¾áž› %sÂ áŸ”"
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážáŸ’ážšáž¡áž”áŸ‹"
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážáŸ’ážšáž¡áž”áŸ‹ áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹ %sÂ áŸ”"
+
+#: lib/MIME/Viewer/notification.php:68
+msgid "The text of the sent message"
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr "áž¢ážáŸ’ážáž”áž‘â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾ áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž˜áž¾áž›â€‹ %sÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:155
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "áž–áŸážáŸŒáž˜áž¶áž“â€‹ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹â€‹ ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™Â áŸ”"
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹áž•áŸ’áž“áŸ‚áž€â€‹áž•áŸ’ážŸáŸáž„â€‹ážŠáŸ‚áž›â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž€áŸ’áž“áž»áž„â€‹ážáž½Â áŸ”"
+
+#: templates/mailbox/empty_mailbox.html:2
+msgid "There are no messages in this mailbox."
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž“áŸáŸ‡Â áŸ”"
+
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr "áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž¢ážáŸ’ážáž”áž‘ ážŠáŸ‚áž›â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž€áŸ’áž“áž»áž„â€‹ážáž½â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Message.php:729
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "áž˜áž¶áž“â€‹áž”áž‰áŸ’áž áž¶â€‹áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž”áŸ†áž”áž¶ážáŸ‹â€‹áž…áŸ„áž›â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™ážáž¶Â áŸ– %s"
+
+#: lib/Message.php:114
+#, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž…áž˜áŸ’áž›áž„â€‹ážŸáž¶ážšâ€‹áž–áž¸ \"%s\" áž‘áŸ… \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: lib/Message.php:238
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž–áž¸ážáž \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: lib/Message.php:329
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
+"server said"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹ážáž \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: lib/MIME/Viewer/itip.php:100
+#, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž›áž»áž”â€‹áž–áŸ’ážšáž¹ážáŸ’ážáž·áž€áž¶ážšážŽáŸÂ áŸ– %sÂ áŸ”"
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
+msgid "There was an error displaying this message part"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž•áŸ’áž“áŸ‚áž€â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡"
+
+#: lib/Message.php:607
+#, php-format
+msgid ""
+"There was an error flagging messages in the folder \"%s\". This is what the "
+"server said"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹áž‘áž„áŸ‹â€‹áž²áŸ’áž™â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„â€‹ážáž \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: folders.php:113
+#, php-format
+msgid "There was an error importing %s."
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž“áž¶áŸ†áž…áž¼áž› %sÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:137
+#, php-format
+msgid "There was an error importing the event: %s."
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸáž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž“áž¶áŸ†áž…áž¼áž›â€‹áž–áŸ’ážšáž¹ážáŸ’ážáž·áž€áž¶ážšážŽáŸÂ áŸ– %sÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:167
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹â€‹â€‹áž“áž¶áŸ†áž…áž¼áž›â€‹áž—áž¶ážšáž€áž·áž…áŸ’áž…Â áŸ– %sÂ áŸ”"
+
+#: lib/MIME/Viewer/itip.php:153
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž“áž¶áŸ†áž…áž¼áž›â€‹áž–áŸážáŸŒáž˜áž¶áž“ áž‘áŸ†áž“áŸážš/ážšážœáž›áŸ‹ ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾Â áŸ– %sÂ áŸ”"
+
+#: lib/Message.php:107
+#, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸â€‹ážŸáž¶ážšâ€‹áž–áž¸ \"%s\" áž‘áŸ… \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: lib/Compose.php:567
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€Â áŸ– %s"
+
+#: lib/MIME/Viewer/itip.php:114
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr "áž˜áž¶áž“â€‹áž€áŸ†áž áž»ážŸâ€‹áž˜áž½áž™ áž€áŸ’áž“áž»áž„â€‹áž€áž¶ážšâ€‹áž’áŸ’ážœáž¾â€‹â€‹áž²áŸ’áž™â€‹â€‹áž–áŸ’ážšáž¹ážáŸ’ážáž·áž€áž¶ážšážŽáŸâ€‹áž‘áž¶áž“áŸ‹â€‹ážŸáž˜áŸáž™Â áŸ– %sÂ áŸ”"
+
+#: lib/MIME/Viewer/plain.php:59
+msgid "There was no text in this message part"
+msgstr "áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž¢ážáŸ’ážáž”áž‘ áž€áŸ’áž“áž»áž„â€‹áž•áŸ’áž“áŸ‚áž€â€‹áž“áŸƒâ€‹â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡"
+
+#: lib/MIME/Viewer/pgp.php:165
+msgid "This PGP Public Key was attached to the message."
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ PGP áž“áŸáŸ‡â€‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‘áŸ…â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
+msgid "This action is not supported."
+msgstr "áž˜áž·áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž¢áŸ†áž–áž¾â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
+msgid "This action is not yet implemented."
+msgstr "áž¢áŸ†áž–áž¾â€‹áž“áŸáŸ‡â€‹áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "áž“áŸáŸ‡â€‹áž”áŸ’ážšáž áŸ‚áž›â€‹áž‡áž¶â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹áž–áŸáž›â€‹áž”áž“áŸ’ážáž·áž…â€‹áž”áž“áŸ’ážáž½áž…Â áŸ” ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž–áž·ážâ€‹áž‡áž¶â€‹áž…áž„áŸ‹â€‹áž”áž“áŸ’ážâ€‹áž¬Â ?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž¶áž“â€‹áž•áŸ’áž‘áž»áž€â€‹áž¯áž€ážŸáž¶ážš Macintosh áž˜áž½áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:415
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž¶áž“â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŒáž¸áž‡áž¸ážáž›â€‹ážáž¶áž˜â€‹ážšáž™áŸˆ S/MIMEÂ áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž¶áž“â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážáž¶áž˜â€‹ážšáž™áŸˆ S/MIMEÂ áŸ”"
+
+#: lib/MIME/Viewer/status.php:162
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž¶áž“â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹ážŸáŸ’ážáž¶áž“áž—áž¶áž–â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹ážŸáŸ†áž”áž»ážáŸ’ážš áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™â€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡ áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:323
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž·áž“â€‹áž‘áŸ†áž“áž„â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠ PGP ážáŸ’ážšáž¹áž˜â€‹ážáŸ’ážšáž¼ážœâ€‹áž˜áž½áž™â€‹áž¡áž¾áž™Â áŸ” áž€áŸ†áž áž»ážŸÂ áŸ–"
+
+#: lib/MIME/Viewer/pgp.php:243 lib/MIME/Viewer/pgp.php:358
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž·áž“â€‹áž‘áŸ†áž“áž„â€‹áž‡áž¶â€‹áž˜áž¶áž“â€‹áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™ PGP ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ (áž™áŸ„áž„â€‹ážáž¶áž˜ RFC 2015)Â áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž˜áž·áž“â€‹áž‘áŸ†áž“áž„â€‹áž‡áž¶â€‹áž˜áž¶áž“â€‹áž‘áŸ’ážšáž„áŸ‹â€‹áž‘áŸ’ážšáž¶áž™ S/MIME ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœÂ áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:200
+msgid ""
+"This message has been digitally signed and encrypted with PGP, but the "
+"signature cannot be verified."
+msgstr ""
+"ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŒáž¸áž‡áž¸ážáž› áž“áž·áž„ áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾ PGP áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹"
+"áž•áŸ’áž‘áŸ€áž„áž•áŸ’áž‘áž¶ážáŸ‹â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:206
+msgid "This message has been digitally signed and encrypted with PGP."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŒáž¸áž‡áž¸ážáž› áž“áž·áž„ áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾ PGPÂ áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:202
+msgid ""
+"This message has been digitally signed via PGP, but the signature cannot be "
+"verified."
+msgstr ""
+"ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡áž ážáŸ’ážáž›áŸážáž¶â€‹ážŒáž¸áž‡áž¸ážáž›â€‹ážáž¶áž˜â€‹ážšáž™áŸˆ PGP áž”áŸ‰áž»áž“áŸ’ážáŸ‚â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’áž‘áŸ€áž„áž•áŸ’áž‘áž¶ážáŸ‹â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:424
+msgid "This message has been digitally signed via PGP."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹áž‡áž¶â€‹áž›áŸážâ€‹ážáž¶áž˜ážšáž™áŸˆ PGPÂ áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŒáž¸áž‡áž¸ážáž›â€‹ážáž¶áž˜ážšáž™áŸˆ S/MIMEÂ áŸ”"
+
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážáž¶áž˜ážšáž™áŸˆ S/MIMEÂ áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:298
+msgid ""
+"This message has been encrypted with PGP, however, PGP support is disabled "
+"so the message cannot be decrypted."
+msgstr ""
+"ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾ PGP áž‘áŸ„áŸ‡â€‹áž™áŸ‰áž¶áž„â€‹ážŽáž¶ áž€áž¶ážšâ€‹áž‚áž¶áŸ†áž‘áŸ’ážš PGP ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž”áŸ’ážšáž¾â€‹áž›áŸ‚áž„â€‹áž”áž¶áž“ "
+"ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹ážŸáž¶ážšâ€‹áž“áž¹áž„â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž˜áž€â€‹áž‡áž¶â€‹áž—áž¶áž–â€‹áž’áž˜áŸ’áž˜ážáž¶â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:303
+msgid ""
+"This message has been encrypted with PGP, however, no personal private key "
+"exists so the message cannot be decrypted."
+msgstr ""
+"ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾ PGP áž‘áŸ„áŸ‡â€‹áž™áŸ‰áž¶áž„â€‹ážŽáž¶ áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹áž˜áž¶áž“â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“â€‹áž“áŸ…â€‹áž¡áž¾áž™â€‹áž‘áŸ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹"
+"ážŸáž¶ážšâ€‹áž“áž¹áž„â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž˜áž€â€‹áž‡áž¶â€‹áž—áž¶áž–â€‹áž’áž˜áŸ’áž˜ážáž¶â€‹áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:294
+msgid "This message has been encrypted with PGP."
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹ážŠáŸ„áž™ PGPÂ áŸ”"
+
+#: message.php:505
+msgid "This message to"
+msgstr "ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž‘áŸ…"
+
+#: acl.php:45
+msgid "This server does not support sharing folders."
+msgstr "áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž“áŸáŸ‡â€‹áž˜áž·áž“â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹ážážâ€‹ážŠáŸ‚áž›â€‹áž…áŸ‚áž€â€‹ážšáŸ†áž›áŸ‚áž€Â áŸ”"
+
+#: templates/contacts/javascript.inc:109
+msgid "This window must be called from a compose window."
+msgstr "ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž áŸ…â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž“áŸáŸ‡ áž–áž¸â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážáŸ‚áž„â€‹áž˜áž½áž™Â áŸ”"
+
+#: thread.php:154
+msgid "Thread Display"
+msgstr "áž”áž„áŸ’áž áž¶áž‰â€‹áž‡áž¶â€‹ážáŸ’ážŸáŸ‚â€‹ážŸáŸ’ážšáž¡áž¶áž™"
+
+#: thread.php:75 config/prefs.php.dist:933
+msgid "Thread View"
+msgstr "áž‘áž·ážŠáŸ’áž‹áž—áž¶áž–â€‹ážáŸ’ážŸáŸ‚áž¢áŸ†áž”áŸ„áŸ‡"
+
+#: message.php:233 compose.php:879 mailbox.php:570 mailbox.php:746
+#: lib/Search.php:607 templates/contacts/contacts.html:39
+#: templates/login/recompose.html:14
+msgid "To"
+msgstr "áž‘áŸ…"
+
+#: config/prefs.php.dist:930
+msgid "To Address"
+msgstr "áž‘áŸ…â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr "áž‡áŸ’ážšáž¾ážŸâ€‹áž€áŸ’ážšáž¡áž¶â€‹áž‘áž‘áž¹áž„â€‹áž…áŸ’ážšáž¾áž“ ážŸáž„áŸ’áž€ážáŸ‹â€‹áž”áž‰áŸ’áž‡áž¶ (PC) áž¬ áž”áž‰áŸ’áž‡áž¶ (Mac) ážážŽáŸˆáž–áŸáž›â€‹áž€áŸ†áž–áž»áž„â€‹áž…áž»áž…Â áŸ”"
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr "ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áŸ’ážšáž¾â€‹áž€áž¶ážšâ€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹ TLS áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž€áŸ†áž–áž»áž„â€‹ážšážáŸ‹ PHP áž€áŸ†ážŽáŸ‚ 5.0.6 áž¬ ážáŸ’áž–ážŸáŸ‹â€‹áž‡áž¶áž„Â áŸ”"
+
+#: templates/compose/compose.html:349
+msgid "Total Attachments Size:"
+msgstr "áž‘áŸ†áž áŸ†â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážŸážšáž»áž”Â áŸ–"
+
+#: lib/IMAP/Tree.php:368
+msgid "Trash folder"
+msgstr "ážážâ€‹ážŸáŸ†ážšáž¶áž˜"
+
+#: templates/prefs/trashselect.inc:23
+msgid "Trash folder:"
+msgstr "ážážâ€‹ážŸáŸ†ážšáž¶áž˜Â áŸ–"
+
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž‘áŸ…â€‹áž™áž€â€‹áž€áž¼ážáž¶"
+
+#: templates/message/navbar_navigate.html:10 templates/mailbox/navbar.html:16
+#: templates/mailbox/navbar.html:31
+msgid "Unanswered"
+msgstr "áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: search.php:330
+msgid "Unanswered messages"
+msgstr "ážŸáž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”"
+
+#: message.php:535 mailbox.php:471
+msgid "Undelete"
+msgstr "áž˜áž·áž“â€‹áž›áž»áž”"
+
+#: search.php:340
+msgid "Undeleted messages"
+msgstr "ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹áž›áž»áž”"
+
+#: mailbox.php:729 mailbox.php:742 lib/MIME/Headers.php:213
+msgid "Undisclosed Recipients"
+msgstr "áž˜áž·áž“â€‹áž”áž¶áž“áž”áŸ’ážšáž€áž¶ážŸâ€‹â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›"
+
+#: lib/MIME/Viewer/itip.php:448
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr "ážŸáž˜áž¶ážŸáž—áž¶áž‚â€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹ážŠáŸ„áŸ‡â€‹ážŸáŸ’ážšáž¶áž™â€‹áž“áŸƒâ€‹áž”áŸ’ážšáž—áŸáž‘Â áŸ– %s"
+
+#: search.php:335
+msgid "Unimportant messages"
+msgstr "ážŸáž¶ážšâ€‹áž˜áž·áž“â€‹ážŸáŸ†ážáž¶áž“áŸ‹"
+
+#: mailbox.php:709
+msgid "Unknown Date"
+msgstr "áž€áž¶áž›â€‹áž”ážšáž·áž…áŸ’áž†áŸáž‘â€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹"
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹â€‹áž…áž˜áŸ’áž›áž¾áž™ IMAP áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾Â áŸ” áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™ážáž”â€‹ážáž¶Â áŸ– %s"
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Unknown Meeting"
+msgstr "áž€áž·áž…áŸ’áž…â€‹áž”áŸ’ážšáž‡áž»áŸ†â€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹"
+
+#: mailbox.php:758
+msgid "Unknown Recipient"
+msgstr "áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr "ážšáž¾â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž…áŸáž‰"
+
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "áž‚áŸ’áž˜áž¶áž“â€‹ážˆáŸ’áž˜áŸ„áŸ‡"
+
+#: message.php:469 mailbox.php:811 mailbox.php:970
+#: templates/message/navbar_navigate.html:6 templates/mailbox/navbar.html:12
+#: templates/mailbox/navbar.html:27 templates/mailbox/legend.html:3
+msgid "Unseen"
+msgstr "áž˜áž·áž“â€‹â€‹áž”áž¶áž“â€‹áž˜áž¾áž›"
+
+#: templates/folders/actions.html:14
+msgid "Unsubscribe from Folder(s)"
+msgstr "ážˆáž”áŸ‹â€‹áž‡áž¶ážœâ€‹áž–áž¸â€‹ážáž"
+
+#: templates/compose/compose.html:284
+msgid "Update"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹áž‘áž¶áž“áŸ‹ážŸáž˜áŸáž™"
+
+#: lib/MIME/Viewer/itip.php:612
+msgid "Update respondent status"
+msgstr "áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™â€‹ážŸáŸ’ážáž¶áž“áž—áž¶áž–â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áž¶áž“áŸ‹ážŸáž˜áŸáž™"
+
+#: templates/smime/import_key.inc:58
+msgid "Upload"
+msgstr "áž•áŸ’áž‘áž»áž€â€‹áž¡áž¾áž„"
+
+#: templates/pgp/import_key.html:38
+msgid "Upload:"
+msgstr "áž•áŸ’áž‘áž»áž€â€‹áž¡áž¾áž„Â áŸ–"
+
+#: templates/prefs/sentmailselect.inc:41
+msgid "Use Default Value"
+msgstr "áž”áŸ’ážšáž¾â€‹ážáž˜áŸ’áž›áŸƒâ€‹áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜"
+
+#: config/prefs.php.dist:257
+msgid "Use IMAP folder subscriptions?"
+msgstr "áž”áŸ’ážšáž¾â€‹áž€áž¶ážšâ€‹áž‡áž¶ážœâ€‹ážáž IMAP áž¬Â ?"
+
+#: config/prefs.php.dist:747
+msgid "Use Virtual Trash Folder?"
+msgstr "áž”áŸ’ážšáž¾ ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹áž“áž·áž˜áŸ’áž˜áž·ážÂ ?"
+
+#: templates/acl/acl.inc:143
+msgid "User"
+msgstr "áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾"
+
+#: acl.php:86
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾ \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹ážŸáž·áž‘áŸ’áž’áž·â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™â€‹áž áž¾áž™ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážáž \"%s\"Â áŸ”"
+
+#: templates/login/login.html:83
+msgid "Username"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾"
+
+#: templates/fetchmail/manage.inc:17
+msgid "Username:"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾Â áŸ–"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "View"
+msgstr "áž˜áž¾áž›"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
+#, php-format
+msgid "View %s"
+msgstr "áž˜áž¾áž› %s"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr "áž˜áž¾áž›â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆ %s"
+
+#: mailbox.php:519
+msgid "View Messages"
+msgstr "áž˜áž¾áž›â€‹ážŸáž¶ážš"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr "áž˜áž¾áž›â€‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr "áž˜áž¾áž›â€‹áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹áž•áŸ’áž‘áž¶áž›áŸ‹â€‹ážáŸ’áž›áž½áž“"
+
+#: message.php:559
+msgid "View Thread"
+msgstr "áž˜áž¾áž›â€‹ážáŸ’ážŸáŸ‚â€‹áž¢áŸ†áž”áŸ„áŸ‡"
+
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
+msgid "View Thumbnail"
+msgstr "áž˜áž¾áž›â€‹ážšáž¼áž”áž—áž¶áž–â€‹ážáž¼áž…"
+
+#: lib/MIME/Viewer/pkcs7.php:423
+msgid "View attachment in a separate window"
+msgstr "áž˜áž¾áž›â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹ â€‹â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹ážŠáž¶áž…áŸ‹â€‹ážŠáŸ„áž™â€‹áž¡áŸ‚áž€"
+
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "áž˜áž¾áž›â€‹áž˜áž¶ážáž·áž€áž¶â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž•áŸ’ážŸáŸáž„"
+
+#: lib/MIME/Viewer/itip.php:141
+msgid "View event"
+msgstr "áž˜áž¾áž›â€‹áž–áŸ’ážšáž¹ážáŸ’ážáž·áž€áž¶ážšážŽáŸ"
+
+#: mailbox.php:669 lib/IMAP/Tree.php:351
+#, php-format
+msgid "View messages in %s"
+msgstr "áž˜áž¾áž›â€‹ážŸáž¶ážšâ€‹áž€áŸ’áž“áž»áž„ %s"
+
+#: templates/prefs/initialpageselect.inc:23
+msgid "View or mailbox to display after login:"
+msgstr "áž‘áž·ážŠáŸ’áž‹áž—áž¶áž– áž¬ áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹ áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž–áž¸â€‹áž…áž¼áž›Â áŸ–"
+
+#: lib/MIME/Viewer/itip.php:171
+msgid "View task"
+msgstr "áž˜áž¾áž›â€‹áž—áž¶ážšáž€áž·áž…áŸ’áž…"
+
+#: lib/MIME/Viewer/html.php:118
+msgid "View this HTML content in a separate window."
+msgstr "áž˜áž¾áž›â€‹áž˜áž¶ážáž·áž€áž¶ HTML áž“áŸáŸ‡â€‹áž€áŸ’áž“áž»áž„â€‹áž”áž„áŸ’áž¢áž½áž…â€‹áž•áŸ’ážŸáŸáž„Â áŸ”"
+
+#: search.php:162
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "ážážâ€‹áž“áž·áž˜áž·áŸ’áž˜áž \"%s\" ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: lib/IMAP/Tree.php:132 lib/IMAP/Tree.php:145 lib/IMAP/Tree.php:147
+#: lib/IMAP/Tree.php:151 lib/IMAP/Tree.php:152 lib/IMAP/Tree.php:613
+#: lib/IMAP/Tree.php:637 lib/IMAP/Tree.php:675
+#: templates/search/search.html:165
+msgid "Virtual Folders"
+msgstr "ážážâ€‹áž“áž·áž˜áž·áŸ’áž˜áž"
+
+#: search.php:154
+msgid "Virtual Folders require a label."
+msgstr "ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážâ€‹áž‘áž¶áž˜áž‘áž¶ážšâ€‹ážŸáŸ’áž›áž¶áž€â€‹áž˜áž½áž™Â áŸ”"
+
+#: lib/Search.php:434
+msgid "Virtual INBOX"
+msgstr "áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž›â€‹áž“áž·áž˜áŸ’áž˜áž·áž"
+
+#: lib/IMAP/Tree.php:409
+msgid "Virtual INBOX Folder"
+msgstr "ážážâ€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž›â€‹áž“áž·áž˜áŸ’áž˜áž·áž"
+
+#: lib/Search.php:380
+msgid "Virtual Trash"
+msgstr "ážŸáŸ†ážšáž¶áž˜â€‹áž“áž·áž˜áŸ’áž˜áž·"
+
+#: lib/IMAP/Tree.php:405
+msgid "Virtual Trash Folder"
+msgstr "ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹áž“áž·áž˜áŸ’áž˜áž·áž"
+
+#: templates/search/search.html:176
+msgid "Virtual folder label:"
+msgstr "ážŸáŸ’áž›áž¶áž€â€‹ážážâ€‹áž“áž·áž˜áŸ’áž˜áž·ážÂ áŸ–"
+
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "áž–áŸ’ážšáž˜áž¶áž“"
+
+#: login.php:184 login.php:266
+#, php-format
+msgid "Welcome to %s"
+msgstr "ážŸáž¼áž˜â€‹ážŸáŸ’ážœáž¶áž‚áž˜áž“áŸâ€‹áž˜áž€â€‹áž€áž¶áž“áŸ‹ %s"
+
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"ážáž¾â€‹áž™áž¾áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž’áŸ’ážœáž¾â€‹áž™áŸ‰áž¶áž„â€‹ážŠáž¼áž…áž˜áŸ’ážŠáŸáž…â€‹áž‡áž¶áž˜áž½áž™â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš áž”áž“áŸ’áž‘áž¶áž”áŸ‹â€‹áž–áž¸â€‹áž–áž½áž€â€‹ážœáž¶â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹ážšáž¶áž™áž€áž¶ážšážŽáŸâ€‹ážáž¶â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš áž¬ "
+"ážŸáž¶ážšâ€‹áž›áŸ’áž¢Â ?"
+
+#: config/prefs.php.dist:739
+msgid ""
+"When deleting messages, move them to your Trash folder instead of marking "
+"them as deleted?"
+msgstr "áž–áŸáž›â€‹áž›áž»áž”â€‹ážŸáž¶ážš áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž‘áž¸â€‹áž–áž½áž€â€‹ážœáž¶â€‹áž‘áŸ…â€‹ážážâ€‹ážŸáŸ†ážšáž¶áž˜â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ áž‡áŸ†áž“áž½ážŸâ€‹áž²áŸ’áž™â€‹áž€áž¶ážšâ€‹ážŸáž˜áŸ’áž‚áž¶áž›áŸ‹â€‹áž–áž½áž€â€‹ážœáž¶â€‹ážáž¶â€‹áž”áž¶áž“â€‹áž›áž»áž”Â ?"
+
+#: config/prefs.php.dist:918
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr "áž–áŸáž›â€‹áž”áž¾áž€â€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸â€‹áž˜áž½áž™ áž‘áŸ†áž–áŸážšâ€‹ážŽáž¶áž˜áž½áž™â€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž…áž¶áž”áŸ‹áž•áŸ’ážáž¾áž˜â€‹áž–áž¸Â ?"
+
+#: config/prefs.php.dist:573
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr "áž–áŸáž›â€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹â€‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾â€‹ ážáž¾â€‹áž™áž¾áž„â€‹áž‚áž½ážšâ€‹ážšáž€áŸ’ážŸáž¶â€‹áž‘áž»áž€â€‹áž‘áž·áž“áŸ’áž“áž“áŸáž™â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž¬â€‹áž‘áŸÂ ?"
+
+#: config/prefs.php.dist:427
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"áž“áŸ…â€‹áž–áŸáž›â€‹áž•áŸ’áž‰áž¾â€‹ážŸáŸ†áž”áž»ážáŸ’ážš áž¬ áž”áž“áŸ’áž›áž¶áž™â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ ážáž¾â€‹ážŠáŸ‚áž“â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž™áž¾áž„â€‹áž‚áž½ážšâ€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹áž‘áŸ…â€‹ážáž¶áž„â€‹áž…áž»áž„â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹ážŠáŸ‚áž›â€‹áž˜áž·áž“â€‹áž˜áž¶áž“â€‹áž›áž€áŸ’ážážŽáŸˆâ€‹"
+"áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž¶áž“áŸ‹ (áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž¢áŸŠáž¸áž˜áŸ‚áž›â€‹ážŠáŸ‚áž›â€‹áž‚áŸ’áž˜áž¶áž“ \"@\")Â ?"
+
+#: config/prefs.php.dist:708
+msgid "Where do you want to display links to alternative formats of a message?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž”áž„áŸ’áž áž¶áž‰â€‹ážáŸ†ážŽâ€‹áž‘áŸ…â€‹áž€áž¶áž“áŸ‹â€‹áž‘áŸ’ážšáž„áŸ‹áž‘áŸ’ážšáž¶áž™â€‹áž‡áŸ†áž“áž½ážŸâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž˜áž½áž™ áž“áŸ…â€‹áž€áž“áŸ’áž›áŸ‚áž„â€‹ážŽáž¶Â ?"
+
+#: message.php:571 mailbox.php:496
+msgid "Whitelist"
+msgstr "áž”áž‰áŸ’áž‡áž¸â€‹ážŸ"
+
+#: config/prefs.php.dist:989 templates/compose/compose.html:295
+msgid "Yes"
+msgstr "áž”áž¶áž‘"
+
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr "áž¢áŸ’áž“áž€â€‹áž‘áŸ†áž“áž„â€‹áž‡áž¶áž‘áŸ…â€‹áž”áŸ’ážšáž˜áž¼áž›â€‹áž™áž€â€‹â€‹áž¢áŸŠáž¸áž˜áŸ‚áž› áž–áž¸â€‹áž‚ážŽáž“áž¸â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜â€‹Â áŸ–"
+
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž”áŸ‰áž»áž“áž”áŸ‰áž„â€‹áž›áž»áž”â€‹ážŸáž¶ážšâ€‹áž‘áž¶áŸ†áž„áž¢ážŸáŸ‹ ážŠáŸ‚áž›â€‹áž˜áž¶áž“â€‹áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ”"
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž”áŸ‰áž»áž“áž”áŸ‰áž„â€‹áž›áž»áž”â€‹ážážâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ”"
+
+#: templates/message/javascript.inc:70 templates/mailbox/javascript.inc:195
+msgid "You are copying/moving to a new folder."
+msgstr "áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž…áž˜áŸ’áž›áž„/áž•áŸ’áž›áž¶ážŸáŸ‹áž‘áž¸â€‹ áž‘áŸ…â€‹ážážážáŸ’áž˜áž¸â€‹áž˜áž½áž™Â áŸ”â€‹"
+
+#: templates/javascript/folders.js:104
+msgid "You are creating a sub-folder to "
+msgstr "áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹ážšáž„â€‹áž˜áž½áž™â€‹áž“áŸƒ"
+
+#: templates/javascript/folders.js:106
+msgid "You are creating a top-level folder."
+msgstr "áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹áž€áž˜áŸ’ážšáž·ážâ€‹áž€áŸ†áž–áž¼áž›â€‹áž˜áž½áž™Â áŸ”"
+
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážážâ€‹áž…áŸ’ážšáž¾áž“â€‹áž‡áž¶áž„ %d áž¡áž¾áž™Â áŸ”"
+
+#: lib/Compose.php:826
+#, php-format
+msgid ""
+"You are not allowed to send messages to more than %d recipients within %d "
+"hours."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšâ€‹áž‘áŸ…â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž…áŸ’ážšáž¾áž“â€‹áž‡áž¶áž„ %d áž“áž¶áž€áŸ‹â€‹áž¡áž¾áž™ áž€áŸ’áž“áž»áž„â€‹ážšáž™áŸˆáž–áŸáž› %d áž˜áŸ‰áŸ„áž„Â áŸ”"
+
+#: lib/Compose.php:1049
+#, php-format
+msgid "You are not allowed to send messages to more than %d recipients."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšâ€‹áž‘áŸ…â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž…áŸ’ážšáž¾áž“â€‹áž‡áž¶áž„ %d áž“áž¶áž€áŸ‹â€‹áž¡áž¾áž™Â áŸ”"
+
+#: templates/javascript/folders.js:137
+msgid "You are renaming the folder: "
+msgstr "áž¢áŸ’áž“áž€â€‹áž€áŸ†áž–áž»áž„â€‹áž”áŸ’ážáž¼ážšâ€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážážÂ áŸ–"
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"áž¢áŸ’áž“áž€â€‹áž¢áž¶áž…â€‹áž”áŸ’ážšáž¾â€‹áž€áž“áŸ’áž›áŸ‚áž„â€‹ážŠáž¶áž€áŸ‹â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜ áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹áž¢ážáŸ’ážáž”áž‘â€‹áž•áŸ’áž‘áŸƒâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™â€‹ážŸáŸ†áž”áž»ážáŸ’ážšÂ áŸ– %c ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž˜áž¶ážáž·áž€áž¶â€‹ážŸáž¶ážšâ€‹áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“; "
+"%s ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž ážáŸ’ážáž›áŸážáž¶Â áŸ”"
+
+#: lib/Folder.php:568
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážˆáž”áŸ‹áž‡áž¶ážœâ€‹áž–áž¸ \"%s\" áž”áž¶áž“â€‹áž¡áž¾áž™Â áŸ”"
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž”áž¶áž“â€‹áž™áž›áŸ‹â€‹áž–áŸ’ážšáž˜â€‹áž‘áŸ…â€‹áž›áž€áŸ’ážážážŽáŸ’ážŒâ€‹áž€áž·áž…áŸ’áž…â€‹áž“áŸƒâ€‹áž–áŸ’ážšáž˜â€‹áž–áŸ’ážšáŸ€áž„â€‹â€‹ážŸáŸážœáž¶ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž²áŸ’áž™â€‹áž…áž¼áž›Â áŸ”"
+
+#: templates/acl/acl.inc:170
+msgid "You do not have permission to change access to this folder"
+msgstr "áž¢áŸ’áž“áž€â€‹â€‹áž˜áž·áž“â€‹áž˜áž¶áž“â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹ ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž•áŸ’áž›áž¶ážŸáŸ‹â€‹áž”áŸ’ážáž¼ážšâ€‹áž€áž¶ážšâ€‹áž…áž¼áž›â€‹ážŠáŸ†ážŽáž¾ážšáž€áž¶ážšâ€‹áž‘áŸ…â€‹ážážâ€‹áž“áŸáŸ‡"
+
+#: lib/Maillog.php:130
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr "áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹áž”áž“áŸ’ážâ€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž›áž¾ %%s áž‘áŸ…â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ– %sÂ áŸ”"
+
+#: mailbox.php:1009
+#, php-format
+msgid "You have %s new messages."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸ %sÂ áŸ”"
+
+#: mailbox.php:1009
+msgid "You have 1 new message."
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹ážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸ áŸ¡Â áŸ”"
+
+#: compose.php:216
+msgid "You have already submitted this page."
+msgstr "áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹ážŠáž¶áž€áŸ‹ážŸáŸ’áž“áž¾â€‹áž‘áŸ†áž–áŸážšâ€‹áž“áŸáŸ‡â€‹ážšáž½áž…â€‹áž áž¾áž™Â áŸ”"
+
+#: lib/IMP.php:957
+msgid "You have new mail in the following folder:"
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸ áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážŠáž¼áž…â€‹â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ–"
+
+#: lib/IMP.php:962
+msgid "You have new mail in the following folders:"
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážáŸ’áž˜áž¸ áž€áŸ’áž“áž»áž„â€‹ážážâ€‹â€‹â€‹ážŠáž¼áž…â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ–"
+
+#: lib/Compose.php:1031
+msgid "You must enter at least one recipient."
+msgstr "áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹áž™áŸ‰áž¶áž„â€‹áž áŸ„áž…â€‹ážŽáž¶ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž˜áž½áž™Â áŸ”"
+
+#: lib/MIME/Viewer/pgp.php:310
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr "áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ PGP ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž˜áž¾áž›â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡"
+
+#: lib/MIME/Viewer/pkcs7.php:254
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr "áž¢áŸ’áž“áž€â€‹â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹ážƒáŸ’áž›áž¶â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“ S/MIME ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž˜áž¾áž›â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡"
+
+#: templates/message/javascript.inc:79 templates/mailbox/javascript.inc:204
+msgid "You must select a target mailbox first."
+msgstr "ážŠáŸ†áž”áž¼áž„ áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹áž‚áŸ„áž›â€‹ážŠáŸ…â€‹áž˜áž½áž™Â áŸ”"
+
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr "áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž‚ážŽáž“áž¸â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž›áž»áž”â€‹áž˜áž½áž™Â áŸ”"
+
+#: templates/contacts/javascript.inc:81
+msgid "You must select an address first."
+msgstr "ážŠáŸ†áž”áž¼áž„ áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž˜áž½áž™Â áŸ”"
+
+#: templates/mailbox/javascript.inc:74 templates/mailbox/javascript.inc:211
+#: templates/mailbox/javascript.inc:268
+msgid "You must select at least one message first."
+msgstr "ážŠáŸ†áž”áž¼áž„ áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž™áŸ‰áž¶áž„â€‹áž áŸ„áž…â€‹ážŽáž¶ážŸáŸ‹â€‹ážŸáž¶ážšâ€‹áž˜áž½áž™Â áŸ”"
+
+#: templates/compose/javascript.inc:18
+msgid "You must specify a recipient."
+msgstr "áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž˜áž½áž™Â áŸ”"
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœážáŸ‚â€‹áž’áŸ’ážœáž¾â€‹áž²áŸ’áž™ \"%s\" áž”áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážáŸ‚áž‘áž¶áŸ†â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ”"
+
+#: lib/Maillog.php:138
+#, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "áž¢áŸ’áž“áž€áž”áž¶áž“â€‹áž”áŸ’ážáž¼ážšâ€‹áž‘áž·ážŸâ€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž‘áŸ… %s áž›áž¾ %%sÂ áŸ”"
+
+#: lib/Maillog.php:142
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž†áŸ’áž›áž¾áž™â€‹ážáž”â€‹áž‘áŸ…â€‹ážŸáž¶ážšâ€‹áž“áŸáŸ‡â€‹áž›áž¾ %sÂ áŸ”"
+
+#: lib/Folder.php:518
+#, php-format
+msgid "You were not subscribed to \"%s\". Here is what the server said"
+msgstr "áž¢áŸ’áž“áž€â€‹â€‹áž˜áž·áž“â€‹ážáŸ’ážšáž¼ážœâ€‹â€‹áž”áž¶áž“â€‹áž‡áž¶ážœâ€‹áž”áŸ’ážšáž…áž¶áŸ†â€‹áž‘áŸ… \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: lib/Folder.php:570
+#, php-format
+msgid "You were not unsubscribed from \"%s\". Here is what the server said"
+msgstr "áž¢áŸ’áž“áž€â€‹áž˜áž·áž“ážáŸ’ážšáž¼ážœâ€‹â€‹áž”áž¶áž“â€‹ážˆáž”áŸ‹â€‹áž‡áž¶ážœâ€‹áž–áž¸ \"%s\"Â áŸ” áž“áŸáŸ‡â€‹áž‚ážºâ€‹áž‡áž¶â€‹áž¢áŸ’ážœáž¸â€‹ážŠáŸ‚áž›â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž”áž¶áž“â€‹áž“áž·áž™áž¶áž™"
+
+#: lib/Folder.php:521
+#, php-format
+msgid "You were successfully subscribed to \"%s\""
+msgstr "áž¢áŸ’áž“áž€ážáŸ’ážšáž¼ážœâ€‹â€‹áž”áž¶áž“â€‹áž‡áž¶ážœâ€‹áž”áŸ’ážšáž…áž¶áŸ†â€‹áž‘áŸ… \"%s\" ážŠáŸ„áž™â€‹áž‡áŸ„áž‚áž‡áŸáž™"
+
+#: lib/Folder.php:573
+#, php-format
+msgid "You were successfully unsubscribed from \"%s\""
+msgstr "áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹â€‹áž”áž¶áž“â€‹ážˆáž”áŸ‹â€‹áž‡áž¶ážœâ€‹áž–áž¸ \"%s\" ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™"
+
+#: templates/pgp/pgp.inc:98
+msgid "Your Name"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr "áž€áž¼áž“ážŸáŸ„ ážŸáž¶áž’áž¶ážšážŽáŸˆ/áž¯áž€áž‡áž“ PGP ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹áž¯áž€áž‡áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+msgid "Your Public Key"
+msgstr "áž€áž¼áž“ážŸáŸ„â€‹ážŸáž¶áž’áž¶ážšážŽáŸˆâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: config/prefs.php.dist:166
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž†áŸ’áž›áž¾áž™ážáž”-áž‘áŸ…â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ– <em>(ážŸáŸ’ážšáŸáž…â€‹áž…áž·ážáŸ’áž)</em>"
+
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "ážœáž·áž‰áŸ’áž‰áž¶áž”áž“áž”ážáŸ’ážšâ€‹ ážŸáž¶áž’áž¶ážšážŽáŸˆ/áž¯áž€áž‡áž“â€‹ áž“áŸƒ S/MIME ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr "áž‚ážŽáž“áž¸â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ–"
+
+#: config/prefs.php.dist:174
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr "áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž€áŸ’áž›áŸ‚áž„áž€áŸ’áž›áž¶áž™â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ– <em>(ážŸáŸ’ážšáŸáž…â€‹áž…áž·ážáŸ’áž, áž”áž‰áŸ’áž…áž¼áž›â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“â€‹áž“áž¸áž˜áž½áž™áŸ—â€‹áž›áž¾â€‹áž‡áž½ážšâ€‹ážáŸ’áž˜áž¸)</em>"
+
+#: lib/MIME/Viewer/images.php:101
+msgid "Your browser does not support inline display of this image type."
+msgstr "áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ áž˜áž·áž“áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž€áž¶ážšâ€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž€áŸ’áž“áž»áž„ážáž½ áž“áŸƒâ€‹áž”áŸ’ážšáž—áŸáž‘â€‹ážšáž¼áž”áž—áž¶áž–â€‹áž“áŸáŸ‡Â áŸ”"
+
+#: config/prefs.php.dist:551
+msgid "Your default charset for sending messages:"
+msgstr "ážŸáŸ†ážŽáž»áŸ†â€‹ážáž½â€‹áž¢áž€áŸ’ážŸážšâ€‹áž›áŸ†áž“áž¶áŸ†â€‹ážŠáž¾áž˜â€‹ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšÂ áŸ–"
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr "ážœáž·áž’áž¸ážŸáž¶ážŸáŸ’ážáŸ’ážšâ€‹áž”áž˜áŸ’áž›áŸ‚áž„â€‹áž‡áž¶â€‹áž€áž¼ážŠâ€‹áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜â€‹ážšáž”ážŸáŸ‹áž¢áŸ’áž“áž€ ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹â€‹áž•áŸ’áž‰áž¾â€‹ážŸáž¶ážšÂ áŸ–"
+
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážáž—áŸ’áž‡áž¶áž”áŸ‹ ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž‘áž¶áž‰áž™áž€â€‹ážŠáŸ„áž™â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾â€‹áž™áŸ‰áž¶áž„â€‹ážáž·áž…â€‹áž˜áŸ’áž“áž¶áž€Â áŸ”\n"
+"\n"
+"ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ– %s\n"
+"áž€áž¶áž›áž”ážšáž·áž…áŸ’áž†áŸáž‘â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ– %s\n"
+"\n"
+"áž…áž»áž…â€‹ážáŸ†ážŽâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž›áž»áž”â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸÂ áŸ–\n"
+"%s"
+
+#: lib/MIME/Viewer/status.php:89
+msgid "Your message was successfully delivered."
+msgstr "ážŸáž¶ážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”áž‰áŸ’áž‡áž¼áž“â€‹ážŠáŸ„áž™â€‹áž‡áŸ„áž‚â€‹áž‡áŸáž™Â áŸ”"
+
+#: config/prefs.php.dist:207
+msgid "Your signature:"
+msgstr "áž ážáŸ’ážáž›áŸážáž¶â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€Â áŸ–"
+
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[áž›áž¶áž€áŸ‹â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“]"
+
+#: message.php:257 compose.php:609 mailbox.php:691 lib/Compose.php:1968
+msgid "[No Subject]"
+msgstr "[áž‚áŸ’áž˜áž¶áž“â€‹áž”áŸ’ážšáž’áž¶áž“áž”áž‘]"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[áž”áž„áŸ’áž áž¶áž‰â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ -"
+
+#: lib/MIME/Headers.php:222
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[áž”áž„áŸ’áž áž¶áž‰â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ - áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹áž…áŸ†áž“áž½áž“ %s]"
+
+#: compose.php:1130
+msgid "_Bcc"
+msgstr "_Báž›áž¶áž€áŸ‹ "
+
+#: message.php:565 mailbox.php:490
+msgid "_Blacklist"
+msgstr "_Báž”áž‰áŸ’áž‡áž¸â€‹ážáŸ’áž˜áŸ… "
+
+#: compose.php:1127
+msgid "_Cc"
+msgstr "_Cáž…áž˜áŸ’áž›áž„ "
+
+#: message.php:537 mailbox.php:463 mailbox.php:466
+msgid "_Delete"
+msgstr "_Dáž›áž»áž” "
+
+#: lib/IMP.php:793
+msgid "_Folders"
+msgstr "_Fážáž "
+
+#: compose.php:1107
+msgid "_Identity"
+msgstr "_Iáž¢ážáŸ’ážážŸáž‰áŸ’áž‰áž¶ážŽ "
+
+#: lib/IMP.php:758
+msgid "_Inbox"
+msgstr "_Iáž”áŸ’ážšáž¢áž”áŸ‹â€‹áž‘áž‘áž½áž› "
+
+#: lib/IMP.php:834
+msgid "_Log out"
+msgstr "_Láž…áŸáž‰ "
+
+#: message.php:578
+msgid "_Message Source"
+msgstr "_Máž€áž¼ážŠâ€‹ážšáž”ážŸáŸ‹â€‹ážŸáž¶ážš "
+
+#: lib/IMP.php:790
+msgid "_New Message"
+msgstr "_NážŸáž¶ážšâ€‹ážáŸ’áž˜áž¸ "
+
+#: message.php:594
+msgid "_Print"
+msgstr "_Páž”áŸ„áŸ‡áž–áž»áž˜áŸ’áž– "
+
+#: compose.php:1198
+msgid "_Priority"
+msgstr "_Páž¢áž¶áž‘áž·áž—áž¶áž– "
+
+#: mailbox.php:327
+#, php-format
+msgid "_Refresh %s"
+msgstr "_Ráž’áŸ’ážœáž¾â€‹áž²áŸ’áž™ %s ážŸáŸ’ážšážŸáŸ‹ "
+
+#: message.php:540
+msgid "_Reply"
+msgstr "_Ráž†áŸ’áž›áž¾áž™â€‹ážáž” "
+
+#: lib/IMP.php:795
+msgid "_Search"
+msgstr "_SážŸáŸ’ážœáŸ‚áž„â€‹ážšáž€ "
+
+#: compose.php:1092 compose.php:1096
+msgid "_Send Message"
+msgstr "_Sáž•áŸ’áž‰áž¾â€‹ážŸáž¶ážš "
+
+#: mailbox.php:580
+msgid "_Thread"
+msgstr "_TážáŸ’ážŸáŸƒâ€‹ážŸáŸ’ážšáž¡áž¶áž™ "
+
+#: compose.php:1123 compose.php:1125
+msgid "_To"
+msgstr "_Táž‘áŸ… "
+
+#: mailbox.php:471
+msgid "_Undelete"
+msgstr "_Uáž˜áž·áž“â€‹áž›áž»áž” "
+
+#: message.php:559
+msgid "_View Thread"
+msgstr "_Váž˜áž¾áž›â€‹ážáŸ’ážŸáŸ‚â€‹ážŸáŸ’ážšáž¡áž¶áž™ "
+
+#: message.php:571 mailbox.php:496
+msgid "_Whitelist"
+msgstr "_Wáž”áž‰áŸ’áž‡áž¸ážŸ "
+
+#: lib/Compose.php:853
+msgid "addressee unknown"
+msgstr "áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: lib/Compose.php:1580
+msgid "attachment"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹"
+
+#: view.php:114
+msgid "attachments.zip"
+msgstr "attachments.zip"
+
+#: templates/compose/compose.html:276
+msgid "bytes"
+msgstr "áž”áŸƒ"
+
+#: lib/Compose.php:877
+msgid "cannot create output file"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž„áŸ’áž€áž¾ážâ€‹áž¯áž€ážŸáž¶ážšâ€‹áž›áž‘áŸ’áž’áž•áž›"
+
+#: lib/Compose.php:849
+msgid "cannot open input"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¾áž€â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž”áž‰áŸ’áž…áž¼áž›"
+
+#: lib/Compose.php:841
+msgid "command line usage error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž€áž¶ážšâ€‹áž”áŸ’ážšáž¾â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹â€‹áž–áž¶áž€áŸ’áž™áž”áž‰áŸ’áž‡áž¶"
+
+#: lib/Compose.php:897
+msgid "configuration error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’"
+
+#: lib/Compose.php:873
+msgid "critical system file missing"
+msgstr "áž”áž¶ážáŸ‹â€‹áž¯áž€ážŸáž¶ážšâ€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’â€‹ážŸáŸ†ážáž¶áž“áŸ‹â€‹áž”áŸ†áž•áž»áž"
+
+#: lib/Compose.php:845
+msgid "data format error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž‘áŸ’ážšáž„áŸ‹áž‘áŸ’ážšáž¶áž™â€‹áž‘áž·áž“áŸ’áž“áž“áŸáž™"
+
+#: lib/Compose.php:901
+msgid "entry not found"
+msgstr "ážšáž€â€‹áž˜áž·áž“â€‹ážƒáž¾áž‰â€‹áž’áž¶ážáž»â€‹áž”áž‰áŸ’áž…áž¼áž›"
+
+#: templates/contacts/contacts.html:16
+msgid "from"
+msgstr "áž–áž¸"
+
+#: lib/Compose.php:857
+msgid "host name unknown"
+msgstr "áž˜áž·áž“â€‹ážŸáŸ’áž‚áž¶áž›áŸ‹â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“"
+
+#: templates/compose/spelling.html:31
+msgid "in"
+msgstr "áž€áŸ’áž“áž»áž„"
+
+#: lib/Compose.php:881
+msgid "input/output error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž”áž‰áŸ’áž…áŸáž‰/áž”áž‰áŸ’áž…áž¼áž›"
+
+#: lib/Compose.php:865
+msgid "internal software error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ…"
+
+#: templates/folders/import.html:13
+msgid "into folder"
+msgstr "áž‘áŸ…â€‹áž€áŸ’áž“áž»áž„â€‹ážáž"
+
+#: smime.php:29 pgp.php:77
+msgid "key"
+msgstr "áž€áž¼áž“ážŸáŸ„"
+
+#: folders.php:109
+msgid "mailbox file"
+msgstr "áž¯áž€ážŸáž¶ážšâ€‹áž”áŸ’ážšáž¢áž”áŸ‹â€‹ážŸáŸ†áž”áž»ážáŸ’ážš"
+
+#: lib/Message.php:524 lib/Compose.php:640
+msgid "name"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡"
+
+#: templates/compose/spelling.html:32
+msgid "none"
+msgstr "áž‚áŸ’áž˜áž¶áž“"
+
+#: templates/compose/spelling.html:50
+msgid "or"
+msgstr "áž¬"
+
+#: lib/Compose.php:893
+msgid "permission denied"
+msgstr "ážŸáž·áž‘áŸ’áž’áž·â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž”ážŠáž·ážŸáŸáž’"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›]"
+
+#: lib/Compose.php:889
+msgid "remote error in protocol"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž–áž¸â€‹áž…áž˜áŸ’áž„áž¶áž™â€‹áž€áŸ’áž“áž»áž„â€‹áž–áž·áž’áž¸áž€áž¶ážš"
+
+#: lib/Compose.php:861
+msgid "service unavailable"
+msgstr "áž˜áž·áž“â€‹áž¢áž¶áž…â€‹ážšáž€â€‹ážŸáŸážœáž¶â€‹áž”áž¶áž“"
+
+#: templates/compose/spelling.html:19
+msgid "spelling error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’"
+
+#: templates/compose/spelling.html:19
+msgid "spelling errors"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž¢áž€áŸ’ážážšáž¶ážœáž·ážšáž»áž‘áŸ’áž’"
+
+#: lib/Compose.php:869
+msgid "system error"
+msgstr "áž€áŸ†áž áž»ážŸâ€‹áž”áŸ’ážšáž–áŸáž“áŸ’áž’"
+
+#: lib/Compose.php:885
+msgid "temporary failure"
+msgstr "áž”ážšáž¶áž‡áŸáž™â€‹áž”ážŽáŸ’ážŠáŸ„áŸ‡áž¢áž¶ážŸáž“áŸ’áž“"
+
+#: lib/Filter.php:51
+msgid "your blacklist"
+msgstr "áž”áž‰áŸ’áž‡áž¸â€‹ážáŸ’áž˜áŸ…â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr "áž”áž‰áŸ’áž‡áž¸â€‹ážŸâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€"


--- /dev/null
+++ lib/IMAP/Thread.php
@@ -0,0 +1,116 @@
+<?php
+
+require_once 'Horde/IMAP/Thread.php';
+
+/**
+ * The IMP_Thread class extends the IMAP_Thread class to include a function
+ * to generate the thread tree images.  This class is necessary to ensure
+ * backwards compatibility with Horde 3.0.
+ *
+ * For the next (mythical) release of Horde 4.x, this code should be merged
+ * into the IMAP_Thread class.
+ *
+ * $Horde: imp/lib/IMAP/Thread.php,v 1.5.2.2 2006/01/01 21:28:57 jan Exp $
+ *
+ * Copyright 2005-2006 Michael Slusarz <slusarz at curecanti.org>
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael Slusarz <slusarz at curecanti.org>
+ * @since   IMP 4.1
+ * @package IMP
+ */
+class IMP_Thread extends IMAP_Thread {
+
+    /**
+     * Cached value of the Horde graphics directory.
+     *
+     * @var string
+     */
+    var $_graphicsdir;
+
+    /**
+     * Cached values of the thread image objects.
+     *
+     * @var string
+     */
+    var $_imgcache = array();
+
+    /**
+     * Generate the thread representation image for the given index list.
+     *
+     * @param array $indices    The list of indices to create a tree for.
+     * @param boolean $sortdir  True for newest first, false for oldest first.
+     *
+     * @return array  An array with the index as the key and the thread image
+     *                representation as the value.
+     */
+    function getThreadImageTree($indices, $sortdir)
+    {
+        $container = $last_level = $last_thread = null;
+        $tree = array();
+
+        if ($sortdir) {
+            $indices = array_reverse($indices);
+        }
+
+        foreach ($indices as $val) {
+            $tree[$val] = '';
+
+            $indentBase = $this->getThreadBase($val);
+            if (empty($indentBase)) {
+                continue;
+            }
+
+            $lines = '';
+            $indentLevel = $this->getThreadIndent($val);
+            $lastinlevel = $this->lastInLevel($val);
+
+            if ($lastinlevel && ($indentBase == $val)) {
+                continue;
+            }
+
+            if ($lastinlevel) {
+                $join_img = ($sortdir) ? 'joinbottom-down.png' : 'joinbottom.png';
+            } elseif (($indentLevel == 1) && ($indentBase == $val)) {
+                $join_img = ($sortdir) ? 'joinbottom.png' : 'joinbottom-down.png';
+                $container = $val;
+            } else {
+                $join_img = 'join.png';
+            }
+            $threadLevel[$indentLevel] = $lastinlevel;
+            for ($i = ($container == $indentBase) ? 1 : 2; $i < $indentLevel; $i++) {
+                $lines .= $this->_image(!isset($threadLevel[$i]) || ($threadLevel[$i]) ? 'blank.png' : 'line.png');
+            }
+            $tree[$val] = $lines . $this->_image($join_img);
+        }
+
+        return $tree;
+    }
+
+    /**
+     * Utility function to return a url for the various thread images.
+     *
+     * @access private
+     *
+     * @param string $name  Image filename.
+     *
+     * @return string  Link to the folder image.
+     */
+    function _image($name)
+    {
+        if (!empty($this->_imgcache[$name])) {
+            return $this->_imgcache[$name];
+        }
+
+        if (empty($this->_graphicsdir)) {
+            $this->_graphicsdir = $GLOBALS['registry']->getImageDir('horde');
+        }
+
+        $this->_imgcache[$name] = Horde::img('tree/' . $name, '', 'style="vertical-align:middle"', $this->_graphicsdir);
+
+        return $this->_imgcache[$name];
+    }
+
+}


--- /dev/null
+++ templates/javascript/popup.js
@@ -0,0 +1,66 @@
+/**
+ * IMP Popup JavaScript.
+ *
+ * Provides the javascript to open popup windows.
+ *
+ * $Horde: imp/templates/javascript/popup.js,v 1.1.2.2 2006/02/10 21:10:26 slusarz Exp $
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you did not
+ * receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ */
+
+/**
+ * Open a popup window.
+ *
+ * @param string $url               The URL to open in the popup window.
+ * @param optional integer $width   The width of the popup window. (Default:
+ *                                  600 px)
+ * @param optional integer $height  The height of the popup window. (Default:
+ *                                  500 px)
+ * @param optional string $args     Any additional args to pass to the script.
+ *                                  (Default: no args)
+ */
+function popup_imp(url, width, height, args)
+{
+    if (!width) {
+        width = 600;
+    }
+    var screen_width = screen.width;
+    if (width > (screen_width - 75)) {
+        width = screen_width - 75;
+    }
+
+    if (!height) {
+        height = 500;
+    }
+    var screen_width = screen.width;
+    if (width > (screen_width - 75)) {
+        width = screen_width - 75;
+    }
+
+    var now = new Date();
+    var name = now.getTime();
+
+    if (url.indexOf('?') == -1) {
+        var glue = '?';
+    } else {
+        var glue = '&';
+    }
+
+    if (args != "") {
+        url = url + glue + args + "&uniq=" + name;
+    } else {
+        url = url + glue + "uniq=" + name;
+    }
+
+    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + width + ",height=" + height + ",left=0,top=0";
+    win = window.open(url, name, param);
+    if (!win) {
+        alert("<?php echo addslashes(_("The image save window can not be opened. Perhaps you have set your browser to block popup windows?")) ?>");
+    } else {
+        if (!eval("win.opener")) {
+            win.opener = self;
+        }
+        win.focus();
+    }
+}


--- /dev/null
+++ saveimage.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * $Horde: imp/saveimage.php,v 1.1.2.3 2006/01/19 07:08:00 slusarz Exp $
+ *
+ * Copyright 2005-2006 Michael Slusarz <slusarz at bigworm.curecanti.org>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('IMP_BASE', dirname(__FILE__));
+require_once IMP_BASE . '/lib/base.php';
+require_once IMP_BASE . '/lib/MIME/Contents.php';
+
+$id = Util::getFormData('id');
+$index = Util::getFormData('index');
+
+/* Run through the action handlers. */
+$actionID = Util::getFormData('actionID');
+switch ($actionID) {
+case 'save_image':
+    $contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $_SESSION['imp']['thismailbox']);
+    $mime_part = $contents->getDecodedMIMEPart($id);
+    $image_data = array(
+        'filename' => $mime_part->getName(true, true),
+        'description' => $mime_part->getDescription(true),
+        'data' => $mime_part->getContents(),
+        'type' => $mime_part->getType()
+    );
+    $res = $registry->call('images/saveImage', array(null, Util::getFormData('gallery'), $image_data));
+    if (is_a($res, 'PEAR_Error')) {
+        $notification->push($res, 'horde.error');
+        break;
+    }
+    Util::closeWindowJS();
+    exit;
+}
+
+/* Build the list of galleries. */
+$gallerylist = $registry->call('images/selectGalleries');
+
+$title = _("Save Image");
+require IMP_TEMPLATES . '/common-header.inc';
+IMP::status();
+require IMP_TEMPLATES . '/saveimage/saveimage.inc';
+require $registry->get('templates', 'horde') . '/common-footer.inc';


Þ•


















¦
























È
É

































h
j
l
ê
ë














r %s.
st
ey successfully added.
hat the server said

Attachment name: %s
Attachment date: %s

Click on the following link to permanently delete the attachment:
%s
POT-Creation-Date: 2004-12-08 10:28+0100
PO-Revision-Date: 2005-06-15 11:53+0700
Last-Translator: Leang Chumsoben <soben at khmeros.info>
Language-Team: Khmer <support at khmeros.info>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

ž˜áž¸)</em>
Ÿ‹â€‹áž˜áž·áž“â€‹áž›áŸ’áž¢Â áŸ”
™â€‹áž›áŸ†áž“áž¶áŸ†ážŠáž¾áž˜ (áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážšáž»áž€ážšáž€â€‹áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸâ€‹áž“áŸáŸ‡)Â ?
áž„áŸ’áž áž¶áž‰â€‹ážáŸ†ážŽ "ážŸáž˜áŸ’áž¢áž¶ážâ€‹ážŸáž¶ážšâ€‹áž¥ážâ€‹áž”áž¶áž“â€‹áž€áž¶ážš" áž€áŸ’áž“áž»áž„â€‹ážšáž”áž¶ážšâ€‹áž˜áŸ‰ážºáž“áž»áž™Â ?
Ÿáž€áž˜áŸ’áž˜Â áŸ”
ž¶
áž‘áŸ… %s
ž”ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž…áž»áŸ‡â€‹áž ážáŸ’ážáž›áŸážáž¶â€‹ážŠáŸ„áž™â€‹ážáŸ’áž›áž½áž“â€‹áž¯áž„)
áž¶áž˜Â áŸ”
”áŸ‹â€‹áž‡áž¶áž˜áž½áž™â€‹ážŸáž¶ážšâ€‹ áž€áŸ’áž“áž»áž„â€‹ážážâ€‹ážŸáŸ†áž”áž»ážáŸ’ážšâ€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž•áŸ’áž‰áž¾Â ?
”ážŸáŸ‹â€‹ážŸáž¶ážš
Ÿ†áž”áž»ážáŸ’ážšâ€‹áž”áž¶áž“â€‹áž”áž„áŸ’áž€áž¾ážâ€‹ážŸáž¶ážšâ€‹áž“áŸƒáž–áŸážáŸŒáž˜áž¶áž“â€‹ážŠáž¼áž…ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜Â áŸ–
Ÿ‡â€‹áž˜áž·áž“â€‹áž‘áž¶áž“áŸ‹â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž“áž»ážœážáŸ’ážâ€‹áž¡áž¾áž™Â áŸ”
áŸ†ážŽáŸ‚
ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž‚ážŽáž“áž¸â€‹ážŠáŸ‚áž›â€‹ážáŸ’ážšáž¼ážœâ€‹áž›áž»áž”â€‹áž˜áž½áž™Â áŸ”

ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ– %s
áž€áž¶áž›áž”ážšáž·áž…áŸ’áž†áŸáž‘â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹Â áŸ– %s

áž…áž»áž…â€‹ážáŸ†ážŽâ€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž˜â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž›áž»áž”â€‹áž¯áž€ážŸáž¶ážšâ€‹áž—áŸ’áž‡áž¶áž”áŸ‹â€‹áž‡áž¶â€‹áž¢áž…áž·áž“áŸ’ážáŸ’ážšáŸƒáž™áŸÂ áŸ–
%s

--- /dev/null
+++ lib/IMAP/.arch-ids/Sort.php.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4866.0


--- /dev/null
+++ .arch-ids/saveimage.php.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4877.0


--- /dev/null
+++ templates/javascript/.arch-ids/folders.js.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4880.0


--- /dev/null
+++ templates/prefs/.arch-ids/defaultsearchselect.inc.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4882.0


--- /dev/null
+++ templates/saveimage/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4883.0


--- /dev/null
+++ locale/he_IL/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4868.0


--- /dev/null
+++ locale/km_KH/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4871.0


--- /dev/null
+++ templates/stationery/.arch-ids/=id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4885.0


--- /dev/null
+++ config/.arch-ids/header.php.dist.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4863.0


--- /dev/null
+++ locale/he_IL/LC_MESSAGES/.arch-ids/imp.mo.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4870.0


--- /dev/null
+++ themes/graphics/.arch-ids/mail_forwarded.png.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4892.0


--- /dev/null
+++ locale/km_KH/LC_MESSAGES/.arch-ids/imp.mo.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4873.0


--- /dev/null
+++ po/.arch-ids/km_KH.po.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4876.0


--- /dev/null
+++ templates/javascript/addressesBlocks.js
@@ -0,0 +1,23 @@
+function toggleAddressesBlock(field, count)
+{
+    var block = new Horde_Hideable('ab_' + field);
+
+    block.toggle();
+    text = document.createTextNode(block.shown() ?
+                                   '<?php echo _("[Hide Addresses]") ?>' :
+                                   '<?php echo _("[Show Addresses -") ?> ' + count + ' <?php echo _("recipients]") ?>');
+    link = document.createElement('A');
+    link.href = '';
+    link.className = 'widget';
+    link.onclick = function() {
+        toggleAddressesBlock(field, count);
+        return false;
+    }
+    link.appendChild(text);
+
+    var toggle = document.getElementById('at_' + field);
+    if (toggle.firstChild) {
+        toggle.removeChild(toggle.firstChild);
+    }
+    toggle.appendChild(link);
+}


‰PNG


±ÄÅJs
™{xûEø2òŠÃÕED»»-Ã|AŠºË[šjÊ²º»º•º»ººj;Û:Ú£º»œ»«@*ô=K*Š2•»c´Á†°ÊhèhJ±Õ§ë†‚¸½ä…y¸º»
ÓÀ¼þz>rZ]@Pí
áÎ·fMËvìªNØ«”ÚdwÙUZ

--- /dev/null
+++ themes/graphics/.arch-ids/addressbook_add.png.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4887.0


--- /dev/null
+++ stationery.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * $Horde: imp/stationery.php,v 2.1.2.3 2006/02/20 15:08:50 jan Exp $
+ *
+ * Copyright 2005-2006 Jan Schneider <jan at horde.org>
+ *
+ * See the enclosed file COPYING for license information (GPL).  If you did
+ * not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ */
+
+ at define('IMP_BASE', dirname(__FILE__));
+$authentication = OP_HALFOPEN;
+require_once IMP_BASE . '/lib/base.php';
+require_once 'Horde/Prefs/UI.php';
+
+$compose_url = Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/services/prefs.php', true), 'app', 'imp', false);
+
+/* Is the preference locked? */
+if ($prefs->isLocked('stationery')) {
+    header('Location: ' . $compose_url);
+    exit;
+}
+
+/* Retrieve stationery. */
+$stationery_list = @unserialize($prefs->getValue('stationery', false));
+if (is_array($stationery_list)) {
+    $stationery_list = String::convertCharset($stationery_list, $prefs->getCharset());
+} else {
+    $stationery_list = array();
+}
+$stationery = null;
+
+/* Get form data. */
+$id = Util::getFormData('id');
+if (!is_null($id)) {
+    $id = (int)$id;
+}
+$selected = Util::getFormData('stationery');
+if (strlen($selected)) {
+    $selected = (int)$selected;
+}
+
+/* Run through the action handlers. */
+$actionID = Util::getFormData('actionID');
+$updated = false;
+switch ($actionID) {
+case 'update':
+    if (Util::getFormData('edit')) {
+        /* Stationery has been switched. */
+        if (strlen($selected)) {
+            /* Edit existing. */
+            $stationery = array('n' => $stationery_list[$selected]['n'],
+                                't' => $stationery_list[$selected]['t'],
+                                'c' => $stationery_list[$selected]['c']);
+            $id = $selected;
+        } else {
+            /* Create new. */
+            $stationery = array('n' => '', 't' => 'plain', 'c' => '');
+        }
+    } elseif (Util::getFormData('delete')) {
+        /* Delete stationery. */
+        if (isset($stationery_list[$id])) {
+            $updated = sprintf(_("The stationery \"%s\" has been deleted."), $stationery_list[$id]['n']);
+            unset($stationery_list[$id]);
+        }
+    } else {
+        $last_type = Util::getFormData('last_type');
+        $type = Util::getFormData('type', 'plain');
+        $name = Util::getFormData('name', '');
+        $content = Util::getFormData('content', '');
+        $stationery = array('n' => $name, 't' => $type, 'c' => $content);
+        if (!empty($last_type)) {
+            if ($last_type != $type) {
+                /* Switching text format. */
+                if ($type == 'plain') {
+                    require_once 'Horde/Text/Filter.php';
+                    $content = Text_Filter::filter($content, 'html2text');
+                }
+                $stationery['c'] = $content;
+            } else {
+                /* Saving stationery. */
+                if (is_null($id)) {
+                    $id = count($stationery_list);
+                    $stationery_list[] = $stationery;
+                    $updated = sprintf(_("The stationery \"%s\" has been added."), $stationery['n']);
+                } else {
+                    $stationery_list[$id] = $stationery;
+                    $updated = sprintf(_("The stationery \"%s\" has been updated."), $stationery['n']);
+                }
+            }
+        } elseif (!is_null($id)) {
+            $stationery = $stationery_list[$id];
+        }
+    }
+
+    break;
+}
+
+if ($updated) {
+    $prefs->setValue('stationery', serialize(String::convertCharset($stationery_list, NLS::getCharset(), $prefs->getCharset())), false);
+    $notification->push($updated, 'horde.success');
+}
+
+if (!is_null($stationery) && $stationery['t'] == 'html') {
+    require_once 'Horde/Editor.php';
+    $editor = &Horde_Editor::singleton('xinha', array('id' => 'content'));
+}
+
+/* Show the header. */
+require_once 'Horde/Prefs/UI.php';
+require IMP_BASE . '/config/prefs.php';
+$app = 'imp';
+$group = 'compose';
+
+Prefs_UI::generateHeader();
+require IMP_TEMPLATES . '/stationery/prefs.inc';
+
+require $registry->get('templates', 'horde') . '/common-footer.inc';


--- /dev/null
+++ lib/IMAP/Sort.php
@@ -0,0 +1,41 @@
+<?php
+
+require_once 'Horde/IMAP/Sort.php';
+
+/**
+ * The IMP_IMAP_Sort:: class extends the IMAP_Sort class in order to
+ * provide necessary bug fixes to ensure backwards compatibility with Horde
+ * 3.0.
+ *
+ * $Horde: imp/lib/IMAP/Sort.php,v 1.1.2.1 2006/02/15 18:10:09 slusarz Exp $
+ *
+ * Copyright 2006 Michael Slusarz <slusarz at horde.org>
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael Slusarz <slusarz at horde.org>
+ * @since   IMP 4.1
+ * @package Horde_IMAP
+ */
+class IMP_IMAP_Sort extends IMAP_Sort {
+
+    /**
+     * Sort a list of mailboxes (by value).
+     *
+     * @param array &$mbox    The list of mailboxes to sort.
+     * @param boolean $inbox  When sorting, always put 'INBOX' at the head of
+     *                        the list?
+     * @param boolean $index  Maintain index association?
+     */
+    function sortMailboxes(&$mbox, $inbox = true, $index = false)
+    {
+        $this->_sortinbox = $inbox;
+        if ($index) {
+            uasort($mbox, array(&$this, '_mbox_cmp'));
+        } else {
+            usort($mbox, array(&$this, '_mbox_cmp'));
+        }
+    }
+
+}


--- /dev/null
+++ locale/tr_TR/help.xml
@@ -0,0 +1,696 @@
+<?xml version="1.0" encoding="iso-8859-9"?>
+<!-- $Horde: imp/locale/tr_TR/help.xml,v 1.3.2.4 2006/03/23 00:24:08 jan Exp $ -->
+<help>
+  <entry id="compose-buttons" md5="3259ba00a198559c7faa76e7867600d9" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Ýþlemler</title>
+    <heading>Ýþlemler</heading>
+    <para>
+    Mesaj Gönder" e-posta mesajýnýzý alýcý(larý)nýza gönderir. Bu iþlem geri alýnamayacaðýndan iþlem bitmeden mesajýnýzý göndermek istediðinizden emin olunuz.  
+</para>
+    <para>
+    Taslaðý Kaydet" bitirilmemiþ bir mesajý ekranýnýzýn sað üst köþesinde bulunan aþaðý doðru açýlan kutudaki "Taslaklar" klasörüne koyar. Mesajýnýzý daha sonra "Taslaklar" klasöründeki kaydedilmiþ halinden açarak ve "Devam Etme" tuþuna týklayarak bitirebilirsiniz. Mesajýnýzý taslak olarak kaydetmeden önce konusunu yazmýþ olmanýz Taslaklar klasöründe mesajýnýzý kolaylýkla bulmanýzý saðlayacaktýr." 
+</para>
+    <para>
+     Mesajý Ýptal Et" sözkonusu mesajý iptal eder ve en son görüntülemekte olduðunuz klasöre döner."
+</para>
+</entry>
+  <entry id="compose-from" md5="82cf24d31a667a5b94e481cd5179c529" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Kimden</title>
+    <heading>"Kimden"</heading>
+    <para>
+    Kurulumunuza baðlý olarak, aþaðý akan bir listeden Seçenekler-&gt;Kiþisel Bilgiler kýsmýna girdiðiniz bir kimliði seçebilir, veya mesajýn gönderildiði adres olarak gözükmesini istediðiniz mail adresini metin alanýna girebilirsiniz."
+    </para>
+</entry>
+  <entry id="compose-to" md5="31cba17f169572c367aa8014831eb8f8" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Kime</title>
+    <heading>Kime</heading>
+    <para>
+    Mesajýnýzýn alýcýsý için doðru email adresini girin. Fazla alýcý girmek için, email adreslerini virgüllerle ayýrýn. Herhangi diðer noktalama iþaretlerinin email adreslerini ayýrmak için kullanýmý hataya sebep olur."
+    </para>
+</entry>
+  <entry id="compose-cc" md5="97571433ab037ef9c4d101a56bf74e25" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Kopya</title>
+    <heading>Kopya</heading>
+    <para>
+Mesajýnýzýn karbon kopya alýcýsý için doðru email adresini girin. Fazla alýcý girmek için, email adreslerini virgüllerle ayýrýn.
+     </para>
+    <para>
+Karbon Kopyalar genellikle mesajýn direkt alýcýsý olmayan kiþilere gönderilir, ama bilgilenmek açýsýndan mesajý almaya gereksinim duyabilirler, genellikle emailin konusu ile dolaylý olarak ilgilidirler. Bütün "Kime:" alýcýlarý ve "Kopya:" alýcýlarý her iki tür alýcý listesinin tamamýný görebilirler."
+    </para>
+</entry>
+  <entry id="compose-bcc" md5="aa8f9e2d44fdb74def0fa15240ff687b" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Gizli Kopya</title>
+    <heading>"Gizli Kopya"</heading>
+    <para>
+Mesajýnýzýn görünmez karbon kopya alýcýsý için doðru email adresini girin. Fazla alýcý girmek için, email adreslerini virgüllerle ayýrýn.  Herhangi diðer noktalama iþretlerinin email adreslerini ayýrmak için kullanýmý hataya sebep olur."  
+      </para>
+    <para>
+Görünmez karbon kopyalar genellikle diðer alýcýlarýn da o emaili aldýðýný BÝLMEDEN yazýlaný okumasý gereken alýcýlara gönderilir. Böylece "görünmez" bu alýcýlarýn kimliðinin emailin bütün diðer alýcýlarýndan saklandýðý anlamýna gelir. Sadece siz gönderen ve "Gizli Kopya" alýcýlarý bir kopya aldýklarýný bilecekler."
+     </para>
+</entry>
+  <entry id="compose-subject" md5="0639a8790e306acc9e19b4d1ce342d53" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Konu</title>
+    <heading>"Konu"</heading>
+    <para>
+   Mesajýnýzýn konusunu girin. Konuyu kýsa, yalýn ve açýklayýcý tutmak iyidir. Konu satýrý sizin ve yazýþtýðýnýz kiþi için emailin içinde ne olduðunu en kolay þekilde hatýrlatýr, bu yüzden emaillerinizi düzenlemede ve sonradan önemli olanlarýný bulmanýzý saðlamada önemlidir."
+     </para>
+    <para>
+   Ayrýca , bir emaili "Reply" veya "Forward" ederken, bu konu satýrý yeni mesajýnkine kopyalanýr bu email konuþmasýnda hangi mesajlarýn birlikte giderek bir "akýcýlýk" oluþturduðunu fark etmek açýsýndan çok yararlý bir yoldur. Bir öneri olarak, eðer replied veya forwarded mesajlar yeni fikirler içeriyorsa, "Konu" satýrýný alýcýlarýn "akýcýlýk" ilerlemesini takip edebilmeleri için biraz deðiþtirmek isteyebilirsiniz."
+     </para>
+</entry>
+  <entry id="compose-options" md5="5f1d50a733c8b7e46aecece28822ff70" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Seçenekler</title>
+    <heading>Seçenekler</heading>
+    <para>
+Bu Seçenekler mesajýnýzý hazýrlamak için size yardým eder."
+      </para>
+    <para>
+Ýmlanýzý kontrol etmek için "Spell Check" e týklayýn."
+     </para>
+    <para>
+Mesaja dosya ekleyebileceðiniz sayfanýn alt kýsmýna gitmek için "Ekler" e týklayýn.
+    </para>
+<para>
+Eðer gönderilmiþ postanýn saklanmasýna yöneticiniz tarafýndan izin verilmiþse, "Kopyasýný al" nin yanýndaki kutuyu iþaretleyerek gönderdiðiniz mesajýn bir kopyasýný saklamayý aktif duruma getirmiþ olursunuz. Bu hedef klasör kendi hazýr klasörü de olabilir veya sizin bu amaç için "Seçenekler-&gt;Kiþisel Bilgiler-&gt;Kimlikler". Eðer yöneticiniz gönderilen maillerin gönderileceði yeri seçmeyi aktif ettiyse, klasörünüzü bu seçeneðin yanýndaki aþaðý akan bir listeden seçebiliyor olacaksýnýz." 
+</para>
+<para>
+Gönderdiðiniz önemli e-postalarýn kopyalarýný saklamak ne görüþüldüðünü kaydetmek için önemlidir. Bununla birlikte, "Seçenekler-&gt;Kiþisel Bilgiler-&gt;Kimliði düzenle"a giderek, bu özelliði sizin kimliðiniz içinde otomatik olarak "açýk" yapýn. Seçeneklerinizde ayrýca bakým görevleri olan klasörleri periyodik olarak boþaltma veya yeniden adlandýrmayý düzenleyebilirsiniz."
+</para>
+</entry>
+  <entry id="compose-attach" md5="98dd30f32af1fa86a9f0fea3124c4ee1" state="changed">
+    <title>Mesaj Düzenlenmesi: Ek</title>
+    <heading>"Ek"</heading>
+    <para>
+Eðer tarayýcýnýz dosya yüklemeyi destekliyorsa mesajýnýza dosya ekleyebilirsiniz. Bir kerede 1 den fazla dosya yükleyebilirsiniz."
+      </para>
+    <para>
+Adým 1: Bu mesaja eklemek istediðiniz dosyanýn yolunu ve ismini yazýn veya "Gözat" tuþuna týklayýn ve eklemek istediðiniz dosyayý seçin. Dosyanýn yolu ve adý þimdi Ekler kutusunda görünüyor."
+     </para>
+    <para>
+Adým 2: Dosyanýzýn ek olarak mý yoksa mesajýn devamý halinde satýriçi mi olmasýný istediðinize karar verin. Alýcýlarýn mail okuduklarý yazýlýmýn mesajýn inline görüntülenen dosya tipini bulundurmasý gerekir, aksi halde bu kýsým ek olarak gözükür."
+    </para>
+   <para>
+Adým 3: "Ekle" tuþuna basýn. Dosya adý ve büyüklüðü Ekler listenize eklenecektir."
+   </para>
+<!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
+    <para>
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
+    </para>
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--><!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
+    <para>
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
+    </para>
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--><!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
+    <para>
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
+    </para>
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--></entry>
+  <entry id="compose-attachments" md5="8ac032c4ac182f3f0d6446c20f0089dd" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Ekler</title>
+    <heading>"Ekler"</heading>
+<para>
+Bu bölüm mesaja önceden eklenmiþ olan dosyalarýn listesini gösterir."
+     </para>
+<heading>Eklenmiþ dosyayý/dosyalarý silme</heading>
+<para>
+Eklenmiþ dosyayý/dosyalarý silmek için:
+    </para>
+<para>
+Adým 1: Silmek istediðiniz eklenmiþ dosya(lar)ýn yanýndaki iþaretleme düðmesini aktive edin.
+    </para>
+<para>
+Adým 2: "Eklenti Bilgisini Sil" i týkla."
+    </para>
+<heading>Ekin Yapýsýný Deðiþtirme</heading>
+<para>
+Ekinizin yapýsýný deðiþtirmek için:
+    </para>
+<para>
+Adým 1: Her ekin yapýsýný deðiþtirin - "satýriçi" veya "ek" olarak - istenilen deðere."
+    </para>
+<para>
+Adým 2: "Eklenti Bilgisini Yenile" yi týkla.
+    </para>
+<heading>Ekin Açýklamasýný Deðiþtirmek</heading>
+<para>
+Eklerinizin açýklamasýný deðiþtirmek için (alýcýnýn göreceði eki açýklayan metin):
+    </para>
+<para>
+Adým 1: Açýklama alanýna bir açýklama girin.
+   </para>
+<para>
+Adým 2: "Eklenti Bilgisini Yenile" yi týkla."
+   </para>
+</entry>
+  <entry id="compose-priority" md5="b023367c36de3ce1567d27ccaa45640c" state="uptodate">
+    <title>Mesaj Düzenlenmesi: Öncelik</title>
+    <heading>Öncelik</heading>
+    <para>
+  Bu giden mesajlarýnýza "X-Priority" baþlýðý koyar. "X-Priority" etiketi Netscape, Mozilla, Opera, ve Outlook mail istemcilerinin kabul ettiði bir tür "yalancý standart"týr. Bu baþlýðý kullanmayan bütün mail istemcileri önemsemeyecektir."
+      </para>    
+</entry>
+  <entry id="compose-save-attachments" md5="db89972c4ebb0b41ab691b6a7744a81d" state="uptodate">
+    <title>Mesaj Düzenlemesi: Ekleri Kaydet</title>
+    <para>
+Düzenlemenizdeki eklerin mesajlarla birlikte  gönderilmiþ-posta klasörüne kaydedilip kaydedilmedigine karar verir."Evet" ise,ekli veri kaydedilecektir. "Hayýr" ise, ekli veritüm alýcýlara gönderildikten sonra mesajdan çýkartýlýr."Hayýr" ý seçmek, kaydedilmiþ mesajlardan ekli bilgileri (genelde büyük olur) kaldýrarak disk alanýnýzdan tasarruf saðlar."
+      </para>
+</entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
+  <entry id="search" md5="86b2ef57b1194890833d9dd49ebc9b32" state="uptodate">
+    <title>Mesaj Düzenlemesi: Mesaj Arama</title>
+    <heading>Arama Kriteri</heading>
+    <para>
+   Farklý arama kriterleri kullanarak klasörlerinizde mesajlarýnýzý arayabilirsiniz
+      </para>
+    <para>
+   Adým 1: Arama kriterinize eklemek istediðiniz alanlara metin giriniz.
+     </para>
+    <para>
+  Adým 2: Arama kriterinize eklemek istediðiniz mesaj bayraklarýný seçiniz.
+    </para>
+<para>
+  Adým 3: Mesaj aramak istediðiniz klasörü seçiniz.
+    </para>
+<para>
+  Adým 4: "Ara" yý týklayýnýz.
+    </para>
+<para>
+  Eðer herhangi bir mesaj arama kriterinize uyuyorsa, bu mesajlarýn konularý "Arama Sonuçlarý" ekranýnda görüntülenecektir.
+    </para>
+</entry>
+  <entry id="folder-options" md5="30687ec475765ba4467d2ef6dcec40c3" state="uptodate">
+    <title>Klasör Yönetimi: Seçenekler</title>
+    <heading>Klasör Seçenekleri</heading>
+    <para>
+Sol sütundaki butonlarý kullanarak bir klasör seçebilirsiniz.Bunu bir kez yaptýktan sonra,klasör üzerinde gerçekleþtirmek istediðiniz tercihi soldaki seçenek kutusu ile seçiniz  " 
+      </para>
+    <para>
+Sonraki seçenekler için uyarýlacaksýnýz.Silme seçeneði konusunda dikkatli olunuz, yanlýþlýkla silerek klasördeki tüm mesajlarýnýzý kaybedebilirsiniz!"
+     </para>
+<heading>mbox Dosyasý Almak</heading>
+    <para>
+Bu seçenek seçtiðiniz bir klasöre mbox formatýnda dosya almanýzý saðlar. Mesajlarý almak için 1(bir) klasör seçiniz ve daha sonra bu tercihi seçiniz.Daha sonra mbox dosyasýný almak için uyaran bir sayfaya yönlendirileceksiniz. "
+    </para>
+</entry>
+  <entry id="folder-widgets" state="new">
+    <title>Folder Navigator: Display</title>
+    <heading>Show/Hide Unsubscribed</heading>
+    <para>
+    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
+    </para>
+    <heading>Expand All</heading>
+    <para>
+    Expand all folder entries.
+    </para>
+    <heading>Collapse All</heading>
+    <para>
+    Collapse all folder entries.
+    </para>
+</entry>
+  <entry id="filters" md5="5ef60786767e638fbf5ba8fc5bd5d9d2" state="uptodate">
+    <title>Filtreler: Uygula</title>
+    <heading>Filtre Kurallarýný Uygula</heading>
+    <para>
+Tüm mesajlarýnýzý belirlenmiþ kurallara göre filtrelemek için posta kutusu görünümündeyken GELEN KUTUSU adýnýn yanýndaki "Filtre Uygula" ikonunu týklayýnýz."
+    </para>
+</entry>
+  <entry id="filter-edit-rules" state="new">
+    <title>Filters: Edit Filter Rules</title>
+    <heading>Edit Your Filter Rules</heading>
+    <para>
+    Click on "Edit your filter rules" to proceed to the page where you can add, delete, and edit the currently active set of filter rules.
+    </para>
+</entry>
+  <entry id="filter-edit-blacklist" md5="80ff7803c66599c7035f7f8811d218cc" state="uptodate">
+    <title>Filtreler: Karalisteyi düzenle</title>
+    <heading>Karalistenizi düzenleyiniz</heading>
+    <para>
+   ASLA posta almak istemediðiniz e-posta adreslerini ekleyebileceðiniz, silebileceðiniz, düzenleyebileceginiz sayfaya yönlendirilmek için "Karalistenizi düzenleyiniz" i týklayýnýz."
+    </para>
+</entry>
+  <entry id="filter-edit-whitelist" md5="330c3a8fad198c7afe855c101c63cd0f" state="uptodate">
+    <title>Filtreler: Beyazlisteyi düzenle</title>
+    <heading>Beyazlistenizi düzenleyiniz</heading>
+    <para>
+    HER ZAMAN posta almak istediðiniz e-posta adreslerini ekleyebileceðiniz, silebileceðiniz, düzenleyebileceginiz sayfaya yönlendirilmek için "Beyazlistenizi düzenleyiniz" i týklayýnýz."
+     </para>
+</entry>
+  <entry id="filter-on-login" md5="37d9297d1cca46435e36b6e38e45dcdb" state="uptodate">
+    <title>Filtreler: Oturum Açarken Filtrelemek</title>
+    <heading>Filtre Kurallarýný Oturum Açarken Uygula</heading>
+    <para>
+     Her zaman IMP de ilk oturum açýlýrken filtreleri uygulamak için bu seçeneði iþaretle.
+     </para>
+</entry>
+  <entry id="filter-on-display" md5="f5afc305402ef52bad108933f3f33291" state="uptodate">
+    <title>FÝltreler: Yenilerken filtrele</title>
+    <heading>GELEN KUTUSU'nu her görüntülemede filtreleri uygula</heading>
+    <para>
+    GELEN KUTUSU'nu her görüntülemede filtreleri uygulamak için bu seçeneði iþaretle.
+    </para>
+</entry>
+  <entry id="filter-any-mailbox" md5="71c51e83909f9d0bd440d220772ee3c6" state="uptodate">
+    <title>Filtreler: Herhangi Bir Posta Kutusunu Fitrelemek</title>
+    <heading>Filtre kurallarýný herhangi bir posta kutusuna uygulamak</heading>
+    <para>
+    Herhangi bir posta kutusu için filtre kurallarný uygulayabilmek içim bu seçeneði iþaretleyiniz.Aslýnda,filtre kurallarý sadece GELEN KUTUNUZA gelen yeni postalara uygulanýr. Eðer bu seçenek iþaretliyse, tüm posta kutularýnýzýn sayfalarýnda o kutudaki mesajlara filtre kurallarýný uygulamanýzý saðlayacak ikonlar yer alacaktýr.NOT: GELEN KUTUSU dýþýndaki posta kutularýnda filtrelemek garip (örnek: Filtre mesajýn bir kopyasýnýn daha bu kutuya gelmesine sebep olabilir) ve/veya istenmeyen sonuçlar üretebilir(örnek: Mesaj bu kutuya geldikten sonra yeni filtre kurallarý üretilirse mesajlarýn silinmesine/taþýnmasýna sebep olabilir)."
+    </para>
+</entry>
+  <entry id="pgp-compose-attach-pubkey" md5="97446dbbb27616b4fa39be801e10df2d" state="uptodate">
+    <title>PGP: Yerel Anahtar Ekle</title>
+    <heading>Yerel Anahtar Ekle</heading>
+    <para>
+   Eðer seçiliyse PGP yerel anahtarýnýzýn bir kopyasý, eðer mevcutsa, gönderilen mesaja eklenecektir. PGP Ayarlarý ekranýndan varsayýlan hareketi ayarlayabilirsiniz.
+    </para>
+</entry>
+  <entry id="pgp-option-scan-body" md5="6baaada0d46dc1ab0941087f235f359b" state="uptodate">
+    <title>PGP: Metin gövdelerini tara</title>
+    <heading>Metin gövdelerini tara</heading>
+    <para>
+   Eðer IMP seçildiyse, metin mesajlarýnýn gövdelerini PGP bilgisi için arayacaktýr ve herhangi bir bilgi bulunduðunda görüntüleyecektir. Bu iþlem tüm metin mesajlarý içeriðinde PGP bilgisi olup olmadýðý kontrol edileceði için sistemi 
+   yavaþlatabilir.
+      </para>
+</entry>
+  <entry id="compose-options-encrypt" md5="1012144f749f19f5a24cef38601daa71" state="uptodate">
+    <title>Oluþtur: Þifreleme Seçenekleri</title>
+    <heading>Þifreleme yok</heading>
+    <para>
+    Mesajý þifreleme olmadan yolla (sade metin).
+      </para>
+    <heading>PGP Mesajý Þifrele</heading>
+    <para>
+    Bu seçenek aktif mesajý, PGP ve alýcýlarýn kiþisel genel anahtarlarýný kullanarak þifreler ve yollar. Bu seçeneði kullanarak sadece bir kiþiye mesaj yollayabilirsiniz. Alýcýnýn genel anahtarýnýn adres defterinizde olmasý gerekir aksi takdirde bu 
+    seçenek çalýþmayacaktýr. Alýcýnýn genel anahtarý adres defterinizde olduðu halde hala hatalar alýyorsanýz, alýcý alanýndaki e-posta adresiyle genel anahtarýn tutulduðu yerdeki e-posta adresinin eþleþtiðini kontrol ediniz."
+    </para>
+    <heading>PGP Mesajý Ýmzala</heading>
+    <para>
+    Bu seçenek aktif mesajý ve kiþisel genel anahtarýnýzý PGP kullanarak dijital olarak imzalayacaktýr. Bu devrede genel anahtarýnýz için þifre girmediyseniz, sizden þifre girmeniz istenecektir. Alýcýnýn sizin imzanýzý dijital olarak doðrulamasý 
+    için genel anahtarýnýzýn bir kopyasýna sahip olmalýdýr.
+    </para>
+    <heading>PGP Ýmzalama/Þifreleme Mesajý</heading>
+    <para>Bu seçenek ilk olarak mesajýnýzý dijital olarak imzalayacak ve sonra çýktýyý þifreleyecektir. Daha fazla bilgi için "PGP Mesajý Þifrele" ve "PGP Mesajý Ýmzala" baþlýklarýna bakýnýz."
+    </para>
+    <heading>S/MIME Mesajý Þifrele</heading>
+    <para>
+     TODO
+    </para>
+   <heading>S/MIME Mesajý Ýmzala</heading>
+    <para>
+     TODO
+    </para>
+   <heading>S/MIME Mesajý Ýmzala/Þifrele</heading>
+    <para>
+     TODO
+    </para>
+</entry>
+  <entry id="pgp-overview" md5="24b5138b4b53f73b5f2f2739e4c1858d" state="uptodate">
+    <title>PGP: Genel Bakýþ</title>
+    <heading>PGP nedir?</heading>
+    <para>
+    PGP güvenli baðlantý ve bilgi depolama için bir araçtýr özellikle e-posta ile kullanmak için. Bilgiyi þifrelemek ve dijital imzalar hazýrlamak için kullanýlabilir. IMP bu özelliði saðlamak için GNU Güvenlik Bekçisini kullanýr.
+      </para>
+    <heading>PGP özelliðini aktif et?</heading>
+    <para>
+    Eðer bu seçenek seçilirse, kiþisel PGP anahtarlarý yaratabilir/görüntüleyebilir, diðer bireylerden genel anahtarlar ekleyebilr/silebilir, þifreli postalarý okuyabilir, dijital olarak imzalanmýþ mailleri doðrulayabilir, ve giden maillerinizi þifreleyebilir/imzalayabilirsiniz.
+     </para>
+</entry>
+  <entry id="pgp-option-attach-pubkey" md5="561ce43370ac4afbcc3f9818c8fbc2f6" state="uptodate">
+    <title>PGP: Seçenekler - Genel Anahtar Ekle</title>
+    <heading>Seçenekler - Genel Anahtar Ekle</heading>
+    <para>
+    Eðer seçilirse PGP genel anahtarýnýzýn bir kopyasý, eðer varsa, varsayýlan olarak tüm giden postalarýnýza eklenecektir.
+    </para>
+</entry>
+  <entry id="pgp-manage-pubkey" md5="b289ea5824b7f69f35c0751497f4e1c3" state="uptodate">
+    <title>PGP: Genel Anahtarlarý Yönet</title>
+    <heading>Ganel Bakýþ</heading>
+    <para>
+    Bu ekran adres defterinizde PGP genel anahtarý olan aktif kullanýcýlarý listeler. Bu kullanýcýlar ya 1) þifreli mesaj yolladýðýnýz ya da 2) dijital imza doðruladýðýnýz kullanýcýlardýr.
+      </para>
+    <heading>Görüntüle</heading>
+    <para>
+    PGP genel anahtarýný görüntülemek için bir pencere açar.
+    </para>
+    <heading>Ayrýntýlar</heading>
+    <para>
+    PGP genel anahtarý hakkýnda bazý ayrýntýlar gösterir.
+    </para>
+    <heading>Sil</heading>
+    <para>
+    Adres defterinizden genel anahtarý siler.
+    </para>
+</entry>
+  <entry id="pgp-import-pubkey" md5="6ee1130b46e9ff1ca9ad3a3a47e7b382" state="uptodate">
+    <title>PGP: Genel Anahtarlarý Yönet - Dýþalým</title>
+    <heading>Genel anahtarlarý al</heading>
+    <para>
+    Bu tuþ manuel olarak PGP genel anahtarý alabileceðiniz bir pencere açar. Anahtar metin alanýna kopyalanmýþ olabilir yada bilgisayarýnýzda bir dosyada ise, dýþarýdan alým yapabilirsiniz. Anahtar geçerliyse adres defterinize girilcek ve pencere kapanacak; eðer geçerli deðilse, nedenini açýklayan bir hata mesajý dönecektir.
+     </para>
+</entry>
+  <entry id="pgp-overview-personalkey" md5="220af2b74a58f430efd72d6d6b1f993f" state="uptodate">
+    <title>PGP: Kiþisel Anahtarlarý Yönet</title>
+    <heading>Genel Bakýþ</heading>
+    <para>
+Eðer mesajlarý dijital olarak imzalamak istiyorsanýz veya diðerlerinin size þifreli mesaj göndermesini aktif etmek istiyorsanýz, kiþisel genel/özel PGP anahtar çiftine sahip olmalýsýnýz."
+      </para>
+    <heading>Genel Anahtarýnýz</heading>
+    <para>
+    Genel anahtarýnýz size þifreli mesaj gödermesini istediðiniz kiþliere açýk olmalýdýr ki bu mesajý sadece siz çözebilirsiniz(özel anahtarýnýzý kullanarak.) Ek olarak genel anahtarýnýz dijital mesaj yolladýðýnýz kiþilere açýk olmalýdýr - genel anahtar dijital imzayý doðrulamak için gereklidir.
+     </para>
+     <heading>Özel Anahtarýnýz</heading>
+    <para>
+    Özel anahtarýnýz genel þifrenizi kullanarak þifrelenmiþ mesajlarý çözmek için gereklidir. Ek olarak, özel anahtarýnýz dijital olarak mesaj imzalamak istiyorsanýz gereklidir. Özel anahtarýnýz anahtarlar oluþturulduðunda bir þifreyle korunacaktýr. Bu yüzden özel anahtarýnýzý gerektirensbir aktivite olduðunda, IMP þifrenizi soracaktýr. Her oturumda þifrenizi bir kere girmeniz gerekmektedir - IMP oturumu kapatana kadar þifrenizi saklar.
+    </para>
+</entry>
+  <entry id="pgp-personalkey-public" md5="3c844d4ff8fdda3e0d446b47a63117e0" state="uptodate">
+    <title>PGP: Kiþisel Anahtarlarý Yönet - Genel Anahtar</title>
+    <heading>Görüntüle</heading>
+    <para>
+    PGP genel anahtarý görüntülemek için bir pencere açar.
+      </para>
+    <heading>Ayrýntýlar</heading>
+    <para>
+    PGP genel anahtarý ile ilgili bazý ayrýntýlar görüntüler.
+     </para>
+</entry>
+  <entry id="pgp-personalkey-private" state="new">
+    <title>PGP: Manage Personal Keys - Private Key</title>
+    <heading>Enter Passphrase</heading>
+    <para>
+    Opens the passphrase dialog window. The passphrase entered, if correct, will be stored by IMP until your session ends.
+    </para>
+    <heading>Unload Passphrase</heading>
+    <para>
+    Removes the stored passphrase from IMP - any additional usage of the private key will require you to reenter the passphease.
+    </para>
+    <heading>View</heading>
+    <para>
+    Opens a window to view the PGP private key. DO NOT SEND THIS KEY TO ANYONE - this option is strictly so that you can export your IMP personal private key for use in another program.
+    </para>
+    <heading>Details</heading>
+    <para>
+    Displays some details about the PGP private key.
+    </para>
+</entry>
+  <entry id="pgp-personalkey-delete" md5="dbd8cbe6bce71c4fb592dd1b3b27b7ce" state="uptodate">
+    <title>PGP: Kiþisel Anahtarlarý Yönetin - Sil</title>
+    <heading>Kiþisel Anahtarlarý sil</heading>
+    <para>
+    Bu tuþ kiþisel genel/özel anahtar çiftinizi IMP seçeneklerinden siler.
+     </para>
+</entry>
+  <entry id="pgp-personalkey-create-name" md5="748cb124b7ff52820792e278037a8c27" state="uptodate">
+    <title>PGP: Kiþisel Anahtar yarat - Ýsim</title>
+    <heading>Ýsim</heading>
+    <para>
+    Kiþisel anahtarlarýnýza eklemek istediðiniz isim. Gerekli bir alan.
+    </para>
+</entry>
+  <entry id="pgp-personalkey-create-comment" md5="e666eb9f0ee4b49fe04f74fc18db8640" state="uptodate">
+    <title>PGP: Kiþisel Anahtar yarat - Yorum</title>
+    <heading>Yorum</heading>
+    <para>
+    Kiþisel anahtarlarýnýza eklemek istediðiniz karakter dizisi. Opsiyonel bir alan.
+    </para>
+</entry>
+  <entry id="pgp-personalkey-create-email" md5="c729f70fdb3a73cbb7ba5ef5888e3092" state="uptodate">
+    <title>PGP: Kiþisel Anahtar yarat - E-posta adresi</title>
+    <heading>E-posta adresi</heading>
+    <para>
+     Kiþisel Anantarýnýzla eþleþtirmek istediðiniz e-posta adresi. Gerekli bir alan.
+      </para>
+</entry>
+  <entry id="pgp-personalkey-create-keylength" md5="24ca641c63fb5ff310a39ee0d3b1ee55" state="uptodate">
+    <title>PGP: Kiþisel Anahtar yarat - Anahtar Uzunluðu</title>
+    <heading>Anahtar Uzunluðu</heading>
+    <para>
+Üretilen anahtarýnýzýn anahtar Uzunluðu (byte olarak). Deðer ne kadar yüksekse koruma o kadar yüksektir (ve ayrýca yüksek üretim ve þifreleme süresi). Varsayýlan 1024 byte - bu deðer mükemmmel koruma saðlar.
+      </para>
+</entry>
+  <entry id="pgp-personalkey-create-passphrase" md5="2fb9372970bf33f51e988ba39dbd7193" state="uptodate">
+    <title>PGP: Kiþisel Anahtar yarat - Þifre</title>
+    <heading>Þifre</heading>
+    <para>
+    Kiþisel özel anahtarýnýzý þifrelemek ve korumak için kullanýlan þifre. Bu en az 6 karakter olmalý, oturum açma þifrenizle ayný olmamalý, anlamlý bir sözcük içermemeli, ayrýca hem numara hem harf içermeli. Onaylama süreci için bu þifreyi iki kez girmeniz gerekir. Gerekli bir alan.
+    </para>
+</entry>
+  <entry id="pgp-personalkey-create-actions" md5="0f8234935b964c83533b4ec4c15eb712" state="uptodate">
+    <title>PGP: Kiþisel Anahtar yarat - Aksiyon</title>
+    <heading>Anahtarlar Yarat</heading>
+    <para>
+    Kiþisel Genel/özel anahtar çiftinizi yaratýn ve saklayýn.
+      </para>
+    <heading>Anahtar Çifti Al</heading>
+    <para>
+    Kiþisel/özel anahtar çifti al. Bu tuþ varolan PGP kiþisel genel/özel anahtar çiftinizi almanýz için bir pencere açar. Anahtarlar metin alanýna yapýþtýrýlmýþ veya lokal bilgisayarýnýzda bir dosyada olabilir, onlarý alabilirsiniz. Anahtarlar geçerli ise seçeneklerinize eklenir ve pencere kapanýr; eðer geçersizse neden geçersiz olduðunu açýklayan bir mesaj döner."
+     </para>
+</entry>
+  <entry id="smime-overview" md5="d3c752b1345fb2eccfe575c07461963f" state="uptodate">
+    <title>S/MIME: Genel Bakýþ</title>
+    <heading>S/MIME Nedir?</heading>
+    <para>
+S/MIME bir açýk ve kontrol edilebilir bir yolla dijital imzalar, mesaj gizliliði ve izinsiz eriþim kontrolcüsü saðlayan özel/genel anahtar çifti sistemidir. S/MIME sadece yollayan ve istenen alýcýlarýn çözebileceði þifreleme saðlar. Mesajý yollayan kiþiyi dijital imza aracýlýðýyla tanýmanýzý saðlar. Bu þifreleme ve dijital imzalama, alýcýlarýn mesajýn yollandýktan sonra deðiþtirilip deðiþtirilmediðini kontrol etmelerini saðlar."
+      </para>
+    <heading>S/MIME özelliklerini aktif et?</heading>
+    <para>
+Eðer bu seçenek seçilirse, kiþisel S/MIME anahtarlarýnýzý almaya, þifrelenmiþ posta okumaya, dijital olarak imzalanmýþ postlarý doðrulamaya ve giden postalarýnýzý þifreleme/imzalamanýza olanak verir."
+     </para>
+</entry>
+  <entry id="smime-overview-personalkey" md5="9f4f36ae72cb4abc731067d338be3b98" state="uptodate">
+    <title>S/MIME: Kiþisel Anahtarlar</title>
+    <heading>Genel Bakýþ</heading>
+    <para>Eðer mesajlarý dijital olarak imzalamak veya þifrelemek istiyorsanýz, kendi kiþisel genel/özel S/MIME anahtar çiftine sahip olmalýsýnýz."
+      </para>
+</entry>
+  <entry id="smime-import-personal-certs" state="uptodate" md5="cf0ed2e3e24d30dedf8cfef2c2645759">
+    <title>S/MIME: Import Personal Certificates</title>
+    <heading>Import Personal Certificates</heading>
+    <para>
+    Import personal certificates from a PKCS #12 format file. PKCS #12 files is the file usually generated when exporting a key from a browser (e.g. Internet Explorer, Firefox) or from a certificate store maintained by an Operating System (e.g. Windows XP). If the keys are valid they will be inserted into your preferences and the window will close; if not valid, an error message will be returned explaining why.
+    </para>
+</entry>
+  <entry id="smime-delete-personal-certs" md5="018bb6b61a7e416892de288ad1c880f4" state="uptodate">
+    <title>S/MIME: Kiþisel Sertifikalarý Sil</title>
+    <heading>Kiþisel Sertifikalarý Sil</heading>
+    <para>Kiþisel Sertifikalarýnýzý seçeneklerinizden silin. Bundan sonra S/MIME mesajlarýnýzý onaylayamaz veya size göderilen S/MIME ile þifrelenmiþ postalarý göremezsiniz."
+      </para>
+</entry>
+  <entry id="smime-manage-pubkey" md5="8b6c63684d3d73b3d084025a78fe7e88" state="uptodate">
+    <title>S/MIME: Genel Anahtarlarý Yönet</title>
+    <heading>S/MIME: Genel Anahtarlarý Yönet</heading>
+    <para>S/MIME genel anahtar listesini yönet.
+      </para>
+     <heading>Görünüm</heading>
+    <para>Genel Anahtarýn yalýn metnini gör.
+      </para>
+<heading>Ayrýntýlar</heading>
+    <para>Genel anahtarýn teknik ayrýntýlarýný görüntüle.
+      </para>
+<heading>Sil</heading>
+    <para>Seçili genel anahtarý kayýttan sil. Bir kullanýcý için genel anahtarý silmek, o kiþiye þifrelenmiþ posta göndermenizi engeller.
+      </para>
+</entry>
+  <entry id="printing" state="uptodate" md5="f233c11b6b4a6bedeb68f1d5a2a976db">
+    <title>Printing</title>
+    <heading>Print a message</heading>
+    <para>
+    To print a message you are viewing, click on the "Print" link at either the top or bottom of the message. The message will open in a new window formated for printing.  Depending on your web browser and operating system, the print dialog box may open for you.  If it does not open, then pull down the web browser's "File" menu and choose "Print" to open the print dialog box.
+    </para>
+</entry>
+  <entry id="sorting" md5="18cdeac38027fe5c42bab693f2a4260a" state="uptodate">
+    <title>Sýnýflandýrma ve Gruplama</title>
+    <heading>Giriþleri Sýnýflandýrma</heading>
+    <para>Bir mesaj listesi görüntülerken,mesajlarýnýzý uygun sütun baþlýðýna týklayarak her sütun için sýnýflandýrabilirsiniz. Sütunlarý azalan ve artan sýra arasýnda deðiþtirmek için sütun baþlýðýdaki ok simgesine týklayýn."
+      </para>
+    <heading>Gruplama</heading>
+    <para>Mesajlarý kendi cevaplarýyla birlikte konularýna göre gruplamak için konu sütununun baþýndaki [Thread] baðlantýsýna týklayýn. Normal konu sýralamasýna dönmek için konu sütununun baþýndaki [Subject] baðlantýsýna týklayýn."
+    </para>
+</entry>
+  <entry id="alternative-msg" md5="4978073f76977b6af6b69810e4d22a65" state="uptodate">
+    <title>Çokparçalý/Alternatif mesajlar</title>
+    <para>Kullanýcýlar bazý mesajlarý çokparçalý/alternatif olarak yollayabilirler.Bu mesajlar,AYNI içeriði DEÐÝÞÝK formatlarda gösterirler.
+    </para>
+</entry>
+  <entry id="prefs-rename_sentmail_monthly" md5="530fa20e0afbc25ffd40877948832899" state="uptodate">
+    <title>Seçenekler: Bakým: Gönderilmiþ-postalar klasörünü aylýk olarak yeniden adlandýr</title>
+    <para>Bu seçeneði her ayýn baþýnda göderilmiþ-postalar klasörünü yeniden adlandýrmak istiyorsanýz seçin. Klasör yeniden adlandýrýlacak ve yeni gönderilmiþ-postalar klasörü yaratýlacaktýr."
+      </para>
+</entry>
+  <entry id="prefs-delete_sentmail_monthly" md5="0beed16dfd68e2f25e0c66871fd546df" state="uptodate">
+    <title>Seçenekler: Bakým: Gönderilmiþ-postalar klasörünü aylýk olarak sil</title>
+    <para>Bu seçeneði her ayýn baþýnda göderilmiþ-postalar klasörünü silmek istiyorsanýz seçin. Bu kotanýz varsa kullanýþlý olabilir.
+    </para>
+</entry>
+  <entry id="prefs-delete_sentmail_monthly_keep" md5="71ed1c2eab48b91a25b5bcd4b14ccea9" state="uptodate">
+    <title>Seçenekler: Bakým: Gönderilmiþ-postalar klasörünü aylýk olarak sil - saklanacak klasör sayýsý</title>
+    <para>eðer eski-gönderilmiþ postalar klasörünü her ay siliyorsanýz, bu dosyalarý kaç ay daha saklamak istiyorsunuz? Bu süreden daha eski klasörleriniz silinecektir."
+    </para>
+</entry>
+  <entry id="prefs-delete_attachments_monthly" md5="373ea02ede6df5fc345caf632e19a75f" state="uptodate">
+    <title>"Seçenekler: Bakým: Baðlý eklentileri aylýk olarak sil</title>
+    <para>Bu seçeneði her ay baþýnda eski eklentilerinizi silmek istiyorsanýz seçin. Bu kotanýz varsa kullanýþlý olabilir.
+    </para>
+</entry>
+  <entry id="prefs-delete_attachments_monthly_keep" state="uptodate" md5="1b340a60214dffd04aec02cc1127df5d">
+    <title>Preferences: Maintenance: Delete Linked Attachments Monthly - # of Months to Keep</title>
+    <para>
+    If you are deleting old linked attachments every month, how many months of old attachments do you  want to keep?  Any attachments older than this many months will be deleted.
+    </para>
+</entry>
+  <entry id="prefs-purge_trash" md5="dc71871146be3e46ade0087a8cf18273" state="uptodate">
+    <title>Seçenekler: Bakým: Çöp kutusunu temizle</title>
+    <para>Çöp kutunuzu bu kadar sýk temizlemek istiyor musunuz?
+    </para>
+</entry>
+  <entry id="prefs-purge_trash_interval" md5="7be91fbeb05b2d87289d4c5602d5a32f" state="uptodate">
+    <title>Seçenekler: Bakým: Çöp kutusunu temizleme aralýðý</title>
+    <para>Çöp kutunuzu ne kadar sýklýkla temizliyorsunuz?
+    </para>
+</entry>
+  <entry id="prefs-purge_trash_keep" md5="3cb5a2b5b80b7ac1179ae005f983970e" state="uptodate">
+    <title>Seçenekler: Bakým: Çöp kutusunu temizlerken tut</title>
+    <para>Çöp kutunuzu temizlerken kaç günlük mailler silinmelidir.
+    </para>
+</entry>
+  <entry id="prefs-attrib_text" md5="721a09d7ca028c97e3bd2b38c597fff7" state="uptodate">
+    <title>Seçenekler: Mesaj Kompozisyonu : simgesel Metin</title>
+    <para>Burda postalara cevap verirken görünmesini istediðiniz sözcüðü yazýn.
+      </para>
+    <para>Cevap verdiðiniz postada mesajla ilgili bilgiler vermek için yertutucular kullanabilirsiniz. yertutucular '%' ve takip eden bir karakterden oluþur. bazý yer tutucular þunlardýr:"
+     </para>
+    <para>%f : Gönderenin adý ve e-posta adresi
+    </para>
+<para>%a : Gönderenin e-posta adresi
+    </para>
+<para>%p : Gönderenin adý
+    </para>
+<para>%r : tüm RFC 2822 stili tarih ve zaman dilimi
+    </para>
+<para>%d : Tarih www, gg aaa yyyy
+    </para>
+<para>%x : Varsayýlan yerel tarih
+    </para>
+<para>%c : Varsayýlan yerel tarih ve zaman
+    </para>
+<para>%m : Mesaj-kimliði
+    </para>
+<para>%s : Konu
+    </para>
+<para>%n : Yeni Bir satýr
+    </para>
+<para>%% : '%' karakteri
+    </para>
+</entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
+  <entry id="prefs-disposition_request_read" md5="89e92c4d68224b2345b59959878a7174" state="uptodate">
+    <title>Seçenekler: Okundu bilgisi isteði</title>
+    <para>'Okundu Bilgisi Ýstegi' Alýcýlardan mailin okunduðuna dair bilgi dönmesi. Her zaman desteklenmez.
+    </para>
+</entry>
+  <entry id="prefs-disposition_send_mdn" md5="1fe04e5dc3de68d172da284895973ea9" state="uptodate">
+    <title>Seçenekler: MDN yolla</title>
+    <para>'MDN yolla' Mesaj Ulaþým Uyarýsý (Message Disposition Notification), bir mesaj okuduðunuzda yollanan mesajý okuduðunuza dair bir uyarý iletisi, mesajý yolayan kiþiye, yollayan kiþi okundu bilgisi almak istediyse, iletilir. Çoðu durumda bu iþlem size bir uyarý verilmeden yapýlýr. Bazý özel durumlarda ise uyarý mailini bir linke týklayarak  yollamayý tercih edebilirsiniz."
+    </para>
+</entry>
+  <entry id="prefs-disposition_request_delivery" state="new">
+    <title>Preferences: Request Delivery Confirmation</title>
+    <para>
+    "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this.
+    </para>
+</entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
+  <entry id="prefs-html_image_replacement" md5="28e1cf08e328345a8e7274c853492d4f" state="uptodate">
+    <title>Seçenekler: HTML Resim Engelleme</title>
+    <para>HTML olarak atýlan mesajlardaki resimlerin görüntülenmesi, siz aksini belirtene kadar engellenir. Unutmayýn ki eklenti olarak gönderilen HTML dosyalarýndaki resimler herzaman görüntülenir."
+    </para>
+</entry>
+  <entry id="prefs-html_image_addrbook" md5="759fa3df24e0a3cd89f320102252f91a" state="uptodate">
+    <title>Seçenekler: Adres Defterinde Deðilse HTML Resim Engelleme</title>
+    <para>Gönderen kiþi adres defterinizde yer alýyorsa, HTML biçiminde gönderdiði mesajlardaki resimler görüntülensin mi?"
+    </para>
+</entry>
+  <entry id="prefs-mailbox_start" md5="3d1196f265d8b7cc465ebf21512acc05" state="uptodate">
+    <title>Seçenekler: Posta Kutusu Baþlangýç Safyasý</title>
+    <para>Posta kutunuza ilk eriþtiðinizde görüntülenmesini istediðiniz sayfayý belirler. Unutmayýn ki okunmamýþ mesaj seçeneði, konuya göre sýralama seçeneði ile birlikte çalýþmaz." 
+    </para>
+</entry>
+  <entry id="prefs-save_attachments" md5="35b46334cdcc7fa416b9f9fca5874e80" state="uptodate">
+    <title>Seçenekler: Gönderilmiþ Mesajlardaki Eklentileri Kaydet.</title>
+    <para>Eðer gönderdiðiniz mesajý kaydedecekseniz aþaðýdaki seçenekleri kullanabilirsiniz:
+      </para>
+    <para>* 'Her zaman eklentileri kaydet' - Asla mesaj gönderme ekranýnda sizden bilgi istenmez. Eklentiler her zaman mesajla birlikte kaydedilir." 
+     </para>
+    <para>* 'Her eklenti gönderildiðinde sizden bilgi istenir' - Her zaman mesaj gönderme ekranýnda sizden bilgi istenir; Aksi belirtilmedikçe eklentiler kaydedilir."
+    </para>
+    <para>* 'Her eklenti gönderildiðinde sizden bilgi istenir' - Her zaman mesaj gönderme ekranýnda sizden bilgi istenir; Aksi belirtilmedikçe eklentiler kaydedilmez."
+    </para>
+    <para>* 'Hiçbir zaman eklentileri kaydetme' - Asla mesaj gönderme ekranýnda sizden bilgi istenmez. Eklentiler hiçbir zaman mesajla birlikte kaydedilmez."  
+</para>
+</entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
+</help>


--- /dev/null
+++ lib/IMAP/.arch-ids/Search.php.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4865.0


--- /dev/null
+++ lib/IMAP/Client.php
@@ -0,0 +1,787 @@
+<?php
+
+/**
+ * The IMP_IMAPClient:: class enables connection to an IMAP server through
+ * built-in PHP functions.
+ *
+ * TODO: This should eventually be moved to Horde 4.0/framework.
+ *
+ * $Horde: imp/lib/IMAP/Client.php,v 1.21.2.21 2006/03/30 10:15:31 selsky Exp $
+ *
+ * Copyright 2005-2006 Michael Slusarz <slusarz at horde.org>
+ *
+ * Based on code from:
+ *   + auth.php (1.49)
+ *   + imap_general.php (1.212)
+ *   + strings.php (1.184.2.35)
+ *   from the Squirrelmail project.
+ *   Copyright (c) 1999-2005 The SquirrelMail Project Team
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael Slusarz <slusarz at horde.org>
+ * @since   IMP 4.1
+ * @package IMP
+ */
+class IMP_IMAPClient {
+
+    /**
+     * The list of capabilities of the IMAP server.
+     *
+     * @var array
+     */
+    var $_capability = null;
+
+    /**
+     * The hostname of the IMAP server to connect to.
+     *
+     * @var string
+     */
+    var $_host;
+
+    /**
+     * The last message returned from the server.
+     *
+     * @var string
+     */
+    var $_message;
+
+    /**
+     * The namespace information.
+     *
+     * @var array
+     */
+    var $_namespace = null;
+
+    /**
+     * The port number of the IMAP server to connect to.
+     *
+     * @var string
+     */
+    var $_port;
+
+    /**
+     * The last response returned from the server.
+     *
+     * @var string
+     */
+    var $_response;
+
+    /**
+     * The unique session identifier ID to use when making an IMAP query.
+     *
+     * @var integer
+     */
+    var $_sessionid = 1;
+
+    /**
+     * The socket connection to the IMAP server.
+     *
+     * @var resource
+     */
+    var $_stream;
+
+    /**
+     * Are we using SSL to connect to the IMAP server?
+     *
+     * @var string
+     */
+    var $_usessl = false;
+
+    /**
+     * Are we using TLS to connect to the IMAP server?
+     *
+     * @var string
+     */
+    var $_usetls = false;
+
+    /**
+     * Constructor.
+     *
+     * @param string $host      The address/hostname of the IMAP server.
+     * @param string $port      The port to connect to on the IMAP server.
+     * @param string $protocol  The protocol string (See, e.g., servers.php).
+     */
+    function IMP_IMAPClient($host, $port, $protocol)
+    {
+        $this->_host = $host;
+        $this->_port = $port;
+
+        /* Split apart protocol string to discover if we need to use either
+         * SSL or TLS. */
+        $tmp = explode('/', strtolower($protocol));
+        if (in_array('tls', $tmp)) {
+            $this->_usetls = true;
+        } elseif (in_array('ssl', $tmp)) {
+            $this->_usessl = true;
+        }
+    }
+
+    /**
+     * Are we using TLS to connect and is it supported?
+     *
+     * @return mixed  Returns true if TLS is being used to connect, false if
+     *                is not, and PEAR_Error if we are attempting to use TLS
+     *                and this version of PHP doesn't support it.
+     */
+    function useTLS()
+    {
+        if ($this->_usetls) {
+            /* There is no way in PHP 4 to open a TLS connection to a
+             * non-secured port.  See http://bugs.php.net/bug.php?id=26040 */
+            if (!function_exists('stream_socket_enable_crypto')) {
+                return PEAR::raiseError(_("To use a TLS connection, you must be running a version of PHP 5.1.0 or higher."), 'horde.error');
+            }
+        }
+
+        return $this->_usetls;
+    }
+
+    /**
+     * Generates a new IMAP session ID by incrementing the last one used.
+     *
+     * @access private
+     *
+     * @return string  IMAP session id of the form 'A000'.
+     */
+    function _generateSid()
+    {
+        return sprintf("A%03d", $this->_sessionid++);
+    }
+
+    /**
+     * Perform a command on the IMAP server.
+     * This command sets the $_response and $_message variable.
+     *
+     * @access private
+     *
+     * @param string $query  IMAP command.
+     *
+     * @return mixed  Returns PEAR_Error on error.  On success, returns an
+     *                array of the IMAP return text.
+     */
+    function _runCommand($query)
+    {
+        $message = $response = array();
+
+        $sid = $this->_generateSid();
+        fwrite($this->_stream, $sid . ' ' . $query . "\r\n");
+        $tag_uid_a = explode(' ', trim($sid));
+        $tag = $tag_uid_a[0];
+
+        $res = $this->_retrieveIMAPResponse($tag, $response, $message);
+        if (is_a($res, 'PEAR_Error')) {
+            $this->_message = $this->_response = '';
+            return $res;
+        }
+
+        /* retrieve the response and the message */
+        $this->_response = $response[$tag];
+        $this->_message  = $message[$tag];
+
+        return (!empty($res[$tag])) ? $res[$tag][0] : $res[$tag];
+    }
+
+    /**
+     * Custom fgets function - get a line from the IMAP server no matter how
+     * large the line may be.
+     *
+     * @access private
+     *
+     * @return string  The next line in the IMAP stream.
+     */
+    function _fgets()
+    {
+        $buffer = 4096;
+        $offset = 0;
+        $results = '';
+
+        while (strpos($results, "\r\n", $offset) === false) {
+            if (!($read = fgets($this->_stream, $buffer))) {
+                $results = '';
+                break;
+            }
+            if ($results != '') {
+                $offset = strlen($results) - 1;
+            }
+            $results .= $read;
+        }
+
+        return $results;
+    }
+
+    /**
+     * Reads the output from the IMAP stream.
+     *
+     * @access private
+     *
+     * @param string $tag      The IMAP SID tag.
+     * @param array $response  The response information.
+     * @param array $message   The message information.
+     *
+     * @return mixed  PEAR_Error on error, response string on success.
+     */
+    function _retrieveIMAPResponse($tag, &$response, &$message)
+    {
+        $aResponse = $read = '';
+        $data = $resultlist = array();
+        $i = 0;
+
+        $read = $this->_fgets();
+        while ($read) {
+            $char = $read{0};
+            switch ($char) {
+            case '+':
+            default:
+                $read = $this->_fgets();
+                break;
+
+            case $tag{0}:
+                /* Get the command. */
+                $arg = '';
+                $i = strlen($tag) + 1;
+                $s = substr($read, $i);
+                if (($j = strpos($s, ' ')) || ($j = strpos($s, "\n"))) {
+                    $arg = substr($s, 0, $j);
+                }
+                $found_tag = substr($read, 0, $i - 1);
+                if ($found_tag) {
+                    $response[$found_tag] = $arg;
+                    $message[$found_tag] = trim(substr($read, $i + strlen($arg)));
+                    if (!empty($data)) {
+                        $resultlist[] = $data;
+                    }
+                    $aResponse[$found_tag] = $resultlist;
+                    $data = $resultlist = array();
+                    if ($found_tag == $tag) {
+                        break 2;
+                    }
+                    break;
+                }
+
+                $read = $this->_fgets();
+                if ($read === false) {
+                    break 2; /* switch while */
+                }
+                break;
+
+            case '*':
+                if (preg_match('/^\*\s\d+\sFETCH/', $read)) {
+                    /* check for literal */
+                    $s = substr($read, -3);
+                    $fetch_data = array();
+                    do {
+                        /* Outer loop: continue until next untagged fetch
+                           or tagged reponse. */
+                        do {
+                            /* Innerloop for fetching literals. with this
+                               loop we prohibit that literal responses appear
+                               in the outer loop so we can trust the untagged
+                               and tagged info provided by $read. */
+                            if ($s === "}\r\n") {
+                                $j = strrpos($read, '{');
+                                $iLit = substr($read, $j + 1, -3);
+                                $fetch_data[] = $read;
+                                $sLiteral = fread($this->_stream, $iLit);
+                                if ($sLiteral === false) { /* error */
+                                    break 4; /* while while switch while */
+                                }
+                                /* backwards compattibility */
+                                $aLiteral = explode("\n", $sLiteral);
+
+                                unset($sLiteral);
+
+                                foreach ($aLiteral as $line) {
+                                    $fetch_data[] = $line ."\n";
+                                }
+
+                                unset($aLiteral);
+
+                                /* Next fgets belongs to this fetch because
+                                   we just got the exact literalsize and data
+                                   must follow to complete the response. */
+                                $read = $this->_fgets();
+                                if ($read === false) { /* error */
+                                    break 4; /* while while switch while */
+                                }
+                            }
+                            $fetch_data[] = $read;
+
+                            /* Retrieve next line and check in the while
+                               statements if it belongs to this fetch
+                               response. */
+                            $read = $this->_fgets();
+                            if ($read === false) { /* error */
+                                break 4; /* while while switch while */
+                            }
+                            /* Check for next untagged reponse and break. */
+                            if ($read{0} == '*') {
+                                break 2;
+                            }
+                            $s = substr($read, -3);
+                        } while ($s === "}\r\n");
+
+                        $s = substr($read,-3);
+                    } while (($read{0} !== '*') &&
+                             (substr($read, 0, strlen($tag)) !== $tag));
+
+                    $resultlist[] = $fetch_data;
+                    unset($fetch_data);
+                } else {
+                    $s = substr($read, -3);
+                    do {
+                        if ($s === "}\r\n") {
+                            $j = strrpos($read, '{');
+                            $iLit = substr($read, $j + 1, -3);
+                            $data[] = $read;
+                            $sLiteral = fread($this->_stream, $iLit);
+                            if ($sLiteral === false) { /* error */
+                                $read = false;
+                                break 3; /* while switch while */
+                            }
+                            $data[] = $sLiteral;
+                            $data[] = $this->_fgets();
+                        } else {
+                            $data[] = $read;
+                        }
+                        $read = $this->_fgets();
+                        if ($read === false) {
+                            break 3; /* while switch while */
+                        } elseif ($read{0} == '*') {
+                            break;
+                        }
+                        $s = substr($read,-3);
+                    } while ($s === "}\r\n");
+                    break;
+                }
+                break;
+            }
+        }
+
+        /* Error processing in case $read is false. */
+        if ($read === false) {
+            /* Try to retrieve an untagged bye respons from the results. */
+            $sResponse = array_pop($data);
+            if (($sResponse !== NULL) &&
+                (strpos($sResponse,'* BYE') !== false)) {
+                return PEAR::raiseError(_("IMAP server closed the connection."), 'horde.error');
+            } else {
+                return PEAR::raiseError(_("Connection dropped by IMAP server."), 'horde.error');
+            }
+        }
+
+        switch ($response[$tag]) {
+        case 'OK':
+            return $aResponse;
+            break;
+
+        case 'NO':
+            /* Ignore this error from M$ exchange, it is not fatal (aka bug). */
+            if (strstr($message[$tag], 'command resulted in') === false) {
+                return PEAR::raiseError(sprintf(_("Could not complete request. Reason Given: %s"), $message[$tag]), 'horde.error', null, null, $response[$tag]);
+            }
+            break;
+
+        case 'BAD':
+            return PEAR::raiseError(sprintf(_("Bad or malformed request. Server Responded: %s"), $message[$tag]), 'horde.error', null, null, $response[$tag]);
+            break;
+
+        case 'BYE':
+            return PEAR::raiseError(sprintf(_("IMAP Server closed the connection. Server Responded: %s"), $message[$tag]), 'horde.error', null, null, $response[$tag]);
+            break;
+
+        default:
+            return PEAR::raiseError(sprintf(_("Unknown IMAP response from the server. Server Responded: %s"), $message[$tag]), 'horde.error', null, null, $response[$tag]);
+            break;
+        }
+    }
+
+    /**
+     * Connects to the IMAP server.
+     *
+     * @access private
+     *
+     * @return mixed  Returns true on success, PEAR_Error on error.
+     */
+    function _createStream()
+    {
+        if (($this->_usessl || $this->_usetls) &&
+            !Util::extensionExists('openssl')) {
+            return PEAR::raiseError(_("If using SSL or TLS, you must have the PHP openssl extension loaded."), 'horde.error');
+        }
+
+        if ($res = $this->useTLS()) {
+            if (is_a($res, 'PEAR_Error')) {
+                return $res;
+            } else {
+                $this->_host = $this->_host . ':' . $this->_port;
+            }
+        }
+
+        if ($this->_usessl) {
+            $this->_host = 'ssl://' . $this->_host;
+        }
+        $error_number = $error_string = '';
+        $timeout = 10;
+
+        if ($this->_usetls) {
+            $this->_stream = stream_socket_client($this->_host, $error_number, $error_string, $timeout);
+            if (!$this->_stream) {
+                return PEAR::raiseError(sprintf(_("Error connecting to IMAP server: [%s] %s."), $error_number, $error_string), 'horde.error');
+            }
+
+            /* Disregard any server information returned. */
+            fgets($this->_stream, 1024);
+
+            /* Send the STARTTLS command. */
+            fwrite($this->_stream, $this->_generateSid() . " STARTTLS\r\n");
+
+            /* Disregard any server information returned. */
+            fgets($this->_stream, 1024);
+
+            /* Switch over to a TLS connection. */
+            $res = stream_socket_enable_crypto($this->_stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+            if (!$res) {
+                return PEAR::raiseError(_("Could not open secure connection to the IMAP server. %s : %s."), 'horde.error');
+            }
+        } else {
+            $this->_stream = fsockopen($this->_host, $this->_port, $error_number, $error_string, $timeout);
+        }
+
+        /* Do some error correction */
+        if (!$this->_stream) {
+            return PEAR::raiseError(sprintf(_("Error connecting to IMAP server. %s : %s."), $error_number, $error_string), 'horde.error');
+        }
+
+        /* Disregard any server information. */
+        fgets($this->_stream, 1024);
+    }
+
+    /**
+     * Log the user into the IMAP server.
+     *
+     * @param string $username  Username.
+     * @param string $password  Encrypted password.
+     *
+     * @return mixed  True on success, PEAR_Error on error.
+     */
+    function login($username, $password)
+    {
+        $res = $this->_createStream();
+        if (is_a($res, 'PEAR_Error')) {
+            Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR);
+            return $res;
+        }
+
+        $imap_auth_mech = array();
+
+        /* Use md5 authentication, if available. But no need to use special
+         * authentication if we are already using an encrypted connection. */
+        $auth_methods = $this->queryCapability('AUTH');
+        if ((!$this->_usessl || !$this->_usetls) && !empty($auth_methods)) {
+            if (in_array('CRAM-MD5', $auth_methods)) {
+                $imap_auth_mech[] = 'cram-md5';
+            }
+            if (in_array('DIGEST-MD5', $auth_methods)) {
+                $imap_auth_mech[] = 'digest-md5';
+            }
+        }
+
+        /* Next, try 'PLAIN' authentication. */
+        if (!empty($auth_methods) && in_array('PLAIN', $auth_methods)) {
+            $imap_auth_mech[] = 'plain';
+        }
+
+        /* Fall back to 'LOGIN' if available. */
+        if (!$this->queryCapability('LOGINDISABLED')) {
+            $imap_auth_mech[] = 'login';
+        }
+
+        if (empty($imap_auth_mech)) {
+            return PEAR::raiseError(_("No supported IMAP authentication method could be found."), 'horde.error');
+        }
+
+        foreach ($imap_auth_mech as $method) {
+            $res = $this->_login($username, $password, $method);
+            if (!is_a($res, 'PEAR_Error')) {
+                return true;
+            }
+        }
+
+        return $res;
+    }
+
+    /**
+     * Log the user into the IMAP server.
+     *
+     * @access private
+     *
+     * @param string $username  Username.
+     * @param string $password  Encrypted password.
+     * @param string $method    IMAP login method.
+     *
+     * @return mixed  True on success, PEAR_Error on error.
+     */
+    function _login($username, $password, $method)
+    {
+        switch ($method) {
+        case 'cram-md5':
+        case 'digest-md5':
+            /* If we don't have Auth_SASL package install, return error. */
+            if (!@include_once 'Auth/SASL.php') {
+                return PEAR::raiseError(_("CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."), 'horde.error');
+            }
+
+            $tag = $this->_generateSid();
+            fwrite($this->_stream, $tag . ' AUTHENTICATE ' . strtoupper($method) . "\r\n");
+            $challenge = explode(' ', $this->_fgets(), 3);
+
+            if ($method == 'cram-md5') {
+                $auth_sasl = Auth_SASL::factory('crammd5');
+                $response = $auth_sasl->getResponse($username, $password, base64_decode($challenge[1]));
+                fwrite($this->_stream, base64_encode($response) . "\r\n");
+                $read = $this->_fgets();
+            } elseif ($method == 'digest-md5') {
+                $auth_sasl = Auth_SASL::factory('digestmd5');
+                $response = $auth_sasl->getResponse($username, $password, base64_decode($challenge[1]), $this->_host, 'imap');
+                fwrite($this->_stream, base64_encode($response) . "\r\n");
+                $response = explode(' ', $this->_fgets());
+                $response = base64_decode($response[1]);
+                if (strpos($response, 'rspauth=') === false) {
+                    return PEAR::raiseError(_("Unexpected response from server to Digest-MD5 response."), 'horde.error');
+                }
+                fwrite($this->_stream, "\r\n");
+                $read = $this->_fgets();
+            } else {
+                return PEAR::raiseError(_("The IMAP server does not appear to support the authentication method selected. Please contact your system administrator."), 'horde.error');
+            }
+            break;
+
+        case 'login':
+            $tag = $this->_generateSid();
+            $query = $tag . " LOGIN $username {" . strlen($password) . "}\r\n";
+            fwrite($this->_stream, $query);
+            $read = $this->_fgets();
+            if (substr($read, 0, 1) == '+') {
+                fwrite($this->_stream, "$password\r\n");
+                $read = $this->_fgets();
+            } else {
+                return PEAR::raiseError(_("Unexpected response from server to LOGIN command."), 'horde.error');
+            }
+            break;
+
+        case 'plain':
+            $tag = $this->_generateSid();
+            $sasl = $this->queryCapability('SASL-IR');
+            $auth = base64_encode("$username\0$username\0$password");
+            if ($sasl) {
+                // IMAP Extension for SASL Initial Client Response
+                // <draft-siemborski-imap-sasl-initial-response-01b.txt>
+                $query = $tag . " AUTHENTICATE PLAIN $auth\r\n";
+                fwrite($this->_stream, $query);
+                $read = $this->_fgets();
+            } else {
+                $query = $tag . " AUTHENTICATE PLAIN\r\n";
+                fwrite($this->_stream, $query);
+                $read = $this->_fgets();
+                if (substr($read, 0, 1) == '+') {
+                    fwrite($this->_stream, "$auth\r\n");
+                    $read = $this->_fgets();
+                } else {
+                    return PEAR::raiseError(_("Unexpected response from server to AUTHENTICATE command."), 'horde.error');
+                }
+            }
+            break;
+        }
+
+        /* Check for failed login. */
+        $results = explode(' ', $read, 3);
+        $response = $results[1];
+
+        if ($response != 'OK') {
+            $message = !empty($results[2]) ? htmlspecialchars($results[2]) : _("No message returned.");
+
+            switch ($response) {
+            case 'NO':
+                return PEAR::raiseError(sprintf(_("Bad login name or password."), $message), 'horde.error');
+
+            case 'BAD':
+            default:
+                return PEAR::raiseError(sprintf(_("Bad request: %s"), $message), 'horde.error');
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Log out of the IMAP session.
+     */
+    function logout()
+    {
+        /* Logout is not valid until the server returns 'BYE'
+         * If we don't have an imap_ stream we're already logged out */
+        if (isset($this->_stream) && $this->_stream) {
+            $this->_runCommand('LOGOUT');
+        }
+    }
+
+    /**
+     * Get the CAPABILITY string from the IMAP server.
+     *
+     * @access private
+     */
+    function _capability()
+    {
+        if (!is_null($this->_capability)) {
+            return;
+        }
+
+        $this->_capability = array();
+        $read = $this->_runCommand('CAPABILITY');
+        if (is_a($read, 'PEAR_Error')) {
+            Horde::logMessage($read, __FILE__, __LINE__, PEAR_LOG_ERR);
+            return;
+        }
+
+        $c = explode(' ', trim($read[0]));
+        for ($i = 2; $i < count($c); $i++) {
+            $cap_list = explode('=', $c[$i]);
+            if (isset($cap_list[1])) {
+                if (!isset($this->_capability[$cap_list[0]])) {
+                    $this->_capability[$cap_list[0]] = array();
+                }
+                $this->_capability[$cap_list[0]][] = $cap_list[1];
+            } else {
+                $this->_capability[$cap_list[0]] = true;
+            }
+        }
+    }
+
+    /**
+     * Returns whether the IMAP server supports the given capability.
+     *
+     * @param string $capability  The capability string to query.
+     *
+     * @param mixed  True if the server supports the queried capability,
+     *               false if it doesn't, or an array if the capability can
+     *               contain multiple values.
+     */
+    function queryCapability($capability)
+    {
+        $this->_capability();
+        return isset($this->_capability[$capability]) ? $this->_capability[$capability] : false;
+    }
+
+    /**
+     * Get the NAMESPACE information from the IMAP server.
+     *
+     * @param array $additional  If the server supports namespaces, any
+     *                           additional namespaces to add to the
+     *                           namespace list that are not broadcast by
+     *                           the server.
+     *
+     * @return array  An array with the following format:
+     * <pre>
+     * Array
+     * (
+     *   [foo] => Array
+     *   (
+     *     [name] => (string)
+     *     [delimiter] => (string)
+     *     [type] => 'personal' | 'others' | 'shared'
+     *     [hidden] => (boolean)
+     *   )
+     *
+     *   [foo2] => Array
+     *   (
+     *     ...
+     *   )
+     * )
+     * </pre>
+     */
+    function namespace($additional = array())
+    {
+        if (!is_null($this->_namespace)) {
+            return $this->_namespace;
+        }
+
+        $namespace_array = array(
+            1 => 'personal',
+            2 => 'others',
+            3 => 'shared'
+        );
+
+        if ($this->queryCapability('NAMESPACE')) {
+            /*
+             * According to rfc2342 response from NAMESPACE command is:
+             * * NAMESPACE (PERSONAL NAMESPACES) (OTHER_USERS NAMESPACE) (SHARED NAMESPACES)
+             */
+            $read = $this->_runCommand('NAMESPACE');
+            if (is_a($read, 'PEAR_Error')) {
+                Horde::logMessage($read, __FILE__, __LINE__, PEAR_LOG_ERR);
+                return $read;
+            }
+
+            if (eregi('\\* NAMESPACE +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL) +(\\( *\\(.+\\) *\\)|NIL)', $read[0], $data)) {
+                for ($i = 1; $i <= 3; $i++) {
+                    if ($data[$i] == 'NIL') {
+                        continue;
+                    }
+                    $pna = explode(')(', $data[$i]);
+                    while (list($k, $v) = each($pna)) {
+                        $lst = explode('"', $v);
+                        $delimiter = (isset($lst[3])) ? $lst[3] : '';
+                        $this->_namespace[$lst[1]] = array('name' => $lst[1], 'delimiter' => $delimiter, 'type' => $namespace_array[$i], 'hidden' => false);
+                    }
+                }
+            }
+
+            foreach ($additional as $val) {
+                /* Skip namespaces if we have already auto-detected them.
+                 * Also, hidden namespaces cannot be empty. */
+                $val = trim($val);
+                if (empty($val) || isset($this->_namespace[$val])) {
+                    continue;
+                }
+                $read = $this->_runCommand('LIST "" "' . $val . '"');
+                if (is_a($read, 'PEAR_Error')) {
+                    Horde::logMessage($read, __FILE__, __LINE__, PEAR_LOG_ERR);
+                    return $res;
+                }
+                if (!empty($read) &&
+                    preg_match("/^\* LIST \(.*\) \"(.*)\" \"?(.*?)\"?\s*$/", $read[0], $data) &&
+                    ($data[2] == $val)) {
+                    $this->_namespace[$val] = array('name' => $val, 'delimiter' => $data[1], 'type' => $namespace_array[3], 'hidden' => true);
+                }
+            }
+        } else {
+            $res = $this->_runCommand('LIST "" ""');
+            if (is_a($res, 'PEAR_Error')) {
+                Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR);
+                return $res;
+            }
+            $quote_position = strpos($res[0], '"');
+            $this->_namespace[''] = array('name' => '', 'delimiter' => substr($res[0], $quote_position + 1 , 1), 'type' => $namespace_array[1], 'hidden' => false);
+        }
+
+        return $this->_namespace;
+    }
+
+    /**
+     * Determines whether the IMAP search command supports the optional
+     * charset provided.
+     *
+     * @param string $charset  The character set to test.
+     *
+     * @return boolean  True if the IMAP search command supports the charset.
+     */
+    function searchCharset($charset)
+    {
+        $this->_runCommand('SELECT INBOX');
+        $read = $this->_runCommand('SEARCH CHARSET ' . $charset . ' TEXT "charsettest" 1');
+        return !is_a($read, 'PEAR_Error');
+    }
+
+}


--- /dev/null
+++ .arch-ids/stationery.php.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4878.0


‰PNG


éÜ‚7¿çÕ¤š]#+|(ÓÈsôn_Z1œµ¾K^6§Çn¼½>õ¿—`
ÏÌøÓéøµVƒbž‚Ò

--- /dev/null
+++ templates/saveimage/saveimage.inc
@@ -0,0 +1,24 @@
+<form method="post" name="save_image_dialog" action="<?php echo Horde::applicationUrl('saveimage.php') ?>">
+<input type="hidden" name="actionID" value="save_image" />
+<input type="hidden" name="id" value="<?php echo $id ?>" />
+<input type="hidden" name="index" value="<?php echo $index ?>" />
+
+
+<h1 class="header">
+  <?php echo Horde::img('mime/image.png', _("Image"), null, $registry->getImageDir('horde')) ?>
+  <?php echo _("Select the gallery to save the image in.") ?>
+</h1>
+<p class="item">
+   <select id="gallery" name="gallery">
+<?php echo $gallerylist ?>
+   </select>
+</p>
+
+<div class="nowrap">
+  <input type="submit" name="submit" class="button" value="<?php echo _("Submit") ?>" />&nbsp;
+  <input type="button" class="button" onclick="window.close();" value="<?php echo _("Cancel") ?>" />
+</div>
+
+</form>
+</body>
+</html>


--- /dev/null
+++ templates/javascript/folders.js
@@ -0,0 +1,179 @@
+/**
+ * IMP Folders Javascript
+ *
+ * Provides the javascript to help the folders.php script.
+ *
+ * See the enclosed file COPYING for license information (GPL). If you did not
+ * receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * $Horde: imp/templates/javascript/folders.js,v 1.1.2.2 2006/01/11 05:48:23 slusarz Exp $
+ */
+
+var tooMany = '<?php echo addslashes(_("Please select only one folder for this operation.")) ?>';
+var downloadConfirm = '<?php echo addslashes(_("All messages in the following folder(s) will be downloaded into one MBOX file:")) ?>';
+var downloadSure = '<?php echo addslashes(_("This may take some time. Are you sure you want to continue?")) ?>';
+var displayNames;
+
+function buttonCount()
+{
+    numSel = 0;
+    for (var i = 0; i < document.fmanager.elements.length; i++) {
+        if (document.fmanager.elements[i].checked) {
+            numSel++;
+        }
+    }
+    return numSel;
+}
+
+function getSelectedFolders()
+{
+    var sel = "";
+    var folder = 0;
+    for (var a = 0; a < document.fmanager.elements.length; a++) {
+        if (document.fmanager.elements[a].name == 'folder_list[]') {
+            if (document.fmanager.elements[a].checked == 1) {
+                sel = sel + displayNames[folder] + "\n";
+            }
+            folder++;
+        }
+    }
+
+    if (sel.charAt(sel.length - 1) == "\n") {
+        sel = sel.substring(0, sel.length - 1);
+    }
+
+    return sel;
+}
+
+function chooseAction(i)
+{
+    var action;
+
+    if (i == 0) {
+        action = document.fmanager.action_choose0.options[document.fmanager.action_choose0.selectedIndex].value;
+    } else {
+        action = document.fmanager.action_choose1.options[document.fmanager.action_choose1.selectedIndex].value;
+    }
+
+    if (action == 'create_folder') {
+        createMailbox();
+    } else if (action == 'rebuild_tree') {
+        submitAction(action);
+    } else if (buttonCount() == 0) {
+        alert('<?php echo addslashes(_("Please select a folder before you perform this action.")) ?>');
+    } else if (action == 'rename_folder') {
+        renameMailbox();
+    } else if (action == 'subscribe_folder' ||
+               action == 'unsubscribe_folder' ||
+               action == 'poll_folder' ||
+               action == 'expunge_folder' ||
+               action == 'nopoll_folder' ||
+               action == 'mark_folder_seen' ||
+               action == 'mark_folder_unseen' ||
+               action == 'delete_folder_confirm' ||
+               action == 'folders_empty_mailbox_confirm') {
+        submitAction(action);
+    } else if (action == 'download_folder' ||
+               action == 'download_folder_zip') {
+        downloadMailbox(action);
+    } else if (action == 'import_mbox') {
+        if (buttonCount() > 1) {
+            alert('<?php echo addslashes(_("Only one folder should be selected for this action.")) ?>');
+        } else {
+            submitAction(action);
+        }
+    }
+}
+
+function submitAction(a)
+{
+    document.fmanager.actionID.value = a;
+    document.fmanager.submit();
+}
+
+function createMailbox()
+{
+    var count = buttonCount();
+    if (count > 1) {
+        window.alert(tooMany);
+        return;
+    }
+
+    var mbox;
+    if (count == 1) {
+        mbox = window.prompt('<?php echo addslashes(_("You are creating a sub-folder to ")) ?>' + getSelectedFolders() + '.\n<?php echo addslashes(_("Please enter the name of the new folder:")) ?>\n', '');
+    } else {
+        mbox = window.prompt('<?php echo addslashes(_("You are creating a top-level folder.")) . '\n' . addslashes(_("Please enter the name of the new folder:")) ?>\n', '');
+    }
+
+    if (mbox != null && mbox != '') {
+        document.fmanager.new_mailbox.value = mbox;
+        document.fmanager.actionID.value = 'create_folder';
+        document.fmanager.submit();
+    }
+}
+
+function downloadMailbox(actionid)
+{
+    var count = buttonCount();
+    if (window.confirm(downloadConfirm + "\n" + getSelectedFolders() + "\n" + downloadSure)) {
+        document.fmanager.actionID.value = actionid;
+        document.fmanager.submit();
+    }
+}
+
+function renameMailbox()
+{
+    newnames = '';
+    oldnames = '';
+
+    var j = 0;
+    while (document.fmanager.elements[j].name != "folder_list[]") {
+        j++;
+    }
+
+    for (var i = j; i < document.fmanager.elements.length; i++) {
+        if (document.fmanager.elements[i].type == "checkbox" && document.fmanager.elements[i].checked) {
+            tmp = window.prompt('<?php echo addslashes(_("You are renaming the folder: ")) ?>' +
+                                displayNames[i - j] + "\n" +
+                                '<?php echo addslashes(_("Please enter the new name:")) ?>', displayNames[i - j]);
+            if (tmp == null || tmp == '') {
+                return false;
+            }
+            newnames = newnames + tmp + "\n";
+            oldnames = oldnames + document.fmanager.elements[i].value + "\n";
+        }
+    }
+    if (newnames.charAt(newnames.length - 1) == "\n") {
+        newnames = newnames.substring(0, newnames.length - 1);
+    }
+    if (oldnames.charAt(oldnames.length - 1) == "\n") {
+        oldnames = oldnames.substring(0, oldnames.length - 1);
+    }
+    document.fmanager.new_names.value = newnames;
+    document.fmanager.old_names.value = oldnames;
+    document.fmanager.actionID.value = 'rename_folder';
+    document.fmanager.submit();
+    return true;
+}
+
+function toggleSelection()
+{
+    var total = 0;
+    var checked = 0;
+    for (var i = 0; i < document.fmanager.elements.length; i++) {
+        if (document.fmanager.elements[i].name == "folder_list[]") {
+            total++;
+            if (document.fmanager.elements[i].checked) {
+                checked++;
+            }
+        }
+    }  
+    
+    var new_value = (total != checked);
+    for (var i = 0; i < document.fmanager.elements.length; i++) {
+        if (document.fmanager.elements[i].name == "folder_list[]") {
+            document.fmanager.elements[i].checked = new_value;
+        }
+    }  
+}


--- /dev/null
+++ config/header.php.dist
@@ -0,0 +1,22 @@
+<?php
+/**
+ * $Horde: imp/config/header.php.dist,v 1.1.2.2 2005/12/11 01:38:04 slusarz Exp $
+ *
+ * This file will allow you to set headers to append to outgoing mail messages.
+ *
+ * To add a new header item, simply add a new entry to the $_header array.
+ * The "key" should be the header name.
+ * The "value" should be the header data.
+ *
+ * Example entries:
+ *
+ *  // Add the IP of the remote browser
+ *  $_header['X-Originating-IP'] = $_SERVER['REMOTE_ADDR'];
+ *
+ *  // Add the Browser information of the remote browser
+ *  $_header['X-Remote-Browser'] = $_SERVER['HTTP_USER_AGENT'];
+ */
+
+$_header = array();
+
+/* Add your custom entries below this line. */


RIFFÀ`
¬¥‘’VP€‰›’w\h—Œ ŒPbt‘¬¤Œ\hz€®€k_b€—ª†ble—°™†Sbn€°†w\P}€—€\a_—°Ÿ’\bq—¶Œnb—š«Œqhb£°©¤bh}”ª˜Œ\hšˆ©ŒXYY€”†Fhhz»˜whhz‹¸Œnzc—±¡Œkqn£È—€_‹£¤€kPD€˜‘˜PD\w…‰€P\ˆ€—Œ_Sh‹‘£ŒVht‹µª†ht€—Áž€w‘¯·˜wwh—¶‰n\z §€}bV—ª¢˜nPb‹”›’Vb‡£¤€Yt’—»¤jqt€¦¤€^hf€®†ob\t§€p\P€™ƒhPb”{tPP€— ŒnPh”—˜\h€•£¥€Pn|‹´˜tlt‹£¶€nzq—¹˜€ekw£³ƒhe—§¨Œt_h—˜Ž€Pe€‘›†tPbŠŽ§Œenz¤œ€Sq€—°’w^n…‘Ÿ€hhn”žn_kr—˜teS_€”ŒnXPb‹™’€ah}—¡•€iz‘ žŒ€v‰£¨ž†w~”³˜€ptˆ¡’€pbt‹†tbb€Š‡k`z‰’Œz\b€‘£˜tmu€˜t{}ˆ§˜tmw…•€ihWt’€xkbe€˜twhTtˆ†zh\€Œ‹›€q‹”–’’tt›’›˜tt{‰—£’]t|z©ž€tou€—Œu€hzƒ}tws€›€tth‹™œŒwqb€˜‘›€q~€…nh†”Œw}t…‹€_ty~—†ybbzz‘†u}j€‰€nxv€txhh‡‚ƒvwr—˜•˜z€€‹Ÿ‰‰€zŸŒ‡Œ{”˜Œ€€‰—’€Šhb‹€€‡tkq„t€Œb€Œz‘€q‹Œ{Œnˆƒˆ—™€zŒt€¤€€€kt‹Œq}€\€€l}tht‰€qŠhb†zˆnz’€‹’q€˜ƒ‘¤†t—Œ}£˜v‹’‚”›€~‰t}’€qƒtnŽŒt€€j€†v€€l€Œt}‰nn‘‰€–†t‘Œ€—Œj€“w‹žtn„qt”€s€zn‘Œh€€`€Œnn€hh‘€w‰th‹†x‘Œh€˜t€’tt”†€›€q”†}¡Œq‘˜€—¤€z’t€£†~Ž€w—˜t‹†k‹˜v}†hq—€znh‘†€—†n€˜z‘’n}‹˜€t‹€€—€r…€€‘Œknwm€Œzzwlz†zx€nn‹ƒw„€t…’‰‹‰€ˆ•—˜€€‘‘—Œ{…“’š•‡‚ƒ…Œ€z€z€„zvqux€„}~yz‰€}ztt}ˆ†ƒ€q}…‚‰€€ˆ’†…ƒq}‚‹Œzwqnt€‰tx€o}€ztl}‚ˆƒzhhˆ€}‰Š€€—€z†w€“‘›zu‹†x—’t‘˜ŒŒ€w‹‡‹ž€tnz”†j€Œk€’tx{€‹›Œ€†hq—€€—†}‘ž€z†p€›Ž“†kt‹€€š€k‹Œ€‹€hl~~ˆŒhnyh}Œth€€qˆ€_hnz‘“€ztf€ŸŒ‹˜€˜€€}”ž–˜€n€€ˆ’nh‘†|€hZezƒˆ€anwn‘˜tq€€}—Œl}„‘¥˜ƒ€tq‹¤€‹˜q€¤†zytn—¤„ŠnVtwvˆƒht›€}‰b\€”›†bqptŒu‹‰}‘ž€n…€‹˜€|nq‹‰z‹€n‘’tnkXh—•†€\Snpz€k€Œ€‰€\hˆ‹ž€tz{‹¡†x‹€z—Œhnt}”§˜€h€–†”˜€€—’qtne€š¡˜thn}z‘›nz„‹Œ€^h…£˜}€tzŽ˜ƒ€—€‘«†z}|…—ª†zt_€‡€’€dtŽ€q‰h\‹“‹€t\bzs‹Œd€Œ}—•€e€~¡˜qwsz‹†‹‰v€¤€t‰t}ž€ww`z†~‹tk€†ww‰h\—˜‡—†pt~…”’€—˜z—˜hh…†…©žv€tw‹€€‰wg€ƒV\v_h‘tvi€‰Ž›†}‘Œz‹˜nt£˜”¤Œvx~ˆ—‰…†w”Œ\h‡z€¦’qukt‰ƒŒ•€w”’n€’iz¡€‰wo€ƒ‹œ€z—Œz‘Œht•€€˜t]mjwŽ†€‘€w‘€bt†q€¢ƒntbh‹†‹”€€”Œ|‹Œn€¤Œ‘’tn€‚…€w†tt‰€cz€ŽŸ€kwo€“†Œ†zzŒ€e€€t—¥’€zjt‰†”Œn}ƒtt€te‹›‹žŒnt~‹••€€€o€nn}†ƒ—˜pnhn‰ƒŠŒzp}†hhwbt—œ‰€tcz†—«Œˆ•ŒŠŽ’nh•Œ•›€nhw…ŽŒ‹€z›†tltqw€eeVn}ˆ›‰€w‹Œz‘€tŽ£©’€n€§ž€€ƒ‹†\h„€€hPns€€ttYt†qwdrw‹ƒtn‹Š£ªŒ†€—’‘›€€£³˜Œvn~€—€itaq}wkPbn€¢Œ€hVt€€€wb€Œ‚pt{”¥‰nt”¬¤‡€€‘Œ‹Œhnz‹ž†wbeq€£†xƒt}Š‰nYqt€žŒy\\z‹’ŒŒ€q—›Šƒtqw—Ÿ†hn‡‰£›€x€Œ‘†\qƒ‘žzhjq‹¤€}ƒjzŒ€hett”ž‰€\Yw€…‹Œnt’‘€€Ž©¯ª˜vˆ‰‹¨˜wz€ƒˆ–€btt‹˜†yh\`€€eth\zzqikk€£ž˜nw“—¬›€—¥”’€~‹™—›€q€t€˜€kqul€€VVX`}€{mdYh‘†€Œzwˆƒ}v‹©¡¤˜€‚”¡œ¬ž€—™Œ€h`z€€†hendz…thtwn‹€bhkt‹™†z€kz£Ž˜€}”˜‰—’|—¤”˜†hn|tznh€txˆzhq}€—˜t}tez‡wzŒtt€w€€ˆ—™€q‹›„’˜€xŽŒˆ—Œ€Ž“‘˜Œw€€r‹˜t}Œtr…€bqwx‹†x}nb€w€nn…€r€€w…Ž˜Œƒ—˜‡—¡€€—†€‘†r€Œ…ŒŒtwzo‹–€€„h\ztYntbt}kmlh€‰€Žt€žŒ‹¢Œ}—¤—©›€”‰~’t€tz˜€h„tn€tV_YVz€d}tYq†zz“ƒ}Œˆ’€ƒ—˜ ˜y—ž‰—˜ƒw‹“ˆ˜€ntbr€thntYt†iqzst~€qxow—€€€r€›†€ž†ˆ¢›Ÿ˜Ž”˜“¡Œqˆ€qzƒnb€€{‹€tnl…€pone€Œwzzr€’€€†‹•’”‡€ˆ™†…€z‹†|€yx‰‘€x~{€‡Œ€vˆ†‚…ƒwhtƒ€~xwsr‰Œz{tnz€stz€††‹†|€’š–˜€…Œ†€ƒ}~Šˆ†tq}tyƒ€tq€€w}wlenzturtwt‹’€‡ŒŒ…‘žŒ‘••˜‘Œ€€Ž•ƒ‰’€}‹†€€‚|~~}}b\n^`tveh}nr„€w}„ŒŠ„‹Žƒ‹£¤’ žŒ‹˜—›˜Œ‰Œ€qzˆ€x€t`bpkhnopjtˆwo€€qz‘ˆ—’‰‰‡Œ‰”¡˜Œ—’€‘ž•‘’†mqtt|w~€kt|tm}‰w€€uvwtz€€‚w€€z…€u€›•‘œ†€€ƒ‚ƒŠƒ€~ˆ€t€~…‡‰‡ttz€‚~‰zn~yzwwzx„ˆŠ†w€€}‘“Œ„‹†z€wqy}‘™•ƒzt‰•‰’Œ€ƒ‹‡€€€€‰‘†trz{€‹€lw~z|vkelw€€tjhet‹Œ‰ŒŒ”˜’Š†”£¨§ž†yz†Ž”’†ƒ…ˆ†€tqz„‰†t\V_kz€zjnz€‡†€ƒ” žƒ€€‹£¤•‡‰–†vz…—Ÿžt_\zx€tchwqbgeh€ŒŒ€her€…‘˜t€‡‘ƒ€‘¢£²˜{ˆ€‹£ž†€ƒjt†_\kk€“ŒnaPP€†zŽ€kzˆzn€n€¢™ž’tp€Œ‹£ž€—›†ŒŠtk€˜tee_tŒz…†k€Œjo{€‹˜tk\\€€…’ƒu€tnƒq€ž’zn`q‹¤Œ}”Œ€ˆ€w—˜—ž€tnr€‘y€€l€€hlz„‘¡˜|qVe€€ˆ’†t€€ktzz•¦¦Ÿtn€ƒ‘§Œ…ƒ{ƒ€q€ŒŽœ˜zqkh}{heth_kqyˆ’†|n_tˆ‰£ª˜Ž”†€ŽŒ‘§§£¡†otx}”Ÿ‰††pqnbafnzƒtbcPPt€€Š‰€zwz€…—žš›Œtt€Œ•§•Œ„‚€€„Œ’†kca_h€‹ƒ‚}nnjpuw…”“ƒ{q_h}‹—›’€~|zˆ‘” ¤¡˜Œ€twzˆ–€}qgqwt€‡Š‘Œzle]n‹Œ”˜€krwt€ŽŽš™’‘€qw‹‹—ªŒz€ur}‰††Œ”†pxqz‘£›‰te€|€‡‹‘ŒŒwnhZ€˜”¢˜t`nsn‰€}‰€Ž„tsw…‹©°‘Œ}€‹’ƒ‰‘–€{n]qˆ–Œ‰†\hqn|v~|zohPP€‚‘›‰tk€|‹–Š•‰—ªƒwzw€¯žŽ|yxˆŒƒŠ‰—Œtt\Ph€Ž€ƒkThmz€}ˆ†ˆ‰ˆ€\t‡‹£¤“€€Š†”’–Œ£¤Œ€hnn€¤†€q]`ewqluz‰€zzXb€—™”˜€q€‚‡ˆ••š˜€mˆŒ—¯ª’€}zt€z}€z‘Œtmccn‘¤ŒŒziqt€}x}ˆ’€…€Yh€‘˜›’tw€€ƒ€‡Œ“Œne}x‹§˜ƒzvw€†…€€•†one_t—˜…‰thz„ƒ~‚’‚†tRh€‘™ƒn}€Œ†…ŒŒ—ž†ltzt—Œ…ƒtq€}ƒ€…—€rwb\€’€…†bbsoy~u~‰‹”€q‹’‘©§†…Œ€…Œ€ƒ†‚”›€k}nh”˜€wbbqhqwk€Œtz|hh•˜‹¡˜y€ƒƒ’…—›†—›t}Žƒ‹£ž…‹ƒuƒ€t„wq‹†bepVh‹ƒ€‰zixyw”†z—†t…€kz—‡‘§Œˆ‹™Œ…Œx—†ewtiz’}ƒhhznzŒz}‘€i€€b€’‡”’€u€w€™€€•€~”€m€†v‹˜z}zhtƒv€€z—€p€tn‹’†Žƒeqzq€’z€€z‰wq‰†…•†rzwo€Œ€…z€•€Œ…˜†‹€n€ƒ~‰†v}†tw€htŠ‡‰Œ€hqzr€†s}zo{‚tq€€‹¥˜…ˆ~›Œ‘’{‹€††€…›˜…‹€n€„€†€nt{ntt_n€€…Œ€fzƒ|‘“ƒŠ‡†‘’ƒ€‰—ª˜…‰ƒz‘˜„‹†x…z{tht„wtzhbx}w€€x€‡…Ž€y‡Œ‰˜€n……•„……†‡|†€~‘€qtkk€€qvlt}z|}wq€€ˆ†tw…‰‚‹†€†…Œ€€‹•“–˜€}†‹ƒ€|ww€zt€z€‰†{|t}‰€~w~‚€~‚€~‹Žƒ}}„„ƒ†z~x€~w}ƒƒ…‹ƒ{‚†ˆ‹†„ƒ‰‰…†ƒ‰Œ‰ƒ€€}€ˆ…†‚†€}€zz€ƒ€}}tw}}‡Œ†‰‰†‘Œ†”Œ‹‘†ƒ€€‚‰}€†uƒyz~}y€€u~tq|tt€„z€Št}‰€‹Œ‹‹‰‚ŽŒ€’Œ‚Œ†ƒ‹€€Œ€…ƒz€xvquth}zitkjr}ƒ€…€~‚‡†‚ˆ‡‰ˆ‹‰€‹Ž‘˜’‰…ŒŒ€€w€ƒ}tlnmqw{vktwtz|{{€‰Œ†€€‘˜ƒ†€~‰‰„…††Œ‡}u€‡‚€€zp}€vzwx€…†}wz…ƒ‹’€z~…‡‰„‰‹•Œƒ}€ˆ†x~uzƒ€€wy~€‰ƒ~ww€‰ŽŒ}v}€~w{€…Š}wwˆƒz}ƒ„„€qt|}€†vn{€…‘‚ƒ„Œ„ƒƒ‹’€z}tzŒ‚€vt{zztl€€yzteh€€}„wt}€‰ˆ€€‰’›˜}€‡‹‘›“€…€€‰€ƒ€w€‚€pqqhz€{vnpmw}|}t€‹‰‘‰ƒ|€’Œ‘“‰†‹†‡†‹Œ‘•†}y}€€‰€opmqmtwitz}|u{uz‰‘’ƒˆ†}‹†ˆ“‰”˜ŠŠ€‹•”–Œ€zŠ€€€}yu€zsqhwv~Œ€zw}}z€~‰…†ˆ‡‚‹›˜†Žƒ€ˆŽ€ˆ‡‰€€wq€‚ˆŒƒ€pz€~…ƒƒz}†€}|~{|‹ƒ}~w}}€‡€}€‰€z‚zt€†ƒ€€tw}}Œ€‹‰‹’†€Š†…‰€|wv€„~Š†z€†z{{x…{€tnwwz„‚}…†|€Œ†Š“’‰€ˆƒ†–Œ‡‰€}€z}ƒz}€zvqokruwtrxqx}€‚…ŒŠŽ…ˆ†‹–••“‘‰Œ–”˜’‡€€w~€}€qjnhkqvqt|qwwqwy€‹‘†‰€€ŽŒŽ•’ŒŽ‡‰‡…‘’’Œ€~ƒ€~„zwxqmkkilt{†ƒyztr}…†…ˆƒ€€~€€‚‰’•„}…‰ˆ‡ƒ‚}yvxz}‚vnttz…ƒ€}}yz}{}|€††‡€}xz‰ŠŒ’‰€}€€|„€ˆ‰†€wt{€ˆ—ˆƒ||€€wƒ†€‚ypqw€Šƒ€€pw~xw~€{…ƒqtst€‹†€€‹†‹•ŒŽ›‰zˆ’”›€{ztz†wzŠ€{€wbhzu€†uukjt~wzŒ…œŒ~ƒ‚‚—¤˜—Œ€ˆ†ˆ”•‘žŒ{„nh€…‡„€hehettlz|wznh€}…›‹„€€Œ‡‘’‹š˜†††€…˜‘’€rvs{}yuytcnhZn{€ŠŒ€pqmz…€‰Œ€…‹w€……¡š˜†€‚†‹‘’†Ž€~}qq€ˆ…‡zkkht€€€…ƒt}€kt€‚Š‘‡zzqz‰‹’†ƒŽz€†x‹•‘“ƒzvzy€›†‹•€€zr}Š‰rzln€‰‰ˆ€t†tt‚†ˆŽ€zyn€€}‘†ƒˆŽ‡~‹€€—›¡˜‰€tx{‹’ƒ‹€suuzu€Š‚‰€vnhtw}‚€nwwt€€ˆ‹•Œ‰€€ˆƒ‘™’Œ‡„}€„€‡ŒŽŒ|neht‚}nkknnqv{~}zqt|€ˆ”•‰†ˆ†‰‹”‘‘š˜“Œ‰ƒ€Ž“•ƒ€tqxyyt~zqynihkz}…†zmzzvƒ‡…ƒŠŒ€‚€„Œ››Œ†‡‡‹˜…‰‰‚}ztux€‡ww{kq€ƒ€€†z€†€tt€†‹‘“€zˆ€…•‹‹Œ‰†ƒ}ƒ„ˆ—Œ}€}z€‘Œ†z}€yzwot€€w€wi}„„†€…ƒ‚€tz‰†˜ƒu~€‹˜‰‹‰†Œ‰„„†‚‹˜ƒ}ts€zxzvz}z{tn}€}€€nn}z}ƒ€z}€ƒ…€~†ŒŽ›††Šˆ—’ˆ‡ƒ……ƒ}z~‰†zztkt~}yvtttwzqntz}„‡€y~ƒˆŒˆˆ‡‡Š†ˆ”˜†€€€†‹‡€wywrxwkr}}}wqt{€†€€€‹‰{€†‚Ž”’Œ‡‰Ž”–“’‡‰•Œˆ‰|€‹†|tusz€ysrwqt€toz€ƒ€‚€vw€ˆ†…‰ƒŽ’Œƒ‹‰‰—˜’‡ƒ‰„‰ŒŒ„|ˆ†}‚€zv}…z{wttt€zstsuq}€tz€ƒ‚‡€zƒ†€…Œ€…Œ€‚‡Š“”’ƒƒ„}€‡‡|zƒzrywqw}}~zz}vz€{wy|wzƒ€z€„‰ŒŒ†‰ŽŒ•’‰‰‰€…†€€…„€}zwtw~|wyztowwnv{zz}‚|€‚€ˆŒ†‹Š†‹•˜•’‰‰‹‹Ž‡€€}€}{wzwvvpsnrxxzy{zw€|z‚€ƒ‰Œ‡‡‰€…Ž‰Ž’Œ‹‘Œ‡‘‹”‰Š€x€ƒz€ƒtqvot~ws}yt€zrzwq}†z}ƒwz|€ˆ††’‡†€‹Œ†‹€€‰€€†}€ˆ„‡€p}zq€€qw}prttƒ|€‰€w€€y‘’€‹‰€€Š†ˆ’‰Ž˜ŒŽƒ‚€‹‰w€€wzzwx€€~€nnwpw€€t||nyzt€€††~…€…š’˜‹‘“Œ‘•‰’“Œ†€}„€€‰€zvrwwu€€w{wmnsw}„€€ƒz}‰€…‘Š‘„‹‰†‘“‰‰€‚€…‹†€zottt~vrwtnpyqzŠ€€ƒ|{wƒ‡‰„Œƒ}‰‡‚‹””Œˆ‰†ˆˆ†‰†€}€wnzzs€€wttqtww~€vz~tt€}x‹Œƒˆ†ƒƒ„…Œˆ”˜†‰€€‘Œ††€€||€€|€ƒx€€knzww€€pwqq}wy~||€ƒz}†}ˆ‰‰‰‡ƒ‹Œˆ‘‹•Ž‰‰ƒ…”Š‰Œ{z|z{}€w}€ywot{}€†€v}u}‚}€‚‚‡Œ€…†…”˜’Žˆˆ‰‰„…‡†‚}}x€‡ƒ†}stwx{wuxwz|vqt~†Š€„‚€‹‹‡†‹‰‹“Œ…†€…”˜Œ‰ƒu€†ƒ…€zt{|twnhwwx{tehut€z}}…†€w€€ˆ—††ƒ…Ž“Œ‹‰’’Œ†€‚‘€~nn|…€wpq|{€}ovz€ƒ}tktv~‹€€‚‹ŒŒƒ€ˆ‹—™‘€€ˆŽŒ†‡€€‹‡†€u{…‹‰†zmyz}†€qqz}‚†zz€Ž“†}|€”’†‰†‹’†…„€‹˜’ŒŒ€zŠ†‚‰€w€ƒ€~wjt‚‰†tqyz€Ž€s~{}ˆ†z}ƒƒ‹’€€„}‹•Œ†‘’„…€y…Œ‚‚€iq€tztq}€x|tew}}‡€nqzu€‘€z…€…‘Œ…ˆŠ‰•’€†€z‹•Œ†‹€~†€ƒz}…‹„zfqzq€€ss{|w}to}‰€y{}z‹€€ˆ‚‹“Œ†ˆ†‰–Œ‡‰zxˆ‡€„€tz€xzwt{„…€nn}w}‹ƒz~€€ƒƒ€……‹š˜‹‰‰€ˆ™‹„…‰‰ˆ€}|ƒ†‚†€qw}}€ƒ|vyuyzsxz}€ƒ€pw|z‰ˆ†„ˆˆ‹Œˆ‡ƒ˜’Ž†€x€‰ŒŠ‚€zxw|zzzngnty}€wqwy€€€‚|€…ˆƒx}zz‹Š‡ƒ…„ˆŒ‹†ƒ‹’Œ‰ƒtozƒˆ†zzy{€|}{~€€„voww{ƒƒ€txz€ƒƒ…€„ŽŒ„ƒ}€‘“Œ€~}€ˆˆ„€…‰…†€tqz‚ƒˆ€vvr}zzx|€ˆ‡z}yzˆŽ‰…‚…Ž‰Œ‰ƒ‹•’‰ƒ{…Ž‘˜†€€{ƒ…‡€{€z€€sqkt€‡„w|tt€€€xx}€Š„€€x…Œ”˜’Œ†”–•‰ˆ‰‹”Šƒwt~~‹Œzwtyx€€tywz€wshkt}‰€}}s~…ˆ†€‡„Ž“Œˆ€}„Ž’ŒŠ€z‰†ˆˆ€}}ˆ†ƒ€qsvy€wptvzƒ€zzz€ƒyz|‰‰‰ƒ~…‹‰Š‡‰’’‡€}‚‹‹Œƒvz{z|vsx}€€tqpq†‚|zyz…†€€z€…‰Œ†ƒ€ˆ’“•‰†‹‘Œ‰ƒ€†ˆŒ‰€zw€ˆ‹z}z€€€yw}}€€tqnt€…†€€|€‹††ƒ€ƒˆŒ‡„€†ŠŽ“Œ‡…‹Œ†‰€€…„ˆ„€trz|€wwvw{€€vz|~ƒ€{ttw{‚€}…‰††…ƒ…Ž’Ž‰€€‚ƒ‰Š†}~y~wz}~~~zsww|€}vutq}‚y|{z€ˆŒˆ†€€ŽŒ‘˜‰Ž†‰‰€…Œ†‹†|x}€‹€u|qqzvnpsoz~twtr~„ƒ„€}ŽŠ…Œ†„‹“Ž‰€…‘—™Œ†Œ‡„Œƒ}ƒ‚†€vtvw€†{z}uz‚{tzz}‰‡€~tt€‰‹…‘Œ’‰Š‘Š€}~…Ž‰z€€y€zw~€€…€yupz€~}t‚y€}€Š‹‰€z}††‘’ƒ€~ƒƒƒˆ€ƒ„†Ž€}t~…Šƒ|€ttwwtpw}€ƒ|znq€€††€yx€€€}…Š“Œƒ€ˆ‰‘›’‰†…ˆ‰†€}Š‰|zqmw„ƒ€ƒwtytutsu€ƒ|€tkz€†‹Ž†€ˆ†‡†ˆŽ‘“•€…†ƒ‘’Œ‡††ƒ‡€zz€Š€wqkkt{€€tzzzy{}~‘‰Œ€}ƒˆŽ“‡ˆ…‹‰‚ˆŽ’†v~z}‡€zzztynq|y…‰zpuu€Šƒˆ€€}€z€ƒ…—’ŽŽƒ†Žƒ‚ƒy~zvz€„€†€myqt€z}vrthtzz…†€vwyz‹Œ‘‰‰‡ƒ€€……‘˜ŒŒ†|~ƒˆ‡‹‰€ƒ€}}zx}‚€‚ttwtw€ƒ}‚ƒ}}wt|€…‹Œ€yzt}††‰ŽŒƒ…ƒz€„‰—’‰ƒ|~ˆ…Œ€€~zz}x€ƒ€‹€z}wwzƒ€€Œ€€€u€ˆ”‚Š€€“ŒŽ‘‰‚…z}}‹†Šƒ}z€€x…€|„zwtpot}…†v~}w€‡†‚ŽŒ‡€z…†‹—’†ˆ†}ˆ’„‹’„†‡{uytt…€ztkttnz€v~†vtwlt€ƒ†Žw€€z‹†‘”’€Œƒ‹˜‰ƒƒ{u€x…†z…€uvtqzŠƒ€‡tqzuz€ƒ}…‡z€€r€‹ŒŽ‘†|…€€†ƒˆ…„‡†xzz…Ž†ƒ€}y€€z‡ƒ~†€tswt€‰ˆŒ€}ƒƒ…‹Œ†ŒŒ€ƒ€z€ŒŒŽ’‡€„‚ƒ‡†‚‡†‚ˆ€twxx€Šƒ~€wy€~ƒ‡ƒ€…€v|zw€††…„€y€€…Œ„ˆŒ‡†‰ƒz€‰†‘†€~~…†…‰ƒ†ztvvt~†€ytmqrz€€}~‚|zuzƒ‰ŒŠŠ€}~€‹†…Œ‡ƒ†‰€zƒ…ŽŠ†zwyz}~‚€yƒ€uwvtzˆŠ†‚xzz{…‡€ˆ„}†€u€ˆ“•ƒ€}ˆŒ€ˆ‡€}„€owww…‡„€trx}z€‡t}‡€||t€Ž’‡‚„€…‘’†‹—‰Š’€w€‡‰‘’tq…|…„wz‰zq|txˆ‡ƒxoz€}‹‰}ˆŒ„‚†zw‹Œ“}|z€Ž’ƒŽŒ€‹Œ{zƒˆ‘Œ€}ow}€€|w€‡z{tmz…Š‰€uqxy€Œ€}ƒ€€ƒ€w}ˆ‹•€ztxƒ‹‡€{~‡€vww~Ž“‰ƒzpz€„€y|ƒ€€qq€’†yz}€ŽŒƒ††‚‹Œzz€€‹—Œ€zwzˆ‰ƒ…€yƒ€vvtkz‹†€nny€ƒ‰„€ˆ‡ƒŠƒu€“•ƒ}€€‹“Š‡…‘Œ{€‹„|vpw€‚‚zz†€x}vq€ŠŒ€rt|€‹Œ€‰ƒ‚‹€y…Š—’ƒz{…Šƒ†ƒ{€‰€y€z{‹‰€tqz€„€q}€y€ƒwzˆŽ€z}y€Ž‡€‚ƒ{…‰wz€€‰‘€yqtƒ€€†zw€zzt}ˆ„†€tx~€…Ž€{†€€‰ƒz~ˆ‰€€}z‰‘Œ†‰€zŠƒz€|}…Š„}wkw€z…‚ww€€x€wn}€„‡€ww‰‡†€‹Œ‡‚ˆ‰‰—ƒƒy}ˆŽ‰ˆ†x€‰€‚€{€ˆ‹„„znzy~†€z|€…‰z}ƒƒ’†€|y€Œ‰ƒ‡€€‹Šƒ‚ƒ‹”‰†€tz‚…†ƒxv}}€ƒ|u|ƒ…Š†wuz{„‰„‚ƒ€…Œƒ|€€…‘’ƒ}zx€‰††€x€…€ttƒ†ƒwow€‡tz|z€€wqz€…ƒwxt€‹Ž‰ƒƒ~ˆƒ€}ˆ‚€ww‹‹Š‰|~‚ˆ‰ƒ€tzƒ‚Š€tnr~…€qzy€ˆw€…‹•€zwt…‹Ž‰€€€Ž‡‰€‚‹““†€vx……Œ†y{€…„ƒ€t~ƒˆŠ€vrw€‰Œ€z{}ˆ‹†€}€‰”’ˆw}‹ŽŒ‡}€ŽŠƒ}z…Œtlx€…Œƒyw}~€zy}…‹Œ€y~€†•…ƒ‚ƒ‰†~}ˆŠ‚}wu€ˆƒzx€ƒ€zwqt„ƒ…€klw|‚‹s}}}ˆƒ}}‚…ˆ€z€xˆ’†‚€~‹Œ€‚€}‹‡}qt‰…‡zz…†ƒƒ€v€‡‰€kqz~…€wz€‹}€€‹‰w|zv€Š€€€z€†€ƒ}€‘’ˆ‰€t€‰…Š†z€„€‚ƒyz…†…Š€r}ƒŒ€€€{€Œ€~„€…†€‚€€‘…‹†|…‰€}€x~Šƒƒƒtr~€†€w€}€z|‚ƒ‡‰|{€†‰‚…ƒ€‹Š…„ƒ‚‡‰€€u~†€ƒzw€{}zx}}€yprxx€†|€€€ƒ…†ƒ€ƒˆŒ†‚ƒz}‰‰…†z€ˆƒ†€~‚ƒ‚ƒwt…€€Š€z}€€€z€ƒ€Ž‰€}€}€“Œ~ˆ|}„‚||y€†z€€t†€†€t€€€‡€€„…‹Š|€Œ€Ž•ƒƒ„€€ˆ„€‰€€Žƒ€}z…ƒ†w€…‚„€}}…„€‰€y€ƒ„‡Š€€‡††€‚€‚„€w€€}Š‡€~z€†€‚ƒ}€…€z~zx†‰ƒˆ†€…‰‡‰‡€…Š†ˆ†€w€€‹ƒ{€zz€€|}z}wwz|~†z}|v€€€ƒ€‚‚‰†~…€€Š‡ˆ†ƒ}~ƒ|€€z€ƒ‚€€€v€€€†€}}z€ƒ€€ƒ…†‚‚€…„‰†€ƒy{„~€€†€}|x€ƒ…†€}z}|€ƒ}€ƒ€ƒ‚€€€…ˆ‰ƒˆƒƒŠˆƒ„„€€ˆ€€€}€†‡…„€}‚ƒ€…€|€€}|{xzƒƒ…‰}ƒƒƒ‰‚Š‡€…†€€‚…‰€ƒ€|†€|„€~…|}~{€Š…„y{…„€‰†€‰†‚†€…‰„ˆŒz{ƒz|ƒ{w€€y€€v{{z„ƒw{qt‚ww„€€…€|€€€‹Œˆƒw€‰€€ˆ€~ˆƒ~€}††…Š†y€‚y€„z}ƒ€€zy~ƒ‹ƒ…€zƒ†~€ƒ€ƒ…€||{€†ƒ‚†€z€‚}‚}‚ƒ€~{z~ƒ…ˆŠƒ€…„‚‰‡‚…††ˆƒ}€€ƒ‹†€‚…ƒ„€‚ˆƒ€~z}„†‡…}~‚‚ƒ†‚‰‡†…€~€†‰‰†€~€ƒ€€ƒƒ…†€}{€„‡‡€|z|~€€€€†‹‡ƒ‚€‚ŠŒ†}}€€€~|‚€}}vv}‚„€yw}}}wz|}€‚zt{„ŒŒ†‚ƒ‚‰„„†‚‹Š}{}~‰ˆ‡€}€€€{ƒ~yqx}‚††ƒ{~€€†€€€ƒ…„zz~ˆŒ†„€}}‚„€†€€ˆ}zz~††‡„}€€€„ƒ€‚‹ŒˆŒ€|€‚‰Œ†€€~…†‚…ƒ‚ˆŽ‰€€‚‰‰‡zw|}ƒ€z€‡‚|z…†‹Œ€~}zƒ€z€„€ˆƒyy{‚ˆŒƒ€x€†€}ˆŒ€€}x€‰ŽŒ…€{€€‚‰}}ƒ}{sy€ƒ‹†}zwz}‚}w€zz‚}vuz~…Œ†…€}††ƒƒ€}€‹‡wy€†ŒŠ„}|}}‡ƒ~‚„€ztz€…‰ƒxu}ƒ„‚„ˆŠ„€{€ˆ‰‰„|}€ƒ€{…‰„†€wy€„ˆ‡€{yz€‰ƒ‚…ƒ€ˆ‡€ƒƒƒ‹Ž‰ƒ€~€‰†ˆ‰€ƒŠ‰ƒ„€x€‡ˆŒ|zz~€ƒz}‚€ƒ†€y}ƒ…ŽŠ€€z}„„‚~€}€‰€~ƒ‹Œ…ƒ~„†…‡€{}„ƒ€ƒzzƒ†ŒŠ„€z€€†ƒ}€€ƒ‚zw{z€ˆƒzw~ƒ}}„„€}zw}…†ƒ}wxz€ˆ†€}€„„ˆz|…‰ˆ{z}…‰†„€‚†‰Œ€|zz…‡†ƒzyz€„ƒ…€€ˆ‰„€{x€‰‡…€tv{€‡„€w}‚ƒ‡{{…Š‰€zz{€‡‚€€†ŒŒ}€‹’‰€}€††††}~†‡†ƒ{z€ŠŒŒ„z|~‚ˆƒ|z}‚†‰€yz}…Ž‰ƒzz}ƒ‰ƒ‚€}†‹‰€}z€‹Œ†zz€…‰‡ƒz~ƒ…‡€uvz„‰‰ƒyz|‚‰ƒ|€ƒˆ‰€wtt€ˆ‰€xzz€ˆ†ƒ€†††}uqt€†ƒ{rsw€ˆƒ€{€„ˆ‰yu}†ˆŒ†zx~ƒƒ†€|€†‹Œyz~…‹Œ€z|{€‡||€‚ˆ„zxu}ˆ‰‚}yqxƒ‚€}yz„Šƒ€zw€‰Œ†zw€„„‰…‹ŽŒ‡}„‡‘ƒ€€ˆ„}€‚„‰‡€z{€‡Œ„‚€z€ˆ‰€~„‰ƒ}ww}…‹Š†€z€ƒ…ˆ†ƒ‰†…€wx}€ˆˆ€{}}€‰‡€€‚ƒ…†€xyz€…ƒ‚€}~…Š€‚‚€ˆŠ†€}y}ˆ‰‡ƒzw|€‚|~ƒ‚‚}vtx€ƒ}vxv{‚€|}‚ƒˆŒ}|}ƒˆ‰ƒ€}z„ƒ‚€€…Œ‡ƒ}€‹‰‰†|w}}…x€‚€€zu}€ƒˆ€}}z~‚€{~‚ˆ†€zw{‚‹‹‡‡€€‰††ˆ„…Š„ƒ{€†‡‰†€}ƒ€‚‹ƒ‚ƒ„„ƒ{z}~ˆŒ…†€|€„„†„†Šƒ€}w{…‹Š‰†}€ƒ„‰„€‚……†}z{|„†€zz}‚„€„‚‰†‚}zz€Š‰‰ƒz}„Š‰††‰‰‰‰€y}€…Š†|wuv}~zzzz€„€wutx€…€zts|€€€}‚‰†‚z|†ŒŠ|~ƒ…‰†€„†…ˆ„}vz€ˆŒ‡€|vz€~||}}ƒ†€ywy†Š†€|}ƒ…ƒ„€€„‰†€}y{€‹†€}€€†ˆƒ€€†„‚€zrw„ŠŒŒ}z~ˆ†ƒ„………Šƒy}}€ˆ‹‡€~…‰„‡„€†Œ‰€€}x€‹‡†}{}€„…†€€‡ƒ…wrxƒ„ˆ„zwu{‚ƒ€€„ƒ‡{~‚‰†€€~…‡„ˆ„ƒˆ‰€€zz…‹†€|uw}}€t{|{}tn}€‚…zvz{€ƒ{€…†‰€{€„…‘††ƒ…‡‡ƒ€„€…Œ€€ztz€†€}t€}{{€€}}rz€ƒˆˆ„€€ƒ‚‰†‚‡ƒ‰‰ƒ€}€}ƒŠ€‚€}€€}}€€ˆƒ€€tx}†‚ƒ~€ƒ€ˆ„ƒ‡…‹‰†ƒ‚†ƒ‰ˆˆ†ƒƒ…ˆƒ††…‹†‚‚}€ƒ€€|}€|}||ƒ„‚„€w~€€ƒ†€€€ƒƒ†ƒ‡‡€€†ƒƒ‰‰…„ƒ‚‚ƒ‚€…†€‚„€~…€‡‚}yxzx€z€|sxz|€‚€„}}€|€ƒ€€€z€„†ƒƒ‡†‰†…€†€…‡€€€~z~€y€€…€|{z}€†€~ƒz}€}‚ˆ‰…€€ˆ‡‰‡†ƒ€…€€}€€€€y|€ƒ€~}}~~€}}€ƒ…€€~€ƒ†‰ˆ‰‰‰Œ‰ˆ††ˆŠŒˆ„€€ƒˆˆ„ƒ€€~}€€€~{zwx}€}|~€‚‚€…‰…Š‰ƒƒ†ƒˆ‡ƒ††…†‚…‡‡‰€~|€‚ƒ}}}}~€}€„€€€z{€}~}€€}{}€ƒ…†~~€€‚€€~€~z}~€ƒ†€€€€ƒƒ€~€~}€„‚‚„€€‚ƒƒƒ„‚„ƒ~€~|ƒƒ„…ƒ€~„€€„ƒ…†ƒ‚€z‚…€}€{€}zƒ€€„}}}€€„†€…†€†„‚‚ƒˆˆŒ…‹ƒ†Œ‹Š‰Š†ˆŠ€€€}‚††‚€}x€€€ƒ}{~€||~wzƒ€…†€ƒƒ…Œ‡‚ˆ†…Š†€€ƒ‚ˆŒ€‚„€ƒ‡…ƒ„„‚…ƒyzxx€„€~~wx€€€€€…‡ƒ€}z€„…Š„|}€€„€€ƒ…„€zz{}†z{xxz}~z|}€}|xz„‡ƒƒ€}……ˆƒ~ƒƒˆŒ†‚z}ƒ…Š„€{‚€€€~}†…€}tw}‚Šƒ€zx}ƒƒ}€~‚€}ztz~…‰…€~ˆ†‰€‚ƒŽŒ†ƒw|ƒˆŽŒ†€…‡…Œƒ€„…‹‹†|v~}ˆ€}{{…†€€€‹†€}zz€Œ†…ƒz€……†ƒ€€‰Œˆ†€w}…‰Œ€}‚€……€~ƒ…ˆ€twz}††€{}z€†€€€€ˆ‹Œ€~|z‡Šˆ‡€}~„ƒ€z~††„€ztzƒ€…€uwy}zz{v}€€„|zz€…ˆŒƒ€ƒ€ˆ‡†„€ˆ‡‹Œ~~{‡‹Œƒƒ€~…ƒ€€}€€„€{yqz€€„€|z}€}€€|‚‚„ƒ}zz€„†Š‚‚‡ˆ‰ƒƒˆ†Š†€€}~ƒˆˆ„ƒ€€„„‚€€„‡ƒ€~z~…†††‚€†………ƒ……ˆ‰ƒ€ƒ†ƒ†ƒ~€‚„€€…„††€}}}€…‡€€€z€€€‚€€ˆƒ{€…„„†ƒ}€„‚‡„€ƒ…†‰ˆ€„€‚‡€€€}€ƒ{}€}€€zywwx€}zxz~~}{}ƒ€‚€}€‚††‰‰€ƒ……‡ƒ€€‚„…‰€}€}€ˆ‡ƒ~€}€ƒ~€}z€€zyww€ƒ‚~{}‚‚‚|€…„†ƒ}z€††Œ‰€€‚‚…ƒ€€ƒƒ‰‰€}||€‡‡€~}}ƒ„‚}‚‰„ƒ€z€ˆ‰ˆ‡|ƒ‡…Šƒ€…‰Š‰†€y‚‚‰ƒ|{~€ƒƒ|€€‰ƒ}zvx€Šƒ}w}„‚‚z~ˆŒ‡‰€w€‰ŒŠ€zƒ„‹‰€€‚ƒ‰‰z}€€Ž‰}zwz€wuvq€…€|tqt€Šƒzx€€‚€zxˆ‡ˆƒwz€Š’‰€}€…Œƒ~€€ƒ‰ˆ€wzz…‹„€yz~„|~w{ˆˆƒ}trz…‰‰ƒz}€‚ˆ†€~ˆŠ‰Œ€xz€†‹‰€z}}…‰€{}€‹‡|zx}…Š‰€}{€‡‚ƒ…Ž†€|x€Ž‡€…†ˆ‹€‰‰Š‰zz„†‹Œ€|}}ƒ}w}|€‹ƒ|zz{…‹ƒ€€z€†€€z€‹Œ„†€z‹‰€}…ƒ…‡}€…ƒˆ†€w~€€‹†z{{zwwzv€„{yyvzƒ†€€~z‚‚~€}|…‰†„€xz…‰‰Œ„€‚‚‚†ƒ~‚ƒƒ€wv{}€ˆ}~}~€}~€…†€}|x}„†ƒ…‚…„‚ƒ€‚†††„€|}€‚ƒƒ€z{}~}}€‚€}||~‚†„‚€€€€€‚ƒˆ‹ŠŠ†ƒ…‡‹ŒŽŠ†„ƒ„ƒƒ„ƒ…‡†€€€}‚ƒƒ€}{z}||€|€ƒ€€€}{€„ƒ‡†€€}€ƒƒ‰†…Š€€ƒƒ†ˆŽ‡„†~„„}€~†ƒ}€zw€ƒƒƒ€}|€}€y€z€}wu}€€‰†}€z}‚„ƒ~ƒ†z€€y€††ƒ„€{„ƒƒ~~…†‚‚€tw€~…‡€zzy}‚€~„€€‰ƒ}€€‡Œƒ€€y€†ƒ„„€€‰†€ƒ€x€…„…zx|y}z}ƒ€‚…zv~€ƒ‰‰€~€~…‰„††…‹‰†ˆ„†ŽŠ‡€‚ˆ„ƒƒ~…‡ƒ‚€zx€ˆƒ†€wxz~€{€~‚„z}€‚†ŠŒƒƒ†‚‰†„ƒ‚…‡‹†€„€€Œ‰ˆ€}€‡€€}ƒ€‚€|ww…†…‰€z{}‚„€}€|…€y~}€ˆ„}ƒ€~…€~„„z}|t€„€€}zz€ƒ€‚{€†ƒ„…€w€‡††yz~€„‡€†ƒ…†~€†Œ€€€{€€ƒƒ‹~‚}|…†€€}v}€}}zƒ€€…zy……„††€€†€ˆ‡€…†…ˆŒ†€ˆ†…Œ†‰†ƒˆ‰€ƒ†€…‰€}€}z……€ƒ€z‚€}€~z€†€€ƒz}…„†ˆ†€†ƒ‚‹†ˆ†‚‡‰€€…€ƒ‰‚†€…€}ƒ€}…ƒ{}}w}€|€z~‚}€ƒ€€‡„‚†€|€€€ƒ}€ƒz€ƒ}~„€‚†}zz{€}w}zv~€x}€~€†€€ƒzˆ€€‡€~…†……€‡‰…‡‡€€†€ƒ†€€‡€}‚€x~€}€w}~y€ƒz~ƒ}~„€y€€€†}€…ˆ„†€…Šƒ„…‚…‰†„‡ƒ€ˆ…ƒ†ƒƒˆ‹††ƒ}€„ƒŠ†€‚ƒ€„€}€€ƒ…€€‚…†€€~ƒƒ~€€…„€‚}€‰†‰†„€€†€ƒ€}€…ƒ€}ƒ€ƒ‰€}€€€€|z€~…„€ƒ~€„ˆ†€…€†€~€„€€€z€†€‚€|y€€}€zx}z}€{ty}w€†{€€„ƒ…ƒƒŽ‡‚‚€…Œ‚†€€‡…ƒƒ€}…ƒ}ƒ|y€€|}€tw‚z€ƒzz€€~…ƒw€€}…†€…€€ˆ€€‡€…Œ†€†…‚ŽŒ€ˆƒ}„‡€ƒzzˆ€ƒˆ€„†€‡‡}…†€†ƒ~€†ƒƒ€~†ƒ…‹Œƒ…„ƒƒ}‚€}€…€|„€ˆƒ€‚€‚„€€€x€„€…†€…ˆƒ…‚‚†ƒ€„†€…‰€€‚€€†ƒ€…€}„€}ƒ€}€z{yzz}€}{€|z€zx€€}€€z|z€„€€…€€†€€†ƒ€ˆ†€…ƒ~ƒ†€…†}€ƒ€€ƒ€}„€…€}€€~‚€z~~w€y}€|~……€„€}…ƒ…€}€‚~ƒ†€€ˆƒ†‡†ƒ‚‹ƒ{‚€{ƒƒ~€}€†€ƒƒ~…Š€€†€€Š‡€…ƒ€ˆ‹ˆ‹†}…‰‰Œ€€†ƒ‡€|€€€ƒ€y}}z…†z|€{€‰†€}}……ƒ„€~…‰ƒ†‡€‡ˆ…†€€ˆŠ‡†€z€ƒˆƒyz}€„zvz{}€€xzyx‚€wy{z€‡€}}z€ˆˆ„ƒ}}…†ƒ€|€†ƒ„ƒ{}…ˆ‰†€|€‚…€wz€…ƒzz~ƒ‰ƒ~€€€ˆ„|}{}…†€~}y€Š†ƒ€z~…†ƒƒ}z„…ƒ†€w}‚„††}}€€ˆ‰}€ƒ…Œ†}~|€ˆ†„€€€…†„…€‰‰„€}ˆŒ‰‰€~‚†††„|€‡…Šƒzwz€†‡€z|w}…€|zz…‡€~zz††ˆ‡€~‚‰†††}€Š‰Œ‡€~ƒˆ‹ƒ}‚€€…ƒyx{€„wvww…€y}wu€€z|zx€‰€€y€††‰‡€~…„€†€z‚‡„ƒ„zz‚€…†}{€}}…w€{…ƒ}z}{€‰€€†}€‰„€ƒƒ€‹€‚€w€„„„„}z…€€†€|‚ƒ€€t{z€|{††‚ƒ‹‡€‚ƒ€ˆ†‰‡€…‰„„‰…„‰„‰…ˆ†ˆ‡}€}€‚}~€€‚‡€{€~„‚€€€{€‚|}€…ƒ€…€€‰ˆ†Š„€ƒ…ƒ†‚…‰ƒ…††ƒ„‰ƒ€‚€€€~{‚z}{wz€€}€}z}}€€€€€~€z€‚ƒƒ€€€†€ƒ€ƒƒ€}x~ƒ~€}z{‚€€~„{†…„‰€€ƒ…‡‰†‚ƒ„‚‹‡€‚€€…‡€}€|z€€~z}‚€z}zt€†€€€wx€€ƒ†€€ˆ†‡Œ…€‰ŒŠŒ‚†„ŠŒ‚„‚ˆŽ†‚€€‹‰€€|z‚€€€w€‡€€€zz…†ƒ…€y€ƒ…‰ƒ|€‰„ˆ‰€}‚ƒ‹‰€‚‚Šƒ€ƒ€€ˆ†€z}{ƒŠƒ€y}ƒ‚‚„€z…†€€}w}ƒƒ„z{ƒƒ€z€ƒ‡€wy{€ˆ†€~zz€‚€€}€…€|zx}ƒƒ‚€zw{€€‚€}€†‰†ƒ~|€…ˆŠ}}€„††‚‚…†Œˆ}|€…‰†{vx~~}zx{€‚€}wu}ƒƒ‚€zx~€€€€„‰‹Œƒ€ƒ‰‰‘†ƒƒ†‡‰†ƒ…„‰Œ„€|{ˆŠ†‚€z€€€}|€„€€€xzƒ†††„€…ƒ‡†€…‡‡‡†€}€…Šƒ€‚ƒ†€€ƒƒ†„€zyw}‡ƒ€}|€‚€ƒ€…‰ƒƒ€{€„„‚…€z€€~€}€…†‚ƒ}}€}‚€}}~z}zw~€€ƒ€z|}€†€€}€€€€€‡†ƒ„€‚…††……ƒ‚…€ƒ€€‚„…„ƒ}€~‚€€}|{y}€€€€~|z}}€€€‚€ƒ€€‚…ˆ„ƒƒ‚…††…‰ˆ‡Œˆ…†ƒ‚ˆ‹†„…€€ƒ€€ƒ€€†ƒ€ƒ€}…‰ƒ…„~ƒ€€„€€ˆ†„ˆ€}ƒ†ƒ‹‰€‚ƒ€€†}~…€ƒ†€z€}}ˆ†ƒ…†}€|€‹€€z}ˆ†ƒ‰†~‡†€…ƒz€‰ƒƒww€}€ˆ€{€€zƒ€v€€|€€wvzw}„|z€z~ƒ€z~}zˆ‰„€w€ƒƒ…ˆ€€†€‚†€€ˆ‹†‰ƒz€€€…„€|~}€ƒ}{€€ˆƒ}}z€ƒ}~~€ƒ}z}z€ˆˆ„~{€…†ˆ…‚„ƒ„€€ˆˆ‡‰ƒ€€ƒƒ…‡€€ƒ‚ƒ€}{€€ƒ‰ƒ€€‡‰†ƒ‡…†‰‚€~…‰‡ƒ€}}ƒ†……ƒ„„€z}€€‚€zz}~€‚ƒ€‚……†ƒ€‚ƒ…‰ˆ€€€‚‡†ƒƒƒ††ƒ‚€€€…‡ƒƒ€}}}~}}}}€}}zwz~€€z}|{€}~€}z}‚€ƒ†…ƒ‚ƒ‚…ƒƒ€€†}€€ˆ…ƒƒ€‚€€€€€ƒƒ}€|{€‚ƒ€‚€€€€}€‚€€€}y}€}€€€€€‚€€‚…ƒ‡‡€€€€‚†ƒƒƒ‚ƒ€€€ƒ„†ˆƒ€€…†‚ƒƒ††ƒƒƒ††‹Š‡‡ƒƒ…†ƒ„…ƒ„†‚€}€ƒ„ƒƒ€z€~„€}€€€€€xz‚€…„€€ƒ…‹†€ˆˆ‡‰‚€€€…Š†…ƒ|€†‚…ƒ€†ƒ}€zw}~~|yst}z€z|€ƒƒ„€y}€ƒˆ€€}€…†€ƒˆŒƒ€|}†‡€zx€€~z|€…„‚€y~„…Šƒ~}€€ƒ†€|€…‰ƒ}|~‚‰‡€}z€„€|zz€†ƒ~}vz……††€{€„€‚{€ˆ‡‰†}{€…‹†…ƒ…Œ‰€……ŠŒ€€€|…Œ†‚ƒ€~‹‰€ƒ€€†Š‡€v{†€ƒƒxz€ƒ€€z€†…‡€wx~€ƒŠ€z}€‰†€€†…Ž€‚€€‰Œ…†€~‹ƒ}€~€†‰€€zs}ƒ}€}tt}|w~xt€‚‚…€z}‚ƒ‰‰|~€…€y€‚‰†}€}{…ˆ€€€z}|y{y}ƒ€~~zz€‡…‡ƒ}‚†ƒ…†€€††…‰€}€€‚††€€ƒ€‚}|}}€ƒ€wzvv€€}|~€€‚€…ˆ†……€†‰‡‰†…‰‰‰‰ˆ„†‰ˆ‹‰€€ƒƒ€€€ƒ€€‚‚†‡€€€}‚ƒ€€€€€€‚€†††‡†€€‚ƒ‚‚€€€€€†ƒ…‹‰ƒ„…€‚†……ƒ€€€€~~…€„ƒ}~€€ƒ€€}y}}y|}€…€z~~ƒƒ„„€}€}€{€ƒ€€‚€z~€ƒ†€}|€€{~€}€ƒ€{|~†‡ˆ‡€†…„‰†ƒ…‡ƒ€€~€ƒƒ…ƒ}~‚ƒ|w}€}vqrw€€|}|z}ƒ‚€ƒƒ…‹Š†€ƒ‰ŒŒ‹†€†‰‰Š‰†…‰Œ‰†€€€€…†€|}€€||€„‡†|z{€Š†ƒ€~}€†ƒƒ‚ˆ‰‰†€€†‰……€{€‚„€}€…††‚||}‚…‡ƒ}~€€~€††‰€}~€…‰‰†€€€‚}z|€{zyzƒ……€|}€‚ƒ€}w€‚}wv{€…‰€€€~ƒƒ€€€ˆ„z{z}…‰†…ƒ€‚ˆƒ…ƒ…ˆ‰ƒ€|x€‚……€{~€

--- /dev/null
+++ templates/javascript/.arch-ids/addressesBlocks.js.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4879.0


--- /dev/null
+++ lib/IMAP/Search.php
@@ -0,0 +1,90 @@
+<?php
+
+require_once 'Horde/IMAP/Search.php';
+
+/**
+ * The IMP_IMAP_Search:: class extends the IMAP_Search class in order to
+ * provide necessary bug fixes to ensure backwards compatibility with Horde
+ * 3.0.
+ *
+ * $Horde: imp/lib/IMAP/Search.php,v 1.3 2006/01/28 03:30:19 slusarz Exp $
+ *
+ * Copyright 2006 Michael Slusarz <slusarz at horde.org>
+ *
+ * See the enclosed file COPYING for license information (GPL). If you did not
+ * receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @author  Michael Slusarz <slusarz at horde.org>
+ * @since   IMP 4.1
+ * @package Horde_IMAP
+ */
+class IMP_IMAP_Search extends IMAP_Search {
+
+    /**
+     * Returns a reference to the global IMP_IMAP_Search object, only creating
+     * it if it doesn't already exist.
+     *
+     * @see IMAP_Search::singleton()
+     */
+    function &singleton($params = array())
+    {
+        static $object;
+
+        if (!isset($object)) {
+            $object = new IMP_IMAP_Search($params);
+        }
+
+        return $object;
+    }
+
+    /**
+     * Searches messages by ALL headers (rather than the limited set provided
+     * by imap_search()).
+     *
+     * @see IMAP_Search::searchMailbox()
+     */
+    function searchMailbox($query, &$imap, $mbox)
+    {
+        /* Clear the search flag. */
+        $this->_searchflag = 0;
+
+        if ($_SESSION['imp']['base_protocol'] != 'pop3') {
+            require_once IMP_BASE . '/lib/IMAP.php';
+            $imp_imap = &IMP_IMAP::singleton();
+            $imp_imap->changeMbox($mbox, OP_READONLY);
+        }
+
+        return $this->_searchMailbox($query, $imap, $mbox);
+    }
+
+}
+
+/**
+ * The IMP_IMAP_Search_Query:: class extends the IMAP_Search_Query class in
+ * order to provide necessary bug fixes to ensure backwards compatibility with
+ * Horde 3.0.
+ *
+ * @author  Michael Slusarz <slusarz at horde.org>
+ * @since   IMP 4.1
+ * @package Horde_IMAP
+ */
+class IMP_IMAP_Search_Query extends IMAP_Search_Query {
+
+    /**
+     * Builds the IMAP search query.
+     */
+    function build()
+    {
+        $search = parent::build();
+        if (empty($search)) {
+            if (!empty($this->_or)) {
+                return $search;
+            }
+            $search = &new stdClass;
+            $search->flags = null;
+            $search->not = false;
+            $search->fullquery = $search->query = 'ALL';
+        }
+        return $search;
+    }
+}


--- /dev/null
+++ templates/stationery/.arch-ids/prefs.inc.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4886.0


--- /dev/null
+++ lib/IMAP/.arch-ids/Client.php.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4864.0


--- /dev/null
+++ themes/rtl.css
@@ -0,0 +1,21 @@
+/**
+ * $Horde: imp/themes/rtl.css,v 1.1.2.1 2006/04/02 00:58:04 selsky Exp $
+ * S.Niksefat & C.Mortezania in Amirkabir MetaNET Ltd.
+ */
+
+.leftAlign {
+        text-align: right;
+}
+.rightAlign {
+        text-align: left;
+}
+
+.leftFloat {
+        float: right;
+}
+.rightFloat {
+        float: left;
+}
+.messageList th {
+    text-align: right;
+}


--- /dev/null
+++ templates/saveimage/.arch-ids/saveimage.inc.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4884.0


‰PNG



--- /dev/null
+++ lib/IMAP/.arch-ids/Thread.php.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4867.0


‰PNG



--- /dev/null
+++ themes/graphics/.arch-ids/empty_spam.png.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4891.0


--- /dev/null
+++ themes/graphics/audio/.arch-ids/theetone.wav.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4890.0


--- /dev/null
+++ themes/graphics/.arch-ids/addressbook_browse.png.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4888.0


--- /dev/null
+++ {arch}/imp/imp--upstream/imp--upstream--4/pkg-horde-hackers at lists.alioth.debian.org--2006/patch-log/patch-1
@@ -0,0 +1,252 @@
+Revision: imp--upstream--4--patch-1
+Archive: pkg-horde-hackers at lists.alioth.debian.org--2006
+Creator: Ola Lundqvist <opal at debian.org>
+Date: Mon Apr 24 21:47:40 CEST 2006
+Standard-date: 2006-04-24 19:47:40 GMT
+New-files: .arch-ids/saveimage.php.id
+    .arch-ids/stationery.php.id
+    config/.arch-ids/header.php.dist.id
+    config/header.php.dist lib/IMAP/.arch-ids/Client.php.id
+    lib/IMAP/.arch-ids/Search.php.id
+    lib/IMAP/.arch-ids/Sort.php.id
+    lib/IMAP/.arch-ids/Thread.php.id lib/IMAP/Client.php
+    lib/IMAP/Search.php lib/IMAP/Sort.php
+    lib/IMAP/Thread.php locale/he_IL/.arch-ids/=id
+    locale/he_IL/LC_MESSAGES/.arch-ids/=id
+    locale/he_IL/LC_MESSAGES/.arch-ids/imp.mo.id
+    locale/he_IL/LC_MESSAGES/imp.mo
+    locale/km_KH/.arch-ids/=id
+    locale/km_KH/LC_MESSAGES/.arch-ids/=id
+    locale/km_KH/LC_MESSAGES/.arch-ids/imp.mo.id
+    locale/km_KH/LC_MESSAGES/imp.mo
+    locale/tr_TR/.arch-ids/help.xml.id
+    locale/tr_TR/help.xml po/.arch-ids/he_IL.po.id
+    po/.arch-ids/km_KH.po.id po/he_IL.po po/km_KH.po
+    saveimage.php stationery.php
+    templates/javascript/.arch-ids/addressesBlocks.js.id
+    templates/javascript/.arch-ids/folders.js.id
+    templates/javascript/.arch-ids/popup.js.id
+    templates/javascript/addressesBlocks.js
+    templates/javascript/folders.js
+    templates/javascript/popup.js
+    templates/prefs/.arch-ids/defaultsearchselect.inc.id
+    templates/prefs/defaultsearchselect.inc
+    templates/saveimage/.arch-ids/=id
+    templates/saveimage/.arch-ids/saveimage.inc.id
+    templates/saveimage/saveimage.inc
+    templates/stationery/.arch-ids/=id
+    templates/stationery/.arch-ids/prefs.inc.id
+    templates/stationery/prefs.inc
+    themes/.arch-ids/rtl.css.id
+    themes/graphics/.arch-ids/addressbook_add.png.id
+    themes/graphics/.arch-ids/addressbook_browse.png.id
+    themes/graphics/.arch-ids/empty_spam.png.id
+    themes/graphics/.arch-ids/mail_forwarded.png.id
+    themes/graphics/addressbook_add.png
+    themes/graphics/addressbook_browse.png
+    themes/graphics/audio/.arch-ids/=id
+    themes/graphics/audio/.arch-ids/theetone.wav.id
+    themes/graphics/audio/theetone.wav
+    themes/graphics/empty_spam.png
+    themes/graphics/mail_forwarded.png themes/rtl.css
+New-directories: locale/he_IL locale/he_IL/.arch-ids
+    locale/he_IL/LC_MESSAGES
+    locale/he_IL/LC_MESSAGES/.arch-ids locale/km_KH
+    locale/km_KH/.arch-ids locale/km_KH/LC_MESSAGES
+    locale/km_KH/LC_MESSAGES/.arch-ids templates/saveimage
+    templates/saveimage/.arch-ids templates/stationery
+    templates/stationery/.arch-ids themes/graphics/audio
+    themes/graphics/audio/.arch-ids
+Removed-files: config/.arch-ids/header.txt.dist.id
+    config/header.txt.dist lib/.arch-ids/VFolder.php.id
+    lib/VFolder.php scripts/.arch-ids/singlescript.php.id
+    scripts/singlescript.php
+    templates/folders/.arch-ids/javascript.inc.id
+    templates/folders/javascript.inc
+    templates/javascript/.arch-ids/open_compose_win.js.id
+    templates/javascript/.arch-ids/open_print_win.js.id
+    templates/javascript/open_compose_win.js
+    templates/javascript/open_print_win.js
+    templates/pgp/.arch-ids/open_pgp_import.js.id
+    templates/pgp/.arch-ids/open_pgp_win.js.id
+    templates/pgp/open_pgp_import.js
+    templates/pgp/open_pgp_win.js
+    templates/smime/.arch-ids/open_smime_import.js.id
+    templates/smime/.arch-ids/open_smime_win.js.id
+    templates/smime/open_smime_import.js
+    templates/smime/open_smime_win.js
+    templates/thread/.arch-ids/bottom.inc.id
+    templates/thread/.arch-ids/top.inc.id
+    templates/thread/bottom.inc templates/thread/top.inc
+    themes/graphics/.arch-ids/addressbook-blue.png.id
+    themes/graphics/.arch-ids/addressbook-red.png.id
+    themes/graphics/.arch-ids/forward.png.id
+    themes/graphics/.arch-ids/reply.png.id
+    themes/graphics/addressbook-blue.png
+    themes/graphics/addressbook-red.png
+    themes/graphics/folders/.arch-ids/templates.png.id
+    themes/graphics/folders/templates.png
+    themes/graphics/forward.png themes/graphics/reply.png
+Modified-files: README acl.php attachment.php compose.php
+    config/conf.xml config/mime_drivers.php.dist
+    config/motd.php.dist config/prefs.php.dist
+    config/servers.php.dist contacts.php docs/CHANGES
+    docs/CREDITS docs/INSTALL docs/RELEASE_NOTES docs/TODO
+    docs/UPGRADING expand.php fetchmail.php
+    fetchmailprefs.php filterprefs.php folders.php index.php
+    js/ieEscGuard.js lib/Auth/imp.php lib/Block/summary.php
+    lib/Block/tree_folders.php lib/Compose.php
+    lib/Crypt/PGP.php lib/Crypt/SMIME.php lib/Fetchmail.php
+    lib/Fetchmail/imap.php lib/Filter.php lib/Folder.php
+    lib/IMAP.php lib/IMAP/Tree.php lib/IMP.php
+    lib/Identity/imp.php lib/MIME/Contents.php
+    lib/MIME/Headers.php lib/MIME/Viewer/alternative.php
+    lib/MIME/Viewer/appledouble.php
+    lib/MIME/Viewer/enriched.php lib/MIME/Viewer/html.php
+    lib/MIME/Viewer/images.php lib/MIME/Viewer/itip.php
+    lib/MIME/Viewer/multipart.php
+    lib/MIME/Viewer/notification.php
+    lib/MIME/Viewer/partial.php lib/MIME/Viewer/pgp.php
+    lib/MIME/Viewer/pkcs7.php lib/MIME/Viewer/plain.php
+    lib/MIME/Viewer/related.php lib/MIME/Viewer/rfc822.php
+    lib/MIME/Viewer/status.php lib/MIME/Viewer/tnef.php
+    lib/MIME/Viewer/zip.php lib/Mailbox.php lib/Maillog.php
+    lib/Maintenance/Task/delete_attachments_monthly.php
+    lib/Maintenance/Task/delete_sentmail_monthly.php
+    lib/Maintenance/Task/fetchmail_login.php
+    lib/Maintenance/Task/purge_trash.php
+    lib/Maintenance/Task/rename_sentmail_monthly.php
+    lib/Maintenance/Task/tos_agreement.php
+    lib/Maintenance/imp.php lib/Message.php
+    lib/Notification/Listener/status.php lib/Quota.php
+    lib/Quota/command.php lib/Quota/courier.php
+    lib/Quota/cyrus.php lib/Quota/logfile.php
+    lib/Quota/mdaemon.php lib/Quota/mercury32.php
+    lib/Search.php lib/Session.php lib/Spam.php lib/api.php
+    lib/base.php lib/prefs.php lib/version.php
+    locale/ar_OM/LC_MESSAGES/imp.mo
+    locale/ar_SY/LC_MESSAGES/imp.mo
+    locale/bg_BG/LC_MESSAGES/imp.mo
+    locale/bs_BA/LC_MESSAGES/imp.mo
+    locale/ca_ES/LC_MESSAGES/imp.mo locale/ca_ES/help.xml
+    locale/cs_CZ/LC_MESSAGES/imp.mo locale/cs_CZ/help.xml
+    locale/da_DK/LC_MESSAGES/imp.mo locale/da_DK/help.xml
+    locale/de_DE/LC_MESSAGES/imp.mo locale/de_DE/help.xml
+    locale/el_GR/LC_MESSAGES/imp.mo locale/el_GR/help.xml
+    locale/en_US/help.xml locale/es_ES/LC_MESSAGES/imp.mo
+    locale/es_ES/help.xml locale/et_EE/LC_MESSAGES/imp.mo
+    locale/et_EE/help.xml locale/fa_IR/LC_MESSAGES/imp.mo
+    locale/fa_IR/help.xml locale/fi_FI/LC_MESSAGES/imp.mo
+    locale/fi_FI/help.xml locale/fr_FR/LC_MESSAGES/imp.mo
+    locale/fr_FR/help.xml locale/gl_ES/LC_MESSAGES/imp.mo
+    locale/hu_HU/LC_MESSAGES/imp.mo locale/hu_HU/help.xml
+    locale/id_ID/LC_MESSAGES/imp.mo
+    locale/is_IS/LC_MESSAGES/imp.mo
+    locale/it_IT/LC_MESSAGES/imp.mo locale/it_IT/help.xml
+    locale/ja_JP/LC_MESSAGES/imp.mo
+    locale/ko_KR/LC_MESSAGES/imp.mo locale/ko_KR/help.xml
+    locale/lt_LT/LC_MESSAGES/imp.mo
+    locale/lv_LV/LC_MESSAGES/imp.mo
+    locale/mk_MK/LC_MESSAGES/imp.mo
+    locale/nb_NO/LC_MESSAGES/imp.mo locale/nb_NO/help.xml
+    locale/nl_NL/LC_MESSAGES/imp.mo locale/nl_NL/help.xml
+    locale/nn_NO/LC_MESSAGES/imp.mo
+    locale/pl_PL/LC_MESSAGES/imp.mo locale/pl_PL/help.xml
+    locale/pt_BR/LC_MESSAGES/imp.mo locale/pt_BR/help.xml
+    locale/pt_PT/LC_MESSAGES/imp.mo locale/pt_PT/help.xml
+    locale/ro_RO/LC_MESSAGES/imp.mo
+    locale/ru_RU/LC_MESSAGES/imp.mo locale/ru_RU/help.xml
+    locale/sk_SK/LC_MESSAGES/imp.mo locale/sk_SK/help.xml
+    locale/sl_SI/LC_MESSAGES/imp.mo
+    locale/sv_SE/LC_MESSAGES/imp.mo locale/sv_SE/help.xml
+    locale/th_TH/LC_MESSAGES/imp.mo
+    locale/tr_TR/LC_MESSAGES/imp.mo
+    locale/uk_UA/LC_MESSAGES/imp.mo locale/uk_UA/help.xml
+    locale/zh_CN/LC_MESSAGES/imp.mo locale/zh_CN/help.xml
+    locale/zh_TW/LC_MESSAGES/imp.mo locale/zh_TW/help.xml
+    login.php mailbox.php message.php pgp.php po/ar_OM.po
+    po/ar_SY.po po/bg_BG.po po/bs_BA.po po/ca_ES.po
+    po/cs_CZ.po po/da_DK.po po/de_DE.po po/el_GR.po
+    po/es_ES.po po/et_EE.po po/fa_IR.po po/fi_FI.po
+    po/fr_FR.po po/gl_ES.po po/hu_HU.po po/id_ID.po po/imp.pot
+    po/is_IS.po po/it_IT.po po/ja_JP.po po/ko_KR.po
+    po/lt_LT.po po/lv_LV.po po/mk_MK.po po/nb_NO.po
+    po/nl_NL.po po/nn_NO.po po/pl_PL.po po/pt_BR.po
+    po/pt_PT.po po/ro_RO.po po/ru_RU.po po/sk_SK.po
+    po/sl_SI.po po/sv_SE.po po/th_TH.po po/tr_TR.po
+    po/uk_UA.po po/zh_CN.po po/zh_TW.po recompose.php
+    redirect.php scripts/custom_login.php search.php
+    smime.php spelling.php templates/acl/acl.inc
+    templates/common-header.inc
+    templates/compose/attachments.inc
+    templates/compose/attachments.js
+    templates/compose/compose.inc
+    templates/compose/compose.js
+    templates/compose/compose_expand.js
+    templates/compose/expand.inc
+    templates/compose/recompose.inc
+    templates/compose/redirect.inc
+    templates/compose/spelling.inc
+    templates/compose/spelling.js
+    templates/contacts/contacts.inc
+    templates/fetchmail/account_select.inc
+    templates/fetchmail/driver_select.inc
+    templates/fetchmail/fetchmail.inc
+    templates/fetchmail/manage.inc
+    templates/fetchmail/top.inc
+    templates/filters/notactive.inc
+    templates/filters/prefs.inc
+    templates/folders/actions.inc
+    templates/folders/foot.inc templates/folders/head.inc
+    templates/folders/import.inc templates/login/login.inc
+    templates/mailbox/actions.inc
+    templates/mailbox/actions_deleted.inc
+    templates/mailbox/alert.inc
+    templates/mailbox/empty_mailbox.inc
+    templates/mailbox/header.inc
+    templates/mailbox/javascript.inc
+    templates/mailbox/legend.inc
+    templates/mailbox/mailbox.html
+    templates/mailbox/message_footers.inc
+    templates/mailbox/message_headers.inc
+    templates/mailbox/navbar.inc
+    templates/mailbox/searchfolder.inc templates/menu.inc
+    templates/message/headers.inc
+    templates/message/javascript.inc
+    templates/message/navbar_actions.inc
+    templates/message/navbar_navigate.inc
+    templates/message/navbar_top.inc
+    templates/pgp/import_key.inc
+    templates/pgp/notactive.inc
+    templates/pgp/passphrase.inc templates/pgp/pgp.inc
+    templates/prefs/folderselect.inc
+    templates/prefs/initialpageselect.inc
+    templates/prefs/sentmailselect.inc
+    templates/prefs/sourceselect.inc
+    templates/prefs/spamselect.inc
+    templates/prefs/trashselect.inc
+    templates/search/fields.inc templates/search/header.inc
+    templates/search/javascript.inc
+    templates/search/main.inc
+    templates/smime/import_key.inc
+    templates/smime/notactive.inc
+    templates/smime/passphrase.inc
+    templates/smime/smime.inc templates/thread/thread.html
+    test.php themes/bluewhite/screen.css
+    themes/cornflower/screen.css
+    themes/graphics/compose.png
+    themes/graphics/fetchmail.png
+    themes/graphics/mail_personal.png
+    themes/graphics/mime/html.png
+    themes/graphics/mime/mail.png
+    themes/graphics/spellcheck.png themes/luc/screen.css
+    themes/lucblue/screen.css themes/screen.css thread.php
+    view.php
+New-patches: pkg-horde-hackers at lists.alioth.debian.org--2006/imp--upstream--4--patch-1
+Summary: Import upstream imp 4.1.1
+Keywords: 
+
+Imported imp-h3-4.1.1
+into pkg-horde-hackers at lists.alioth.debian.org--2006/imp--upstream--4
+
+


--- /dev/null
+++ po/.arch-ids/he_IL.po.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4875.0


--- /dev/null
+++ templates/prefs/defaultsearchselect.inc
@@ -0,0 +1,27 @@
+<?php if (!$prefs->isLocked('default_search')): ?>
+<?php
+    if (!isset($imp_search)) {
+        require_once IMP_BASE . '/lib/Search.php';
+        $imp_search = new IMP_Search();
+    }
+    $curr_default = $prefs->getValue('default_search');
+    $search_fields = array_merge(array('' => array('label' => _("NONE"))), $imp_search->searchFields());
+    $def_select = '';
+    foreach ($search_fields as $key => $val) {
+        $def_select .= '<option value="' . $key . '"';
+        if ($curr_default == $key) {
+            $def_select .= ' selected="selected"';
+        }
+        $def_select .= '>' . $val['label'] . '</option>';
+    }
+?>
+<table border="0">
+ <tr>
+  <td>
+   <?php echo _("Default Search Field") ?>:
+   <br />
+   <select name="default_search"><?php echo $def_select ?></select>
+  </td>
+ </tr>
+</table>
+<?php endif; ?>


--- /dev/null
+++ templates/stationery/prefs.inc
@@ -0,0 +1,46 @@
+<form method="post" name="prefs" action="<?php echo Horde::selfUrl() ?>">
+<?php Util::pformInput() ?>
+<input type="hidden" name="actionID" value="update" />
+<input type="hidden" name="group" value="<?php echo $group ?>" />
+<input type="hidden" name="app" value="<?php echo $app ?>" />
+
+<div class="header">
+  <?php Prefs_UI::generateNavigationCell('compose') ?>
+  <?php echo _("Stationery") ?>
+</div>
+
+<p class="item">
+<select name="stationery" onchange="document.prefs.edit.click()">
+  <option value=""><?php echo _("Create new stationery") ?></option>
+<?php foreach ($stationery_list as $stationery_id => $stationery_choice): ?>
+  <option value="<?php echo $stationery_id ?>"<?php if ($selected === $stationery_id) echo ' selected="selected"' ?>><?php echo $stationery_choice['n'] . ' ' . ($stationery_choice['t'] == 'html' ? _("(HTML)") : _("(Plain Text)")) ?></option>
+<?php endforeach; ?>
+</select>
+<input type="submit" name="edit" class="button" value="<?php echo _("Edit") ?>" />
+<br /><br />
+
+<?php if (!is_null($stationery)): if (!is_null($id)): ?>
+<input type="hidden" name="id" value="<?php echo $id ?>" />
+<?php endif; ?>
+<input type="hidden" name="last_type" value="<?php echo $stationery['t'] ?>" />
+<?php echo Horde::label('name', _("Stationery name:")) ?><br />
+<input type="text" name="name" id="name" value="<?php echo $stationery['n'] ?>" /><br />
+<?php echo Horde::label('type', _("Stationery type:")) ?><br />
+<select name="type" id="type" onchange="document.prefs.submit()">
+  <option value="plain"<?php if ($stationery['t'] == 'plain') echo ' selected="selected"' ?>><?php echo _("Text") ?></option>
+  <option value="html"<?php if ($stationery['t'] == 'html') echo ' selected="selected"' ?>><?php echo _("HTML") ?></option>
+</select><br />
+<?php echo Horde::label('content', _("Stationery:")) ?><br />
+<textarea name="content" id="content" rows="15" cols="80" class="fixed"><?php echo $stationery['c'] ?></textarea><br />
+<em><?php echo _("You can use the following placeholders in the stationery text: %c for the current message content; %s for the signature.") ?></em>
+<?php endif; ?>
+</p>
+
+<?php if (!is_null($stationery)): ?>
+<input type="submit" name="save" class="button" value="<?php echo _("Save Stationery") ?>" />&nbsp;&nbsp;
+<?php if (!is_null($id)): ?>
+<input type="submit" name="delete" class="button" value="<?php echo _("Delete Stationery") ?>" />&nbsp;&nbsp;
+<?php endif; endif; ?>
+<input type="button" name="back" class="button" onclick="document.location.href='<?php echo Util::addParameter($compose_url, 'group', 'compose') ?>'" value="<?php echo htmlspecialchars(_("Return to \"Message Composition\""), ENT_COMPAT, NLS::getCharset()) ?>" />
+
+</form>


--- /dev/null
+++ themes/.arch-ids/rtl.css.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4893.0


--- /dev/null
+++ templates/javascript/.arch-ids/popup.js.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4881.0


Þ•













































%


Report-Msgid-Bugs-To: dev at lists.horde.org
POT-Creation-Date: 2006-01-24 16:57+0100
PO-Revision-Date: 2006-01-24 16:57+0100
Last-Translator: Matt Selsky <selsky at columbia.edu>
Language-Team: i18n at lists.horde.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


--- /dev/null
+++ locale/tr_TR/.arch-ids/help.xml.id
@@ -0,0 +1,1 @@
+Ola Lundqvist <opal at debian.org> Mon Apr 24 21:47:33 2006 4874.0


‰PNG


øN¾
ºQ~`…^³

--- templates/javascript/.arch-ids/open_print_win.js.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.351


--- themes/graphics/.arch-ids/addressbook-red.png.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.429


--- templates/smime/.arch-ids/open_smime_import.js.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.401


--- templates/smime/open_smime_import.js
+++ /dev/null
@@ -1,15 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-function open_smime_import(url)
-{
-    var now = new Date();
-    var name = "smime_import_window_" + now.getTime();
-    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=750,height=275,left=0,top=0";
-    eval("name = window.open(url, name, param)");
-    if (!eval("name.opener")) {
-        eval("name.opener = self");
-    }
-
-}
-// -->
-</script>


--- config/header.txt.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file will allow you to set headers to append to mail messages.
-#
-# It will also substitute PHP variables into the headers, allowing you
-# to send some extra information from the client if you desire.
-#
-# The format of the lines should be:
-# <Header>: <Value | Variable>
-#
-# Where the parts of the lines are:
-#
-#  * Header = The letters "X-" and then the header name
-#             The "X-" is REQUIRED by RFC's to indicate a user-defined header
-#             (as opposed to a standard header)
-#  * Value = A text value for the header
-#  * Variable = A PHP variable, surrounded by percent ('%') signs
-#
-# Lines beginning with a "#" sign will be ignored.
-#
-# Example - Your company/organization name
-#X-WebMail-Company: Hotmail Killers, Inc.
-#
-# Example - Record remote IP Address (useful for tracking abuse)
-#X-Originating-IP: %REMOTE_ADDR%
-#
-# Example - Record the remote browser information (useful for tracking abuse)
-#X-Remote-Browser: %HTTP_USER_AGENT%


‰PNG


éÜ‚7¿çÕ¤š]#+|(ÓÈsôn_Z1œµ¾K^6§Çn¼½>õ¿—`
ÏÌøÓéøµVƒbž‚Ò

--- templates/thread/.arch-ids/bottom.inc.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.406


--- templates/folders/.arch-ids/javascript.inc.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.348


--- themes/graphics/folders/.arch-ids/templates.png.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.445


--- templates/javascript/.arch-ids/open_compose_win.js.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.350


--- templates/pgp/.arch-ids/open_pgp_win.js.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.380


--- templates/pgp/open_pgp_win.js
+++ /dev/null
@@ -1,19 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-function open_pgp_win(url)
-{
-    var now = new Date();
-    var name = "openpgp_window_" + now.getTime();
-    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=450,height=200,left=0,top=0";
-    name = window.open(url, name, param);
-    if (!name) {
-        alert("<?php echo addslashes(_("The passphrase window can't be opened. Perhaps you have set your browser to block popup windows?")) ?>");
-    } else {
-        if (!eval("name.opener")) {
-            name.opener = self;
-        }
-    }
-
-}
-// -->
-</script>


--- templates/thread/bottom.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-    </td>
-  </tr>
-</table>


--- config/.arch-ids/header.txt.dist.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.9


--- templates/pgp/open_pgp_import.js
+++ /dev/null
@@ -1,15 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-function open_pgp_import(url)
-{
-    var now = new Date();
-    var name = "pgp_import_window_" + now.getTime();
-    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=750,height=275,left=0,top=0";
-    eval("name = window.open(url, name, param)");
-    if (!eval("name.opener")) {
-        eval("name.opener = self");
-    }
-
-}
-// -->
-</script>


--- scripts/singlescript.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*
- * $Horde: imp/scripts/singlescript.php,v 1.4.12.1 2005/01/03 12:25:37 jan Exp $
- *
- * Copyright 2002-2005 Charles J. Hagenbuch <chuck at horde.org>
- *
- * See the enclosed file COPYING for license information (GPL).  If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- */
-
-// This script is a wrapper that lets you hide the whole of IMP
-// outside of your webroot. You still have to have the images
-// somewhere accessible, which you can do via
-// horde/config/registry.php. To use this script, you'll have to edit
-// horde/config/registry.php and set IMP's webroot to
-// '/path/to/this/script.php' - no trailing slash. You must also be
-// using a webserver that supports PATH_INFO. Finally, set the
-// following variable to where IMP really is on the filesystem:
-$imppath = './horde/imp/';
-
-$bits = explode('/', $_SERVER['PATH_INFO']);
-foreach ($bits as $file) {
-    if (substr($file, -4) == '.php') {
-        include $imppath . $file;
-        exit;
-    }
-}
-
-include $imppath . 'index.php';
-
-?>


--- lib/.arch-ids/VFolder.php.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.101


--- templates/javascript/open_compose_win.js
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?><script language="JavaScript" type="text/javascript">
-<!--
-<?php endif; ?>
-
-var last_compose_win;
-
-function open_compose_win(args)
-{
-    var url = "<?php echo Horde::url($GLOBALS['registry']->applicationWebPath('%application%/compose.php', 'imp')) ?>";
-    if (url.indexOf('?') == -1) {
-        var glue = '?';
-    } else {
-        var glue = '&';
-    }
-    var now = new Date();
-    var name = "compose_windows_" + now.getTime();
-    if (args != "") {
-        url = url + glue + args + "&uniq=" + now.getTime();
-    } else {
-        url = url + glue + "uniq=" + now.getTime();
-    }
-    var width = screen.width;
-    if (width > 775) {
-        width = 700;
-    } else {
-        width -= 75;
-    }
-    var height = screen.height;
-    if (height > 725) {
-        height = 650;
-    } else {
-        height -= 75;
-    }
-    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=" + width + ",height=" + height + ",left=0,top=0";
-    name = window.open(url, name, param);
-    if (!name) {
-        alert("<?php echo addslashes(_("The compose window can't be opened. Perhaps you have set your browser to block popup windows?")) ?>");
-    } else {
-        if (!eval("name.opener")) {
-            name.opener = self;
-        }
-
-        last_compose_win = name;
-    }
-}
-
-function focus_compose_win(compose_win)
-{
-    if (!compose_win) {
-        compose_win = last_compose_win;
-    }
-
-    if (!compose_win) {
-        return;
-    }
-
-    compose_win.focus();
-}
-<?php if (!strstr($_SERVER['PHP_SELF'], 'javascript.php')): ?>// -->
-</script>
-<?php endif; ?>


--- templates/smime/open_smime_win.js
+++ /dev/null
@@ -1,19 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-function open_smime_win(url)
-{
-    var now = new Date();
-    var name = "opensmime_window_" + now.getTime();
-    param = "toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=450,height=200,left=0,top=0";
-    name = window.open(url, name, param);
-    if (!name) {
-        alert("<?php echo addslashes(_("The passphrase window can't be opened. Perhaps you have set your browser to block popup windows?")) ?>");
-    } else {
-        if (!eval("name.opener")) {
-            name.opener = self;
-        }
-    }
-
-}
-// -->
-</script>


--- templates/folders/javascript.inc
+++ /dev/null
@@ -1,172 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-
-var tooMany = '<?php echo addslashes(_("Please select only one folder for this operation.")) ?>';
-var downloadConfirm = '<?php echo addslashes(_("All messages in the following folder(s) will be downloaded into one MBOX file:")) ?>';
-var downloadSure = '<?php echo addslashes(_("This may take some time. Are you sure you want to continue?")) ?>';
-var displayNames;
-
-function buttonCount()
-{
-    numSel = 0;
-    for (var i = 0; i < document.fmanager.elements.length; i++) {
-        if (document.fmanager.elements[i].checked) {
-            numSel++;
-        }
-    }
-    return numSel;
-}
-
-function getSelectedFolders()
-{
-    var sel = "";
-    var folder = 0;
-    for (var a = 0; a < document.fmanager.elements.length; a++) {
-        if (document.fmanager.elements[a].name == 'folder_list[]') {
-            if (document.fmanager.elements[a].checked == 1) {
-                sel = sel + displayNames[folder] + "\n";
-            }
-            folder++;
-        }
-    }
-
-    if (sel.charAt(sel.length - 1) == "\n") {
-        sel = sel.substring(0, sel.length - 1);
-    }
-
-    return sel;
-}
-
-function chooseAction(i)
-{
-    var action;
-
-    if (i == 0) {
-        action = document.fmanager.action_choose0.options[document.fmanager.action_choose0.selectedIndex].value;
-    } else {
-        action = document.fmanager.action_choose1.options[document.fmanager.action_choose1.selectedIndex].value;
-    }
-
-    if (action == 'create_folder') {
-        createMailbox();
-    } else if (buttonCount() == 0) {
-        alert('<?php echo addslashes(_("Please select a folder before you perform any actions.")) ?>');
-    } else if (action == 'rename_folder') {
-        renameMailbox();
-    } else if (action == 'subscribe_folder' ||
-               action == 'unsubscribe_folder' ||
-               action == 'poll_folder' ||
-               action == 'expunge_folder' ||
-               action == 'nopoll_folder' ||
-               action == 'mark_folder_seen' ||
-               action == 'mark_folder_unseen' ||
-               action == 'delete_folder_confirm' ||
-               action == 'folders_empty_mailbox_confirm') {
-        submitAction(action);
-    } else if (action == 'download_folder' ||
-               action == 'download_folder_zip') {
-        downloadMailbox(action);
-    } else if (action == 'import_mbox') {
-        if (buttonCount() > 1) {
-            alert('<?php echo addslashes(_("Only one folder should be selected for this action.")) ?>');
-        } else {
-            submitAction(action);
-        }
-    }
-}
-
-function submitAction(a)
-{
-    document.fmanager.actionID.value = a;
-    document.fmanager.submit();
-}
-
-function createMailbox()
-{
-    var count = buttonCount();
-    if (count > 1) {
-        window.alert(tooMany);
-        return;
-    }
-
-    var mbox;
-    if (count == 1) {
-        mbox = window.prompt('<?php echo addslashes(_("You are creating a sub-folder to ")) ?>' + getSelectedFolders() + '.\n<?php echo addslashes(_("Please enter the name of the new folder:")) ?>\n', '');
-    } else {
-        mbox = window.prompt('<?php echo addslashes(_("You are creating a top-level folder.")) . '\n' . addslashes(_("Please enter the name of the new folder:")) ?>\n', '');
-    }
-
-    if (mbox != null && mbox != '') {
-        document.fmanager.new_mailbox.value = mbox;
-        document.fmanager.actionID.value = 'create_folder';
-        document.fmanager.submit();
-    }
-}
-
-function downloadMailbox(actionid)
-{
-    var count = buttonCount();
-    if (window.confirm(downloadConfirm + "\n" + getSelectedFolders() + "\n" + downloadSure)) {
-        document.fmanager.actionID.value = actionid;
-        document.fmanager.submit();
-    }
-}
-
-function renameMailbox()
-{
-    newnames = '';
-    oldnames = '';
-
-    var j = 0;
-    while (document.fmanager.elements[j].name != "folder_list[]") {
-        j++;
-    }
-
-    for (var i = j; i < document.fmanager.elements.length; i++) {
-        if (document.fmanager.elements[i].type == "checkbox" && document.fmanager.elements[i].checked) {
-            tmp = window.prompt('<?php echo addslashes(_("You are renaming the folder: ")) ?>' +
-                                displayNames[i - j] + "\n" +
-                                '<?php echo addslashes(_("Please enter the new name:")) ?>', displayNames[i - j]);
-            if (tmp == null || tmp == '') {
-                return false;
-            }
-            newnames = newnames + tmp + "\n";
-            oldnames = oldnames + document.fmanager.elements[i].value + "\n";
-        }
-    }
-    if (newnames.charAt(newnames.length - 1) == "\n") {
-        newnames = newnames.substring(0, newnames.length - 1);
-    }
-    if (oldnames.charAt(oldnames.length - 1) == "\n") {
-        oldnames = oldnames.substring(0, oldnames.length - 1);
-    }
-    document.fmanager.new_names.value = newnames;
-    document.fmanager.old_names.value = oldnames;
-    document.fmanager.actionID.value = 'rename_folder';
-    document.fmanager.submit();
-    return true;
-}
-
-function toggleSelection()
-{
-    var total = 0;
-    var checked = 0;
-    for (var i = 0; i < document.fmanager.elements.length; i++) {
-        if (document.fmanager.elements[i].name == "folder_list[]") {
-            total++;
-            if (document.fmanager.elements[i].checked) {
-                checked++;
-            }
-        }
-    }  
-    
-    var new_value = (total != checked);
-    for (var i = 0; i < document.fmanager.elements.length; i++) {
-        if (document.fmanager.elements[i].name == "folder_list[]") {
-            document.fmanager.elements[i].checked = new_value;
-        }
-    }  
-}
-
-//-->
-</script>


--- templates/javascript/open_print_win.js
+++ /dev/null
@@ -1,25 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-
-function open_print_win(args)
-{
-    var url = "<?php echo Horde::url('message.php') ?>";
-    if (url.indexOf('?') == -1) {
-        var glue = '?';
-    } else {
-        var glue = '&';
-    }
-    var now = new Date();
-    var name = "compose_windows_" + now.getTime();
-    if (args != "") {
-        url = url + glue + args + "&uniq=" + now.getTime();
-    } else {
-        url = url + glue + "uniq=" + now.getTime();
-    }
-    param = "toolbar=yes,location=no,status=yes,scrollbars=yes,resizable=yes,width=630,height=650,left=0,top=0";
-    eval ("name = window.open(url, name, param)");
-    if (!eval("name.opener")) eval("name.opener = self");
-}
-
-// -->
-</script>


--- templates/pgp/.arch-ids/open_pgp_import.js.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.379


--- themes/graphics/.arch-ids/reply.png.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.468


‰PNG


1Ä¬y¨ÙMTk-—ž_|çD?‘w~`^dØÏœ

‰PNG


cV²ÏõÈ÷¥DÜŸ,ãBpâÖKÓ”BÂß¸vµåâÜ‰ã¸üÇ±E°Ø5/ó¥§T}ÓØŸrÓ‹Ôªo¬þóNÜìøEòC

--- templates/thread/.arch-ids/top.inc.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.408


--- lib/VFolder.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-require_once 'Horde/IMAP/Search.php';
-
-/**
- * The IMP_VFolder:: class provides the code necessary to handle virtual
- * folders in IMP.
- *
- * $Horde: imp/lib/VFolder.php,v 1.6.6.4 2005/07/03 03:42:43 selsky Exp $
- *
- * Copyright 2004-2005 Michael Slusarz <slusarz at curecanti.org>
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author  Michael Slusarz <slusarz at curecanti.org>
- * @since   IMP 4.0
- * @package IMP
- */
-class IMP_VFolder {
-
-    /**
-     * Obtains the list of virtual folders for the current user.
-     *
-     * @return mixed
-     */
-    function getVFolderList()
-    {
-        $vfolder = $GLOBALS['prefs']->getValue('vfolder');
-        return (empty($vfolder)) ? $vfolder : unserialize($vfolder);
-    }
-
-    /**
-     * Saves the list of virtual folders for the current user.
-     *
-     * @access private
-     */
-    function _saveVFolderList()
-    {
-        $vfolder = empty($_SESSION['imp']['vfolder']) ? '' : serialize($_SESSION['imp']['vfolder']);
-        $GLOBALS['prefs']->setValue('vfolder', $vfolder);
-    }
-
-    /**
-     * Add a virtual folder for the current user.
-     *
-     * @param object &$ob     A IMAP_Search_Query object.
-     * @param array &$search  The array of information used to build the
-     *                        search UI page.
-     *
-     * @return string  The virtual folder ID.
-     */
-    function addVFolder(&$ob, $search)
-    {
-        $id = base_convert(microtime() . mt_rand(), 10, 36);
-        $_SESSION['imp']['vfolder'][$id] = array(
-            'ob' => serialize($ob),
-            'search' => $search
-        );
-        IMP_VFolder::_saveVFolderList();
-
-        return $id;
-    }
-
-    /**
-     * Remove a virtual folder for the current user.
-     *
-     * @param string $id  The virtual folder ID to delete.
-     */
-    function deleteVFolder($id)
-    {
-        $id = IMP_VFolder::_stripIMPLabel($id);
-        if (!empty($_SESSION['imp']['vfolder'][$id])) {
-            unset($_SESSION['imp']['vfolder'][$id]);
-            IMP_VFolder::_saveVFolderList();
-        }
-    }
-
-    /**
-     * Return a list of IDs and VFolder labels, sorted by the label.
-     *
-     * @return array  An array with the folder IDs as the key and the labels
-     *                as the value.
-     */
-    function listVFolders()
-    {
-        $vfolders = array();
-
-        if (!empty($_SESSION['imp']['vfolder'])) {
-            foreach ($_SESSION['imp']['vfolder'] as $key => $val) {
-                $vfolders[$key] = $val['search']['vfolder_label'];
-            }
-            natcasesort($vfolders);
-        }
-
-        return $vfolders;
-    }
-
-    /**
-     * Set the necessary search parameters in the session given a virtual
-     * folder ID.
-     *
-     * @param string $id  The virtual folder ID.
-     */
-    function changeToVFolder($id)
-    {
-        $id = IMP_VFolder::_stripIMPLabel($id);
-        $query = unserialize($_SESSION['imp']['vfolder'][$id]['ob']);
-        $search = $_SESSION['imp']['vfolder'][$id]['search'];
-
-        require_once IMP_BASE . '/lib/Search.php';
-        IMP_Search::createSearchQuery($query, $search['folders'], $search, $search['vfolder_label'], $id);
-    }
-
-    /**
-     * Change the label on a vfolder.
-     *
-     * @param string $id     The virtual folder ID.
-     * @param string $label  The new label.
-     */
-    function relabelVFolder($id, $label)
-    {
-        $id = IMP_VFolder::_stripIMPLabel($id);
-        if (isset($_SESSION['imp']['vfolder'][$id]['search']['vfolder_label'])) {
-            $_SESSION['imp']['vfolder'][$id]['search']['vfolder_label'] = $label;
-            IMP_VFolder::_saveVFolderList();
-        }
-    }
-
-    /**
-     * Retrieve the UI query object for a given virtual folder ID.
-     *
-     * @param string $id  The virtual folder ID.
-     */
-    function retrieveUIQuery($id)
-    {
-        $id = IMP_VFolder::_stripIMPLabel($id);
-        if (isset($_SESSION['imp']['vfolder'][$id]['search'])) {
-            return $_SESSION['imp']['vfolder'][$id]['search'];
-        }
-    }
-
-    /**
-     * Returns a link to edit a given virtual folder ID.
-     *
-     * @param string $id  The virtual folder ID.
-     *
-     * @return string  The URL to the search page.
-     */
-    function editVFolderURL($id)
-    {
-        $id = IMP_VFOLDER_PREFIX . IMP_VFolder::_stripIMPLabel($id);
-        return Util::addParameter(Horde::applicationUrl('search.php'), array('edit_vfolder' => 1, 'vfolder' => $id));
-    }
-
-    /**
-     * Strip the IMP identifying label from a virtual folder ID.
-     *
-     * @access private
-     *
-     * @param string $id  The virtual folder ID.
-     *
-     * @return string  The virtual folder ID, with any IMP specific identifying
-     *                 information stripped off.
-     */
-    function _stripIMPLabel($id)
-    {
-        return (strpos($id, IMP_VFOLDER_PREFIX) === 0) ? substr($id, strlen(IMP_VFOLDER_PREFIX)) : $id;
-    }
-
-}


--- scripts/.arch-ids/singlescript.php.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.308


--- themes/graphics/.arch-ids/addressbook-blue.png.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.428


--- themes/graphics/.arch-ids/forward.png.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.447


--- templates/smime/.arch-ids/open_smime_win.js.id
+++ /dev/null
@@ -1,1 +0,0 @@
-Ola Lundqvist <opal at debian.org> Sun Feb 19 14:34:27 2006 19470.402


‰PNG



--- templates/thread/top.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-  <tr>
-    <td class="header" align="left"><b><?php echo _("Thread View") . ': ' . $subject ?></b></td>
-  </tr>
-</table>
-
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
-  <tr>
-    <td class="item">


--- orig/templates/folders/head.inc
+++ mod/templates/folders/head.inc
@@ -1,4 +1,4 @@
-<div class="header">
+<h1 class="header">
  <?php
     $refresh_title = _("Reload View");
     $refresh_ak = Horde::getAccessKey($refresh_title);
@@ -6,8 +6,8 @@
     if (!empty($refresh_ak)) {
         $refresh_title .= sprintf(_(" (Accesskey %s)"), $refresh_ak);
     }
-    echo _("Folder Navigator") . '&nbsp;' . Horde::link(Util::addParameter($folders_url, 'actionID', 'refresh_folders'), $refresh_title, 'smallheader', '', '', $refresh_title, $refresh_ak) . Horde::img('reload.png', _("Reload"), array('title' => $refresh_title), $registry->getImageDir('horde')) . '</a>';
+    echo _("Folder Navigator") . '&nbsp;' . Horde::link($folders_url, $refresh_title, '', '', '', $refresh_title, $refresh_ak) . Horde::img('reload.png', _("Reload"), null, $registry->getImageDir('horde')) . '</a>';
 ?>
-</div>
+</h1>
 <div class="headerbox folders">
 <form name="fmanager" method="post" action="<?php echo $folders_url ?>">


--- orig/po/it_IT.po
+++ mod/po/it_IT.po
@@ -6,176 +6,176 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Imp 4.0-cvs\n"
-"POT-Creation-Date: 2004-09-06 22:35+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2005-03-01 11:17+0100\n"
-"Last-Translator: jacopo <poedit at goracci.com>\n"
 "Last-Translator: Marco Pirovano <marco.pirovano at unibocconi.it>\n"
 "Language-Team: i18n at lists.horde.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      A: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      A: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Data: "
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    Da: "
 
-#: mailbox.php:466
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Chiave Accesso %s)"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Oggetto: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " in "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: mailbox.php:670
-#, php-format
-msgid "%.0fkb"
-msgstr "%.0fkb"
-
-#: lib/Block/summary.php:72
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:263
-#, php-format
-msgid "%d message(s) have been deleted."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "Nessun Messaggio"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
 msgstr "%d messaggio(i) sono stati eliminati."
 
-#: mailbox.php:253
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "%d messaggi sono stati segnalati come non-spam al tuo amministratore."
 
-#: mailbox.php:237
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d messaggi sono stati segnalati come non-spam."
 
-#: mailbox.php:247
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d messaggi sono stati segnalati come spam al tuo amministratore."
 
-#: mailbox.php:231
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d messaggi sono stati segnalati come spam."
 
-#: mailbox.php:435
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "da %d a %d di %d Messaggi"
 
-#: pgp.php:338
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s Amministrazione PGP"
-
-#: smime.php:174
+#: mailbox.php:640
 #, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s Amministrazione S/MIME"
+msgid "%s KB"
+msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s esiste già. La cartella %s non è stata rinominata."
 
-#: lib/Message.php:608
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s non sembra essere una casella valida."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "La cartella %s verrà rinominata ad inizio mese."
 
-#: lib/MIME/Viewer/itip.php:228
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr "%s ha accettato."
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
 msgstr "%s ha cancellato %s."
 
-#: lib/MIME/Viewer/itip.php:234
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
 msgstr "%s ha rifuitato."
 
-#: lib/MIME/Viewer/itip.php:455
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s ha risposto a una richiesta libero/occupato."
 
-#: lib/MIME/Viewer/itip.php:586
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s ha risposto al invito a %s."
 
-#: lib/MIME/Viewer/itip.php:444
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s ti ha mandato informazioni libero/occupato."
 
-#: lib/MIME/Viewer/itip.php:240
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s tentativi accettati."
 
-#: lib/MIME/Viewer/itip.php:449
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s richiede informazionsi sul tuo libero/occupato."
 
-#: lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s richiede la tua presenza a %s."
 
-#: lib/Message.php:398
-#, php-format
-msgid "%s was successfully added to %s."
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
 msgstr "%s spostato con successo a %s."
 
-#: lib/MIME/Viewer/itip.php:556
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr "%s vuole modificare %s."
 
-#: lib/MIME/Viewer/itip.php:534
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr "%s vorrebbe farti presente del %s."
 
-#: lib/MIME/Viewer/itip.php:561
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr "%s vorrebbe ricevere le utlime informazioni su %s."
 
-#: message.php:324 message.php:329
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -185,15 +185,24 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;di&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Effettua queste modifiche e passa alla finestra successiva.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Ignora tutte le modifiche e torna alla finestra Componi Messaggio.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+#, fuzzy
+msgid "(HTML)"
+msgstr "HTML"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -202,7 +211,7 @@
 "modifiche fatte finora.  Le modifiche a questa finestra NON verranno "
 "effettuate.)"
 
-#: spelling.php:274
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -215,54 +224,55 @@
 msgid "* Add these by clicking OK *"
 msgstr "* Aggiungili cliccando su OK *"
 
-#: templates/contacts/contacts.inc:207
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Seleziona gli indirizzi *"
 
-#: mailbox.php:255
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Il messaggio è stato eliminato."
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 "1 messaggio è stato segnalato come non spam al tuo amministratore di sistema."
 
-#: mailbox.php:239
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
 msgstr "1 messaggio è stato segnalato come non spam."
 
-#: mailbox.php:249
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr ""
 "1 messaggio è stato segnalato come spam al tuo amministratore di sistema."
 
-#: mailbox.php:233
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
 msgstr "1 messaggio è stato segnalato come spam"
 
-#: config/prefs.php.dist:770
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100 caratteri"
 
-#: config/prefs.php.dist:773
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000 caratteri"
 
-#: config/prefs.php.dist:771
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250 caratteri"
 
-#: config/prefs.php.dist:772
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500 caratteri"
 
-#: lib/MIME/Viewer/itip.php:62
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>I dati di calnedario non sono validi</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Un immagine grossa nominata %s è allegata a questo messaggio."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -272,121 +282,126 @@
 msgid "AND"
 msgstr "E"
 
-#: lib/MIME/Viewer/itip.php:549
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr "Accetta Richieste"
 
-#: lib/MIME/Viewer/itip.php:742
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "L'evento è stato aggiunto al tuo calendario."
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr "Accettato"
 
-#: templates/menu/menu.inc:38 templates/menu/menu.inc:40
-msgid "Acco_unts"
-msgstr "Acco_unts"
+#: lib/MIME/Viewer/itip.php:257
+#, fuzzy
+msgid "Accepted: "
+msgstr "Accettato"
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Nome dell'account:"
 
-#: lib/MIME/Viewer/itip.php:480 lib/MIME/Viewer/itip.php:719
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
 msgstr "Azioni"
 
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Aggiungi alla Rubrica (%s)"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Aggiungi sorgente"
 
-#: lib/MIME/Viewer/itip.php:537 lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr "Aggiungi al mio calendario"
 
-#: lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Aggiungi alla Rubrica (%s)"
-
-#: compose.php:1055
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" aggiunto come allegato."
 
-#: config/prefs.php.dist:188
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "Intestazioni addizionali da mostrare in visualizzazione: <i>(opzionale, "
 "inserire ogni intestazione in una nuova linea)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Ulteriori informazioni possono essere visualizzate %s"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Ulteriori Informazioni Personale"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Ulteriori dettagli del messaggio"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Ulteriori dettagli del messaggio possono essere visualizzati %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Ulteriori dettagli del messaggio d'errore"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr ""
 "Ulteriori dettagli del messaggio d'errore possono essere visualizzati %s"
 
-#: contacts.php:95 templates/contacts/contacts.inc:174
-#: templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: config/prefs.php.dist:124
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Rubriche"
 
-#: config/prefs.php.dist:179
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "Invia a BCC tutti i messaggi: <i>(opzionale, inserisci ogni indirizzo in una "
 "nuova riga)</i>"
 
-#: config/prefs.php.dist:171
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Indirizzi da legare esplicitamente a questa identità: <i>(opzionale, "
 "inserisci ogni indirizzo in una nuova riga"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:774
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "Tutti"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Tutti i messaggi contenuti nella/e cartella/e andrano persi!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Tutti i messaggi delle seguenti cartelle saranno scaricati in un file MBOX:"
 
-#: lib/Maintenance/Task/purge_trash.php:86
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -395,45 +410,45 @@
 "Tutti i messaggi nella cartella \"%s\", più vecchi di %s giorni, saranno "
 "eliminati per sempre."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr ""
 "Tutte le cartelle di Posta Inviata più vecchie di %s mesi saranno cancellate."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Tutte le cartelle di Posta Inviata più vecchie di %s mesi saranno cancellate."
 
 #: acl.php:85
-#, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
 "Tutti i diritti sulla cartella '%s' sono stati rimossi per l'utente '%s'"
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Permetti applicazione filtri in ogni Casella"
 
-#: templates/mailbox/legend.inc:29
-msgid "Alternative"
-msgstr "Alternativi"
-
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Parti alternative per questa sezione:"
 
-#: config/prefs.php.dist:556 config/prefs.php.dist:568
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "Sempre"
 
-#: config/prefs.php.dist:541
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Salva sempre gli allegati"
 
-#: lib/Message.php:491
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -441,68 +456,62 @@
 "Errore durante il tentativo di ottenere l'allegato. Il server IMAP ha "
 "risposto: "
 
-#: compose.php:927 message.php:221
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Si è verificato un errore sconosciuto aggiungendo la nuova voce."
 
-#: lib/Message.php:385
+#: lib/Message.php:387
 msgid "An unknown error occured while creating the new task."
 msgstr "Si è verificato un errore sconosciuto aggiungendo la nuova voce."
 
-#: mailbox.php:752 message.php:539 templates/message/navbar_navigate.inc:9
-#: templates/mailbox/legend.inc:16 templates/mailbox/navbar.inc:18
-#: templates/mailbox/navbar.inc:35
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Risposto"
 
-#: templates/search/main.inc:30
+#: templates/search/main.inc:31
 msgid "Answered messages"
 msgstr "Messaggi a cui si è risposto"
 
-#: templates/smime/smime.inc:58
-msgid "Any Additional Signing Certificate"
-msgstr "Certificati di Firma aggiuntivi"
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Applica i Filtri a"
 
-#: templates/mailbox/header.inc:9
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Applica i Filtri a"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Applica le regole del filtro a inizio sessione."
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Applica le regole del filtro ogni volta che INBOX è mostrato?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Sei SICURO di voler continuare?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Sei proprio sicuro di voler continuare?"
-
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Sicuro di voler cancellare questa chiave pubblica?"
 
-#: templates/smime/smime.inc:69 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
 "Sei sicuro di voler eliminare questa regola? (Questo NON è raccomandato!)"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Sei sicuro di volerlo fare?"
 
-#: message.php:447 templates/mailbox/javascript.inc:63
-#: templates/folders/javascript.inc:71
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Sei sicuro di voler cancellare PER SEMPRE questi messaggi?"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:215
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Sicuro di voler cancellare PERMANENTEMENTE questo allegato?"
 
@@ -510,7 +519,12 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Sei sicuro di voler svuotare il questa cartella?"
 
-#: templates/menu/menu.inc:29
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Sei sicuro di voler svuotare il Cestino?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Sei sicuro di voler svuotare il Cestino?"
 
@@ -518,43 +532,44 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Sicuro di voler cancellare PERMANENTEMENTE questi messaggi?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Sei sicuro di voler segnalare questo messaggio come corretto?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Sei sicuro di voler segnalare questo messaggio come spam?"
 
-#: config/prefs.php.dist:869
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Orario di arrivo"
 
-#: config/prefs.php.dist:884
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Crescente"
 
-#: config/prefs.php.dist:555 config/prefs.php.dist:567
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Chiedi"
 
-#: templates/compose/compose.inc:533
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Allega"
 
-#: templates/compose/compose.inc:473
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "File Allegato:"
+
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Includi copia della tua chiave pubblica PGP al messaggio?"
 
-#: templates/compose/compose.inc:350
-msgid "Attach_ments"
-msgstr "Alle_gati"
-
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "File Allegato:"
 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -562,36 +577,37 @@
 "La dimandione del file allegato \"%s\" è superiore a quella consentita. File "
 "non allegato."
 
-#: lib/MIME/Viewer/itip.php:344
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Allegato un file iCalendar in risposta alla vostra richiesta."
 
-#: mailbox.php:784 templates/mailbox/legend.inc:27
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:519
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Allegato"
 
-#: compose.php:878 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
 msgstr "Allegato strippato: Tipo originale dell'allegato"
 
-#: templates/compose/compose.inc:490 lib/Compose.php:1024
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Allegati"
 
-#: lib/MIME/Viewer/itip.php:671
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Partecipanti"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Attenzione"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Estensione IMAP Richiesta non trovata."
 
-#: config/prefs.php.dist:625
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -603,52 +619,65 @@
 msgid "Available Address books:"
 msgstr "Rubriche disponibili:"
 
-#: lib/MIME/Viewer/itip.php:707
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr "In attesa di Risposta"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Torna a %s"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Torna a %s"
 
-#: message.php:300 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Ccn"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Qui sotto è il testo completo dello messaggio informativo."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Lista nera"
 
-#: config/prefs.php.dist:613
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Blocca immagini nei messaggi HTML fino a che non specificatamente richiesto"
 
-#: search.php:157
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Corpo"
 
-#: templates/search/main.inc:23 templates/search/main.inc:38
-#: templates/search/main.inc:53 templates/search/main.inc:68
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Entrambe"
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
 msgstr "Sia lista delle intestazioni che del corpo del Messaggio"
 
-#: templates/compose/compose.inc:293
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "C_odice caratteri"
 
@@ -656,15 +685,15 @@
 msgid "Calendar"
 msgstr "Calendario"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "Impossibile connettersi al server di posta remoto."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "Impossibile connettersi al server di posta remoto: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -673,45 +702,52 @@
 "Impossibile Visualizzare - trovato solo %s di %s parti di questo messaggio "
 "nella Casella corrente"
 
-#: templates/smime/import_key.inc:57 templates/smime/passphrase.inc:22
-#: templates/pgp/import_key.inc:57 templates/pgp/passphrase.inc:32
-#: templates/folders/import.inc:21 templates/contacts/contacts.inc:252
-#: templates/compose/spelling.inc:106
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Annulla"
 
-#: templates/compose/compose.inc:80 templates/compose/compose.inc:452
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Annulla Messaggio"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
 "Annullando questo messaggio si perderà il suo contenuto definitivamente."
 
-#: message.php:299 search.php:145 templates/contacts/contacts.inc:222
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:689
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
 msgstr "Moderatore"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Modifica"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Cambia Tutti"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Cambia Cartella"
 
-#: config/prefs.php.dist:108
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -730,24 +766,24 @@
 "Modifica nome, indirizzo, e firma che verranno visualizzati dalle persone "
 "che leggono e rispondono ai tuoi messaggi."
 
-#: config/prefs.php.dist:775
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
 msgstr "Caratteri da mostrare:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Controlla se è arrivata Nuova Posta"
 
-#: templates/mailbox/message_headers.inc:65 templates/folders/actions.inc:2
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Seleziona Tutti/Nessuno"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr ""
 "Controlla tutti i server di posta dai quali vuoi scaricare i nuovi messaggi:"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Controllo ortografico prima di mandare un messaggio?"
 
@@ -755,15 +791,21 @@
 msgid "Choose Action:"
 msgstr "Scegli Azione:"
 
-#: config/servers.php.dist:164
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Scegli un server di posta:"
 
-#: lib/MIME/Viewer/itip.php:481 lib/MIME/Viewer/itip.php:720
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Seleziona o scrivi nella casella a destra:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
 msgstr "Seleziona un azione:"
 
-#: templates/prefs/sourceselect.inc:350
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Scegli la rubrica da utilizzare quando aggiungi indirizzi."
 
@@ -772,33 +814,44 @@
 msgstr ""
 "Scegli l'ordine in cui ricercare le rubriche quando espandi gli indirizzi"
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Clicca %s per convertire l'immagine in un formato compatibile con il tuo "
 "browser"
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Clicca %s per scaricare l'immagine."
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/Filter.php:106
+#, fuzzy, php-format
+msgid "Click %s to go to %s management page."
+msgstr "Clicca %s per scaricare l'immagine."
+
+#: lib/MIME/Viewer/html.php:116
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Clicca %s per vedere contenuto HTML in una finestra separata."
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr "Clicca %s per vedere il thumbnail di questa immagine"
+msgstr "iClicca %s per vedere il thumbnail di questa immagine"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Click here to HIDE the Images"
-msgstr "Clicca qui per NASCONDERE le immagini"
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Clicca %s per vedere contenuto HTML in una finestra separata."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Clicca %s per vedere contenuto HTML in una finestra separata."
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
 msgstr "Clicca qui per MOSTRARE le immagini"
 
@@ -808,48 +861,49 @@
 "search."
 msgstr "Scegli una delle tue rubriche, e seleziona tutti i campi da ricercare."
 
-#: lib/MIME/Viewer/pgp.php:174
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Clicca per salvare la chiave PGP nella tua Rubrica."
 
-#: lib/MIME/Viewer/pkcs7.php:208
-msgid "Click to Save S/MIME certificate in your Address book"
+#: lib/MIME/Viewer/pkcs7.php:202
+#, fuzzy, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "Clicca per salvare certificato S/MIME nella tua rubrica"
 
-#: config/prefs.php.dist:919
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
 "Cliccando sull'indirizzo si comporra un nuovo messaggio per il mittente"
 
-#: config/prefs.php.dist:920
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
 msgstr "Cliccando sull'indirizzo si aprirà il messaggio"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Chiudi"
 
-#: templates/compose/success.inc:4
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: folders.php:354
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Cartella Chiusa"
 
-#: folders.php:369
+#: folders.php:449
 msgid "Collapse"
 msgstr "Riduci"
 
-#: templates/folders/actions.inc:32
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Richiudi tutte"
 
-#: templates/folders/actions.inc:32
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Richiudi tutte le cartelle"
 
-#: folders.php:369
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Richiudi cartella"
 
@@ -857,32 +911,23 @@
 msgid "Color Indicator: "
 msgstr "Indicatore del Colore:"
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Commento"
 
-#: lib/MIME/Viewer/itip.php:758
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
 msgstr "Completato"
 
-#: lib/Block/summary.php:19
-msgid "Compose"
-msgstr "Componi"
-
-#: mailbox.php:814 lib/MIME/Headers.php:196
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Componi Messaggio (%s)"
-
-#: templates/compose/success.inc:3
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Componi un altro messaggio"
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Utilizza una nuova finestra per comporre un messaggio."
 
-#: config/prefs.php.dist:438
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -894,31 +939,40 @@
 msgid "Configure how messages are displayed."
 msgstr "Configura come visualizzare i messaggi."
 
-#: config/prefs.php.dist:93
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Configura opzioni anteprima posta."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Connessione al server fallita"
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Connessione al server fallita"
 
-#: config/prefs.php.dist:133
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Verifica supporto PGP per %s."
 
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Controlla supporto S/MIME per %s."
 
-#: config/prefs.php.dist:85
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "Gestisci il controllo e la notifica della Posta in Arrivo."
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Converti Emoticon testuali in grafiche"
 
@@ -926,59 +980,83 @@
 msgid "Copy"
 msgstr "Copia"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Copia alla cartella"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corretto"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Testo Corretto"
 
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Non posso creare il backend VFS: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Non posso creare il backend VFS: %s"
 
-#: lib/Message.php:599
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr ""
 "Impossibile cancellare messaggi da %s. Questo è il messaggio del server: %s"
 
-#: lib/Session.php:270
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
 msgstr "Impossibile eseguire le operazioni di manutenzione."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Impossibile estrarre il file richiesto dall'allegato MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:68
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Impossibile estrarre il file richiesto dall'archivio Zip."
 
-#: templates/fetchmail/account_select.inc:26 templates/fetchmail/manage.inc:67
-#: templates/acl/acl.inc:39 templates/acl/acl.inc:157
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "Crea"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Crea Cartella"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Crea Chiavi"
 
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Cartella Virtuale"
+
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Altri Account di Posta"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Crea una nuova cartella Cestino"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Crea una nuova cartella Bozze"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Crea una nuova cartella di Posta Inviata"
 
@@ -986,7 +1064,7 @@
 msgid "Create a new trash folder"
 msgstr "Crea una nuova cartella Cestino"
 
-#: config/prefs.php.dist:118
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -994,12 +1072,21 @@
 "Crea i filtri per organizzare la posta in entrata, distribuirla in cartelle, "
 "ed eliminare lo spamming."
 
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Crea una nuova cartella di Posta Inviata"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Accesso corrente a %s"
 
-#: config/prefs.php.dist:101
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Personalizza account per scaricare posta da altri account."
 
@@ -1012,106 +1099,142 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Imposta le operazioni da eseguire quando entri in %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Dat_a"
 
-#: message.php:296 thread.php:72
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Data"
 
-#: lib/MIME/Viewer/itip.php:746
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Rifiutato"
 
-#: config/prefs.php.dist:876
+#: lib/MIME/Viewer/itip.php:263
+#, fuzzy
+msgid "Declined: "
+msgstr "Rifiutato"
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Elimina"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Criteri di ordinamento di default:"
 
-#: config/prefs.php.dist:886
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Direzione di ordinamento di default:"
 
-#: lib/MIME/Viewer/itip.php:754
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
 msgstr "Delegato"
 
-#: templates/pgp/pgp.inc:93 templates/message/navbar_actions.inc:6
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/fetchmail/manage.inc:68 templates/contacts/contacts.inc:243
-#: templates/compose/attachments.inc:28
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Elimina %s Chiave Pubblica"
 
-#: templates/smime/smime.inc:69 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Elimina Chiavi Attuali"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Elimina Cartella(e)"
 
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Elimina Cartella(e)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Elimina Cartella(e)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Cartella Virtuale"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Elimina messaggi scaricati dal server remoto?"
 
-#: config/prefs.php.dist:354
+#: lib/MIME/Viewer/itip.php:628
+#, fuzzy
+msgid "Delete from my calendar"
+msgstr "Rimuovi dal mio calendario"
+
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Elimina le vecchie cartelle di Posta Inviata ad inizio mese."
 
-#: config/prefs.php.dist:336
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Elimina le vecchie cartelle di Posta Inviata ad inizio mese."
 
-#: config/prefs.php.dist:603
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Elimina messaggi SPAM dopo che questi sono stati segnalati come spam?"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Messaggi eliminati"
 
-#: mailbox.php:774 message.php:542 templates/mailbox/legend.inc:20
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: templates/search/main.inc:60
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Messaggi eliminati"
 
-#: compose.php:1079
+#: compose.php:307
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Allegato \"%s\" eliminato."
 
-#: config/prefs.php.dist:76
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Gestione e cancellazione dei Messaggi"
 
-#: lib/MIME/Viewer/itip.php:551
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Nega richiesta"
 
-#: lib/MIME/Viewer/itip.php:500
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
 msgstr "Nega richiesta per informazioni libero/occupato"
 
-#: config/prefs.php.dist:885
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Decrescente"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:659
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Descrizione"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Dettagli"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Differenzia la firma dal testo."
 
@@ -1119,20 +1242,26 @@
 msgid "Display"
 msgstr "Visualizza"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Mostra conferma dopo invio messaggio?"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Mostra nel Corpo del Messaggio"
 
-#: config/prefs.php.dist:750
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Notifica con un pop-up quando arriva Nuova Posta."
 
-#: config/prefs.php.dist:715
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Mostra il link 'Svuota Cestino' nella barra menu?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Mostra il link 'Svuota Cestino' nella barra menu?"
 
 #: templates/compose/attachments.inc:11
@@ -1143,23 +1272,27 @@
 msgid "Do NOT match"
 msgstr "Non corrisponde"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Non controllare l'arrivo di Nuova Posta nella cartella(e)"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
 msgstr "Non generare un link nella colona Da:"
 
-#: lib/IMP.php:847
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Vuoi aprire quella cartella?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Fatto"
 
-#: lib/MIME/Contents.php:200
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Scarica %s in formatto .zip"
@@ -1168,25 +1301,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Scarica Tutti gli Allegati (in un file .zip)"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Scarica Cartella(e)"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Scarica Cartella(e) [formatto .zip]"
 
-#: lib/MIME/Contents.php:200
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
 msgstr "Scarica in formatto .zip"
 
-#: mailbox.php:757 message.php:540 templates/message/navbar_navigate.inc:11
-#: templates/mailbox/legend.inc:22 templates/mailbox/navbar.inc:22
-#: templates/mailbox/navbar.inc:41
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Bozza"
 
-#: folders.php:333
+#: folders.php:392
 msgid "Draft folder"
 msgstr "Cartella bozze"
 
@@ -1194,39 +1327,58 @@
 msgid "Drafts folder:"
 msgstr "Cartella bozze:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Indirizzo E-mail"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "E"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "ERRORE: Impossibile consegnare il messaggio."
 
-#: templates/filters/prefs.inc:21
+#: folders.php:420 templates/stationery/prefs.inc:19
+msgid "Edit"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Modifica la Lista Nera"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
 
-#: templates/filters/prefs.inc:26
+#: folders.php:420 templates/search/header.inc:16
+#, fuzzy
+msgid "Edit Virtual Folder"
+msgstr "Cartella Virtuale"
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Modifica la Lista Bianca"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Modifica la tua lista nera"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Modifica le tue regole di filtro"
 
-#: config/prefs.php.dist:812
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Modifica le tue preferenze per accedere ad altri account di posta."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Modifica la tua lista bianca"
 
@@ -1234,65 +1386,80 @@
 msgid "Email Address"
 msgstr "Indirizzo Email"
 
-#: lib/Message.php:616
+#: lib/Message.php:657
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Tutti messaggi eliminati da %s"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Svuota Cartella(e)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Svuota Cartella(e)"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Svuota la cartella Cestino"
 
-#: templates/menu/menu.inc:29
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Svuota _Cestino"
+
+#: lib/IMP.php:966
 msgid "Empty _Trash"
 msgstr "Svuota _Cestino"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Abilita Funzionalità PGP?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:15
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Abilita funzionalità S/MIME?"
 
-#: config/prefs.php.dist:762
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
 msgstr "Attiva Anteprima Messaggi?"
 
-#: templates/compose/compose.inc:459
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
 msgstr "Opzioni Crip_taggio"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:647
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Fine"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Fine messaggio inoltrato."
 
-#: lib/Compose.php:262
+#: lib/Compose.php:341
 msgid "End message"
 msgstr "FIne Messaggio"
 
-#: lib/Compose.php:260
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
 msgstr "Fine messaggio da %s"
 
-#: templates/smime/smime.inc:54 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Inserisci Parola Chiave"
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Iserisci il nome della una nuova cartella Cestino"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Inserisci il nome della nuova cartella Bozze"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Inserisci il nome della nuova cartella di Posta Inviata"
 
@@ -1300,115 +1467,101 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Iserisci il nome della una nuova cartella Cestino"
 
-#: compose.php:929 message.php:223
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Consegna il Messaggio ad un altro indirizzo."
+
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "I dati \"%s\" sono stati aggiunti alla Rubrica con successo"
 
-#: templates/pgp/pgp.inc:84 lib/MIME/Viewer/pgp.php:393
-#: lib/MIME/Viewer/pkcs7.php:185 lib/MIME/Viewer/status.php:75
-#: lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Errore"
 
-#: lib/Fetchmail/hotmail.php:228
-msgid "Error 403: Request was forbidden."
-msgstr "Errore 403: Richiesta non autorizzata."
-
-#: lib/Fetchmail/hotmail.php:232
-msgid "Error 503: Service is unavailable."
-msgstr "Errore 503: Servizio non disponibile."
-
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:373
-#, php-format
-msgid "Error sending reply: %s."
-msgstr "Errore nell'invio della risposta: %s."
-
-#: lib/Fetchmail/hotmail.php:242
+#: lib/IMAP/Client.php:454
 #, php-format
-msgid ""
-"Error: Had to make %d requests, check username and password or increase "
-"request count limit."
+msgid "Error connecting to IMAP server. %s : %s."
 msgstr ""
-"Errore: Effettuate %d richieste, verificare username e password oppure "
-"incrementare il limite numero richieste."
 
-#: lib/Fetchmail/hotmail.php:235
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
-msgid "Error: Unrecognized HTTP status was recieved: %s."
-msgstr "Errore: Rivecuto codice HTTP non conosciuto: %s."
-
-#: lib/Fetchmail/hotmail.php:263
-msgid "Error: fsockopen() failed."
-msgstr "Errore: fsockopen() fallita."
-
-#: lib/Fetchmail/hotmail.php:261
-#, php-format
-msgid "Error: fsockopen() failed. Error no: %s. Error string %s."
-msgstr "Errore: fsockopen() fallita. Errore nr: %s. Errore %s."
+msgid "Error sending reply: %s."
+msgstr "Errore nell'invio della risposta: %s."
 
-#: lib/MIME/Viewer/itip.php:93
-msgid "Event successfully removed."
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
 msgstr "Evento rimosso con successo."
 
-#: config/prefs.php.dist:740
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Ogni 15 minuti"
 
-#: config/prefs.php.dist:737
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Ogni 30 secondi"
 
-#: config/prefs.php.dist:739
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Ogni 5 minuti"
 
-#: config/prefs.php.dist:741
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Ogni mezz'ora"
 
-#: config/prefs.php.dist:738
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Ogni minuto"
 
-#: folders.php:377
+#: folders.php:457
 msgid "Expand"
 msgstr "Espandi"
 
-#: templates/folders/actions.inc:31
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Espandi Tutte"
 
-#: templates/folders/actions.inc:31
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Espandi Tutte le Cartelle"
 
-#: folders.php:377
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Espandi Cartella"
 
-#: templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Espandi Nomi"
 
-#: config/prefs.php.dist:1043
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Espandi i nomi nella finestra di composizione automaticamente?"
 
-#: config/prefs.php.dist:973
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Espandi tutte le cartelle nella visualizzazione predefinita."
 
-#: templates/compose/compose.inc:165 templates/compose/compose.inc:215
-#: templates/compose/compose.inc:266 templates/compose/redirect.inc:104
-msgid "Expanding ..."
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
 msgstr "Apertura..."
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:100
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Scarica Posta"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Scarica Posta"
 
-#: config/prefs.php.dist:821
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "Scarica messaggi in una finestra separata?."
 
@@ -1416,72 +1569,88 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Scarica Messaggi ad ogni accesso?"
 
-#: lib/Fetchmail.php:306
-#, php-format
-msgid "Fetched %d message(s) from %s"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Scaricato %d messaggi da %s"
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
 msgstr "Scaricato %d messaggi da %s"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
 msgstr "Scaricamento Posta:"
 
-#: templates/menu/menu.inc:44
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Hai %s nuovi messaggi."
+
+#: lib/IMP.php:990
 msgid "Fi_lters"
 msgstr "Fi_ltri"
 
-#: templates/compose/compose.inc:515
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "File"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Opzioni Filtri"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Impostazioni Filtri"
 
-#: config/prefs.php.dist:585
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "Controlla se nei messaggi ci sono parole offensive."
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Supporto filtri è disabilitato su questo sistema."
 
-#: config/prefs.php.dist:117
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtri"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filtri NON Attivi"
 
-#: templates/contacts/contacts.inc:182
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Trova"
 
-#: config/prefs.php.dist:858
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
 msgstr "Prima Pagina della Mailbox"
 
-#: mailbox.php:407
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Prima Pagina"
 
-#: templates/mailbox/actions.inc:21
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
 msgid "Fo_rward"
 msgstr "In_oltra"
 
-#: folders.php:237 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Esplora le cartelle"
 
-#: templates/login/login.inc:215
-msgid "Folder Prefix"
-msgstr "Prefisso di Cartella"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Sommario Cartella"
@@ -1490,83 +1659,70 @@
 msgid "Folder sharing is not enabled."
 msgstr "Condivisione cartelle non abilitato."
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
 msgstr "Uso di cartelle non è abilitato."
 
-#: lib/Crypt/SMIME.php:213 lib/Crypt/PGP.php:650
-msgid ""
-"For message encryption, there can only be one recipient in the To: field."
-msgstr ""
-"Per il criptaggio del messaggio vi può essere solo un destinatario nel campo "
-"A:."
-
-#: config/prefs.php.dist:962
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Formato della data del messaggio nella mailbox per i messaggi di oggi"
 
-#: config/prefs.php.dist:947
-msgid ""
-"Format of message dates in the mailbox view for messages not dated today"
-msgstr ""
-"Formato della data del messaggio nella mailbox per i messaggi non di oggi"
-
-#: compose.php:584 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Inoltra"
 
-#: compose.php:569
+#: compose.php:765
 msgid "Forward:"
 msgstr "Inoltra:"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Messaggio Inoltrato"
 
-#: lib/Compose.php:288
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Messaggio inoltrato da %s"
 
-#: lib/MIME/Viewer/itip.php:445
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
 msgstr "Informazione Libero/Occupato"
 
-#: lib/MIME/Viewer/itip.php:456
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr "Risposta Libero/Occupato"
 
-#: lib/MIME/Viewer/itip.php:450
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
 msgstr "Richiesta Libero/Occupato"
 
-#: lib/MIME/Viewer/itip.php:367
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
 msgstr "Risposta a richiesta Libero/Occupato"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "D_a"
 
-#: message.php:297 search.php:137 thread.php:73
-#: templates/contacts/contacts.inc:186 templates/compose/compose.inc:108
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Da"
 
-#: config/prefs.php.dist:871
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "Da Indirizzo"
 
-#: compose.php:581 compose.php:585
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Inoltro:"
 
-#: compose.php:1105
+#: compose.php:1294
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#: compose.php:1107
+#: compose.php:1296
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u Messaggi Inoltrati"
@@ -1580,28 +1736,39 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Ottieni solo nuovi messaggi? (solo IMAP)"
 
-#: thread.php:65
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Vai al Messaggio"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Aggiungi alla Rubrica (%s)"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr "Assegna Accesso"
 
-#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/html.php:114
-#: lib/MIME/Viewer/images.php:93 lib/MIME/Viewer/images.php:94
-#: lib/MIME/Viewer/images.php:96 lib/MIME/Viewer/images.php:149
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/pgp.php:176 lib/MIME/Viewer/status.php:123
-#: lib/MIME/Viewer/status.php:130
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "QUI"
 
-#: lib/MIME/Viewer/html.php:115
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:261
+#: compose.php:256
 msgid "HTML Version of Message"
 msgstr "Versione HTML del Messaggio"
 
@@ -1613,139 +1780,162 @@
 msgid "Here is the message you were composing:"
 msgstr "Messaggio che stavi componendo:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
 msgstr "Nascosto nella Visualizzazione per Argomento"
 
-#: mailbox.php:429
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Nascondi Eliminati"
 
-#: folders.php:232
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Cancella non sottoscritti"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Hide the Images"
-msgstr "Nascondi le Immagini"
-
-#: templates/compose/compose.inc:315
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Alta"
 
-#: message.php:336
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Priorità alta"
 
-#: templates/compose/compose.inc:314
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Altissima"
 
-#: lib/Fetchmail/hotmail.php:50
-msgid "Hotmail Accounts"
-msgstr "Account Hotmail"
-
-#: config/prefs.php.dist:673
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Come vuoi mostrare gli allegati?"
 
-#: config/prefs.php.dist:488
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Come attribuire le linee citate in una risposta"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Protocol Automatico)"
 
-#: templates/login/login.inc:190 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP via SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP via SSL (certficato auto-firmato)"
 
-#: templates/login/login.inc:191
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP via SSL (auto-firmato)"
 
-#: templates/login/login.inc:189 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Tipo Server di Posta per il collegamento:"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, senza TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 Server di Posta"
 
-#: folders.php:325
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Tutti i messaggi contenuti nella/e cartella/e andrano persi!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignora"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignora Tutti"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importa"
 
-#: templates/smime/import_key.inc:16
-msgid "Import Additional (signing) Certificate"
-msgstr "Importa Certificati di firma addizionali."
-
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importa Chiave"
 
-#: templates/smime/smime.inc:85 templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Importa Chiave PGP"
 
-#: pgp.php:46
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "Messaggi importanti"
+
+#: pgp.php:42
 msgid "Import PGP Key"
 msgstr "Importa Chiave PGP"
 
-#: templates/pgp/import_key.inc:16
-msgid "Import Personal Private PGP Key"
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
 msgstr "Importa Chiave Personale Privata PGP"
 
-#: templates/smime/import_key.inc:14
-msgid "Import Personal Private S/MIME Key"
-msgstr "Importa Chiave Personale Privata S/MIME"
-
 #: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr "Importa Chiave Personale Privata PGP"
+
+#: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
 msgstr "Importa Chiave Personale Pubblica PGP"
 
-#: templates/smime/import_key.inc:12
-msgid "Import Personal Public S/MIME Key"
+#: templates/smime/import_key.inc:4
+#, fuzzy
+msgid "Import Personal S/MIME Certificates"
 msgstr "Importa Chiave Personale Pubblica S/MIME"
 
-#: templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Importa Chiave Pubblica"
 
-#: templates/pgp/import_key.inc:12
+#: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
 msgstr "Importa Chiave Pubblica PGP"
 
+#: templates/smime/import_key.inc:8
+#, fuzzy
+msgid "Import Public S/MIME Key"
+msgstr "Importa Chiave Personale Pubblica S/MIME"
+
 #: smime.php:16
 msgid "Import S/MIME Key"
 msgstr "Importa chiave S/MIME"
 
-#: templates/folders/actions.inc:23 templates/folders/import.inc:9
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "Importa File mbox"
 
@@ -1754,102 +1944,106 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Importa File mbox %s nella cartella %s."
 
-#: mailbox.php:762 mailbox.php:768 message.php:541
-#: templates/message/navbar_navigate.inc:7 templates/mailbox/legend.inc:18
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Importante"
 
-#: templates/search/main.inc:45
+#: templates/search/main.inc:47
 msgid "Important messages"
 msgstr "Messaggi importanti"
 
-#: folders.php:149
+#: folders.php:167
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Importati %d messaggi da %s."
 
-#: lib/MIME/Viewer/itip.php:762
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr "In Processo"
 
-#: config/prefs.php.dist:902
-msgid ""
-"In the Mailbox view, 'From:' columns longer than this value will be "
-"truncated."
-msgstr ""
-"Nella Mailbox, il campo 'Da:' verrà troncato se maggiore di questo valore"
-
-#: config/prefs.php.dist:910
-msgid ""
-"In the Mailbox view, 'Subject:' columns longer than this value will be "
-"truncated."
-msgstr ""
-"Nella Mailbox, il campo 'Oggetto:' verrà troncato se maggiore di questo "
-"valore"
-
-#: lib/Folder.php:248 lib/IMP.php:304
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
 msgstr "Posta in Arrivo"
 
-#: config/prefs.php.dist:476
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Includi un breve sommario delle intestazioni nella risposta?"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Includi il messaggio originale nella risposta."
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Info"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Informazioni sulla Chiave Pubblica %s"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Informazioni sulla Chiave Pubblica Privata"
 
-#: templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Informazioni sulla Chiave Pubblica Personale"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:520
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "In linea"
 
-#: templates/smime/import_key.inc:27 templates/pgp/import_key.inc:27
-msgid "Insert Key Here"
+#: templates/smime/import_key.inc:9
+#, fuzzy
+msgid "Insert Certificate Here"
 msgstr "Inserisci chiave qui"
 
-#: lib/MIME/Viewer/itip.php:378
+#: templates/pgp/import_key.inc:15
+#, fuzzy
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Importa Chiave Personale Privata PGP"
+
+#: templates/pgp/import_key.inc:10
+#, fuzzy
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Importa Chiave Personale Pubblica PGP"
+
+#: templates/pgp/import_key.inc:5
+#, fuzzy
+msgid "Insert Public PGP Key Here"
+msgstr "Importa Chiave Pubblica PGP"
+
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
 msgstr "Azione invalida per questo componente."
 
-#: mailbox.php:614 mailbox.php:655
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
 msgstr "Indirizzo Invalido"
 
-#: lib/Fetchmail/hotmail.php:102 lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Casella di posta remota invalida"
 
-#: compose.php:142
-msgid "Invalid character in e-mail address."
+#: compose.php:158
+#, fuzzy, php-format
+msgid "Invalid character in e-mail address: %s."
 msgstr "Carattere non valido nell'indirizzo e-mail."
 
-#: pgp.php:18
+#: smime.php:82 pgp.php:16
 msgid "Invalid key"
 msgstr "Chiave invalida"
 
-#: pgp.php:202
+#: pgp.php:196
 msgid "Invalid personal PGP private key."
 msgstr "Chiave Privata PGP personale invalida."
 
-#: pgp.php:178
+#: pgp.php:171
 msgid "Invalid personal PGP public key."
 msgstr "Chiave Pubblica PGP personale invalida."
 
@@ -1857,47 +2051,68 @@
 msgid "Invert"
 msgstr "Inverta"
 
-#: templates/compose/compose.inc:591
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Lunghezza chiave"
 
-#: pgp.php:324
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr "Chiave inviata con successo al server pubblico."
 
-#: templates/login/login.inc:243
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Lingua"
 
-#: config/prefs.php.dist:859
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
 msgstr "Ultima Pagina dell Cartella"
 
-#: mailbox.php:420
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Ultima Pagina"
 
-#: templates/compose/compose.inc:403
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
 msgstr "Collegame_nto Allegati"
 
-#: attachment.php:34 lib/Compose.php:1014
+#: attachment.php:34 lib/Compose.php:1063
 msgid "Linked attachments are forbidden."
 msgstr "Il collegamento agli allegati non è permesso"
 
-#: config/prefs.php.dist:1062
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
-"Carica tutti i contatti quando mostri schermo contatti? (se disabilitato "
+"Carica tutti i contatti quando mostri schermo conatti? (se disabilitato "
 "vedrai solo i contatti che ricerchi esplicitamente)"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Lista nell'Intestazione"
 
@@ -1905,20 +2120,20 @@
 msgid "Local Mailbox:"
 msgstr "Casella di Posta locale:"
 
-#: lib/MIME/Viewer/itip.php:664
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
 msgstr "Luogo"
 
-#: templates/login/login.inc:251
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "Entra"
 
-#: lib/Block/summary.php:118
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "Entra in %s"
 
-#: templates/login/login.inc:158
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "Entra"
 
@@ -1926,27 +2141,27 @@
 msgid "Login Tasks"
 msgstr "Operazioni da eseguire a inizio sessione"
 
-#: templates/compose/compose.inc:317
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Bassa"
 
-#: message.php:338
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Priorità Bassa"
 
-#: templates/compose/compose.inc:318
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Minimo"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "File Macintosh"
 
-#: pgp.php:338 smime.php:174 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Posta"
 
-#: config/prefs.php.dist:92
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Anteprime di Posta"
 
@@ -1954,19 +2169,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Tipo Server di Posta per il collegamento:"
 
-#: folders.php:343
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Casella di Posta"
 
-#: config/prefs.php.dist:107
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Opzioni di Visualizzazione di Cartelle"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Contrassegna tutti i messaggi nella cartella come letti"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Contrassegna tutti i messaggi nella cartella come non letti"
 
@@ -1974,7 +2189,7 @@
 msgid "Mark as:"
 msgstr "Contrassegna come:"
 
-#: config/prefs.php.dist:635
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Mostra i vari livelli di citazione con colori diversi."
 
@@ -1982,51 +2197,56 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Segna messaggi come visti? (solo IMAP)"
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
-msgstr "Utilizza simple markup?"
+msgstr ""
 
-#: templates/search/header.inc:37
+#: templates/search/header.inc:46
 msgid "Match All Queries"
 msgstr "Combacia Tutte le Domande"
 
-#: templates/search/header.inc:33
+#: templates/search/header.inc:42
 msgid "Match Any Query"
 msgstr "Combacia Una Domanda"
 
-#: templates/compose/compose.inc:527
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
 msgstr "Massima Dimensione degli Allegati"
 
-#: templates/compose/compose.inc:506
+#: lib/api.php:79
+#, fuzzy
+msgid "Maximum Number of Folders"
+msgstr "Il numero massimo di allegati è stato raggiunto."
+
+#: templates/compose/compose.inc:494
 msgid "Maximum number of attachments reached."
 msgstr "Il numero massimo di allegati è stato raggiunto."
 
-#: templates/compose/compose.inc:501
+#: templates/compose/compose.inc:489
 msgid "Maximum total attachment size reached."
 msgstr "Il totale massimo di allegati è stato raggiunto."
 
-#: lib/MIME/Viewer/itip.php:607
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
 msgstr "Cancellazione Riunione"
 
-#: lib/MIME/Viewer/itip.php:535
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
 msgstr "Informazioni Riunione"
 
-#: lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
 msgstr "Proposta Riunione"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Risposta Riunione"
 
-#: lib/MIME/Viewer/itip.php:557
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
 msgstr "Aggiornamento Riunione"
 
-#: lib/MIME/Viewer/itip.php:562
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
 msgstr "Richiesta aggiornamento Riunione"
 
@@ -2034,32 +2254,32 @@
 msgid "Menu Folder List"
 msgstr "Lista Cartella"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Messaggio"
 
-#: compose.php:386 compose.php:413 compose.php:446 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Composizione Messaggio"
 
-#: config/prefs.php.dist:870
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Data Messaggio"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:75
-#: config/prefs.php.dist:83 config/prefs.php.dist:91 config/prefs.php.dist:99
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Opzioni Messaggi"
 
-#: search.php:305
+#: search.php:312
 msgid "Message Search"
 msgstr "Ricerca Messaggio"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Dimensione Messaggio"
 
-#: message.php:424
+#: message.php:384
 msgid "Message Source"
 msgstr "Intestazioni Messaggio"
 
@@ -2067,45 +2287,56 @@
 msgid "Message Viewing"
 msgstr "Visualizzazione Messaggio"
 
-#: templates/search/header.inc:45
-msgid "Message fields"
-msgstr "Campi del messaggio"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Contrassegni del messaggio"
 
-#: templates/search/main.inc:79
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Cartelle"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:329
 #, php-format
 msgid "Message from %s"
 msgstr "Messaggio da %s"
 
-#: templates/search/header.inc:24
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Messaggi trovati"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Campi del messaggio"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Campi del messaggio"
+
+#: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Messaggi trovati"
 
-#: compose.php:627 compose.php:637
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
 msgstr "Messaggio reindirizzato con successo."
 
-#: compose.php:894
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Messaggio inviato con successo, ma non salvato in %s"
 
-#: compose.php:938 compose.php:949
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "Messaggio inviato con successo."
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Numero di messaggi per pagina nella visualizzazione della cartella."
 
-#: mailbox.php:384
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Messaggi a"
 
@@ -2114,8 +2345,8 @@
 msgstr "Modifica"
 
 #: templates/compose/expand.inc:12
-#, php-format
-msgid "More than one address found for field '%s'."
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
 msgstr "Più di un indirizzo trovato per il campo '%s'."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2126,7 +2357,11 @@
 msgid "Move down"
 msgstr "Sposta giù"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Sposta alla cartella"
 
@@ -2134,52 +2369,73 @@
 msgid "Move up"
 msgstr "Sposta su"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/pgp/pgp.inc:24 templates/fetchmail/manage.inc:48
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Visualizzazione Messaggio"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "NOTA"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "NOTA"
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:676
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nome"
 
-#: pgp.php:118
+#: pgp.php:110
 msgid "Name and/or email can not be empty"
 msgstr "Nome e/o email non possono essere vuoti"
 
-#: lib/MIME/Viewer/itip.php:767
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
 msgstr "Azione Necessaria"
 
-#: config/prefs.php.dist:554 config/prefs.php.dist:566
-#: config/prefs.php.dist:736
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Mai"
 
-#: config/prefs.php.dist:544
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Allegato mai salvati"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Nuovo"
 
-#: lib/IMP.php:505
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Nuova Cartella"
 
-#: config/prefs.php.dist:84
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nuova Posta"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Messaggio Successivo"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Nuovi messaggi"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nuovi messaggi"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Successivo"
 
@@ -2187,15 +2443,15 @@
 msgid "Next Message"
 msgstr "Messaggio Successivo"
 
-#: mailbox.php:418
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Pagina Successiva"
 
-#: templates/compose/compose.inc:556 config/prefs.php.dist:970
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "No"
 
-#: smime.php:154
+#: smime.php:226
 msgid "No Certificate found"
 msgstr "Nessun certificato trovato"
 
@@ -2203,92 +2459,120 @@
 msgid "No Encryption"
 msgstr "Nessun Criptaggio"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Nessuna chiave nel Keyring"
 
-#: mailbox.php:437
+#: mailbox.php:375
+#, php-format
 msgid "No Messages"
 msgstr "Nessun Messaggio"
 
-#: pgp.php:145
+#: pgp.php:137
 msgid "No PGP public key imported."
 msgstr "Nessuna chiave PGP importata."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: templates/smime/smime.inc:84
+#, fuzzy
+msgid "No Personal Certificate Present"
+msgstr "Nessun certificato trovato"
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Anteprima"
+
+#: templates/smime/smime.inc:15
+#, fuzzy
+msgid "No Public Keys Found"
+msgstr "La tua chiave pubblica"
+
+#: smime.php:151
+#, fuzzy
+msgid "No S/MIME public key imported."
+msgstr "Nessuna chiave pubblica S/MIME importata."
+
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Nessun Allegato Trovato"
 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Informazioni sulla Chiave Pubblica %s"
+
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
 msgstr "Nessuna cartella selezionata."
 
-#: lib/Block/summary.php:131
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
 msgstr "Nessuna cartella selezionata per nuova posta."
 
-#: folders.php:198 lib/Folder.php:579 lib/Folder.php:630
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Non sono state specificate cartelle"
 
-#: lib/Block/summary.php:137
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
 msgstr "Nessuna cartella con dei nuovi messaggi"
 
-#: lib/Block/summary.php:134
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
 msgstr "Nessuna cartella con dei messaggi non visti."
 
-#: lib/Compose.php:231
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "Nessun testo del corpo messaggio."
 
-#: lib/Mailbox.php:1134
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
 msgstr "Nessun messaggio corrispondente trovato."
 
-#: pgp.php:196
+#: pgp.php:189
 msgid "No personal PGP private key imported."
 msgstr "Nessuna chiave privata PGP importata."
 
-#: pgp.php:173
+#: pgp.php:165
 msgid "No personal PGP public key imported."
 msgstr "Nessuna chiave pubblica PGP importata."
 
-#: smime.php:135
-msgid "No personal S/MIME private key imported."
+#: smime.php:201
+#, fuzzy
+msgid "No personal S/MIME certificates imported."
 msgstr "Nessuna chiave privata S/MIME importata."
 
-#: smime.php:123
-msgid "No personal S/MIME public key imported."
-msgstr "Nessuna chiave pubblica S/MIME importata."
-
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Nessun programma di controllo ortografico configurato."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Nessun errore di ortografia"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Nessun suggerimento"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 msgid "No user specified."
 msgstr "Nessun utente specificato."
 
-#: lib/MIME/Viewer/itip.php:697
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr "Non Partecipante"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/mailbox/navbar.inc:11 lib/MIME/Viewer/itip.php:654
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Nessuno"
 
-#: templates/compose/compose.inc:316
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normale"
 
@@ -2310,39 +2594,45 @@
 msgid "Not Personal"
 msgstr "Non Personale"
 
-#: lib/Crypt/SMIME.php:176 lib/Crypt/SMIME.php:185 lib/Crypt/PGP.php:154
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Chiave pubblica non valida."
 
-#: templates/search/main.inc:64
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Messaggi non eliminati"
 
-#: templates/search/main.inc:49
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Messaggi non importanti"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Nota che questo puo' richedere un po' di tempo"
 
-#: config/prefs.php.dist:363
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Scrive"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Quanti mesi conservare vecchi allegati se impostata eliminazione mensile"
 
-#: config/prefs.php.dist:345
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Numero di vecchie cartelle di Posta Inviata da mantenere se vengono "
 "eliminate mensilmente."
 
-#: templates/contacts/contacts.inc:251 lib/MIME/Viewer/itip.php:512
-#: lib/MIME/Viewer/itip.php:722
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "O"
 
@@ -2350,51 +2640,48 @@
 msgid "Old messages"
 msgstr "Vecchi messaggi"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Eliminazione delle vecchie cartelle di Posta Inviata."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
 msgid "Only display folders with unread messages in them?"
 msgstr "Mostra solo cartelle con messeggi non letti?"
 
-#: templates/folders/javascript.inc:76
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
 msgstr "Solo una cartella può essere selezionato per questa azione"
 
-#: templates/menu/menu.inc:93 templates/menu/menu.inc:94
-msgid "Ope_n Folder"
-msgstr "A_pri Cartella"
-
-#: templates/menu/menu.inc:84 templates/menu/menu.inc:87
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Apri Cartella"
 
-#: folders.php:352
+#: folders.php:427
 msgid "Opened Folder"
 msgstr "Cartella Aperta"
 
-#: lib/MIME/Viewer/itip.php:693
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
 msgstr "Partecipante opzionale"
 
-#: templates/compose/compose.inc:331
-msgid "Options"
-msgstr "Opzioni"
-
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Altri Account di Posta"
 
-#: config/prefs.php.dist:106 config/prefs.php.dist:116
-#: config/prefs.php.dist:123 config/prefs.php.dist:131
-#: config/prefs.php.dist:140
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Altre Opzioni"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:294
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
@@ -2402,46 +2689,42 @@
 msgid "PGP Encrypt Message"
 msgstr "Cripta Messaggio PGP"
 
-#: compose.php:722
+#: compose.php:358
 msgid "PGP Error: "
 msgstr "Errore PGP: "
 
-#: compose.php:699
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr ""
 "Errore PGP: è necessaria una parola chiave per la chiave privata personale."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP NON attivo"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:132
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "Opzioni PGP"
 
-#: pgp.php:34
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "Input Parola Chiave PGP"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Il supporto della chiave PGP necessita di una connessione sicura."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
 msgstr "Test Chiave PGP Pubblica"
 
-#: pgp.php:157
+#: pgp.php:149
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "La chiave Pubblica PGP per \"%s (%s)\" è stata aggiunta con successo."
 
-#: pgp.php:251
+#: pgp.php:245
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "La Chiave Pubblica PGP per \"%s\" è stata eliminata con successo."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Chiave Pubblica PGP"
 
@@ -2453,19 +2736,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Firma/Cripta messaggio PGP"
 
-#: pgp.php:208
+#: pgp.php:202
 msgid "PGP private key successfully added."
 msgstr "Chiave privata PGP aggiunta con successo."
 
-#: pgp.php:184
+#: pgp.php:177
 msgid "PGP public key successfully added."
 msgstr "Chiave pubblica PGP aggiunta con successo."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Supporto PGP disabilitato sul sistema."
 
-#: lib/MIME/Viewer/pgp.php:212
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2473,56 +2756,57 @@
 "Il supporto PGP non è attivo, per cui è impossibile verificare la firma "
 "elettronica."
 
-#: lib/MIME/Viewer/pgp.php:299
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "Il supporto PGP non è attivo, per cui è impossibile decriptare il messaggio."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
+#, fuzzy
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "Il supporto PGP necessita di utlizzare finestre popup. Se il tuo browser è "
 "settato per non utilizzare finestre popup, devi modificare le impostazioni "
 "del browser o le funzioni PGP non funzioneranno correttamente"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Protocollo Automatico)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 via SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 via SSL (certificato auto-firmato)"
 
-#: templates/login/login.inc:193
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 via SSL (auto-firmato)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, senza TLS"
 
-#: templates/mailbox/header.inc:21
+#: templates/mailbox/header.inc:19
 #, php-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: config/prefs.php.dist:856
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
 msgstr "Pagina con il Primo Messaggio Non Visto"
 
-#: config/prefs.php.dist:857
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
 msgstr "Pagina con l'Ultimo Messaggio Non Visto"
 
@@ -2530,31 +2814,32 @@
 msgid "Part(s)"
 msgstr "Parte(i)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Parola chiave"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Parola chiave (ancora)"
 
-#: pgp.php:316 smime.php:162
+#: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
 msgstr "Parola chiave scaricata con successo."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Parola chiave:"
 
-#: pgp.php:120
+#: pgp.php:112
 msgid "Passphrases can not be empty"
 msgstr "Le parole chiave non possono essere vuote"
 
-#: pgp.php:122
+#: pgp.php:114
 msgid "Passphrases do not match"
 msgstr "La parole chiave non corrispondono"
 
-#: templates/login/login.inc:237 templates/fetchmail/manage.inc:20
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Password"
 
@@ -2566,8 +2851,8 @@
 msgid "Permissions for this user can not be changed."
 msgstr "I permessi per questo utente non possono essere modificati."
 
-#: mailbox.php:741 message.php:532 templates/mailbox/legend.inc:24
-#: templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Personale"
 
@@ -2575,35 +2860,47 @@
 msgid "Personal Information"
 msgstr "Informazioni Personali"
 
-#: pgp.php:128
+#: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
 msgstr "Coppia chiavi PGP generata con successo."
 
-#: pgp.php:135
+#: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
 msgstr "Chiave personale PGP cancellata con successo."
 
-#: smime.php:112
+#: smime.php:207
+#, fuzzy
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Nessuna chiave privata S/MIME importata."
+
+#: smime.php:132
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Chiave personale S/MIME cancellata con successo."
 
-#: config/prefs.php.dist:212
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Inserisci la tua firma prima di risposte e inoltri."
 
-#: compose.php:259
+#: compose.php:254
 msgid "Plaintext Version of Message"
 msgstr "Mostra Versione Solo Testo del Messaggio"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Inserisci un nome per la nuova cartella:"
 
-#: templates/folders/javascript.inc:107 templates/folders/javascript.inc:109
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Inserisci il nome della nuova cartella:"
 
-#: templates/folders/javascript.inc:152
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Inserisci il nuovo nome:"
 
@@ -2625,32 +2922,27 @@
 "Per cortesia inserisci la password per la tua chiave privata S/MIME. Dovrai "
 "inserirla solo una volta per %s sessione."
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
 "log in again in your main window as well. This is to keep attackers from "
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
-"Prego collegati nuovamente per riprendere la composizione del messaggio. Se "
-"non stai usando i cookies e stai componendo messaggi in una finestra di "
-"popup, dovrai ricollegarti nuovamente anche nella finestra principale. "
-"Questo per evitare che estranei possano entrare in possesso del tuo ID di "
-"sessione. Ci scusiamo per l'inconveniente."
 
-#: templates/login/login.inc:93
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Inserisci la tua password."
 
-#: templates/login/login.inc:89
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Inserisci il tuo nome utente."
 
-#: compose.php:74 lib/IMP.php:447
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Correggi gli indirizzi ambigui o non validi."
 
-#: lib/MIME/Viewer/itip.php:634
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -2658,11 +2950,11 @@
 "Rivedi le seguenti informazioni, e poi selezione un'azione dal menu qui "
 "sotto "
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Seleziona una cartella prima di eseguire una azione."
 
-#: lib/MIME/Viewer/itip.php:464
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
 msgstr "Seleziona un'azione dal menu qui sotto."
 
@@ -2670,24 +2962,23 @@
 msgid "Please select at least one folder to search."
 msgstr "Seleziona almeno una cartella in cui cercare."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Seleziona solo una cartella per questa operazione."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Seleziona o scrivi nella casella a destra:"
 
-#: templates/compose/compose.inc:137 templates/compose/compose.inc:187
-#: templates/compose/compose.inc:238
-msgid "Please select or edit right next:"
-msgstr "Seleziona o scrivi vicino:"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
 
-#: config/prefs.php.dist:204
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Fai precedere la tua firma da trattini ('-- ')?"
 
-#: filterprefs.php:40 pgp.php:263 smime.php:167
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Preferenze aggiornate con successo."
 
@@ -2699,11 +2990,11 @@
 msgid "Previous Message"
 msgstr "Messaggio Precedente"
 
-#: mailbox.php:409
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Pagina Precedente"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Stampa"
 
@@ -2711,15 +3002,16 @@
 msgid "Priority"
 msgstr "Priorità"
 
-#: templates/menu/menu.inc:60
-msgid "Problem"
-msgstr "Problema?"
+#: templates/smime/import_key.inc:76
+#, fuzzy
+msgid "Private Key Password"
+msgstr "La tua chiave privata"
 
-#: config/prefs.php.dist:543
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Richiedi ogni volta che viene inviato un allegato; default NO"
 
-#: config/prefs.php.dist:542
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Richiedi ogni volta che viene inviato un allegato; default SI"
 
@@ -2727,69 +3019,77 @@
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: lib/Crypt/PGP.php:451
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Supporto server pubblico PGP disabilitato"
 
-#: templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Pur_ge Deleted"
 msgstr "Ri_muovi Eliminati"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:9
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Rimuovi Eliminati"
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Svuota Cartella(e)"
 
-#: config/prefs.php.dist:382
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Ogni quanto svuotare il Cestino:"
 
-#: config/prefs.php.dist:391
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Elimina i messaggi dalla cartella Cestino più vecchi di giorni."
 
-#: config/prefs.php.dist:372
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Elimina vecchi messaggi nella cartella Cestino?"
 
-#: lib/Maintenance/Task/purge_trash.php:63
-#, php-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
 msgstr "Sto eliminando %d messaggio(i) dal Cestino."
 
-#: config/prefs.php.dist:413
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "Inserisci questo dopo @ quando si invia email con espansione indirizzi"
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Sto eliminando %d messaggio(i) dal Cestino."
 
 #: templates/quota/quota.inc:17
 #, php-format
 msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
 msgstr "Status Quota: %.2fMB / %.2fMB  (%.2f%%)"
 
-#: templates/quota/quota.inc:20
+#: templates/quota/quota.inc:21
+#, fuzzy, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "Status QUota: Ness Limite"
+
+#: templates/quota/quota.inc:24
+#, php-format
 msgid "Quota status: NO LIMIT"
 msgstr "Status QUota: Ness Limite"
 
-#: config/prefs.php.dist:484
-msgid "Quoting"
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Scrive"
 
-#: templates/compose/compose.inc:397
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
 msgstr "Richiedi una Conferma di Consegna"
 
-#: search.php:161
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "Ricevuto il"
 
-#: search.php:169
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Ricevuto dal"
 
-#: search.php:165
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Ricevuto Prima del"
 
@@ -2801,35 +3101,40 @@
 msgid "Redirect"
 msgstr "Reindirizza"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Consegna il Messaggio ad un altro indirizzo."
 
-#: compose.php:591
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Consegna questo Messaggio ad un altro indirizzo."
 
-#: compose.php:646
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "La consegna del Messaggio ad un altro indirizzo non ha funzionato."
 
-#: templates/compose/compose.inc:597
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: config/prefs.php.dist:742
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Aggiorna l'elenco della cartella:"
 
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Aggiorna Visualizzazione"
+
 #: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Aggiorna Visualizzazione"
 
-#: lib/MIME/Viewer/itip.php:486 lib/MIME/Viewer/itip.php:505
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
 msgstr "Ricorda le informazioni libero/occupato."
 
-#: config/prefs.php.dist:972
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Ricorda l'ultima visualizzazione"
 
@@ -2841,23 +3146,19 @@
 msgid "Remove Field From Search"
 msgstr "Rimuovi il campo dalla ricerca"
 
-#: lib/MIME/Viewer/itip.php:609
-msgid "Remove from my calendar"
-msgstr "Rimuovi dal mio calendario"
-
 #: templates/prefs/sourceselect.inc:305
 msgid "Remove source"
 msgstr "Elimina la sorgente"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Rinomina Cartella/e"
 
-#: config/prefs.php.dist:327
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Rinomina la cartella di Posta Inviata ad inizio mese?"
 
-#: lib/Folder.php:538
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -2868,7 +3169,7 @@
 msgid "Repl_y to List"
 msgstr "Rispondi alla Lista"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Sostituisci con:"
 
@@ -2876,7 +3177,7 @@
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/MIME/Viewer/itip.php:281 lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
 msgstr "Risposta Inviata"
 
@@ -2884,7 +3185,7 @@
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
-#: compose.php:538
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Rispondi a Tutti:"
 
@@ -2892,7 +3193,7 @@
 msgid "Reply to List"
 msgstr "Rispondi alla Lista"
 
-#: compose.php:540
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "Rispondi alla Lista:"
 
@@ -2900,103 +3201,106 @@
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: lib/MIME/Viewer/itip.php:488 lib/MIME/Viewer/itip.php:497
-#: lib/MIME/Viewer/itip.php:507
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
 msgstr "Rispondi con Messaggio Non Supportato"
 
-#: lib/MIME/Viewer/itip.php:495
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Rispondi con libero/occupato per i prossimi 2 mesi."
 
-#: lib/MIME/Viewer/itip.php:494
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Rispondi con le informazioni libero/occupato richieste"
 
-#: message.php:301
+#: message.php:267
 msgid "Reply-To"
 msgstr "Rispondi-A"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Rispondi-A: "
 
-#: compose.php:536
+#: compose.php:731
 msgid "Reply:"
 msgstr "Rispondi:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Segnala come Non-Spam"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Segnala come Spam"
 
-#: templates/compose/compose.inc:391
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "Richiedi una Ricevuta di Lettura"
 
-#: config/prefs.php.dist:569
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
 msgstr "Richiedi una conferma di consegna?"
 
-#: config/prefs.php.dist:557
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Richiedi una ricevuta di lettura?"
 
-#: lib/MIME/Viewer/itip.php:685
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
 msgstr "Partecipanti Richiesto"
 
-#: templates/search/header.inc:19 templates/search/main.inc:105
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Azzera"
 
-#: lib/MIME/Viewer/itip.php:107
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
 msgstr "Stato del Rispondente Aggiornato."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Recupera"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Continua la tua sessione"
 
-#: templates/fetchmail/account_select.inc:32
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Composizione Messaggio"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "Ritorna a Scarica Posta"
 
-#: templates/smime/smime.inc:98 templates/pgp/pgp.inc:268
-#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
-msgid "Return to Main Preferences Screen"
-msgstr "Torna alla videata principale Preferenze"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
 msgstr "Torna all'Opzioni."
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Ritorna alla Schermata Precedente"
-
-#: config/prefs.php.dist:696
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Torna all'elenco dei messaggi dopo aver eliminato, spostato, o copiato un "
 "messaggio."
 
-#: lib/MIME/Viewer/itip.php:676
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Ruolo"
 
-#: lib/MIME/Viewer/pkcs7.php:130 lib/MIME/Viewer/pkcs7.php:206
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3004,15 +3308,16 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Cripta messaggio S/MIME"
 
-#: compose.php:737
+#: compose.php:394
+#, fuzzy
+msgid "S/MIME Error: "
+msgstr "Errore PGP: "
+
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "Errore S/MIME: è necessaria la parola chiave per la chiave privata."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME NON attivo"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:141
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "Opzioni S/MIME"
 
@@ -3020,12 +3325,27 @@
 msgid "S/MIME Passphrase Input"
 msgstr "Input Parola chiave S/MIME"
 
-#: templates/smime/smime.inc:41
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "Il supporto della coppia di chiavi S/MIME richiede una connessione sicura."
 
 #: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "La Chiave Pubblica PGP per \"%s\" è stata eliminata con successo."
+
+#: smime.php:162
+#, fuzzy
+msgid "S/MIME Public Key successfully added."
+msgstr "Coppia di chiavi pubblica/privata S/MIME aggiunta con successo."
+
+#: templates/smime/smime.inc:10
+#, fuzzy
+msgid "S/MIME Public Keyring"
+msgstr "Chiave Pubblica PGP"
+
+#: smime.php:211
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Coppia di chiavi pubblica/privata S/MIME aggiunta con successo."
 
@@ -3037,15 +3357,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Firma/Cripta messaggio S/MIME"
 
-#: lib/MIME/Viewer/pkcs7.php:217
-msgid "S/MIME certificate details:"
-msgstr "Dettagli del certificasto S/MIME:"
-
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Il supporto S/MIME è disabilitato sul sistema."
 
-#: lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3053,7 +3369,16 @@
 "Il supporto S/MIME non è abilitato, pertanto il messaggio non può essere "
 "decriptato."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:173
+#, fuzzy
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+"Il supporto S/MIME non è abilitato, pertanto la firma digitale non può "
+"essere verificata."
+
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3061,49 +3386,78 @@
 "Il supporto S/MIME non è abilitato, pertanto la firma digitale non può "
 "essere verificata."
 
-#: templates/compose/compose.inc:276
+#: templates/smime/smime.inc:2
+#, fuzzy
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+"Il supporto PGP necessita di utlizzare finestre popup. Se il tuo browser è "
+"settato per non utilizzare finestre popup, devi modificare le impostazioni "
+"del browser o le funzioni PGP non funzioneranno correttamente"
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "O_ggetto"
 
-#: templates/compose/compose.inc:366
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Sal_va una copia in "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Sal_va con Nome"
 
-#: templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Salva"
 
-#: templates/compose/compose.inc:552
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Salva Allegati con messaggio nella cartella sent-mail"
 
-#: templates/compose/compose.inc:78 templates/compose/compose.inc:450
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Salva Bozza"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:25
-#: templates/pgp/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/filters/prefs.inc:69
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Salva con Nome"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Salva Opzioni"
 
-#: templates/compose/compose.inc:78 templates/compose/compose.inc:450
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Salva Opzioni"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
 msgstr "Salva la _Bozza"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Salva con Nome"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Salva le bozze come non viste?"
 
-#: config/prefs.php.dist:1052
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "Salve i destinatari automaticamente alla rubrica default?"
 
@@ -3111,30 +3465,31 @@
 msgid "Save search as a virtual folder?"
 msgstr "Salva la ricerca come una cartella virtuale?"
 
-#: config/prefs.php.dist:221
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Salva posta inviata?"
 
-#: compose.php:1027
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Non è stato possibile salvare la bozza. Codice del server: %s"
 
-#: templates/search/header.inc:18 templates/search/main.inc:104
-#: templates/contacts/contacts.inc:196
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
-msgstr "Ricerca"
+msgstr "RiCerca"
 
-#: templates/search/header.inc:11 templates/mailbox/header.inc:12
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Ricerca %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Ricerca Messaggio"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Salva Opzioni"
 
-#: lib/IMP.php:306
+#: search.php:265
 msgid "Search Results"
 msgstr "Risultati della Ricerca"
 
@@ -3154,15 +3509,20 @@
 msgid "Select a date"
 msgstr "Seleziona una data"
 
-#: templates/search/fields.inc:11
+#: templates/search/fields.inc:10
 msgid "Select a field"
 msgstr "Seleziona un campo"
 
-#: config/prefs.php.dist:125
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Seleziona una data"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Seleziona le fonti della rubrica per aggiungere e cercare indirizzi."
 
-#: templates/search/main.inc:84
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Seleziona tutto"
 
@@ -3175,10 +3535,14 @@
 msgid "Select an account"
 msgstr "Seleziona un'account"
 
-#: templates/search/main.inc:85
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Deseleziona tutto."
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Seleziona un tipo di server"
@@ -3187,32 +3551,32 @@
 msgid "Selected Address books:"
 msgstr "Rubriche Selezionate:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Invia chiave al server pubblico"
 
-#: lib/MIME/Viewer/itip.php:563
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
-msgstr "Invia Ultime Informazioni"
-
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Invia MDM quando richiesto dal mandante?"
+msgstr "AInvia Ultime Informazioni"
 
-#: templates/compose/compose.inc:76 templates/compose/compose.inc:448
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Invia Messaggio"
 
-#: folders.php:338
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
 msgid "Sent mail folder"
 msgstr "Cartella di posta inviata"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Cartella di posta inviata"
 
-#: templates/login/login.inc:154 templates/login/login.inc:168
-#: templates/login/login.inc:175
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Server"
 
@@ -3224,12 +3588,12 @@
 msgid "Server:"
 msgstr "Server:"
 
-#: config/prefs.php.dist:77
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 "Imposta le azioni da eseguire quando si spostano o eliminano i messaggi."
 
-#: config/prefs.php.dist:514
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Configura l'intestazione X-Priority quando invii messaggio?"
 
@@ -3245,32 +3609,35 @@
 msgid "Share your mail folders with other users."
 msgstr "Condividi la cartella di posta con altri utenti."
 
-#: config/prefs.php.dist:654
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
-"Si desidera visualizzare di default blocchi grandi di testo quotato?Può "
-"essere modificato facilmente quando si vuole."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Il corpo dei messaggi di testo deve essere controllato per dati PGP?"
 
-#: config/prefs.php.dist:497
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Chiudi la finestra Componi dopo aver salvato una Bozza."
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 "La tua chiave PGP pubblica deve essere allegata ai messaggi di default?"
 
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Mostra tutte le Intestazioni"
+
 #: templates/message/headers.inc:67
 msgid "Show All Headers"
 msgstr "Mostra tutte le Intestazioni"
 
-#: mailbox.php:427
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Mostra Eliminati"
 
@@ -3282,207 +3649,246 @@
 msgid "Show Mailing List Information"
 msgstr "Mostra Infomazioni della Mailing List"
 
-#: lib/MIME/Viewer/pkcs7.php:213
-msgid "Show S/MIME certificate details."
-msgstr "Mostra dettagli del certificato S/MIME."
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Sottoscrivi a Cartella/e"
 
-#: folders.php:232
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Mostra i Non sottoscritti"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Mostra un'icona per permettere lo stripping degli allegati?"
 
-#: config/prefs.php.dist:996
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Mostra la legenda dei colori nella visualizzazione della cartella."
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
 msgstr "Mostra anteprima solo per messaggi non letti?"
 
-#: config/prefs.php.dist:799
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
 msgstr "Mostra preview in tooltips?"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Mostra l'icona Fetch Mail nella barra menu?"
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:95
 msgid "Show the Images"
 msgstr "Mostra le Immagini"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Mostra l'icona di filtro nella barra menu?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
 msgstr "Mostra il numero totale di messagi nella cartella?"
 
-#: config/prefs.php.dist:651
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "Mostra"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Di_mensione"
 
-#: templates/login/login.inc:257
-msgid "Sign up if not registered"
-msgstr "Iscriviti se non sei registrato"
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Dimensione"
 
 #: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Dimensione"
 
-#: templates/mailbox/message_headers.inc:3
-msgid "Sort Direction"
-msgstr "Direzione di Ordinamento"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Ordina per Arrivo"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Ordina per Data"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Ordina per Mittente"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Ordina per Dimensione Messaggio"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Ordina per Oggetto"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Ordina per Thread"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Ordina per Destinatario"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Cartella ppam:"
 
-#: templates/compose/compose.inc:347
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Caratteri Speciali"
 
-#: templates/compose/compose.inc:344
-msgid "Spell Chec_k"
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
+#, fuzzy
+msgid "Spell Check"
 msgstr "Controllo Ortogra_fico"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Controllo Ortografico"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Controllo ortografico completato"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Numero di errori ortografici per ogni schermata."
 
-#: lib/MIME/Viewer/itip.php:472 lib/MIME/Viewer/itip.php:642
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr "Avvio"
 
-#: lib/MIME/Viewer/itip.php:676
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Statis"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:215
 msgid "Strip Attachment"
 msgstr "Strippa Allegato"
 
-#: config/prefs.php.dist:783
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
 msgstr "Elimina Interruzioni di Linea?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "O_ggetto"
 
-#: message.php:302 search.php:153 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Oggetto"
 
-#: config/prefs.php.dist:873
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "Campo Oggetto"
 
-#: templates/smime/passphrase.inc:21 templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Invio"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Sottoscrivi a Cartella/e"
 
-#: lib/MIME/Viewer/pgp.php:396 lib/MIME/Viewer/pkcs7.php:188
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Successo"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Suggerimenti"
 
-#: lib/MIME/Viewer/itip.php:652 lib/MIME/Viewer/itip.php:654
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Breve Riassunto"
 
-#: templates/compose/compose.inc:417 templates/compose/compose.inc:420
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
 msgstr "Modifica Metodo di Composizione"
 
-#: templates/compose/compose.inc:421
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
 msgstr "Vai a composizione HTML"
 
-#: templates/compose/compose.inc:421
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
 msgstr "Vai a composizione solo testo"
 
-#: templates/compose/compose.inc:436
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "Te_sto"
 
-#: lib/MIME/Viewer/itip.php:550
+#: lib/MIME/Viewer/itip.php:269
+#, fuzzy
+msgid "Tentative: "
+msgstr "Accettato provissoriamente."
+
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
 msgstr "Richiesta di accettazione provvisoria"
 
-#: lib/MIME/Viewer/itip.php:750
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
 msgstr "Accettato provissoriamente."
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "File dei Termini d'Utilizzo non specificato in conf.php"
 
-#: config/prefs.php.dist:923
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "Te_sto"
+
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
 msgstr "La colonna Da: del messaggio deve essere collegata:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, fuzzy
 msgid "The Macintosh resource fork"
-msgstr "La sezione risorse"
+msgstr "Il file originale puo' essere scaricato %s."
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
-msgstr "La sezione risorse puo' essere scaricata %s."
+msgstr "Il file originale puo' essere scaricato %s."
 
 #: fetchmailprefs.php:81
 #, php-format
@@ -3494,16 +3900,16 @@
 msgid "The account \"%s\" has been saved."
 msgstr "L'account \"%s\" è stato salvato."
 
-#: lib/Filter.php:89
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "L'indirizzo \"%s\" è stato aggiunto a %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "L'allegato non è stato trovato."
 
-#: templates/javascript/open_compose_win.js:34
+#: lib/MIME/Viewer/itip.php:69
+#, fuzzy
+msgid "The calendar data is invalid"
+msgstr "<b>I dati di calnedario non sono validi</b>"
+
+#: templates/javascript/open_compose_win.js:37
 msgid ""
 "The compose window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
@@ -3511,41 +3917,41 @@
 "La finestra di composizione non può essere aperta. Probabilmente il tuo "
 "browser è impostato per bloccare i popup"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Seguono sotto i contenuti del file Macintosh."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "La cartella \"%s\" verrà rinominata in \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "La lista degli utenti con accesso a questa cartella non è stata ottenuta"
 
-#: compose.php:1036
+#: compose.php:1236
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "La bozza è stata salvata nella cartella \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr "L'evento è stato aggiunto al tuo calendario."
 
 #: templates/compose/expand.inc:9
-#, php-format
-msgid "The field '%s' can't be expanded."
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
 msgstr "Il campo '%s' non può essere espanso."
 
-#: lib/Folder.php:422
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "La cartella \"%s\" esiste già"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3554,74 +3960,83 @@
 "Il nome della cartella \"%s\" contiene caratteri non validi. Potrebbe "
 "causare problemi. Contatta l'amministratore di sistema."
 
-#: lib/Folder.php:441
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "La cartella \"%s\" è stata creata ma non è stata sottoscritta."
 
-#: lib/Folder.php:376
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr ""
 "La cartella \"%s\" è stata cancellata ma non è stata annullata la "
 "sottoscrizione."
 
-#: lib/Folder.php:428
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr ""
 "La cartella \"%s\" non è stata creata. Questo è il messaggio del server"
 
-#: lib/Folder.php:444
+#: lib/Folder.php:265
+#, fuzzy, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr ""
+"La cartella \"%s\" non è stata eliminata. Questo è il messaggio del server"
+
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "La cartella \"%s\" è stata creata con successo."
 
-#: lib/Folder.php:379
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "La cartella \"%s\" è stata eliminata con successo."
 
-#: lib/Folder.php:536
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "La cartella \"%s\" è stata rinominata in \"%s\"."
 
-#: lib/Folder.php:369
-#, php-format
-msgid "The folder '%s' was not deleted. This is what the server said"
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
 msgstr ""
-"La cartella \"%s\" non è stata eliminata. Questo è il messaggio del server"
 
-#: lib/MIME/Viewer/tnef.php:96
-msgid "The following files were attached to this part:"
-msgstr "I file seguenti sono stati allegati a questa parte:"
+#: templates/javascript/open_saveimage_win.js:12
+#, fuzzy
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"La finestra di composizione non può essere aperta. Probabilmente il tuo "
+"browser è impostato per bloccare i popup"
 
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:97
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr ""
 "Le immagini saranno mostrate perché il mittente si trova nella tua rubrica."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "Il server di posta ha generato il seguente messaggio di errore:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "Il server di posta ha generato il seguente messaggio di informazione:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "Il server di posta ha generato il seguente messaggio:"
 
-#: lib/Message.php:610
+#: lib/Message.php:651
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "La cartella \"%s\" è già vuota."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3631,14 +4046,19 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Il messaggio in composizione è stato chiuso. In uscita."
 
-#: message.php:179
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Il messaggio è stato eliminato."
 
-#: lib/MIME/Viewer/pgp.php:400 lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
 msgstr "Il messaggio è stato verificato."
 
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Il messaggio è stato verificato."
+
 #: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
 "The passphrase window can't be opened. Perhaps you have set your browser to "
@@ -3647,19 +4067,32 @@
 "La finestra di autenticazione non può essere aperta. Probabilmente il tuo "
 "browser è impostato per bloccare i popup"
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Il testo della Chiave PGP Pubblica può essere visto %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Il file richiesto non esiste nell'alegato MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:74
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Il file richiesto non esiste nell'allegato zip."
 
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+#, fuzzy
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "iClicca %s per vedere il thumbnail di questa immagine"
+
 #: templates/compose/compose.js:104
 msgid "The signature could not be replaced."
 msgstr "Non era possibile sostituire la firma."
@@ -3672,42 +4105,57 @@
 msgid "The specified file does not exist."
 msgstr "Il file specificato non esiste."
 
-#: lib/MIME/Viewer/itip.php:160
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "L'account \"%s\" è stato salvato."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "L' account \"%s\" è stato eliminato."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "L' account \"%s\" è stato eliminato."
+
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
 msgstr "L'attività è stata aggiunta nella tua tasklist."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Testo del messaggio"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Il testo del messaggio puo' essere visto %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Testo del messaggio restituito"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Il testo del messaggio restituito può essere visto %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Testo del messaggio inviato"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Il testo del messaggio inviato può essere visto %s."
 
-#: lib/MIME/Viewer/itip.php:145
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Informazioni libero/occupato dell'utente salvate con successo."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "Non ci sono porzioni alternative che possono essere mostrate inline."
 
@@ -3715,27 +4163,32 @@
 msgid "There are no messages in this mailbox."
 msgstr "Non ci sono messaggi in questa casella di posta."
 
-#: lib/Message.php:569
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Non ci sono porzioni alternative che possono essere mostrate inline."
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr ""
 "Si è verificato un errore nell'eliminazione di %s. Questo è il messaggio del "
 "server"
 
-#: lib/Message.php:612
+#: lib/Message.php:653
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 "Si è verificato un errore nella eliminazione della casella di posta. Questo "
 "è il messaggio del server: %s"
 
-#: lib/Message.php:578
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
 "Si è verificato un errore nella eliminazione della casella di posta. Questo "
 "è il messaggio del server"
 
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3744,7 +4197,7 @@
 "Si è verificato un errore nel copiare i messaggi da \"%s\" a \"%s\". Questo "
 "è il messaggio del server"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3753,7 +4206,7 @@
 "Si è verificato un errore nell'eliminazione dei files dalla cartella \"%s\". "
 "Questo è il messaggio del server"
 
-#: lib/Message.php:296
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3762,18 +4215,23 @@
 "Si è verificato un errore nel cancellare i messaggi nella cartella \"%s\". "
 "Questo è il messaggio del server"
 
-#: lib/Message.php:230
+#: lib/Message.php:211
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr ""
 "Si è verificato un errore nel cancellare i messaggi. Questo è il messaggio "
 "del server: %s"
 
-#: lib/MIME/Viewer/enriched.php:40 lib/MIME/Viewer/plain.php:55
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Errore nell'aggiornamento dell'evento: %s."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Si è verificato un errore visualizzando questa parte del messaggio"
 
-#: lib/Message.php:540
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3782,29 +4240,29 @@
 "Si è verificato un errore impostando i flags dei messaggi nella cartella \"%s"
 "\". Questo è il messaggio del server"
 
-#: folders.php:147
+#: folders.php:165
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Si è verificato un errore importando %s."
 
-#: lib/MIME/Viewer/itip.php:127
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Errore nell'importazione dell'evento: %s."
 
-#: lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Errore nell'importazione dell'attività: %s."
 
-#: lib/MIME/Viewer/itip.php:143
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Si e' verificato un errore nell'importazione delle informazioni libero/"
 "occupato dell'utente: %s."
 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3813,38 +4271,29 @@
 "Si è verificato un errore spostando i messaggi da \"%s\" a \"%s\". Questo è "
 "il messaggio del server"
 
-#: lib/MIME/Viewer/itip.php:91
-#, php-format
-msgid "There was an error removing the event: %s."
-msgstr "Errore nell'eliminazione del evento: %s."
-
-#: compose.php:1044
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
 msgstr "Si è verificato un errore salvando il messaggio come bozza."
 
-#: compose.php:958
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Si è verificato un errore inviando il messaggio: %s"
 
-#: lib/MIME/Viewer/itip.php:105
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Errore nell'aggiornamento dell'evento: %s."
 
-#: mailbox.php:270
-msgid "There was an error viewing the requested message."
-msgstr "Si è verificato un errore visualizzando il messaggio richiesto."
-
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "Non c'era testo in questa porzione di messaggio"
 
-#: lib/MIME/Viewer/html.php:91
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
 msgstr "Questo messaggio HTML ha le immagini inserite dentro."
 
-#: lib/MIME/Viewer/html.php:87
+#: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -3852,100 +4301,81 @@
 "Questo messaggio HTML ha le immagini inserite dentro. Immagini bloccate "
 "appaiono così: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Questa chiave pubblica PGP è stata allegata al messaggio."
 
-#: lib/MIME/Viewer/itip.php:96 lib/MIME/Viewer/itip.php:110
-#: lib/MIME/Viewer/itip.php:134 lib/MIME/Viewer/itip.php:148
-#: lib/MIME/Viewer/itip.php:164 lib/MIME/Viewer/itip.php:284
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr "Questa azione non e' supportata."
 
-#: lib/MIME/Viewer/itip.php:170 lib/MIME/Viewer/itip.php:385
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr "Questa azione non e' ancora implementata."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Questo potrebbe richiedere del tempo. Sei sicuro di voler proseguire?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Questo messaggio contiene un file Macintosh."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/pkcs7.php:410
+#, fuzzy
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr "Messaggio firmato elettronicamente con S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:414
+#, fuzzy
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Messaggio criptato con S/MIME."
+
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
-"Questo messaggio contiene informazioni sullo stato di consegna della mail, "
-"ma il formato di questo messaggio è sconosciuto."
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 "Questo messaggio non appare essere un valido messaggio criptato con PGP. "
 "Errore: "
 
-#: lib/MIME/Viewer/pkcs7.php:257
-msgid ""
-"This message does not appear to be a valid S/MIME encrypted message. Error: "
-msgstr ""
-"Questo messaggio non appare essere un valido messaggio criptato con S/MIME. "
-"Errore: "
-
-#: lib/MIME/Viewer/pgp.php:244 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Questo messaggio non appare essere nel formato corretto PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:178
-msgid ""
-"This message does not appear to be in the correct S/MIME format (according "
-"to RFC 2633)."
+#: lib/MIME/Viewer/pkcs7.php:170
+#, fuzzy
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Questo messaggio non appare essere nel formato corretto S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:209 lib/MIME/Viewer/pgp.php:423
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Messaggio firmato elettronicamente con PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Messaggio firmato elettronicamente con S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:234
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Messaggio criptato con S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
 msgstr "Messaggio criptato con PGP."
 
-#: message.php:168
-msgid ""
-"This message has been reported as not spam to your system administrator."
-msgstr ""
-"Questo messaggio è stato segnalato come spamming al tuo amministratore di "
-"sistema."
-
-#: message.php:155
-msgid "This message has been reported as not spam."
-msgstr "Questo messaggio è stato segnalato come non-spam."
-
-#: message.php:166
-msgid "This message has been reported as spam to your system administrator."
-msgstr ""
-"Questo messaggio è stato segnalato come spamming al tuo amministratore di "
-"sistema."
-
-#: message.php:153
-msgid "This message has been reported as spam."
-msgstr "Questo messaggio è stato segnalato come spam"
-
-#: message.php:240
+#: message.php:211
 msgid "This message to"
 msgstr "Questo messaggio a"
 
@@ -3957,18 +4387,22 @@
 msgid "This window must be called from a compose window."
 msgstr "Questa finestra deve essere chiamata da una finestra di composizione."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:875
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Visualizza"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Visualizzazione per Argomento"
 
-#: mailbox.php:635 message.php:298 search.php:141
-#: templates/mailbox/message_headers.inc:17
-#: templates/contacts/contacts.inc:220 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "A"
 
-#: config/prefs.php.dist:872
+#: config/prefs.php.dist:919
 msgid "To Address"
 msgstr "Indirizzo A"
 
@@ -3977,14 +4411,18 @@
 "To select multiple fields, hold down the Control (PC) or Command (Mac) while "
 "clicking."
 msgstr ""
-"Per scegliere campi multipli, abbassare mentre si clicca Control(PC) o "
-"Command(Mac)"
 
-#: templates/compose/compose.inc:591
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
 msgstr "Dimensione Totale Allegati:"
 
-#: folders.php:329
+#: folders.php:388
 msgid "Trash folder"
 msgstr "Cartella cestino"
 
@@ -3992,8 +4430,8 @@
 msgid "Trash folder:"
 msgstr "Cartella Cestino:"
 
-#: lib/Quota/command.php:77 lib/Quota/courier.php:54 lib/Quota/cyrus.php:70
-#: lib/Quota/logfile.php:93 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Impossibile ottenere quota"
 
@@ -4002,7 +4440,7 @@
 msgid "Unanswered"
 msgstr "Non Risposto"
 
-#: templates/search/main.inc:34
+#: templates/search/main.inc:35
 msgid "Unanswered messages"
 msgstr "Messaggi non risposti"
 
@@ -4010,28 +4448,33 @@
 msgid "Undelete"
 msgstr "Recupera"
 
-#: mailbox.php:619 mailbox.php:631 lib/MIME/Headers.php:219
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Destinatari nascosti"
 
-#: lib/MIME/Viewer/itip.php:411
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Componente non gestito del tipo: %s"
 
-#: mailbox.php:596
+#: mailbox.php:565
 msgid "Unknown Date"
 msgstr "Data Sconosciuta"
 
-#: lib/MIME/Viewer/itip.php:627
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
 msgstr "Incontro Sconosciuto"
 
-#: mailbox.php:647
+#: mailbox.php:618
 msgid "Unknown Recipient"
 msgstr "Destinatario Sconosciuto"
 
-#: templates/smime/smime.inc:54 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Scarica Password"
 
@@ -4039,48 +4482,54 @@
 msgid "Unnamed"
 msgstr "Senza nome"
 
-#: mailbox.php:746 message.php:538 templates/message/navbar_navigate.inc:6
-#: templates/mailbox/legend.inc:14 templates/mailbox/navbar.inc:15
-#: templates/mailbox/navbar.inc:32
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Non Letto"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Annulla sottoscrizione dalla cartella(e)"
 
-#: templates/compose/compose.inc:598
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
 msgstr "Aggiorna informazioni sull'allegato"
 
-#: lib/MIME/Viewer/itip.php:590
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr "Status del rispondente aggiornato"
 
-#: templates/smime/import_key.inc:46 templates/pgp/import_key.inc:46
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Utilizza il Valore di Default"
 
-#: config/prefs.php.dist:248
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Usa la sottoscrizione delle cartelle IMAP?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Cartella Virtuale"
+
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "Utente"
 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 "All'utente '%s' sono stati conferiti con successo i diritti seguenti per la "
 "cartella '%s'."
 
-#: templates/login/login.inc:225
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Nome Utente"
 
@@ -4088,82 +4537,134 @@
 msgid "Username:"
 msgstr "Nome Utente:"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Visualizza"
 
-#: lib/MIME/Viewer/tnef.php:112 lib/MIME/Viewer/zip.php:114
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
 msgstr "Visualizza %s"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Mostra chiave pubblica %s"
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:116
 msgid "View HTML content in a separate window"
 msgstr "Mostra il contenuto HTML in una finestra separata"
 
-#: templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Nuovi messaggi"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Mostra chiave personale privata"
 
-#: templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Mostra chiave personale pubblica"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Vedi Discussione"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
 msgstr "Visualizza Thumbnail"
 
-#: lib/MIME/Viewer/itip.php:131
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Mostra il contenuto HTML in una finestra separata"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Mostra il contenuto HTML in una finestra separata"
+
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
 msgstr "Visualizza evento"
 
-#: folders.php:321 mailbox.php:565
+#: folders.php:380 mailbox.php:534
 #, php-format
 msgid "View messages in %s"
 msgstr "Visualizza i messaggi in %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Visualizzazione o cartella da mostrare appena entrato:"
 
-#: lib/MIME/Viewer/itip.php:161
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
 msgstr "Visualizza attività"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
 msgstr "Mostra le Immagini"
 
-#: search.php:304
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "La Cartella Virtuale \"%s\" è stata creata con successo."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:118 lib/IMAP/Tree.php:306
-#: lib/IMAP/Tree.php:330 lib/IMAP/Tree.php:372
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Cartella Virtuale"
 
+#: search.php:245
+#, fuzzy
+msgid "Virtual Folders require a label."
+msgstr "Nome della cartella virtuale"
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "Cartella Virtuale"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Cartella Virtuale"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Cartella Virtuale"
+
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "Nome della cartella virtuale"
 
-#: login.php:149
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr ""
+
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
 msgstr "Benvenuto a %s"
 
-#: config/prefs.php.dist:706
+#: config/prefs.php.dist:619
+#, fuzzy
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "Elimina messaggi SPAM dopo che questi sono stati segnalati come spam?"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4171,65 +4672,93 @@
 "Sposta i messaggi cancellati nel Cestino invece di contrassegnarli come "
 "messaggi eliminati."
 
-#: config/prefs.php.dist:860
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
-"Quale pagina deve essere quella iniziale quando viene aperta una nuova "
-"mailbox?"
 
-#: config/prefs.php.dist:545
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
-msgstr "Salvare gli allegati quando viene salvata la posta inviata?"
+msgstr ""
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Lista Bianca"
 
-#: config/prefs.php.dist:429
-msgid "Wrap text at this many characters."
-msgstr "Manda a capo il testo dopo questo numero di caratteri."
-
-#: templates/compose/compose.inc:555 config/prefs.php.dist:971
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Si"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Stai per scaricare la posta dalle seguente caselle:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
 msgstr "Stai cercando di cancellare le seguenti cartelle:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Stai cercando di cancellare le seguenti cartelle:"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Stai compiando/spostando ad una nuova cartella."
 
-#: templates/folders/javascript.inc:107
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Stai creando una sottocartella di "
 
-#: templates/folders/javascript.inc:109
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Stai creando una cartella di primo livello."
 
-#: templates/folders/javascript.inc:150
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Stai creando una cartella di primo livello."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Stai rinominando la cartella: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Hai annullato con successo la sottoscrizione da \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
-"Non hai accettato le condizioni di servizio, quindi non hai il permesso di "
-"collegarti."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
 msgstr "Non hai il permesso per modificare gli accessi a questa cartella"
 
-#: lib/Maillog.php:98
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Hai inoltrato questo messaggio a %%s ai seguenti destinatari: %s."
@@ -4243,34 +4772,37 @@
 msgid "You have 1 new message."
 msgstr "Hai un nuovo messaggio."
 
-#: templates/compose/compose.js:142
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Hai un nuovo messaggio."
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
 msgstr ""
-"Hai almeno un allegato selezionato non ancora caricato. Seisicuro di voler "
-"inviare questo messaggio senza tali allegati?"
 
-#: lib/IMP.php:846
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Hai nuovi messaggi nella seguente cartella:"
 
-#: lib/IMP.php:851
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Hai nuovi messaggi nelle seguenti cartelle:"
 
-#: compose.php:137
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Devi inserire almeno un destinatario."
 
-#: lib/MIME/Viewer/pgp.php:306
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Devi inserire la password per la tua chiave privata PGP per visualizzare "
 "questo messaggio"
 
-#: lib/MIME/Viewer/pkcs7.php:245
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4278,7 +4810,7 @@
 "Devi inserire la password per la tua chiave privata S/MIME per visualizzare "
 "questo messaggio"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Devi prima selezionare una casella di destinazione."
 
@@ -4290,8 +4822,8 @@
 msgid "You must select an address first."
 msgstr "Devi prima selezionare un indirizzo."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Devi prima specificare almeno un messaggio."
 
@@ -4299,97 +4831,93 @@
 msgid "You must specify a recipient."
 msgstr "Devi specificare un destinatario."
 
-#: templates/compose/attachments.js:17
+#: templates/compose/attachments.js:29
 msgid "You must specify at least one file to attach."
 msgstr "Devi specificare almeno un file da allegare."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Devi avere '%s' abilitato nelle tue opzioni di manutenzione."
 
-#: lib/Maillog.php:102
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Hai reindirizzato questo messaggio a %s il %%s."
 
-#: lib/Maillog.php:106
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Hai risposto a questo messaggio il %s."
 
-#: lib/Folder.php:586
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
 "Notifica da parte del server: la sottoscrizione a \"%s\" NON è andata a buon "
 "fine."
 
-#: lib/Folder.php:637
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 "Notifica da parte del server: Non è stata annullata la sottoscrizione da \"%s"
 "\". "
 
-#: lib/Folder.php:589
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Hai sottoscritto con successo \"%s\""
 
-#: lib/Folder.php:640
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Hai annullato con successo la sottoscrizione da \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Il tuo nome"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Le tue chiavi Pubbliche/Private PGP"
 
-#: templates/smime/smime.inc:53 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "La tua chiave privata"
 
-#: templates/smime/smime.inc:49 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "La tua chiave pubblica"
 
-#: config/prefs.php.dist:155
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Il tuo indirizzo \"Risposta-a:\": <i>(opzionale)</i>"
 
-#: templates/smime/smime.inc:32
-msgid "Your S/MIME Public/Private Keys"
+#: templates/smime/smime.inc:49
+#, fuzzy
+msgid "Your S/MIME Public/Private Certificates"
 msgstr "Le tue chiavi Pubbliche/Private S/MIME"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "I tuoi account:"
 
-#: config/prefs.php.dist:163
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"I tuoi alias: <i>(opzionali, inserire ogni indirizzo su una nuova riga)</i>"
+"Invia a BCC tutti i messaggi: <i>(opzionale, inserisci ogni indirizzo in una "
+"nuova riga)</i>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "Il tuo browser non supporta la visualizzazione di questo tipo di immagine."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Il tuo browser non supporta l'opzione di stampa. Premi [Ctrl] / [Alt] + [P] "
-"per stampare."
-
-#: config/prefs.php.dist:523
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Il tuo codice caratteri di default per l'invio di messaggi:"
 
@@ -4397,84 +4925,69 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Il tuo metodo di criptaggio default per l'invio di messaggi:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Il tuo messaggio e' stato consegnato con successo."
 
-#: config/prefs.php.dist:196
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "La tua firma:"
 
-#: compose.php:1095 mailbox.php:580 message.php:327 lib/Compose.php:731
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Nessun Oggetto]"
 
-#: templates/compose/compose.inc:340
-msgid "_Address Book"
-msgstr "Rubrica"
-
-#: templates/compose/compose.inc:226
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Lista _Nera"
 
-#: templates/compose/compose.inc:175
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "Cc"
 
-#: templates/menu/menu.inc:31
-msgid "_Compose"
-msgstr "_Componi"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: templates/compose/compose.inc:341
-msgid "_Expand Names"
-msgstr "_Espandi Nomi"
-
-#: templates/menu/menu.inc:33
+#: lib/IMP.php:979
 msgid "_Folders"
 msgstr "Car_telle"
 
-#: templates/menu/menu.inc:65
-msgid "_Help"
-msgstr "_Aiuto"
-
-#: templates/compose/compose.inc:90
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identità"
 
-#: templates/menu/menu.inc:24
+#: lib/IMP.php:961
 msgid "_Inbox"
 msgstr "_Posta in Arrivo"
 
-#: templates/menu/menu.inc:72 templates/menu/menu.inc:75
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "_Fine sessione"
 
-#: message.php:424
+#: message.php:384
 msgid "_Message Source"
 msgstr "Intestazioni _Messaggio"
 
-#: templates/menu/menu.inc:55
-msgid "_Options"
-msgstr "_Opzioni"
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Nuovi messaggi"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Stampa"
 
-#: templates/compose/compose.inc:293 templates/compose/compose.inc:310
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "_Priorità"
 
-#: mailbox.php:462
+#: mailbox.php:418
 #, php-format
 msgid "_Refresh %s"
 msgstr "_Aggiorna %s"
@@ -4483,19 +4996,19 @@
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: templates/menu/menu.inc:35
+#: lib/IMP.php:981
 msgid "_Search"
 msgstr "_Ricerca"
 
-#: templates/compose/compose.inc:76 templates/compose/compose.inc:448
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
 msgstr "_Invia Messaggio"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_Argomento"
 
-#: templates/compose/compose.inc:125
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_A"
 
@@ -4503,58 +5016,128 @@
 msgid "_Undelete"
 msgstr "_Recupera"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Visualizza per Argomento"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Lista _Bianca"
 
-#: lib/Compose.php:344
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
 msgid "attachment"
 msgstr "allegato"
 
-#: view.php:82
+#: view.php:99
 msgid "attachments.zip"
 msgstr "allegati.zip"
 
-#: templates/compose/compose.inc:527
+#: templates/compose/compose.inc:513
 msgid "bytes"
-msgstr "byte"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
 
-#: pgp.php:75 smime.php:29
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
+#, fuzzy
+msgid "from"
+msgstr "Da"
+
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
 msgid "key"
 msgstr "chiave"
 
-#: folders.php:143
+#: folders.php:161
 msgid "mailbox file"
 msgstr "File di casella di posta"
 
-#: compose.php:878 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "nome"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "nessuno"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "o"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "errore di ortografia"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "errori di ortografia"
 
-#: lib/Filter.php:57
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "errore di ortografia"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "tua lista indesiderata"
 
-#: lib/Filter.php:70
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "tua lista consentita"


--- orig/lib/Maintenance/imp.php
+++ mod/lib/Maintenance/imp.php
@@ -4,12 +4,12 @@
 require_once $GLOBALS['registry']->get('fileroot', 'imp') . '/lib/base.php';
 
 /**
- * $Horde: imp/lib/Maintenance/imp.php,v 1.19.10.3 2005/06/23 03:08:52 selsky Exp $
+ * $Horde: imp/lib/Maintenance/imp.php,v 1.19.10.5 2006/01/01 21:28:59 jan Exp $
  *
  * The Maintenance_IMP class defines the maintenance operations run upon
  * login to IMP.
  *
- * Copyright 2001-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2001-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/templates/message/headers.inc
+++ mod/templates/message/headers.inc
@@ -1,26 +1,26 @@
 <?php $i = 0; ?>
-<table border="0" align="center" width="100%" cellpadding="2" cellspacing="0">
+<table width="100%" cellspacing="0">
 <?php if ($all_headers): ?>
   <?php foreach ($full_h as $head => $val): ?><tr>
   <?php if (in_array($head, $basic_headers)) $val = $imp_headers->getValue($head); ?>
-  <td class="item<?php echo $i ?>" align="right" valign="top" nowrap="nowrap"><b><?php echo $head ?>:</b>&nbsp;</td>
-  <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
+  <td class="item<?php echo $i ?> rightAlign nowrap" valign="top"><strong><?php echo $head ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><?php echo $val ?></td>
 </tr><?php $i = ($i + 1) % 2; ?>
   <?php endforeach; ?>
 <?php else: ?>
   <?php foreach ($basic_headers as $head => $str): ?>
     <?php if ($val = $imp_headers->getValue($head)): ?>
 <tr>
-  <td class="item<?php echo $i ?>" nowrap="nowrap" align="right" valign="top"><b><?php echo $str ?>:</b>&nbsp;</td>
-  <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
+  <td class="item<?php echo $i ?> rightAlign nowrap" valign="top"><strong><?php echo $str ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><?php echo $val ?></td>
 </tr>
     <?php $i = ($i + 1) % 2; endif; ?>
   <?php endforeach; ?>
 <?php endif; ?>
 <?php if (!empty($user_hdrs) && count($custom_hdrs) > 0): ?>
   <?php foreach ($custom_hdrs as $head => $val): ?><tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top" nowrap="nowrap"><b><?php echo $head ?>:</b>&nbsp;</td>
-  <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
+  <td class="item<?php echo $i ?> rightAlign nowrap" valign="top"><strong><?php echo $head ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><?php echo $val ?></td>
 </tr><?php $i = ($i + 1) % 2; ?>
   <?php endforeach; ?>
 <?php endif; ?>
@@ -28,46 +28,46 @@
   <?php foreach ($imp_headers->listHeaders() as $head => $str): ?>
     <?php if ($val = $imp_headers->getValue($head)): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" nowrap="nowrap" valign="top"><b><?php echo $str ?>:</b>&nbsp;</td>
-  <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
+  <td class="item<?php echo $i ?> rightAlign nowrap" valign="top"><strong><?php echo $str ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><?php echo $val ?></td>
 </tr>
     <?php $i = ($i + 1) % 2; endif; ?>
   <?php endforeach; ?>
 <?php endif; ?>
 <?php if ($val = $imp_headers->getValue('priority')): ?><tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"><b><?php echo _("Priority") ?>:</b>&nbsp;</td>
-  <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"><strong><?php echo _("Priority") ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><?php echo $val ?></td>
 </tr><?php $i = ($i + 1) % 2; endif; ?>
 <?php if ($show_parts || ($downloadall_link && !$printer_friendly)): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"><b><?php echo _("Part(s)") ?>:</b>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"><strong><?php echo _("Part(s)") ?>:</strong>&nbsp;</td>
 <?php if ($show_parts): ?>
-  <td class="item<?php echo $i ?>" width="100%"><table cellspacing="2" cellpadding="1"><?php echo $attachments ?></table></td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><table cellspacing="2"><?php echo $attachments ?></table></td>
 <?php endif; ?>
 <?php if ($downloadall_link && !$printer_friendly): ?>
 <?php if ($show_parts): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"></td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"></td>
 <?php endif; ?>
-  <td class="item<?php echo $i ?>" width="100%"><?php echo Horde::link($downloadall_link, _("Download All Attachments (in .zip file)")) . _("Download All Attachments (in .zip file)") ?></a></td>
+  <td class="item<?php echo $i ?> msgheader" width="100%"><?php echo Horde::link($downloadall_link, _("Download All Attachments (in .zip file)")) . _("Download All Attachments (in .zip file)") . ' ' . Horde::img('compressed.png', _("Download All Attachments (in .zip file)"), '', $registry->getImageDir('horde') . '/mime') ?></a></td>
 <?php endif; ?>
 </tr>
 <?php $i = ($i + 1) % 2; endif; ?>
 <?php if (!$printer_friendly): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"><b><?php echo _("Headers") ?>:</b>&nbsp;</td>
-  <td class="item<?php echo $i ?>" width="100%">
+  <td class="item<?php echo $i ?> rightAlign" valign="top"><strong><?php echo _("Headers") ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> msgheader" width="100%">
     <?php if ($all_headers || $list_headers): ?>
-      <?php echo Horde::link($headersURL, _("Show Limited Headers")) . _("Show Limited Headers") ?></a>
+      <?php echo Horde::link($headersURL) . _("Show Limited Headers") ?></a>
     <?php endif; ?>
     <?php if (!$all_headers): ?>
       <?php if ($list_headers): ?>
       &nbsp;|&nbsp;
       <?php endif; ?>
-      <?php echo Horde::link(Util::addParameter($headersURL, 'show_all_headers', 1), _("Show All Headers")) . _("Show All Headers") ?></a>
+      <?php echo Horde::link(Util::addParameter($headersURL, 'show_all_headers', 1)) . _("Show All Headers") ?></a>
     <?php endif; ?>
     <?php if ($list_exists && !$list_headers): ?>
-      &nbsp;|&nbsp;&nbsp;<?php echo Horde::link(Util::addParameter($headersURL, 'show_list_headers', 1), _("Show Mailing List Information")) . _("Show Mailing List Information") ?></a>
+      &nbsp;|&nbsp;&nbsp;<?php echo Horde::link(Util::addParameter($headersURL, 'show_list_headers', 1)) . _("Show Mailing List Information") ?></a>
     <?php endif; ?>
   </td>
 </tr>


--- orig/po/bg_BG.po
+++ mod/po/bg_BG.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Imp 4.0-cvs\n"
-"POT-Creation-Date: 2002-09-12 20:21-0400\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-11-14 00:38-0400\n"
 "Last-Translator: Miroslav Pendev <miro at cybershade.us>\n"
 "Language-Team: BG i18n at lists.horde.org\n"
@@ -15,92 +16,193 @@
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Äî: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Äî: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Äàòà: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "      Îò: "
 
-msgid " - $nm new message"
-msgstr " - $nm íîâî ïèñìî"
-
-msgid " - $nm new messages"
-msgstr " - $nm íîâè ïèñìà"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "    Òåìà: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " â "
 
-#, c-format
-msgid " where the %s contains <b>%s</b>"
-msgstr " êúäåòî %s ñúäúðæà <b>%s</b>"
-
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#, c-format
-msgid "%d of %d Messages"
+#: lib/Block/summary.php:69
+#, fuzzy, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Êâîòà ñòàòóñ: %.2fMB / %.2fMB  (%.2f%%)"
+
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d îò %d ïèñìà"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "Òîâà ïèñìî áåøå èçïðàòåíî êàòî Ñïàì äî Ñèñòåìíèÿ Àäìèíèñòðàòîð."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Òîâà ïèñìî áåøå ðåãèñòðèðàíî êàòî ñïàì."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "Òîâà ïèñìî áåøå èçïðàòåíî êàòî Ñïàì äî Ñèñòåìíèÿ Àäìèíèñòðàòîð."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Òîâà ïèñìî áåøå ðåãèñòðèðàíî êàòî ñïàì."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d äî %d îò %d ïèñìà"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#, c-format
-msgid "%s PGP Administration"
-msgstr "%s PGP Àäìèíèñòðèðàíå"
-
-#, c-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME Àäìèíèñòðèðàíå"
-
-#, c-format
-msgid "%s Standard"
-msgstr "%s Ñòàíäàðò"
-
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s âå÷å ñúùåñòâóâà. Âàøàòà ïàïêà %s íå áåøå ïðåèìåíóâàíà."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s íå å âàëèäíà ïîùåíñêà êóòèÿ."
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Ïàïêà %s áåøå ïðåèìåíóâàíà â íà÷àëîòî íà ìåñåöà."
 
-#, c-format
-msgid "%s messages were fetched..."
-msgstr "%s ïèñìà áÿõà èçòåãëåíè..."
-
-#, c-format
-msgid "%s%s Guest Services</a>"
-msgstr "%s%s Óñëóãè çà ãîñòè</à>"
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Ïàïêàòà \"%s\" áåøå óñïåøíî ïðåèìåíóâàíà íà \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
 
-#, c-format
+#: message.php:285 message.php:290
+#, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#, c-format
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;îò&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Ïðèëîæè òåçè ïðîìåíè è ïðîäúëæè êúì ñëåäâàùèÿ åêðàí.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "Îòêàæè âñè÷êè ïðîìåíè è ñå âúðíè êúì åêðàíà \"Íàïèøè\""
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -108,213 +210,655 @@
 "(Âúðíè ñå êúì åêðàíà \"Íàïèøè\" ñëåä êàòî ïðèëîæèø âñè÷êè ïðîìåíè äî òóê."
 "Ïðîìåíèòå â òåêóùèÿ åêðàí ÍßÌÀ äà áúäàò ïðèëîæåíè.)"
 
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Âúðíè ñå êúì åêðàíà \"Íàïèøè\" ñëåä êàòî ïðèëîæèø âñè÷êè ïðîìåíè äî òóê."
+"Ïðîìåíèòå â òåêóùèÿ åêðàí ÍßÌÀ äà áúäàò ïðèëîæåíè.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Äîáàâè òåçè ñ \"ÎÊ\" *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Ìîëÿ èçáåðåòå àäðåñ(è) *"
 
-#, c-format
-msgid "<i>View as %s</i>"
-msgstr "<i>Èçãëåä êàòî %s<i>"
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "Òîâà ïèñìî áåøå èçïðàòåíî êàòî Ñïàì äî Ñèñòåìíèÿ Àäìèíèñòðàòîð."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Òîâà ïèñìî áåøå ðåãèñòðèðàíî êàòî ñïàì."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "Òîâà ïèñìî áåøå èçïðàòåíî êàòî Ñïàì äî Ñèñòåìíèÿ Àäìèíèñòðàòîð."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Òîâà ïèñìî áåøå ðåãèñòðèðàíî êàòî ñïàì."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Ñïåöèàëíè ñèìâîëè"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Ñïåöèàëíè ñèìâîëè"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Ñïåöèàëíè ñèìâîëè"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Ñïåöèàëíè ñèìâîëè"
+
+#: lib/MIME/Viewer/images.php:162
+#, fuzzy, php-format
+msgid "A large image named %s is attached to this message."
+msgstr "Òîçè PGP ïóáëè÷åí êëþ÷ áåøå ïðèêðåïåí êúì ïèñìîòî."
+
+#: lib/MIME/Viewer/notification.php:50
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
 
+#: templates/search/fields.inc:5
 msgid "AND"
 msgstr "è"
 
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Èìå íà ïîùàòà:"
 
-msgid "Accounts"
-msgstr "Ïîùè"
-
-msgid "Action"
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Äåéñòâèå"
 
-#, c-format
-msgid "Add to Address book (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Äîáàâè êúì àäðåñíà êíèãà (%s)"
 
-#, c-format
-msgid "Added %s as an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "äîáàâè ñîðñ"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "Äîáàâåí %s êàòî ïðèêðåïåí ôàéë."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Ïåðñîíàëíà èíôîðìàöèÿ"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Àäðåñåí áåëåæíèê"
 
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Àäðåñíè êíèãè"
 
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "Âñè÷êè"
 
-#, c-format
+#: templates/javascript/folders.js:13
+msgid ""
+"All messages in the following folder(s) will be downloaded into one MBOX "
+"file:"
+msgstr ""
+
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
 "Âñè÷êè ïèñìà âúâ Âàøàòà \"%s\" ïàïêà ïî-ñòàðè îò %s äíè ùå áúäàò èçòðèòè!"
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Âñè÷êè ïàïêè \"Èçïðàòåíè ïèñìà\" ïî-ñòàðè îò %s ìåñåöà ùå áúäàò èçòðèòè!"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Âñè÷êè ïàïêè \"Èçïðàòåíè ïèñìà\" ïî-ñòàðè îò %s ìåñåöà ùå áúäàò èçòðèòè!"
 
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Ïàïêàòà \"%s\" áåøå óñïåøíî ïðåèìåíóâàíà íà \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Àëòåðíàòèâíè ÷àñòè çà òàçè ñåêöèÿ:"
 
-msgid "An error occurred when deleting messages from server!"
-msgstr "Ãðåøêà ïðè èçòðèâàíå íà ïèñìà îò ñúðâúðà!"
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "Äîáàâåí %s êàòî ïðèêðåïåí ôàéë."
 
-msgid "An error occurred when setting the messages seen from server!"
+#: lib/Message.php:505
+#, fuzzy
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
 msgstr "Ãðåøêà ïðè ïðåãëåæäàíå íà ïèñìà îò ñúðâúðà! "
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Íåèçâåñòíà ãðåøêà ïðè äîáàâÿíå íà íîâ çàïèñ."
+
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
 msgstr "Íåèçâåñòíà ãðåøêà ïðè äîáàâÿíå íà íîâ çàïèñ."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Ñ îòãîâîð"
 
+#: templates/search/main.inc:31
 msgid "Answered messages"
 msgstr "Ïèñìà ñ îòãîâîð"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Ïðèëîæè ôèëòðèòå"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Ïðèëîæè ôèëòðèòå"
 
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Äà ñå ïðèëàãàò ëè ôèëòðèòå ñëåä âõîä?"
 
-msgid "Apply filter rules when mailbox is refreshed?"
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Äà ñå ïðèëàãàò ëè ôèëòðèòå, êîãàòî ñå îïðåñíÿâà ïîùåíñêàòà êóòèÿ?"
 
-msgid "April"
-msgstr "Àïðèë"
-
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òîçè ïóáëè÷åí êëþ÷?"
 
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+#, fuzzy
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òîçè ïóáëè÷åí êëþ÷?"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Are you sure you want to do this?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òîçè ïóáëè÷åí êëþ÷?"
+
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òåçè ïèñìà (íåâúçâðàòèìî)?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òåçè ïèñìà (íåâúçâðàòèìî)?"
+
+#: templates/mailbox/actions.inc:39
+#, fuzzy
+msgid "Are you sure you wish to empty this folder?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçïðàçíèòå êîø÷åòî?"
+
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçïðàçíèòå êîø÷åòî?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçïðàçíèòå êîø÷åòî?"
 
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òåçè ïèñìà (íåâúçâðàòèìî)?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òåçè ïèñìà (íåâúçâðàòèìî)?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Ñèãóðíè ëè ñòå, ÷å èñêàòå äà èçòðèåòå òåçè ïèñìà (íåâúçâðàòèìî)?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Âðåìå íà ïðèñòèãàíå"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Íàðàñòâàùè"
 
-msgid "Ask for confirmation before doing maintenance operations?"
-msgstr "Äà ñå èñêà ëè ïîòâúðæäåíèå ïðåäè îáñëóæâàùèòå îïåðàöèè?"
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
+#, fuzzy
+msgid "Attach"
+msgstr "Ïðèêðåïåí ôàéë"
+
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Ïðèêðåïåí ôàéë:"
 
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Äà ñå äîáàâÿ ëè Âàøèÿò ïóáëè÷åí PGP êëþ÷ êúì ïèñìîòî Âè?"
 
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "Ïðèêðåïåí ôàéë:"
 
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Ïðèêðåïåí ôàéë"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Ïðèêðåïåíè ôàéëîâå"
 
-msgid "August"
-msgstr "Àâãóñò"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Ïðèêðåïåíè ôàéëîâå"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Äåéñòâèå"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
+#: templates/prefs/sourceselect.inc:298
 msgid "Available Address books:"
 msgstr "Íàëè÷íè àäðåñíè êíèãè:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Îáðàòíî â %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Îáðàòíî â %s"
 
-msgid "Barbie"
-msgstr "Barbie"
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
 
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "×åðåí ñïèñúê"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Òÿëî"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Äâàòà"
 
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
 msgstr "Òÿëîòî íà ïèñìîòî è headers "
 
-msgid "Brown"
-msgstr "Brown"
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
 
-msgid "Burnt Orange"
-msgstr "Burnt Orange"
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
 
-msgid "Camouflage"
-msgstr "Camouflage"
+#: lib/Fetchmail/imap.php:201
+#, fuzzy
+msgid "Can not connect to the remote mail server."
+msgstr "Ãðåøêà ïðè ñâúðçâàíå ñ ìåéë ñúðâúðà"
 
-msgid "Can't connect to the Mail Server"
+#: lib/Fetchmail/imap.php:199
+#, fuzzy
+msgid "Can not connect to the remote mail server: "
 msgstr "Ãðåøêà ïðè ñâúðçâàíå ñ ìåéë ñúðâúðà"
 
-msgid "Cannot move past the beginning"
-msgstr "Íå ìîæå äà ñå ìèíå ïðåäè íà÷àëîòî"
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
+#, fuzzy
+msgid "Cancel"
+msgstr "Ïðîìåíè"
+
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+#, fuzzy
+msgid "Cancel Message"
+msgstr "Èçòðèé ïèñìî"
 
-msgid "Cannot move past the end"
-msgstr "Íå ìîæå äà ñå ìèíå ñëåä êðàÿ"
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+msgid "Cancelling this message will permanently discard its contents."
+msgstr ""
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
-msgstr "Cc:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Ïåðñîíàëíè"
 
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Ïðîìåíè"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Ïðîìåíè âñè÷êè"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Ñúçäàé ïàïêà"
+
+#: config/prefs.php.dist:112
+#, fuzzy
 msgid ""
-"Change display options such as the color scheme, how many messages you see "
-"on each page and how messages are sorted."
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
 msgstr ""
 "Ñìÿíà íà äèñïëåé îïöèèòå, êàòî öâåòíà ñõåìà, êîëêî ïèñìà äà ñå âèæäàò âúâ "
 "âñÿêà ñòðàíèöà è êàê äà ñå ñîðòèðàò ïèñìàòà."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Ïðîìÿíà íà íàñòðîéêèòå çà ìåéë ñúðâúð."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr ""
-"Ïðîìåíåòå èìåòî, àäðåñà è ïîäïèñà, êîèòî ïîëó÷àòåëèòå ùå âèæäàò, êîãàòî ÷åòàò "
-"è îòãîâàðÿò íà ïèñìîòî Âè."
+"Ïðîìåíåòå èìåòî, àäðåñà è ïîäïèñà, êîèòî ïîëó÷àòåëèòå ùå âèæäàò, êîãàòî "
+"÷åòàò è îòãîâàðÿò íà ïèñìîòî Âè."
+
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Ïðîâåðè ïàïêàòà(èòå) çà íîâè ïèñìà"
 
-msgid "Checkbox"
-msgstr "Checkbox"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
 
-msgid "Cherry"
-msgstr "Cherry"
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "Äà ñå ïîêàçâà ëè ïîòâúðæäåíèå ñëåä èçïðàùàíå íà ïèñìî?"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Èçáåðè äåéñòâèå:"
 
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Èçáåðåòå ìåéë ñúðâúð:"
 
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Èçáåðè äåéñòâèå:"
+
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Èçáåðåòå êîÿ àäðåñíà êíèãà äà ñå èçïîëçâà ïðè äîáàâÿíå íà àäðåñ."
 
+#: templates/prefs/sourceselect.inc:293
 msgid "Choose the order of address books to search when expanding addresses."
-msgstr "Èçáåðåòå ðåäà íà òúðñåíå íà àäðåñíèòå êíèãè, ïðè îòêðèâàíåòî íà àäðåñè."
+msgstr ""
+"Èçáåðåòå ðåäà íà òúðñåíå íà àäðåñíèòå êíèãè, ïðè îòêðèâàíåòî íà àäðåñè."
+
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Äà ñå ïèøàò ëè ïèñìàòà â îòäåëåí ïðîçîðåö?"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
 
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
@@ -322,61 +866,116 @@
 "Êëèêíåòå íà åäíà îò èçáðàíèòå àäðåñíè êíèãè è ñëåä òîâà èçáåðåòå âñè÷êè "
 "ïîëåòà çà òúðñåíå."
 
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 "Êëèêíåòå, çà äà çàïèøåòå Âàøèÿò ïóáëè÷åí PGP êëþ÷ â àäðåñíàòà ñè êíèãà."
 
+#: lib/MIME/Viewer/pkcs7.php:202
+#, fuzzy, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+"Êëèêíåòå, çà äà çàïèøåòå Âàøèÿò ïóáëè÷åí PGP êëþ÷ â àäðåñíàòà ñè êíèãà."
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Íàïèøè"
+
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Çàòâîðè ïðîçîðåöà"
 
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Çàòâîðåíà ïàïêà"
 
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Ñúáåðè âñè÷êè"
+
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Ñúáåðè âñè÷êè"
 
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Ñúáåðè âñè÷êè ïàïêè"
 
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Ñúáåðè ïàïêà"
 
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "êîìåíòàð"
 
-msgid "Compose"
-msgstr "Íàïèøè"
-
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Íàïèøè ïèñìî (%s)"
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "êîìåíòàð"
 
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Íàïèøè äðóãî ïèñìî"
 
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Äà ñå ïèøàò ëè ïèñìàòà â îòäåëåí ïðîçîðåö?"
 
-msgid "Compose messages with an HTML GUI (IE 5.5+ only)?"
+#: config/prefs.php.dist:443
+#, fuzzy
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
 msgstr "Äà ñå ïèøàò ëè ïèñìàòà â HTML ðåäàêòîð (IE 5.5+ ñàìî)?"
 
-msgid "Connection to Server failed, check your Username/Password/Protocol"
-msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúðà, ïðîâåðåòå Âàøèòå Èìå/Ïàðîëà/Ïðîòîêîë"
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Ïðîìÿíà íà íàñòðîéêèòå çà ìåéë ñúðâúð."
 
-msgid "Connection to server failed"
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
 msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúð."
 
-msgid "Contact List"
-msgstr "Êîíòàêòè"
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr "Ãðåøêà ïðè ñâúðçâàíå ñúñ ñúðâúð."
 
-#, c-format
+#: config/prefs.php.dist:143
+#, php-format
 msgid "Control PGP support for %s."
 msgstr "Êîíòðîë íà PGP ïîääðúæêàòà çà %s."
 
-#, c-format
+#: config/prefs.php.dist:152
+#, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Êîíòðîë íà S/MIME ïîääðúæêàòà çà %s."
 
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -384,40 +983,100 @@
 "Êîíòðîëèðà êîãà äà ñå ïðîâåðÿâà çà íîâà ïîùà è äàëè äà áúäåòå óâåäîìåíè, "
 "êîãàòî òÿ ñå ïîëó÷è."
 
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Êîïèðàé"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Èçïðàçíè êîø÷åòî"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Êîðèãèðàé"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Êîðèãèðàí òåêñò"
 
-#, c-format
-msgid "Could not delete messages from %s. The server said: %s"
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr ""
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Ãðåøêà ïðè èçòðèâàíåòî íà ïèñìà îò %s. Ñúðâúðà êàçà: %s"
 
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
 msgstr "Ãðåøêà ïðè èçïúëíåíèå íà \"Îïåðàöèè ïî îáñëóæâàíåòî\""
 
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Ãðåøêà ïðè èçâëè÷àíåòî íà ïðèêà÷åíèÿ ôàéë îò MS-TNEF."
 
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Ãðåøêà ïðè èçâëè÷àíåòî íà ôàéë îò Zip àðõèâà."
 
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+#, fuzzy
+msgid "Create"
+msgstr "Ñúçäàé ïàïêà"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Ñúçäàé ïàïêà"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "×àñòåí êëþ÷"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Ñúçäàé ïàïêà"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Ñúçäàé íîâà ïàïêà \"Êîø÷å\""
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Ñúçäàé íîâà ïàïêà \"×åðíîâè\""
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Ñúçäàé íîâà ïàïêà \"Èçïðàòåíè\""
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Ñúçäàé íîâà ïàïêà \"Êîø÷å\""
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -425,937 +1084,1912 @@
 "Ñúçäàé ïðàâèëà çà ôèëòðèðàíå è îðãàíèçàöèÿ íà èäâàùàòà ïîùà, ñîðòèðàíåòî é â "
 "ïàïêèòå è èçòðèâàíå íà ñïàì"
 
-msgid "Customize accounts for fetching mail from other POP3/IMAP accounts."
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Ñúçäàé íîâà ïàïêà \"Èçïðàòåíè\""
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+#, fuzzy
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Èçòåãëÿíå íà ïîùà îò äðóãè POP3/IMAP ñúðâúðè."
 
-msgid "Customize how you send mail and where drafts are saved."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
 msgstr "Îïðåäåëè íà÷èíà, ïî êîéòî èçïðàùàø ïîùà è êúäå ñà ÷åðíîâèòå."
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Íàñòðîé îïåðàöèèòå çà îáñëóæâàíå ñëåä âõîä â %s."
-
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Îïðåäåëè çàäà÷èòå çà èçïúëíåíèå ñëåä âõîä â %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Äàòà"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Äàòà"
 
-msgid "December"
-msgstr "Äåêåìâðè"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Èçòðèòè"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Èçòðèé"
 
-msgid "Default Identity"
-msgstr "Èäåíòè÷íîñò ïî ïîäðàçáèðàíå"
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Êðèòåðèè çà ñîðòèðàíå ïî ïîäðàçáèðàíå:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Ïîñîêà íà ñîðòèðàíå ïî ïîäðàçáèðàíå:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Èçòðèòè"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Èçòðèé"
 
-#, c-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "Delete %s Public Key"
 msgstr "Èçòðèé %s ïóáëè÷åí êëþ÷"
 
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+#, fuzzy
+msgid "Delete Current Keys"
+msgstr "Èçòðèé %s ïóáëè÷åí êëþ÷"
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Èçòðèé ïàïêà(è)"
 
-msgid "Delete Message"
-msgstr "Èçòðèé ïèñìî"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Èçòðèé ïàïêà(è)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Èçòðèé ïàïêà(è)"
 
-msgid "Delete fetched messages from server"
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Èçòðèé ïàïêà(è)"
+
+#: templates/fetchmail/manage.inc:43
+#, fuzzy
+msgid "Delete fetched messages from remote server?"
 msgstr "Èçòðèé èçòåãëåíèòå ïèñìà îò ñúðâúðà"
 
-msgid "Delete messages"
-msgstr "Èçòðèé ïèñìà"
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
+msgstr ""
+"Äà ñå èçòðèâàò ëè ñòàðèòå ïàïêè \"Èçïðàòåíà ïîùà\" â íà÷àëîòî íà ìåñåöà?"
+
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr ""
 "Äà ñå èçòðèâàò ëè ñòàðèòå ïàïêè \"Èçïðàòåíà ïîùà\" â íà÷àëîòî íà ìåñåöà?"
 
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Èçòðèé ïèñìà"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Èçòðèòè"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Èçòðèòè ïèñìà"
 
-#, c-format
-msgid "Deleted the attachment %s."
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
 msgstr "Èçòðèé ïðèêðåïåíèÿò ôàéë %s."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Èçòðèâàíå è ïðåìåñòâàíå íà ïèñìà"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Íàìàëÿâàùè"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Ðàçïîëîæåíèå"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Äåòàéëè"
 
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Äà ñå çàìúãëÿâàò ëè ïîäïèñèòå?"
 
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Ïîêàæè"
 
-msgid "Display Options"
-msgstr "Äèñïëåé Îïöèè"
-
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Äà ñå ïîêàçâà ëè ïîòâúðæäåíèå ñëåä èçïðàùàíå íà ïèñìî?"
 
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Ïîêàæè â ñúäúðæàíèåòî íà ïèñìîòî"
 
-msgid "Display message when filters have been applied?"
-msgstr "Äà ñå ïîêàçâà ëè ïèñìîòî, ñëåä êàòî ôèëòðèòå ñà áèëè ïðèëîæåíè?"
-
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Äà ñå ïîêàçâà ëè pop-up óâåäîìÿâàíå çà íîâà ïîùà?"
 
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Äà ñå ïîêàçâà ëè \"Èçïðàçíè êîø÷åòî\" â ìåíþ ëåíòàòà?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Äà ñå ïîêàçâà ëè \"Èçïðàçíè êîø÷åòî\" â ìåíþ ëåíòàòà?"
 
+#: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Ðàçïîëîæåíèå"
 
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Íå ïðîâåðÿâàé ïàïêà(è) çà íîâà ïîùà"
 
-msgid "Download"
-msgstr "Èçòåãëè"
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
+msgid "Do you want to open that folder?"
+msgstr ""
+
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
+#, fuzzy
+msgid "Done"
+msgstr "Íÿìà"
+
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
 
-#, c-format
-msgid "Download %s"
-msgstr "Èçòåãëè %s"
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Èçòåãëè ïàïêà(è)"
 
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Èçòåãëè ïàïêà(è)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
+
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "×åðíîâà"
 
-msgid "Drafts folder:"
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
 msgstr "Ïàïêà \"×åðíîâè\":"
 
-msgid "E-Mail"
-msgstr "E-Mail"
+#: templates/prefs/folderselect.inc:23
+msgid "Drafts folder:"
+msgstr "Ïàïêà \"×åðíîâè\":"
 
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "E-Mail àäðåñ"
 
-msgid "Edit your IMAP/POP3 accounts."
-msgstr "Ðåäàêöèÿ íà Âàøèòå IMAP/POP3 ïîùè."
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "è"
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
+msgid "Edit"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "×åðåí ñïèñúê"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Ïîùà Ôèëòðè"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Ðåäàêöèÿ íà ïðàâèëàòà çà ôèëòðèðàíå"
 
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Ðåäàêöèÿ íà ïðàâèëàòà çà ôèëòðèðàíå"
 
-msgid "Edit your identities"
-msgstr "Ðåäàêöèÿ íà èäåíòè÷íîñòèòå"
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Ðåäàêöèÿ íà ïðàâèëàòà çà ôèëòðèðàíå"
 
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Åmail àäðåñ"
 
-#, c-format
+#: lib/Message.php:657
+#, php-format
 msgid "Emptied all messages from %s."
 msgstr "Çàëè÷åíè áÿõà âñè÷êè ïèñìà îò %s."
 
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Èçïðàçíè ïàïêà(è)"
 
-msgid "Empty Trash"
-msgstr "Èçïðàçíè êîø÷åòî"
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Èçïðàçíè ïàïêà(è)"
 
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Èçïðàçíè êîø÷åòî"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Èçïðàçíè êîø÷åòî"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
+msgstr "Èçïðàçíè êîø÷åòî"
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Äà ñå ðàçðåøè ëè PGP ôóíêöèîíàëíîñòòà?"
 
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Äà ñå ðàçðåøè ëè S/MIME ôóíêöèîíàëíîñòòà?"
 
-msgid "Encrypt Message"
-msgstr "Êðèïòèðàíå íà ïèñìî"
+#: config/prefs.php.dist:811
+#, fuzzy
+msgid "Enable message previews?"
+msgstr "Êðàé íà ïèñìîòî îò %s"
+
+#: templates/compose/compose.inc:442
+#, fuzzy
+msgid "Encr_yption Options"
+msgstr "Áåç êðèïòèðàíå"
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
 
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Êðàé íà ïðåïðàòåíîòî ïèñìî"
 
+#: lib/Compose.php:341
 msgid "End message"
 msgstr "Êðàé íà ïèñìîòî"
 
-#, c-format
+#: lib/Compose.php:339
+#, php-format
 msgid "End message from %s"
 msgstr "Êðàé íà ïèñìîòî îò %s"
 
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Âúâåäåòå êëþ÷îâà ôðàçà"
 
-#, c-format
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr ""
+
+#: templates/prefs/folderselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new drafts folder"
+msgstr "Ñúçäàé íîâà ïàïêà \"×åðíîâè\""
+
+#: templates/prefs/sentmailselect.inc:23
+#, fuzzy
+msgid "Enter the name for your new sent mail folder"
+msgstr "Ñúçäàé íîâà ïàïêà \"Èçïðàòåíè\""
+
+#: templates/prefs/trashselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new trash folder"
+msgstr "Ñúçäàé íîâà ïàïêà \"Êîø÷å\""
+
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Êðèïòèðàíå íà ïèñìî"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Çàïèñà \"%s\" áåøå óñïåøíî äîáàâåí êúì àäðåñíàòà êíèãà"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Ãðåøêà"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Íàñòðîéêèòå áÿõà îáíîâåíè óñïåøíî."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Âñåêè 15 ìèíóòè"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Âñåêè 30 ñåêóíäè"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Âñåêè 5 ìèíóòè"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Íà âñåêè ïîëîâèí ÷àñ"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Âñÿêà ìèíóòà"
 
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Ðàçòâîðè âñè÷êè"
+
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Ðàçòâîðè âñè÷êè"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Ðàçòâîðè âñè÷êè ïàïêè"
 
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Ðàçòâîðè ïàïêà"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Äîïèøè èìåíàòà"
 
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Äà ñå äîïèñâàò ëè àâòîìàòè÷íî èìåíàòà ïðè ïèñàíå íà íîâî ïèñìî?"
 
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Äà ñå îòâàðÿ ëè öÿëîòî äúðâî â èçãëåä \"Ïàïêè\" ïî ïîäðàçáèðàíå?"
 
-msgid "Expanding..."
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
 msgstr "Îòâàðÿíå..."
 
-msgid "Expiration Date"
-msgstr "Äàòà íà èçòè÷àíå"
-
-msgid "Expunge error!"
-msgstr "Ãðåøêà ïðè çàëè÷àâàíå!"
-
-msgid "February"
-msgstr "Ôåâðóàðè"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Äðóãà ïîùà"
 
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Äðóãà ïîùà"
 
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "Äà ñå èçòåãëÿ ëè ïîùàòà â îòäåëåí ïðîçîðåö?"
 
-msgid "Field"
-msgstr "Ïîëå"
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Äà ñå ïðèëàãàò ëè ôèëòðèòå ñëåä âõîä?"
+
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Èìïîðòèðàíè áÿõà %d ïèñìà îò %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Êðàé íà ïèñìîòî îò %s"
 
-msgid "Filename"
-msgstr "Èìå íà ôàéë"
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#, fuzzy
+msgid "Fetchmail: "
+msgstr "Äðóãà ïîùà"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Ôèëòúð àêòèâíîñò: Ïèñìîòî \"%s\" îò \"%s\" áåøå èçòðèòî."
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr " - $nm íîâè ïèñìà"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"Ôèëòúð Àêòèâíîñò: Ïèñìîòî \"%s\" îò \"%s\" áåøå ïðåìåñòåíî â ïàïêà \"%s\"."
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Ôèëòúð"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr "Ôèëòúð Àêòèâíîñò: Ïèñìîòî \"%s\" îò \"%s\" áåøå ïðåìåñòåíî â êîø÷åòî."
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Ôèëòúð"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Äðóãè Îïöèè"
 
-msgid "Filter Rules"
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Ïðàâèëà çà ôèëòðèðàíå"
 
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "Äà ñå ôèëòðèðà ëè ñúäúðæàíèåòî íà ïèñìàòà çà ðóãàòíè?"
 
+#: templates/filters/notactive.inc:11
+#, fuzzy
+msgid "Filter support is disabled on this system."
+msgstr "Ñèñòåìàòà å ñ èçêëþ÷åíà PGP ïîääðúæêà."
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Ôèëòúð"
 
+#: templates/filters/notactive.inc:3
+#, fuzzy
+msgid "Filters NOT Active"
+msgstr "PGP ÍÅ Å àêòèâåí"
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Òúðñè"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Ïúðâà ñòðàíèöà"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Ïúðâà ñòðàíèöà"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Ïðåïðàòè"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Íàâèãàòîð íà ïàïêèòå"
 
-msgid "Folder Prefix"
-msgstr "Ïàïêà ïðåôèêñ"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Ôåâðóàðè"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
 
-msgid "Folders"
-msgstr "Ïàïêè"
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
 
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Ïðåïðàòè"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Ïðåïðàòè:"
 
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Ïðåïðàòåíî ïèñìî"
 
-#, c-format
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Ïðåïðàòåíî ïèñìî îò %s"
 
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Èíôîðìàöèÿ çà Ñúðâúðà"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "Îò"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Îò"
 
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "Îò àäðåñ"
 
-msgid "From:"
-msgstr "Îò:"
-
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fwd:"
 
+#: compose.php:1294
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#, c-format
+#: compose.php:1296
+#, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u Ïðåïðàòåíî ïèñìî"
 
-msgid "Get only new messages (IMAP only)"
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Ïîòðåáèòåëñêè îïöèè"
+
+#: templates/fetchmail/manage.inc:37
+#, fuzzy
+msgid "Get only new messages? (IMAP only)"
 msgstr "Èçòåãëè ñàìî íîâèòå ïèñìà (ñàìî çà IMAP)"
 
-msgid "Green"
-msgstr "Green"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "Ñëåäâàùî ïèñìî"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Äîáàâè êúì àäðåñíà êíèãà (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
 
-msgid "Grey"
-msgstr "Grey"
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
 
-msgid "Guest Services"
-msgstr "Óñëóãè çà ãîñòè"
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
 
-msgid "Hash-Algorithm"
-msgstr "Hash-Àëãîðèòúì"
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
 
+#: templates/message/headers.inc:58
 msgid "Headers"
 msgstr "Çàãëàâíè ÷àñòè"
 
-msgid "Help"
-msgstr "Ïîìîù"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "Èçãëåä ïî ñìèñëîâè íèøêè"
 
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Ñêðèé èçòðèòèòå"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Ñêðèé íåàáîíèðàíèòå"
 
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Áúðçî"
 
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Áúðçà ïîùà"
 
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Åêñïðåñíî"
 
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Êàê èñêàòå äà ñå ïîêàçâàò ïðèêðåïåíèòå ôàéëîâå?"
 
-msgid "How to prefix quoted lines in a reply:"
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Êàêúâ äà å ïðåôèêñà ïðåä ëèíèèòå â ïèñìîòî îòãîâîð:"
 
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-msgid "IMAP Auto"
-msgstr "IMAP Àóòî"
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
 
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP âúðõó SSL"
 
+#: lib/Fetchmail/imap.php:152
+#, fuzzy
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP âúðõó SSL (ñàìîïîäïèñàí)"
+
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP âúðõó SSL (ñàìîïîäïèñàí)"
 
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, áåç TLS"
 
-msgid "IMAP/POP3 Accounts"
-msgstr "IMAP/POP3 Ïîùè"
-
-msgid "IMP is not properly configured"
-msgstr "IMP íå å êîíôèãóðèðàí êîðåêòíî"
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
 
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-msgid "Identities"
-msgstr "Èäåíòè÷íîñòè"
-
-msgid "Identity"
-msgstr "Èäåíòè÷íîñò"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity's name:"
-msgstr "Èìå íà èäåíòè÷íîñòòà:"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
 
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Èãíîðèðàé"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Èãíîðèðàé âñè÷êè"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Âàæíè"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "Èìïîðò íà PGP êëþ÷"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "Èìïîðò íà PGP êëþ÷"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "Âàæíî ïèñìî"
+
+#: pgp.php:42
 msgid "Import PGP Key"
 msgstr "Èìïîðò íà PGP êëþ÷"
 
-msgid "Import Personal Private PGP Key"
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
 msgstr "Èìïîðò íà ëè÷åí ÷àñòåí PGP êëþ÷"
 
-msgid "Import Personal Private S/MIME Key"
-msgstr "Èìïîðò íà ëè÷åí ÷àñòåí S/MIME êëþ÷"
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr "Èìïîðò íà ëè÷åí ÷àñòåí PGP êëþ÷"
 
+#: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
 msgstr "Èìïîðò íà ïåðñîíàëåí ïóáëè÷åí PGP êëþ÷"
 
-msgid "Import Personal Public S/MIME Key"
+#: templates/smime/import_key.inc:4
+#, fuzzy
+msgid "Import Personal S/MIME Certificates"
 msgstr "Èìïîðò íà ïåðñîíàëåí ïóáëè÷åí S/MIME êëþ÷"
 
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+#, fuzzy
+msgid "Import Public Key"
+msgstr "Èìïîðò íà ïóáëè÷åí PGP êëþ÷"
+
+#: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
 msgstr "Èìïîðò íà ïóáëè÷åí PGP êëþ÷"
 
+#: templates/smime/import_key.inc:8
+#, fuzzy
+msgid "Import Public S/MIME Key"
+msgstr "Èìïîðò íà ïåðñîíàëåí ïóáëè÷åí S/MIME êëþ÷"
+
+#: smime.php:16
 msgid "Import S/MIME Key"
 msgstr "Èìïîðò íà S/MIME êëþ÷"
 
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "Èìïîðò íà mbox ôàéë"
 
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Âàæíè"
 
+#: templates/search/main.inc:47
 msgid "Important messages"
 msgstr "Âàæíî ïèñìî"
 
-#, c-format
+#: folders.php:167
+#, php-format
 msgid "Imported %d messages from %s."
 msgstr "Èìïîðòèðàíè áÿõà %d ïèñìà îò %s."
 
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Äà ñå âêëþ÷âà ëè êðàòêî îáîáùåíèå îò headers â îòãîâîðà?"
 
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Äà ñå âêëþ÷è ëè è îðèãèíàëíîòî ïèñìî â îòãîâîðà?"
 
-#, c-format
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Èãíîðèðàé"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "Information on %s Public Key"
 msgstr "Èíôîðìàöèÿ çà %s ïóáëè÷åí êëþ÷"
 
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Èíôîðìàöèÿ çà ïåðñîíàëíèÿ ÷àñòåí êëþ÷"
 
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Èíôîðìàöèÿ çà ïåðñîíàëíèÿ ïóáëè÷åí êëþ÷"
 
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "Â ðåäà"
 
-msgid "Insert Key Here"
+#: templates/smime/import_key.inc:9
+#, fuzzy
+msgid "Insert Certificate Here"
 msgstr "Âìúêíåòå êëþ÷à òóê"
 
-msgid "Invalid PGP Key."
-msgstr "Íåâàëèäåí PGP êëþ÷."
+#: templates/pgp/import_key.inc:15
+#, fuzzy
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Èìïîðò íà ëè÷åí ÷àñòåí PGP êëþ÷"
+
+#: templates/pgp/import_key.inc:10
+#, fuzzy
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Èìïîðò íà ïåðñîíàëåí ïóáëè÷åí PGP êëþ÷"
+
+#: templates/pgp/import_key.inc:5
+#, fuzzy
+msgid "Insert Public PGP Key Here"
+msgstr "Èìïîðò íà ïóáëè÷åí PGP êëþ÷"
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Åmail àäðåñ"
 
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Íåâàëèäíà îòäàëå÷åíà (íåëîêàëíà) ïîùeíñêà êóòèÿ"
 
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
 msgid "Invalid key"
 msgstr "Íåâàëèäåí êëþ÷"
 
+#: pgp.php:196
 msgid "Invalid personal PGP private key."
 msgstr "Íåâàëèäåí ïåðñîíàëåí PGP ÷àñòåí êëþ÷."
 
+#: pgp.php:171
 msgid "Invalid personal PGP public key."
 msgstr "Íåâàëèäåí ïåðñîíàëåí PGP ïóáëè÷åí êëþ÷."
 
-msgid "January"
-msgstr "ßíóàðè"
-
-msgid "July"
-msgstr "Þëè"
-
-msgid "June"
-msgstr "Þíè"
-
-msgid "Key Creation"
-msgstr "Ñúçäàâàíå íà êëþ÷"
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
 
-msgid "Key Fingerprint"
-msgstr "Êëþ÷îâ îòïå÷àòúê"
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
 
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Äúëæèíà íà êëþ÷à"
 
-msgid "Key Type"
-msgstr "Êëþ÷ òèï"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
 
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr "Êëþ÷à áåøå èçïðàòåí óñïåøíî â ïóáëè÷íèÿ êëþ÷ñúðâúð."
 
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Åçèê"
 
-msgid "Last Page"
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
 msgstr "Ïîñëåäíà ñòðàíèöà"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Ïîñëåäíî âëèçàíå: %s"
+#: mailbox.php:358
+msgid "Last Page"
+msgstr "Ïîñëåäíà ñòðàíèöà"
+
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Ïðèêðåïåíè ôàéëîâå"
 
-msgid "Last login: Never"
-msgstr "Ïîñëåäíî âëèçàíå: Íèêîãà"
+#: attachment.php:34 lib/Compose.php:1063
+#, fuzzy
+msgid "Linked attachments are forbidden."
+msgstr "Íÿìà íàìåðåíè ïðèêðåïåíè ôàéëîâå."
 
-msgid "Light Blue"
-msgstr "Light Blue"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
-msgstr "Äà ñå ïîêàçâàò ëè âñè÷êè êîíòàêòè, êîãàòî ñå çàðåæäà åêðàíà ñ "
-"êîíòàêòè? (àêî å çàáðàíåíî, ùå âèæäàòå ñàìî êîíòàêòèòå êîèòî ñòå òúðñèëè)"
-
-msgid "List-Archive"
-msgstr "List-Archive"
-
-msgid "List-Help"
-msgstr "List-Help"
-
-msgid "List-Id"
-msgstr "Ñïèñúê-Id"
-
-msgid "List-Owner"
-msgstr "List-Owner"
-
-msgid "List-Post"
-msgstr "List-Post"
-
-msgid "List-Subscribe"
-msgstr "List-Subscribe"
-
-msgid "List-Unsubscribe"
-msgstr "List-Unsubscribe"
+msgstr ""
+"Äà ñå ïîêàçâàò ëè âñè÷êè êîíòàêòè, êîãàòî ñå çàðåæäà åêðàíà ñ êîíòàêòè? (àêî "
+"å çàáðàíåíî, ùå âèæäàòå ñàìî êîíòàêòèòå êîèòî ñòå òúðñèëè)"
 
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Ñïèñúê â çàãëàâèåòî"
 
+#: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
 msgstr "Ëîêàëíà ïîùà:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Äåéñòâèå"
+
+#: templates/login/login.inc:225
+#, fuzzy
+msgid "Log in"
+msgstr "Âõîä â %s"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Âõîä â %s"
 
-msgid "Login Tasks"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Çàäà÷è ïðè âõîä"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr ""
-"Ðåãèñòðèðàíåòî ñå ïðîâàëè ïîðàäè íåèçâåñòíà ïðè÷èíà. Âåðîÿòíî ãðåøíî "
-"âúâåäåíî ïîòðåáèòåëñêî èìå èëè ïàðîëà."
-
-msgid "Logout"
-msgstr "Èçõîä"
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr "Çàäà÷è ïðè âõîä"
 
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Îáèêíîâåííî"
 
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Ñëàá ïðèîðèòåò"
 
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Áåç ïðèîðèòåò"
 
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "Ïîùà Ôèëòðè"
+
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Ïîùà"
 
-msgid "Mail Filters"
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
 msgstr "Ïîùà Ôèëòðè"
 
-msgid "Mail Management"
-msgstr "Ïîùà Óïðàâëåíèå"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Ïîùåíñêà êóòèÿ"
 
-msgid "Maintenance Operations"
-msgstr "Îïåðàöèè ïî îáñëóæâàíåòî"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Äèñïëåé Îïöèè"
+
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
 
-msgid "March"
-msgstr "Ìàðò"
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Ìàðêèðàé êàòî:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Äà ñå ìàðêèðàò ëè ðàçëè÷íèòå íèâà íà îòãîâîðè ñ ðàçëè÷íè öâåòîâå?"
 
-msgid "Mark messages as seen (IMAP only)"
+#: templates/fetchmail/manage.inc:40
+#, fuzzy
+msgid "Mark messages as seen? (IMAP only)"
 msgstr "Ìàðêèðàé ïèñìàòà êàòî ïðåãëåäàíè (ñàìî çà IMAP)"
 
-msgid "May"
-msgstr "Ìàé"
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Ïðèêðåïåí ôàéë"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Èíôîðìàöèÿ çà Ñúðâúðà"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Îòâîðè ïàïêà"
 
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Ïèñìî"
 
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Íàïèñâàíå íà ïèñìî"
 
-msgid "Message Composition Options"
-msgstr "Îïöèè ïðè íàïèñâàíå íà ïèñìî"
-
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Äàòà íà ïèñìîòî"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "ïèñìàòà â"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Òúðñåíå íà ïèñìî"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Ðàçìåð íà ïèñìîòî"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "ñîðñ êîä íà ïèñìîòî"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Ïðåãëåä íà ïèñìî"
 
-msgid "Message bounced successfully."
-msgstr "Ïèñìîòî áåøå îòõâúðëåíî óñïåøíî."
-
-msgid "Message fields"
-msgstr "Ïîëåòà íà ïèñìîòî"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Ôëàãîâå íà ïèñìîòî"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Ïàïêè çà ïèñìà"
 
-#, c-format
+#: lib/Compose.php:329
+#, php-format
 msgid "Message from %s"
 msgstr "Ïèñìî îò %s"
 
-#, c-format
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Èçòðèé ïðèêðåïåíèÿò ôàéë %s."
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Ïîëåòà íà ïèñìîòî"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Ïîëåòà íà ïèñìîòî"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Äàòà íà ïèñìîòî"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
+msgstr "Ïèñìîòî áåøå èçïðàòåíî óñïåøíî."
+
+#: compose.php:1084
+#, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Ïèñìîòî áåøå èçïðàòåíî óñïåøíî, íî íå áåøå çàïèñàíî â %s"
 
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "Ïèñìîòî áåøå èçïðàòåíî óñïåøíî."
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Ïèñìà â ñòðàíèöà çà ïîùåíñêàòà êóòèÿ."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "ïèñìàòà â"
 
-msgid "Mime Type"
-msgstr "Mime òèï"
+#: templates/acl/acl.inc:29
+#, fuzzy
+msgid "Modify"
+msgstr "Òÿëî"
+
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Ïðåìåñòè"
 
-msgid "Move Message to"
-msgstr "Ïðåìåñòè ïèñìî â"
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "íà äîëó"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "èçáåðè ïàïêà"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "íà ãîðå"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Ïðåãëåä íà ïèñìî"
 
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Ïðåìåñòè ïèñìàòà â <b>%s</b> ïàïêà"
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
 
-msgid "Mozilla"
-msgstr "Mozilla"
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
 
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Èìå"
 
+#: pgp.php:110
 msgid "Name and/or email can not be empty"
 msgstr "Èìå è/èëè email íå ìîãàò äà ñà ïðàçíè"
 
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Äåéñòâèå"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Íèêîãà"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "Èçòðèé ïðèêðåïåíèÿò ôàéë %s."
+
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Íîâè"
 
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Íîâà ïàïêà"
 
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Íîâà ïîùà"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Ñëåäâàùî ïèñìî"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Íîâè ïèñìà"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Íîâè ïèñìà"
 
+#: templates/compose/spelling.inc:133
+#, fuzzy
+msgid "Next"
+msgstr "Òåêñò"
+
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Ñëåäâàùî ïèñìî"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Ñëåäâàùà ñòðàíèöà"
 
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "Íå"
 
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
 msgid "No Encryption"
 msgstr "Áåç êðèïòèðàíå"
 
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Íÿìà êëþ÷îâå â ñïèñúêà"
 
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "Íîâè ïèñìà"
+
+#: pgp.php:137
 msgid "No PGP public key imported."
 msgstr "Íÿìà èìïîðòèðàí PGP ïóáëè÷åí êëþ÷."
 
+#: templates/smime/smime.inc:84
+#, fuzzy
+msgid "No Personal Certificate Present"
+msgstr "Èìïîðò íà ëè÷åí ÷àñòåí PGP êëþ÷"
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Êîðèãèðàí òåêñò"
+
+#: templates/smime/smime.inc:15
+#, fuzzy
+msgid "No Public Keys Found"
+msgstr "Âàøèÿò ïóáëè÷åí êëþ÷"
+
+#: smime.php:151
+#, fuzzy
+msgid "No S/MIME public key imported."
+msgstr "Íå áåøå èìïîðòèðàí ïåðñîíàëåí S/MIME ïóáëè÷åí êëþ÷."
+
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Íÿìà íàìåðåíè ïðèêðåïåíè ôàéëîâå."
 
-msgid "No folder selected"
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Èíôîðìàöèÿ çà %s ïóáëè÷åí êëþ÷"
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
 msgstr "Íÿìà èçáðàíà ïàïêà"
 
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Íå áÿõà èçáðàíè ïàïêè"
 
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Íåèçòðèòè ïèñìà"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Íåèçòðèòè ïèñìà"
+
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "Íÿìà òåêñò â òÿëîòî íà ïèñìîòî"
 
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
 msgstr "Íÿìà ïèñìà îòãîâàðÿùè íà òúðñåíåòî."
 
-msgid "No messages to fetch..."
-msgstr "Íÿìà ïèñìà çà èçòåãëÿíå..."
-
+#: pgp.php:189
 msgid "No personal PGP private key imported."
 msgstr "Íå áåøå èìïîðòèðàí ïåðñîíàëåí PGP ÷àñòåí êëþ÷."
 
+#: pgp.php:165
 msgid "No personal PGP public key imported."
 msgstr "Íå áåøå èìïîðòèðàí ïåðñîíàëåí PGP ïóáëè÷åí êëþ÷."
 
-msgid "No personal S/MIME private key imported."
+#: smime.php:201
+#, fuzzy
+msgid "No personal S/MIME certificates imported."
 msgstr "Íå áåøå èìïîðòèðàí ïåðñîíàëåí S/MIME ÷àñòåí êëþ÷."
 
-msgid "No personal S/MIME public key imported."
-msgstr "Íå áåøå èìïîðòèðàí ïåðñîíàëåí S/MIME ïóáëè÷åí êëþ÷."
-
-msgid "No rule selected"
-msgstr "Íå áÿõà èçáðàíè ïðàâèëà"
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
 
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Íÿìà ïðàâîïèñíè ãðåøêè"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Íÿìà ïðåäëîæåíèÿ"
 
-msgid "No text specified"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
 msgstr "Íÿìà çàäàäåí òåêñò"
 
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Íÿìà"
 
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Íîðìàëíî"
 
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Íåèçòðèòè"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Íå-÷åðíîâè"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Ìàëîâàæíè"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Íå-ëè÷íè"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Íåâàëèäåí ïóáëè÷åí êëþ÷."
 
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Íåèçòðèòè ïèñìà"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Ìàëîâàæíè ïèñìà"
 
-msgid "November"
-msgstr "Íîåìâðè"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Îòãîâîð"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Áðîé íà ñòàðèòå ïàïêè \"Èçïðàòåíà ïîùà\" çà ñúõðàíåíèå, àêî ñå òðèÿò ìåñå÷íî."
 
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Áðîé íà ñòàðèòå ïàïêè \"Èçïðàòåíà ïîùà\" çà ñúõðàíåíèå, àêî ñå òðèÿò ìåñå÷íî."
 
-msgid "October"
-msgstr "Îêòîìâðè"
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr ""
+
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Ñòàðè ïèñìà"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Ñòàðè ïàïêè \"Èçïðàòåíà ïîùà\", êîéòî ñå çàëè÷àâàò."
 
-msgid "Open Folder"
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+msgid "Only one folder should be selected for this action."
+msgstr ""
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Îòâîðè ïàïêà"
 
-msgid "Options"
-msgstr "Îïöèè"
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Îòâîðè ïàïêà"
 
-msgid "Orange"
-msgstr "Orange"
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
 
-msgid "Other Header:"
-msgstr "Äðóãà çàãëàâíà ÷àñò:"
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "Äðóãè Îïöèè"
 
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Äðóãè Îïöèè"
 
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
-msgid "PGP Digital Signature"
-msgstr "PGP öèôðîâ ïîäïèñ"
-
-msgid "PGP Encrypted Data"
-msgstr "PGP êðèïòèðàíè äàííè"
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "Ïîäïèøè/êðèïòèðàé ïèñìî ñ PGP"
 
-#, c-format
-msgid "PGP Error: %s"
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
 msgstr "PGP ãðåøêà: %s"
 
-msgid "PGP Error: For message encryption, there can only be one recipient."
-msgstr "PGP Ãðåøêà: Ïðè êðèïòèðàíî ïèñìî ìîæå äà èìà ñàìî åäèí ïîëó÷àòåë."
-
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP Ãðåøêà: Íåîáõîäèìà å êëþ÷îâà ôðàçà çà ÷àñòåí êëþ÷."
 
-msgid "PGP NOT Active"
-msgstr "PGP ÍÅ Å àêòèâåí"
-
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP Îïöèè"
 
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "Âúâåäåòå PGP êëþ÷îâà ôðàçà"
 
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "PGP ïåðñîíàëíà êëþ÷îâà äâîéêà èçèñêâà êðèïòèðàíà web âðúçêà."
 
-msgid "PGP Public Key"
+#: lib/MIME/Viewer/pgp.php:173
+#, fuzzy
+msgid "PGP Public Key Text"
 msgstr "PGP Ïóáëè÷åí êëþ÷"
 
-#, c-format
+#: pgp.php:149
+#, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "PGP ïóáëè÷åí êëþ÷ çà \"%s (%s)\" áåøå óñïåøíî äîáàâåí."
 
-#, c-format
+#: pgp.php:245
+#, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "PGP ïóáëè÷åí êëþ÷ çà \"%s\" áåøå óñïåøíî èçòðèò."
 
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP ïóáëè÷åí ñïèñúê"
 
-msgid "PGP Public/Private Keypair successfully added."
-msgstr "PGP äâîéêà ïóáëè÷åí/÷àñòåí êëþ÷ áåøå óñïåøíî äîáàâåíà."
-
+#: templates/compose/encrypt_list.inc:8
 msgid "PGP Sign Message"
 msgstr "Ïîäïèøè ñ PGP "
 
+#: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
 msgstr "Ïîäïèøè/êðèïòèðàé ïèñìî ñ PGP"
 
-msgid "PGP Signed/Encrypted Data"
-msgstr "PGP ïîäïèñàíè è êðèïòèðàíè äàííè"
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "PGP äâîéêà ïóáëè÷åí/÷àñòåí êëþ÷ áåøå óñïåøíî äîáàâåíà."
+
+#: pgp.php:177
+#, fuzzy
+msgid "PGP public key successfully added."
+msgstr "PGP äâîéêà ïóáëè÷åí/÷àñòåí êëþ÷ áåøå óñïåøíî äîáàâåíà."
 
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Ñèñòåìàòà å ñ èçêëþ÷åíà PGP ïîääðúæêà."
 
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 "PGP ïîääðúæêàòà íå å àêòèâíà è öèôðîâèÿò ïîäïèñ íå ìîæå äà áúäå ïðîâåðåí."
 
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr "PGP ïîääðúæêàòà íå å àêòèâíà è ïèñìîòî íå ìîæå äà áúäå äåêðèïòèðàíî."
 
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-msgid "POP3 Auto"
-msgstr "POP3 Àóòî"
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+#, fuzzy
+msgid "POP3 over SSL"
+msgstr "IMAP âúðõó SSL"
+
+#: lib/Fetchmail/imap.php:123
+#, fuzzy
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 âúðõó SSL (ñàìîïîäïèñàí)"
 
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 âúðõó SSL (ñàìîïîäïèñàí)"
 
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, áåç TLS"
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "ñòðàíèöà %d îò %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "×àñò(è)"
 
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Êëþ÷îâà ôðàçà"
 
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Êëþ÷îâà ôðàçà (îòíîâî)"
 
+#: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
 msgstr "Êëþ÷îâàòà ôðàçà áåøå óñïåøíî ïðåìàõíàòà."
 
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Êëþ÷îâà ôðàçà:"
 
+#: pgp.php:112
 msgid "Passphrases can not be empty"
 msgstr "Êëþ÷îâàòà ôðàçà íå ìîæå äà å ïðàçíà"
 
+#: pgp.php:114
 msgid "Passphrases do not match"
 msgstr "Êëþ÷îâàòà ôðàçà íå ñúâïàäà"
 
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Ïàðîëà"
 
-msgid "Password:"
-msgstr "Ïàðîëà:"
-
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "Äà ñå èçâúðøâàò ëè îáñëóæâàùèòå îïåðàöèè ïðè Âõîä?"
 
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Ïåðñîíàëíè"
 
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Ïåðñîíàëíà èíôîðìàöèÿ"
 
+#: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
 msgstr "Ïåðñîíàëíà PGP êëþ÷îâà äâîéêà áåøå óñïåøíî ãåíåðèðàíà."
 
+#: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
 msgstr "Ïåðñîíàëíè PGP êëþ÷îâå áÿõà óñïåøíî èçòðèòè."
 
+#: smime.php:207
+#, fuzzy
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Íå áåøå èìïîðòèðàí ïåðñîíàëåí S/MIME ÷àñòåí êëþ÷."
+
+#: smime.php:132
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Ïåðñîíàëíè S/MIME êëþ÷îâå áÿõà óñïåøíî èçòðèòè."
 
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Äà ñå ñëàãà ëè âàøèÿò ïîäïèñ ïðåäè îòãîâîð è ïðåïðàùàíå?"
 
-#, c-format
+#: compose.php:254
+#, fuzzy
+msgid "Plaintext Version of Message"
+msgstr "Ïîêàæè â ñúäúðæàíèåòî íà ïèñìîòî"
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "Please enter a name for the new folder:"
+msgstr ""
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
+msgid "Please enter the name of the new folder:"
+msgstr ""
+
+#: templates/javascript/folders.js:137
+msgid "Please enter the new name:"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:19
+#, php-format
 msgid ""
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per %s session."
@@ -1363,7 +2997,8 @@
 "Ìîëÿ, âúâåäåòå êëþ÷îâà ôðàçà çà Âàøèÿò PGP ÷àñòåí êëþ÷. Íåîáõîäèìî å äà "
 "âúâåäåòå òàçè ôðàçà âåäíúæ çà %s ñåñèÿ."
 
-#, c-format
+#: templates/smime/passphrase.inc:13
+#, php-format
 msgid ""
 "Please enter the passphrase for your S/MIME private key. You will only need "
 "to enter this passphrase once per %s session."
@@ -1371,409 +3006,1077 @@
 "Ìîëÿ, âúâåäåòå êëþ÷îâà ôðàçà çà Âàøèÿò S/MIME ÷àñòåí êëþ÷. Íåîáõîäèìî å äà "
 "âúâåäåòå òàçè ôðàçà âåäíúæ çà %s ñåñèÿ."
 
-msgid "Please fill in the text and choose a field and an action"
-msgstr "Ìîëÿ, âúâåäåòå òåêñòà è èçáåðåòå ïîëå è äåéñòâèå"
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+msgid "Please provide your password."
+msgstr ""
+
+#: templates/login/login.inc:67
+msgid "Please provide your username."
+msgstr ""
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Ìîëÿ, êîðèãèðàéòå íåâàëèäíèòå èëè áåçñìèñëåíè àäðåñè."
 
-msgid "Please select or edit right next:"
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
+msgid "Please select a folder before you perform any actions."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:502
+msgid "Please select an action from the menu below."
+msgstr ""
+
+#: templates/search/javascript.inc:41
+msgid "Please select at least one folder to search."
+msgstr ""
+
+#: templates/javascript/folders.js:12
+msgid "Please select only one folder for this operation."
+msgstr ""
+
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "Ìîëÿ, èçáåðåòå èëè ðåäàêòèðàéòå:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Ïðåäõîæäàéòå ïîäïèñà ñè ñ òèðåòà ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Íàñòðîéêèòå áÿõà îáíîâåíè óñïåøíî."
 
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Ïðåäèøíà ñòðàíèöà"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Ïðåäèøíî ïèñìî"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Ïðåäèøíà ñòðàíèöà"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Îòïå÷àòàé"
 
+#: templates/message/headers.inc:38
 msgid "Priority"
 msgstr "Ïðèîðèòåò"
 
-msgid "Private Key"
+#: templates/smime/import_key.inc:76
+#, fuzzy
+msgid "Private Key Password"
 msgstr "×àñòåí êëþ÷"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Ïðîáëåì ñ ôèëòúð %d: íå ñúùåñòâóâà ïàïêà: %s"
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
 
+#: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Ïðîòîêîë:"
 
-msgid "Public Key"
-msgstr "Ïóáëè÷åí êëþ÷"
-
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Ïîääðúæêàòà çà PGP êëþ÷îâ ñúðâúð áåøå çàáðàíåíà."
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Çàëè÷è èçòðèòèòå"
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Çàëè÷è èçòðèòèòå"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Èçòðèé ïàïêà(è)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Êîëêî ÷åñòî äà ñå èçïðàçâà êîø÷åòî:"
 
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Èç÷èñòè ïèñìàòà îò êîø÷åòî, êîèòî ñà ïî-ñòàðè îò òîëêîâà äíè."
 
-msgid "Purge old message in the Trash folder?"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Äà ñå çàëè÷àâàò ëè ñòàðèòå ïèñìà â êîø÷åòî?"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Çàëè÷àâàíå íà %d ïèñìî(à) îò êîø÷åòî"
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "Çàëè÷àâàíå íà %d ïèñìî(à) îò êîø÷åòî"
 
-#, c-format
+#: templates/quota/quota.inc:17
+#, php-format
 msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
 msgstr "Êâîòà ñòàòóñ: %.2fMB / %.2fMB  (%.2f%%)"
 
+#: templates/quota/quota.inc:21
+#, fuzzy, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "Êâîòà ñòàòóñ: ÁÅÇ ËÈÌÈÒ"
+
+#: templates/quota/quota.inc:24
+#, php-format
 msgid "Quota status: NO LIMIT"
 msgstr "Êâîòà ñòàòóñ: ÁÅÇ ËÈÌÈÒ"
 
-msgid "Quoting"
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Îòãîâîð"
 
-msgid "Received after"
-msgstr "Ïîëó÷åíî ñëåä"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Ïîëó÷åíî íà"
 
-msgid "Received before"
-msgstr "Ïîëó÷åíî ïðåäè"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Ïîëó÷åíî íà"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Ïîëó÷åíî íà"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Ïðåíàñî÷è"
+
+#: templates/message/navbar_actions.inc:16
 msgid "Redirect"
 msgstr "Ïðåíàñî÷è"
 
+#: templates/compose/redirect.inc:110
+#, fuzzy
+msgid "Redirect Message"
+msgstr "Ïðåíàñî÷è òîâà ïèñìî"
+
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Ïðåíàñî÷è òîâà ïèñìî"
 
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Ïðåíàñî÷âàíåòî ñå ïðîâàëè"
 
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "Îïðåñíè"
 
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Îïðåñíÿâàé èçãëåäèòå íà ïàïêèòå"
 
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Ïðåçàðåäè èçãëåäà"
+
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Ïðåçàðåäè èçãëåäà"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Çàïîìíè ïîñëåäíèÿ èçãëåä"
 
+#: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
 msgstr "Ïîùåíñêà êóòèÿ:"
 
-msgid "Remove Selected"
-msgstr "Ïðåìåñòè èçáðàíîòî"
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "ïðåìàõíè ñîðñà"
 
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Ïðåèìåíóâàé ïàïêà(è)"
 
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Äà ñå ïðåèìåíóâà ëè \"Èçïðàòåíà ïîùà\" ïàïêà â íà÷àëîòî íà ìåñåöà?"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Ïðåèìåíóâàíåòî íà \"%s\" â \"%s\" ñå ïðîâàëè. Åòî êàêâî êàçà ñúðâúðà"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Îòãîâîð äî ñïèñúêà"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Çàìåíè ñ:"
 
+#: templates/message/navbar_actions.inc:8
 msgid "Reply"
 msgstr "Îòãîâîð"
 
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Îòãîâîð"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Îòãîâîð äî âñè÷êè"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Îòãîâîð äî âñè÷êè:"
 
+#: templates/message/navbar_actions.inc:10
 msgid "Reply to List"
 msgstr "Îòãîâîð äî ñïèñúêà"
 
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "Îòãîâîð äî ñïèñúêà:"
 
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Îòãîâîð äî âñè÷êè"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
 msgid "Reply-To"
 msgstr "Îòãîâîð-Äî"
 
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Îòãîâîð-Äî:"
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Îòãîâîð:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Ðàïîðò çà Ñïàì"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Ðàïîðò çà Ñïàì"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
 msgstr "Èçèñêàé ïîòâúðæäåíèå çà ïîëó÷àâàíå"
 
-msgid "Resume"
-msgstr "Ïîäíîâè"
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
 
-msgid ""
-"Return to the mailbox listing after deleting, moving, or copying a message?"
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
+msgstr "Èçèñêàé ïîòâúðæäåíèå çà ïîëó÷àâàíå"
+
+#: mailbox.php:189
+msgid "Requested message not found."
 msgstr ""
-"Âúðíè ñå êúì ïîùåíñêàòà êóòèÿ ñëåä èçòðèâàíå, ìåñòåíå èëè êîïèðàíå íà ïèñìî."
 
-msgid "Rule Definition"
-msgstr "Äåôèíèðàíå íà ïðàâèëî"
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
 
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
+#, fuzzy
+msgid "Reset"
+msgstr "Ïîäíîâè"
+
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
+msgid "Resume"
+msgstr "Ïîäíîâè"
+
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Íàïèñâàíå íà ïèñìî"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+#, fuzzy
+msgid "Return to Fetch Mail"
+msgstr "Äðóãà ïîùà"
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Ïîòðåáèòåëñêè îïöèè"
+
+#: config/prefs.php.dist:718
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr ""
+"Âúðíè ñå êúì ïîùåíñêàòà êóòèÿ ñëåä èçòðèâàíå, ìåñòåíå èëè êîïèðàíå íà ïèñìî."
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
-msgid "S/MIME NOT Active"
-msgstr "S/MIME ÍÅ Å àêòèâåí"
+#: templates/compose/encrypt_list.inc:12
+#, fuzzy
+msgid "S/MIME Encrypt Message"
+msgstr "Êðèïòèðàíå íà ïèñìî"
+
+#: compose.php:394
+#, fuzzy
+msgid "S/MIME Error: "
+msgstr "S/MIME"
+
+#: compose.php:373
+#, fuzzy
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "PGP Ãðåøêà: Íåîáõîäèìà å êëþ÷îâà ôðàçà çà ÷àñòåí êëþ÷."
 
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME Îïöèè"
 
+#: smime.php:49
 msgid "S/MIME Passphrase Input"
 msgstr "Âúâåäåòå S/MIME êëþ÷îâà ôðàçà"
 
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "S/MIME ïîääðúæêàòà çà ïåðñîíàëíà êëþ÷îâà äâîéêà èçèñêâà êðèïòèðàíà web "
 "âðúçêà."
 
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "PGP ïóáëè÷åí êëþ÷ çà \"%s\" áåøå óñïåøíî èçòðèò."
+
+#: smime.php:162
+#, fuzzy
+msgid "S/MIME Public Key successfully added."
+msgstr "S/MIME äâîéêà ïóáëè÷åí/÷àñòåí êëþ÷ áåøå óñïåøíî äîáàâåíà."
+
+#: templates/smime/smime.inc:10
+#, fuzzy
+msgid "S/MIME Public Keyring"
+msgstr "PGP ïóáëè÷åí ñïèñúê"
+
+#: smime.php:211
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "S/MIME äâîéêà ïóáëè÷åí/÷àñòåí êëþ÷ áåøå óñïåøíî äîáàâåíà."
 
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "Ïîäïèøè ñ PGP "
+
+#: templates/compose/encrypt_list.inc:14
+#, fuzzy
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "Ïîäïèøè/êðèïòèðàé ïèñìî ñ PGP"
+
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Ñèñòåìàòà å ñ èçêëþ÷åíà S/MIME ïîääðúæêà."
 
+#: lib/MIME/Viewer/pkcs7.php:241
+#, fuzzy
 msgid ""
-"S/MIME support is not currently active so the message is unable to be "
+"S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
-msgstr "S/MIME ïîääðúæêàòà íå å àêòèâíà è ïèñìîòî íå ìîæå äà áúäå äåêðèïòèðàíî."
+msgstr ""
+"S/MIME ïîääðúæêàòà íå å àêòèâíà è ïèñìîòî íå ìîæå äà áúäå äåêðèïòèðàíî."
+
+#: lib/MIME/Viewer/pkcs7.php:173
+#, fuzzy
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+"S/MIME ïîääðúæêàòà íå å àêòèâíà è ïèñìîòî íå ìîæå äà áúäå äåêðèïòèðàíî."
+
+#: lib/MIME/Viewer/pkcs7.php:146
+#, fuzzy
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"PGP ïîääðúæêàòà íå å àêòèâíà è öèôðîâèÿò ïîäïèñ íå ìîæå äà áúäå ïðîâåðåí."
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Òåìà"
 
-msgid "Save a copy in "
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
 msgstr "Çàïèøè êîïèå â "
 
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Çàïèøè êàòî"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Çàïèøè êàòî"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save Draft"
+msgstr "Çàïèøè êàòî"
+
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Çàïèøè êàòî"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "Ïîòðåáèòåëñêè îïöèè"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Çàïèøè êàòî"
+
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Çàïèøè êàòî"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Çàïèñâàé èçïðàòåíàòà ïîùà â"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Çàïèñà íà ÷åðíîâàòà ñå ïðîâàëè. Åòî êàêâî êàçà ñúðâúðà: %s"
 
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Òúðñè"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Òúðñè"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Ïîòðåáèòåëñêè îïöèè"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "Ðåçóëòàòè îò òúðñåíåòî"
 
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Ïðåãëåäàíè"
 
+#: templates/mailbox/navbar.inc:9
 msgid "Select"
 msgstr "Èçáåðè"
 
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Èçáåðåòå ïîùà"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Èçáåðåòå ïîùà"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Èçáåðè âñè÷êè"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Èçáåðåòå ïîùà"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Èçáåðåòå àäðåñíà êíèãà çà äîáàâÿíå è òúðñåíå íà àäðåñè."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Èçáåðè âñè÷êè"
 
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"Èçáåðåòå ðåäà íà òúðñåíå íà àäðåñíèòå êíèãè, ïðè îòêðèâàíåòî íà àäðåñè."
+
+#: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
 msgstr "Èçáåðåòå ïîùà"
 
-msgid "Select an identity"
-msgstr "Èçáåðè èäåíòè÷íîñò"
-
-msgid "Select charset:"
-msgstr "Èçáåðè ñèìâîëåí íàáîð:"
-
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Íå èçáèðàé íèùî"
 
-msgid "Select your color scheme."
-msgstr "Èçáåðåòå âàøàòà ñõåìà çà öâåòîâåòå."
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select your preferred language:"
-msgstr "Èçáåðåòå ïðåäïî÷èòàíèÿò îò Âàñ åçèê:"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
+#: templates/prefs/sourceselect.inc:309
 msgid "Selected Address books:"
 msgstr "Èçáðàíà àäðåñíà êíèãà:"
 
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Èçïðàòè êëþ÷ â ïóáëè÷íèÿ êëþ÷ñúðâúð"
 
-msgid "Sent mail folder:"
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Èíôîðìàöèÿ çà Ñúðâúðà"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "Send Message"
+msgstr "Êðàé íà ïèñìîòî"
+
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
 msgstr "Ïàïêà \"Èçïðàòåíà ïîùà\":"
 
-msgid "September"
-msgstr "Ñåïòåìâðè"
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "Ïàïêà \"Èçïðàòåíà ïîùà\":"
 
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Ñúðâúð"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "Èíôîðìàöèÿ çà Ñúðâúðà"
 
+#: templates/fetchmail/manage.inc:23
 msgid "Server:"
 msgstr "Ñúðâúð:"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Íàñòðîé ôèëòðèòå çà íåæåëàíî ñúäúðæàíèå."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Íàñòðîé êàêâî äà ñå ñëó÷âà, êîãàòî ïðåìåñòèø èëè èçòðèåø ïèñìî."
 
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Äà ñå çàäàâà ëè X-Priority çàãëàâíà ÷àñò ïðè ïèñàíå íà ïèñìî?"
 
-msgid "Set the current time zone."
-msgstr "Íàñòðîé ÷àñîâàòà çîíà."
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Ïàïêè"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Ïàïêà \"Èçïðàòåíà ïîùà\":"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Èçáåðåòå åçèêà, íà êîèòî ñå ïîêàçâàò ìåíþòà, îáÿñíåíèÿ è ïîìîù."
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
-msgstr "Òðÿáâà ëè äà ñå ïðîâåðÿâà ñúäúðæàíèåòî íà îáèêíîâåíè òåêñòîâè ïèñìà çà"
-" PGP äàííè?"
+msgstr ""
+"Òðÿáâà ëè äà ñå ïðîâåðÿâà ñúäúðæàíèåòî íà îáèêíîâåíè òåêñòîâè ïèñìà çà PGP "
+"äàííè?"
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Òðÿáâà ëè ïðîçîðåöà \"Íàïèøè\" äà ñå çàòâîðè ñëåä çàïèñ íà ÷åðíîâàòà."
 
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
-msgstr "Äà áúäå ëè ïðèêðåïÿí Âàøèÿò ïóáëè÷åí PGP êëþ÷ êúì ïèñìàòà Âè, ïî "
+msgstr ""
+"Äà áúäå ëè ïðèêðåïÿí Âàøèÿò ïóáëè÷åí PGP êëþ÷ êúì ïèñìàòà Âè, ïî "
 "ïîäðàçáèðàíå?"
 
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Ïîêàæè âñè÷êè çàãëàâíè ÷àñòè"
+
+#: templates/message/headers.inc:67
 msgid "Show All Headers"
 msgstr "Ïîêàæè âñè÷êè çàãëàâíè ÷àñòè"
 
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Ïîêàæè èçòðèòèòå"
 
+#: templates/message/headers.inc:61
 msgid "Show Limited Headers"
 msgstr "Ïîêàæè ñàìî èçáðàíè çàãëàâíè ÷àñòè!"
 
+#: templates/message/headers.inc:70
 msgid "Show Mailing List Information"
 msgstr "Ïîêàæè èíôîðìàöèÿ çà Mailing List"
 
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Àáîíèðàíå çà ïàïêà(è)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Ïîêàæè íåàáîíèðàíèòå"
 
-msgid "Show last login time when logging in?"
-msgstr "Äà ñå ïîêàçâà ëè âðåìåòî íà ïîñëåäíîòî âëèçàíå?"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Äà ñå ïîêàçâà ëè ëåãåíäà â ïîùåíñêàòà êóòèÿ?"
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Äà ñå ïîêàçâà ëè \"Äðóãè ïîùè\" èêîíà â ìåíþ ëåíòàòà?"
 
-msgid "Size"
+#: lib/MIME/Viewer/html.php:95
+#, fuzzy
+msgid "Show the Images"
+msgstr "Ïîêàæè ñàìî èçáðàíè çàãëàâíè ÷àñòè!"
+
+#: templates/filters/prefs.inc:54
+#, fuzzy
+msgid "Show the filter icon on the menubar?"
+msgstr "Äà ñå ïîêàçâà ëè \"Äðóãè ïîùè\" èêîíà â ìåíþ ëåíòàòà?"
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+#, fuzzy
+msgid "Shown"
+msgstr "Brown"
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
 msgstr "Ðàçìåð"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Íÿêîé îò êîíôèãóðàöèîííèòå ôàéëîâå íà IMP ëèïñâàò:"
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Ðàçìåð"
 
-msgid "Sort Direction"
-msgstr "Ñîðòèðàíå"
+#: templates/compose/attachments.inc:3
+msgid "Size"
+msgstr "Ðàçìåð"
 
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Ñîðòèðàé ïî ïîëó÷àâàíå"
 
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Ñîðòèðàé ïî äàòà"
 
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Ñîðòèðàé ïî \"Îò\" àäðåñ"
 
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Ñîðòèðàé ïî ðàçìåð íà ïèñìîòî"
 
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Ñîðòèðàé ïî òåìà"
 
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Ñîðòèðàé ïî íèøêè"
 
-msgid "Spam Report from"
-msgstr "Ñïàì Ðàïîðò îò"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "Ñîðòèðàé ïî \"Îò\" àäðåñ"
+
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Ïàïêà \"Êîø÷å\":"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Ñïåöèàëíè ñèìâîëè"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Ïðàâîïèñ"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Ïðîâåðêà íà ïðàâîïèñà"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Ïðàâîïèñà áåøå ïðîâåðåí"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Ïðàâîïèñíè ãðåøêè â ñòðàíèöà ïðè ïðîâåðêà çà ïðàâîïèñ."
 
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+#, fuzzy
+msgid "Start"
+msgstr "Ñòàòóñ"
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Ñòàòóñ"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Ïðèêðåïåí ôàéë"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Òåìà"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Òåìà"
 
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "Òåìà íà ïèñìîòî"
 
-msgid "Subject:"
-msgstr "   Òåìà:"
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "Òåìà"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Àáîíèðàíå çà ïàïêà(è)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Óñïåõ"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Ïðåäïîëîæåíèÿ"
 
-msgid "Sun"
-msgstr "Sun"
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Òåêñò"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
 
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Ôàéë çà \"Óñëîâèÿ íà óñëóãàòà\" íå å çàäàäåí â conf.php"
 
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Òåêñò"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, php-format
 msgid "The account \"%s\" has been deleted."
 msgstr "Ïîùàòà \"%s\" áåøå ïðåìàõíàòà."
 
-#, c-format
+#: fetchmailprefs.php:74
+#, php-format
 msgid "The account \"%s\" has been saved."
 msgstr "Ïîùàòà \"%s\" áåøå çàïèñàíà."
 
-#, c-format
-msgid "The address %s has been added to your blacklist."
-msgstr "Àäðåñà '%s' áåøå äîáàâåí êúì Âàøèÿò \"÷åðåí ñïèñúê\"."
+#: attachment.php:43
+#, fuzzy
+msgid "The attachment was not found."
+msgstr "Íÿìà íàìåðåíè ïðèêðåïåíè ôàéëîâå."
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Òåêóùàòà ïàïêà(è) \"%s\" ùå áúäå ïðåèìåíóâàíà íà \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+#, fuzzy
+msgid "The event was added to your calendar."
+msgstr "Àäðåñà '%s' áåøå äîáàâåí êúì Âàøèÿò \"÷åðåí ñïèñúê\"."
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Èäåíòè÷íîñòòà \"%s\" áåøå èçòðèòà."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Ïàïêàòà \"%s\" âå÷å ñúùåñòâóâà"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1781,348 +4084,695 @@
 "Èìåòî íà ïàïêàòà \"%s\" ñúäúðæà íåêîðåêòíè ñèìâîëè. Òîâà ìîæå äà äîâåäå äî "
 "ïðîáëåìè. Ìîëÿ êîíñóëòèðàéòå ñå ñúñ Ñèñòåìíèÿ Àäìèíèñòðàòîð."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Ïàïêàòà \"%s\" áåøå ñúçäàäåíà, íî Âèå íå ñòå àáîíèðàíè çà íåÿ. "
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Ïàïêàòà \"%s\" áåøå èçòðèòà, íî Âèå âñå îùå ñòå aàáîíèðàíè çà íåÿ."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Ïàïêàòà \"%s\" íå áåøå ñúçäàäåíà. Åòî êàêâà å ïðè÷èíàòà ñïîðåä ñúðâúðà"
 
-#, c-format
+#: lib/Folder.php:265
+#, fuzzy, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "Ïàïêàòà '%s' íå áåøå èçòðèòà. Åòî êàêâî êàçà ñúðâúðà"
+
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Ïàïêàòà \"%s\" áåøå ñúçäàäåíà óñïåøíî. "
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Ïàïêàòà \"%s\" áåøå èçòðèòà óñïåøíî. "
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Ïàïêàòà \"%s\" áåøå óñïåøíî ïðåèìåíóâàíà íà \"%s\"."
 
-#, c-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "Ïàïêàòà '%s' íå áåøå èçòðèòà. Åòî êàêâî êàçà ñúðâúðà"
-
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "Èäåíòè÷íîñòòà \"%s\" áåøå èçòðèòà."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "Èäåíòè÷íîñòòà \"%s\" áåøå çàïèñàíà."
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
 
-#, c-format
-msgid "The mailbox %s is already empty."
-msgstr "Ïîùåíñêàòà êóòèÿ %s å âå÷å îòâîðåíà."
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
 
-msgid "The message has been verified."
-msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
 
-msgid "The requested file does not exist in the MS-TNEF attachment."
-msgstr "Èçèñêàíèÿ ïðèêðåïåí ôàéë íå å îòêðèò â MS-TNEF."
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
 
-msgid "The requested file does not exist in the Zip attachment."
-msgstr "Èçèñêàíèÿ ôàéë íå ñúùåñòâóâà â Zip ïðèêðåïåíèÿ ôàéë."
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
 
-msgid "There are no alternative parts that can be displayed inline."
-msgstr "Íÿìà àëòåðíàòèâíè äâîéêè, êîèòî äà áúäàò ïîêàçàíè â ëèíèÿòà."
+#: lib/Message.php:651
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "Ïîùåíñêàòà êóòèÿ %s å âå÷å îòâîðåíà."
 
-msgid "There are no messages in this mailbox."
-msgstr "Íÿìà ïèñìà â òàçè ïîùåíñêà êóòèÿ."
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
 
-#, c-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Èìàøå ïðîáëåì ïðè çàëè÷àâàíåòî íà %s. Åòî êàêâà å ïðè÷èíàòà"
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
 
-#, c-format
-msgid "There was a problem expunging the mailbox. The server said: %s"
-msgstr "Ãðåøêà ïðè çàëè÷àâàíå íà ïîùåíñêà êóòèÿ. Åòî êàêâî êàçà ñúðâúðà: %s"
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Èìàøå ïðîáëåì ïðè çàëè÷àâàíåòî íà ïîùåíñêàòà êóòèÿ. Ïðè÷èíàòà å"
+#: lib/MIME/Viewer/pgp.php:393
+msgid "The message has been verified."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
 
-msgid "There was a problem with the file upload."
-msgstr "Ãðåøêà ïðè èçïðàùàíåòî íà ôàéëà."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
 
-#, c-format
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
 msgstr ""
-"Èìàøå ïðîáëåì ïðè èçïðàùàíåòî íà ôàéëà. Âúçìîæíî å ôàéëà äà å ïî-ãîëÿì îò "
-"ìàêñèìàëíî äîïóñòèìèÿ ðàçìåð (%d MB)."
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr ""
-"Ãðåøêà ïðè èçïðàùàíåòî íà ôàéëà. Âúçìîæíî å ôàéëúò äà å ïî-ãîëÿì îò "
-"ìàêñèìàëíî äîïóñòèìèÿò ðàçìåð."
 
-msgid "There was a problem with the file upload: No attachment was uploaded."
-msgstr "Ãðåøêà ïðè èçïðàùàíåòî íà ôàéëà: Íå áåøå ïðèêðåïåí ôàéë."
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "Èçèñêàíèÿ ïðèêðåïåí ôàéë íå å îòêðèò â MS-TNEF."
 
-#, c-format
-msgid ""
-"There was a problem with the file upload: The attachment was larger than the "
-"maximum allowed size (%d MB)."
-msgstr ""
-"Èìàøå ïðîáëåì ïðè èçïðàùàíåòî íà ôàéëà: Ôàéëà å ïî-ãîëÿì îò ìàêñèìàëíî "
-"äîïóñòèìèÿ ðàçìåð (%d MB)."
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "Èçèñêàíèÿ ôàéë íå ñúùåñòâóâà â Zip ïðèêðåïåíèÿ ôàéë."
 
+#: message.php:547
+#, php-format
 msgid ""
-"There was a problem with the file upload: The attachment was only partially "
-"uploaded."
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
 msgstr ""
-"Ãðåøêà ïðè èçïðàùàíåòî íà ôàéëà: Ñàìî ÷àñò îò ôàéëà áåøå èçïðàòåíà "
 
-#, c-format
-msgid ""
-"There was an error copying messages from \"%s\" to \"%s\". This is what the "
-"server said"
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
 msgstr ""
-"Ãðåøêà ïðè êîïèðàíåòî íà ïèñìà îò \"%s\" â \"%s\". Åòî êàêâî êàçà ñúðâúðà"
 
-#, c-format
-msgid ""
-"There was an error deleting messages from the folder \"%s\". This is what "
-"the server said"
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
 msgstr ""
-"Ãðåøêà ïðè èçòðèâàíåòî íà ïèñìàòà îò ïàïêà \"%s\". Ñïîðåä ñúðâúðà ïðè÷èíàòà "
-"çà òîâà å"
 
-#, c-format
-msgid ""
-"There was an error deleting messages in the folder \"%s\". This is what the "
+#: templates/compose/compose.js:102
+#, fuzzy
+msgid "The signature was successfully replaced."
+msgstr "Ïàïêàòà \"%s\" áåøå ñúçäàäåíà óñïåøíî. "
+
+#: attachment.php:59
+#, fuzzy
+msgid "The specified file does not exist."
+msgstr "Èçèñêàíèÿ ôàéë íå ñúùåñòâóâà â Zip ïðèêðåïåíèÿ ôàéë."
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Ïîùàòà \"%s\" áåøå çàïèñàíà."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Ïîùàòà \"%s\" áåøå ïðåìàõíàòà."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Ïîùàòà \"%s\" áåøå ïðåìàõíàòà."
+
+#: lib/MIME/Viewer/itip.php:169
+#, fuzzy
+msgid "The task has been added to your tasklist."
+msgstr "Àäðåñà '%s' áåøå äîáàâåí êúì Âàøèÿò \"÷åðåí ñïèñúê\"."
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "Ïðåíàñî÷è òîâà ïèñìî"
+
+#: lib/MIME/Viewer/status.php:94
+#, fuzzy, php-format
+msgid "The text of the message can be viewed %s."
+msgstr "Ïèñìîòî áåøå ïðîâåðåíî."
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Ïðåíàñî÷è òîâà ïèñìî"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Íÿìà àëòåðíàòèâíè äâîéêè, êîèòî äà áúäàò ïîêàçàíè â ëèíèÿòà."
+
+#: templates/mailbox/empty_mailbox.inc:3
+msgid "There are no messages in this mailbox."
+msgstr "Íÿìà ïèñìà â òàçè ïîùåíñêà êóòèÿ."
+
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Íÿìà àëòåðíàòèâíè äâîéêè, êîèòî äà áúäàò ïîêàçàíè â ëèíèÿòà."
+
+#: lib/Message.php:612
+#, php-format
+msgid "There was a problem expunging %s. This is what the server said"
+msgstr "Èìàøå ïðîáëåì ïðè çàëè÷àâàíåòî íà %s. Åòî êàêâà å ïðè÷èíàòà"
+
+#: lib/Message.php:653
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "Ãðåøêà ïðè çàëè÷àâàíå íà ïîùåíñêà êóòèÿ. Åòî êàêâî êàçà ñúðâúðà: %s"
+
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Èìàøå ïðîáëåì ïðè çàëè÷àâàíåòî íà ïîùåíñêàòà êóòèÿ. Ïðè÷èíàòà å"
+
+#: lib/Message.php:90
+#, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"Ãðåøêà ïðè êîïèðàíåòî íà ïèñìà îò \"%s\" â \"%s\". Åòî êàêâî êàçà ñúðâúðà"
+
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr ""
+"Ãðåøêà ïðè èçòðèâàíåòî íà ïèñìàòà îò ïàïêà \"%s\". Ñïîðåä ñúðâúðà ïðè÷èíàòà "
+"çà òîâà å"
+
+#: lib/Message.php:275
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
 "Ãðåøêà ïðè èçòðèâàíå íà ïèñìà â ïàïêà \"%s\". Ïðè÷èíàòà ñïîðåä ñúðâúðà å"
 
-#, c-format
+#: lib/Message.php:211
+#, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Ãðåøêà ïðè èçòðèâàíå íà ïèñìà. Åòî êàêâî êàçà ñúðâúðà: %s"
 
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Ãðåøêà ïðè ïðåãëåäà íà ïîèñêàíîòî ïèñìî."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Ãðåøêà ïðè ïîêàçâàíå íà òàçè ÷àñò îò ïèñìîòî"
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
 "Ãðåøêà ïðè óñòàíîâÿâàíå íà ôëàãîâå â ïàïêà \"%s\". Ïðè÷èíàòà ñïîðåä ñúðâúðà å"
 
-#, c-format
+#: folders.php:165
+#, php-format
 msgid "There was an error importing %s."
 msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
+
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
+
+#: lib/Message.php:85
+#, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "Ãðåøêà ïðè ïðåìåñòâàíå íà \"%s\" â \"%s\". Åòî êàêâî êàçà ñúðâúðà."
 
-msgid ""
-"There was an error moving messages to the trash. This is what the server said"
-msgstr ""
-"Ãðåøêà ïðè ïðåìåñòâàíåòî íà ïèñìà â êîø÷åòî. Ñúðâúðà ñìÿòà, ÷å ïðè÷èíàòà å"
-
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
 msgstr "Ãðåøêà ïðè çàïèñà íà òîâà ïèñìî êàòî ÷åðíîâà."
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Ãðåøêà ïðè èçïðàùàíåòî íà ïèñìîòî: %s"
 
-msgid "There was an error viewing the requested message."
-msgstr "Ãðåøêà ïðè ïðåãëåäà íà ïîèñêàíîòî ïèñìî."
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Ãðåøêà ïðè èìïîðòèðàíå íà äàííèòå: %s."
+
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Ãðåøêà ïðè ïîêàçâàíå íà òàçè ÷àñò îò ïèñìîòî"
+
+#: lib/MIME/Viewer/html.php:97
+#, fuzzy
+msgid "This HTML message has images embedded in it."
+msgstr "Òîâà ïèñìî áåøå êðèïòèðàíî ñ PGP."
 
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Òîçè PGP ïóáëè÷åí êëþ÷ áåøå ïðèêðåïåí êúì ïèñìîòî."
 
-msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
 msgstr ""
-"Òîçè ôàéë êîíòðîëèðà ëîêàëíèòå MIME äðàéâåðè íà IMP, ïî-ñïåöèàëíî, êàêâè "
-"ïðèêðåïåíè ôàéëîâå ìîãàò äà ñå ïðåãëåæäàò è/èëè èçòåãëÿò."
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
 msgstr ""
-"Òîçè ôàéë êîíòðîëèðà íàñòðîéêèòå ïî ïîäðàçáèðàíå íà IMP, à ñúùî è êîè "
-"íàñòðîéêè ïîòðåáèòåëèòå ìîãàò äà ïðîìåíÿò."
 
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
 msgstr ""
-"Òîçè ôàéë êîíòðîëèðà íàñòðîéêèòå ïî ïîäðàçáèðàíå íà IMP, à ñúùî äåôèíèðà "
-"ñïèñúêà ñúñ ñúðâúðè, àêî èçïîëçâàòå òàêúâ."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
 msgstr ""
-"Òîçè ôàéë êîíòðîëèðà ñòèëîâåòå, êîéòî ñå èçïîëçâàò çà öâåòîâåòå è øðèôòîâåòå "
-"â äîïúëíåíèå êúì ïîäðàçáèðàùèòå ñòèëîâå íà Horde."
 
+#: lib/MIME/Viewer/pkcs7.php:410
+#, fuzzy
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr "Òîâà ïèñìî áåøå öèôðîâî ïîäïèñàíî ÷ðåç S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:414
+#, fuzzy
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Òîâà ïèñìî áåøå öèôðîâî ïîäïèñàíî ÷ðåç S/MIME."
+
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"Òîâà å ãëàâíèÿ ôàéë çà êîíôèãóðèðàíå íà IMP. Òîé ñúäúðæà ïúòèùàòà è îïöèèòå "
-"çà IMP ñêðèïòîâåòå."
 
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "Òîâà ïèñìî íå å â êîðåêòåí PGP ôîðìàò (ñúîáðàçíî RFC 2015)."
+
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Òîâà ïèñìî íå å â êîðåêòåí PGP ôîðìàò (ñúîáðàçíî RFC 2015)."
 
-msgid ""
-"This message does not appear to be in the correct S/MIME format (according "
-"to RFC 2633)."
+#: lib/MIME/Viewer/pkcs7.php:170
+#, fuzzy
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Òîâà ïèñìî íå å â êîðåêòåí S/MIME ôîðìàò (ñúîáðàçíî RFC 2015)."
 
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Òîâà ïèñìî áåøå öèôðîâî ïîäïèñàíî ÷ðåç PGP."
 
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Òîâà ïèñìî áåøå öèôðîâî ïîäïèñàíî ÷ðåç S/MIME."
 
-msgid "This message has been encrypted with PGP."
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#, fuzzy
+msgid "This message has been encrypted via S/MIME."
 msgstr "Òîâà ïèñìî áåøå êðèïòèðàíî ñ PGP."
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Òîâà ïèñìî áåøå èçïðàòåíî êàòî Ñïàì äî Ñèñòåìíèÿ Àäìèíèñòðàòîð."
-
-msgid "This message has been reported as spam."
-msgstr "Òîâà ïèñìî áåøå ðåãèñòðèðàíî êàòî ñïàì."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr "Òîâà ïèñìî áåøå êðèïòèðàíî ñ PGP."
 
+#: message.php:211
 msgid "This message to"
 msgstr "Òîâà ïèñìî â"
 
-#, c-format
-msgid ""
-"This message was written in a character set other than your own. If it is "
-"not displayed correctly, %s to open it in a new window."
+#: acl.php:46
+msgid "This server does not support sharing folders."
 msgstr ""
-"Òîâà ïèñìî å íàïèñàíî ñúñ ñèìâîëè ðàçëè÷íè îò âàøèòå. Àêî íå å "
-"ïîêàçàíî êîðåêòíî, %s çà äà ãî îòâîðèòå â íîâ ïðîçîðåö."
 
-msgid "Thread"
-msgstr "Ñìèñëîâè íèøêè"
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
+
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Ïîêàæè"
 
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Èçãëåä ïî ñìèñëîâè íèøêè"
 
-msgid "Time Zone"
-msgstr "×àñîâà çîíà"
-
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Äî"
 
-msgid "To:"
-msgstr "Äî:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "Îò àäðåñ"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Îáù ðàçìåð: %s KB"
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Ïðèêðåïåíè ôàéëîâå"
 
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Ïàïêà \"Êîø÷å\":"
+
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Ïàïêà \"Êîø÷å\":"
 
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Ãðåøêà ïðè ïðîâåðêàòà çà êâîòà"
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Áåç îòãîâîð"
 
+#: templates/search/main.inc:35
 msgid "Unanswered messages"
 msgstr "Ïèñìà áåç îòãîâîð"
 
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Âúçñòàíîâè"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Íåèçâåñòíè Ïîëó÷àòåëè"
 
-msgid "Unknown Protocol Specified"
-msgstr "Çàäàäåíèÿò ïðîòîêîë å íåèçâåñòåí"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
 
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "Íåèçâåñòíè Ïîëó÷àòåëè"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Ïðåìàõâàíå íà êëþ÷îâà ôðàçà"
 
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Áåçèìåííè"
 
-msgid "Unread"
-msgstr "Íåïðî÷åòåíè"
-
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Íåïðåãëåäàíè"
 
-msgid "Unseen Messages"
-msgstr "Íåïðåãëåäàíè ïèñìà"
-
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Îòïèøè îò ïàïêà(è)"
 
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Èçïðàòè"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Èçïîëçâàé Ctrl/Option+Click çà äà èçáåðåø ìíîæåñòâî ïîëåòà"
-
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Èçïîëçâàé ïîäðàçáèðàùàòà ñå ñòîéíîñò"
 
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Äà ñå èçïîëçâàò ëè IMAP àáîíàìåíòè çà ïàïêè?"
 
-msgid "User Options"
-msgstr "Ïîòðåáèòåëñêè îïöèè"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Èçïðàçíè êîø÷åòî"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Èìå"
 
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Èìå"
 
+#: templates/fetchmail/manage.inc:17
 msgid "Username:"
 msgstr "Èìå:"
 
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Âèæ"
 
-#, c-format
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Èçãëåä %s"
 
-#, c-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "View %s Public Key"
 msgstr "Âèæ %s ïóáëè÷åí êëþ÷"
 
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Äà ñå èçòåãëÿ ëè ïîùàòà â îòäåëåí ïðîçîðåö?"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Íîâè ïèñìà"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Âèæ ïåðñîíàëåí ÷àñòåí êëþ÷"
 
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Âèæ ïåðñîíàëåí ïóáëè÷åí êëþ÷"
 
-msgid "View messages in "
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Ñìèñëîâè íèøêè"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Äà ñå èçòåãëÿ ëè ïîùàòà â îòäåëåí ïðîçîðåö?"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Äà ñå èçòåãëÿ ëè ïîùàòà â îòäåëåí ïðîçîðåö?"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "Ïîêàæè ïèñìà â "
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Èçãëåä èëè ïîùåíñêà êóòèÿ äà áúäå íà åêðàíà ñëåä âõîä:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "Èçãëåä %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Ïîêàæè ïèñìà â "
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Ïàïêàòà \"%s\" áåøå èçòðèòà óñïåøíî. "
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Ñúçäàé ïàïêà"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Èçïðàçíè êîø÷åòî"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr ""
+
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Äîáðå Äîøëè â %s"
 
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -2130,30 +4780,136 @@
 "Ïðè èçòðèâàíå íà ïèñìà, äà ñå ïðåìåñòâàò ëè â êîø÷åòî âìåñòî äà ñå ìàðêèðàò "
 "êàòî èçòðèòè."
 
-msgid "Wrap text at this many characters."
-msgstr "Ïðåïîäðåäè òåêñòà íà òîëêîâà ñèìâîëà."
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Äà"
 
-msgid "You didn't specify a Mail Server"
-msgstr "Íå âúâåäîõòå âàëèäåí ïîùåíñêè ñúðâúð"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Èçòåãëÿíå íà ïîùà îò äðóãè POP3/IMAP ñúðâúðè."
 
-msgid "You didn't specify the password"
-msgstr "Íå âúâåäîõòå ïàðîëà"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr ""
 
-msgid "You didn't specify the username"
-msgstr "Íå âúâåäîõòå ïîòðåáèòåëñêî èìå"
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr ""
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Âèå èçëÿçîõòå.<br />Áëàãîäàðèì Âè, ÷å èçïîëçâàõòå ñèñòåìàòà."
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "You are copying/moving to a new folder."
+msgstr ""
 
+#: templates/javascript/folders.js:102
+msgid "You are creating a sub-folder to "
+msgstr ""
+
+#: templates/javascript/folders.js:104
+msgid "You are creating a top-level folder."
+msgstr ""
+
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr ""
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
+msgid "You are renaming the folder: "
+msgstr ""
+
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Áÿõòå îòïèñàí óñïåøíî îò \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, fuzzy, php-format
+msgid "You have %s new messages."
+msgstr " - $nm íîâè ïèñìà"
+
+#: templates/mailbox/alert.inc:3
+#, fuzzy
+msgid "You have 1 new message."
+msgstr " - $nm íîâî ïèñìî"
+
+#: compose.php:494
+msgid "You have already submitted this page."
+msgstr ""
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
+
+#: lib/IMP.php:1074
+msgid "You have new mail in the following folder:"
+msgstr ""
+
+#: lib/IMP.php:1079
+msgid "You have new mail in the following folders:"
+msgstr ""
+
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Òðÿáâà äà èìàòå ïîíå åäèí ïîëó÷àòåë."
+
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Òðÿáâà äà âúâåäåòå êëþ÷îâàòà ôðàçà íà Âàøèÿ PGP ÷àñòåí êëþ÷ çà äà âèäèòå "
 "òîâà ïèñìî"
 
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -2161,115 +4917,354 @@
 "Òðÿáâà äà âúâåäåòå êëþ÷îâàòà ôðàçà íà Âàøèÿ S/MIME ÷àñòåí êëþ÷ çà äà âèäèòå "
 "òîâà ïèñìî"
 
-msgid "You must have at least one recipient."
-msgstr "Òðÿáâà äà èìàòå ïîíå åäèí ïîëó÷àòåë."
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
+#, fuzzy
+msgid "You must select a target mailbox first."
+msgstr "Òðÿáâà äà èçáåðåòå ïîùà, êîÿòî äà áúäå èçòðèòà."
 
+#: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
 msgstr "Òðÿáâà äà èçáåðåòå ïîùà, êîÿòî äà áúäå èçòðèòà."
 
-msgid "You must select an identity to be deleted."
-msgstr "Òðÿáâà äà èçáåðåòå êîÿ èäåíòè÷íîñò äà áúäå èçòðèòà, ïðåäâàðèòåëíî."
+#: templates/contacts/contacts.inc:81
+#, fuzzy
+msgid "You must select an address first."
+msgstr "Òðÿáâà äà èçáåðåòå ïîùà, êîÿòî äà áúäå èçòðèòà."
+
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
+#, fuzzy
+msgid "You must select at least one message first."
+msgstr "Òðÿáâà äà èìàòå ïîíå åäèí ïîëó÷àòåë."
+
+#: templates/compose/redirect.inc:13
+#, fuzzy
+msgid "You must specify a recipient."
+msgstr "Òðÿáâà äà èìàòå ïîíå åäèí ïîëó÷àòåë."
+
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Òðÿáâà äà èìàòå ïîíå åäèí ïîëó÷àòåë."
+
+#: templates/fetchmail/manage.inc:48
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Ãðåøêà ïðè èçïúëíåíèå íà \"Îïåðàöèè ïî îáñëóæâàíåòî\""
 
-#, c-format
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Ïðåíàñî÷è òîâà ïèñìî"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Ïðåíàñî÷è òîâà ïèñìî"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Íå áÿõòå àáîíèðàí çà \"%s\". Åòî êàêâà å ïðè÷èíàòà"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Íå áÿõòå îòïèñàí îò \"%s\". Åòî êàêâà å ïðè÷èíàòà ñïîðåä ñúðâúðà"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Áÿõòå àáîíèðàí óñïåøíî çà \"%s\""
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Áÿõòå îòïèñàí óñïåøíî îò \"%s\""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Âðåìåòî çà âàøàòà %s ñåñèÿ èçòå÷å. Ìîëÿ ðåãèñòðèðàéòå ñå îòíîâî."
-
-msgid "Your From: address:"
-msgstr "Âàøèÿò Îò: àäðåñ:"
-
-msgid "Your Information"
-msgstr "Èíôîðìàöèÿ çà Âàñ"
-
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Âàøåòî èìå"
 
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Âàøèòå PGP ïóáëè÷åí/÷àñòåí êëþ÷îâå"
 
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Âàøèÿò ÷àñòåí êëþ÷"
 
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Âàøèÿò ïóáëè÷åí êëþ÷"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Âàøèÿò Îòãîâîðà-íà: àäðåñ: <i>(optional)</i>"
 
-msgid "Your S/MIME Public/Private Keys"
+#: templates/smime/smime.inc:49
+#, fuzzy
+msgid "Your S/MIME Public/Private Certificates"
 msgstr "Âàøèòå S/MIME ïóáëè÷åí/÷àñòåí êëþ÷îâå"
 
+#: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "Âàøèòå ïîùè:"
 
-msgid "Your browser does not support inline display of this image type"
-msgstr "Âàøèÿò browser íå ïîäúðæà ðåäîâî ïîêàçâàíå íà òîçè òèï ôàéë"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-msgid "Your current time zone:"
-msgstr "Âàøàòà ÷àñîâà çîíà:"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr "Âàøèÿò browser íå ïîäúðæà ðåäîâî ïîêàçâàíå íà òîçè òèï ôàéë"
 
-msgid "Your default identity:"
-msgstr "Âàøàòà èäåíòè÷íîñò ïî ïîäðàçáèðàíå:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
 
-msgid "Your full name:"
-msgstr "Ïúëíîòî Âè èìå:"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your identities:"
-msgstr "Âàøèòå èäåíòè÷íîñòè:"
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Ïàïêàòà \"%s\" áåøå èçòðèòà óñïåøíî. "
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Âàøèÿò ïîäïèñ:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Íÿìà Òåìà]"
 
-msgid "add source"
-msgstr "äîáàâè ñîðñ"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Bcc"
 
-msgid "click here"
-msgstr "êëèêíåòå òóê"
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "×åðåí ñïèñúê"
 
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Cc"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Èçòðèé"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Ïàïêè"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Èäåíòè÷íîñò"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Èçõîä"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "ñîðñ êîä íà ïèñìîòî"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Íîâè ïèñìà"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Îòïå÷àòàé"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+#, fuzzy
+msgid "_Priority"
+msgstr "Ïðèîðèòåò"
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Îïðåñíè"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Îòãîâîð"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Òúðñè"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Êðàé íà ïèñìîòî"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Ñìèñëîâè íèøêè"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Äî"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Âúçñòàíîâè"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Ñìèñëîâè íèøêè"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Ïðèêðåïåí ôàéë"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Ïðèêðåïåíè ôàéëîâå"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "îò"
 
-msgid "header"
-msgstr "çàãëàâíà ÷àñò"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-msgid "move down"
-msgstr "íà äîëó"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-msgid "move up"
-msgstr "íà ãîðå"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Ïîùåíñêà êóòèÿ"
+
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Èìå"
+
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "íÿìà"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "èëè"
 
-msgid "remove source"
-msgstr "ïðåìàõíè ñîðñà"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "select folder"
-msgstr "èçáåðè ïàïêà"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ïðàâîïèñíà ãðåøêà"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ïðàâîïèñíè ãðåøêè"
+
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "ïðàâîïèñíà ãðåøêà"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "×åðåí ñïèñúê"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/locale/ru_RU/help.xml
+++ mod/locale/ru_RU/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="windows-1251"?>
-<!-- $Horde: imp/locale/ru_RU/help.xml,v 1.18.6.1 2005/01/25 22:05:51 jan Exp $ -->
+<!-- $Horde: imp/locale/ru_RU/help.xml,v 1.18.6.5 2006/03/23 00:24:08 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Ñîñòàâëåíèå ïèñüìà: Äåéñòâèÿ</title>
@@ -187,6 +187,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Ïîèñê</title>
     <heading>Êðèòåðèé ïîèñêà</heading>
@@ -633,6 +639,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -651,6 +663,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -680,4 +707,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/lib/Block/summary.php
+++ mod/lib/Block/summary.php
@@ -3,7 +3,7 @@
 $block_name = _("Folder Summary");
 
 /**
- * $Horde: imp/lib/Block/summary.php,v 1.54.2.1 2005/01/13 21:15:06 chuck Exp $
+ * $Horde: imp/lib/Block/summary.php,v 1.54.2.6 2006/02/05 22:45:13 jan Exp $
  *
  * @package Horde_Block
  */
@@ -15,10 +15,11 @@
     {
         global $registry;
 
-        $html  = Horde::link(Horde::url($registry->getInitialPage(), true), $registry->get('name'), 'header') . $registry->get('name') . '</a> :: ';
-        $html .= Horde::link($registry->call('mail/compose'), _("Compose"), 'smallheader') . Horde::img('compose.png', _("Compose"), 'align="middle"', Horde::url($registry->getImageDir(), true, -1)) . ' ' . _("Compose") . '</a>';
-
-        return $html;
+        return Horde::link(Horde::url($registry->getInitialPage(), true)) .
+            $registry->get('name') . '</a> :: <small>' .
+            Horde::link($registry->call('mail/compose')) .
+            Horde::img('compose.png', _("New Message")) . ' ' .
+            _("New Message") . '</a></small>';
     }
 
     function _params()
@@ -84,7 +85,8 @@
                     /* Filter on INBOX display, if requested. */
                     if ($prefs->getValue('filter_on_display')) {
                         require_once IMP_BASE . '/lib/Filter.php';
-                        IMP_Filter::filter('INBOX');
+                        $imp_filter = &IMP_Filter::singleton();
+                        $imp_filter->filter('INBOX');
                     }
 
                     $info = $imptree->getElementInfo($folder);
@@ -98,15 +100,15 @@
                             $url = Util::addParameter($url, 'mailbox', $folder);
                             $html .= '<tr style="cursor:pointer" class="text" onclick="self.location=\'' . $url . '\'"><td>';
                             if (!empty($info['unseen'])) {
-                                $html .= '<b>';
+                                $html .= '<strong>';
                                 $anyUnseen = true;
                             }
                             $html .= Horde::link($url, IMP::displayFolder($folder)) . IMP::displayFolder($folder) . '</a>';
                             if (!empty($info['unseen'])) {
-                                $html .= '</b>';
+                                $html .= '</strong>';
                             }
                             $html .= '</td><td>&nbsp;&nbsp;&nbsp;</td><td>';
-                            $html .= !empty($info['unseen']) ? '<b>' . $info['unseen'] . '</b>' : '0';
+                            $html .= !empty($info['unseen']) ? '<strong>' . $info['unseen'] . '</strong>' : '0';
                             $html .= !empty($this->_params['show_total']) ? '</td><td>(' . $info['messages'] . ')' : '';
                             $html .= '</td></tr>';
                         }
@@ -124,16 +126,33 @@
         if ($auth && $prefs->getValue('nav_popup')) {
             $notification->push(IMP::getNewMessagePopup($newmsgs), 'javascript');
         }
+        if ($auth &&
+            class_exists('Notification_Listener_audio') &&
+            $prefs->getValue('nav_audio')) {
+            $found = false;
+            foreach ($newmsgs as $mbox => $nm) {
+                if ($nm > 0) {
+                    $found = true;
+                    break;
+                }
+            }
+            if ($found) {
+                $notification->push($registry->getImageDir() .
+                                    '/audio/theetone.wav', 'audio');
+                $html .= Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'audio'));
+            }
+        }
 
-        if ($auth && (count($newmsgs) == 0 && !empty($this->_params['show_unread']))) {
+        if ($auth && (count($newmsgs) == 0 &&
+                      !empty($this->_params['show_unread']))) {
             if (count($folders) == 0) {
                 $html .= _("No folders are being checked for new mail.");
             } else {
                 if (!$anyUnseen) {
-                    $html .= '<i>' . _("No folders with unseen messages") . '</i>';
+                    $html .= '<em>' . _("No folders with unseen messages") . '</em>';
                 } else {
                     if ($prefs->getValue('nav_popup')) {
-                        $html .= '<i>' . _("No folders with new messages") . '</i>';
+                        $html .= '<em>' . _("No folders with new messages") . '</em>';
                     }
                 }
             }


--- orig/po/sv_SE.po
+++ mod/po/sv_SE.po
@@ -1,265 +1,280 @@
 # IMP Swedish translation
-# Copyright (C) 2005 Horde Project
+# Copyright (C) 2002-2004 Horde Project
 # This file is distributed under the same license as the Imp package.
-# Andreas Dahlén <andreas at dahlen.ws>, 2002-2005.
+# Joaquim Homrighausen <joho at webbplatsen.se>, 2005, 2006.
+# Andreas Dahlén <andreas at dahlen.ws>, 2005.
+# Updates from Pontus Freyhult <pont_horde at soua.net> 2005-02-04 
 # Updates from Andreas Påhlsson <andreas at pahlsson.info> 2002-01-17
-# Updates from Pontus Freyhult <pont_horde at soua.net> 2005-02-04
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Imp 4.0.3-cvs\n"
+"Project-Id-Version: Imp 4.1\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-30 14:24+0200\n"
-"PO-Revision-Date: 2005-04-01 10:40+0200\n"
-"Last-Translator: Andreas Dahlén <andreas at dahlen.ws>\n"
+"POT-Creation-Date: 2006-02-14 15:30+0100\n"
+"PO-Revision-Date: 2006-02-14 16:00+0100\n"
+"Last-Translator: Joaquim Homrighausen <joho at webbplatsen.se>\n"
 "Language-Team: Swedish <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/Compose.php:266 lib/Compose.php:318
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "      Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "    Till: "
 
-#: lib/Compose.php:254 lib/Compose.php:306
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "   Datum: "
 
-#: lib/Compose.php:257 lib/Compose.php:309
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "    Från: "
 
-#: mailbox.php:399
+#: mailbox.php:409 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (snabbtangent %s)"
 
-#: lib/Compose.php:263 lib/Compose.php:315
+#: lib/Compose.php:423
 msgid " Subject: "
-msgstr "    Ämne: "
+msgstr "  Ärende: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " i "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%2f%%)"
 
-#: mailbox.php:190
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d meddelanden"
+
+#: mailbox.php:176
 #, php-format
-msgid "%d message(s) have been deleted."
+msgid "%d messages have been deleted."
 msgstr "%d meddelande(n) har raderats."
 
-#: lib/Spam.php:182
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
-"%d meddelanden har rapporterats som ICKE-spam till din systemadministratör."
+"%d meddelanden har rapporterats som EJ-skräppost till din "
+"systemadministratör."
 
-#: lib/Spam.php:162
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
-msgstr "%d meddelanden har rapporterats som ICKE-spam."
+msgstr "%d meddelanden har rapporterats som EJ-skräppost."
 
-#: lib/Spam.php:174
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
-msgstr "%d meddelanden har rapporterats som spam till din systemadministratör."
+msgstr ""
+"%d meddelanden har rapporterats som skräppost till systemadministratören."
 
-#: lib/Spam.php:154
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
-msgstr "%d meddelanden har rapporterats som spam."
+msgstr "%d meddelanden har rapporterats som skräppost."
 
-#: mailbox.php:362
+#: mailbox.php:359
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d till %d av %d meddelanden"
 
-#: mailbox.php:607
+#: mailbox.php:636
 #, php-format
 msgid "%s KB"
-msgstr "%s kB"
+msgstr "%s Kb"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP administration"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME administration"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s finns redan. Namnet på mappen %s ändrades inte."
 
-#: lib/Message.php:633
+#: lib/Message.php:689
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s verkar inte vara en korrekt mapp."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mappen %s får nytt namn i början av månaden."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s har accepterat."
 
-#: lib/MIME/Viewer/itip.php:581
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s har annulerat %s."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s har annullerat \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s har avböjt."
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s har svarat på en begäran om information angående ledig/upptagen."
 
-#: lib/MIME/Viewer/itip.php:572
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
+msgid "%s has replied to the invitation to \"%s\"."
 msgstr "%s har svarat på inbjudan till %s."
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s har skickat dig information om ledig/upptagen."
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s har accepterat preliminärt."
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s efterfrågar information om när du är ledig/upptagen."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s efterfrågar din närvaro vid %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s efterfrågar din närvaro %s."
 
-#: lib/Message.php:388
+#: lib/Message.php:463
 #, php-format
-msgid "%s was successfully added to %s."
+msgid "%s was successfully added to \"%s\"."
 msgstr "%s lades till %s."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
+msgid "%s wishes to ammend \"%s\"."
 msgstr "%s vill ändra %s."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
+msgid "%s wishes to make you aware of \"%s\"."
 msgstr "%s vill göra dig medveten om %s."
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
 msgstr "%s vill erhålla den senaste informationen om %s."
 
-#: message.php:276 message.php:281
+#: message.php:293 message.php:298
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;av&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Verkställ ändringarna och fortsätt till nästa skärm.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Ta bort alla ändringar och återvänd till 'skriv meddelande'.)"
+msgstr "(Ta bort alla ändringar och återvänd till meddelande.)"
 
-#: spelling.php:270
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Text)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Återvänd till 'skriv meddelande' efter verkställande av hittils gjorda "
-"ändringar. Ändringar på aktiv skärm kommer INTE verkställas.)"
+"(Återvänd till meddelande efter verkställande av hittills gjorda ändringar. "
+"Ändringar på aktiv skärm kommer INTE verkställas.)"
 
-#: spelling.php:267
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
 msgstr ""
-"(Skicka meddelande efter verkställande av hittils gjorda ändringar. "
+"(Skicka meddelande efter verkställande av hittills gjorda ändringar. "
 "Ändringar på aktiv skärm kommer INTE verkställas.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Lägg till dem här genom att klicka OK *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Välj adress(er) *"
 
-#: lib/Spam.php:184
+#: mailbox.php:174
+msgid "1 message has been deleted."
+msgstr "Meddelandet har raderats."
+
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
-"1 meddelande har rapporterats som ICKE-spam till din systemadministratör."
+"1 meddelande har rapporterats som EJ-skräppost till din systemadministratör."
 
-#: lib/Spam.php:164
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
-msgstr "1 meddelande har rapporterats som ICKE-spam."
+msgstr "1 meddelande har rapporterats som EJ-skräppost."
 
-#: lib/Spam.php:176
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
-msgstr "1 meddelande har rapporterats som spam till din systemadministratör."
+msgstr ""
+"1 meddelande har rapporterats som skräppost till din systemadministratör."
 
-#: lib/Spam.php:156
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
-msgstr "1 meddelande har rapporterats som spam."
+msgstr "1 meddelande har rapporterats som skräppost."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 tecken"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 tecken"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 tecken"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 tecken"
 
-#: lib/MIME/Viewer/images.php:159
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "En stor bild (%s) är bifogad till meddelandet."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -267,21 +282,25 @@
 
 #: templates/search/fields.inc:5
 msgid "AND"
-msgstr "AND"
+msgstr "OCH"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Acceptera och lägg till min kalender"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Acceptera begäran"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Accepterad"
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "Accepterad: "
 
-#: lib/IMP.php:910 lib/IMP.php:912
+#: templates/menu/menu.inc:38 templates/menu/menu.inc:40
 msgid "Acco_unts"
 msgstr "Kon_ton"
 
@@ -289,156 +308,164 @@
 msgid "Account's name:"
 msgstr "Kontots namn:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Åtgärder"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Lägg till %s i min adressbok"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Lägg till källa"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Lägg till i min kalender"
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Lägg till i adressbok (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Lägg till i min kalender"
 
-#: compose.php:1178
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Lade till %s som en bilaga."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "Ytterligare huvudrader att visa: <em>(ej obligatoriskt, ange varje huvudrad "
 "på en egen rad)</em>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Ytterligare information visas %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Fler detaljer"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Fler detaljer om meddelandet"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Fler detaljer om meddelandet visas %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Fler felmeddelande-detaljer"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Fler felmeddelande-detaljer visas %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adressböcker"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "Adresser att lägga till som BCC till alla meddelanden: <em>(ej "
 "obligatoriskt, skriv varje adress på en egen rad)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Adresser kopplade till den här identiten: <em>(ej obligatoriskt, skriv varje "
 "adress på en egen rad)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "Alla"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Alla meddelanden i mappen/mapparna försvinner!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13 templates/folders/javascript.inc:5
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Alla meddelanden i följande mapp(ar) laddas ner till en MBOX-fil:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
-"Alla meddelanden i din '%s' mapp, äldre än %s dagar kommer att raderas "
+"Alla meddelanden i din '%s'-mapp, äldre än %s dagar kommer att raderas "
 "permanent."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:63
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "Alla länkade bilagor äldre än %s månader kommer att raderas."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Alla mappar för skickade meddelanden, äldre än %s månader kommer att raderas."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Behörigheter till mappen '%s' raderades för användare '%s'."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Tillåt att mappar skapas?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Tillåt att filter-regler tillämpas i alla brevlådor?"
 
-#: lib/MIME/Viewer/alternative.php:113
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Alternativa delar för den här delen:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "Alltid"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
-msgstr "Spara altid bilagor"
+msgstr "Spara alltid bilagor"
 
-#: lib/Message.php:481
+#: lib/Message.php:554
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr "Ett fel uppstod när bilagan skulle tas bort: IMAP-servern svarade: "
 
-#: lib/Message.php:375
+#: lib/Message.php:437
+msgid "An unknown error occured while creating the new note."
+msgstr "Ett okänt fel uppstod vid uppläggningen av uppgiften."
+
+#: lib/Message.php:436
 msgid "An unknown error occured while creating the new task."
 msgstr "Ett okänt fel uppstod vid uppläggningen av uppgiften."
 
-#: mailbox.php:677 message.php:490 templates/message/navbar_navigate.inc:9
-#: templates/mailbox/legend.inc:6 templates/mailbox/navbar.inc:18
-#: templates/mailbox/navbar.inc:35
+#: message.php:504 mailbox.php:709 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Besvarat"
 
@@ -455,41 +482,36 @@
 msgid "Apply Filters to %s"
 msgstr "Verkställ filter på %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Verkställ filterregler vid inloggning?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
-msgstr "Verkställ filterregler när INBOX visas?"
-
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Är du säker på att du vill fortsätta?"
+msgstr "Verkställ filterregler när inkorgen visas?"
 
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Är du säker på att du vill fortsätta?"
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Är du säker att du vill radera aktuell virtuell mapp?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Är du säker att du vill radera den publika nyckeln?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "Är du säker att du vill radera nyckelparet? (Rekommenderas INTE!)"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Är du säker?"
 
-#: message.php:398 templates/mailbox/javascript.inc:68
-#: templates/folders/javascript.inc:73
+#: message.php:409 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Är du säker på att du vill radera dessa meddelanden PERMANENT?"
 
-#: lib/MIME/Contents.php:215
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Är du säker på att du vill radera bilagan PERMANENT?"
 
@@ -497,7 +519,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Är du säker på att du vill tömma mappen?"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:949
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Är du säker på att du vill tömma din mapp för skräppost?"
+
+#: templates/menu/menu.inc:29 lib/IMP.php:942
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Är du säker på att du vill tömma din papperskorg?"
 
@@ -505,81 +531,85 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Är du säker på att du vill radera dessa meddelanden PERMANENT?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Är du säker på att du vill rapportera meddelandet som oskyldigt?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
-msgstr "Är du säker på att du vill rapportera meddelandet som spam?"
+msgstr "Är du säker på att du vill rapportera meddelandet som skräppost?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Ankomsttid"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Stigande"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Fråga"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Bifoga"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:472
 msgid "Attach Files"
 msgstr "Bifoga filer"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:453
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Bifoga en kopia av din publika PGP-nyckel till meddelandet?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Bifogad fil:"
 
-#: lib/Compose.php:366 lib/Compose.php:453
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
-"Bifogad fil \"%s\" överskrider maxstorlek för bilagor. Filen bifogas EJ."
+"Bifogad fil \"%s\" överskrider maxstorlek för bilagor. Filen har ej bifogats."
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Bifogar svar på kalender-förfrågan du skickade."
 
-#: mailbox.php:711 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/attachments.js:98
-#: templates/compose/compose.inc:496
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:500 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: compose.php:988 lib/Message.php:442
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Bifogade filen %s raderades."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Bilageinformation"
+
+#: compose.php:1105 lib/Message.php:515
 msgid "Attachment stripped: Original attachment type"
 msgstr "Bilaga borttagen: Typ på ursprungsbilagan"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:1009
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:470
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "Deltagare"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Observera"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Kan inte hitta den nödvändiga IMAP-utökningen."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -591,7 +621,7 @@
 msgid "Available Address books:"
 msgstr "Tillgängliga adressböcker:"
 
-#: lib/MIME/Viewer/itip.php:671
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Väntar på svar"
 
@@ -600,29 +630,51 @@
 msgid "Bac_k to %s"
 msgstr "Tillba_ka till %s"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Tillbaka till %s"
 
-#: message.php:257 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Återvänd till meddelandevisningen"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Tillbaka till trådvisning"
+
+#: lib/IMAP/Client.php:572
+msgid "Bad login name or password."
+msgstr "Ogiltigt användarnamn eller lösenord."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Ogiltig förfrågan. Servern svarade: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Felaktig begäran: %s."
+
+#: message.php:274 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Nedan finns ursprungstexten från statusmeddelandet."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Spärra adress"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Blockera bilder i HTML-meddelanden om de inte särskilt efterfrågas?"
 
-#: search.php:161
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Meddelandetext"
 
@@ -631,27 +683,31 @@
 msgid "Both"
 msgstr "Båda"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
-msgstr "Både i rubrik och i meddelandet"
+msgstr "Både i huvudet och i meddelandet"
+
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
-msgstr "T_eckenuppsättning"
+msgstr "T_eckenkodning"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Kalender"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
-msgstr "Kan inte kontakta fjärr-mailservern"
+msgstr "Kan inte kontakta e-postservern"
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
-msgstr "Kan inte kontakta fjärr-mailservern: "
+msgstr "Kan inte kontakta e-postservern: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -660,44 +716,53 @@
 "Kan inte visa - hittade bara %s av %s delar av meddelandet i aktuell "
 "brevlåda."
 
-#: templates/smime/import_key.inc:85 templates/smime/passphrase.inc:22
-#: templates/folders/import.inc:21 templates/contacts/contacts.inc:253
-#: templates/compose/spelling.inc:127 templates/pgp/import_key.inc:66
-#: templates/pgp/passphrase.inc:32
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:432
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
-msgstr "Avbryt meddelande"
+msgstr "Avbryt"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Om du avbryter försvinner allt i meddelandet."
 
-#: message.php:256 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:273 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:653
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Certifikatimport är inte tillgängligt. Uppladdning av filer är inte "
+"aktiverat på servern."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Ordförande"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Ändra"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Ändra alla"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Ändra mapp"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -715,37 +780,38 @@
 "Ändra namn, adress och signatur som mottagarna ser när de läser och svarar "
 "på din meddelanden."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Antal tecken att visa:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
-msgstr "Kontrollera mapp(ar) för ny e-post"
+msgstr "Kontrollera mapp(ar) för nya meddelanden"
 
-#: templates/mailbox/message_headers.inc:65 templates/folders/actions.inc:2
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Markera _Alla/Ingen"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Kryssa för alla e-postservrar du vill hämta post från:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Kontrollera stavning innan meddelande skickas?"
 
-#: templates/folders/actions.inc:4
+#: templates/folders/vfolder_actions.inc:3 templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Välj åtgärd:"
 
-#: config/servers.php.dist:194
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Välj en e-postserver:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:683
-msgid "Choose an action:"
-msgstr "Välj åtgärd:"
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr "Välj eller ändra adressen i rutan till höger:"
 
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
@@ -755,48 +821,44 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Välj ordning som adressböcker genomsöks vid expansion av adresser."
 
-#: lib/MIME/Viewer/images.php:109
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Klicka %s för att konvertera bilden till ett format din webbläsare kan\n"
 "visa."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Klicka %s för att ladda ner bilden."
 
-#: lib/Filter.php:113
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Klicka %s för att gå till %s-hanteringssidan."
 
-#: lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
-msgstr "Klicka %s för att visa HTML-innehål i ett eget fönster."
+msgstr "Klicka %s för att visa HTML-innehåll i ett eget fönster."
 
-#: lib/MIME/Viewer/images.php:160
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr "Klicka %s för att visa en minibild av den här bilden."
+msgstr "Klicka %s för att visa en miniatyr av den här bilden."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:423
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Klicka %s för att visa bilagan i ett eget fönster."
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr "Klicka %s för att visa multipart/related i ett eget fönster."
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Click here to HIDE the Images"
-msgstr "Klicka här för att GÖMMA bilderna"
-
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Klicka här för att VISA bilderna"
 
@@ -808,113 +870,111 @@
 "Klicka på en av dina adressböcker och ange sedan vilka fält som skall "
 "genomsökas."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Klicka föra att spara publik PGP-nyckel i din adressbok"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "Klicka föra att spara S/MIME certifikat för %s i din adressbok"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
 "Om du klickar på adressen får du skriva ett nytt meddelande till\n"
 "avsändaren"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Om du klickar på adressen öppnas meddelandet för visning"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Stäng"
 
-#: compose.php:762 compose.php:1069
+#: compose.php:418
 msgid "Close this window"
 msgstr "Stäng fönstret"
 
-#: folders.php:383
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Stängda mappar"
 
-#: folders.php:403
+#: folders.php:430
 msgid "Collapse"
-msgstr "Förminska"
+msgstr "Stäng"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
-msgstr "Förminska alla"
+msgstr "Stäng alla"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
-msgstr "Förminska alla mappar"
+msgstr "Stäng alla mappar"
 
-#: folders.php:403
+#: folders.php:430
 msgid "Collapse Folder"
-msgstr "Förminska mapp"
+msgstr "Stäng mapp"
 
 #: templates/fetchmail/manage.inc:51
 msgid "Color Indicator: "
 msgstr "Färgindikator: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Kommentar"
 
-#: lib/MIME/Viewer/itip.php:721
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Slutförd"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Skriv meddelande"
-
-#: mailbox.php:741 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Skriv meddelande (%s)"
-
-#: compose.php:761 compose.php:1068
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Skriv ett annat meddelande"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Skriv meddelanden i ett separat fönster?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
-"Skriv meddelanden med ett HTML GUI som default(om webläsaren stödjer "
-"funktionen)?"
+"Skriv meddelanden med ett HTML-gränssnitt (om webläsaren stödjer funktionen)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Inställningar för meddelandevisning."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Ändra inställningar förhandsgranskning."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Förbindelsen nedkopplad av IMAP-servern."
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
-msgstr "Förbindelse till server misslyckades."
+msgstr "Anslutning till servern misslyckades."
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Hantering av PGP i %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Hantering av S/MIME i %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Inställningar för sökning i meddelanden"
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -922,7 +982,7 @@
 "Kontrollera när nya meddelanden anländer och ange om notifiering skall ske "
 "när de anländer."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Konvertera känsloikoner i textform till grafiska?"
 
@@ -930,84 +990,113 @@
 msgid "Copy"
 msgstr "Kopiera"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Kopiera till mapp"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Korrekt"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Korrigerad text"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Kunde inte slutföra begäran. Anledning: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
-msgstr "Kunde inte skapa VFS-bakändan: %s"
+msgstr "Kunde inte skapa VFS-kopplingen: %s"
 
-#: lib/Message.php:624
+#: lib/Message.php:680
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Kunde inte radera meddelanden från %s. Servern svarade: %s"
 
-#: lib/Session.php:294
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Kunde inte utföra underhållsaktiviteter"
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Kunde inte extrahera begärd fil från MS-TNEF bilagan."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Kunde inte extrahera begärd fil från ZIP-arkivet."
 
-#: search.php:356 templates/fetchmail/account_select.inc:26
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Kan inte skapa en säker anslutning till IMAP-servern. %s : %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Kan inte hämta namndefinition från IMAP-server."
+
 #: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Skapa mapp"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Skapa nycklar"
 
-#: templates/search/header.inc:14
+#: templates/folders/vfolder_actions.inc:11
 msgid "Create Virtual Folder"
 msgstr "Skapa virtuell mapp"
 
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Skapa nytt konto"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Skapa ny mapp för skräppost"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Skapa ny mapp för utkast"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Skapa ny mapp för skickade meddelanden"
 
 #: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Skapa ny mapp som papperskorg"
+msgstr "Skapa ny mapp för papperskorg"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
 "Skapa filtreringsregler för att organisera inkommande meddelanden, sortera "
-"in i mappar och radera spam."
+"in i mappar och radera skräppost."
+
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Skapa ny mall"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Skapa mallar och formulärsvar."
 
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Nuvarande rättigheter för %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Skräddarsy konton för hämtning av meddelanden från andra konton."
 
@@ -1020,89 +1109,110 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Skräddarsy aktiviteter som körs vid inlogning till %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Dat_um"
 
-#: message.php:253 thread.php:75
+#: message.php:270 thread.php:153
 msgid "Date"
 msgstr "Datum"
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "Avböjt"
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
 msgstr "Avböjt: "
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Standard"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Förvalt sökfält"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Förvald sorteringsordning:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Förvald sorteringsriktning:"
 
-#: lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Delegerad"
 
-#: folders.php:374 templates/smime/smime.inc:65
-#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
-#: templates/mailbox/actions.inc:10 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:244 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: folders.php:400 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Radera publik nyckel för %s"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
-msgstr "Raderaaktuella nycklar"
+msgstr "Radera aktuella nycklar"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Radera mapp(ar)"
 
-#: folders.php:374
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "Radera valda mapp(ar)"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Radera mall"
+
+#: folders.php:400 templates/folders/vfolder_actions.inc:6
 msgid "Delete Virtual Folder"
 msgstr "Radera virtuell mapp"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Ändra definitionen för den virtuella mappen %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Radera hämtade meddelanden från server?"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Ta bort från min kalender"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Radera länkade bilagor i början av månaden?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Radera mapp(ar) för skickade meddelanden vid början av månaden?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Radera spam meddelanden när de rapporterats som spam?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Radera skräppost"
 
-#: mailbox.php:701 message.php:493 templates/mailbox/legend.inc:8
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+#: message.php:507 mailbox.php:735 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Raderad"
 
 #: templates/search/main.inc:63
 msgid "Deleted messages"
-msgstr "Radera meddelanden"
+msgstr "Raderade meddelanden"
 
-#: compose.php:292
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Raderade bilagan %s."
@@ -1111,104 +1221,116 @@
 msgid "Deleting and Moving Messages"
 msgstr "Radera och flytta meddelanden"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Avslå begäran"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Avslå begäran om ledig/upptagen-information"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Fallande"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:623
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Beskrivning"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Detaljer"
 
-#: config/prefs.php.dist:680
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "\"%s\" bifogades inte eftersom den är tom."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Gråmarkera signatur?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Visa"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Visa bekräftelse efter att meddelande har skickats?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Visa i meddelandet"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Visa popup notifiering vid nya meddelanden?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Visa 'Töm papperkorg' i menyn?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Visa \"Töm skräppost\" i menyn?"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Visa \"Töm papperkorg\" i menyn?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Placering"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
-msgstr "Skall INTE passa"
+msgstr "Skall INTE matcha"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Kontrollera inte mapp(ar) för nya meddelanden"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
-msgstr "Generera ingen länk från From:-kolumnen"
+msgstr "Skapa ingen länk av Från-kolumnen"
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1053
 msgid "Do you want to open that folder?"
 msgstr "Vill du öppna mappen?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Har du inget konto? Registrera dig."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Klar"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
-msgstr "Ladda ned %s som en zip-fil"
+msgstr "Hämta %s som en .zip-fil"
 
 #: templates/message/headers.inc:52
 msgid "Download All Attachments (in .zip file)"
-msgstr "Ladda ner alla bilagor (som en zip-fil)"
+msgstr "Hämta alla bilagor (som en .zip-fil)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Hämta mapp(ar)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
-msgstr "Hämta mapp(ar) (som en zip-fil)"
+msgstr "Hämta mapp(ar) (som en .zip-fil)"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
-msgstr "Ladda ner i .zip-format"
+msgstr "Hämta i .zip-format"
 
-#: mailbox.php:682 message.php:491 templates/message/navbar_navigate.inc:11
-#: templates/mailbox/legend.inc:9 templates/mailbox/navbar.inc:22
-#: templates/mailbox/navbar.inc:41
+#: message.php:505 mailbox.php:714 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Utkast"
 
-#: folders.php:354
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Utkast-mapp"
 
@@ -1216,28 +1338,36 @@
 msgid "Drafts folder:"
 msgstr "Utkast-mapp:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
-msgstr "E-post adress"
+msgstr "E-postadress"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:302
+msgid "END"
+msgstr "SLUT"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "FEL: Ditt meddelande kunde inte levereras."
 
-#: folders.php:375
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Ändra"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Ändra spärrade adresser"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Ändra filter"
 
-#: folders.php:375 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Redigera sökfråga"
+
+#: folders.php:401 templates/search/header.inc:17
+#: templates/folders/vfolder_actions.inc:4
 msgid "Edit Virtual Folder"
 msgstr "Ändra virtuell mapp"
 
@@ -1246,89 +1376,110 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Ändra definitionen för den virtuella mappen %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Ändra betrodda adresser"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Ändra spärrade adresser"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Ändra filterregler"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Ändra inställningar för åtkomst av andra e-postkonton."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Ändra betrodda adresser"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
-msgstr "E-post adress"
+msgstr "E-postadress"
 
-#: lib/Message.php:641
+#: lib/Message.php:697
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Rensade alla meddelanden från %s."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:673
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Rensade alla meddelanden från virtuella papperskorgen."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Töm mapp(ar)"
 
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "Töm markerade mappar"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Töm Papperskorg"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:949
+msgid "Empty _Spam"
+msgstr "Töm _skräppost"
+
+#: templates/menu/menu.inc:29 lib/IMP.php:942
 msgid "Empty _Trash"
 msgstr "Töm _papperskorg"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Aktivera PGP-funktionalitet?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Aktivera S/MIME-funktionalitet?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Aktivera förhandsgranskning av meddelanden?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:439
 msgid "Encr_yption Options"
 msgstr "Kr_ypteringsinställningar"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:611
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Krypterat"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Slut"
 
-#: lib/Compose.php:331
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Slut på vidarebefordrat meddelande"
 
-#: lib/Compose.php:272
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Slut på meddelanden"
 
-#: lib/Compose.php:270
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Slut på meddelande från %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Ange lösenord"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Ange namn på ny mapp för skräppost"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Ange namn på ny mapp för utkast"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Ange namn på ny mapp för skickade meddelanden"
 
@@ -1336,85 +1487,129 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Ange namn på ny papperskorg"
 
-#: compose.php:1055 message.php:185
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "Hela meddelandet"
+
+#: message.php:195 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "'%s' lades till i adressboken."
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pgp.php:392 lib/MIME/Viewer/pkcs7.php:367
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Fel"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/Fetchmail/hotmail.php:228
+msgid "Error 403: Request was forbidden."
+msgstr "Fel 403: Begäran tillåts inte."
+
+#: lib/Fetchmail/hotmail.php:232
+msgid "Error 503: Service is unavailable."
+msgstr "Fel 503: Service ej tillgänglig"
+
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Kan inte kontakta mailservern. %s : %s"
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Fel under sändning av svarsmeddelande: %s"
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/Fetchmail/hotmail.php:242
+#, php-format
+msgid ""
+"Error: Had to make %d requests, check username and password or increase "
+"request count limit."
+msgstr ""
+"Fel: Gjorde %d försök, var god kontroller användarnamn och lösenord, eller "
+"öka max antal försök."
+
+#: lib/Fetchmail/hotmail.php:235
+#, php-format
+msgid "Error: Unrecognized HTTP status was recieved: %s."
+msgstr "Fel: Okänd HTTP-status: %s."
+
+#: lib/Fetchmail/hotmail.php:263
+msgid "Error: fsockopen() failed."
+msgstr "Fel: fsockopen() misslyckades."
+
+#: lib/Fetchmail/hotmail.php:261
+#, php-format
+msgid "Error: fsockopen() failed. Error no: %s. Error string %s."
+msgstr "Fel: fsockopen() misslyckades. Fel nr: %s. Feltext: %s."
+
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Händelse raderad."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Var 15:e minut"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Var 30:e sekund"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Var 5:e minut"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
-msgstr "Varje halvtimma"
+msgstr "Varje halvtimme"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Varje minut"
 
-#: folders.php:412
+#: folders.php:438
 msgid "Expand"
 msgstr "Expandera"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Expandera alla"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Expandera alla mappar"
 
-#: folders.php:412
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Expandera mapp"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Expandera namn"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
-msgstr ""
-"Automatisk bakgrundsexpansion av adresser i fönstret 'skriv meddelande'?"
+msgstr "Automatisk bakgrundsexpansion av adresser när du anger mottagare?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Expandera alla mappar som förvald inställning i mappvyn?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 msgid "Expanding"
 msgstr "Expanderar"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:960 lib/IMP.php:962
+msgid "F_etch Mail"
+msgstr "Häm_ta e-post"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Hämta e-post"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "Hämta e-post i ett separat fönster."
 
@@ -1422,153 +1617,147 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Hämta meddelanden vid inloggning?"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:291
 #, php-format
-msgid "Fetched %d message(s) from %s"
+msgid "Fetched %d messages from %s"
 msgstr "Hämtade %d meddelanden från %s."
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Hämtade 1 meddelande från %s."
+
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Fetchmail: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: inga nya meddelanden."
 
-#: lib/IMP.php:916
+#: templates/menu/menu.inc:44 lib/IMP.php:966
 msgid "Fi_lters"
 msgstr "Fi_lter"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:492
+#: templates/compose/compose.inc:496 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Fil"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Filterinställningar"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Filterinställningar"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Filtrera meddelande på svordomar?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Filtersupport är avstängt i systemet."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filter"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filter är INTE aktivt"
 
-#: lib/Filter.php:112
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "%s-filterhanteringssida"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Sök"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Första brevlådesidan"
 
-#: mailbox.php:334
+#: mailbox.php:331
 msgid "First Page"
 msgstr "Första sidan"
 
 #: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
 msgid "Fo_rward"
-msgstr "Vida_rbefordra"
+msgstr "Vida_rebefordra"
 
-#: folders.php:259 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:2
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Bekräftelse för åtgärder i mappar"
+
+#: folders.php:289 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Mappnavigator"
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Mapprefix"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Mappsammanställning"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "Mappdelning är inte tillgängligt."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "Mappanvändning är inte tillgångligt."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Datumformat i brevlådevyn för meddelanden daterade idag"
 
-#: compose.php:714 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
-msgstr "Vidarbefordra"
+msgstr "Vidarebefordra"
 
-#: compose.php:699
+#: compose.php:805
 msgid "Forward:"
-msgstr "Vidarbefordra:"
+msgstr "Vidarebefordra:"
 
-#: lib/Compose.php:300
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: lib/Compose.php:298
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Vidarebefordrat meddelande från %s"
 
-#: lib/MIME/Viewer/itip.php:442
-msgid "Free/Busy Information"
-msgstr "Ledig/Upptagen information"
-
-#: lib/MIME/Viewer/itip.php:453
-msgid "Free/Busy Reply"
-msgstr "Ledig/Upptagen svar"
-
-#: lib/MIME/Viewer/itip.php:447
-msgid "Free/Busy Request"
-msgstr "Ledig/upptagen-förfrågan"
-
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Svar på ledig/upptagen-förfrågan"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "Frå_n"
 
-#: message.php:254 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:271 thread.php:154 templates/compose/compose.inc:99
+#: lib/Search.php:589
 msgid "From"
 msgstr "Från"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
-msgstr "Från adress"
+msgstr "Från-adress"
 
-#: compose.php:711 compose.php:715
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "VB:"
 
-#: compose.php:1216
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "VB: "
 
-#: compose.php:1218
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "VB: %u vidarbefordrat meddelande"
@@ -1580,144 +1769,176 @@
 
 #: templates/fetchmail/manage.inc:37
 msgid "Get only new messages? (IMAP only)"
-msgstr "Hämta enbart nya meddelanden? (endast IMAP)"
+msgstr "Hämta enbart nya meddelanden? (IMAP)"
 
-#: thread.php:68
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "OK"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Gå till meddelande"
 
-#: templates/acl/acl.inc:135
+#: lib/IMP.php:502
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Gå till adressbokspost för \"%s\""
+
+#: templates/acl/acl.inc:136
 msgid "Grant access"
-msgstr "Ge tillgång"
+msgstr "Tillåt åtkomst"
 
-#: message.php:546 lib/Filter.php:112 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/html.php:116 lib/MIME/Viewer/images.php:98
-#: lib/MIME/Viewer/images.php:105 lib/MIME/Viewer/images.php:107
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/notification.php:65
-#: lib/MIME/Viewer/notification.php:71 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/pkcs7.php:410 lib/MIME/Viewer/related.php:64
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:550 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "HÄR"
 
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:243
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML-version av meddelandet"
 
 #: templates/message/headers.inc:58
 msgid "Headers"
-msgstr "Rubrik"
+msgstr "Rubriker"
 
 #: templates/compose/recompose.inc:5
 msgid "Here is the message you were composing:"
 msgstr "Här är meddelandet du skrev på:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Gömd"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Gömd i trådvy"
 
-#: mailbox.php:356
+#: mailbox.php:353
 msgid "Hide Deleted"
-msgstr "Göm raderade"
+msgstr "Dölj raderade"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Göm unsubscribed"
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Hide the Images"
-msgstr "Göm bilder"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Hög"
 
-#: mailbox.php:687 message.php:288 templates/mailbox/legend.inc:12
+#: message.php:305 mailbox.php:719 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Hög prioritet"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Högst"
 
-#: config/prefs.php.dist:691
+#: lib/Fetchmail/hotmail.php:50
+msgid "Hotmail Accounts"
+msgstr "Hotmail-konton"
+
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Hur vill du visa bilagor?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Hur citerade rader visas i ett svar"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
-msgstr "IMAP (detektera protokoll automatiskt)"
+msgstr "IMAP (upptäck protokoll automatiskt)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP-servern bröt förbindelsen. Servern svarade: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP över SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP över SSL (självsignerat certifikat)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP över SSL (självsignerad)"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP-servern bröt förbindelsen."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, ingen TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 e-postservrar"
 
-#: folders.php:346
-msgid "INBOX"
-msgstr "Inkorg"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Om du använder SSL eller TLS så måste du ha OPENSSL-tillägget till PHP "
+"laddat."
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
+"Om du väljer att fortsätta så kommer alla meddelanden i mappen/mapparna att "
+"försvinna!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorera alla"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Bild"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importera"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importera nyckel"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Importera nyckelpar"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Importera meddelanden"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "Importera PGP-nyckel"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr "Importera personligt certifikat"
 
 #: templates/pgp/import_key.inc:14
@@ -1732,9 +1953,9 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Importera personligt S/MIME-certifikat"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
-msgstr "Import publik nyckel"
+msgstr "Importera publik nyckel"
 
 #: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
@@ -1755,11 +1976,11 @@
 #: templates/folders/import.inc:16
 #, php-format
 msgid "Import mbox file %s into folder %s."
-msgstr "Importera mbox fil %s till mappen %s."
+msgstr "Importera mbox-fil %s till mappen %s."
 
-#: mailbox.php:695 message.php:492 templates/message/navbar_navigate.inc:7
-#: templates/mailbox/legend.inc:7 templates/mailbox/navbar.inc:16
-#: templates/mailbox/navbar.inc:33
+#: message.php:506 mailbox.php:729 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Viktigt"
 
@@ -1767,46 +1988,48 @@
 msgid "Important messages"
 msgstr "Viktiga meddelanden"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Importerade %d meddelanden från %s."
 
-#: lib/MIME/Viewer/itip.php:725
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "Pågående"
 
-#: lib/Folder.php:248 lib/IMP.php:368
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:830 lib/IMAP/Tree.php:119
+#: lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Inkludera en kort sammanställning av rubrikerna i svar?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Inkludera orginalmeddelande i svar?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Info"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Information om publik nyckel för %s"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Information om personlig privat nyckel"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Information om personlig publik nyckel"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:497
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:501
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "Inline"
 
@@ -1826,32 +2049,32 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Infoga publik PGP-nyckel här"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Handling är ogiltig för den här komponenten."
 
-#: mailbox.php:555 mailbox.php:596
+#: mailbox.php:575 mailbox.php:622
 msgid "Invalid Address"
 msgstr "Felaktig adress"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307 lib/Fetchmail/hotmail.php:102
 msgid "Invalid Remote Mailbox"
 msgstr "Felaktig fjärrbrevlåda"
 
-#: compose.php:132
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Ogiltigt tecken i e-postadress: %s."
 
-#: pgp.php:16 smime.php:82
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "Felaktig nyckel"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Felaktig personlig privat PGP-nyckel."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Felaktig personlig publik PGP-nyckel."
 
@@ -1859,44 +2082,60 @@
 msgid "Invert"
 msgstr "Invertera urval"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Nyckellängd"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Nyckel skickades till den publika nyckelservern."
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Språk"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Sista brevlådesidan"
 
-#: mailbox.php:347
+#: mailbox.php:344
 msgid "Last Page"
 msgstr "Sista sidan"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "Lä_nka bilagor"
+#: templates/compose/compose.inc:549
+msgid "Link Attachments?"
+msgstr "Lä_nka bilagor?"
 
-#: attachment.php:34 lib/Compose.php:999
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "Länka bilagor är inte tillåtet."
 
-#: lib/Compose.php:1016
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Länkar kommer att löpa ut %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1904,28 +2143,28 @@
 "Visa alla kontakter när du tar fram kontaktvyn? (Annars ser du bara\n"
 "kontakter när du explicit söker efter dem)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
-msgstr "Visa i rubriken"
+msgstr "Visa i huvudet"
 
 #: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
-msgstr "Lokal brevlåda:"
+msgstr "Lokal mapp:"
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Plats"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Logga in"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Logga in till %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Login"
 
@@ -1933,27 +2172,27 @@
 msgid "Login Tasks"
 msgstr "Loginaktiviteter"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Låg"
 
-#: mailbox.php:690 message.php:290 templates/mailbox/legend.inc:13
+#: message.php:307 mailbox.php:722 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Låg prioritet"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Lägst"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Macintochfil"
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "E-post"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Förhandsgranskning"
 
@@ -1961,19 +2200,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Typ av e-post server att ansluta till:"
 
-#: folders.php:364
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Brevlåda"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Visningsinställningar för brevlåda och mappar"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Markera alla meddelanden i mappen som lästa"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Markera alla meddelanden i mappen som olästa"
 
@@ -1981,103 +2220,79 @@
 msgid "Mark as:"
 msgstr "Markera som:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Markera olika nivåer av citat med olika färger?"
 
 #: templates/fetchmail/manage.inc:40
 msgid "Mark messages as seen? (IMAP only)"
-msgstr "Merkera meddelanden som lästa? (endast IMAP)"
+msgstr "Markera meddelanden som lästa? (endast IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Hantera enkel textuppmärkning?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Samtliga"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Minst en"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:507
 msgid "Maximum Attachment Size"
 msgstr "Maximal bilagestorlek"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Max antal mappar"
+
+#: templates/compose/compose.inc:489
 msgid "Maximum number of attachments reached."
 msgstr "Max antal bilagor uppnått."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:485
 msgid "Maximum total attachment size reached."
 msgstr "Maxstorlek för samtliga bilagor uppnådd."
 
-#: lib/MIME/Viewer/itip.php:582
-msgid "Meeting Cancellation"
-msgstr "Avboka möte"
-
-#: lib/MIME/Viewer/itip.php:532
-msgid "Meeting Information"
-msgstr "Mötesinformation"
-
-#: lib/MIME/Viewer/itip.php:542
-msgid "Meeting Proposal"
-msgstr "Mötesförfrågan"
-
-#: lib/MIME/Viewer/itip.php:573
-msgid "Meeting Reply"
-msgstr "Mötessvar"
-
-#: lib/MIME/Viewer/itip.php:554
-msgid "Meeting Update"
-msgstr "Mötesuppdatering"
-
-#: lib/MIME/Viewer/itip.php:559
-msgid "Meeting Update Request"
-msgstr "Uppdateringsbegäran om möte"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Meny mapplista"
 
-#: lib/Compose.php:247
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Meddelande"
 
-#: compose.php:519 compose.php:546 compose.php:578 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Skriv meddelande"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Meddelandedatum"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Meddelandeinställningar"
 
-#: search.php:354
+#: search.php:306
 msgid "Message Search"
 msgstr "Meddelandesökning"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Meddelandestorlek"
 
-#: message.php:375
+#: message.php:392
 msgid "Message Source"
 msgstr "Meddelandekälla"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Meddelandevisning"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Meddelandefält"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Meddelandeflaggor"
@@ -2086,29 +2301,41 @@
 msgid "Message folders"
 msgstr "Meddelande mappar"
 
-#: lib/Compose.php:245
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Meddelande från %s"
 
-#: templates/search/header.inc:33
+#: mailbox.php:663
+msgid "Message has attachments"
+msgstr "Meddelandet har bilagor"
+
+#: mailbox.php:654
+msgid "Message is encrypted"
+msgstr "Meddelandet är krypterat"
+
+#: mailbox.php:649
+msgid "Message is signed"
+msgstr "Meddelandet är signerat"
+
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Meddelande matchar"
 
-#: compose.php:758 compose.php:772
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Meddelande eftersänt."
 
-#: compose.php:1005
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Meddelande skickades, men kunde inte sparas till %s"
 
-#: compose.php:1064 compose.php:1079
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Meddelande skickades."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Meddelande per sida i mappvyn."
 
@@ -2120,9 +2347,9 @@
 msgid "Modify"
 msgstr "Ändra"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
-msgid "More than one address found for field '%s'."
+msgid "More than one address found for field \"%s\"."
 msgstr "Mer än en adress hittat för fältet '%s'."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2133,7 +2360,11 @@
 msgid "Move down"
 msgstr "Flytta ner"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Flytta till mapp"
 
@@ -2141,53 +2372,70 @@
 msgid "Move up"
 msgstr "Flytta upp"
 
-#: lib/MIME/Viewer/alternative.php:130
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/smime/smime.inc:24 templates/fetchmail/manage.inc:48
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Flermeddelandevisning"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "INGET"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "Notering"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:640
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Namn"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "Namn och/eller e-post får inte vara tom"
 
-#: lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Aldrig"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Spara aldrig bilagor"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Ny"
 
-#: lib/IMP.php:578
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Ny mapp"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nya meddelanden"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Nytt meddelande"
+
+#: mailbox.php:771 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Nytt meddelande till %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nya meddelanden"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Nästa"
 
@@ -2195,15 +2443,16 @@
 msgid "Next Message"
 msgstr "Nästa meddelande"
 
-#: mailbox.php:345
+#: mailbox.php:342
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:540 templates/compose/compose.inc:553
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr "Nej"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Inget certifikat hittat"
 
@@ -2211,102 +2460,123 @@
 msgid "No Encryption"
 msgstr "Ingen kryptering"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Inga nycklar i nyckelringen"
 
-#: mailbox.php:364
-#, php-format
+#: mailbox.php:361
 msgid "No Messages"
 msgstr "Inga meddelanden"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Ingen publik PGP-nyckel importerades."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Inget personligt certifikat tillgängligt"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:319
+msgid "No Preview Text"
+msgstr "Ingen förhandsvisning"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Inga publika nycklar hittades"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Ingen publik S/MIME-nyckel importerades."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Bilagor saknas."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Ingen e-postinformation återfanns i den pulika nyckeln."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Ingen mapp vald."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "Inga mappar kontrolleras för ny e-post."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:201 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Inga mappar är valda"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "Inga mappar med nya meddelanden"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "Inga mappar med olästa meddelanden"
 
-#: lib/Compose.php:241
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "Ingen meddelandetext"
 
-#: lib/Mailbox.php:368
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Inget meddelande hämtat."
+
+#: lib/Mailbox.php:362
 msgid "No messages matched your search."
 msgstr "Inga meddelanden motsvarade din sökning."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Ingen personlig privat PGP-nyckel importerades."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Ingen personlig publik PGP-nyckel importerades."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Ingent personlig S/MIME-certifikat importerades."
 
-#: spelling.php:213
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr "Meddelandet kan inte dekrypteras, det finns ingen privat nyckel."
+
+#: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Hittade inget program för rättstavningskontroll."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Inga stavfel"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Inga förslag"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Ingen användare angiven."
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Icke-deltagare"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/prefs/spamselect.inc:5 templates/mailbox/navbar.inc:11
-#: lib/MIME/Viewer/itip.php:618
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Ingen"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normal"
 
@@ -2328,8 +2598,7 @@
 msgid "Not Personal"
 msgstr "Ej personligt"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:152 lib/Crypt/SMIME.php:158
-#: lib/Crypt/SMIME.php:167
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Felaktig publik PGP-nyckel."
 
@@ -2341,25 +2610,32 @@
 msgid "Not important messages"
 msgstr "Ej viktiga meddelanden"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Det kan ta en stund."
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Ingenting"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Obs: Länkade bilagor nedladdade"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr "Antal månader som länkade bilagor skall sparas, om månadsvis radering."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Antal mappar för skickade meddelanden som skall sparas vid månatlig radering."
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:685
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/smime/import_key.inc:47 templates/search/fields.inc:5
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "eller"
@@ -2368,93 +2644,97 @@
 msgid "Old messages"
 msgstr "Gamla meddelanden"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Mapp för skickade meddelanden rensas."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Visa bara mappar med olästa meddelanden?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:81 templates/folders/javascript.inc:71
 msgid "Only one folder should be selected for this action."
 msgstr "Bara en mapp kan vara vald för den här handlingen."
 
-#: templates/menu.inc:7 templates/menu.inc:27
+#: templates/menu/menu.inc:100 templates/menu/menu.inc:101
 msgid "Ope_n Folder"
 msgstr "Öpp_na mapp"
 
-#: templates/menu.inc:24
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "Öppna mapp"
+
+#: templates/menu/menu.inc:91 templates/menu/menu.inc:94
 msgid "Open Folder"
 msgstr "Öppna mapp"
 
-#: folders.php:381
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Öppnade mapp"
 
-#: lib/MIME/Viewer/itip.php:657
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Icke obligatoriska deltagare"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Andra e-postkonton"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Andra inställningar"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
 #: templates/compose/encrypt_list.inc:7
 msgid "PGP Encrypt Message"
-msgstr "PGP kryptera"
+msgstr "PGP-kryptera"
 
-#: compose.php:343
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP-fel: "
 
-#: compose.php:322
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP-fel: Behöver lösenord för personlig privat nyckel."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP är inte aktivt"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
-msgstr "PGP inställningar"
+msgstr "PGP-inställningar"
 
 #: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "Inmatning av PGP-lösenord"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "PGP personligt nyckelpar kräver säker förbindelse (HTTPS)."
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Publik PGP-nyckel"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Publik PGP-nyckel för '%s (%s)' lades till."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Publik PGP-nyckel för '%s' raderades."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Publik nyckelring för PGP"
 
@@ -2466,19 +2746,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Signera/Kryptera"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Privat PGP-nyckel lades till."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Publik PGP-nyckel lades till."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP-support är avstängt i systemet."
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2486,56 +2766,56 @@
 "Den digitala signaturen kan inte verifieras pga att PGP-support inte är "
 "aktiverat."
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "Meddelandet kan inte dekrypteras pga att PGP-support inte är aktiverat."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
-"PGP-stödet kräver att popup-fönster fungerar. Om din\n"
-"webbläsare är inställd att blockera popup-fönster måste du ändra den\n"
-"inställningen för att PGP-stödet ska fungera"
+"PGP-stödet kräver att popup-fönster fungerar. Om din webbläsare är inställd "
+"att blockera popup-fönster måste du ändra den inställningen för att PGP-"
+"stödet ska fungera"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
-msgstr "POP3 (detektera protokoll automatiskt)"
+msgstr "POP3 (upptäck protokoll automatiskt)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 över SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 över SSL (självsignerat certifikat)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 över SSL (självsignerad)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, ingen TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Sidan med första olästa meddelandet"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Sidan med det sista olästa meddelandet"
 
@@ -2543,32 +2823,32 @@
 msgid "Part(s)"
 msgstr "Del(ar)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Lösenord"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Lösenord (igen)"
 
-#: pgp.php:310 smime.php:235
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "Lösenord frigjort."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Lösenord:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
-msgstr "Lösenord kan inte vara tomt"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "Lösenord kan inte vara tomma"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Lösenord stämmer inte överrens"
 
-#: templates/smime/import_key.inc:69 templates/login/login.inc:221
-#: templates/fetchmail/manage.inc:20
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Lösenord"
 
@@ -2576,12 +2856,12 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Utför underhållsaktiviteter vid inloggning?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "Kan inte ändra rättigheter för denna användare."
 
-#: mailbox.php:666 message.php:483 templates/mailbox/legend.inc:10
-#: templates/mailbox/navbar.inc:24
+#: message.php:494 mailbox.php:698 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Personlig"
 
@@ -2589,39 +2869,52 @@
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Personligt nyckelpar för PGP skapades."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Personligt nyckelpar för PGP raderades."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Inget personligt S/MIME-certifikat importerades."
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Personligt nyckelpar för S/MIME raderades."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "Sätta signatur före svar och vidarbefordring?"
+msgstr "Infoga signatur före svar och vidarbefordring?"
 
-#: compose.php:241
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Meddelande i plaintext"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Spela ljud när ny e-post tas emot? Detta kräver att din webbläsare har stöd "
+"för inpackade ljudfiler. Nästan alla webbläsare för Mac och Windows har stöd "
+"för detta."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Skriv ett namn för den nya mappen:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
+#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
 msgid "Please enter the name of the new folder:"
 msgstr "Ange namn på ny mapp:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:139
+#: templates/folders/vfolder_javascript.inc:101
+#: templates/folders/javascript.inc:129
 msgid "Please enter the new name:"
 msgstr "Skriv in det nya namnet:"
 
@@ -2643,7 +2936,7 @@
 "Var god ange lösenord för din privata S/MIME-nyckel. Lösenordet behöver bara "
 "anges en gång per %s-session."
 
-#: recompose.php:88
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2656,60 +2949,48 @@
 "en säkerhetsåtgärd för att hindra att din session övertas. Vi ber om\n"
 "ursäkt för eventuella olägenheter detta orsakar."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Ange ditt lösenord."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Ange ditt användarnamn."
 
-#: compose.php:80 lib/IMP.php:519
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Rätta felaktiga eller tvetydiga adresser."
 
-#: lib/MIME/Viewer/itip.php:598
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Kontrollera följande information och välj sedan en handling i menyn\n"
-"nedan."
-
-#: templates/folders/javascript.inc:56
+#: templates/folders/vfolder_javascript.inc:49
+#: templates/folders/javascript.inc:53
 msgid "Please select a folder before you perform any actions."
 msgstr "Välj en mapp innan du utför handlingar."
 
-#: lib/MIME/Viewer/itip.php:461
-msgid "Please select an action from the menu below."
-msgstr "Välj en handling från menyn nedan."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Välj en mapp innan du utför denna aktivitet."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Välj åtminstone en mapp att söka i."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12 templates/folders/javascript.inc:4
 msgid "Please select only one folder for this operation."
 msgstr "Välj bara en mapp för den här operationen."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Välj eller ändra i rutan till höger:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Ange eller ändra nästa:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Drivs med Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Föregå signatur med streck ('--')?"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 msgid "Preferences successfully updated."
 msgstr "Inställningar uppdaterade."
 
@@ -2721,11 +3002,11 @@
 msgid "Previous Message"
 msgstr "Föregående meddelande"
 
-#: mailbox.php:336
+#: mailbox.php:333
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -2733,15 +3014,15 @@
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Lösenord för privat nyckel"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Bekräfta varje gång en bilaga skickas, ha NEJ som standardsvar"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Bekräfta varje gång en bilaga skickas, ha JA som standardsvar"
 
@@ -2749,42 +3030,42 @@
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Support för PGP-nyckelserver är inte aktivt."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Ren_sa raderade"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Rensa raderade"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Töm mapp(ar)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Hur ofta rensas papperkorgen:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Rensa meddelanden i papperkorgen äldre än så här många dagar."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Rensa gamla meddelanden i papperkorgen?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
+msgid "Purging %d messages from Trash folder."
 msgstr "Rensar %d meddelande(n) från papperkorgen."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "Lägg till efter @ om domän saknas:"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "Rensar 1 meddelande från papperkorgen."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2797,30 +3078,29 @@
 msgstr "Quota status: %.2fMB / INGEN BEGRÄNSNING"
 
 #: templates/quota/quota.inc:24
-#, php-format
 msgid "Quota status: NO LIMIT"
 msgstr "Quota status: INGEN BEGRÄNSNING"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Citerar %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "Be_gär leveransbekräftelse"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Återskapa information för mappvy"
 
-#: search.php:165
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Ankom den"
 
-#: search.php:173
+#: lib/Search.php:625
 msgid "Received Since"
-msgstr "Ankom sedan"
+msgstr "Ankom efter"
 
-#: search.php:169
+#: lib/Search.php:621
 msgid "Received Until"
-msgstr "Ankom till"
+msgstr "Ankom fram till"
 
 #: templates/message/navbar_actions.inc:16
 msgid "Redirec_t"
@@ -2830,27 +3110,23 @@
 msgid "Redirect"
 msgstr "Eftersänd"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Eftersänd meddelande"
 
-#: compose.php:721
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Eftersänd det här meddelandet"
 
-#: compose.php:781
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Eftersändning misslyckades."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Förnya"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
-msgstr "Förnya mappvyer:"
+msgstr "Uppdatera mappvyer:"
 
-#: templates/mailbox/header.inc:4 templates/folders/head.inc:3
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "Ladda om"
 
@@ -2858,11 +3134,11 @@
 msgid "Reload View"
 msgstr "Ladda om vy"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Kom ihåg information om ledig/upptagen."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Kom ihåg senaste vyn"
 
@@ -2870,7 +3146,7 @@
 msgid "Remote Mailbox:"
 msgstr "Fjärrbrevlåda:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Ta bort fält från sökningen"
 
@@ -2878,15 +3154,19 @@
 msgid "Remove source"
 msgstr "Ta bort källa"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Byt namn på mapp(ar)"
 
-#: config/prefs.php.dist:335
+#: templates/folders/vfolder_actions.inc:5
+msgid "Rename Virtual Folder"
+msgstr "Skapa virtuell mapp"
+
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Byt namn på mapp för skickade meddelanden i början av månaden?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:458
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Namnbyte från '%s' till '%s' misslyckades. Servern svarade"
@@ -2895,7 +3175,7 @@
 msgid "Repl_y to List"
 msgstr "Sva_ra till lista"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Ersätt med:"
 
@@ -2903,7 +3183,7 @@
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Svar skickat."
 
@@ -2911,7 +3191,7 @@
 msgid "Reply to All"
 msgstr "Svara alla"
 
-#: compose.php:670
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Svara alla:"
 
@@ -2919,7 +3199,7 @@
 msgid "Reply to List"
 msgstr "Svara till lista"
 
-#: compose.php:672
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Svara till lista:"
 
@@ -2927,107 +3207,101 @@
 msgid "Reply to _All"
 msgstr "Svara _alla"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Svara att begäran inte stöds"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Svara med information om ledig/upptagen för kommande två månader."
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Svara med den begärda ledig/upptagen-informationen."
 
-#: message.php:258
+#: message.php:275
 msgid "Reply-To"
 msgstr "Svar till"
 
-#: lib/Compose.php:260 lib/Compose.php:312
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Svar till: "
 
-#: compose.php:668
+#: compose.php:769
 msgid "Reply:"
 msgstr "Svara:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Rapportera som oskyldigt"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "Rapportera som spam"
+msgstr "Rapportera som skräppost"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:386
 msgid "Request a _Read Receipt"
 msgstr "Begär _läskvitto"
 
-#: config/prefs.php.dist:587
-msgid "Request delivery confirmation?"
-msgstr "Begär leveransbekräftelse?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Begär läskvitto?"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr "Begärt meddelande ej funnet."
 
-#: lib/MIME/Viewer/itip.php:649
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Obligatorisk deltagare"
 
-#: templates/search/header.inc:26 templates/search/main.inc:143
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:138 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Återställ"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Svarsstatus uppdaterad."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Återta"
 
-#: recompose.php:89
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Återuppta session"
 
-#: templates/fetchmail/account_select.inc:32
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Återvänd till att skriva meddelande"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
 msgstr "Återvänt till Fetch Mail"
 
-#: templates/smime/smime.inc:158 templates/filters/notactive.inc:13
-#: templates/filters/prefs.inc:70 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Återvänd till huvudinställningsfönster"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Återvänd till inställningar"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Återgå till föregående vy"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Återvända till mappvyn efter radering, flyttning eller kopiering av "
 "meddelande?"
 
-#: lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Roll"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:411
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3035,44 +3309,40 @@
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME kryptera"
 
-#: compose.php:379
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME-fel:"
 
-#: compose.php:358
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME-fel: Behöver lösenord för personlig privat nyckel."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME är inte aktivt"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME inställningar"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "Inmatning av S/MIME-lösenord"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "S/MIME personligt nyckelpar kräver säker förbindelse (HTTPS)."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Publik S/MIME-nyckel för '%s' raderades."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Publik S/MIME-nyckel lades till."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Publik nyckelring för S/MIME"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Publikt/privat nyckelpar för S/MIME lades till."
 
@@ -3084,116 +3354,133 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME Signera/Kryptera"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "S/MIME-support är avstängt i systemet."
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 "Meddelandet kan inte dekrypteras pga att stöd för S/MIME inte är aktiverat."
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 "Innehållet i det signerade meddelandet kan inte verifieras pga att stöd för "
 "S/MIME inte är aktiverat."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr ""
-"Den digitala signaturen kan inte verifieras pga att stöd för PGP inte är "
+"Den digitala signaturen kan inte verifieras pga att stöd för S/MIME inte är "
 "aktiverat."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME-stödet använder popup-fönster. Om din webbläsare är inställd\n"
 "att blockera popup-fönster måste du ändra den inställningen för att\n"
 "S/MIME-stödet ska fungera"
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "Ä_rende"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Spa_ra kopia i "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Spa_ra som"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:308 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Spara"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:536
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Spara bilagor med meddelandet i sent-mail mappen?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save Draft"
 msgstr "Spara utkast"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:37
-#: templates/filters/prefs.inc:69 templates/pgp/notactive.inc:23
-#: templates/pgp/pgp.inc:64
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Spara bild"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Spara bild i galleri"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Spara inställningar"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Spara mall"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save _Draft"
 msgstr "Spara _utkast"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Spara som"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Spara utkast som olästa?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr "Lägg till mottagare till huvudadressboken automatiskt?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:122
 msgid "Save search as a virtual folder?"
 msgstr "Spara sökning som en virtuell folder?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Spara skickade meddelanden?"
 
-#: compose.php:1149
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Misslyckades att spara utkast. Servern svarade: %s"
 
-#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:197
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Sök"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Sök %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Sök e-post"
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Inställningar för sökning"
 
-#: search.php:311
+#: search.php:263
 msgid "Search Results"
 msgstr "Sökresultat"
 
@@ -3209,7 +3496,7 @@
 msgid "Select Another Account"
 msgstr "Välj ett annat konto"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Välj ett datum"
 
@@ -3217,7 +3504,11 @@
 msgid "Select a field"
 msgstr "Välj ett fält"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Välj en mall:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Välj adressbok för tillägg och sökning av adresser."
 
@@ -3237,6 +3528,10 @@
 msgid "Select none"
 msgstr "Välj ingen"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Välj galleri att spara bilden i."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Välj e-postservertyp"
@@ -3245,32 +3540,36 @@
 msgid "Selected Address books:"
 msgstr "Valda adressböcker:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Skicka nyckel till publik nyckelserver"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Skicka senaste informationen"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Skicka leveransbekräftelse när sändaren begär det?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Send Message"
-msgstr "Skicka meddelanden"
+msgstr "Skicka"
+
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr ""
+
+#: config/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "Skicka läsbekräftelse när sändaren begär det?"
 
-#: folders.php:359
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "Mapp för skickade meddelanden"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Mapp för skickade meddelanden:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Server"
 
@@ -3287,7 +3586,7 @@
 msgstr ""
 "Ange inställningar för vad som händer vid flytt och radering av meddelanden."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Ange 'X-Priority' rubrik när meddelanden skickas?"
 
@@ -3303,7 +3602,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Dela e-postmappar med andra användare."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3311,18 +3610,18 @@
 "Ska stora sjok av citerad text visas eller gömmas som standard?\n"
 "Oavsett vilket du väljer är det lätt att ändra."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Vill du söka efter PGP data i text/plain-meddelanden?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 "Skall fönstret 'skriv meddelande' stängas efter att utkast har sparats?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
-msgstr "Vill du, som default, bifoga din publika PGP-nyckel till meddelanden?"
+msgstr "Vill du, som standard, bifoga din publika PGP-nyckel till meddelanden?"
 
 #: templates/search/main.inc:92
 msgid "Show All Folders"
@@ -3332,7 +3631,7 @@
 msgid "Show All Headers"
 msgstr "Visa alla rubriker"
 
-#: mailbox.php:354
+#: mailbox.php:351
 msgid "Show Deleted"
 msgstr "Visa raderade"
 
@@ -3348,54 +3647,50 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Visa bara mappar med prenumerationer"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Visa unsubscribed"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Visa en ikon för att ta bort bilagor från meddelanden?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "Visa förklaring i mappvyn?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Visa förhandsgranskningar bara för olästa meddelanden?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr "Visa förhandsgranskningar i verktygtips?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Visa 'hämta meddelanden' i menyn?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Visa alla bilder"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Visa filterikon i menyn?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Visa antal meddelanden i mapp?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Visade"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Sto_rlek"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr "Anmäl dig om du inte registrerad"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Signerat"
@@ -3404,154 +3699,183 @@
 msgid "Size"
 msgstr "Storlek"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Sorteringsriktning"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Sortera på ankomst"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Sortera på datum"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Sortera på adress"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Sortera på storlek"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Sortera på ärende"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Sortera på tråd"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Sortera på adress"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
-msgstr "Spammapp:"
+msgstr "Mapp för skräppost:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Specialtecken"
 
-#: templates/compose/compose.inc:334
+#: search.php:142
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Virtuella mappar som är spciella kan inte ändras."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Stavningskontroll"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Stavningskontroll"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Stavningskontroll klar"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Antal stavfel per skärm vid stavningskontroll."
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Start"
 
-#: lib/MIME/Viewer/itip.php:640
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Mall"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Mallens namn:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Malltyp:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Mall:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Status"
 
-#: lib/MIME/Contents.php:215
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Ta bort bilaga"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Ta bort radbrytningar?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Ä_rende"
 
-#: message.php:259 search.php:157 templates/compose/recompose.inc:25
+#: message.php:276 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Ärende"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
-msgstr "Ärende fält"
+msgstr "Ärendefält"
 
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:310 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Prenumerera på mapp(ar)"
 
-#: lib/MIME/Viewer/pgp.php:395 lib/MIME/Viewer/pkcs7.php:370
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Lyckat"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Förslag"
 
-#: lib/MIME/Viewer/itip.php:616 lib/MIME/Viewer/itip.php:618
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Sammanställning"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:397 templates/compose/compose.inc:400
 msgid "Switch Composition Method"
 msgstr "Byt skrivläge"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:401
 msgid "Switch to HTML composition"
 msgstr "Byt till HTML-läge"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:401
 msgid "Switch to plain text composition"
 msgstr "Byt till textläge"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:416
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
 msgstr "Preliminärt: "
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Godkänn begäran preliminärt"
 
-#: lib/MIME/Viewer/itip.php:713
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Preliminärt accepterat"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
-#, php-format
+#: lib/Maintenance/Task/tos_agreement.php:49
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Fil med avtalsvillkor är inte angiven i conf.php"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Te_xt"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
-msgstr "Vad ska From:-kolumnen av meddelandet länka till:"
+msgstr "Vad skall \"Från\"-kolumnen av meddelandet länka till:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"IMAP-servern verkar inte stöjda den valda autentiseringsmetoden. Var god "
+"kontakta systemadministratören."
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintosh resurs-strömmen"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Macintosh resurs-strömmen kan laddas ner %s."
@@ -3566,16 +3890,11 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Kontot '%s' sparades."
 
-#: lib/Filter.php:103
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Adressen '%s' har lagts till i %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Bilagor saknas."
 
-#: lib/MIME/Viewer/itip.php:61
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "Kalenderinformationen är felaktig"
 
@@ -3587,40 +3906,40 @@
 "Kan inte öppna fönstret att skriva meddelanden i, kanske har du ställt in "
 "din webbläsare att blockera popup-fönster?"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Innehållet i Macintosh-filen återfinns nedan."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Namnet på nuvarande mapp(ar) '%s' kommer att bytas till '%s'."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr "Kunde inte hämta listan på användare med tillgång till denna mapp"
 
-#: compose.php:1158
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Utkastet har sparats i mappen \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Händelsen har lagts till i din kalender."
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
+msgid "The field \"%s\" can't be expanded."
 msgstr "Fältet '%s' kan inte expanderas."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:332
 #, php-format
 msgid "The folder \"%s\" already exists"
-msgstr "Mappen '%s' existerar redan"
+msgstr "Mappen '%s' finns redan"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:162
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3629,69 +3948,78 @@
 "Namnet på mappen '%s' innehåller felaktiga tecken som kan medföra problem. "
 "Var god kontakta din systemadministratör."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:351
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Mappen '%s' skapades men du började inte prenumerera på den."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:269
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Mappen '%s' raderades men din prenumeration på mappen togs inte bort."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:338
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Mappen '%s' skapades inte. Servern svarade"
 
-#: lib/Folder.php:373
+#: lib/Folder.php:262
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Mappen '%s' raderades inte. Servern svarade"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mappen '%s' skapades."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Mappen '%s' raderades."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:456
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Namnet på mappen '%s' ändrades till '%s'"
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Följande filer var bifogade den här delen:"
 
-#: lib/MIME/Viewer/html.php:95
+#: templates/javascript/open_saveimage_win.js:12
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Kan inte öppna fönstret att spara bilder i, kanske har du ställt in din "
+"webbläsare att blockera popup-fönster?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr "Visar bilder då avsändaren finns i din adressbok."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "E-postservern gav följande felmeddelande:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "E-postservern gav följande informationsmeddelande:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "E-postservern gav följande meddelande:"
 
-#: lib/Message.php:635
+#: lib/Message.php:691
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Mappen '%s' är redan tom."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3702,15 +4030,19 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Meddelandet som skrivs har stängts. Avslutar."
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Meddelandet har saknar innehåll i ärenderaden."
+
+#: message.php:149
 msgid "The message has been deleted."
 msgstr "Meddelandet har raderats."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Meddelandet har verifierats."
 
-#: lib/MIME/Viewer/pkcs7.php:374
+#: lib/MIME/Viewer/pkcs7.php:389
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Meddelandet har verifierats. Avsändare: %s"
@@ -3723,20 +4055,20 @@
 "Kan inte öppna fönstret för att fråga efter lösenfras. Kanske har du ställt\n"
 "in din webbläsare att blockera popup-fönster?"
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Råtexten för PGP-nyckeln visas %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
-msgstr "Den begärda filen finns inte i MS-TNEF bilagan."
+msgstr "Den begärda filen finns inte i MS-TNEF-bilagan."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
-msgstr "Den begärda filen finns inte i ZIP bilagan."
+msgstr "Den begärda filen finns inte i .zip-bilagan."
 
-#: message.php:547
+#: message.php:551
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3746,15 +4078,15 @@
 "Avsändaren begär leveransbekräftelse av dig när du läst detta\n"
 "meddelande. Klicka %s för att skicka leveransbekräftelse."
 
-#: lib/MIME/Viewer/images.php:72
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
 msgstr "Servern kunde inta skapa en miniatyrbild för bilden."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "Kunde inte byta ut signaturen."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Signaturen har ersatts."
 
@@ -3762,42 +4094,57 @@
 msgid "The specified file does not exist."
 msgstr "Angiven fil finns inte."
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Mallen '%s' lades till."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Mallen '%s' raderades."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Mallen '%s' har uppdaterats."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "Uppgiften har lagts till i din uppgiftslista."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Texten för meddelandet"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Texten för meddelandet kan visas %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Texten för det returnerade meddelandet."
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Texten för det returnerade meddelandet kan visas %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Texten för det skickade meddelandet."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Texten för det skickade meddelandet kan visas %s."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Ledig/upptagen-information för användaren har sparats."
 
-#: lib/MIME/Viewer/alternative.php:89
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "Det finns inga alternativa delas som kan visas inline."
 
@@ -3805,21 +4152,16 @@
 msgid "There are no messages in this mailbox."
 msgstr "Det finns inga meddelanden i den här mappen."
 
-#: lib/Message.php:594
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Problem vid radering av %s. Servern svarade"
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr "Det finns ingen text som kan visas inline."
 
-#: lib/Message.php:637
+#: lib/Message.php:693
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Problem vid radering av innehållet i mappen. Servern svarade: %s"
 
-#: lib/Message.php:603
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Problem vid radering av innehållet i mappen. Servern svarade"
-
-#: lib/Message.php:97
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3828,7 +4170,7 @@
 "Det uppstod problem vid kopiering av meddelanden till '%s' till '%s'. "
 "Servern svarade"
 
-#: lib/Message.php:207 lib/Message.php:222
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3837,7 +4179,7 @@
 "Det uppstod problem vid radering av meddelanden från mappen '%s'. Servern "
 "svarade"
 
-#: lib/Message.php:286
+#: lib/Message.php:320
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3846,21 +4188,21 @@
 "Det uppstod problem vid radering av meddelanden från mappen '%s'. Servern "
 "svarade"
 
-#: lib/Message.php:220
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Det uppstod problem vid radering av meddelanden. Servern svarade %s"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Det uppstod ett fel vid radering av händelse: %s"
 
-#: lib/MIME/Viewer/enriched.php:40 lib/MIME/Viewer/plain.php:55
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Det uppstod ett fel vid visning av meddelandedelen."
 
-#: lib/Message.php:523 lib/Message.php:565
+#: lib/Message.php:594
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3869,27 +4211,27 @@
 "Det uppstod problem vid märkning av meddelanden i mappen '%s'. Servern "
 "svarade"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Det uppstod ett fel vid import: %s"
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Fel vid import av händelsen: %s."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Fel vid import av uppgiften: %s."
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "Fel vid import av information om ledig/upptagen: %s."
 
-#: lib/Message.php:92
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3898,69 +4240,68 @@
 "Det uppstod problem vid flytt av meddelanden till '%s' till '%s'. Servern "
 "svarade"
 
-#: compose.php:1166
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "Det uppstod ett fel när meddeladet skulle sparas som utkast."
 
-#: compose.php:927
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
-msgstr "Det uppstod ett fel vid skickning av ditt meddelande: %s"
+msgstr "Det uppstod ett fel när ditt meddelande skickades: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Det uppstod ett fel vid 3uppdatering av händelsen: %s"
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
-msgstr "Ingen text iden här  meddelandedelen"
+msgstr "Ingen text i den här meddelandedelen"
 
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "HTML-meddelandet har inbäddade bilder."
 
-#: lib/MIME/Viewer/html.php:89
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
-"Detta HTML-meddelande har inbäddade bilder. Blockerade bilder visas så\n"
-"här:"
+"Detta HTML-meddelande har inbäddade bilder. Blockerade bilder visas så här:"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Den här publika PGP-nyckeln var bifogat till meddelandet."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Denna handling stöds inte."
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Handlingen är inte implementerad ännu."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14 templates/folders/javascript.inc:6
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Det kan ta lite tid, är du säker på att du vill fortsätta?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Detta meddelande innehåller en Macintosh-fil."
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:415
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr "Meddelandet innehåller en bilaga som har signerats via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Meddelandet innehåller en bilaga som har krypterats via S/MIME."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -3968,43 +4309,43 @@
 "Detta meddelande innehåller leveransinformation om e-post, men\n"
 "formatet på meddelandet är okänt."
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Det här meddelandet verkar inte ha ett riktigt PGP-fomat. Fel: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
-"Det här meddelandet verkar inte ha ett riktigt PGP-fomat (enligt RFC 2015)."
+"Det här meddelandet verkar inte ha ett riktigt PGP-format (enligt RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Det här meddelandet verkar inte ha ett riktigt S/MIME-fomat."
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Meddelandet har signerats via PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Meddelandet har signerats via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Meddelandet har krypterats via S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Meddelandet har krypterats via PGP."
 
-#: message.php:202
+#: message.php:211
 msgid "This message to"
 msgstr "Meddelandet till"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Denna server stöder inte delade mappar."
 
@@ -4013,18 +4354,21 @@
 msgstr ""
 "Detta fönster kan bara öppnas från ett fönster för att skriva meddelanden."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Trådvisning"
+
+#: thread.php:76 templates/thread/top.inc:3 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Trådvy"
 
-#: mailbox.php:576 message.php:255 search.php:145
-#: templates/mailbox/message_headers.inc:17
-#: templates/contacts/contacts.inc:221 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: message.php:272 mailbox.php:602 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "Till"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "Till adress"
 
@@ -4036,11 +4380,18 @@
 "För att välja flera fält, håll nere Control (på PC) eller Command (på\n"
 "Mac) och klicka."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"För att använda TLS-anslutning, så måste du använda PHP 5.1.0 eller senare."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Storlek på bilagor:"
 
-#: folders.php:350
+#: folders.php:369
 msgid "Trash folder"
 msgstr "Papperskorg"
 
@@ -4048,11 +4399,10 @@
 msgid "Trash folder:"
 msgstr "Papperskorg"
 
-#: lib/Quota/command.php:77 lib/Quota/courier.php:54 lib/Quota/cyrus.php:70
-#: lib/Quota/logfile.php:93 lib/Quota/mdaemon.php:51
-#: lib/Quota/mercury32.php:84
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
-msgstr "Kunde inte läsa quota"
+msgstr "Kunde inte läsa kvota"
 
 #: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
 #: templates/mailbox/navbar.inc:36
@@ -4067,28 +4417,45 @@
 msgid "Undelete"
 msgstr "Återta"
 
-#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:218
+#: mailbox.php:580 mailbox.php:598 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
-msgstr "Okänd mottagare"
+msgstr "Dolda mottagare"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Oväntat svar från server för AUTHENTICATE-kommando: "
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Oväntat svar från server för Digest-MD5: "
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Oväntat svar från server för LOGIN-kommando: "
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Icke hanterad komponent av typ: %s"
 
-#: mailbox.php:537
+#: mailbox.php:558
 msgid "Unknown Date"
 msgstr "Okänt datum"
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Okänt svar från IMAP-server. Servern svarade: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Okänt möte"
 
-#: mailbox.php:588
+#: mailbox.php:614
 msgid "Unknown Recipient"
 msgstr "Okänd mottagare"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Frigör lösenord"
 
@@ -4096,46 +4463,51 @@
 msgid "Unnamed"
 msgstr "Namnlös"
 
-#: mailbox.php:671 message.php:489 templates/message/navbar_navigate.inc:6
-#: templates/mailbox/legend.inc:5 templates/mailbox/navbar.inc:15
-#: templates/mailbox/navbar.inc:32
+#: message.php:503 mailbox.php:703 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Oläst"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Avsluta prenumeration på mapp(ar)"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Uppdatera bilageinformation"
+#: templates/compose/compose.inc:515
+msgid "Update"
+msgstr "Uppdatera"
 
-#: lib/MIME/Viewer/itip.php:576
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Uppdatera status på svarande"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Använd förvalt värde"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Använd IMAPs mappprenumerationer?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Använd virtuell papperskorg?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Användare"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
-msgstr "Gav användaren '%s' angivna rättigheter till mappen '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "Gav användaren \"%s\" angivna rättigheter till mappen \"%s\"."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Användarnamn"
 
@@ -4143,158 +4515,228 @@
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Visa"
 
-#: lib/MIME/Viewer/tnef.php:112 lib/MIME/Viewer/zip.php:95
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "Visa %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Visa publik nyckel för %s"
 
-#: lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "Visa HTML-innehåll i ett separat fönster"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Visa meddelanden"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Visa personlig, privat nyckel"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Visa personlig, publik nyckel"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Visa tråd"
 
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Visa miniatyrbild"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:423
 msgid "View attachment in a separate window"
 msgstr "Visa bilagor i ett separat fönster"
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "Visa innehåll i ett separat fönster"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Visa händelse"
 
-#: folders.php:342 mailbox.php:506
+#: folders.php:361 mailbox.php:521
 #, php-format
 msgid "View messages in %s"
 msgstr "Visa meddelanden i %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Vy eller mapp att visa efter inloggning:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Visa uppgift"
 
-#: lib/MIME/Viewer/html.php:110
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Visa bilder"
 
-#: search.php:309
+#: search.php:260
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
-msgstr "Virtuell mapp '%s' skapades."
+msgstr "Virtuell mapp \"%s\" skapades."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:125 lib/IMAP/Tree.php:138
-#: lib/IMAP/Tree.php:140 lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:145
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:353 lib/IMAP/Tree.php:395
+#: templates/search/main.inc:111 templates/folders/vfolder_head.inc:2
+#: lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154 lib/IMAP/Tree.php:156
+#: lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161 lib/IMAP/Tree.php:371
+#: lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: search.php:291
+#: search.php:252
 msgid "Virtual Folders require a label."
-msgstr "Virtuella mappar måste ha en etikett"
+msgstr "Virtuella mappar måste ha ett namn"
 
-#: templates/search/main.inc:133
+#: lib/VFolder.php:176 lib/VFolder.php:186 lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Virtuell inkorg"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Virtuell inkorg"
+
+#: lib/Mailbox.php:156 lib/VFolder.php:111 lib/VFolder.php:123
+#: lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Virtuell papperskorg"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Virtuell papperskorg"
+
+#: templates/search/main.inc:128
 msgid "Virtual folder label"
 msgstr "Namn på virtuell mapp"
 
-#: login.php:131
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "Varning"
+
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Välkommen till %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Hur skall meddelanden hanteras efter de har rapporterats som skräppost eller "
+"som EJ-skräppost?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr ""
-"När meddelanden raderas flytta dem till papperskorgen istället för att "
+"När meddelanden raderas, flytta dem till papperskorgen istället för att "
 "markera dem som raderade?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
-msgstr "När du öppnar en ny e-postlåda, vilken sida vill du börja på?"
+msgstr "När du öppnar en ny mapp, vilken sida vill du börja på?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
-msgstr "När skickad post sparas, ska bilagor också sparas?"
+msgstr "När skickad post sparas, skall bilagor också sparas?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"När vi skickar e-post eller expanderar adresser, vilken domän skall vi lägga "
+"till ofullständiga e-postadresser (adresser utan \"@\")?"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Betrodda adresser"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Radbryt texten vid så här många tecken."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:539 templates/compose/compose.inc:552
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Du kommer att häme meddelanden från följande konto(n):"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Du försöker ta bort följande mappar:"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Du försöker ta bort alla meddelanden i följande mapp(ar):"
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Du försöker ta bort följande mapp(ar):"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Du flyttar/kopierar till en ny mapp."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:104 templates/folders/javascript.inc:94
 msgid "You are creating a sub-folder to "
 msgstr "Du skapar en undermapp till "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:106 templates/folders/javascript.inc:96
 msgid "You are creating a top-level folder."
-msgstr "Du skapar en mapp på topp-nivån."
+msgstr "Du skapar en mapp på toppnivån."
+
+#: lib/Folder.php:315
+msgid "You are not allowed to create folders."
+msgstr "Du får inte skapa mappar."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:322
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Du får inte skapa mer än %d mapp(ar)."
+
+#: templates/javascript/folders.js:137
+#: templates/folders/vfolder_javascript.inc:99
+#: templates/folders/javascript.inc:127
 msgid "You are renaming the folder: "
 msgstr "Du döper om mappen: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Du kan använda följande makron i malltexten: %c för meddelandeinnehållet; %s "
+"för signaturen."
+
+#: lib/Folder.php:557
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "Du kan inte avsluta din prenumeration på \"%s\"."
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr "Eftersom du inte godkänt användningsvillkoren får du inte logga in."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "Du har inte rätt att ändra rättigheter för denna mapp"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Du vidarbefordrade meddelandet %%s till följande mottagare: %s."
@@ -4308,34 +4750,34 @@
 msgid "You have 1 new message."
 msgstr "Du har 1 nytt meddelande."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Du har minst en bilaga vald som du inte laddat upp än. Är du säker på att du "
-"vill skicka meddelandet utan bilagorna?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Du har sedan skickat sidan/formuläret."
 
-#: lib/IMP.php:1002
+#: lib/IMP.php:1052
 msgid "You have new mail in the following folder:"
-msgstr "Du har ny post i följande mapp:"
+msgstr "Du har nya meddelanden mappen:"
 
-#: lib/IMP.php:1007
+#: lib/IMP.php:1057
 msgid "You have new mail in the following folders:"
 msgstr "Du har nya meddelanden i följande mappar:"
 
-#: compose.php:127
+#: templates/folders/vfolder_javascript.inc:52
+msgid "You may only edit 1 folder at a time."
+msgstr "Du kan bara redigera en mapp åt gången."
+
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Välj minst en mottagare."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Du måste ange lösenord för din privata PGP-nyckel för att kunna visa det här "
 "meddelandet."
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4343,7 +4785,7 @@
 "Du måste ange lösenord för din privata S/MIME-nyckel för att kunna visa det "
 "här meddelandet."
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Välj en målmapp först."
 
@@ -4355,8 +4797,8 @@
 msgid "You must select an address first."
 msgstr "Du måste ange en adress först."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Välj minst ett meddelande först."
 
@@ -4364,66 +4806,62 @@
 msgid "You must specify a recipient."
 msgstr "Välj en mottagare."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Välj minst en fil att bifoga."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "Du måste aktivera '%s' i underhållsinställningar."
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Du måste aktivera \"%s\" i underhållsinställningar."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Du eftersände meddelandet till %s den %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Du svarade på meddelandet %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
-msgstr "Du blev inte prenumerant på '%s'. Servern svarade"
+msgstr "Du blev inte prenumerant på \"%s\". Servern svarade"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr "Din prenumeration på '%s' avslutades inte. Servern svarade"
+msgstr "Din prenumeration på \"%s\" avslutades inte. Servern svarade"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
-msgstr "Prenumeration på '%s' startades."
+msgstr "Prenumeration på \"%s\" startades."
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
-msgstr "Din prenumeration på '%s' avslutades."
+msgstr "Din prenumeration på \"%s\" avslutades."
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Ditt namn"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Din publika/privata nyckel för PGP"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Din privata nyckel"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Din publika nyckel"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Din Reply-to: adress: <em>(valfri)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Ditt publika/privata certifikat för S/MIME"
 
@@ -4431,14 +4869,14 @@
 msgid "Your accounts:"
 msgstr "Dina konton:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Dina alias adresser: <em>(ej obligatoriskt, skriv varje adress på en ny\n"
+"Dina aliasadresser: <em>(ej obligatoriskt, skriv varje adress på en ny\n"
 "rad)</em>"
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr "Din webläsare stödjer inte inline-visning av den här bildtypen."
 
@@ -4450,39 +4888,71 @@
 "Din webläsare stödjer inte utskriftsfunktionen. Tryck control/option + P för "
 "att skriva ut."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
-msgstr "Standardteckenuppsättning när du skickar meddelanden:"
+msgstr "Standardtextkodning när du skickar meddelanden:"
 
 #: templates/prefs/encryptselect.inc:1
 msgid "Your default encryption method for sending messages:"
 msgstr "Standardmetod för kryptering när du skickar meddelanden:"
 
-#: lib/MIME/Viewer/status.php:92
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"De länkade bifogade dokumenten har laddats ned av åtminstone en användare.\n"
+"\n"
+"Namn: %s\n"
+"Datum: %s\n"
+"\n"
+"Klicka på länken för att radera de bifogade dokumenten:\n"
+"%s"
+
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Meddelandet levererades."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Din signatur:"
 
-#: compose.php:1206 mailbox.php:521 message.php:279 lib/Compose.php:742
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Göm adresser]"
+
+#: message.php:296 compose.php:1301 mailbox.php:536 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Inget ärende]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Visa adresser -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Visa adresser - %s mottagare]"
+
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
-msgstr "_Spärra adresser"
+msgstr "_Spärra adress"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:903
+#: templates/menu/menu.inc:31
 msgid "_Compose"
 msgstr "_Skriv meddelande"
 
@@ -4491,35 +4961,39 @@
 msgid "_Delete"
 msgstr "_Radera"
 
-#: lib/IMP.php:905
+#: templates/menu/menu.inc:33 lib/IMP.php:955
 msgid "_Folders"
 msgstr "_Mappar"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: lib/IMP.php:896
+#: templates/menu/menu.inc:24 lib/IMP.php:924
 msgid "_Inbox"
 msgstr "_Inkorg"
 
-#: lib/IMP.php:946
+#: templates/menu/menu.inc:83 lib/IMP.php:996
 msgid "_Log out"
 msgstr "_Logga ut"
 
-#: message.php:375
+#: message.php:392
 msgid "_Message Source"
 msgstr "_Meddelandekälla"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:952
+msgid "_New Message"
+msgstr "_Nytt meddelande"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
-msgstr "_Skriv ut"
+msgstr "_Utskrift"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "_Prioritet"
 
-#: mailbox.php:395
+#: mailbox.php:405
 #, php-format
 msgid "_Refresh %s"
 msgstr "_Förnya %s"
@@ -4528,82 +5002,151 @@
 msgid "_Reply"
 msgstr "_Svara"
 
-#: lib/IMP.php:907
+#: templates/menu/menu.inc:35 lib/IMP.php:957
 msgid "_Search"
 msgstr "_Sök"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "_Send Message"
-msgstr "_Skicka meddelande"
+msgstr "_Skicka"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_Tråd"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Till"
 
 #: templates/mailbox/actions.inc:13
 msgid "_Undelete"
-msgstr "_Återta"
+msgstr "Återta"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Visa tråd"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
-msgstr "_Betrodda adressre"
+msgstr "_Betrodda adresser"
 
-#: lib/Compose.php:355
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "okänd mottagare"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "bilaga"
 
-#: view.php:102
+#: view.php:97
 msgid "attachments.zip"
 msgstr "bilagor.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:507
 msgid "bytes"
 msgstr "tecken"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "Kan inte skapa utfil"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "kan inte öppna indata"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "kommandoradsfel"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "konfigurationsfel"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "kritisk systemfil saknas"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "formatfel"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "post saknas."
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "från"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "okänd värddator"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "bearbetningsfel"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "Internt mjukvarufel"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "nyckel"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "brevlådefil"
 
-#: compose.php:988 lib/Message.php:442
+#: compose.php:1105 lib/Message.php:515
 msgid "name"
 msgstr "namn"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ingen"
 
-#: templates/compose/spelling.inc:111
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "eller"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "åtkomst nekad"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "mottagare]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "protokollfel"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "service ej tillgänglig"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "stavfel"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "stavfel"
 
-#: lib/Filter.php:55
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "systemfel"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "tillfälligt fel"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "dina spärrade adresser"
 
-#: lib/Filter.php:67
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "dina betrodda adresser"


--- orig/templates/pgp/notactive.inc
+++ mod/templates/pgp/notactive.inc
@@ -1,39 +1,18 @@
-<form method="post" name="pgp" action="<?php echo $selfURL ?>">
-<input type="hidden" name="actionID" value="" />
-
-<table border="0" align="center" cellpadding="3" cellspacing="0" width="100%">
-  <tr>
-    <td align="left" class="header" nowrap="nowrap"><b><?php echo _("PGP NOT Active") ?></b></td>
-    <?php Prefs_UI::generateNavigationCell('pgp') ?>
-  </tr>
-  <tr>
-<?php if ($prefs->isLocked('use_pgp')): ?>
-    <td class="item" align="left">&nbsp;<b><?php echo _("PGP support is disabled on this system.") ?></b></td>
-    <td class="item">&nbsp;</td>
-  </tr>
+<?php
+  $use_pgp_locked = $prefs->isLocked('use_pgp');
+  if ($use_pgp_locked): ?>
+<strong><?php echo _("PGP support is disabled on this system.") ?></strong>
 <?php else: ?>
-    <td class="item" align="left">&nbsp;
-      <input type="checkbox" id="use_pgp" name="use_pgp" <?php echo ($prefs->getValue('use_pgp')) ? "checked=\"checked\"" : "" ?> />&nbsp;<?php echo Horde::label('use_pgp', _("Enable PGP functionality?")) ?>
-    </td>
-    <td class="item" align="right"><?php echo Help::link('imp', 'pgp-overview') ?></td>
-  </tr>
-
-  <tr>
-    <td class="header" nowrap="nowrap" align="left" valign="middle">
-      <input type="submit" name="save" class="button" onclick="document.pgp.actionID.value='pgp_enable'; return true;" value="<?php echo _("Save Options") ?>" />
-    </td>
-    <td class="header">&nbsp;</td>
-  </tr>
+<input type="checkbox" id="use_pgp" name="use_pgp"<?php echo ($prefs->getValue('use_pgp')) ? ' checked="checked"' : '' ?> /> <?php echo Horde::label('use_pgp', _("Enable PGP functionality?")) ?>&nbsp;<?php echo Help::link('imp', 'pgp-overview') ?><br />
+</div>
 <?php endif; ?>
 
-  <tr rowspan="2"><td>&nbsp;</td></tr>
-
-  <tr>
-    <td align="left" class="header" nowrap="nowrap">
-      <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
-    </td>
-    <td class="header">&nbsp;</td>
-  </tr>
-</table>
+<br class="spacer" />
+<div class="nowrap">
+<?php if (!$use_pgp_locked): ?>
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='pgp_enable'; return true;" value="<?php echo _("Save Options") ?>" />
+<?php endif; ?>
+  <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
+</div>
 
 </form>


--- orig/fetchmail.php
+++ mod/fetchmail.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/fetchmail.php,v 1.40.8.1 2005/01/03 12:25:30 jan Exp $
+ * $Horde: imp/fetchmail.php,v 1.40.8.4 2006/01/01 21:28:50 jan Exp $
  *
- * Copyright 2002-2005 Nuno Loureiro <nuno at co.sapo.pt>
- * Copyright 2004-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Nuno Loureiro <nuno at co.sapo.pt>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -24,6 +24,16 @@
     $fetch_list = Util::getFormData('accounts');
     if (!empty($fetch_list)) {
         IMP_Fetchmail::fetchMail($fetch_list);
+
+        /* Go to the download folder. */
+        $lmailbox = $fm_account->getValue('lmailbox', $fetch_list[0]);
+        $url = Util::addParameter(Horde::applicationUrl('mailbox.php'), 'mailbox', $lmailbox);
+        if ($prefs->getValue('fetchmail_popup')) {
+            Util::closeWindowJS('opener.focus();opener.location.href="' . $url . '";');
+        } else {
+            header('Location: ' . $url);
+        }
+        exit;
     }
     break;
 }
@@ -47,6 +57,5 @@
     $cancel_js = 'window.location = \'' . Util::addParameter(Horde::applicationUrl('mailbox.php'), 'mailbox', $mbox) . '\';';
 }
 
-IMP::status();
 require IMP_TEMPLATES . '/fetchmail/fetchmail.inc';
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/lib/base.php
+++ mod/lib/base.php
@@ -9,9 +9,9 @@
  *   $no_compress      - Controls whether the page should be compressed
  *   $session_control  - Sets special session control limitations
  *
- * $Horde: imp/lib/base.php,v 1.79.10.6 2005/06/15 01:02:39 slusarz Exp $
+ * $Horde: imp/lib/base.php,v 1.79.10.14 2006/03/24 05:43:54 slusarz Exp $
  *
- * Copyright 1999-2005 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Chuck Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -64,6 +64,10 @@
 require_once IMP_BASE . '/lib/Notification/Listener/status.php';
 $notification = &Notification::singleton();
 $notification->attach('status', null, 'Notification_Listener_status_imp');
+// BC check.
+if (@include_once 'Horde/Notification/Listener/audio.php') {
+    $notification->attach('audio');
+}
 
 // IMP base library.
 require_once IMP_BASE . '/lib/IMP.php';
@@ -131,10 +135,10 @@
     IMP_Session::loginTasks();
 }
 
-// Load IMP_VFolder:: if we are currently in a session and have at least 1
-// virtual folder defined
-if (!empty($_SESSION['imp']['vfolder'])) {
-    require_once IMP_BASE . '/lib/VFolder.php';
+// Set default message character set, if necessary
+if (isset($prefs) && ($def_charset = $prefs->getValue('default_msg_charset'))) {
+    $GLOBALS['mime_structure']['default_charset'] = $def_charset;
+    $GLOBALS['mime_headers']['default_charset'] = $def_charset;
 }
 
 // Catch c-client errors.


--- orig/lib/MIME/Viewer/related.php
+++ mod/lib/MIME/Viewer/related.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_related class handles multipart/related messages
  * as defined by RFC 2387.
  *
- * $Horde: imp/lib/MIME/Viewer/related.php,v 1.21.10.8 2005/09/19 21:54:19 slusarz Exp $
+ * $Horde: imp/lib/MIME/Viewer/related.php,v 1.21.10.10 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/po/fa_IR.po
+++ mod/po/fa_IR.po
@@ -2,9 +2,11 @@
 # This file is distributed under the same license as the Horde package.
 # 
 # Copyright (C) 2004 High Concil of Informatics (www.shci.ir)
-# Provided by  Amirkabir Metanetworking Ltd, 2004 <horde at metanetworking.com>
+# Provided by  Amirkabir Metanetworking Ltd, 2004 <persian-horde at metanetworking.com>
 # Mohsen Nader-Badr       <naderi at metanetworking.com>
 # chakameh Mortezania     <mortezania at metanetworking.com>
+# Salman Niksefat         <niksefat at metanetworking.com>
+# Hamed Gheybi            <gheybi at metanetworking.com>
 # Vahid Ghafarpour        <ghafarpour at metanetworking.com>
 # Zahra Ahmadi Firouzjaee <ahmadi at metanetworking.com>
 # 
@@ -12,187 +14,186 @@
 msgstr ""
 "Project-Id-Version: IMP 4 ALPHA\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-20 16:29+0330\n"
-"PO-Revision-Date: 2004-06-06 17:16+0430\n"
-"Last-Translator: Amirkabir Metanetworking ltd. <horde at metanetworking.com>\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2005-07-09 15:27+0200\n"
+"Last-Translator: Amirkabir Metanetworking ltd. <persian-horde at metanetworking."
+"com>\n"
 "Language-Team: Persian <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:418
+msgid "      Cc: "
+msgstr " Ø±ÙˆÙ†ÙˆØ´Øª Ø¨Ù‡:"
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "Ø¨Ù‡:     "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:403
 msgid "    Date: "
-msgstr "ØªØ§Ø±ÙŠØ®:  "
+msgstr "ØªØ§Ø±ÛŒØ®:  "
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "Ø§Ø²:     "
 
 # #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
 # 
-#: mailbox.php:393
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
-msgstr "(Ú©Ù„ÙŠØ¯ Ø¯Ø³ØªØ±Ø³ÛŒ %s)"
+msgstr "(Ú©Ù„ÛŒØ¯ Ø¯Ø³ØªØ±Ø³ÛŒ %s)"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "Ø¹Ù†ÙˆØ§Ù†:  "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " Ø¯Ø± "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
 # 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "%s Ù¾ÛŒØºØ§Ù…"
+
 # 
-#: mailbox.php:190
+#: mailbox.php:176
 #, php-format
-msgid "%d message(s) have been deleted."
-msgstr "%d Ù¾ÙŠØºØ§Ù… ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgid "%d messages have been deleted."
+msgstr "%d Ù¾ÛŒØºØ§Ù… ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/Spam.php:169
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
-msgstr "%d Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ù…Ø¯ÙŠØ± Ø³ÙŠØ³ØªÙ… Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%d Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ø³Ø±Ù¾Ø±Ø³Øª Ø³Ø§Ù…Ø§Ù†Ù‡Ù” Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: lib/Spam.php:149
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
-msgstr "%d Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ØºÙŠØ± Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%d Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ØºÛŒØ± Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/Spam.php:161
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
-msgstr "%d Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ù…Ø³Ø¦ÙˆÙ„ Ø³ÙŠØ³ØªÙ… Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%d Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ø³Ø±Ù¾Ø±Ø³Øª Ø³Ø§Ù…Ø§Ù†Ù‡Ù” Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: lib/Spam.php:141
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
-msgstr "%d Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%d Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: mailbox.php:362
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
-msgstr "%d ØªØ§ %d Ø§Ø² %d Ù¾ÙŠØºØ§Ù…"
+msgstr "%d ØªØ§ %d Ø§Ø² %d Ù¾ÛŒØºØ§Ù…"
 
-#: mailbox.php:601
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
-msgstr "%s Ú©ÙŠÙ„Ùˆ Ø¨Ø§ÙŠØª"
-
-# 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s Ù…Ø¯ÙŠØ±ÙŠØª PGP"
+msgstr "Ú©ÛŒÙ„ÙˆØ¨Ø§ÛŒØª %s"
 
 # 
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s Ù…Ø³Ø¦ÙˆÙ„ S/MIME"
-
-# 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
-msgstr "%s Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± Ù…ÙˆØ¬ÙˆØ¯ Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯.Ù¾ÙˆØ´Ù‡ %s Ø´Ù…Ø§ ØªÙÙŠÙŠØ± Ù†Ø§Ù… Ù†ÙŠØ§ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "%s Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± Ù…ÙˆØ¬ÙˆØ¯ Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯.Ù¾ÙˆØ´Ù‡ %s Ø´Ù…Ø§ ØªÙÛŒÛŒØ± Ù†Ø§Ù… Ù†ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª"
 
 # 
-#: lib/Message.php:643
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
-msgstr "%s Ø¨Ù‡ Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ Ø¢Ø¯Ø±Ø³ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù…Ø¹ØªØ¨Ø±ÛŒ Ø¨Ø§Ø´Ø¯"
+msgstr "%s Ø¨Ù‡ Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ù…Ø¹ØªØ¨Ø±ÛŒ Ø¨Ø§Ø´Ø¯"
 
 # 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
-msgstr "Ù¾ÙˆØ´Ù‡%s Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù…Ø§Ù‡ ØªÙÙŠÙŠØ± Ù†Ø§Ù… ÙŠØ§ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡%s Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù…Ø§Ù‡ ØªÙÛŒÛŒØ± Ù†Ø§Ù… ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
-msgstr "%s Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%s Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:603
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
-msgstr "%s %s Ø±Ø§ Ø¨Ø§Ø·Ù„ Ú©Ø±Ø¯"
+msgstr "%s %s Ø±Ø§ Ù„ØºÙˆ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
-msgstr "%s Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%s Ø±Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
-msgstr "%s Ø¨Ù‡ ÙŠÚ© Ø¯Ø±Ø®ÙˆØ§Ø³Øª free/busy Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "%s Ø¨Ù‡ ÛŒÚ© Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:583
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s Ø¨Ù‡ Ø¯Ø¹ÙˆØª %s Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
-msgstr "%s Ø§Ø·Ù„Ø§Ø¹Ø§Øª free/busy Ø±Ø§ Ø¨Ù‡ Ø´Ù…Ø§ ÙØ±Ø³ØªØ§Ø¯Ù‡"
+msgstr "%s Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ø±Ø§ Ø¨Ù‡ Ø´Ù…Ø§ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
-msgstr "%s Ø¨Ø·ÙˆØ± Ø¢Ø²Ù…Ø§ÙŠØ´ÛŒ Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ø´Ø¯"
+msgstr "%s Ø¨Ø·ÙˆØ± Ø¢Ø²Ù…Ø§ÛŒØ´ÛŒ Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
-msgstr "%s Ø§Ø·Ù„Ø§Ø¹Ø§Øª free/busy Ø´Ù…Ø§ Ø±Ø§ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¯Ø§Ø±Ø¯"
+msgstr "%s Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ø´Ù…Ø§ Ø±Ø§ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¯Ø§Ø±Ø¯"
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s ØØ¶ÙˆØ± Ø´Ù…Ø§ Ø±Ø§ Ø¯Ø± %s Ø®ÙˆØ§Ø³ØªØ§Ø± Ø§Ø³Øª"
 
-#: lib/Message.php:398
-#, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s Ø¨ØµÙˆØ±Øª Ù…ÙˆÙÙ‚ÙŠØª Ø¢Ù…ÙŠØ² Ø¨Ù‡ %s Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¨Ù‡ %s Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
 msgid "%s wishes to ammend %s."
-msgstr "%s Ù…Ø§ÙŠÙ„ Ø§Ø³Øª Ø´Ù…Ø§ Ø±Ø§ Ø§Ø² %s Ø¨Ø§Ø®Ø¨Ø± Ø³Ø§Ø²Ø¯"
+msgstr "%s Ù…Ø§ÛŒÙ„ Ø§Ø³Øª  %s Ø±Ø§ Ø§ØµÙ„Ø§Ø Ø³Ø§Ø²Ø¯"
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
-msgstr "%s Ù…Ø§ÙŠÙ„ Ø§Ø³Øª Ø´Ù…Ø§ Ø±Ø§ Ø§Ø² %s Ø¨Ø§Ø®Ø¨Ø± Ø³Ø§Ø²Ø¯"
+msgstr "%s Ù…Ø§ÛŒÙ„ Ø§Ø³Øª Ø´Ù…Ø§ Ø±Ø§ Ø§Ø² %s Ø¨Ø§Ø®Ø¨Ø± Ø³Ø§Ø²Ø¯"
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
-msgstr "%s Ù…Ø§ÙŠÙ„ Ø§Ø³Øª Ø¢Ø®Ø±ÙŠÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø±Ø§Ø¬Ø¹ Ø¨Ù‡ %s Ø±Ø§ Ø¯Ø±ÙŠØ§ÙØª Ú©Ù†Ø¯"
+msgstr "%s Ù…Ø§ÛŒÙ„ Ø§Ø³Øª Ø¢Ø®Ø±ÛŒÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø±Ø§Ø¬Ø¹ Ø¨Ù‡ %s Ø±Ø§ Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†Ø¯"
 
-#: message.php:277 message.php:282
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -203,260 +204,279 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d Ø§Ø² %d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
-msgstr "(Ø§Ø¹Ù…Ø§Ù„ Ø§ÙŠÙ† ØªÙÙŠÙŠØ±Ø§Øª Ùˆ Ø±ÙØªÙ† Ø¨Ù‡ ØµÙØÙ‡ Ø¨Ø¹Ø¯)"
+msgstr "(Ø§Ø¹Ù…Ø§Ù„ Ø§ÛŒÙ† ØªÙÛŒÛŒØ±Ø§Øª Ùˆ Ø§Ù†ØªÙ‚Ø§Ù„ Ø¨Ù‡ ØµÙØÙ‡ Ø¨Ø¹Ø¯)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Ù…Ù„ØºÛŒ Ú©Ø±Ø¯Ù† ØªÙ…Ø§Ù…ÛŒ ØªØºÙŠÙŠØ±Ø§Øª Ùˆ Ø¨Ø±Ú¯Ø´Øª Ø¨Ù‡ ØµÙØÙ‡ Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù…)"
+msgstr "(Ù…Ù„ØºÛŒ Ú©Ø±Ø¯Ù† ØªÙ…Ø§Ù…ÛŒ ØªØºÛŒÛŒØ±Ø§Øª Ùˆ Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ØµÙØÙ‡Ù” Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù…)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Ù…ØªÙ† Ø³Ø§Ø¯Ù‡)"
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Ø¨Ø±Ú¯Ø´Øª Ø¨Ù‡ ØµÙØÙ‡ Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù…Ø¡ Ø¨Ø¹Ø¯ Ø§Ø² Ø§Ø¹Ù…Ø§Ù„ ØªÙ…Ø§Ù…ÛŒ ØªØºÙŠÙŠØ±Ø§ØªÛŒ Ú©Ù‡ ØªØ§Ú©Ù†ÙˆÙ† Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡ "
-"ØªØºÙŠÙŠØ±Ø§Øª Ø¯Ø± ØµÙØÙ‡ Ú©Ù†ÙˆÙ†ÛŒ Ø¹Ù…Ù„ÛŒ Ù†ÙŠØ³Øª)"
+"(Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ØµÙØÙ‡ Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ø¯ Ø§Ø² Ø§Ø¹Ù…Ø§Ù„ ØªÙ…Ø§Ù…ÛŒ ØªØºÛŒÛŒØ±Ø§ØªÛŒ Ú©Ù‡ ØªØ§Ú©Ù†ÙˆÙ† Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡ "
+"ØªØºÛŒÛŒØ±Ø§Øª Ø¯Ø± ØµÙØÙ‡ Ú©Ù†ÙˆÙ†ÛŒ Ø§Ø¹Ù…Ø§Ù„ Ù†Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯("
 
-#: spelling.php:274
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
 msgstr ""
-"Ø§Ø±Ø³Ø§Ù„ Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ø¯ Ø§Ø² Ø§Ø¹Ù…Ø§Ù„ ØªÙ…Ø§Ù…ÛŒ ØªØºÙŠÙŠØ±Ø§ØªÛŒ Ú©Ù‡ ØªØ§Ú©Ù†ÙˆÙ† Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡( ØªØºÙŠÙŠØ±Ø§Øª Ø¯Ø±ØµÙØÙ‡ "
-"Ú©Ù†ÙˆÙ†ÛŒ Ø¹Ù…Ù„ÛŒ Ù†ÙŠØ³Øª)"
+"Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ø¯ Ø§Ø² Ø§Ø¹Ù…Ø§Ù„ ØªÙ…Ø§Ù…ÛŒ ØªØºÛŒÛŒØ±Ø§ØªÛŒ Ú©Ù‡ ØªØ§Ú©Ù†ÙˆÙ† Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡ ØªØºÛŒÛŒØ±Ø§Øª Ø¯Ø±ØµÙØÙ‡) "
+"Ú©Ù†ÙˆÙ†ÛŒ Ø§Ø¹Ù…Ø§Ù„ Ù†Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯("
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
-msgstr "* Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø§ÙŠÙ†â€ŒÙ‡Ø§ Ø¨Ø§ ÙØ´Ø§Ø± Ø¯Ø§Ø¯Ù† Ø¯Ú©Ù…Ù‡ Ù‚Ø¨ÙˆÙ„ *"
+msgstr "* Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø§ÛŒÙ†Ù‡Ø§ Ø¨Ø§ ÙØ´Ø§Ø± Ø¯Ø§Ø¯Ù† Ø¯Ú©Ù…Ù‡ ØªØ£ÛŒÛŒØ¯ *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
-msgstr "* Ù„Ø·ÙØ§Ù‹ Ø¢Ø¯Ø±Ø³ (Ù‡Ø§) Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯ *"
+msgstr "* Ù„Ø·ÙØ§Ù‹ Ø¢Ø¯Ø±Ø³(Ù‡Ø§) Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯ *"
 
-#: lib/Spam.php:171
+#: mailbox.php:174
+msgid "1 message has been deleted."
+msgstr "ÛŒÚ© Ù¾ÛŒØºØ§Ù… ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª"
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
-msgstr "1 Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ØºÙŠØ±Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ù…Ø¯ÙŠØ± Ø³ÙŠØ³ØªÙ… Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯"
+msgstr "ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ØºÛŒØ± Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ø³Ø±Ù¾Ø±Ø³Øª Ø³Ø§Ù…Ø§Ù†Ù‡Ù” Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/Spam.php:151
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
-msgstr "1 .Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ØºÙŠØ± Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯"
+msgstr "ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ØºÛŒØ± Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/Spam.php:163
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
-msgstr "1 Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ù…Ø³Ø¦ÙˆÙ„ Ø³ÙŠØ³ØªÙ… Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯"
+msgstr "ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ø³Ø±Ù¾Ø±Ø³Øª Ø³Ø§Ù…Ø§Ù†Ù‡Ù” Ø´Ù…Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/Spam.php:143
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
-msgstr "1 .Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯"
+msgstr "ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:819
 msgid "100 characters"
-msgstr "100 Ù†ÙˆÙŠØ³Ù‡"
+msgstr "Û±Û°Û° Ù†ÙˆÛŒØ³Ù‡"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:822
 msgid "1000 characters"
-msgstr "1000 Ù†ÙˆÙŠØ³Ù‡"
+msgstr "Û±Û°Û°Û° Ù†ÙˆÛŒØ³Ù‡"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:820
 msgid "250 characters"
-msgstr "250 Ù†ÙˆÙŠØ³Ù‡"
+msgstr "Û²ÛµÛ° Ù†ÙˆÛŒØ³Ù‡"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:821
 msgid "500 characters"
-msgstr "500 Ù†ÙˆÙŠØ³Ù‡"
-
-#: lib/MIME/Viewer/itip.php:61
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b> Ø¯Ø§Ø¯Ù‡ ØªÙ‚ÙˆÙŠÙ… Ù…Ø¹ØªØ¨Ø± Ù†ÙŠØ³Øª </b>"
+msgstr "ÛµÛ°Û° Ù†ÙˆÛŒØ³Ù‡"
 
 # 
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
-msgstr "ÙŠÚ© ØªØµÙˆÙŠØ± Ø¨Ø²Ø±Ú¯ Ø¨Ù‡ Ù†Ø§Ù… %s Ø¨Ù‡ Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ Ø¶Ù…ÙŠÙ…Ù‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "ÛŒÚ© ØªØµÙˆÛŒØ± Ø¨Ø²Ø±Ú¯ Ø¨Ù‡ Ù†Ø§Ù… %s Ø¨Ù‡ Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ Ù¾ÛŒÙˆØ³Øª Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
-msgstr "Ù†ØªÙŠØ¬Ù‡ Ø§Ø±Ø³Ø§Ù„ Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ ÙŠÚ© Ø±Ø³ÙŠØ¯ Ø§Ø² Ø¯Ø±ÙŠØ§ÙØª Ú©Ù†Ù†Ø¯Ù‡ Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯"
+msgstr "Ù†ØªÛŒØ¬Ù‡ Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ ÛŒÚ© Ø±Ø³ÛŒØ¯ Ø§Ø² Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†Ù†Ø¯Ù‡ Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯"
 
 #: templates/search/fields.inc:5
 msgid "AND"
 msgstr "Ùˆ"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
-msgstr "Ù¾Ø°ÙŠØ±ÙØªÙ† Ø¯Ø±Ø®ÙˆØ§Ø³Øª"
+msgstr "Ù¾Ø°ÛŒØ±ÙØªÙ† Ø¯Ø±Ø®ÙˆØ§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:738
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "Ø±ÙˆÛŒØ¯Ø§Ø¯ Ø¨Ù‡ ØªÙ‚ÙˆÛŒÙ… Ø´Ù…Ø§ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡ Ø¨ÙˆØ¯"
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
-msgstr "Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ø´Ø¯"
+msgstr "Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´Ø¯Ù‡"
 
-#: lib/IMP.php:911 lib/IMP.php:913
-msgid "Acco_unts"
-msgstr "ØØ³Ø§Ø¨â€ŒÙ‡Ø§"
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr "Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´Ø¯Ù‡:"
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
-msgstr "Ù†Ø§Ù… ØØ³Ø§Ø¨â€ŒÙ‡Ø§:"
+msgstr "Ù†Ø§Ù… ØØ³Ø§Ø¨â€Œ:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
-msgstr "ÙØ¹Ø§Ù„ÙŠØªâ€ŒÙ‡Ø§"
+msgstr "ÙØ¹Ø§Ù„ÛŒØªÙ‡Ø§"
+
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø¨Ù‡ Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ (%s)"
 
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
-msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ù…Ù†Ø¨Ø¹ "
+msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø³Ø±Ú†Ø´Ù…Ù‡ "
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
-msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø§ÙŠÙ† Ø¨Ù‡ ØªÙ‚ÙˆÙŠÙ… Ù…Ù†"
-
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø¨Ù‡ Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ (%s)"
+msgstr "Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø§ÛŒÙ† Ø¨Ù‡ ØªÙ‚ÙˆÛŒÙ… Ù…Ù†"
 
 # 
-#: compose.php:1166
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
-msgstr "\"%s\" Ø¨Ø¹Ù†ÙˆØ§Ù† Ø¶Ù…ÙŠÙ…Ù‡ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "\"%s\" Ø¨Ø¹Ù†ÙˆØ§Ù† Ù¾ÛŒÙˆØ³Øª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Ø³Ø±Ø¢Ù…Ø¯Ù‡Ø§ÛŒ Ø§Ø¶Ø§ÙÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÙŠØ´ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡: <i> (Ù‡Ø± Ø³Ø±Ø¢Ù…Ø¯ Ø±Ø§ Ø¯Ø± ÙŠÚ© Ø®Ø· Ø¬Ø¯ÙŠØ¯ "
-"ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯ØŒ Ø§Ø®ØªÙŠØ§Ø±ÛŒ) </i>"
+"Ø³Ø±Ø¢Ù…Ø¯Ù‡Ø§ÛŒ Ø§Ø¶Ø§ÙÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡: <em> (Ù‡Ø± Ø³Ø±Ø¢Ù…Ø¯ Ø±Ø§ Ø¯Ø± ÛŒÚ© Ø®Ø· Ø¬Ø¯ÛŒØ¯ "
+"ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯ØŒ Ø§Ø®ØªÛŒØ§Ø±ÛŒ) </em>"
 
 # 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
-msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø§Ø¶Ø§ÙÛŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¯Ø± %s Ø¯ÙŠØ¯Ù‡ Ø´ÙˆÙ†Ø¯"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø§Ø¶Ø§ÙÛŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¯Ø± %s Ø¯ÛŒØ¯Ù‡ Ø´ÙˆÙ†Ø¯"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
-msgstr "Ø¬Ø²Ø¦ÙŠØ§Øª Ø§Ø¶Ø§ÙÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª"
+msgstr "Ø¬Ø²Ø¦ÛŒØ§Øª Ø§Ø¶Ø§ÙÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
-msgstr "Ø¬Ø²Ø¦ÙŠØ§Øª Ø§Ø¶Ø§ÙÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø¬Ø²Ø¦ÛŒØ§Øª Ø§Ø¶Ø§ÙÛŒ Ù¾ÛŒØºØ§Ù…"
 
 # 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
-msgstr "Ø¬Ø²Ø¦ÙŠØ§Øª Ø§Ø¶Ø§ÙÛŒ Ù¾ÙŠØºØ§Ù… Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¯Ø± %s Ø¯ÙŠØ¯Ù‡ Ø´ÙˆÙ†Ø¯"
+msgstr "Ø¬Ø²Ø¦ÛŒØ§Øª Ø§Ø¶Ø§ÙÛŒ Ù¾ÛŒØºØ§Ù… Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¯Ø± %s Ø¯ÛŒØ¯Ù‡ Ø´ÙˆÙ†Ø¯"
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
-msgstr "Ø®Ø·Ø§ÛŒ Ø¬Ø²Ø¦ÙŠØ§Øª Ø§Ø¶Ø§ÙÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø¬Ø²Ø¦ÛŒØ§Øª Ø§Ø¶Ø§ÙÛŒ Ø®Ø·Ø§ÛŒ Ù¾ÛŒØºØ§Ù…"
 
 # 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
+#, php-format
 msgid "Additional message error details can be viewed %s."
-msgstr "Ø¬Ø²Ø¦ÙŠØ§Øª Ø§Ø¶Ø§ÙÛŒ Ø®Ø·Ø§ÛŒ Ù¾ÙŠØºØ§Ù… Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¯Ø± %s Ø¯ÙŠØ¯Ù‡ Ø´ÙˆÙ†Ø¯"
+msgstr "Ø¬Ø²Ø¦ÛŒØ§Øª Ø§Ø¶Ø§ÙÛŒ Ø®Ø·Ø§ÛŒ Ù¾ÛŒØºØ§Ù… Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ù†Ø¯ Ø¯Ø± %s Ø¯ÛŒØ¯Ù‡ Ø´ÙˆÙ†Ø¯"
 
-#: contacts.php:95 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
-msgstr "Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ "
+msgstr "Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ "
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ "
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Ø¢Ø¯Ø±Ø³Ù‡Ø§ÙŠÛŒ Ø¨Ø±Ø§ÛŒ Ø±ÙˆÙ†ÙˆØ´Øª Ù…Ø®ÙÛŒ ØªÙ…Ø§Ù… Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§: <i>(Ù‡Ø± Ø³Ø±Ø¢Ù…Ø¯ Ø±Ø§ Ø¯Ø± ÙŠÚ© Ø®Ø· Ø¬Ø¯ÙŠØ¯ ÙˆØ§Ø±Ø¯ "
-"Ú©Ù†ÙŠØ¯ØŒ Ø§Ø®ØªÙŠØ§Ø±ÛŒ) </i>"
+"Ø¢Ø¯Ø±Ø³Ù‡Ø§ÛŒÛŒ Ø¨Ø±Ø§ÛŒ Ø±ÙˆÙ†ÙˆØ´Øª Ù…Ø®ÙÛŒ ØªÙ…Ø§Ù… Ù¾ÛŒØºØ§Ù…Ù‡Ø§: <em>(Ù‡Ø± Ø³Ø±Ø¢Ù…Ø¯ Ø±Ø§ Ø¯Ø± ÛŒÚ© Ø®Ø· Ø¬Ø¯ÛŒØ¯ ÙˆØ§Ø±Ø¯ "
+"Ú©Ù†ÛŒØ¯ØŒ Ø§Ø®ØªÛŒØ§Ø±ÛŒ) </em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optionalØŒ enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Ø¢Ø¯Ø±Ø³Ù‡Ø§ÙŠÛŒ Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ø´Ø¯Ù† Ø¨Ù‡ Ø§ÙŠÙ† Ù…Ø´Ø®ØµÙ‡: <i>(Ù‡Ø± Ø³Ø±Ø¢Ù…Ø¯ Ø±Ø§ Ø¯Ø± ÙŠÚ© Ø®Ø· Ø¬Ø¯ÙŠØ¯ ÙˆØ§Ø±Ø¯ "
-"Ú©Ù†ÙŠØ¯ØŒ Ø§Ø®ØªÙŠØ§Ø±ÛŒ)</i>"
+"Ø¢Ø¯Ø±Ø³Ù‡Ø§ÛŒÛŒ Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ø´Ø¯Ù† Ø¨Ù‡ Ø§ÛŒÙ† Ù…Ø´Ø®ØµÙ‡: <em>(Ù‡Ø± Ø³Ø±Ø¢Ù…Ø¯ Ø±Ø§ Ø¯Ø± ÛŒÚ© Ø®Ø· Ø¬Ø¯ÛŒØ¯ ÙˆØ§Ø±Ø¯ "
+"Ú©Ù†ÛŒØ¯ØŒ Ø§Ø®ØªÛŒØ§Ø±ÛŒ)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "Ù‡Ù…Ù‡"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "ØªÙ…Ø§Ù…ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ø§ÙŠÙ† Ù¾ÙˆØ´Ù‡ (Ù‡Ø§) Ø§Ø² Ø¨ÙŠÙ† Ø®ÙˆØ§Ù‡Ø¯ Ø±ÙØª!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
-msgstr "ØªÙ…Ø§Ù…ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ø§ÙŠÙ† Ù¾ÙˆØ´Ù‡ (Ù‡Ø§) Ø¨Ù‡ ÙŠÚ©  ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ù…Ù†ØªÙ‚Ù„ Ø®ÙˆØ§Ù‡Ø¯Ø´Ø¯"
+msgstr "ØªÙ…Ø§Ù…ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± Ø§ÛŒÙ† Ù¾ÙˆØ´Ù‡(Ù‡Ø§) Ø¯Ø± ÛŒÚ©  Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø§Ø³ØªÙ‚Ø±Ø§Ø± Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª"
 
 # 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
-" ØªÙ…Ø§Ù…ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡  \"%s\"  Ú©Ù‡ Ù‚Ø¯ÙŠÙ…ÛŒâ€ŒØªØ±â€Œ Ø§Ø²  %s Ø±ÙˆØ² Ø¨Ø§Ø´Ù†Ø¯ Ù‡Ù…ÙˆØ§Ø±Ù‡ ØØ°Ù "
-"Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯"
+" ØªÙ…Ø§Ù…ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø´Ù…Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡  \"%s\"  Ú©Ù‡ Ù‚Ø¯ÛŒÙ…ÛŒâ€ŒØªØ±â€Œ Ø§Ø²  %s Ø±ÙˆØ² Ø¨Ø§Ø´Ù†Ø¯ Ø¨Ù‡ Ø·ÙˆØ± "
+"Ù‡Ù…ÛŒØ´Ú¯ÛŒ ØØ°Ù Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯"
 
 # 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
-msgstr "ØªÙ…Ø§Ù…ÛŒ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒâ€ŒØªØ±â€Œ Ø§Ø²  %s  Ù…Ø§Ù‡ ØØ°Ù Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯"
+msgstr "ØªÙ…Ø§Ù…ÛŒ Ø¶Ù…ÛŒÙ…Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¯ÛŒÙ…ÛŒâ€ŒØªØ±â€Œ Ø§Ø²  %s  Ù…Ø§Ù‡ ØØ°Ù Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯"
 
 # 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "ØªÙ…Ø§Ù…ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒâ€ŒØªØ±â€Œ Ø§Ø²  %s  Ù…Ø§Ù‡ ØØ°Ù Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯"
+msgstr "ØªÙ…Ø§Ù…ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯Ù‡Ù” Ù‚Ø¯ÛŒÙ…ÛŒâ€ŒØªØ±â€Œ Ø§Ø²  %s  Ù…Ø§Ù‡ ØØ°Ù Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯"
 
 # 
 #: acl.php:85
-#, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
-msgstr "ØªÙ…Ø§Ù…ÛŒ ØÙ‚â€ŒÙ‡Ø§ Ø¨Ø± Ù¾ÙˆØ´Ù‡ '%s' Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø¨Ø±Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø± '%s' Ø¨Ø±Ø¯Ø§Ø´ØªÙ‡ Ø´Ø¯"
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "ØªÙ…Ø§Ù…ÛŒ ØÙ‚ÙˆÙ‚ Ø¨Ø± Ù¾ÙˆØ´Ù‡ '%s' Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¨Ø±Ø§ÛŒ Ú©Ø§Ø±Ø¨Ø± '%s' ØØ°Ù Ø´Ø¯"
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø² Ø§Ø³ØªØŸ"
 
-#: templates/filters/prefs.inc:55
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
-msgstr "Ø¢ÙŠØ§ Ø¨Ø±Ø§ÛŒ Ù‡Ø± ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù‚Ø§Ù†ÙˆÙ†â€ŒÙ‡Ø§ÛŒ ÙÙŠÙ„ØªØ± Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¨Ø±Ø§ÛŒ Ù‡Ø± Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ù‚ÙˆØ§Ù†ÛŒÙ† ÙÛŒÙ„ØªØ± Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯ØŸ"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
-msgstr "Ø¨Ø®Ø´â€ŒÙ‡Ø§ÛŒ Ø¯ÙŠÚ¯Ø± Ø¨Ø±Ø§ÛŒ Ø§ÙŠÙ† Ù‚Ø³Ù…Øª:"
+msgstr "Ø¨Ø®Ø´Ù‡Ø§ÛŒ Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ù‚Ø³Ù…Øª:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
-msgstr "Ù‡Ù…ÙŠØ´Ù‡"
+msgstr "Ù‡Ù…ÛŒØ´Ù‡"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
-msgstr "Ù‡Ù…ÙˆØ§Ø±Ù‡ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆÙ†Ø¯"
+msgstr "Ù‡Ù…ÙˆØ§Ø±Ù‡ Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ ØÙØ¸ Ø´ÙˆÙ†Ø¯"
 
-#: lib/Message.php:491
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
-msgstr "Ø³Ø±ÙˆØ± IMAP Ú¯ÙØªÙ‡ Ø§Ø³Øª: Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± Ú¯Ø±ÙØªÙ† Ø¶Ù…ÙŠÙ…Ù‡ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª "
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø² IMAP Ú¯ÙØªÙ‡ Ø§Ø³Øª: Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ú¯Ø±ÙØªÙ† Ø¶Ù…ÛŒÙ…Ù‡ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª "
 
-#: lib/Message.php:385
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ Ø¯Ø± ØÛŒÙ† Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© ÙˆØ¸ÛŒÙÙ‡Ù” Ø¬Ø¯ÛŒØ¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
+
+#: lib/Message.php:387
 msgid "An unknown error occured while creating the new task."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ Ø¯Ø± ØÙŠÙ† Ø§ÙŠØ¬Ø§Ø¯ ÙŠÚ© Ú©Ø§Ø± Ø¬Ø¯ÙŠØ¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ù†Ø§Ø´Ù†Ø§Ø³ Ø¯Ø± ØÛŒÙ† Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© ÙˆØ¸ÛŒÙÙ‡Ù” Ø¬Ø¯ÛŒØ¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
 
-#: mailbox.php:671 message.php:491 templates/message/navbar_navigate.inc:9
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -464,156 +484,150 @@
 
 #: templates/search/main.inc:31
 msgid "Answered messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ø´Ø¯Ù‡"
 
 #: templates/mailbox/header.inc:7
 msgid "Apply Filters"
-msgstr "Ø§Ø¹Ù…Ø§Ù„ ÙÙŠÙ„ØªØ±Ù‡Ø§"
+msgstr "Ø§Ø¹Ù…Ø§Ù„ ÙÛŒÙ„ØªØ±Ù‡Ø§"
 
 #: templates/mailbox/header.inc:7
+#, php-format
 msgid "Apply Filters to %s"
-msgstr "Ø§Ø¹Ù…Ø§Ù„ ÙÙŠÙ„ØªØ±Ù‡Ø§ Ø¨Ù‡ %s"
+msgstr "Ø§Ø¹Ù…Ø§Ù„ ÙÛŒÙ„ØªØ±Ù‡Ø§ Ø¨Ù‡ %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
-msgstr "Ø¢ÙŠØ§ Ù‚Ø§Ù†ÙˆÙ†â€ŒÙ‡Ø§ÛŒ ÙÙŠÙ„ØªØ± Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ±ÙˆØ¯ Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù‚ÙˆØ§Ù†ÛŒÙ† ÙÛŒÙ„ØªØ± Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ±ÙˆØ¯ Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯ØŸ"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr ""
-"Ø¢ÙŠØ§ Ù‚Ø§Ù†ÙˆÙ†â€ŒÙ‡Ø§ÛŒ ÙÙŠÙ„ØªØ± Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø±Ø³ÙŠØ¯Ù‡ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´Ø¯ØŒ Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯ØŸ"
-
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§Ø¯Ø§Ù…Ù‡ Ø¯Ù‡ÙŠØ¯ØŸ"
+"Ø¢ÛŒØ§ Ù‚ÙˆØ§Ù†ÛŒÙ† ÙÛŒÙ„ØªØ± Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø¯Ø±ÛŒØ§ÙØªÛŒ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ØŒ Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯ØŸ"
 
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Ø¢ÙŠØ§ Ú©Ø§Ù…Ù„Ø§Ù‹ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§Ø¯Ø§Ù…Ù‡ Ø¯Ù‡ÙŠØ¯ØŸ"
-
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø±Ø§ ØØ°Ù Ú©Ù†ÙŠØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
-#: templates/pgp/pgp.inc:169 templates/smime/smime.inc:128
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
-"Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø¬ÙØª Ú©Ù„ÙŠØ¯ Ø®ÙˆØ¯ Ø±Ø§ ØØ°Ù Ú©Ù†ÙŠØ¯ØŸ (Ø§ÙŠÙ† Ú©Ø§Ø± Ù¾ÙŠØ´Ù†Ù‡Ø§Ø¯ Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯)"
+"Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¬ÙØª Ú©Ù„ÛŒØ¯ Ø®ÙˆØ¯ Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ (Ø§ÛŒÙ† Ú©Ø§Ø± Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯)"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
-msgstr "Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ú©Ù‡ Ù…ÙŠâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ú©Ø§Ø± Ø§Ø± Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡ÙŠØ¯ØŸ"
+msgstr "Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ú©Ø§Ø± Ø±Ø§ Ø§Ù†Ø¬Ø§Ù… Ø¯Ù‡ÛŒØ¯ØŸ"
 
-#: message.php:399 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:63
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ù‡Ù…ÙŠØ´Ú¯ÛŒ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø±Ø§ ØØ°Ù Ú©Ù†ÙŠØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ù‡Ù…ÛŒØ´Ú¯ÛŒ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
-#: lib/MIME/Contents.php:222
+#: lib/MIME/Contents.php:215
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ù‡Ù…ÙŠØ´Ú¯ÛŒ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ø¶Ù…ÙŠÙ…Ù‡ Ø±Ø§ ØØ°Ù Ú©Ù†ÙŠØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ù‡Ù…ÛŒØ´Ú¯ÛŒ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ù¾ÛŒÙˆØ³Øª Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
 #: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ø®Ø§Ù„ÛŒ Ú©Ù†ÙŠØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ø®Ø§Ù„ÛŒ Ú©Ù†ÛŒØ¯ØŸ"
+
+#: lib/IMP.php:973
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù¾ÙˆØ´Ù‡Ù” Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø®Ø§Ù„ÛŒ Ú©Ù†ÛŒØ¯ØŸ "
 
-#: lib/IMP.php:902
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ù¾ÙˆØ´Ù‡ Ø¢Ø´ØºØ§Ù„ Ø®ÙˆØ¯ Ø±Ø§ Ø®Ø§Ù„ÛŒ Ú©Ù†ÙŠØ¯ØŸ "
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù¾ÙˆØ´Ù‡Ù” Ø¢Ø´ØºØ§Ù„ Ø®ÙˆØ¯ Ø±Ø§ Ø®Ø§Ù„ÛŒ Ú©Ù†ÛŒØ¯ØŸ "
 
 #: templates/mailbox/actions.inc:8
 msgid "Are you sure you wish to permanently delete these messages?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ù‡Ù…ÙŠØ´Ú¯ÛŒ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø±Ø§ ØØ°Ù Ú©Ù†ÙŠØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ù‡Ù…ÛŒØ´Ú¯ÛŒ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø±Ø§ ØØ°Ù Ú©Ù†ÛŒØ¯ØŸ"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ø¨ÛŒ Ø¶Ø±Ø± Ú¯Ø²Ø§Ø±Ø´ Ú©Ù†ÙŠØ¯ØŸ "
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ø¨ÛŒâ€ŒØ¶Ø±Ø± Ú¯Ø²Ø§Ø±Ø´ Ú©Ù†ÛŒØ¯ØŸ "
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ú©Ù†ÙŠØ¯ØŸ "
+msgstr "Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ú©Ù†ÛŒØ¯ØŸ "
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
-msgstr "Ø²Ù…Ø§Ù† Ø±Ø³ÙŠØ¯Ù†"
+msgstr "Ø²Ù…Ø§Ù† Ø±Ø³ÛŒØ¯Ù†"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "ØµØ¹ÙˆØ¯ÛŒ"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Ù¾Ø±Ø³Ø´"
 
-#: templates/compose/compose.inc:509
+#: templates/compose/compose.inc:519
 msgid "Attach"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡ Ú©Ø±Ø¯Ù†"
+msgstr "Ù¾ÛŒÙˆØ³Øª"
 
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:475
 msgid "Attach Files"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡ Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§"
+msgstr "Ù¾ÛŒÙˆØ³Øª Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
-msgstr "Ø¢ÙŠØ§ ÙŠÚ© Ù†Ø³Ø®Ù‡ Ø§Ø² Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø´Ù…Ø§ Ø¨Ù‡ Ù¾ÙŠØºØ§Ù…ØªØ§Ù† Ø¶Ù…ÙŠÙ…Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ ÛŒÚ© Ø±ÙˆÙ†ÙˆØ´Øª Ø§Ø² Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø´Ù…Ø§ Ø¨Ù‡ Ù¾ÛŒØºØ§Ù…ØªØ§Ù† Ù¾ÛŒÙˆØ³Øª Ø´ÙˆØ¯ØŸ"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ Ø¶Ù…ÙŠÙ…Ù‡ Ø´Ø¯Ù‡:"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÛŒÙˆØ³Øª Ø´Ø¯Ù‡:"
 
 # 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
-msgstr ""
-"Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø¶Ù…ÙŠÙ…Ù‡ Ø´Ø¯Ù‡ \"%s\" Ø§Ø² Ø§Ù†Ø¯Ø§Ø²Ù‡ Ù…Ø¬Ø§Ø² Ø¨ÙŠØ´ØªØ± Ø§Ø³Øª. Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø¶Ù…ÙŠÙ…Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Ù¾ÛŒÙˆØ³Øª Ø´Ø¯Ù‡Ù” \"%s\" Ø§Ø² Ø§Ù†Ø¯Ø§Ø²Ù‡ Ù…Ø¬Ø§Ø² Ø¨ÛŒØ´ØªØ± Ø§Ø³Øª. Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ù¾ÛŒÙˆØ³Øª Ù†Ø´Ø¯"
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡ Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª ØªÙ‚ÙˆÙŠÙ…ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø´Ù…Ø§ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø¨ÙˆØ¯ÙŠØ¯"
+msgstr "Ù¾ÛŒÙˆØ³Øª Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª ØªÙ‚ÙˆÛŒÙ…ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø´Ù…Ø§ ÙØ±Ø³ØªØ§Ø¯ÛŒØ¯"
 
-#: mailbox.php:705 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡"
+msgstr "Ù¾ÛŒÙˆØ³Øª"
 
-#: compose.php:976 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡ Ú¯Ø±ÙØªÙ‡ Ø´Ø¯: Ù†ÙˆØ¹ Ø§ØµÙ„ÛŒ Ø¶Ù…ÙŠÙ…Ù‡"
+msgstr "Ù¾ÛŒÙˆØ³Øª Ø§Ø®Ø° Ø´Ø¯: Ù†ÙˆØ¹ Ø§ØµÙ„ÛŒ Ù¾ÛŒÙˆØ³Øª"
 
-#: lib/Compose.php:990 templates/compose/compose.inc:340
-#: templates/compose/compose.inc:464
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§"
+msgstr "Ù¾ÛŒÙˆØ³ØªÙ‡Ø§"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Ø´Ø±Ú©Øª Ú©Ù†Ù†Ø¯Ù‡â€ŒÙ‡Ø§"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "ØªÙˆØ¬Ù‡"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
-msgstr "Authimp: Ø¨Ø³Ø· Ù…ÙˆØ±Ø¯ Ù†ÙŠØ§Ø² IMAP Ù¾ÙŠØ¯Ø§ Ù†Ø´Ø¯"
+msgstr "Authimp: Ø¨Ø³Ø· Ù…ÙˆØ±Ø¯ Ù†ÛŒØ§Ø² IMAP Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
 msgstr ""
-"Ø¢ÙŠØ§ ÙˆÙ‚ØªÛŒ ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ù…Ù† Ø¨Ø§Ø´Ø¯ ØªØµØ§ÙˆÙŠØ± Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¯Ø± Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ HTML "
+"Ø¢ÛŒØ§ ÙˆÙ‚ØªÛŒ ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ Ù…Ù† Ø¨Ø§Ø´Ø¯ ØªØµØ§ÙˆÛŒØ± Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¯Ø± Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ HTML "
 "Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
 
 #: templates/prefs/sourceselect.inc:298
 msgid "Available Address books:"
-msgstr "Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ù‚Ø§Ø¨Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ:"
+msgstr "Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ø¯Ø± Ø¯Ø³ØªØ±Ø³:"
 
-#: lib/MIME/Viewer/itip.php:704
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr "Ù…Ù†ØªØ¸Ø± Ù¾Ø§Ø³Ø®"
 
@@ -623,31 +637,44 @@
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ %s"
 
 # 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ %s"
 
-#: search.php:153 message.php:258 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ Ø´Ø§Ø®Øµ Ù†Ù…Ø§ÛŒ Ú†Ù†Ø¯Ú¯Ø§Ù†Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ Ù…Ø¯ Ù†Ù…Ø§ÛŒØ´ Ø³Ù„Ø³Ù‡â€ŒØ§ÛŒÛŒ"
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Ø±ÙˆÙ†ÙˆØ´Øª Ù…Ø®ÙÛŒ"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
-msgstr "Ø¯Ø± Ø²ÙŠØ± Ù…ØªÙ†ÛŒ Ø§Ø² Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙˆØ¶Ø¹ÙŠØª Ù¾ÙŠØºØ§Ù… ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯"
+msgstr "Ø¯Ø± Ø²ÛŒØ± Ù…ØªÙ†ÛŒ Ø§Ø² Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙˆØ¶Ø¹ÛŒØª Ù¾ÛŒØºØ§Ù… ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
-msgstr "Ù„ÙŠØ³Øª Ø³ÙŠØ§Ù‡"
+msgstr "Ù„ÛŒØ³Øª Ø³ÛŒØ§Ù‡"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
-"Ø¢ÙŠØ§ ØªØµØ§ÙˆÙŠØ± Ø¯Ø± Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ HTML Ø¨Ø¬Ø² Ø¯Ø± Ù…ÙˆØ§Ø±Ø¯ÛŒ Ú©Ù‡ Ù…Ø´Ø®ØµØ§Ù‹ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù†Ø´Ø¯Ù‡ Ø§Ù†Ø¯ØŒ Ø¨Ù„ÙˆÚ© "
+"Ø¢ÛŒØ§ ØªØµØ§ÙˆÛŒØ± Ø¯Ø± Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ HTML Ø¨Ø¬Ø² Ø¯Ø± Ù…ÙˆØ§Ø±Ø¯ÛŒ Ú©Ù‡ Ù…Ø´Ø®ØµØ§Ù‹ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù†Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯ØŒ Ø¨Ù„ÙˆÚ©Ù‡ "
 "Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Ø¨Ø¯Ù†Ù‡"
 
@@ -656,993 +683,1109 @@
 msgid "Both"
 msgstr "Ù‡Ø± Ø¯Ùˆ"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
-msgstr "Ø¯Ø± ÙÙ‡Ø±Ø³Øª Ø³Ø±Ø¢Ù…Ø¯ Ùˆ Ø¨Ø¯Ù†Ù‡ Ù¾ÙŠØºØ§Ù…ØŒ Ù‡Ø±Ø¯Ùˆ"
+msgstr "ÙÙ‡Ø±Ø³Øª Ø³Ø±Ø¢Ù…Ø¯ Ùˆ Ø¨Ø¯Ù†Ù‡ Ù¾ÛŒØºØ§Ù…ØŒ Ù‡Ø±Ø¯Ùˆ"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹Ù‡ Ú©Ø§Ø±Ø§Ú©ØªØ±ÛŒ"
+msgstr "Ù…Ø¬Ù…ÙˆØ¹Ù‡Ù” Ù†ÙˆÛŒØ³Ù‡"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
-msgstr "ØªÙ‚ÙˆÙŠÙ…"
+msgstr "ØªÙ‚ÙˆÛŒÙ…"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¨Ù‡ Ø³Ø±ÙˆØ± Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ© Ø±Ø§Ù‡ Ø¯ÙˆØ± ÙˆØµÙ„ Ø´Ø¯"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¨Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ© Ø±Ø§Ù‡ Ø¯ÙˆØ± ÙˆØµÙ„ Ø´Ø¯"
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¨Ù‡ Ø³Ø±ÙˆØ± Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ© Ø±Ø§Ù‡ Ø¯ÙˆØ± ÙˆØµÙ„ Ø´Ø¯:"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¨Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ© Ø±Ø§Ù‡ Ø¯ÙˆØ± ÙˆØµÙ„ Ø´Ø¯:"
 
 # 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
-msgstr ""
-"Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù†Ù…Ø§ÙŠØ³ Ø¯Ø§Ø¯ - ØªÙ†Ù‡Ø§ %s Ø§Ø² %s Ø¨Ø®Ø´ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¯Ø± Ø§ÙŠÙ† ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ "
-"Ù¾ÙŠØ¯Ø§ Ø´Ø¯"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯ - ØªÙ†Ù‡Ø§ %s Ø§Ø² %s Ø¨Ø®Ø´ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¯Ø± Ø§ÛŒÙ† Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ù¾ÛŒØ¯Ø§ Ø´Ø¯"
 
-#: templates/contacts/contacts.inc:253 templates/pgp/passphrase.inc:32
-#: templates/pgp/import_key.inc:66 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:106
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
-msgstr "Ø§Ù†ØµØ±Ø§Ù"
+msgstr "Ù„ØºÙˆ"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
-msgstr "Ø§Ù†ØµØ±Ø§Ù Ø§Ø² Ø§Ø±Ø³Ø§Ù„ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù„ØºÙˆ Ù¾ÛŒØºØ§Ù…"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
-msgstr "Ø§Ù†ØµØ±Ø§Ù Ø§Ø² Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ø·ÙˆØ± Ú©Ø§Ù…Ù„ ØªÙ…Ø§Ù…ÛŒ Ù…ØØªÙˆÛŒ Ø¢Ù† Ø±Ø§ ØØ°Ù Ø®ÙˆØ§Ù‡Ø¯ Ú©Ø±Ø¯"
+msgstr "Ù„ØºÙˆ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ø·ÙˆØ± Ú©Ø§Ù…Ù„ ØªÙ…Ø§Ù…ÛŒ Ù…ØØªÙˆØ§ÛŒ Ø¢Ù† Ø±Ø§ Ø§Ø² Ø¨ÛŒÙ† Ø®ÙˆØ§Ù‡Ø¯ Ø¨Ø±Ø¯"
 
-#: search.php:149 message.php:257 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Ø±ÙˆÙ†ÙˆØ´Øª"
 
-#: lib/MIME/Viewer/itip.php:686
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú¯ÙˆØ§Ù‡ÛŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯. Ø§Ø±Ø³Ø§Ù„ ÙØ§ÛŒÙ„ Ø¨Ø± Ø±ÙˆÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±Ø³Ø§Ø² Ù…Ù…Ú©Ù† Ù†ÛŒØ³Øª."
+
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
-msgstr "Ù…Ø¯ÙŠØ±"
+msgstr "Ù…Ø¯ÛŒØ±"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
-msgstr "ØªØºÙŠÙŠØ±"
+msgstr "ØªØºÛŒÛŒØ±"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
-msgstr "ØªØºÙŠÙŠØ± Ù‡Ù…Ù‡"
+msgstr "ØªØºÛŒÛŒØ± Ù‡Ù…Ù‡"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
-msgstr "ØªØºÙŠÙŠØ± Ù¾ÙˆØ´Ù‡"
+msgstr "ØªØºÛŒÛŒØ± Ù¾ÙˆØ´Ù‡"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
-"ØªØºÙŠÙŠØ± Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ù…Ø§ÙŠØ´ Ù…Ø§Ù†Ù†Ø¯ ØªØ¹Ø¯Ø§Ø¯ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ù‡Ø± ØµÙØÙ‡ Ùˆ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù…Ø±ØªØ¨ Ø´Ø¯Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§"
+"ØªØºÛŒÛŒØ± Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´ Ù…Ø§Ù†Ù†Ø¯ ØªØ¹Ø¯Ø§Ø¯ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± Ù‡Ø± ØµÙØÙ‡ Ùˆ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù…Ø±ØªØ¨ Ø´Ø¯Ù† Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
 
 #: config/prefs.php.dist:24
 msgid "Change mail server and folder settings."
-msgstr "ØªØºÙŠÙŠØ± ØªÙ†Ø¸ÙŠÙ…Ø§Øª Ø³Ø±ÙˆØ± Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ© Ùˆ Ù¾ÙˆØ´Ù‡"
+msgstr "ØªØºÛŒÛŒØ± ØªÙ†Ø¸ÛŒÙ…Ø§Øª Ú©Ø§Ø±Ø³Ø§Ø² Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ© Ùˆ Ù¾ÙˆØ´Ù‡"
 
 #: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr ""
-"ØªØºÙŠÙŠØ± Ù†Ø§Ù…ØŒ Ø¢Ø¯Ø±Ø³ØŒ ÙˆØ§Ù…Ø¶Ø§ÙŠÛŒ Ú©Ù‡ Ø§ÙØ±Ø§Ø¯ Ù‡Ù†Ú¯Ø§Ù… Ø®ÙˆØ§Ù†Ø¯Ù† Ùˆ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù† Ø¨Ù‡ Ù†Ø§Ù…Ù‡ Ø´Ù…Ø§ "
-"Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø¯ÙŠØ¯"
+"ØªØºÛŒÛŒØ±Ø¯Ø§Ø¯Ù† Ù†Ø§Ù… Ùˆ Ø¢Ø¯Ø±Ø³ÛŒ Ú©Ù‡ Ø§ÙØ±Ø§Ø¯ Ù‡Ù†Ú¯Ø§Ù… Ø®ÙˆØ§Ù†Ø¯Ù† Ùˆ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù† Ø¨Ù‡ Ù†Ø§Ù…Ù‡Ù” Ø´Ù…Ø§ Ø®ÙˆØ§Ù‡Ù†Ø¯ "
+"Ø¯ÛŒØ¯ "
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
-msgstr "Ù†ÙˆÙŠØ³Ù‡â€ŒÙ‡Ø§ÙŠÛŒ Ú©Ù‡ Ø¨Ø§ÙŠØ¯ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯: "
+msgstr "Ù†ÙˆÛŒØ³Ù‡â€ŒÙ‡Ø§ Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´: "
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
-msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ù¾ÙˆØ´Ù‡(Ù‡Ø§) Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ© Ø¬Ø¯ÙŠØ¯"
+msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ù¾ÙˆØ´Ù‡(Ù‡Ø§) Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
-msgstr "Ø¨Ø±Ø±Ø³ÛŒ  Ù‡Ù…Ù‡/ Ù‡ÙŠÚ†Ú©Ø¯Ø§Ù…"
+msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ù‡Ù…Ù‡/ Ù‡ÛŒÚ†â€ŒÛŒÚ©"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr ""
-"Ø¨Ø±Ø±Ø³ÛŒ ØªÙ…Ø§Ù…ÛŒ Ø³Ø±ÙˆØ±â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒØ¡ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø±Ø§ Ø§Ø² "
-"Ø¢Ù†â€ŒÙ‡Ø§ ÙˆØ§Ú©Ø´ÛŒ Ú©Ù†ÙŠØ¯:"
+"Ø¨Ø±Ø±Ø³ÛŒ ØªÙ…Ø§Ù…ÛŒ Ú©Ø§Ø±Ø³Ø§Ø²â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒâ€ŒØ§ÛŒÛŒ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù†Ø§Ù…Ù‡â€Œ Ø§Ø² Ø¢Ù†Ù‡Ø§ ÙˆØ§Ú©Ø´ÛŒ Ú©Ù†ÛŒØ¯:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
-msgstr "Ø¢ÙŠØ§ Ù‚Ø¨Ù„ Ø§Ø² Ø§ÙŠÙ†Ú©Ù‡ Ù¾ÙŠØºØ§Ù… ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´ÙˆØ¯ Ø§Ø² Ù†Ø¸Ø± Ø§Ù…Ù„Ø§ÙŠÛŒ Ø¨Ø±Ø±Ø³ÛŒ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù‚Ø¨Ù„ Ø§Ø² Ø§ÛŒÙ†Ú©Ù‡ Ù¾ÛŒØºØ§Ù… ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´ÙˆØ¯ Ø§Ø² Ù†Ø¸Ø± Ø§Ù…Ù„Ø§ÛŒÛŒ Ø¨Ø±Ø±Ø³ÛŒ Ø´ÙˆØ¯ØŸ"
 
 #: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ø¹Ù…Ù„:"
 
-#: config/servers.php.dist:170
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© Ø³Ø±ÙˆØ± Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©:"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© Ú©Ø§Ø±Ø³Ø§Ø² Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©:"
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯ Ùˆ ÛŒØ§ Ø¢Ø¯Ø±Ø³ Ø±Ø§ ÙˆÛŒØ±Ø§ÛŒØ´ Ú©Ù†ÛŒØ¯:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:716
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© Ø¹Ù…Ù„:"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© Ø¹Ù…Ù„:"
 
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ø¨Ø±Ø§ÛŒ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ø¢Ø¯Ø±Ø³â€ŒÙ‡Ø§ Ø±Ø§ Ø§Ø¶Ø§ÙÙ‡ Ù…ÛŒâ€ŒÚ©Ù†ÙŠØ¯"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ Ø¨Ø±Ø§ÛŒ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ø¢Ø¯Ø±Ø³Ù‡Ø§ Ø±Ø§ Ø§Ø¶Ø§ÙÙ‡ Ù…ÛŒâ€ŒÚ©Ù†ÛŒØ¯"
 
 #: templates/prefs/sourceselect.inc:293
 msgid "Choose the order of address books to search when expanding addresses."
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ØªØ±ØªÙŠØ¨ÛŒ Ø¨Ø±Ø§ÛŒ Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¬Ø³ØªØ¬Ùˆ"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ØªØ±ØªÛŒØ¨ÛŒ Ø¨Ø±Ø§ÛŒ Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¬Ø³ØªØ¬Ùˆ"
 
 # 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
-"Ø¨Ø±Ø§ÛŒ ØªØ¨Ø¯ÙŠÙ„ Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ ØªØµÙˆÙŠØ± Ø¨Ù‡ Ù‚Ø§Ù„Ø¨ÛŒ Ú©Ù‡ Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ Ø¨ØªÙˆØ§Ù†Ø¯ Ø¢Ù†Ø±Ø§ Ø¨Ø¨ÙŠÙ†Ø¯ %s Ø±Ø§ ÙØ´Ø§Ø± "
-"Ø¯Ù‡ÙŠØ¯"
+"Ø¨Ø±Ø§ÛŒ ØªØ¨Ø¯ÛŒÙ„ Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ ØªØµÙˆÛŒØ± Ø¨Ù‡ Ù‚Ø§Ù„Ø¨ÛŒ Ú©Ù‡ Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ Ø¨ØªÙˆØ§Ù†Ø¯ Ø¢Ù†Ø±Ø§ Ø¨Ø¨ÛŒÙ†Ø¯ %s Ø±Ø§ Ú©Ù„ÛŒÚ© "
+"Ú©Ù†ÛŒØ¯ "
 
 # 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
-msgstr "Ø¨Ø±Ø§ÛŒ Ú¯Ø±ÙØªÙ† ØªØµÙˆÙŠØ± %s .Ø±Ø§ ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯"
+msgstr "Ø¨Ø±Ø§ÛŒ Ú¯Ø±ÙØªÙ† ØªØµÙˆÛŒØ± %s .Ø±Ø§ ÙØ´Ø§Ø± Ø¯Ù‡ÛŒØ¯"
 
 # 
-#: lib/Filter.php:103
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
-msgstr "Ø¨Ø± Ø±ÙˆÛŒ %s Ú©Ù„ÙŠÚ© Ú©Ù†ÙŠØ¯ ØªØ§ Ø¨Ù‡ ØµÙØÙ‡ Ù…Ø¯ÙŠØ±ÙŠØª %s Ø¨Ø±ÙˆÙŠØ¯"
+msgstr "Ø¨Ø± Ø±ÙˆÛŒ %s Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯ ØªØ§ Ø¨Ù‡ ØµÙØÙ‡ Ù…Ø¯ÛŒØ±ÛŒØª %s Ø¨Ø±ÙˆÛŒØ¯"
 
 # 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:116
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
-msgstr "Ø¨Ø±Ø§ÛŒ Ø¯ÙŠØ¯Ù† Ù…Ø¶Ù…ÙˆÙ† HTMLØ¡ Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ %s Ø±Ø§ ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯"
+msgstr "Ø¨Ø±Ø§ÛŒ Ø¯ÛŒØ¯Ù† Ù…ØØªÙˆØ§ÛŒ HTML Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ØŒ %s Ø±Ø§ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
 # 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr " Ø¨Ø±Ø§ÛŒ Ø¯ÙŠØ¯Ù† ØªØµÙˆÙŠØ± Ú©ÙˆÚ†Ú© Ø§Ø² Ø§ÙŠÙ† ØªØµÙˆÙŠØ± %s Ø±Ø§ Ú©Ù„ÙŠÚ© Ú©Ù†ÙŠØ¯"
+msgstr " Ø¨Ø±Ø§ÛŒ Ø¯ÛŒØ¯Ù† ØªØµÙˆÛŒØ± Ú©ÙˆÚ†Ú© Ø§Ø² Ø§ÛŒÙ† ØªØµÙˆÛŒØ± %s Ø±Ø§ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
 # 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:418
+#, php-format
 msgid "Click %s to view the attachment in a separate window."
-msgstr "Ø¨Ø±Ø§ÛŒ Ø¯ÙŠØ¯Ù† Ù…Ø¶Ù…ÙˆÙ† HTML Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ %s Ø±Ø§ ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯"
+msgstr "Ø¨Ø±Ø§ÛŒ Ø¯ÛŒØ¯Ù† Ù…ØØªÙˆØ§ÛŒ HTML Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ %s Ø±Ø§ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Ø§ÙŠÙ†Ø¬Ø§ Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† ØªØµØ§ÙˆÙŠØ± ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯"
+# 
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Ø¨Ø±Ø§ÛŒ Ø¯ÛŒØ¯Ù† Ù‚Ø³Ù…ØªÙ‡Ø§ÛŒ Ù…Ø®ØªÙ„Ù Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ %s Ø±Ø§ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
-msgstr "Ø§ÙŠÙ†Ø¬Ø§ Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÙŠØ´ ØªØµØ§ÙˆÙŠØ± ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯"
+msgstr "Ø§ÛŒÙ†Ø¬Ø§ Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´ ØªØµØ§ÙˆÛŒØ± Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
 #: templates/prefs/sourceselect.inc:321
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
-"Ø¨Ø± Ø±ÙˆÛŒ ÙŠÚ©ÛŒ Ø§Ø² Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ú©Ù„ÙŠÚ© Ú©Ù†ÙŠØ¯ Ùˆ Ø³Ù¾Ø³ Ù‡Ù…Ù‡ ÙÙŠÙ„Ø¯Ù‡Ø§Ø±Ø§ Ø¨Ø±Ø§ÛŒ "
-"Ø¬Ø³ØªØ¬Ùˆ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+"Ø¨Ø± Ø±ÙˆÛŒ ÛŒÚ©ÛŒ Ø§Ø² Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯ Ùˆ Ø³Ù¾Ø³  ÙÛŒÙ„Ø¯Ù‡Ø§ÛŒ Ù…ÙˆØ±Ø¯ Ù†Ø¸Ø± Ø±Ø§ "
+"Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
-msgstr "Ø¨Ø±Ø§ÛŒ Ø°Ø®ÙŠØ±Ù‡ Ú©Ù„ÙŠØ¯Ù‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ø®ÙˆØ¯ØŒ Ú©Ù„ÙŠÚ© Ú©Ù†ÙŠØ¯"
+msgstr "Ø¨Ø±Ø§ÛŒ ØÙØ¸ Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ Ø®ÙˆØ¯ØŒ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
-msgstr "Ø¨Ø±Ø§ÛŒ Ø°Ø®ÙŠØ±Ù‡ Ú¯ÙˆØ§Ù‡ÛŒ S/MIME Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ø®ÙˆØ¯ Ú©Ù„ÙŠÚ© Ú©Ù†ÙŠØ¯"
+msgstr "Ø¨Ø±Ø§ÛŒ ØÙØ¸ Ú¯ÙˆØ§Ù‡ÛŒ S/MIME %s Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ Ø®ÙˆØ¯ØŒ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
-msgstr " Ú©Ù„ÙŠÚ© Ú©Ø±Ø¯Ù† Ø±ÙˆÛŒ Ø¢Ø¯Ø±Ø³ ÙØ±Ø³ØªÙ†Ø¯Ù‡ØŒ ØµÙØÙ‡ Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨Ø§Ù„Ø§ Ù…ÛŒâ€ŒØ¢ÙˆØ±Ø¯ "
+msgstr " Ú©Ù„ÛŒÚ© Ú©Ø±Ø¯Ù† Ø±ÙˆÛŒ Ø¢Ø¯Ø±Ø³ØŒ ØµÙØÙ‡ Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨Ø§Ù„Ø§ Ù…ÛŒâ€ŒØ¢ÙˆØ±Ø¯ "
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
-msgstr "Ú©Ù„ÙŠÚ© Ú©Ø±Ø¯Ù† Ø±ÙˆÛŒ Ø¢Ø¯Ø±Ø³ ÙØ±Ø³ØªÙ†Ø¯Ù‡ØŒ Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù† Ø¨Ø§Ø² Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
+msgstr "Ú©Ù„ÛŒÚ© Ú©Ø±Ø¯Ù† Ø±ÙˆÛŒ Ø¢Ø¯Ø±Ø³ØŒ Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù† Ø¨Ø§Ø² Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Ø¨Ø³ØªÙ†"
 
-#: compose.php:1057
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
-msgstr "Ø¨Ø³ØªÙ† Ø§ÙŠÙ† Ù¾Ù†Ø¬Ø±Ù‡"
+msgstr "Ø¨Ø³ØªÙ† Ø§ÛŒÙ† Ù¾Ù†Ø¬Ø±Ù‡"
 
-#: folders.php:387
+#: folders.php:429
 msgid "Closed Folder"
-msgstr "Ù¾ÙˆØ´Ù‡ Ø¨Ø³ØªÙ‡ Ø´Ø¯Ù‡"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ø¨Ø³ØªÙ‡ Ø´Ø¯Ù‡"
 
-#: folders.php:407
+#: folders.php:449
 msgid "Collapse"
-msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù†"
+msgstr "Ø¨Ø³ØªÙ†"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
-msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ù‡Ù…Ù‡"
+msgstr "Ø¨Ø³ØªÙ† Ù‡Ù…Ù‡"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
-msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† ØªÙ…Ø§Ù…ÛŒ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
+msgstr "Ø¨Ø³ØªÙ† Ù‡Ù…Ù‡Ù” Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
 
-#: folders.php:407
+#: folders.php:449
 msgid "Collapse Folder"
-msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡"
+msgstr "Ø¨Ø³ØªÙ† Ù¾ÙˆØ´Ù‡"
 
 #: templates/fetchmail/manage.inc:51
 msgid "Color Indicator: "
 msgstr "Ø´Ø§Ø®Øµ Ø±Ù†Ú¯:"
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
-msgstr "ØªÙˆØ¶ÙŠØ"
+msgstr "ØªÙˆØ¶ÛŒØ"
 
-#: lib/MIME/Viewer/itip.php:754
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
 msgstr "Ú©Ø§Ù…Ù„ Ø´Ø¯Ù‡"
 
-#: lib/Block/tree_folders.php:42 lib/Block/summary.php:19
-msgid "Compose"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù…"
-
-# 
-#: mailbox.php:735 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù… (%s)"
-
-#: compose.php:1056
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ ÙŠÚ© Ù¾ÙŠØºØ§Ù… Ø¯ÙŠÚ¯Ø±"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¯ÛŒÚ¯Ø±"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ Ø§ÙŠØ¬Ø§Ø¯ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ Ø§ÛŒØ¬Ø§Ø¯ Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
-" Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù… Ø¨Ø·ÙˆØ± Ù¾ÙŠØ´ ÙØ±Ø¶ Ø¨Ø§ ÙŠÚ© Ø±Ø§Ø¨Ø· Ú¯Ø±Ø§ÙÙŠÚ©ÛŒ Ù…Ø¨ØªÙ†ÛŒ Ø¨Ø± HTML Ø§ÙŠØ¬Ø§Ø¯ Ø´ÙˆØ¯(Ø§Ú¯Ø± "
-"Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ØµÙŠØµÙ‡ Ø±Ø§ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ â€ŒÚ©Ù†Ø¯)ØŸ "
+" Ø¢ÛŒØ§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¨Ø·ÙˆØ± Ù¾ÛŒØ´ ÙØ±Ø¶ Ø¨Ø§ ÛŒÚ© ÙˆØ§Ø³Ø· Ú¯Ø±Ø§ÙÛŒÚ©ÛŒ Ù…Ø¨ØªÙ†ÛŒ Ø¨Ø± HTML Ø§ÛŒØ¬Ø§Ø¯ Ø´ÙˆØ¯(Ø§Ú¯Ø± "
+"Ù…Ø±ÙˆØ±Ú¯Ø± Ù…Ø´Ø®ØµÙ‡ Ø±Ø§ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ â€ŒÚ©Ù†Ø¯)ØŸ "
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
-msgstr "Ù¾ÙŠÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù†Ù…Ø§ÙŠØ´ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§"
+msgstr "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
-msgstr "Ù¾ÙŠÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ú¯Ø²ÙŠÙ†Ù‡â€Œâ€ŒÙ‡Ø§ÛŒ Ù¾ÙŠØ´ Ù†Ù…Ø§ÙŠØ´ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ú¯Ø²ÛŒÙ†Ù‡â€Œâ€ŒÙ‡Ø§ÛŒ Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´  Ù†Ø§Ù…Ù‡"
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…ÙˆÙÙ‘Ù‚ Ø¨ÙˆØ¯"
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
-msgstr "Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ø³Ø±ÙˆØ± Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯"
+msgstr "Ø§ØªØµØ§Ù„ Ø¨Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…ÙˆÙÙ‘Ù‚ Ø¨ÙˆØ¯"
 
 # 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
-msgstr "Ú©Ù†ØªØ±Ù„ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ PGP Ø¨Ø±Ø§ÛŒ %s."
+msgstr "Ú©Ù†ØªØ±Ù„ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ PGP Ø¨Ø±Ø§ÛŒ %s."
 
 # 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
-msgstr "Ú©Ù†ØªØ±Ù„ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ S/MIME Ø¨Ø±Ø§ÛŒ %s"
+msgstr "Ú©Ù†ØªØ±Ù„ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ S/MIME Ø¨Ø±Ø§ÛŒ %s"
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
-msgstr "Ú©Ù†ØªØ±Ù„ Ø¹Ù„Ø§Ø¦Ù… Ù†Ø§Ù…Ù‡ Ø¬Ø¯ÙŠØ¯ Ùˆ Ø§Ø±Ø§Ø¦Ù‡ ØªØ°Ú©Ø±Ù‡Ø§ÛŒ Ù…Ø±ØªØ¨Ø·"
+msgstr "Ú©Ù†ØªØ±Ù„ ÙˆØµÙˆÙ„ Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯ Ùˆ Ø§Ø±Ø§Ø¦Ù‡Ù” ØªØ°Ú©Ø±Ù‡Ø§ÛŒ Ù…Ø±ØªØ¨Ø·"
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
-msgstr "Ø¢ÙŠØ§ Ø§ØØ³Ø§Ø³Ø§Øª Ù†ÙˆØ´ØªØ§Ø±ÛŒ Ø¨Ù‡ Ú¯Ø±Ø§ÙÙŠÚ©ÛŒ ØªØ¨Ø¯ÙŠÙ„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø§ØØ³Ø§Ø³Ø§Øª Ù†ÙˆØ´ØªØ§Ø±ÛŒ Ø¨Ù‡ Ú¯Ø±Ø§ÙÛŒÚ©ÛŒ ØªØ¨Ø¯ÛŒÙ„ Ø´ÙˆØ¯ØŸ"
 
 #: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
-msgstr "ØªÙ‡ÙŠÙ‡ Ø±ÙˆÙ†ÙˆØ´Øª"
+msgstr "Ø±ÙˆÙ†ÙˆØ´Øª"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ø±ÙˆÙ†ÙˆØ´Øª Ø¯Ø± Ù¾ÙˆØ´Ù‡"
+msgstr "Ø±ÙˆÙ†ÙˆØ´Øª Ø¯Ø± Ù¾ÙˆØ´Ù‡"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
-msgstr "ØµØÙŠØ"
+msgstr "ØµØÛŒØ"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
-msgstr "Ù…ØªÙ†â€ŒÙ‡Ø§ÛŒ ØªØµØÙŠØ Ø´Ø¯Ù‡"
+msgstr "Ù…ØªÙ†Ù‡Ø§ÛŒ ØªØµØÛŒØ Ø´Ø¯Ù‡"
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø´ØªÛŒØ§Ù† VFS Ø±Ø§ Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯: %s"
 
 # #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
 # 
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø´ØªÙŠØ§Ù† VFS Ø±Ø§ Ø§ÙŠØ¬Ø§Ø¯ Ú©Ø±Ø¯: %s"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø´ØªÛŒØ§Ù† VFS Ø±Ø§ Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯: %s"
 
 # 
-#: lib/Message.php:634
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø±Ø§ Ø§Ø² %s ØØ°Ù Ú©Ø±Ø¯. Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª:%s"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø±Ø§ Ø§Ø² %s ØØ°Ù Ú©Ø±Ø¯. Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª:%s"
 
-#: lib/Session.php:287
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¹Ù…Ù„ÙŠØ§Øª Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø±Ø§ Ø§Ø¬Ø±Ø§ Ú©Ø±Ø¯"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¹Ù…Ù„ÛŒØ§Øª Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø±Ø§ Ø§Ø¬Ø±Ø§ Ú©Ø±Ø¯"
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ø±Ø§ Ø§Ø² Ø¶Ù…ÙŠÙ…Ù‡ MS-TNEF Ø¨Ø§Ø²Ú©Ø±Ø¯"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ø±Ø§ Ø§Ø² Ù¾ÛŒÙˆØ³Øª MS-TNEF Ø¨Ø§Ø²Ú©Ø±Ø¯"
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ø±Ø§ Ø§Ø² Ø¶Ù…ÙŠÙ…Ù‡ Zip Ø¨Ø§Ø²Ú©Ø±Ø¯"
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ø±Ø§ Ø§Ø² Ø¢Ø±Ø´ÛŒÙˆ Zip Ø¨Ø§Ø²Ú©Ø±Ø¯"
 
-#: search.php:356 templates/acl/acl.inc:39 templates/acl/acl.inc:157
-#: templates/fetchmail/account_select.inc:26 templates/fetchmail/manage.inc:67
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ú©Ù„ÙŠØ¯Ù‡Ø§"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ú©Ù„ÛŒØ¯Ù‡Ø§"
 
 #: templates/search/header.inc:14
 msgid "Create Virtual Folder"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ"
+
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Ø¨Ù‚ÛŒÙ‡ ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ù¾Ø³ØªÛŒ"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÛŒØ¯ Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÛŒØ¯ Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³Ù‡Ø§"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ÛŒ"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÛŒØ¯ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ÛŒ"
 
 #: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯ Ø¢Ø´ØºØ§Ù„"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÛŒØ¯ Ø¢Ø´ØºØ§Ù„"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-" Ø§ÙŠØ¬Ø§Ø¯ Ù‚Ø§Ù†ÙˆÙ†â€ŒÙ‡Ø§ÛŒ ÙÙŠÙ„ØªØ± Ø¨Ø±Ø§ÛŒ Ø³Ø§Ø²Ù…Ø§Ù†Ø¯Ù‡ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¯Ø±ÙŠØ§ÙØªÛŒØŒ Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ "
-"Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ Ùˆ ØØ°Ù Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
+" Ø§ÛŒØ¬Ø§Ø¯ Ù‚ÙˆØ§Ù†ÛŒÙ† ÙÛŒÙ„ØªØ± Ø¨Ø±Ø§ÛŒ Ø³Ø§Ø²Ù…Ø§Ù†Ø¯Ù‡ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø¯Ø±ÛŒØ§ÙØªÛŒØŒ Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø¯Ø± "
+"Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ Ùˆ ØØ°Ù Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
+
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø± Ø¬Ø¯ÛŒØ¯"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø± Ùˆ ÙØ±Ù… Ù¾Ø§Ø³Ø®"
 
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Ø¯Ø³ØªØ±Ø³ÛŒ Ú©Ù†ÙˆÙ†ÛŒ Ø¨Ù‡ %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
-msgstr "Ø¨Ù‡ÙŠÙ†Ù‡ Ø³Ø§Ø²ÛŒ ØØ³Ø§Ø¨Ù‡Ø§ Ø¨Ø±Ø§ÛŒ ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø§Ø² ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ø¯ÙŠÚ¯Ø±"
+msgstr "Ø¨Ù‡ÛŒÙ†Ù‡ Ø³Ø§Ø²ÛŒ ØØ³Ø§Ø¨Ù‡Ø§ Ø¨Ø±Ø§ÛŒ ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø§Ø² ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø±"
 
 #: config/prefs.php.dist:51
 msgid "Customize how you send mail."
-msgstr "Ø¨Ù‡ÙŠÙ†Ù‡ Ø³Ø§Ø²ÛŒ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ø§Ø±Ø³Ø§Ù„ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
+msgstr "Ø¨Ù‡ÛŒÙ†Ù‡ Ø³Ø§Ø²ÛŒ Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ø§Ø±Ø³Ø§Ù„ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
 
 #: config/prefs.php.dist:40
 #, php-format
 msgid "Customize tasks to run upon logon to %s."
-msgstr "Ø¨Ù‡ÙŠÙ†Ù‡ Ø³Ø§Ø²ÛŒ ÙˆØ¸Ø§ÙŠÙ Ø¨Ø±Ø§ÛŒ Ø§Ø¬Ø±Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ±ÙˆØ¯ Ø¨Ù‡ %s"
+msgstr "Ø¨Ù‡ÛŒÙ†Ù‡ Ø³Ø§Ø²ÛŒ ÙˆØ¸Ø§ÛŒÙ Ø¨Ø±Ø§ÛŒ Ø§Ø¬Ø±Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ±ÙˆØ¯ Ø¨Ù‡ %s"
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
-msgstr "ØªØ§Ø±ÙŠØ®"
+msgstr "ØªØ§Ø±ÛŒØ®"
 
-#: thread.php:75 message.php:254
+#: message.php:262 thread.php:148
 msgid "Date"
-msgstr "ØªØ§Ø±ÙŠØ®"
+msgstr "ØªØ§Ø±ÛŒØ®"
 
-#: lib/MIME/Viewer/itip.php:742
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Ø±Ø¯Ø´Ø¯Ù‡"
 
-#: config/prefs.php.dist:894
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr "Ø±Ø¯Ø´Ø¯Ù‡:"
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "ØØ°Ù"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
-msgstr "Ø¶ÙˆØ§Ø¨Ø· Ù¾ÙŠØ´ ÙØ±Ø¶ Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ:"
+msgstr "Ù…Ø¹ÛŒØ§Ø±Ù‡Ø§ÛŒ Ù¾ÛŒØ´ ÙØ±Ø¶ Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
-msgstr "Ø¬Ù‡Øª Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ù¾ÙŠØ´ ÙØ±Ø¶:"
+msgstr "Ø¬Ù‡Øª Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ù¾ÛŒØ´ ÙØ±Ø¶:"
 
-#: lib/MIME/Viewer/itip.php:750
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
-msgstr "Ù†Ù…Ø§ÙŠÙ†Ø¯Ù‡"
+msgstr "Ù†Ù…Ø§ÛŒÙ†Ø¯Ù‡"
 
-#: folders.php:378 templates/contacts/contacts.inc:244
-#: templates/pgp/pgp.inc:93 templates/message/navbar_actions.inc:6
-#: templates/fetchmail/manage.inc:68 templates/mailbox/actions.inc:8
-#: templates/mailbox/actions.inc:10 templates/smime/smime.inc:65
-#: templates/compose/attachments.inc:28
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "ØØ°Ù"
 
 # 
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
-msgstr "ØØ°Ù Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
+msgstr "ØØ°Ù Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
 
-#: templates/pgp/pgp.inc:169 templates/smime/smime.inc:128
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
-msgstr "ØØ°Ù Ú©Ù„ÙŠØ¯â€ŒÙ‡Ø§ÛŒ Ú©Ù†ÙˆÙ†ÛŒ"
+msgstr "ØØ°Ù Ú©Ù„ÛŒØ¯â€ŒÙ‡Ø§ÛŒ Ú©Ù†ÙˆÙ†ÛŒ"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
-msgstr "ØØ°Ù Ù¾ÙˆØ´Ù‡ (Ù‡Ø§)"
+msgstr "ØØ°Ù Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
-#: folders.php:378
+#: folders.php:285
+msgid "Delete Selected Folders"
+msgstr "ØØ°Ù Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "ØØ°Ù Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±"
+
+#: folders.php:419
 msgid "Delete Virtual Folder"
 msgstr "ØØ°Ù Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ"
 
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ ÙˆØ§Ú©Ø´ÛŒ Ø´Ø¯Ù‡ Ø§Ø² Ø³Ø±ÙˆØ± ØØ°Ù Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ ÙˆØ§Ú©Ø´ÛŒ Ø´Ø¯Ù‡ Ø§Ø² Ú©Ø§Ø±Ø³Ø§Ø² ØØ°Ù Ø´ÙˆØ¯ØŸ"
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
-msgstr "Ø§Ø² ØªÙ‚ÙˆÙŠÙ… Ù…Ù† ØØ°Ù Ø´ÙˆØ¯"
+msgstr "Ø§Ø² ØªÙ‚ÙˆÛŒÙ… Ù…Ù† ØØ°Ù Ø´ÙˆØ¯"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
-msgstr "Ø¢ÙŠØ§ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒØŒ Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù‡Ø± Ù…Ø§Ù‡ ØØ°Ù Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒÙˆÙ†Ø¯Ù‡Ø§ÛŒ Ù¾ÛŒÙˆØ³Øª Ù‚Ø¯ÛŒÙ…ÛŒØŒ Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù‡Ø± Ù…Ø§Ù‡ ØØ°Ù Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
-msgstr "Ø¢ÙŠØ§ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ù‚Ø¯ÙŠÙ…ÛŒØŒ Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù‡Ø± Ù…Ø§Ù‡ ØØ°Ù Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡Ù” Ù‚Ø¯ÛŒÙ…ÛŒØŒ Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù‡Ø± Ù…Ø§Ù‡ ØØ°Ù Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù‡Ø±Ø² Ø¨Ø¹Ø¯ Ø§Ø² Ø§ÙŠÙ†Ú©Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù†Ø¯ ØØ°Ù Ø´ÙˆÙ†Ø¯ØŸ"
+#: config/prefs.php.dist:617
+msgid "Delete spam messages"
+msgstr "ØØ°Ù Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
 
-#: mailbox.php:695 message.php:494 templates/mailbox/navbar.inc:20
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "ØØ°Ù Ø´Ø¯Ù‡"
 
 #: templates/search/main.inc:63
 msgid "Deleted messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ ØØ°Ù Ø´Ø¯Ù‡"
 
 # 
-#: compose.php:292
+#: compose.php:307
 #, php-format
 msgid "Deleted the attachment \"%s\"."
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡ \"%s\" ØØ°Ù Ø´Ø¯Ù‡"
+msgstr "Ù¾ÛŒÙˆØ³Øª \"%s\" ØØ°Ù Ø´Ø¯Ù‡"
 
 #: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
-msgstr "ØØ°Ù Ùˆ Ø¬Ø§Ø¨Ù‡â€ŒØ¬Ø§ÙŠÙŠ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§"
+msgstr "ØØ°Ù Ùˆ Ø§Ù†ØªÙ‚Ø§Ù„ Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Ø±Ø¯ ØªÙ‚Ø§Ø¶Ø§"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
-msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ø±Ø§ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª free/busy Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ù†Ø´Ø¯"
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ø±Ø§ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ù†Ø´Ø¯"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Ù†Ø²ÙˆÙ„ÛŒ"
 
-#: lib/MIME/Viewer/itip.php:656 templates/compose/attachments.inc:21
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
-msgstr "ØªÙˆØ¶ÙŠØ"
+msgstr "ØªÙˆØ¶ÛŒØ"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
-#: templates/smime/smime.inc:113
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
-msgstr "Ø¬Ø²Ø¦ÙŠØ§Øª"
+msgstr "Ø¬Ø²Ø¦ÛŒØ§Øª"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Ø§Ù…Ø¶Ø§Ø¡â€ŒÙ‡Ø§ ØªØ§Ø± Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
-msgstr "Ù†Ù…Ø§ÙŠØ´"
+msgstr "Ù†Ù…Ø§ÛŒØ´"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
-msgstr "Ø¢ÙŠØ§ Ø¨Ø¹Ø¯ Ø§Ø² ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÙŠØºØ§Ù…ØŒ ØªØ£ÙŠÙŠØ¯ Ø¢Ù† Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¨Ø¹Ø¯ Ø§Ø² ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÛŒØºØ§Ù…ØŒ ØªØ£ÛŒÛŒØ¯ Ø¢Ù† Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ø¯Ø± Ø¨Ø¯Ù†Ù‡ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø¯Ø± Ø¨Ø¯Ù†Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
-msgstr "Ø¢ÙŠØ§ ØªØ°Ú©Ø±Ù‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ "
+msgstr "Ø¢ÛŒØ§ ØªØ°Ú©Ø±Ù‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ” Ø¬Ø¯ÛŒØ¯ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ "
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠÙˆÙ†Ø¯ 'Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„' Ø¯Ø± Ù…Ù†Ùˆ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒÙˆÙ†Ø¯ 'Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§' Ø¯Ø± Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒÙˆÙ†Ø¯ 'Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„' Ø¯Ø± Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
-msgstr "ØªØ±ØªÙŠØ¨"
+msgstr "ØªØ±ØªÛŒØ¨"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
-msgstr "Ù…Ø·Ø§Ø¨Ù‚Øª Ù†Ú©Ù†Ø¯"
+msgstr "Ø¹Ø¯Ù… ØªØ·Ø§Ø¨Ù‚"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
-msgstr "Ù¾ÙˆØ´Ù‡(Ù‡Ø§) Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¬Ø¯ÙŠØ¯ Ø¨Ø±Ø±Ø³ÛŒ Ù†Ú©Ù†"
+msgstr "Ø¹Ø¯Ù… Ø¨Ø±Ø±Ø³ÛŒ Ù¾ÙˆØ´Ù‡(Ù‡Ø§) Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
-msgstr "Ø¯Ø± Ø³ØªÙˆÙ† ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ù¾ÙŠÙˆÙ†Ø¯ÛŒ Ø§ÙŠØ¬Ø§Ø¯ Ù†Ú©Ù†"
+msgstr "Ø¯Ø± Ø³ØªÙˆÙ† ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ù¾ÛŒÙˆÙ†Ø¯ÛŒ Ø§ÛŒØ¬Ø§Ø¯ Ù†Ú©Ù†"
 
-#: lib/IMP.php:1004
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
-msgstr "Ø¢ÙŠØ§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø¢Ù† Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ø¨Ø§Ø² Ú©Ù†ÙŠØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¢Ù† Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ø¨Ø§Ø² Ú©Ù†ÛŒØ¯ØŸ"
+
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr "Ø¢ÛŒØ§ ØØ³Ø§Ø¨ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯ØŸ Ø«Ø¨Øª Ù†Ø§Ù…"
 
-#: templates/compose/spelling.inc:112
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡"
 
 # 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
-msgstr "Ú¯Ø±ÙØªÙ† %s Ø¯Ø± Ù‚Ø§Ù„Ø¨ .zip"
+msgstr "Ø§Ø³ØªÙ‚Ø±Ø§Ø± %s Ø¯Ø± Ù‚Ø§Ù„Ø¨ .zip"
 
 #: templates/message/headers.inc:52
 msgid "Download All Attachments (in .zip file)"
-msgstr "Ú¯Ø±ÙØªÙ† ØªÙ…Ø§Ù…ÛŒ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ (Ø¯Ø± Ù¾Ø±ÙˆÙ†Ø¯Ù‡ .zip)"
+msgstr "Ø§Ø³ØªÙ‚Ø±Ø§Ø± ØªÙ…Ø§Ù…ÛŒ Ù¾ÛŒÙˆØ³ØªÙ‡Ø§(Ø¯Ø± Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù” .zip)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
-msgstr "Ú¯Ø±ÙØªÙ† Ù¾ÙˆØ´Ù‡ (Ù‡Ø§)"
+msgstr "Ø§Ø³ØªÙ‚Ø±Ø§Ø± Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
-msgstr "Ú¯Ø±ÙØªÙ† Ù¾ÙˆØ´Ù‡ (Ù‡Ø§) [Ù‚Ø§Ù„Ø¨ .zip]"
+msgstr "Ø§Ø³ØªÙ‚Ø±Ø§Ø± Ù¾ÙˆØ´Ù‡(Ù‡Ø§) [Ù‚Ø§Ù„Ø¨ .zip]"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
-msgstr "Ú¯Ø±ÙØªÙ† Ø¯Ø± Ù‚Ø§Ù„Ø¨ .zip"
+msgstr "Ø§Ø³ØªÙ‚Ø±Ø§Ø± Ø¯Ø± Ù‚Ø§Ù„Ø¨ .zip"
 
-#: mailbox.php:676 message.php:492 templates/message/navbar_navigate.inc:11
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
-msgstr "Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³"
+msgstr "Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³"
 
-#: folders.php:358
+#: folders.php:392
 msgid "Draft folder"
-msgstr "Ù¾ÙˆØ´Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³"
 
 #: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
-msgstr "Ù¾ÙˆØ´Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³â€ŒÙ‡Ø§:"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³Ù‡Ø§:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
-msgstr "Ø¢Ø¯Ø±Ø³ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ø¢Ø¯Ø±Ø³ Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr "Ø®Ø§ØªÙ…Ù‡"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
-msgstr "Ø®Ø·Ø§: Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø§Ø±Ø³Ø§Ù„ Ø´ÙˆØ¯"
+msgstr "Ø®Ø·Ø§: Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ ØªØÙˆÛŒÙ„ Ø¯Ø§Ø¯Ù‡ Ù†Ø´Ø¯"
 
-#: folders.php:379
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ Ù„ÙŠØ³Øª Ø³ÙŠØ§Ù‡"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ Ù„ÛŒØ³Øª Ø³ÛŒØ§Ù‡"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ ØµØ§ÙÛŒâ€ŒÙ‡Ø§"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ ÙÛŒÙ„ØªØ±Ù‡Ø§"
 
-#: folders.php:379 templates/mailbox/header.inc:13
-#: templates/search/header.inc:16
+#: folders.php:420 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø¬Ø§Ø²ÛŒ"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ Ù¾ÙˆØ´Ù‡â€ŒÙ” Ù…Ø¬Ø§Ø²ÛŒ"
 
 #: templates/mailbox/header.inc:13
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ ØªØ¹Ø§Ø±ÙŠÙ Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ %s"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ ØªØ¹Ø±ÛŒÙ Ù¾ÙˆØ´Ù‡Ù” Ù…Ø¬Ø§Ø²ÛŒ %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ Ù„ÙŠØ³Øª Ø³ÙÙŠØ¯"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ ÙÙ‡Ø±Ø³Øª Ø³ÙÛŒØ¯"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ ÙÙ‡Ø±Ø³Øª Ø³ÙŠØ§Ù‡ Ø´Ù…Ø§"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ ÙÙ‡Ø±Ø³Øª Ø³ÛŒØ§Ù‡ Ø´Ù…Ø§"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ Ù‚ÙˆØ§Ù†ÙŠÙ† ÙÙŠÙ„ØªØ± Ø´Ù…Ø§"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ Ù‚ÙˆØ§Ù†ÛŒÙ† ÙÛŒÙ„ØªØ± Ø´Ù…Ø§"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
-msgstr ".ÙˆÙŠØ±Ø§ÙŠØ´ Ø§ÙˆÙ„ÙˆÙŠØªâ€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªÙŠØ§Ø¨ÛŒ Ø¨Ù‡ ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¯ÙŠÚ¯Ø±"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ Ø¯Ø³ØªÛŒØ§Ø¨ÛŒ Ø¨Ù‡ ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ø¯ÛŒÚ¯Ø±"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
-msgstr "ÙˆÙŠØ±Ø§ÙŠØ´ ÙÙ‡Ø±Ø³Øª Ø³ÙÙŠØ¯ Ø´Ù…Ø§"
+msgstr "ÙˆÛŒØ±Ø§ÛŒØ´ ÙÙ‡Ø±Ø³Øª Ø³ÙÛŒØ¯ Ø´Ù…Ø§"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
-msgstr "Ø¢Ø¯Ø±Ø³â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ø¢Ø¯Ø±Ø³ Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ"
 
 # 
-#: lib/Message.php:651
+#: lib/Message.php:657
 #, php-format
 msgid "Emptied all messages from %s."
-msgstr "ØªÙ…Ø§Ù…ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø§Ø² %s Ø®Ø§Ù„ÛŒ Ø´Ø¯Ù†Ø¯"
+msgstr "ØªÙ…Ø§Ù…ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø§Ø² %s Ø®Ø§Ù„ÛŒ Ø´Ø¯Ù†Ø¯"
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
+#: folders.php:286
+msgid "Empty Selected Folders"
+msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
-msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡ Ø¢Ø´ØºØ§Ù„"
+msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡Ù” Ø¢Ø´ØºØ§Ù„"
+
+#: lib/IMP.php:973
+msgid "Empty _Spam"
+msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:966
 msgid "Empty _Trash"
 msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
-msgstr "Ø¢ÙŠØ§ Ù‚Ø§Ø¨Ù„ÙŠØª PGP ÙØ¹Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù‚Ø§Ø¨Ù„ÛŒØª PGP ÙØ¹Ø§Ù„ Ø´ÙˆØ¯ØŸ"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
-msgstr "Ø¢ÙŠØ§ Ù‚Ø§Ø¨Ù„ÙŠØª S/MIME ÙØ¹Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù‚Ø§Ø¨Ù„ÛŒØª S/MIME ÙØ¹Ø§Ù„ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØ´ Ù†Ù…Ø§ÙŠØ´ Ù¾ÙŠØºØ§Ù… ÙØ¹Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´Ù‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù… ÙØ¹Ø§Ù„ Ø´ÙˆØ¯ØŸ"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€Œâ€ŒÙ‡Ø§ÛŒ Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€Œâ€ŒÙ‡Ø§ÛŒ Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Ø§Ù†ØªÙ‡Ø§"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:384
 msgid "End forwarded message"
-msgstr "Ø§Ù†ØªÙ‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù…â€Œ Ø¨Ù‡ Ø¬Ù„Ùˆ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ø§Ù†ØªÙ‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù…â€Œ Ø§Ø±Ø¬Ø§Ø¹ Ø´Ø¯Ù‡"
 
-#: lib/Compose.php:262
+#: lib/Compose.php:341
 msgid "End message"
-msgstr "Ø§Ù†ØªÙ‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø§Ù†ØªÙ‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù…"
 
 # 
-#: lib/Compose.php:260
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
-msgstr "Ø§Ù†ØªÙ‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù… Ø§Ø² %s"
+msgstr "Ø§Ù†ØªÙ‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù… Ø§Ø² %s"
 
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
-msgstr "ÙˆØ§Ø±Ø¯Ú©Ø±Ø¯Ù† Passphrase"
+msgstr "ÙˆØ§Ø±Ø¯Ú©Ø±Ø¯Ù† Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø±"
+
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡Ù” Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯"
 
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
-msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³ Ø¬Ø¯ÙŠØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡Ù” Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³ Ø¬Ø¯ÛŒØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
-msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯Ù‡ Ø¬Ø¯ÙŠØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡Ù” Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯Ù‡ Ø¬Ø¯ÛŒØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯"
 
 #: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
-msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ø¢Ø´ØºØ§Ù„ Ø¬Ø¯ÙŠØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡Ù” Ø¢Ø´ØºØ§Ù„ Ø¬Ø¯ÛŒØ¯ Ø®ÙˆØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯"
+
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡Ù” Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
 
 # 
-#: compose.php:1043 message.php:186
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
-msgstr "ÙˆØ±ÙˆØ¯ÛŒ %s Ø¨Ø·ÙˆØ± Ù…ÙˆÙÙ‚ÙŠØª Ø¢Ù…ÙŠØ² Ø¨Ù‡ Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "ÙˆØ±ÙˆØ¯ÛŒ %s Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¨Ù‡ Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
-#: lib/MIME/Viewer/pgp.php:392 lib/MIME/Viewer/status.php:75
-#: lib/MIME/Viewer/status.php:170 lib/MIME/Viewer/pkcs7.php:367
-#: templates/pgp/pgp.inc:84 templates/smime/smime.inc:58
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
 # 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾Ø§Ø³Ø®:%s"
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
 msgid "Event successfully deleted."
-msgstr "Ø±ÙˆÙŠØ¯Ø§Ø¯ Ø¨Ø·ÙˆØ± Ù…ÙˆÙÙ‚ÙŠØª Ø¢Ù…ÙŠØ² ØØ°Ù Ø´Ø¯"
+msgstr "Ø±ÙˆÛŒØ¯Ø§Ø¯ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØØ°Ù Ø´Ø¯"
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
-msgstr "Ù‡Ø± Ù¾Ø§Ù†Ø²Ø¯Ù‡ Ø¯Ù‚ÙŠÙ‚Ù‡"
+msgstr "Ù‡Ø± Ù¾Ø§Ù†Ø²Ø¯Ù‡ Ø¯Ù‚ÛŒÙ‚Ù‡"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
-msgstr "Ù‡Ø± Ø³ÛŒ Ø¯Ù‚ÙŠÙ‚Ù‡"
+msgstr "Ù‡Ø± Ø³ÛŒ Ø¯Ù‚ÛŒÙ‚Ù‡"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
-msgstr "Ù‡Ø± Ù¾Ù†Ø¬ Ø¯Ù‚ÙŠÙ‚Ù‡"
+msgstr "Ù‡Ø± Ù¾Ù†Ø¬ Ø¯Ù‚ÛŒÙ‚Ù‡"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:783
 msgid "Every half hour"
-msgstr "Ù‡Ø± Ù†ÙŠÙ… Ø³Ø§Ø¹Øª"
+msgstr "Ù‡Ø± Ù†ÛŒÙ… Ø³Ø§Ø¹Øª"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:780
 msgid "Every minute"
-msgstr "Ù‡Ø± Ø¯Ù‚ÙŠÙ‚Ù‡"
+msgstr "Ù‡Ø± Ø¯Ù‚ÛŒÙ‚Ù‡"
 
-#: folders.php:416
+#: folders.php:457
 msgid "Expand"
 msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù†"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ù‡Ù…Ù‡"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ù‡Ù…Ù‡ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
 
-#: folders.php:416
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
-msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ø§Ø³Ù…â€ŒÙ‡Ø§"
+msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ø§Ø³Ù…Ù‡Ø§"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
-msgstr "Ø¢ÙŠØ§ Ø§Ø³Ø§Ù…ÛŒ Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¯Ø± Ù¾Ø³ Ø²Ù…ÙŠÙ†Ù‡ ØµØºØÙ‡ Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù… Ø¨Ø§Ø² Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø§Ø³Ø§Ù…ÛŒ Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¯Ø± Ù¾Ø³â€ŒØ²Ù…ÛŒÙ†Ù‡Ù” ØµØºØÙ‡Ù” Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù… Ø¨Ø§Ø² Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
-msgstr "Ø¢ÙŠØ§ Ø¨Ø·ÙˆØ± Ù¾ÙŠØ´ ÙØ±Ø¶ Ø¯Ø± Ø¨Ø®Ø´ Ù†Ù…Ø§ÙŠØ´ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ØŒ Ø¯Ø±Ø®Øª ØªÙ…Ø§Ù…ÛŒ Ù¾ÙˆØ´Ù‡ Ø¨Ø§Ø² Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¨Ø·ÙˆØ± Ù¾ÛŒØ´ ÙØ±Ø¶ Ø¯Ø± Ø¨Ø®Ø´ Ù†Ù…Ø§ÛŒØ´ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ØŒ ØªÙ…Ø§Ù…ÛŒ Ø¯Ø±Ø®Øª Ù¾ÙˆØ´Ù‡ Ø¨Ø§Ø² Ø´ÙˆØ¯ØŸ"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
-msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† ..."
+msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù†"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
-msgstr "ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
-msgstr "Ø¢ÙŠØ§ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¯Ø± Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡ ÙˆØ§Ú©Ø´ÛŒ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù†Ø§Ù…Ù‡ Ø¯Ø± Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡â€ŒØ§ÛŒÛŒ ÙˆØ§Ú©Ø´ÛŒ Ø´ÙˆØ¯ØŸ"
 
 #: templates/fetchmail/manage.inc:46
 msgid "Fetch messages upon logging on?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¨Ù…ØØ¶ ÙˆØ±ÙˆØ¯ ÙˆØ§Ú©Ø´ÛŒ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¨Ù…ØØ¶ ÙˆØ±ÙˆØ¯ ÙˆØ§Ú©Ø´ÛŒ Ø´ÙˆÙ†Ø¯ØŸ"
+
+# 
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "%d Ù¾ÛŒØºØ§Ù… Ø§Ø² %s ÙˆØ§Ú©Ø´ÛŒ Ø´Ø¯Ù†Ø¯"
 
 # 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:287
 #, php-format
-msgid "Fetched %d message(s) from %s"
-msgstr "%d Ù¾ÙŠØºØ§Ù… Ø§Ø² %s ÙˆØ§Ú©Ø´ÛŒ Ø´Ø¯Ù†Ø¯"
+msgid "Fetched 1 message from %s"
+msgstr "ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø§Ø² %s ÙˆØ§Ú©Ø´ÛŒ Ø´Ø¯"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
-msgstr "ÙˆØ§Ú©Ø´ÛŒ Ú©Ù†Ù†Ø¯Ù‡ Ù†Ø§Ù…Ù‡:"
+msgstr "ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡:"
 
 # 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
-msgstr "ÙˆØ§Ú©Ø´ÛŒ Ú©Ù†Ù†Ø¯Ù‡ Ù†Ø§Ù…Ù‡: Ù†Ø§Ù…Ù‡ Ø¬Ø¯ÙŠØ¯ÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+msgstr "ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡: Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯ÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
 
-#: lib/IMP.php:917
+#: lib/IMP.php:990
 msgid "Fi_lters"
-msgstr "ÙÙŠÙ„ØªØ±Ù‡Ø§"
+msgstr "ÙÛŒÙ„ØªØ±Ù‡Ø§"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ ÙÙŠÙ„ØªØ±"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ ÙÛŒÙ„ØªØ±"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
-msgstr "ØªÙ†Ø¸ÙŠÙ…Ø§Øª ÙÙŠÙ„ØªØ±"
+msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª ÙÛŒÙ„ØªØ±"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø¶Ù…ÙˆÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ø±Ø§ÛŒ Ø¨ÛŒ ØØ±Ù…ØªÛŒ Ø¨Ù‡ Ù…Ù‚Ø¯Ø³Ø§Øª ÙÙŠÙ„ØªØ± Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù…Ø¶Ù…ÙˆÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ø±Ø§ÛŒ Ø¨ÛŒâ€ŒØØ±Ù…ØªÛŒ Ø¨Ù‡ Ù…Ù‚Ø¯Ø³Ø§Øª ÙÛŒÙ„ØªØ± Ø´ÙˆØ¯ØŸ"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ ÙÙŠÙ„ØªØ± Ø±ÙˆÛŒ Ø§ÙŠÙ† Ø³ÙŠØ³ØªÙ… ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ ÙÛŒÙ„ØªØ± Ø¨Ø± Ø±ÙˆÛŒ Ø§ÛŒÙ† Ø³Ø§Ù…Ø§Ù†Ù‡ ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª"
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
-msgstr "ÙÙŠÙ„ØªØ±Ù‡Ø§"
+msgstr "ÙÛŒÙ„ØªØ±Ù‡Ø§"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
-msgstr "ÙÙŠÙ„ØªØ±â€ŒÙ‡Ø§ ÙØ¹Ø§Ù„ Ù†ÙŠØ³ØªÙ†Ø¯"
+msgstr "ÙÛŒÙ„ØªØ±â€ŒÙ‡Ø§ ÙØ¹Ø§Ù„ Ù†ÛŒØ³ØªÙ†Ø¯"
 
 # 
-#: lib/Filter.php:102
+#: lib/Filter.php:105
+#, php-format
 msgid "Filters: %s management page"
-msgstr "ØµØ§ÙÛŒâ€ŒÙ‡Ø§: %s ØµÙØÙ‡ Ù…Ø¯ÙŠØ±ÙŠØª"
+msgstr "ÙÛŒÙ„ØªØ±Ù‡Ø§: %s ØµÙØÙ‡Ù” Ù…Ø¯ÛŒØ±ÛŒØª"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
-msgstr "Ù¾ÙŠØ¯Ø§Ú©Ø±Ø¯Ù†"
+msgstr "Ù¾ÛŒØ¯Ø§Ú©Ø±Ø¯Ù†"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
-msgstr "ØµÙØÙ‡ Ø§ÙˆÙ„ ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ "
+msgstr "ØµÙØÙ‡Ù” Ø§ÙˆÙ„ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† "
 
-#: mailbox.php:334
+#: mailbox.php:345
 msgid "First Page"
-msgstr "ØµÙØÙ‡ Ø§ÙˆÙ„"
+msgstr "ØµÙØÙ‡Ù” Ø§ÙˆÙ„"
 
 #: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
 msgid "Fo_rward"
-msgstr "Ù¾ÙŠØ´Ø¨Ø±Ø¯Ù‡Ø§"
+msgstr "Ø§Ø±Ø¬Ø§Ø¹"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Ø¹Ù…Ù„ÛŒØ§Øª Ù¾ÙˆØ´Ù‡ - ØªØ£ÛŒÛŒØ¯"
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
-msgstr "Ù…Ø±ÙˆØ±Ú¯Ø± Ù¾ÙˆØ´Ù‡"
-
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Ù¾ÙŠØ´ÙˆÙ†Ø¯ Ù¾ÙˆØ´Ù‡"
+msgstr "Ù†Ø§ÙˆØ´Ú¯Ø± Ù¾ÙˆØ´Ù‡"
 
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
-msgstr "Ø®Ù„Ø§ØµÙ‡ Ù¾ÙˆØ´Ù‡"
+msgstr "Ø®Ù„Ø§ØµÙ‡Ù” Ù¾ÙˆØ´Ù‡"
 
 #: acl.php:24
 msgid "Folder sharing is not enabled."
-msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ù¾ÙˆØ´Ù‡ Ù…Ù‚Ø¯ÙˆØ± Ù†ÙŠØ³Øª"
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ù¾ÙˆØ´Ù‡ Ù…Ù‚Ø¯ÙˆØ± Ù†ÛŒØ³Øª"
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
-msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾ÙˆØ´Ù‡ Ù…Ù‚Ø¯ÙˆØ± Ù†ÙŠØ³Øª"
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù¾ÙˆØ´Ù‡ Ù…Ù‚Ø¯ÙˆØ± Ù†ÛŒØ³Øª"
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
-msgstr "ÙØ±Ù…Øª ØªØ§Ø±ÙŠØ® Ù†Ø§Ù…Ù‡ Ø¯Ø± ØµÙ†Ø¯ÙˆÙ‚ Ù¾Ø³ØªÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù…Ø±ÙˆØ² "
+msgstr "ÙØ±Ù…Øª ØªØ§Ø±ÛŒØ® Ù†Ø§Ù…Ù‡ Ø¯Ø± Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù…Ø±ÙˆØ² "
 
-#: compose.php:706 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
-msgstr "Ù¾ÙŠØ´Ø¨Ø±Ø¯"
+msgstr "Ø§Ø±Ø¬Ø§Ø¹"
 
-#: compose.php:691
+#: compose.php:765
 msgid "Forward:"
-msgstr ":Ù¾ÙŠØ´Ø¨Ø±Ø¯"
+msgstr ":Ø§Ø±Ø¬Ø§Ø¹"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:369
 msgid "Forwarded message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ù¾ÙŠØ´Ø¨Ø±Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø§Ø±Ø¬Ø§Ø¹ Ø´Ø¯Ù‡"
 
 # 
-#: lib/Compose.php:288
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
-msgstr "Ù¾ÙŠØºØ§Ù… Ù¾ÙŠØ´Ø¨Ø±Ø¯ Ø§Ø² %s"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø§Ø±Ø¬Ø§Ø¹ Ø´Ø¯Ù‡ Ø§Ø² %s"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
-msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Free/Busy"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
-msgstr "Ù¾Ø§Ø³Ø® Free/Busy"
+msgstr "Ù¾Ø§Ø³Ø® Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
-msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Free/Busy"
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„"
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
-msgstr "Ù¾Ø§Ø³Ø® Ø¯Ø±Ø®ÙˆØ§Ø³Øª Free/Busy"
+msgstr "Ù¾Ø§Ø³Ø® Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "Ø§Ø²"
 
-#: thread.php:76 search.php:141 message.php:255
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Ø§Ø²"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:918
 msgid "From Address"
-msgstr "Ø¢Ø¯Ø±Ø³ ÙØ±Ø³ØªÙ†Ø¯Ù‡"
+msgstr "Ø§Ø² Ø¢Ø¯Ø±Ø³"
 
-#: compose.php:703 compose.php:707
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
-msgstr "Ù¾ÙŠØ´Ø¨Ø±Ø¯:"
+msgstr "Ø§Ø±Ø¬Ø§Ø¹:"
 
-#: compose.php:1204
+#: compose.php:1294
 msgid "Fwd: "
-msgstr "Ù¾ÙŠØ´Ø¨Ø±Ø¯:"
+msgstr "Ø§Ø±Ø¬Ø§Ø¹:"
 
 # 
-#: compose.php:1206
+#: compose.php:1296
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
-msgstr "Ù¾ÙŠØ´Ø¨Ø±Ø¯: %u Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù¾ÙŠØ´Ø¨Ø±Ø¯ Ø´Ø¯Ù‡"
+msgstr "Ø§Ø±Ø¬Ø§Ø¹: %u Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø§Ø±Ø¬Ø§Ø¹ Ø´Ø¯Ù‡"
 
 #: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
 #: config/prefs.php.dist:38
 msgid "General Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ"
 
 #: templates/fetchmail/manage.inc:37
 msgid "Get only new messages? (IMAP only)"
-msgstr "Ø¢ÙŠØ§ ÙÙ‚Ø· Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯ Ú¯Ø±ÙØªÙ‡ Ø´ÙˆÙ†Ø¯ØŸ (ÙÙ‚Ø· IMAP)"
+msgstr "Ø¢ÛŒØ§ ÙÙ‚Ø· Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯ Ú¯Ø±ÙØªÙ‡ Ø´ÙˆÙ†Ø¯ØŸ (ÙÙ‚Ø· IMAP)"
 
-#: thread.php:68
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
-msgstr "Ø¨Ù‡ Ù¾ÙŠØºØ§Ù… Ø¨Ø±Ùˆ"
+msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ Ù¾ÛŒØºØ§Ù…"
+
+#: lib/IMP.php:498
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Ø¨Ø±Ùˆ Ø¨Ù‡ ÙˆØ±ÙˆØ¯ÛŒ Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ \"%s\" "
 
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr "ÙˆØ§Ú¯Ø°Ø§Ø±ÛŒ Ø¯Ø³ØªØ±Ø³ÛŒ"
 
-#: message.php:547 lib/Filter.php:102 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/pkcs7.php:410
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
-msgstr "Ø§ÙŠÙ†Ø¬Ø§"
+msgstr "Ø§ÛŒÙ†Ø¬Ø§"
 
-#: lib/MIME/Viewer/html.php:118
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:243
+#: compose.php:256
 msgid "HTML Version of Message"
-msgstr "Ù†Ø³Ø®Ù‡ HTML Ø§Ø² Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù†Ø³Ø®Ù‡Ù” HTML Ø§Ø² Ù¾ÛŒØºØ§Ù…"
 
 #: templates/message/headers.inc:58
 msgid "Headers"
@@ -1650,151 +1793,169 @@
 
 #: templates/compose/recompose.inc:5
 msgid "Here is the message you were composing:"
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù…ÛŒ Ø§Ø³Øª Ú©Ù‡ Ù†ÙˆØ´ØªÙ‡â€ŒØ§ÙŠØ¯:"
+msgstr "Ø§ÛŒÙ†Ø¬Ø§ Ù¾ÛŒØºØ§Ù…ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø´Ù…Ø§ Ù†ÙˆØ´ØªÙ‡â€ŒØ§â€ŒÛŒØ¯:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù†"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
-msgstr "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† Ø¯Ø± Ù†Ù…Ø§ÙŠØ´ Ù…ÙˆØ±Ø¯ "
+msgstr "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† Ø¯Ø± Ù†Ù…Ø§ÛŒØ´ Ø³Ù„Ø³Ù„Ù‡â€ŒØ§ÛŒÛŒ "
 
-#: mailbox.php:356
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "â€Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† ØØ°Ù Ø´Ø¯Ù‡â€ŒÙ‡Ø§"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Hide Unsubscribed"
-msgstr "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† ØºÙŠØ± Ø¹Ø¶Ùˆâ€ŒÙ‡Ø§"
-
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† ØªØµØ§ÙˆÙŠØ±"
+msgstr "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† ØºÛŒØ±Ø¹Ø¶Ùˆâ€ŒÙ‡Ø§"
 
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Ø¨Ø§Ù„Ø§"
 
-#: mailbox.php:681 message.php:289 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
-msgstr "Ø§ÙˆÙ„ÙˆÙŠØª Ø¨Ø§Ù„Ø§"
+msgstr "Ø§ÙˆÙ„ÙˆÛŒØª Ø¨Ø§Ù„Ø§"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
-msgstr "Ø¨Ø§Ù„Ø§ØªØ±ÙŠÙ†"
+msgstr "Ø¨Ø§Ù„Ø§ØªØ±ÛŒÙ†"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
-msgstr "Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù†Ù…Ø§ÙŠØ´ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§"
+msgstr "Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒÙˆØ³Øªâ€ŒÙ‡Ø§"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
-msgstr "Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù…ØªÙ…Ø§ÙŠØ² Ú©Ø±Ø¯Ù† Ø®Ø·â€ŒÙ‡Ø§ÛŒ Ù†Ù‚Ù„ Ù‚ÙˆÙ„ Ø¯Ø± ÙŠÚ© Ù¾Ø§Ø³Ø®"
+msgstr "Ú†Ú¯ÙˆÙ†Ú¯ÛŒ Ù…Ø´Ø®Øµ Ú©Ø±Ø¯Ù† Ø®Ø·Ù‡Ø§ÛŒ Ù†Ù‚Ù„ Ù‚ÙˆÙ„ Ø¯Ø± ÛŒÚ© Ù¾Ø§Ø³Ø®"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
-msgstr "IMAP (Ù¾ÙŠØ¯Ø§ Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆØªÚ©Ù„â€ŒÙ‡Ø§ Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø±)"
+msgstr "IMAP (Ù¾ÛŒØ¯Ø§ Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆØªÚ©Ù„Ù‡Ø§ Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø±)"
 
-#: lib/Fetchmail/imap.php:149 templates/login/login.inc:174
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP Ø±ÙˆÛŒ SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
-msgstr "IMAP Ø¨Ø± SSL (Ú¯ÙˆØ§Ù‡ÛŒ self-signed) "
+msgstr "IMAP Ø¨Ø± SSL (Ú¯ÙˆØ§Ù‡ÛŒ Ø®ÙˆØ¯Ø§Ù…Ø¶Ø§Ø¡) "
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
-msgstr "IMAP Ø¨Ø± SSL(Ú¯ÙˆØ§Ù‡ÛŒ self-signed) "
+msgstr "IMAP Ø¨Ø± SSL(Ú¯ÙˆØ§Ù‡ÛŒ Ø®ÙˆØ¯Ø§Ù…Ø¶Ø§Ø¡) "
+
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Ù†ÙˆØ¹ Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ø´Ø¯Ù† Ø¨Ù‡:"
 
-#: lib/Fetchmail/imap.php:143 templates/login/login.inc:173
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP ØŒÙ†Ù‡ TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
-msgstr "Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ IMAP/POP3"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø²Ù‡Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ IMAP/POP3"
 
-#: folders.php:350
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Ø¯Ø± ØµÙˆØ±Øª Ø§Ø¯Ø§Ù…Ù‡ØŒ ØªÙ…Ø§Ù…ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± Ø§ÛŒÙ† Ù¾ÙˆØ´Ù‡(Ù‡Ø§) Ø§Ø² Ø¨ÛŒÙ† Ø®ÙˆØ§Ù‡Ø¯ Ø±ÙØª!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
-msgstr "Ù†Ø§Ø¯ÙŠØ¯Ù‡ Ú¯Ø±ÙØªÙ†"
+msgstr "Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ†"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
-msgstr "Ù†Ø§Ø¯ÙŠØ¯Ù‡ Ú¯Ø±ÙØªÙ† Ù‡Ù…Ù‡"
+msgstr "Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ† Ù‡Ù…Ù‡"
+
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "ØªØµÙˆÛŒØ±"
 
 #: templates/folders/import.inc:20
 msgid "Import"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù†"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯"
 
-#: templates/pgp/import_key.inc:65 templates/smime/import_key.inc:84
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ø¬ÙØª Ú©Ù„ÙŠØ¯"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ø¬ÙØª Ú©Ù„ÛŒØ¯"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
 
 #: pgp.php:42
 msgid "Import PGP Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ PGP"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ PGP"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† ØªØµØ¯ÙŠÙ‚â€ŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú¯ÙˆØ§Ù‡ÛŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ PGP Ø´Ø®ØµÛŒ Ø®ØµÙˆØµÛŒ"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ PGP"
 
 #: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ Ø¹Ù…ÙˆÙ…ÛŒ PGP "
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ PGP "
 
 #: templates/smime/import_key.inc:4
 msgid "Import Personal S/MIME Certificates"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† ØªØµØ¯ÙŠÙ‚â€ŒÙ‡Ø§ÛŒ S/MIME Ø´Ø®ØµÛŒ"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú¯ÙˆØ§Ù‡ÛŒÙ‡Ø§ÛŒ S/MIME Ø´Ø®ØµÛŒ"
 
-#: templates/pgp/pgp.inc:107 templates/smime/smime.inc:79
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ"
 
 #: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP"
 
 #: templates/smime/import_key.inc:8
 msgid "Import Public S/MIME Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ S/MIME Ø¹Ù…ÙˆÙ…ÛŒ "
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ S/MIME Ø¹Ù…ÙˆÙ…ÛŒ "
 
 #: smime.php:16
 msgid "Import S/MIME Key"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ù„ÙŠØ¯ S/MIME"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ S/MIME"
 
 #: templates/folders/import.inc:9
 msgid "Import mbox File"
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ mbox"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ mbox"
 
 # 
 #: templates/folders/import.inc:16
 #, php-format
 msgid "Import mbox file %s into folder %s."
-msgstr "ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ %s mbox  Ø¨Ù‡ Ù¾ÙˆØ´Ù‡ %s"
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ %s mbox Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” %s"
 
-#: mailbox.php:689 message.php:493 templates/message/navbar_navigate.inc:7
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1802,546 +1963,620 @@
 
 #: templates/search/main.inc:47
 msgid "Important messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù…Ù‡Ù…"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù…Ù‡Ù…"
 
 # 
-#: folders.php:157
+#: folders.php:167
 #, php-format
 msgid "Imported %d messages from %s."
-msgstr "%d Ù¾ÙŠØºØ§Ù… Ø§Ø² %s ÙˆØ§Ø±Ø¯ Ø´Ø¯"
+msgstr "%d Ù¾ÛŒØºØ§Ù… Ø§Ø² %s Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ø´Ø¯"
 
-#: lib/MIME/Viewer/itip.php:758
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr "Ø¯Ø± ØØ§Ù„ Ø§Ù†Ø¬Ø§Ù…"
 
-#: lib/IMP.php:369 lib/Folder.php:248
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
 msgstr "Inbox"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
-msgstr "Ø¢ÙŠØ§ Ù¾Ø§Ø³Ø® Ø´Ø§Ù…Ù„ ÙŠÚ© Ø®Ù„Ø§ØµÙ‡ Ø§Ø² Ø³Ø±Ø¢Ù…Ø¯ Ø¨Ø§Ø´Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾Ø§Ø³Ø® Ø´Ø§Ù…Ù„ ÛŒÚ© Ø®Ù„Ø§ØµÙ‡ Ø§Ø² Ø³Ø±Ø¢Ù…Ø¯ Ø¨Ø§Ø´Ø¯ØŸ"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
-msgstr "Ø¢ÙŠØ§ Ù¾Ø§Ø³Ø® Ø´Ø§Ù…Ù„ Ù¾ÙŠØºØ§Ù… Ø§ØµÙ„ÛŒ Ø¨Ø§Ø´Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾Ø§Ø³Ø® Ø´Ø§Ù…Ù„ Ù¾ÛŒØºØ§Ù… Ø§ØµÙ„ÛŒ Ø¨Ø§Ø´Ø¯ØŸ"
 
-#: lib/MIME/Viewer/status.php:133 lib/MIME/Viewer/notification.php:64
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª"
 
 # 
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
-msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø± Ø±ÙˆÛŒ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
-msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø± Ø±ÙˆÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ"
 
-#: templates/pgp/pgp.inc:147 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
-msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ù…Ø±Ø¨ÙˆØ· Ø¨Ù‡ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø± Ø±ÙˆÛŒ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "Ø¯Ø± Ø®Ø·"
 
 #: templates/smime/import_key.inc:9
 msgid "Insert Certificate Here"
-msgstr "Ú¯ÙˆØ§Ù‡ÛŒ Ø±Ø§ Ø§ÙŠÙ†Ø¬Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ú¯ÙˆØ§Ù‡ÛŒ Ø±Ø§ Ø§ÛŒÙ†Ø¬Ø§ Ø¯Ø±Ø¬ Ú©Ù†ÛŒØ¯"
 
 #: templates/pgp/import_key.inc:15
 msgid "Insert Personal Private PGP Key Here"
-msgstr "Ú©Ù„ÙŠØ¯ PGP Ù…ØØ±Ù…Ø§Ù†Ù‡ Ø´Ø®ØµÛŒ Ø±Ø§ Ø§ÙŠÙ†Ø¬Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ù…ØØ±Ù…Ø§Ù†Ù‡Ù” Ø´Ø®ØµÛŒ PGP Ø±Ø§ Ø§ÛŒÙ†Ø¬Ø§ Ø¯Ø±Ø¬ Ú©Ù†ÛŒØ¯"
 
 #: templates/pgp/import_key.inc:10
 msgid "Insert Personal Public PGP Key Here"
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø´Ø®ØµÛŒ Ø±Ø§ Ø§ÙŠÙ†Ø¬Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ PGP Ø±Ø§ Ø§ÛŒÙ†Ø¬Ø§ Ø¯Ø±Ø¬ Ú©Ù†ÛŒØ¯"
 
 #: templates/pgp/import_key.inc:5
 msgid "Insert Public PGP Key Here"
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø±Ø§ Ø§ÙŠÙ†Ø¬Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø±Ø§ Ø§ÛŒÙ†Ø¬Ø§ Ø¯Ø±Ø¬ Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
-msgstr "Ø¹Ù…Ù„ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ø§ÙŠÙ† Ù…ÙˆÙ„ÙÙ‡ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø¹Ù…Ù„ ØºÛŒØ±Ù…Ø¹ØªØ¨Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ù…Ø¤Ù„ÙÙ‡ Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: mailbox.php:549 mailbox.php:590
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
-msgstr "Ø¢Ø¯Ø±Ø³ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø±"
+msgstr "Ø¢Ø¯Ø±Ø³ ØºÛŒØ±Ù…Ø¹ØªØ¨Ø±"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
-msgstr "ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¯ÙˆØ± ØºÙŠØ± Ù…Ø¹ØªØ¨Ø±"
+msgstr "Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø±Ø§Ù‡ Ø¯ÙˆØ± ØºÛŒØ±Ù…Ø¹ØªØ¨Ø±"
 
-#: compose.php:132
+#: compose.php:158
+#, php-format
 msgid "Invalid character in e-mail address: %s."
-msgstr "Ù†ÙˆÙŠØ³Ù‡ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø± Ø¯Ø± Ø¢Ø¯Ø±Ø³ Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ© : %s"
+msgstr "Ù†ÙˆÛŒØ³Ù‡Ù” ØºÛŒØ±Ù…Ø¹ØªØ¨Ø± Ø¯Ø± Ø¢Ø¯Ø±Ø³ Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ© : %s"
 
-#: pgp.php:16 smime.php:82
+#: smime.php:82 pgp.php:16
 msgid "Invalid key"
-msgstr "Ú©Ù„ÙŠØ¯ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø±"
+msgstr "Ú©Ù„ÛŒØ¯ ØºÛŒØ±Ù…Ø¹ØªØ¨Ø±"
 
 #: pgp.php:196
 msgid "Invalid personal PGP private key."
-msgstr "Ú©Ù„ÙŠØ¯ PGP Ù…ØØ±Ù…Ø§Ù†Ù‡ Ø´Ø®ØµÛŒ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø±"
+msgstr "Ú©Ù„ÛŒØ¯ ØºÛŒØ±Ù…Ø¹ØªØ¨Ø± Ù…ØØ±Ù…Ø§Ù†Ù‡Ù” Ø´Ø®ØµÛŒ PGP "
 
 #: pgp.php:171
 msgid "Invalid personal PGP public key."
-msgstr "Ú©Ù„ÙŠØ¯ PGP Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø±"
+msgstr "Ú©Ù„ÛŒØ¯ ØºÛŒØ±Ù…Ø¹ØªØ¨Ø± Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ PGP"
 
 #: templates/mailbox/navbar.inc:12
 msgid "Invert"
 msgstr "Ù…Ø¹Ú©ÙˆØ³"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "KB"
-msgstr "Ú©ÙŠÙ„Ùˆ Ø¨Ø§ÙŠØª"
+msgstr "Ú©ÛŒÙ„ÙˆØ¨Ø§ÛŒØª"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
-msgstr "Ø·ÙˆÙ„ Ú©Ù„ÙŠØ¯"
+msgstr "Ø·ÙˆÙ„ Ú©Ù„ÛŒØ¯"
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr "Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª. Ø§Ø±Ø³Ø§Ù„ ÙØ§ÛŒÙ„ Ø¨Ø± Ø±ÙˆÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±Ø³Ø§Ø² Ù…Ù‚Ø¯ÙˆØ± Ù†ÛŒØ³Øª"
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ù„ÛŒØ¯ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª. Ø´Ù…Ø§ Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ÛŒ Ø¨Ø±Ø§ÛŒ ØªÙ…Ø§Ø³Ù‡Ø§ÛŒ Ø®ÙˆØ¯ Ù…Ø´Ø®Øµ Ù†Ù†Ù…ÙˆØ¯Ù‡â€ŒØ§ÛŒØ¯"
 
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¨Ø·ÙˆØ± Ù…ÙˆÙÙ‚ÙŠØª Ø¢Ù…ÙŠØ² Ø¨Ù‡ Ø³Ø±ÙˆØ± Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¨Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯"
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Ø²Ø¨Ø§Ù†"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
-msgstr "ØµÙØÙ‡ Ø¢Ø®Ø± ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "ØµÙØÙ‡Ù” Ø¢Ø®Ø± Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù†"
 
-#: mailbox.php:347
+#: mailbox.php:358
 msgid "Last Page"
-msgstr "ØµÙØÙ‡ Ù‚Ø¨Ù„ÛŒ"
+msgstr "ØµÙØÙ‡Ù” Ø¢Ø®Ø±"
 
-#: templates/compose/compose.inc:380
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
-msgstr "Ù¾ÙŠÙˆÙ†Ø¯ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§"
+msgstr "Ù¾ÛŒÙˆÙ†Ø¯ Ù¾ÛŒÙˆØ³ØªÙ‡Ø§"
 
-#: attachment.php:34 lib/Compose.php:980
+#: attachment.php:34 lib/Compose.php:1063
 msgid "Linked attachments are forbidden."
-msgstr "Ù¾ÙŠÙˆÙ†Ø¯ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ø§Ø¯Ù‡ Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯"
+msgstr "Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ÛŒ Ù¾ÛŒÙˆÙ†Ø¯ÛŒ Ù…Ø¬Ø§Ø² Ù†ÛŒØ³Øª"
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Ù¾ÛŒÙˆÙ†Ø¯Ù‡Ø§ Ø¨Ø± Ø±ÙˆÛŒ %s Ù…Ù†Ù‚Ø¶ÛŒ Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯."
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
-"Ø¢ÙŠØ§ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ ØµÙØÙ‡ Ø§Ø±ØªØ¨Ø§Ø·â€ŒÙ‡Ø§ Ø¨Ø§Ø±Ù…ÛŒâ€ŒØ´ÙˆØ¯Ø¡ ØªÙ…Ø§Ù…ÛŒ ØªÙ…Ø§Ø³â€ŒÙ‡Ø§ ÙÙ‡Ø±Ø³Øª Ø´ÙˆÙ†Ø¯ØŸ (Ø¯Ø± ØºÙŠØ± "
-"Ø§ÙŠÙ†ØµÙˆØ±Øª ØªÙ†Ù‡Ø§ Ø´Ù…Ø§ ØªÙ…Ø§Ø³â€ŒÙ‡Ø§ÙŠÛŒ Ø±Ø§ Ù…ÛŒâ€ŒØ¨ÙŠÙ†ÙŠØ¯ Ú©Ù‡ Ø¨Ø·ÙˆØ± ØµØ±ÙŠØ Ø¬Ø³ØªØ¬Ùˆ Ú©Ù†ÙŠØ¯)"
+"Ø¢ÛŒØ§ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ ØµÙØÙ‡Ù” ØªÙ…Ø§Ø³Ù‡Ø§ Ø¨Ø§Ø± Ù…ÛŒâ€ŒØ´ÙˆØ¯ ØªÙ…Ø§Ù…ÛŒ ØªÙ…Ø§Ø³Ù‡Ø§ ÙÙ‡Ø±Ø³Øª Ø´ÙˆÙ†Ø¯ØŸ (Ø¯Ø± ØºÛŒØ± Ø§ÛŒÙ†ØµÙˆØ±Øª "
+"ØªÙ†Ù‡Ø§ Ø´Ù…Ø§ ØªÙ…Ø§Ø³Ù‡Ø§ÛŒÛŒ Ø±Ø§ Ù…ÛŒâ€ŒØ¨ÛŒÙ†ÛŒØ¯ Ú©Ù‡ Ø¨Ø·ÙˆØ± ØµØ±ÛŒØ Ø¬Ø³ØªØ¬Ùˆ Ú©Ù†ÛŒØ¯)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "ÙÙ‡Ø±Ø³Øª Ø´Ø¯Ù† Ø¯Ø± Ø³Ø±Ø¢Ù…Ø¯"
 
 #: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
-msgstr "ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù…ØÙ„ÛŒ:"
+msgstr "Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ù…ØÙ„ÛŒ:"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
-msgstr "Ù…ÙˆÙ‚Ø¹ÙŠØª"
+msgstr "Ù…ÙˆÙ‚Ø¹ÛŒØª"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "ÙˆØ±ÙˆØ¯"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "ÙˆØ±ÙˆØ¯ Ø¨Ù‡ %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "ÙˆØ±ÙˆØ¯"
 
 #: config/prefs.php.dist:39
 msgid "Login Tasks"
-msgstr "ÙˆØ¸Ø§ÙŠÙ Ø²Ù…Ø§Ù† ÙˆØ±ÙˆØ¯"
+msgstr "ÙˆØ¸Ø§ÛŒÙ ÙˆØ±ÙˆØ¯"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
-msgstr "Ù¾Ø§ÙŠÙŠÙ†"
+msgstr "Ù¾Ø§ÛŒÛŒÙ†"
 
-#: mailbox.php:684 message.php:291 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
-msgstr "Ø§ÙˆÙ„ÙˆÙŠØª Ù¾Ø§ÙŠÙŠÙ†"
+msgstr "Ø§ÙˆÙ„ÙˆÛŒØª Ù¾Ø§ÛŒÛŒÙ†"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
-msgstr "Ù¾Ø§ÙŠÙŠÙ†â€ŒØªØ±â€ŒÙŠÙ†"
+msgstr "Ù¾Ø§ÛŒÛŒÙ†â€ŒØªØ±â€ŒÛŒÙ†"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Macintosh "
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
-msgstr "Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
-msgstr "Ù¾ÙŠØ´ Ù†Ù…Ø§ÙŠØ´â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´Ù‡Ø§ÛŒ Ù†Ø§Ù…Ù‡"
 
 #: templates/fetchmail/driver_select.inc:16
 msgid "Mail server type to connect to:"
-msgstr "Ù†ÙˆØ¹ Ø³Ø±ÙˆØ± Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ø´Ø¯Ù† Ø¨Ù‡:"
+msgstr "Ù†ÙˆØ¹ Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø¨Ø±Ø§ÛŒ Ù…ØªØµÙ„ Ø´Ø¯Ù† Ø¨Ù‡:"
 
-#: folders.php:368
+#: folders.php:402
 msgid "Mailbox"
-msgstr "ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù†"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ù…Ø§ÙŠØ´ ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ùˆ Ù¾ÙˆØ´Ù‡"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ùˆ Ù¾ÙˆØ´Ù‡"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
-msgstr "ØªØºÙŠÙŠØ± Ø¹Ù„Ø§Ù…Øª ØªÙ…Ø§Ù… Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡Ø¡ Ø¨Ù‡ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ ØªÙ…Ø§Ù… Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´Ø¯Ù‡"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
-msgstr "ØªØºÙŠÙŠØ± Ø¹Ù„Ø§Ù…Øª ØªÙ…Ø§Ù… Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡Ø¡ Ø¨Ù‡ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
+msgstr "Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ ØªÙ…Ø§Ù… Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
 
 #: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ø¹Ù†ÙˆØ§Ù†:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
-msgstr "Ø¢ÙŠØ§ Ø³Ø·ÙˆØ Ù…Ø®ØªÙ„Ù Ù†Ù‚Ù„ Ù‚ÙˆÙ„â€ŒÙ‡Ø§ØŒ Ø¨Ø§ Ø±Ù†Ú¯Ù‡Ø§ÛŒ Ù…Ø®ØªÙ„Ù Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø³Ø·ÙˆØ Ù…Ø®ØªÙ„Ù Ù†Ù‚Ù„ Ù‚ÙˆÙ„Ù‡Ø§ØŒ Ø¨Ø§ Ø±Ù†Ú¯Ù‡Ø§ÛŒ Ù…Ø®ØªÙ„Ù Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø´ÙˆØ¯ØŸ"
 
 #: templates/fetchmail/manage.inc:40
 msgid "Mark messages as seen? (IMAP only)"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´Ø¯Ù‡ Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø´ÙˆÙ†Ø¯ØŸ (ÙÙ‚Ø· IMAP)"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´Ø¯Ù‡ Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø´ÙˆÙ†Ø¯ØŸ (ÙÙ‚Ø· IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
-msgstr "Ø¹Ù„Ø§Ø¦Ù… Ø³Ø§Ø¯Ù‡ Ù†Ø´Ø§Ù†Ù‡â€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¹Ù„Ø§Ø¦Ù… Ø³Ø§Ø¯Ù‡ Ø¹Ù„Ø§Ù…Øª â€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø´ÙˆÙ†Ø¯ØŸ"
 
 #: templates/search/header.inc:46
 msgid "Match All Queries"
-msgstr "ØªØ·Ø¨ÙŠÙ‚ ØªÙ…Ø§Ù…ÛŒ Ù¾Ø±Ø³ Ùˆ Ø¬ÙˆÙ‡Ø§"
+msgstr "ØªØ·Ø¨ÛŒÙ‚ ØªÙ…Ø§Ù…ÛŒ Ù¾Ø±Ø³â€ŒÙˆØ¬ÙˆÙ‡Ø§"
 
 #: templates/search/header.inc:42
 msgid "Match Any Query"
-msgstr "ØªØ·Ø¨ÙŠÙ‚ Ù‡Ø± Ù¾Ø±Ø³ Ùˆ Ø¬Ùˆ"
+msgstr "ØªØ·Ø¨ÛŒÙ‚ Ù‡Ø± Ù¾Ø±Ø³â€ŒÙˆØ¬Ùˆ"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
-msgstr "Ø¨ÙŠØ´ØªØ±ÙŠÙ† Ø§Ù†Ø¯Ø§Ø²Ù‡ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§"
+msgstr "Ø¨ÛŒØ´ÛŒÙ†Ù‡Ù” Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Ù¾ÛŒÙˆØ³Øª"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Ø¨ÛŒØ´ÛŒÙ†Ù‡Ù” ØªØ¹Ø¯Ø§Ø¯ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
+
+#: templates/compose/compose.inc:494
 msgid "Maximum number of attachments reached."
-msgstr "Ø¨ÙŠØ´ØªØ±ÙŠÙ† ØªØ¹Ø¯Ø§Ø¯ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ÛŒ Ø±Ø³ÙŠØ¯Ù‡"
+msgstr "Ø±Ø³ÛŒØ¯Ù† Ø¨Ù‡ Ø¨ÛŒØ´ÛŒÙ†Ù‡Ù” ØªØ¹Ø¯Ø§Ø¯ Ù¾ÛŒÙˆØ³ØªÙ‡Ø§"
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:489
 msgid "Maximum total attachment size reached."
-msgstr "Ø¨ÙŠØ´ØªØ±ÙŠÙ† Ù…Ø¬Ù…ÙˆØ¹ Ø§Ù†Ø¯Ø§Ø²Ù‡ Ø¶Ù…ÙŠÙ…Ù‡ Ø±Ø³ÙŠØ¯Ù‡"
+msgstr "Ø±Ø³ÛŒØ¯Ù† Ø¨Ù‡ Ø¨ÛŒØ´ÛŒÙ†Ù‡Ù” Ù…Ø¬Ù…ÙˆØ¹ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Ù¾ÛŒÙˆØ³Øª"
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
-msgstr "Ù…Ù†ØªÙÛŒ Ø´Ø¯Ù† Ù‚Ø±Ø§Ø± Ù…Ù„Ø§Ù‚Ø§Øª"
+msgstr "Ù„ØºÙˆ Ø´Ø¯Ù† Ù…Ù„Ø§Ù‚Ø§Øª"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
 msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ù…Ù„Ø§Ù‚Ø§Øª"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
-msgstr "Ø·Ø±Ø Ù¾ÙŠØ´Ù†Ù‡Ø§Ø¯ÛŒ Ù…Ù„Ø§Ù‚Ø§Øª"
+msgstr "Ø·Ø±Ø Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ÛŒ Ù…Ù„Ø§Ù‚Ø§Øª"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Ù¾Ø§Ø³Ø® Ù…Ù„Ø§Ù‚Ø§Øª"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
-msgstr "Ø¨Ù‡ Ø±ÙˆØ²Ú©Ø±Ø¯Ù† Ù…Ù„Ø§Ù‚Ø§Øª"
+msgstr "Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù…Ù„Ø§Ù‚Ø§Øª"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
-msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ù‡ Ø±ÙˆØ²Ú©Ø±Ø¯Ù† Ù…Ù„Ø§Ù‚Ø§Øª"
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ù…Ù„Ø§Ù‚Ø§Øª"
 
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
-msgstr "Ù…Ù†Ùˆ ÙÙ‡Ø±Ø³Øª Ù¾ÙˆØ´Ù‡"
+msgstr "Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† ÙÙ‡Ø±Ø³Øª Ù¾ÙˆØ´Ù‡"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:331
 msgid "Message"
-msgstr "Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù¾ÛŒØºØ§Ù…"
 
-#: compose.php:508 compose.php:535 compose.php:568 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
-msgstr "Ø§ÙŠØØ§Ø¯ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù…"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:917
 msgid "Message Date"
-msgstr "ØªØ§Ø±ÙŠØ® Ù¾ÙŠØºØ§Ù…"
+msgstr "ØªØ§Ø±ÛŒØ® Ù¾ÛŒØºØ§Ù…"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù…"
 
-#: search.php:354
+#: search.php:312
 msgid "Message Search"
-msgstr "Ø¬Ø³ØªØ¬ÙˆÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø¬Ø³ØªØ¬ÙˆÛŒ Ù¾ÛŒØºØ§Ù…"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:921
 msgid "Message Size"
-msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
 
-#: message.php:376
+#: message.php:384
 msgid "Message Source"
-msgstr "Ù…ØªÙ† Ø§ØµÙ„ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø³Ø±Ú†Ø´Ù…Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
-msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù¾ÙŠØºØ§Ù…"
-
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "ÙÙŠÙ„Ø¯Ù‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
 
 #: templates/search/main.inc:6
 msgid "Message flags"
-msgstr "Ø§Ù†ÙˆØ§Ø¹ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù¾Ø±Ú†Ù…Ù‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù…"
 
 #: templates/search/main.inc:83
 msgid "Message folders"
-msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù…"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:329
 #, php-format
 msgid "Message from %s"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø§Ø² %s"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø§Ø² %s"
+
+#: mailbox.php:667
+msgid "Message has attachments"
+msgstr " Ù¾ÛŒØºØ§Ù… Ø¯Ø§Ø±Ø§ÛŒ Ù¾ÛŒÙˆØ³Øª Ø§Ø³Øª"
+
+#: mailbox.php:658
+msgid "Message is encrypted"
+msgstr " Ù¾ÛŒØºØ§Ù… Ø±Ù…Ø² Ø¨Ù†Ø¯ÛŒ Ù…ÛŒâ€ŒØ´ÙˆØ¯"
+
+#: mailbox.php:653
+msgid "Message is signed"
+msgstr " Ù¾ÛŒØºØ§Ù… Ø§Ù…Ø¶Ø§Ø¡ Ù…ÛŒâ€ŒØ´ÙˆØ¯"
 
 #: templates/search/header.inc:33
 msgid "Message matches"
-msgstr "ØªØ·Ø¨ÙŠÙ‚â€ŒÙ‡Ø§ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "ØªØ·Ø¨ÛŒÙ‚Ù‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù…"
 
-#: compose.php:750 compose.php:760
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù‡ Ø´Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ± Ø¯Ø§Ø¯Ù‡ Ø´Ø¯"
 
 # 
-#: compose.php:993
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯ØŒ Ø§Ù…Ø§ Ø¯Ø± %s Ø°Ø®ÙŠØ±Ù‡ Ù†Ø´Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯ØŒ Ø§Ù…Ø§ Ø¯Ø± %s ØÙØ¸ Ù†Ø´Ø¯"
 
-#: compose.php:1052 compose.php:1067
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯"
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
-msgstr "ØªØ¹Ø¯Ø§Ø¯ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ù‡Ø± ØµÙØÙ‡ Ù†Ù…Ø§ÙŠØ´ ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "ØªØ¹Ø¯Ø§Ø¯ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± Ù‡Ø± ØµÙØÙ‡ Ù†Ù…Ø§ÛŒØ´ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù†"
 
-#: mailbox.php:311
+#: mailbox.php:322
 msgid "Messages to"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¨Ù‡"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¨Ù‡"
 
 #: templates/acl/acl.inc:29
 msgid "Modify"
-msgstr "ØªØºÙŠÙŠØ±"
+msgstr "ØªØºÛŒÛŒØ±"
 
 # 
 #: templates/compose/expand.inc:12
-#, php-format
-msgid "More than one address found for field '%s'."
-msgstr "Ø¨Ø±Ø§ÛŒ ÙÙŠÙ„Ø¯ '%s' Ø¨ÙŠØ´ Ø§Ø² ÙŠÚ© Ø¢Ø¯Ø±Ø³ Ù¾ÙŠØ¯Ø§ Ø´Ø¯"
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "Ø¨Ø±Ø§ÛŒ ÙÛŒÙ„Ø¯ '%s' Ø¨ÛŒØ´ Ø§Ø² ÛŒÚ© Ø¢Ø¯Ø±Ø³ Ù¾ÛŒØ¯Ø§ Ø´Ø¯"
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
-msgstr "Ø¬Ø§Ø¨Ø¬Ø§Ø¦ÛŒ"
+msgstr "Ø§Ù†ØªÙ‚Ø§Ù„"
 
 #: templates/prefs/sourceselect.inc:316
 msgid "Move down"
-msgstr "Ø¬Ø§Ø¨Ø¬Ø§ÙŠÛŒ Ø¨Ù‡ Ù¾Ø§ÙŠÙŠÙ†"
+msgstr "Ø§Ù†ØªÙ‚Ø§Ù„ Ø¨Ù‡ Ù¾Ø§ÛŒÛŒÙ†"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "Ø§Ù†ØªÙ‚Ø§Ù„ Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ùˆ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø¨Ù‡ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø±Ø¨ÙˆØ·Ù‡"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
-msgstr "Ø¬Ø§Ø¨Ø¬Ø§ÙŠÛŒ Ø¨Ù‡ Ù¾ÙˆØ´Ù‡"
+msgstr "Ø§Ù†ØªÙ‚Ø§Ù„ Ø¨Ù‡ Ù¾ÙˆØ´Ù‡"
 
 #: templates/prefs/sourceselect.inc:314
 msgid "Move up"
-msgstr "Ø¬Ø§Ø¨Ø¬Ø§ÙŠÛŒ Ø¨Ù‡ Ø¨Ø§Ù„Ø§"
+msgstr "Ø§Ù†ØªÙ‚Ø§Ù„ Ø¨Ù‡ Ø¨Ø§Ù„Ø§"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
-msgstr "Ú†Ù†Ø¯ Ø¨Ø®Ø´ÛŒ/Ø¬Ø§ÙŠÚ¯Ø²ÙŠÙ†"
+msgstr "Ú†Ù†Ø¯ Ø¨Ø®Ø´ÛŒ/Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†"
+
+#: thread.php:76 thread.php:152
+msgid "Multiple Message View"
+msgstr "Ù†Ù…Ø§ÛŒ Ú†Ù†Ø¯Ú¯Ø§Ù†Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "ØªÙˆØ¬Ù‡"
 
-#: templates/pgp/pgp.inc:24 templates/fetchmail/manage.inc:48
-#: templates/smime/smime.inc:24
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "ØªÙˆØ¬Ù‡"
 
-#: lib/MIME/Viewer/itip.php:673 templates/contacts/contacts.inc:239
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Ù†Ø§Ù…"
 
 #: pgp.php:110
 msgid "Name and/or email can not be empty"
-msgstr "Ù†Ø§Ù… Ùˆ/ÙŠØ§ Ø¢Ø¯Ø±Ø³ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯"
+msgstr "Ù†Ø§Ù… Ùˆ/ÛŒØ§ Ø¢Ø¯Ø±Ø³ Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯"
 
-#: lib/MIME/Viewer/itip.php:763
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
-msgstr "Ù†ÙŠØ§Ø² Ø¨Ù‡ ÙØ¹Ø§Ù„ÙŠØª"
+msgstr "Ù†ÛŒØ§Ø² Ø¨Ù‡ ÙØ¹Ø§Ù„ÛŒØª"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Ù‡Ø±Ú¯Ø²"
 
 # 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
-msgstr "Ù‡Ø±Ú¯Ø² Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ Ø°Ø®ÙŠØ±Ù‡ Ù†Ø´ÙˆÙ†Ø¯"
+msgstr "Ù‡Ø±Ú¯Ø² Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ ØÙØ¸ Ù†Ø´ÙˆÙ†Ø¯"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
-msgstr "Ø¬Ø¯ÙŠØ¯"
+msgstr "Ø¬Ø¯ÛŒØ¯"
 
-#: lib/IMP.php:579
+#: lib/IMP.php:563
 msgid "New Folder"
-msgstr "Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ø¬Ø¯ÛŒØ¯"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
-msgstr "Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¬Ø¯ÙŠØ¯"
+msgstr "Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ø¯ÛŒ"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯"
 
 #: templates/search/main.inc:19
 msgid "New messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Ø¨Ø¹Ø¯ÛŒ"
 
 #: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ø¯ÛŒ"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ø¯ÛŒ"
 
-#: mailbox.php:345
+#: mailbox.php:356
 msgid "Next Page"
-msgstr "ØµÙØÙ‡ Ø¨Ø¹Ø¯ÛŒ"
+msgstr "ØµÙØÙ‡Ù” Ø¨Ø¹Ø¯ÛŒ"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
-msgstr "Ø®ÙŠØ±"
+msgstr "Ø®ÛŒØ±"
 
 #: smime.php:226
 msgid "No Certificate found"
-msgstr "Ú¯ÙˆØ§Ù‡ÛŒâ€ŒØ§ÙŠÛŒ Ù¾ÙŠØ¯Ø§ Ù†Ø´Ø¯"
+msgstr "Ú¯ÙˆØ§Ù‡ÛŒâ€ŒØ§â€ŒÛŒÛŒ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
 
 #: templates/compose/encrypt_list.inc:5
 msgid "No Encryption"
-msgstr "Ø±Ù…Ø²Ù†Ú¯Ø§Ø±â€ŒÛŒâ€ŒØ§ÙŠÙŠ Ù†ÙŠØ³Øª"
+msgstr "Ø¨Ø¯ÙˆÙ† Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
-msgstr "Ù‡ÙŠÚ† Ú©Ù„ÙŠØ¯ÛŒ Ø¯Ø± ØÙ„Ù‚Ù‡ Ú©Ù„ÙŠØ¯ Ù†ÙŠØ³Øª"
+msgstr "Ù‡ÛŒÚ† Ú©Ù„ÛŒØ¯ÛŒ Ø¯Ø± ØÙ„Ù‚Ù‡Ù” Ú©Ù„ÛŒØ¯ Ù†ÛŒØ³Øª"
 
-#: mailbox.php:364
+#: mailbox.php:375
 #, php-format
 msgid "No Messages"
-msgstr "Ù¾ÙŠØºØ§Ù…ÛŒ Ù†ÙŠØ³Øª"
+msgstr "Ù¾ÛŒØºØ§Ù…ÛŒ Ù†ÛŒØ³Øª"
 
 #: pgp.php:137
 msgid "No PGP public key imported."
-msgstr "Ù‡ÙŠÚ† Ú©Ù„ÙŠØ¯ PGP Ø¹Ù…ÙˆÙ…ÛŒ ÙˆØ§Ø±Ø¯ Ù†Ø´Ø¯"
+msgstr "Ù‡ÛŒÚ† Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù†Ø´Ø¯Ù‡"
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
-msgstr "Ù‡ÙŠÚ† ØªØµØ¯ÙŠÙ‚ Ø´Ø®ØµÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+msgstr "Ù‡ÛŒÚ† Ú¯ÙˆØ§Ù‡ÛŒ Ø´Ø®ØµÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:329
+msgid "No Preview Text"
+msgstr "Ø¨Ø¯ÙˆÙ† Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´ Ù…ØªÙ†"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒâ€ŒØ§ÙŠÙŠ Ù¾ÙŠØ¯Ø§ Ù†Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒâ€ŒØ§â€ŒÛŒÛŒ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
 
 #: smime.php:151
 msgid "No S/MIME public key imported."
-msgstr "Ù‡ÙŠÚ† Ú©Ù„ÙŠØ¯ S/MIME Ø¹Ù…ÙˆÙ…ÛŒ ÙˆØ§Ø±Ø¯ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù‡ÛŒÚ† Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù†Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
-msgstr "Ù‡ÙŠÚ† Ø¶Ù…ÙŠÙ…Ù‡â€ŒØ§ÛŒ Ù¾ÙŠØ¯Ø§ Ù†Ø´Ø¯"
+msgstr "Ù‡ÛŒÚ† Ù¾ÛŒÙˆØ³ØªÛŒ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
+
+# 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø± Ø±ÙˆÛŒ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
 
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
-msgstr "Ù‡ÙŠÚ† Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´Ø¯Ù‡"
+msgstr "Ù‡ÛŒÚ† Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´Ø¯"
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
-msgstr "Ù‡ÙŠÚ† Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¬Ø¯ÙŠØ¯ Ø¬Ø³ØªØ¬Ùˆ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù‡ÛŒÚ† Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯ Ø¬Ø³ØªØ¬Ùˆ Ù†Ø´Ø¯"
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
-msgstr "Ù‡ÙŠÚ† Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡"
+msgstr "Ù‡ÛŒÚ† Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ù…Ø´Ø®Øµ Ù†Ø´Ø¯"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
-msgstr "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¨Ø§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø¬Ø¯ÙŠØ¯ Ù†ÙŠØ³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¨Ø§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯ Ù†ÛŒØ³Øª"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
-msgstr "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¨Ø§ Ù¾ÙŠØºØ§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ù†ÙŠØ³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒØ§ÛŒ Ø¨Ø§ Ù¾ÛŒØºØ§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ù†ÛŒØ³Øª"
 
-#: lib/Compose.php:231
+#: lib/Compose.php:325
 msgid "No message body text"
-msgstr "Ù…ØªÙ†ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾ÙŠØºØ§Ù… Ù†ÙŠØ³Øª"
+msgstr "Ù…ØªÙ† Ø¨Ø¯Ù†Ù‡Ù” Ù¾ÛŒØºØ§Ù… Ù†ÛŒØ³Øª"
 
-#: lib/Mailbox.php:1157
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
-msgstr "Ù‡ÙŠÚ† Ù¾ÙŠØºØ§Ù…ÛŒ Ø¨Ø§ Ø¬Ø³ØªØ¬ÙˆÛŒ Ø´Ù…Ø§ Ù…Ù†Ø·Ø¨Ù‚ Ù†ÙŠØ³Øª"
+msgstr "Ù‡ÛŒÚ† Ù¾ÛŒØºØ§Ù…ÛŒ Ø¨Ø§ Ø¬Ø³ØªØ¬ÙˆÛŒ Ø´Ù…Ø§ ØªØ·Ø§Ø¨Ù‚ Ù†Ø¯Ø§Ø±Ø¯"
 
 #: pgp.php:189
 msgid "No personal PGP private key imported."
-msgstr "Ù‡ÙŠÚ† Ú©Ù„ÙŠØ¯ PGP Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒâ€ŒØ§ÛŒ ÙˆØ§Ø±Ø¯ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù‡ÛŒÚ† Ú©Ù„ÛŒØ¯ PGP Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒâ€ŒØ§ÛŒ Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù†Ø´Ø¯Ù‡"
 
 #: pgp.php:165
 msgid "No personal PGP public key imported."
-msgstr "Ù‡ÙŠÚ† Ú©Ù„ÙŠØ¯ PGP Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ ÙˆØ§Ø±Ø¯ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù‡ÛŒÚ† Ú©Ù„ÛŒØ¯ PGP Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù†Ø´Ø¯Ù‡"
 
 #: smime.php:201
 msgid "No personal S/MIME certificates imported."
-msgstr "Ù‡ÙŠÚ† Ú¯ÙˆØ§Ù‡ÛŒ S/MIME Ø´Ø®ØµÛŒ ÙˆØ§Ø±Ø¯ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù‡ÛŒÚ† Ú¯ÙˆØ§Ù‡ÛŒ S/MIME Ø´Ø®ØµÛŒ Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù†Ø´Ø¯Ù‡"
 
 #: spelling.php:220
 msgid "No spellchecking program configured."
-msgstr "Ù‡ÙŠÚ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø®Ø·Ø§ÙŠØ§Ø¨ Ø§Ù…Ù„Ø§ÙŠÛŒ Ù¾ÙŠÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù‡ÛŒÚ† Ø¨Ø±Ù†Ø§Ù…Ù‡Ù” Ø®Ø·Ø§ÛŒØ§Ø¨ Ø§Ù…Ù„Ø§ÛŒÛŒ Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ Ù†Ø´Ø¯Ù‡"
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
-msgstr "Ù‡ÙŠÚ† Ø®Ø·Ø§ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+msgstr "Ù‡ÛŒÚ† Ø®Ø·Ø§ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
-msgstr "Ù¾ÙŠØ´Ù†Ù‡Ø§Ø¯ÛŒ Ù†ÙŠØ³Øª"
+msgstr "Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ÛŒ Ù†ÛŒØ³Øª"
+
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
 
 #: acl.php:68 acl.php:94
 msgid "No user specified."
-msgstr "Ù‡ÙŠÚ† Ú©Ø§Ø±Ø¨Ø±ÛŒ Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡"
+msgstr "Ù‡ÛŒÚ† Ú©Ø§Ø±Ø¨Ø±ÛŒ Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/itip.php:694
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr "Ø¨Ø¯ÙˆÙ† Ø´Ø±Ú©Øª Ú©Ù†Ù†Ø¯Ù‡"
 
-#: lib/MIME/Viewer/itip.php:651 templates/prefs/sourceselect.inc:35
-#: templates/prefs/sentmailselect.inc:41 templates/mailbox/navbar.inc:11
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
-msgstr "Ù‡ÙŠÚ†Ú©Ø¯Ø§Ù…"
+msgstr "Ù‡ÛŒÚ†Ú©Ø¯Ø§Ù…"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Ø¹Ø§Ø¯ÛŒ"
 
@@ -2352,213 +2587,213 @@
 #: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
 #: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
-msgstr "ØºÙŠØ± Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³"
+msgstr "ØºÛŒØ± Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³"
 
 #: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
 #: templates/mailbox/navbar.inc:34
 msgid "Not Important"
-msgstr "ØºÙŠØ± Ù…Ù‡Ù…"
+msgstr "ØºÛŒØ± Ù…Ù‡Ù…"
 
 #: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
-msgstr "ØºÙŠØ± Ø´Ø®ØµÛŒ"
+msgstr "ØºÛŒØ± Ø´Ø®ØµÛŒ"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
-#: lib/Crypt/SMIME.php:166
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ù†Ø§Ù…Ø¹ØªØ¨Ø±"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ù†Ø§Ù…Ø¹ØªØ¨Ø±"
 
 #: templates/search/main.inc:67
 msgid "Not deleted messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ ØØ°Ù Ù†Ø´Ø¯Ù‡"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ ØØ°Ù Ù†Ø´Ø¯Ù‡"
 
 #: templates/search/main.inc:51
 msgid "Not important messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ ØºÙŠØ± Ù…Ù‡Ù…"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ ØºÛŒØ± Ù…Ù‡Ù…"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
-msgstr "ØªÙˆØ¬Ù‡ Ú©Ù†ÙŠØ¯ Ú©Ù‡ Ø§ÙŠÙ† Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø²Ù…Ø§Ù† Ø¨Ø¨Ø±Ø¯"
+msgstr "ØªÙˆØ¬Ù‡ Ú©Ù†ÛŒØ¯ Ú©Ù‡ Ø§ÛŒÙ† Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø²Ù…Ø§Ù† Ø¨Ø¨Ø±Ø¯"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr "Ù‡ÛŒÚ† Ú†ÛŒØ²"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
-msgstr ""
-"ØªØ¹Ø¯Ø§Ø¯ Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒØŒ Ø§Ú¯Ø± Ø¢Ù†Ù‡Ø§ Ù…Ø§Ù‡ÙŠØ§Ù†Ù‡ ØØ°Ù Ø´ÙˆÙ†Ø¯"
+msgstr "ØªØ¹Ø¯Ø§Ø¯ Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¯ÛŒÙ…ÛŒØŒ Ø§Ú¯Ø± Ø¢Ù†Ù‡Ø§ Ù…Ø§Ù‡ÛŒØ§Ù†Ù‡ ØØ°Ù Ø´ÙˆÙ†Ø¯"
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
-"ØªØ¹Ø¯Ø§Ø¯ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ú¯Ù‡Ø¯Ø§Ø´ØªÙ†ØŒ Ø§Ú¯Ø± Ø¢Ù†Ù‡Ø§ Ù…Ø§Ù‡ÙŠØ§Ù†Ù‡ ØØ°Ù Ø´ÙˆØ¯"
+"ØªØ¹Ø¯Ø§Ø¯ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ÛŒ Ù‚Ø¯ÛŒÙ…ÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒØŒ Ø§Ú¯Ø± Ø¢Ù†Ù‡Ø§ Ù…Ø§Ù‡ÛŒØ§Ù†Ù‡ ØØ°Ù Ø´ÙˆØ¯"
 
-#: lib/MIME/Viewer/itip.php:509 lib/MIME/Viewer/itip.php:718
-#: templates/contacts/contacts.inc:252
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
-msgstr "ØµØÙŠØ Ø§Ø³Øª"
+msgstr "ØµØÛŒØ Ø§Ø³Øª"
 
-#: templates/pgp/import_key.inc:48 templates/smime/import_key.inc:47
-#: templates/search/fields.inc:5
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
 msgid "OR"
-msgstr "ÙŠØ§"
+msgstr "ÛŒØ§"
 
 #: templates/search/main.inc:15
 msgid "Old messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒ"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù‚Ø¯ÛŒÙ…ÛŒ"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
-msgstr "Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø®Ø§Ù„ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø®Ø§Ù„ÛŒ Ø´Ø¯"
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
 msgid "Only display folders with unread messages in them?"
-msgstr "Ø¢ÙŠØ§ ØªÙ†Ù‡Ø§ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÙŠÛŒ Ú©Ù‡ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ø¯Ø§Ø±Ù†Ø¯Ø¡ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ ØªÙ†Ù‡Ø§ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ø¯Ø§Ø±Ù†Ø¯ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
-msgstr "Ø¨Ø±Ø§ÛŒ Ø§ÙŠÙ† Ø¹Ù…Ù„ ØªÙ†Ù‡Ø§ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø¨Ø§ÙŠØ¯ Ø§Ù†ØªØ®Ø§Ø¨ Ø´ÙˆØ¯"
+msgstr "Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ø¹Ù…Ù„ ØªÙ†Ù‡Ø§ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¨Ø§ÛŒØ¯ Ø§Ù†ØªØ®Ø§Ø¨ Ø´ÙˆØ¯"
 
-#: templates/menu.inc:24 templates/menu.inc:25
-msgid "Ope_n Folder"
-msgstr "Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡"
-
-#: templates/menu.inc:16 templates/menu.inc:18
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡"
 
-#: folders.php:385
+#: folders.php:427
 msgid "Opened Folder"
-msgstr "Ù¾ÙˆØ´Ù‡ Ø¨Ø§Ø² Ø´Ø¯Ù‡"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ø¨Ø§Ø² Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
-msgstr "Ø´Ø±ÙŠÚ© Ø§Ù†ØªØ®Ø§Ø¨ÛŒ"
+msgstr "Ø´Ø±ÛŒÚ© Ø§Ù†ØªØ®Ø§Ø¨ÛŒ"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
-msgstr "Ø¨Ù‚ÙŠÙ‡ ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ù¾Ø³ØªÛŒ"
+msgstr "Ø¨Ù‚ÛŒÙ‡ ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ù¾Ø³ØªÛŒ"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¯ÙŠÚ¯Ø±"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø±"
 
-#: lib/MIME/Viewer/pgp.php:170 lib/MIME/Viewer/pgp.php:210
-#: lib/MIME/Viewer/pgp.php:296 templates/pgp/passphrase.inc:16
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
 #: templates/compose/encrypt_list.inc:7
 msgid "PGP Encrypt Message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ø´Ø¯Ù‡ PGP"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡Ù” PGP"
 
-#: compose.php:343
+#: compose.php:358
 msgid "PGP Error: "
 msgstr "Ø®Ø·Ø§ÛŒ PGP: "
 
-#: compose.php:322
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
-msgstr "Ø®Ø·Ø§ÛŒ PGP: Need passphrase for personal private key."
-
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª"
+msgstr "Ø®Ø·Ø§ÛŒ PGP: Ø¨Ù‡ Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø¨Ø±Ø§ÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ Ù†ÛŒØ§Ø² Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯"
 
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ PGP"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ PGP"
 
 #: pgp.php:30
 msgid "PGP Passphrase Input"
-msgstr "ÙˆØ§Ø±Ø¯Ú©Ø±Ø¯Ù† PGP Passphrase"
+msgstr "ÙˆØ§Ø±Ø¯Ú©Ø±Ø¯Ù† Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø±PGP "
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ø¬ÙØª Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ PGP Ø¨Ù‡ ÙŠÚ© Ø§ØªØµØ§Ù„ Ø§Ù…Ù† web Ù†ÙŠØ§Ø² Ø¯Ø§Ø±Ø¯"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ø¬ÙØª Ú©Ù„ÛŒØ¯ Ø´Ø®ØµÛŒ PGP Ø¨Ù‡ ÛŒÚ© Ø§ØªØµØ§Ù„ Ø§Ù…Ù† ÙˆØ¨ Ù†ÛŒØ§Ø² Ø¯Ø§Ø±Ø¯"
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
-msgstr "Ù…ØªÙ† Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP"
+msgstr "Ù…ØªÙ† Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP"
 
 # 
 #: pgp.php:149
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø±Ø§ÛŒ \"%s (%s)\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø±Ø§ÛŒ \"%s (%s)\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
 # 
 #: pgp.php:245
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø±Ø§ÛŒ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ØØ°Ù Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø±Ø§ÛŒ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØØ°Ù Ø´Ø¯"
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
-msgstr "ØÙ„Ù‚Ù‡ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP"
+msgstr "ØÙ„Ù‚Ù‡ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP"
 
 #: templates/compose/encrypt_list.inc:8
 msgid "PGP Sign Message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ PGP"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡Ù” PGP"
 
 #: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø§Ù…Ø¶Ø§Ø¡/Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ø´Ø¯Ù‡ PGP"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡/Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡ PGP"
 
 #: pgp.php:202
 msgid "PGP private key successfully added."
-msgstr "Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø´Ø®ØµÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
 #: pgp.php:177
 msgid "PGP public key successfully added."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ PGP Ø±ÙˆÛŒ Ø³ÙŠØ³ØªÙ… ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ PGP Ø±ÙˆÛŒ Ø§ÛŒÙ† Ø³Ø§Ù…Ø§Ù†Ù‡ ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª"
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
-"Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ PGP Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙØ¹Ø§Ù„ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ø§Ø² Ø§ÙŠÙ†Ø±Ùˆ Ø§Ù…Ø¶Ø§ÛŒ Ø¯ÙŠØ¬ÙŠØªØ§Ù„ÛŒ Ù‚Ø§Ø¨Ù„ Ø¨Ø±Ø±Ø³ÛŒ Ù†ÙŠØ³Øª"
+"Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ PGP Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙØ¹Ø§Ù„ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ø§Ø² Ø§ÛŒÙ†Ø±Ùˆ Ø§Ù…Ø¶Ø§ÛŒ Ø¯ÛŒØ¬ÛŒØªØ§Ù„ÛŒ Ù‚Ø§Ø¨Ù„ Ø¨Ø§Ø²Ø¨ÛŒÙ†ÛŒ "
+"Ù†ÛŒØ³Øª"
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
-"Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ PGP Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙØ¹Ø§Ù„ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ø§Ø² Ø§ÙŠÙ†Ø±Ùˆ Ù¾ÙŠØºØ§Ù… Ù‚Ø§Ø¨Ù„ Ø±Ù…Ø²Ú¯Ø´Ø§ÙŠÛŒ Ù†ÙŠØ³Øª "
+"Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ PGP Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙØ¹Ø§Ù„ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ø§Ø² Ø§ÛŒÙ†Ø±Ùˆ Ù¾ÛŒØºØ§Ù… Ù‚Ø§Ø¨Ù„ Ø±Ù…Ø²Ú¯Ø´Ø§ÛŒÛŒ Ù†ÛŒØ³Øª "
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
-"PGP Ø¨Ø±Ø§ÛŒ Ø¹Ù…Ù„Ú©Ø±Ø¯ ØµØÙŠØ Ø®ÙˆØ¯ Ø§Ø² Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù…ÛŒâ€ŒÚ©Ù†Ø¯. Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ¯ Ø±Ø§ "
-"Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§ÙŠÙ† Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ ØªÙ†Ø¸ÙŠÙ… Ú©Ù†ÙŠØ¯"
+"PGP Ø¨Ø±Ø§ÛŒ Ø¹Ù…Ù„Ú©Ø±Ø¯ ØµØÛŒØ Ø®ÙˆØ¯ Ø§Ø² Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù…ÛŒâ€ŒÚ©Ù†Ø¯. Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ¯ Ø±Ø§ "
+"Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§ÛŒÙ† Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
-msgstr "POP3 (ØªØ´Ø®ÙŠØµ Ø®ÙˆØ¯Ú©Ø§Ø± Ù¾Ø±ÙˆØªÚ©Ù„) "
+msgstr "POP3 (ØªØ´Ø®ÛŒØµ Ø®ÙˆØ¯Ú©Ø§Ø± Ù¾Ø±ÙˆØªÚ©Ù„Ù‡Ø§) "
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 Ø±ÙˆÛŒ SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
-msgstr "POP3 Ø±ÙˆÛŒ SSL (Ú¯ÙˆØ§Ù‡ÛŒ self-signed)"
+msgstr "POP3 Ø±ÙˆÛŒ SSL (Ú¯ÙˆØ§Ù‡ÛŒ Ø®ÙˆØ¯Ø§Ù…Ø¶Ø§Ø¡)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
-msgstr "POP3 Ø±ÙˆÛŒ SSL (self-signed)"
+msgstr "POP3 Ø±ÙˆÛŒ SSL (Ø®ÙˆØ¯Ø§Ù…Ø¶Ø§Ø¡)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3ØŒ Ù†Ù‡ TLS"
 
@@ -2566,58 +2801,58 @@
 #: templates/mailbox/header.inc:19
 #, php-format
 msgid "Page %d of %d"
-msgstr "ØµÙØÙ‡ %d Ø§Ø² %d"
+msgstr "ØµÙØÙ‡Ù” %d Ø§Ø² %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
-msgstr "ØµÙØÙ‡ Ø¨Ø§ Ø§ÙˆÙ„ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
+msgstr "ØµÙØÙ‡ Ø¨Ø§ Ø§ÙˆÙ„ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
-msgstr "ØµÙØÙ‡ Ø¨Ø§ Ø¢Ø®Ø±ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
+msgstr "ØµÙØÙ‡ Ø¨Ø§ Ø¢Ø®Ø±ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
 
 #: templates/message/headers.inc:43
 msgid "Part(s)"
-msgstr "Ø¨Ø®Ø´ (Ù‡Ø§)"
+msgstr "Ø¨Ø®Ø´(Ù‡Ø§)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
-msgstr "Passphrase"
+msgstr "Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø±"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
-msgstr ""
+msgstr "Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± (Ø¯ÙˆØ¨Ø§Ø±Ù‡)"
 
-#: pgp.php:310 smime.php:235
+#: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
-msgstr "Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ Passphrase PGP Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
+msgstr " Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
 
-#: templates/pgp/passphrase.inc:29 templates/smime/passphrase.inc:19
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
-msgstr "Passphrase:"
+msgstr "Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø±:"
 
 #: pgp.php:112
 msgid "Passphrases can not be empty"
-msgstr "Passphrase Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯"
+msgstr " Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯"
 
 #: pgp.php:114
 msgid "Passphrases do not match"
-msgstr "Passphrase Ù‡Ø§ Ù…Ù†Ø·Ø¨Ù‚ Ù†ÙŠØ³Øª"
+msgstr "Ø¹Ø¨Ø§Ø±Ø§Øª Ú¯Ø°Ø± Ù…Ù†Ø·Ø¨Ù‚ Ù†ÛŒØ³ØªÙ†Ø¯"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
-msgstr "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
+msgstr "Ø§Ø³Ù… Ø±Ù…Ø²"
 
 #: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
-msgstr "Ø¢ÙŠØ§ Ø¹Ù…Ù„ÙŠØ§Øª Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ±ÙˆØ¯ Ø§Ø¬Ø±Ø§ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¹Ù…Ù„ÛŒØ§Øª Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ±ÙˆØ¯ Ø§Ø¬Ø±Ø§ Ø´ÙˆØ¯ØŸ"
 
 #: acl.php:76 acl.php:102
 msgid "Permissions for this user can not be changed."
-msgstr "Ø§Ø¬Ø§Ø²Ù‡â€ŒÙ‡Ø§ Ø¨Ø±Ø§ÛŒ Ø§ÙŠÙ† Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† ØªØºÙŠÙŠØ± Ø¯Ø§Ø¯"
+msgstr "Ù…Ø¬ÙˆØ²Ù‡Ø§ÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† ØªØºÛŒÛŒØ± Ø¯Ø§Ø¯"
 
-#: mailbox.php:660 message.php:484 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Ø´Ø®ØµÛŒ"
@@ -2628,39 +2863,48 @@
 
 #: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
-msgstr "Ø¬ÙØª Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ØªÙˆÙ„ÙŠØ¯ Ø´Ø¯"
+msgstr "Ø¬ÙØª Ú©Ù„ÛŒØ¯ Ø´Ø®ØµÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØªÙˆÙ„ÛŒØ¯ Ø´Ø¯"
 
 #: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
-msgstr "Ú©Ù„ÙŠØ¯Ù‡Ø§ÛŒ Ø´Ø®ØµÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ØØ°Ù Ø´Ø¯Ù†Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø´Ø®ØµÛŒ PGP Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØØ°Ù Ø´Ø¯Ù†Ø¯"
 
 #: smime.php:207
 msgid "Personal S/MIME certificates NOT imported: "
-msgstr "Ú¯ÙˆØ§Ù‡ÛŒâ€ŒÙ‡Ø§ÛŒ S/MIME  Ø´Ø®ØµÛŒ ÙˆØ§Ø±Ø¯ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª:"
+msgstr "Ú¯ÙˆØ§Ù‡ÛŒÙ‡Ø§ÛŒ Ø´Ø®ØµÛŒ S/MIME Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ù†Ø´Ø¯:"
 
 #: smime.php:132
 msgid "Personal S/MIME keys deleted successfully."
-msgstr "Ú©Ù„ÙŠØ¯Ù‡Ø§ÛŒ Ø´Ø®ØµÛŒ S/MIME Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ØØ°Ù Ø´Ø¯Ù†Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯Ù‡Ø§ÛŒ Ø´Ø®ØµÛŒ S/MIME Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØØ°Ù Ø´Ø¯Ù†Ø¯"
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "Ø¢ÙŠØ§ Ù‚Ø¨Ù„ Ø§Ø² Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù† Ùˆ Ù¾ÙŠØ´Ø¨Ø±Ø¯ Ø§Ù…Ø¶Ø§ÛŒ Ø´Ù…Ø§ Ú¯Ù†Ø¬Ø§Ù†Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù‚Ø¨Ù„ Ø§Ø² Ù¾Ø§Ø³Ø® Ùˆ Ø§Ø±Ø¬Ø§Ø¹ Ø§Ù…Ø¶Ø§ÛŒ Ø´Ù…Ø§ Ú¯Ù†Ø¬Ø§Ù†Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: compose.php:241
+#: compose.php:254
 msgid "Plaintext Version of Message"
-msgstr "Ù†Ø³Ø®Ù‡ Ù…ØªÙ† Ù…Ø¹Ù…ÙˆÙ„ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù†Ø³Ø®Ù‡Ù” Ù…ØªÙ† Ù…Ø¹Ù…ÙˆÙ„ÛŒ Ù¾ÛŒØºØ§Ù…"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Ø¢ÛŒØ§ Ù¾Ø®Ø´ ØµØ¯Ø§ Ø¨Ø± Ø±ÙˆÛŒ Ù†Ø§Ù…Ù‡Ù” Ø¬Ø¯ÛŒØ¯ ØµÙˆØ±Øª Ú¯ÛŒØ±Ø¯ØŸ Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ù…Ù†Ø¸ÙˆØ± Ù…ÛŒâ€ŒØ¨Ø§ÛŒØ³Øª Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ Ø§Ø² "
+"Ø§ÛŒÙ†Ú¯ÙˆÙ†Ù‡ ÙØ§ÛŒÙ„Ù‡Ø§ÛŒ ØµÙˆØªÛŒ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ù†Ù…Ø§ÛŒØ¯."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
-msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù…ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯:"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù…ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾ÙˆØ´Ù‡Ù” Ø¬Ø¯ÛŒØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
-msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù…ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯:"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù…ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾ÙˆØ´Ù‡Ù” Ø¬Ø¯ÛŒØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
-msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù… Ø¬Ø¯ÙŠØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯:"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù… Ø¬Ø¯ÛŒØ¯ Ø±Ø§ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯:"
 
 #: templates/pgp/passphrase.inc:19
 #, php-format
@@ -2668,8 +2912,8 @@
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per %s session."
 msgstr ""
-"Ù„Ø·ÙØ§Ù‹ passphrase Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ PGP Ø®ÙˆØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯. Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÙŠÙ† Ø¹Ù…Ù„ ØªÙ†Ù‡Ø§ Ø¯Ø± "
-"Ù‡Ø±%s Ø¬Ù„Ø³Ù‡ Ù†ÙŠØ§Ø² Ø¯Ø§Ø±ÙŠØ¯"
+"Ù„Ø·ÙØ§Ù‹ Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ PGP Ø®ÙˆØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯. Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÛŒÙ† Ø¹Ù…Ù„ ØªÙ†Ù‡Ø§ Ø¯Ø± "
+"Ù‡Ø± %s Ù†Ø´Ø³Øª Ù†ÛŒØ§Ø² Ø¯Ø§Ø±ÛŒØ¯"
 
 #: templates/smime/passphrase.inc:13
 #, php-format
@@ -2677,282 +2921,277 @@
 "Please enter the passphrase for your S/MIME private key. You will only need "
 "to enter this passphrase once per %s session."
 msgstr ""
-"Ù„Ø·ÙØ§Ù‹ passphrase Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ S/MIME Ø®ÙˆØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯. Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÙŠÙ† Ø¹Ù…Ù„ ØªÙ†Ù‡Ø§ "
-"Ø¯Ø± Ù‡Ø±%s Ø¬Ù„Ø³Ù‡ Ù†ÙŠØ§Ø² Ø¯Ø§Ø±ÙŠØ¯"
+"Ù„Ø·ÙØ§Ù‹ Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ S/MIME Ø®ÙˆØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯. Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÛŒÙ† Ø¹Ù…Ù„ ØªÙ†Ù‡Ø§ "
+"Ø¯Ø± Ù‡Ø± %s Ù†Ø´Ø³Øª Ù†ÛŒØ§Ø² Ø¯Ø§Ø±ÛŒØ¯"
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
 "log in again in your main window as well. This is to keep attackers from "
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
-"Ù„Ø·ÙØ§Ù‹ Ø¨Ø±Ø§ÛŒ Ø§Ø¯Ø§Ù…Ù‡ Ø¹Ù…Ù„ Ø§Ø±Ø³Ø§Ù„ Ù¾ÙŠØºØ§Ù… Ø¯ÙˆØ¨Ø§Ø±Ù‡ ÙˆØ§Ø±Ø¯ Ø´ÙˆÙŠØ¯. Ø²ÙŠØ±Ø§ Ø§Ú¯Ø± Ø´Ù…Ø§ Ø§Ø² Ú©ÙˆÚ©ÛŒâ€ŒÙ‡Ø§ "
-"Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ú©Ù†ÙŠØ¯Ùˆ ØµÙØÙ‡ ØªÙˆÙ„ÙŠØ¯ Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ú¯ÙˆØ´ÙˆØ¯Ù†ÛŒ Ø¨Ø§Ø´Ø¯ØŒ Ø´Ù…Ø§ Ù…Ø¬Ø¨ÙˆØ± Ø¨Ù‡ "
-"ÙˆØ±ÙˆØ¯ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¯Ø± Ù¾Ù†Ø¬Ø±Ù‡ Ø§ØµÙ„ÛŒ Ø®ÙˆØ§Ù‡ÙŠØ¯ Ø¨ÙˆØ¯ Ùˆ Ø§ÙŠÙ† Ø§Ù…Ø± Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨Ø§Ø¹Ø« Ø¯Ø²Ø¯ÙŠØ¯Ù† session "
-"ID Ø´Ù…Ø§ ØªÙˆØ³Ø· Ù†ÙÙˆØ°Ú¯Ø±Ø§Ù† Ø´ÙˆØ¯"
+"Ù„Ø·ÙØ§Ù‹ Ø¨Ø±Ø§ÛŒ Ø§Ø¯Ø§Ù…Ù‡ Ø¹Ù…Ù„ Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù… Ø¯ÙˆØ¨Ø§Ø±Ù‡ ÙˆØ§Ø±Ø¯ Ø´ÙˆÛŒØ¯. Ø²ÛŒØ±Ø§ Ø§Ú¯Ø± Ø´Ù…Ø§ Ø§Ø² Ú©ÙˆÚ©ÛŒÙ‡Ø§ "
+"Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ú©Ù†ÛŒØ¯ Ùˆ ØµÙØÙ‡ ØªÙˆÙ„ÛŒØ¯ Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø¨Ø§Ø´Ø¯ØŒ Ø´Ù…Ø§ Ù…Ø¬Ø¨ÙˆØ± Ø¨Ù‡ "
+"ÙˆØ±ÙˆØ¯ Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¯Ø± Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø§ØµÙ„ÛŒ Ø®ÙˆØ§Ù‡ÛŒØ¯ Ø¨ÙˆØ¯ Ùˆ Ø§ÛŒÙ† Ø§Ù…Ø± Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨Ø§Ø¹Ø« Ø¯Ø²Ø¯ÛŒØ¯Ù† ID Ù†Ø´Ø³Øª  "
+"Ø´Ù…Ø§ ØªÙˆØ³Ø· Ù†ÙÙˆØ°Ú¯Ø±Ø§Ù† Ø´ÙˆØ¯"
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
-msgstr "Ù„Ø·ÙØ§Ù‹ Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ø®ÙˆØ¯ Ø±Ø§ Ø¢Ù…Ø§Ø¯Ù‡ Ú©Ù†ÙŠØ¯"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ø§Ø³Ù… Ø±Ù…Ø² Ø®ÙˆØ¯ Ø±Ø§ Ø¢Ù…Ø§Ø¯Ù‡ Ú©Ù†ÛŒØ¯"
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
-msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¢Ù…Ø§Ø¯Ù‡ Ú©Ù†ÙŠØ¯:"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ø¢Ù…Ø§Ø¯Ù‡ Ú©Ù†ÛŒØ¯:"
 
-#: compose.php:80 lib/IMP.php:520
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
-msgstr "Ù„Ø·ÙØ§Ù‹ Ø§Ø¨Ù‡Ø§Ù… ÙŠØ§ Ø¢Ø¯Ø±Ø³ ØºÙŠØ± Ù…Ø¹ØªØ¨Ø± Ø±Ø§ Ø¨Ø±Ø·Ø±Ù Ú©Ù†ÙŠØ¯"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ø§Ø¨Ù‡Ø§Ù… ÛŒØ§ Ø¢Ø¯Ø±Ø³ ØºÛŒØ±Ù…Ø¹ØªØ¨Ø± Ø±Ø§ Ø¨Ø±Ø·Ø±Ù Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
 msgstr ""
-"Ù„Ø·ÙØ§Ù‹ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø²ÙŠØ± Ø±Ø§ Ù…Ø±ÙˆØ± Ú©Ø±Ø¯Ù‡ØŒ Ùˆ Ø³Ù¾Ø³ ÙŠÚ© ÙØ¹Ø§Ù„ÙŠØª Ø§Ø² Ù„ÙŠØ³Øª Ø§Ù†ØªØ®Ø§Ø¨ Ø²ÙŠØ± Ø±Ø§ Ø¨Ø±Ú¯Ø²ÙŠÙ†ÙŠØ¯"
+"Ù„Ø·ÙØ§Ù‹ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø²ÛŒØ± Ø±Ø§ Ù…Ø±ÙˆØ± Ú©Ø±Ø¯Ù‡ØŒ Ùˆ Ø³Ù¾Ø³ ÛŒÚ© ÙØ¹Ø§Ù„ÛŒØª Ø§Ø² Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† Ø²ÛŒØ± Ø±Ø§ Ø¨Ø±Ú¯Ø²ÛŒÙ†ÛŒØ¯"
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
-msgstr "Ù„Ø·ÙØ§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ø§Ø¬Ø±Ø§ÛŒ Ù‡Ø±Ú¯ÙˆÙ†Ù‡ ÙØ¹Ø§Ù„ÙŠØªÛŒ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ù‚Ø¨Ù„ Ø§Ø² Ø§Ù†Ø¬Ø§Ù… Ù‡Ø± Ú¯ÙˆÙ†Ù‡ ÙØ¹Ø§Ù„ÛŒØªÛŒ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
-msgstr "Ù„Ø·ÙØ§Ù‹ ÙŠÚ© ÙØ¹Ø§Ù„ÙŠØª Ø§Ø² Ù„ÙŠØ³Øª Ø§Ù†ØªØ®Ø§Ø¨ Ø²ÙŠØ± Ø±Ø§ Ø¨Ø±Ú¯Ø²ÙŠÙ†ÙŠØ¯"
+msgstr "Ù„Ø·ÙØ§Ù‹ ÛŒÚ© ÙØ¹Ø§Ù„ÛŒØª Ø§Ø² Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† Ø²ÛŒØ± Ø±Ø§ Ø¨Ø±Ú¯Ø²ÛŒÙ†ÛŒØ¯"
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
-msgstr "Ù„Ø·ÙØ§Ù‹ ØØ¯Ø§Ù‚Ù„ ÙŠÚ© Ú©Ø´Ùˆ Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+msgstr "Ù„Ø·ÙØ§Ù‹ ØØ¯Ø§Ù‚Ù„ ÛŒÚ© Ø´Ø§Ø®Ù‡ Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
-msgstr "Ù„Ø·ÙØ§Ù‹ Ø¨Ø±Ø§ÛŒ Ø§ÙŠÙ† Ø¹Ù…Ù„ ÙÙ‚Ø· ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ø¨Ø±Ø§ÛŒ Ø§ÛŒÙ† Ø¹Ù…Ù„ ÙÙ‚Ø· ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
-msgstr "Ù„Ø·ÙØ§Ù‹ Ø¯Ø± Ø¬Ø¹Ø¨Ù‡ Ø±Ø§Ø³Øª Ø§Ù†ØªØ®Ø§Ø¨ Ùˆ ÙŠØ§ ÙˆÙŠØ±Ø§ÙŠØ´ Ú©Ù†ÙŠØ¯:"
-
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Ù„Ø·ÙØ§Ù‹ Ø±Ø§Ø³Øª Ø¨Ø¹Ø¯ÛŒ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ ÙˆÙŠØ§ ÙˆÙŠØ±Ø§ÙŠØ´ Ú©Ù†ÙŠØ¯:"
+msgstr "Ù„Ø·ÙØ§Ù‹ Ø¯Ø± Ø¬Ø¹Ø¨Ù‡Ù” Ú†Ù¾ Ø§Ù†ØªØ®Ø§Ø¨ Ùˆ ÛŒØ§ ÙˆÛŒØ±Ø§ÛŒØ´ Ú©Ù†ÛŒØ¯:"
 
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
-msgstr "Ø¯Ø± Ø§Ø®ØªÙŠØ§Ø± Ù‡ÙˆØ±Ø¯"
+msgstr "Ø¯Ø± Ø§Ø®ØªÛŒØ§Ø± Ù‡ÙˆØ±Ø¯"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Ù‚Ø¨Ù„ Ø§Ø² Ø§Ù…Ø¶Ø§ÛŒ Ø´Ù…Ø§ Ø®Ø· ÙØ§ØµÙ„Ù‡ ('-- ') Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´ÙˆØ¯ØŸ"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
-msgstr "Ø§ÙˆÙ„ÙˆÙŠØªâ€ŒÙ‡Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø¨Ù‡ Ø±ÙˆØ² Ø´Ø¯Ù†Ø¯"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø´Ø¯Ù†Ø¯"
 
 #: templates/compose/attachments.inc:3
 msgid "Preview"
-msgstr "Ù¾ÙŠØ´ Ù†Ù…Ø§ÙŠØ´"
+msgstr "Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´"
 
 #: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ù‚Ø¨Ù„ÛŒ"
+msgstr "Ù¾ÛŒØºØ§Ù… Ù‚Ø¨Ù„ÛŒ"
 
-#: mailbox.php:336
+#: mailbox.php:347
 msgid "Previous Page"
-msgstr "ØµÙØÙ‡ Ù‚Ø¨Ù„ÛŒ"
+msgstr "ØµÙØÙ‡Ù” Ù‚Ø¨Ù„ÛŒ"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Ú†Ø§Ù¾"
 
 #: templates/message/headers.inc:38
 msgid "Priority"
-msgstr "Ø§ÙˆÙ„ÙˆÙŠØª"
+msgstr "Ø§ÙˆÙ„ÙˆÛŒØª"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
-msgstr "Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ"
+msgstr "Ø§Ø³Ù… Ø±Ù…Ø² Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
-msgstr "Ø¢Ú¯Ø§Ù‡ÛŒ Ø¯Ø§Ø¯Ù† Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ ÙŠÚ© Ø¶Ù…ÙŠÙ…Ù‡ Ø§Ø±Ø³Ø§Ù„ Ù…ÛŒâ€ŒÚ¯Ø±Ø¯Ø¯: Ù…Ù‚Ø¯Ø§Ø± Ù¾ÙŠØ´ ÙØ±Ø¶ Ù†Ù‡ Ø§Ø³Øª"
+msgstr "Ø§Ø¹Ù„Ø§Ù† Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ ÛŒÚ© Ù¾ÛŒÙˆØ³Øª Ø§Ø±Ø³Ø§Ù„ Ù…ÛŒâ€ŒÚ¯Ø±Ø¯Ø¯: Ù…Ù‚Ø¯Ø§Ø± Ù¾ÛŒØ´ ÙØ±Ø¶ Ù†Ù‡ Ø§Ø³Øª"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
-msgstr "Ø¢Ú¯Ø§Ù‡ÛŒ Ø¯Ø§Ø¯Ù† Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ ÙŠÚ© Ø¶Ù…ÙŠÙ…Ù‡ Ø§Ø±Ø³Ø§Ù„ Ù…ÛŒâ€ŒÚ¯Ø±Ø¯Ø¯: Ù…Ù‚Ø¯Ø§Ø± Ù¾ÙŠØ´ ÙØ±Ø¶ Ø¨Ù„Ù‡ Ø§Ø³Øª"
+msgstr "Ø§Ø¹Ù„Ø§Ù† Ø²Ù…Ø§Ù†ÛŒ Ú©Ù‡ ÛŒÚ© Ù¾ÛŒÙˆØ³Øª Ø§Ø±Ø³Ø§Ù„ Ù…ÛŒâ€ŒÚ¯Ø±Ø¯Ø¯: Ù…Ù‚Ø¯Ø§Ø± Ù¾ÛŒØ´ ÙØ±Ø¶ Ø¨Ù„Ù‡ Ø§Ø³Øª"
 
 #: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Ù¾Ø±ÙˆØªÚ©Ù„:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ø³Ø±ÙˆØ± Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒâ€ŒPGP Ú©Ø§Ø± Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ú©Ø§Ø±Ø³Ø§Ø² Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ â€ŒPGP ØºÛŒØ± ÙØ¹Ø§Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: templates/mailbox/actions_deleted.inc:8 templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Pur_ge Deleted"
 msgstr "Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ ØØ°Ù Ø´Ø¯Ù‡â€ŒÙ‡Ø§"
 
-#: templates/mailbox/actions_deleted.inc:8 templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ ØØ°Ù Ø´Ø¯Ù‡â€ŒÙ‡Ø§"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
-msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡ (Ù‡Ø§)"
+msgstr "Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
-msgstr " Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ø¨Ù‡ ØµÙˆØ±Øª:"
+msgstr " Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ø¯Ø± Ø¨Ø§Ø²Ù‡â€ŒÙ‡Ø§ÛŒ Ø²Ù…Ø§Ù†ÛŒ:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
-msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ú©Ù‡ Ø§Ø² Ø§ÙŠÙ† Ú†Ù†Ø¯ Ø±ÙˆØ² Ù‚Ø¯ÙŠÙ…ÛŒâ€ŒØªØ±â€Œ Ø¨Ø§Ø´Ø¯"
+msgstr "Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡Ù” Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ú©Ù‡ Ø§Ø² Ø§ÛŒÙ† Ú†Ù†Ø¯ Ø±ÙˆØ² Ù‚Ø¯ÛŒÙ…ÛŒâ€ŒØªØ±â€Œ Ø¨Ø§Ø´Ù†Ø¯"
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù‚Ø¯ÙŠÙ…ÛŒ Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ø®Ø§Ù„ÛŒ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù‚Ø¯ÛŒÙ…ÛŒ Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ Ø´ÙˆÙ†Ø¯ØŸ"
 
 # 
-#: lib/Maintenance/Task/purge_trash.php:67
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Ù¾ÙŠØºØ§Ù… %d Ø§Ø² Ù¾ÙˆØ´Ù‡ Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ø¯ÙˆØ± Ø±ÙŠØ®ØªÙ‡ Ø´Ø¯"
+msgid "Purging %d messages from Trash folder."
+msgstr "Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ %d Ù¾ÛŒØºØ§Ù… Ø§Ø² Ù¾ÙˆØ´Ù‡Ù” Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„"
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Ù…ØªÙ† Ø²ÙŠØ± Ø±Ø§ Ø¨Ø¹Ø¯ Ø§Ø² Ø¹Ù„Ø§Ù…Øª  @ Ù‡Ù†Ú¯Ø§Ù… ÙØ±Ø³ØªØ§Ø¯Ù† Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ùˆ Ø¨Ø§Ø² Ø´Ø¯Ù† Ø¢Ø¯Ø±Ø³ Ù¾ÙŠØ´ "
-"ÙØ±Ø¶ Ù‚Ø±Ø§Ø± Ø¨Ø¯Ù‡:"
+# 
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "Ù¾Ø§Ú©Ø³Ø§Ø²ÛŒ ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø§Ø² Ù¾ÙˆØ´Ù‡Ù” Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„"
 
 # 
 #: templates/quota/quota.inc:17
 #, php-format
 msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
-msgstr "ÙˆØ¶Ø¹ÙŠØªâ€ŒÙ‡Ø§ÛŒ Ù†Ù‚Ù„ Ù‚ÙˆÙ„: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "ÙˆØ¶Ø¹ÛŒØªâ€Œ Ø³Ù‡Ù…ÛŒÙ‡: %.2fMB / %.2fMB  (%.2f%%)"
 
 # 
 #: templates/quota/quota.inc:21
 #, php-format
 msgid "Quota status: %.2fMB / NO LIMIT"
-msgstr "ÙˆØ¶Ø¹ÙŠØª Ø³Ù‡Ù…ÙŠÙ‡: %.2f Ù…Ú¯Ø§ Ø¨Ø§ÙŠØª / Ø¨Ø¯ÙˆÙ† Ù…ØØ¯ÙˆØ¯ÙŠØª"
+msgstr "ÙˆØ¶Ø¹ÛŒØª Ø³Ù‡Ù…ÛŒÙ‡: %.2f Ù…Ú¯Ø§Ø¨Ø§ÛŒØª/Ø¨Ø¯ÙˆÙ† Ù…ØØ¯ÙˆØ¯ÛŒØª"
 
 # 
 #: templates/quota/quota.inc:24
 #, php-format
 msgid "Quota status: NO LIMIT"
-msgstr "ÙˆØ¶Ø¹ÙŠØªâ€Œ Ø³Ù‡Ù…ÙŠÙ‡: Ø¨Ø¯ÙˆÙ† Ù…ØØ¯ÙˆØ¯ÙŠØª"
+msgstr "ÙˆØ¶Ø¹ÛŒØªâ€Œ Ø³Ù‡Ù…ÛŒÙ‡: Ø¨Ø¯ÙˆÙ† Ù…ØØ¯ÙˆØ¯ÛŒØª"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
+#, php-format
 msgid "Quoting %f:"
-msgstr "Ù†Ù‚Ù„ Ù‚ÙˆÙ„"
+msgstr "Ù†Ù‚Ù„ Ù‚ÙˆÙ„ %f:"
 
-#: templates/compose/compose.inc:377
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
-msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª ØªØ£ÙŠÙŠØ¯ÙŠÙ‡ ØªØÙˆÙŠÙ„"
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª ØªØ§Ø¦ÛŒØ¯ÛŒÙ‡Ù” ØªØÙˆÛŒÙ„"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
-msgstr "Ø±Ø³ÙŠØ¯Ù‡ Ø¯Ø±"
+msgstr "Ø¯Ø±ÛŒØ§ÙØª Ø´Ø¯Ù‡ Ø¨Ø±"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
-msgstr "Ø±Ø³ÙŠØ¯Ù‡ Ø§Ø²"
+msgstr "Ø¯Ø±ÛŒØ§ÙØª Ø´Ø¯Ù‡ Ø§Ø²"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
-msgstr "Ø±Ø³ÙŠØ¯Ù‡ ØªØ§"
+msgstr "Ø¯Ø±ÛŒØ§ÙØª Ø´Ø¯Ù‡ ØªØ§"
 
 #: templates/message/navbar_actions.inc:16
 msgid "Redirec_t"
-msgstr "ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù†"
+msgstr "ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ±"
 
 #: templates/message/navbar_actions.inc:16
 msgid "Redirect"
-msgstr "ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù†"
+msgstr "ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ±"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
-msgstr "ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù† Ù¾ÙŠØºØ§Ù…"
+msgstr "ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ± Ù¾ÛŒØºØ§Ù…"
 
-#: compose.php:713
+#: compose.php:787
 msgid "Redirect this message"
-msgstr "ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù† Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù…"
+msgstr "ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ± Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù…"
 
-#: compose.php:769
+#: compose.php:847
 msgid "Redirecting failed."
-msgstr "ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù† Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯"
+msgstr "ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ± Ù†Ø§Ù…ÙˆÙÙ‘Ù‚ Ø¨ÙˆØ¯"
 
-#: templates/compose/compose.inc:573
+#: templates/compose/compose.inc:583
 msgid "Refresh"
-msgstr "Ù†ÙˆØ³Ø§Ø²ÛŒ"
+msgstr "Ø¨Ø§Ø²Ø¢ÙˆØ±ÛŒ"
 
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
-msgstr "Ù†ÙˆØ³Ø§Ø²ÛŒ Ù†Ù…Ø§Ù‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡:"
+msgstr "Ø¨Ø§Ø²Ø¢ÙˆØ±ÛŒ Ù†Ù…Ø§Ù‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
-msgstr "Ø¨Ø§Ø± Ú©Ø±Ø¯Ù†"
+msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯"
 
 #: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ Ù†Ù…Ø§"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
-msgstr "Ø¨Ù‡ ÙŠØ§Ø¯Ø¯Ø§Ø´ØªÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª free/busy"
+msgstr "Ø¨Ù‡ ÛŒØ§Ø¯Ø¢ÙˆØ±ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„"
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
-msgstr "Ø¨Ù‡ â€ŒÙŠØ§Ø¯Ø¢ÙˆØ±ÛŒ Ø¢Ø®Ø±ÙŠÙ† ÙØ±Ù… Ù†Ù…Ø§ÙŠØ´"
+msgstr "Ø¨Ù‡ â€ŒÛŒØ§Ø¯Ø¢ÙˆØ±ÛŒ Ø¢Ø®Ø±ÛŒÙ† ÙØ±Ù… Ù†Ù…Ø§ÛŒØ´"
 
 #: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
-msgstr "ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø±Ø§Ù‡ Ø¯ÙˆØ±:"
+msgstr "Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø±Ø§Ù‡ Ø¯ÙˆØ±:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
-msgstr "ØØ°Ù ÙÙŠÙ„Ø¯ Ø§Ø² Ø¬Ø³ØªØ¬Ùˆ"
+msgstr "ØØ°Ù ÙÛŒÙ„Ø¯ Ø§Ø² Ø¬Ø³ØªØ¬Ùˆ"
 
 #: templates/prefs/sourceselect.inc:305
 msgid "Remove source"
-msgstr "ØØ°Ù Ù…ØªÙ† Ø§ØµÙ„ÛŒ"
+msgstr "ØØ°Ù Ø³Ø±Ú†Ø´Ù…Ù‡"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
-msgstr "ØªØºÙŠÙŠØ± Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ (Ù‡Ø§)"
+msgstr "ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù…Ø§Ù‡ ØªØºÙŠÙŠØ± Ù†Ø§Ù… Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÙˆØ´Ù‡Ù” Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø¯Ø± Ø§Ø¨ØªØ¯Ø§ÛŒ Ù…Ø§Ù‡ ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
 # 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "ØªØºÙŠÙŠØ± Ù†Ø§Ù… \"%s\" Ø¨Ù‡ \"%s\" Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "ØªØºÛŒÛŒØ± Ù†Ø§Ù… \"%s\" Ø¨Ù‡ \"%s\" Ù†Ø§Ù…ÙˆÙÙ‘Ù‚ Ø¨ÙˆØ¯. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª"
 
 #: templates/message/navbar_actions.inc:10
 msgid "Repl_y to List"
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
-msgstr "Ø¬Ø§Ø¨Ø¬Ø§ Ú©Ø±Ø¯Ù† Ø¨Ø§:"
+msgstr "Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ú©Ø±Ø¯Ù† Ø¨Ø§:"
 
 #: templates/message/navbar_actions.inc:8
 msgid "Reply"
 msgstr "Ù¾Ø§Ø³Ø® "
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
-msgstr "Ù¾Ø§Ø³Ø® ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯"
+msgstr "Ù¾Ø§Ø³Ø® Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
 
 #: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ù‡Ù…Ù‡"
 
-#: compose.php:660
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ù‡Ù…Ù‡:"
 
@@ -2960,7 +3199,7 @@
 msgid "Reply to List"
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª"
 
-#: compose.php:662
+#: compose.php:735
 msgid "Reply to List:"
 msgstr ":Ù¾Ø§Ø³Ø® Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª"
 
@@ -2968,271 +3207,284 @@
 msgid "Reply to _All"
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡ Ù‡Ù…Ù‡"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
-msgstr "Ù¾Ø§Ø³Ø® Ø¨Ø§ Ù¾ÙŠØºØ§Ù… Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ù†Ø´Ø¯Ù‡"
+msgstr "Ù¾Ø§Ø³Ø® Ø¨Ø§ Ù¾ÛŒØºØ§Ù… Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ù†Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
-msgstr "Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù† Ø¨Ø§ free/busy Ø¨Ø±Ø§ÛŒ Ø¯Ùˆ Ù…Ø§Ù‡ Ø¢ÙŠÙ†Ø¯Ù‡"
+msgstr "Ù¾Ø§Ø³Ø® Ø¨Ø§ Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ø¨Ø±Ø§ÛŒ Ø¯Ùˆ Ù…Ø§Ù‡ Ø¢ÛŒÙ†Ø¯Ù‡"
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
-msgstr "Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù† Ø¨Ø§ Ø§Ø·Ù„Ø§Ø¹Ø§Øª free/busy Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡"
+msgstr "Ù¾Ø§Ø³Ø® Ø¨Ø§ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡"
 
-#: message.php:259
+#: message.php:267
 msgid "Reply-To"
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Ù¾Ø§Ø³Ø® Ø¨Ù‡: "
 
-#: compose.php:658
+#: compose.php:731
 msgid "Reply:"
 msgstr "Ù¾Ø§Ø³Ø®:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
-msgstr "Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù†Ø§Ù…Ù‡ Ø¨ÛŒ Ø¶Ø±Ø±"
+msgstr "Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø¹Ù†ÙˆØ§Ù† Ø¨ÛŒâ€ŒØ¶Ø±Ø±"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø² Ù†Ø§Ù…Ù‡"
+msgstr "Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
-msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø±Ø³ÙŠØ¯ Ø¨Ø±Ø§ÛŒ Ù…Ø·Ø§Ù„Ø¹Ù‡"
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª ÛŒÚ© Ø±Ø³ÛŒØ¯ Ù…Ø·Ø§Ù„Ø¹Ù‡"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
-msgstr " Ø¢ÙŠØ§ Ø¨Ø±Ø§ÛŒ ØªØÙˆÙŠÙ„ ØªØ£ÙŠÙŠØ¯ÙŠÙ‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´ÙˆØ¯ØŸ"
+msgstr " Ø¢ÛŒØ§ Ø¨Ø±Ø§ÛŒ ØªØÙˆÛŒÙ„ ØªØ§Ø¦ÛŒØ¯ÛŒÙ‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
-msgstr "Ø¢ÙŠØ§ Ø±Ø³ÙŠØ¯ Ù…Ø·Ø§Ù„Ø¹Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø±Ø³ÛŒØ¯ Ù…Ø·Ø§Ù„Ø¹Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´ÙˆØ¯ØŸ"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ù¾ÙŠØ¯Ø§ Ù†Ø´Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø®ÙˆØ§Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
-msgstr "Ù†ÙŠØ§Ø² Ø´Ø±ÙŠÚ©"
+msgstr "Ø´Ø±ÛŒÚ© Ù…ÙˆØ±Ø¯ Ù†ÛŒØ§Ø²"
 
-#: templates/acl/acl.inc:158 templates/search/main.inc:143
-#: templates/search/header.inc:26
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
-msgstr "Ø±Ø§Ù‡â€ŒØ§Ù†Ø¯Ø§Ø²ÛŒ Ø¯ÙˆØ¨Ø§Ø±Ù‡"
+msgstr "Ø¨Ø§Ø²Ù†Ø´Ø§Ù†ÛŒ"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
-msgstr "ØØ§Ù„Ø§Øª Ù¾Ø§Ø³Ø®Ú¯ÙˆÙŠÛŒ Ø¨Ù‡ Ø±ÙˆØ² Ø´Ø¯Ù†Ø¯"
+msgstr "ØØ§Ù„Ø§Øª Ù¾Ø§Ø³Ø®Ú¯ÙˆÛŒÛŒ Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø´Ø¯Ù†Ø¯"
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Ø§Ø² Ø³Ø±Ú¯Ø±ÙØªÙ†"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Ø§Ø² Ø³Ø± Ú¯Ø±ÙØªÙ† Ù†Ø´Ø³Øª Ø´Ù…Ø§"
 
-#: templates/fetchmail/driver_select.inc:31
-#: templates/fetchmail/account_select.inc:32 templates/fetchmail/manage.inc:69
-msgid "Return to Fetch Mail"
-msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù…"
 
-#: templates/pgp/pgp.inc:268 templates/filters/notactive.inc:13
-#: templates/filters/prefs.inc:70 templates/smime/smime.inc:158
-msgid "Return to Main Preferences Screen"
-msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ØµÙØÙ‡ Ø§ØµÙ„ÛŒ Ø§ÙˆÙ„ÙˆÙŠØªâ€ŒÙ‡Ø§"
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡"
 
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
-msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§"
-
-#: templates/pgp/notactive.inc:33 templates/smime/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ ØµÙØÙ‡ Ù‚Ø¨Ù„"
+msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª Ø¨Ù‡ Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§"
 
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
-"Ø¢ÙŠØ§ Ø¨Ø¹Ø¯ Ø§Ø² ØØ°ÙØŒ Ø¬Ø§Ø¨Ø¬Ø§Ø¦ÙŠ ÙŠØ§ Ù†Ø³Ø®Ù‡ Ø¨Ø±Ø¯Ø§Ø±ÛŒ ÙŠÚ© Ù¾ÙŠØºØ§Ù…ØŒ Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ "
-"Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¨Ø±Ú¯Ø´Øª Ø´ÙˆØ¯ØŸ"
+"Ø¢ÛŒØ§ Ø¨Ø¹Ø¯ Ø§Ø² ØØ°ÙØŒ Ø§Ù†ØªÙ‚Ø§Ù„ Ùˆ ÛŒØ§ Ø±ÙˆÙ†ÙˆØ´Øª Ú¯Ø±ÙØªÙ† Ø§Ø² ÛŒÚ© Ù¾ÛŒØºØ§Ù…ØŒ Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† "
+"Ø¨Ø§Ø²Ú¯Ø´Øª Ø´ÙˆØ¯ØŸ"
 
-#: lib/MIME/Viewer/itip.php:673
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Ù†Ù‚Ø´"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:411
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
 #: templates/compose/encrypt_list.inc:12
 msgid "S/MIME Encrypt Message"
-msgstr "Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ S/MIME Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ S/MIME "
 
-#: compose.php:379
+#: compose.php:394
 msgid "S/MIME Error: "
 msgstr "Ø®Ø·Ø§ÛŒ S/MIME: "
 
-#: compose.php:358
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
-msgstr "Ø®Ø·Ø§ÛŒ S/MIME: Ù†ÙŠØ§Ø² Ø¨Ù‡ passphrase Ø¨Ø±Ø§ÛŒ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ"
-
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª"
+msgstr "Ø®Ø·Ø§ÛŒ S/MIME: Ù†ÛŒØ§Ø² Ø¨Ù‡ Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø¨Ø±Ø§ÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ"
 
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
-msgstr "Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ S/MIME"
+msgstr "Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ S/MIME"
 
 #: smime.php:49
 msgid "S/MIME Passphrase Input"
-msgstr "ÙˆØ§Ø±Ø¯Ú©Ø±Ø¯Ù† S/MIME Passphrase"
+msgstr "ÙˆØ§Ø±Ø¯Ú©Ø±Ø¯Ù† S/MIME Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø±"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ø¬ÙØª Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ S/MIME Ø¨Ù‡ ÙŠÚ© Ø§ØªØµØ§Ù„ Ø§Ù…Ù† web Ù†ÙŠØ§Ø²Ù…Ù†Ø¯ Ø§Ø³Øª"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ø¬ÙØª Ú©Ù„ÛŒØ¯ Ø´Ø®ØµÛŒ S/MIME Ø¨Ù‡ ÛŒÚ© Ø§ØªØµØ§Ù„ Ø§Ù…Ù† ÙˆØ¨ Ù†ÛŒØ§Ø²Ù…Ù†Ø¯ Ø§Ø³Øª"
 
 # 
 #: smime.php:140
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME Ø¨Ø±Ø§ÛŒ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ù¾Ø§Ú© Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME Ø¨Ø±Ø§ÛŒ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØØ°Ù Ø´Ø¯"
 
 #: smime.php:162
 msgid "S/MIME Public Key successfully added."
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
-msgstr "ØÙ„Ù‚Ù‡ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME"
+msgstr "ØÙ„Ù‚Ù‡Ù” Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ S/MIME"
 
 #: smime.php:211
 msgid "S/MIME Public/Private Keypair successfully added."
-msgstr "Ø¬ÙØª Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ/Ø´Ø®ØµÛŒ S/MIME Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "Ø¬ÙØª Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ/Ø´Ø®ØµÛŒ S/MIME Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
 
 #: templates/compose/encrypt_list.inc:13
 msgid "S/MIME Sign Message"
-msgstr "Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ S/MIME Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ S/MIME Ù¾ÛŒØºØ§Ù…"
 
 #: templates/compose/encrypt_list.inc:14
 msgid "S/MIME Sign/Encrypt Message"
-msgstr "Ù¾ÙŠØºØ§Ù… Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ/Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ S/MIME "
+msgstr "Ù¾ÛŒØºØ§Ù… Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡/Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ S/MIME "
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ S/MIME Ø±ÙˆÛŒ Ø§ÙŠÙ† Ø³ÙŠØ³ØªÙ… ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ S/MIME Ø±ÙˆÛŒ Ø§ÛŒÙ† Ø³Ø§Ù…Ø§Ù†Ù‡ ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ S/MIME ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª Ø§Ø² Ø§ÙŠÙ†Ø±Ùˆ Ù¾ÙŠØºØ§Ù… Ù‚Ø§Ø¨Ù„ Ø±Ù…Ø²Ú¯Ø´Ø§ÙŠÛŒ Ù†ÙŠØ³Øª"
+msgstr ""
+"Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ S/MIME Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª Ø§Ø² Ø§ÛŒÙ†Ø±Ùˆ Ù¾ÛŒØºØ§Ù… Ù‚Ø§Ø¨Ù„ Ø±Ù…Ø²Ú¯Ø´Ø§ÛŒÛŒ Ù†ÛŒØ³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message can not "
 "be displayed."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ S/MIME ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª Ø§Ø² Ø§ÙŠÙ†Ø±Ùˆ Ù…ØªÙ† Ù¾ÙŠØºØ§Ù… Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ S/MIME ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª Ø§Ø² Ø§ÛŒÙ†Ø±Ùˆ Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯"
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
-msgstr "Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ S/MIME ÙØ¹Ø§Ù„ Ù†ÙŠØ³Øª Ø§Ø² Ø§ÙŠÙ†Ø±Ùˆ Ø§Ù…Ø¶Ø§ÛŒ Ø¯ÙŠØ¬ÙŠØªØ§Ù„ÛŒ Ù‚Ø§Ø¨Ù„ Ø¨Ø±Ø±Ø³ÛŒ Ù†ÙŠØ³Øª"
+msgstr "Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ S/MIME ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª Ø§Ø² Ø§ÛŒÙ†Ø±Ùˆ Ø§Ù…Ø¶Ø§ÛŒ Ø¯ÛŒØ¬ÛŒØªØ§Ù„ÛŒ Ù‚Ø§Ø¨Ù„ Ø¨Ø§Ø²Ø¨ÛŒÙ†ÛŒ Ù†ÛŒØ³Øª"
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
-"Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ S/MIME Ø¨Ø±Ø§ÛŒ Ø¹Ù…Ù„Ú©Ø±Ø¯ ØµØÙŠØ Ø®ÙˆØ¯ Ù†ÙŠØ§Ø² Ø¨Ù‡ Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø¯Ø§Ø±Ø¯ Ù…Ø±ÙˆØ±Ú¯Ø±Ø®ÙˆØ¯ "
-"Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§ÙŠÙ† Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ ØªÙ†Ø¸ÙŠÙ… Ú©Ù†ÙŠØ¯"
+"Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ S/MIME Ø¨Ø±Ø§ÛŒ Ø¹Ù…Ù„Ú©Ø±Ø¯ ØµØÛŒØ Ø®ÙˆØ¯ Ù†ÛŒØ§Ø² Ø¨Ù‡ Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ Ø¯Ø§Ø±Ø¯ Ù…Ø±ÙˆØ±Ú¯Ø±Ø®ÙˆØ¯ "
+"Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ø§ÛŒÙ† Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯"
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "Ø¹Ù†ÙˆØ§Ù†"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
-msgstr "Ø°Ø®ÙŠØ±Ù‡ ÙŠÚ© Ø±ÙˆÙ†ÙˆØ´Øª Ø¯Ø±"
+msgstr "ØÙØ¸ ÛŒÚ© Ø±ÙˆÙ†ÙˆØ´Øª Ø¯Ø±"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
-msgstr "Ø°Ø®ÙŠØ±Ù‡ Ø¨Ø¹Ù†ÙˆØ§Ù†"
+msgstr "ØÙØ¸ Ø¨Ø§ Ù†Ø§Ù…"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
-msgstr "Ø°Ø®ÙŠØ±Ù‡"
+msgstr "ØÙØ¸"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
-msgstr "Ø¢ÙŠØ§ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ Ø¨Ø§ Ù¾ÙŠØºØ§Ù… Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ÛŒ Ù¾ÛŒØºØ§Ù… Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ ØÙØ¸ Ø´ÙˆØ¯ØŸ"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
-msgstr "Ø°Ø®ÙŠØ±Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³"
+msgstr "ØÙØ¸ Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³"
 
-#: templates/pgp/pgp.inc:64 templates/pgp/notactive.inc:23
-#: templates/filters/prefs.inc:69 templates/smime/notactive.inc:23
-#: templates/smime/smime.inc:37
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "ØÙØ¸ ØªØµÙˆÛŒØ±"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr "ØÙØ¸ ØªØµÙˆÛŒØ± Ø¯Ø± Ú¯Ø§Ù„Ø±ÛŒ"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
-msgstr "Ø°Ø®ÙŠØ±Ù‡ Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§"
+msgstr "ØÙØ¸ Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "ØÙØ¸ Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
-msgstr "Ø°Ø®ÙŠØ±Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³"
+msgstr "ØÙØ¸ Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
-msgstr "Ø°Ø®ÙŠØ±Ù‡ Ø¨Ø¹Ù†ÙˆØ§Ù†"
+msgstr "ØÙØ¸ Ø¨Ø§ Ù†Ø§Ù…"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³â€ŒÙ‡Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³Ù‡Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ ØÙØ¸ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
-msgstr "Ø¢ÙŠØ§ Ú¯ÙŠØ±Ù†Ø¯Ù‡â€ŒÙ‡Ø§ Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ú¯ÛŒØ±Ù†Ø¯Ù‡â€ŒÙ‡Ø§ Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø±Ø³ ØÙØ¸ Ø´ÙˆÙ†Ø¯ØŸ"
 
 #: templates/search/main.inc:127
 msgid "Save search as a virtual folder?"
-msgstr "Ø¢ÙŠØ§ Ø¬Ø³ØªØ¬Ùˆ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¬Ø³ØªØ¬Ùˆ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ÛŒÚ© Ù¾ÙˆØ´Ù‡Ù” Ù…Ø¬Ø§Ø²ÛŒ ØÙØ¸ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
-msgstr "Ø¢ÙŠØ§ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù†Ø§Ù…Ù‡Ù” ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ ØÙØ¸ Ø´ÙˆØ¯ØŸ"
 
 # 
-#: compose.php:1137
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
-msgstr "Ø°Ø®ÙŠØ±Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³ Ø§Ù†Ø¬Ø§Ù… Ù†Ø´Ø¯. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
+msgstr "ØÙØ¸ Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³ Ù†Ø§Ù…ÙˆÙÙ‘Ù‚ Ø¨ÙˆØ¯. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
 
-#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Ø¬Ø³ØªØ¬Ùˆ"
 
-#: templates/mailbox/header.inc:11 templates/search/header.inc:18
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
-msgstr "Ø¬Ø³ØªØ¬ÙˆÙŠ %s"
+msgstr "Ø¬Ø³ØªØ¬Ùˆ %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Ø¬Ø³ØªØ¬ÙˆÛŒ Ù†Ø§Ù…Ù‡"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "ØÙØ¸ Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§"
 
-#: search.php:311
+#: search.php:265
 msgid "Search Results"
-msgstr "Ù†ØªØ§ÙŠØ¬ Ø¬Ø³ØªØ¬Ùˆ"
+msgstr "Ù†ØªØ§ÛŒØ¬ Ø¬Ø³ØªØ¬Ùˆ"
 
 #: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
@@ -3240,101 +3492,109 @@
 
 # #-#-#-#-#  fa_IR.po (Turba 1.2.2)  #-#-#-#-#
 # msgid "Search Results"
-# msgstr "Ù†ØªØ§ÙŠØ¬ Ø¬Ø³ØªØ¬Ùˆ"
+# msgstr "Ù†ØªØ§ÛŒØ¬ Ø¬Ø³ØªØ¬Ùˆ"
 #: templates/mailbox/navbar.inc:9
 msgid "Select"
 msgstr "Ø§Ù†ØªØ®Ø§Ø¨"
 
 #: templates/fetchmail/manage.inc:70
 msgid "Select Another Account"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© ØØ³Ø§Ø¨ Ø¯ÙŠÚ¯Ø±"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© ØØ³Ø§Ø¨ Ø¯ÛŒÚ¯Ø±"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© ØªØ§Ø±ÙŠØ®"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© ØªØ§Ø±ÛŒØ®"
 
 #: templates/search/fields.inc:10
 msgid "Select a field"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© ÙÙŠÙ„Ø¯"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© ÙÛŒÙ„Ø¯"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø±Ø³ Ø§ØµÙ„ÛŒ Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ Ùˆ Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø¢Ø¯Ø±Ø³Ù‡Ø§"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³ Ø§ØµÙ„ÛŒ Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ Ùˆ Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† Ø¢Ø¯Ø±Ø³Ù‡Ø§"
 
 # #-#-#-#-#  fa_IR.po (Turba 1.2.2)  #-#-#-#-#
 # msgid "Search Results"
-# msgstr "Ù†ØªØ§ÙŠØ¬ Ø¬Ø³ØªØ¬Ùˆ"
+# msgstr "Ù†ØªØ§ÛŒØ¬ Ø¬Ø³ØªØ¬Ùˆ"
 #: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ù‡Ù…Ù‡"
 
 #: templates/prefs/sourceselect.inc:323
 msgid "Select all fields to search when expanding addresses."
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ØªÙ…Ø§Ù…ÛŒ ÙÙŠÙ„Ø¯â€ŒÙ‡Ø§ Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬ÙˆØ¡ ÙˆÙ‚ØªÛŒ Ø¢Ø¯Ø±Ø³â€ŒÙ‡Ø§ Ø¨Ø§Ø² Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ "
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ØªÙ…Ø§Ù…ÛŒ ÙÛŒÙ„Ø¯â€ŒÙ‡Ø§ Ø¨Ø±Ø§ÛŒ Ø¬Ø³ØªØ¬Ùˆ ÙˆÙ‚ØªÛŒ Ø¢Ø¯Ø±Ø³Ù‡Ø§ Ø¨Ø§Ø² Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ "
 
 #: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÙŠÚ© ØØ³Ø§Ø¨"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ ÛŒÚ© ØØ³Ø§Ø¨"
 
 # #-#-#-#-#  fa_IR.po (Turba 1.2.2)  #-#-#-#-#
 # msgid "Search Results"
-# msgstr "Ù†ØªØ§ÙŠØ¬ Ø¬Ø³ØªØ¬Ùˆ"
+# msgstr "Ù†ØªØ§ÛŒØ¬ Ø¬Ø³ØªØ¬Ùˆ"
 #: templates/search/main.inc:89
 msgid "Select none"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ù‡ÙŠÚ†Ú©Ø¯Ø§Ù…"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ù‡ÛŒÚ†â€ŒÛŒÚ©"
+
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú¯Ø§Ù„Ø±ÛŒ Ø¨Ø±Ø§ÛŒ ØÙØ¸ ØªØµÙˆÛŒØ±"
 
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
-msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ù†ÙˆØ¹ Ø³Ø±ÙˆØ± Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ù†ÙˆØ¹ Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ"
 
 #: templates/prefs/sourceselect.inc:309
 msgid "Selected Address books:"
 msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú©ØªØ§Ø¨Ú†Ù‡â€ŒÙ‡Ø§ÛŒ Ø¢Ø¯Ø±Ø³:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
-msgstr "Ø§Ø±Ø³Ø§Ù„ Ú©Ù„ÙŠØ¯ Ø¨Ù‡ Ø³Ø±ÙˆØ± Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ"
+msgstr "Ø§Ø±Ø³Ø§Ù„ Ú©Ù„ÛŒØ¯ Ø¨Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
-msgstr "Ø§Ø±Ø³Ø§Ù„ Ø¢Ø®Ø±ÙŠÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª"
-
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr " Ø¢ÙŠØ§ MDN Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ø§Ø±Ø³Ø§Ù„ Ú©Ù†Ù†Ø¯Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù…ÛŒâ€ŒÚ©Ù†Ø¯Ø¡ Ø§Ø±Ø³Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø§Ø±Ø³Ø§Ù„ Ø¢Ø®Ø±ÛŒÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
-msgstr "Ø§Ø±Ø³Ø§Ù„ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù…"
 
-#: folders.php:363
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr " Ø¢ÛŒØ§Ø±Ø³ÛŒØ¯ Ù…Ø·Ø§Ù„Ø¹Ù‡ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ø§Ø±Ø³Ø§Ù„ Ú©Ù†Ù†Ø¯Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù…ÛŒâ€ŒÚ©Ù†Ø¯ØŒ Ø§Ø±Ø³Ø§Ù„ Ø´ÙˆØ¯ØŸ"
+
+#: folders.php:397
 msgid "Sent mail folder"
-msgstr "Ù¾ÙˆØ´Ù‡ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ù¾ÙˆØ´Ù‡ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
-msgstr "Ù¾ÙˆØ´Ù‡ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡:"
+msgstr "Ù¾ÙˆØ´Ù‡ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
-msgstr "Ø³Ø±ÙˆØ±"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø²"
 
 #: config/prefs.php.dist:23
 msgid "Server and Folder Information"
-msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø³Ø±ÙˆØ± Ùˆ Ù¾ÙˆØ´Ù‡"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ú©Ø§Ø±Ø³Ø§Ø² Ùˆ Ù¾ÙˆØ´Ù‡"
 
 #: templates/fetchmail/manage.inc:23
 msgid "Server:"
-msgstr "Ø³Ø±ÙˆØ±:"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø²:"
 
 #: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
-msgstr "ØªÙ†Ø¸ÙŠÙ… Ø§ÙˆÙ„ÙˆÙŠØªâ€ŒÙ‡Ø§ Ø¨Ø±Ø§ÛŒ Ø²Ù…Ø§Ù† ØØ°Ù Ùˆ ÙŠØ§ Ø¬Ø§Ø¨Ù‡â€ŒØ¬Ø§ÙŠÙŠ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§"
+msgstr "ØªÙ†Ø¸ÛŒÙ… Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ Ø¨Ø±Ø§ÛŒ Ø²Ù…Ø§Ù† ØØ°Ù Ùˆ ÛŒØ§ Ø§Ù†ØªÙ‚Ø§Ù„ Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
-msgstr "Ø¢ÙŠØ§ Ø³Ø±Ø¢Ù…Ø¯ X-Priority Ù‡Ù†Ú¯Ø§Ù… Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ ØªÙ†Ø¸ÙŠÙ… Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø³Ø±Ø¢Ù…Ø¯ X-Priority Ù‡Ù†Ú¯Ø§Ù… Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ ØªÙ†Ø¸ÛŒÙ… Ø´ÙˆØ¯ØŸ"
 
 #: config/prefs.php.dist:31
 msgid "Share Folders"
@@ -3342,104 +3602,100 @@
 
 #: templates/acl/acl.inc:86
 msgid "Share mail folders"
-msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù…Ø´ØªØ±Ú©"
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ù…Ø´ØªØ±Ú©"
 
 #: config/prefs.php.dist:32
 msgid "Share your mail folders with other users."
-msgstr "Ø§Ø´ØªØ±Ø§Ú© Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø´Ù…Ø§ Ø¨Ø§ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯ÙŠÚ¯Ø±"
+msgstr "Ø§Ø´ØªØ±Ø§Ú© Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ø§Ù…Ù‡Ù” Ø´Ù…Ø§ Ø¨Ø§ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯ÛŒÚ¯Ø±"
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
-"Ø¢ÙŠØ§ Ø¨Ù„ÙˆÚ©Ù‡Ø§ÛŒ Ø¨Ø²Ø±Ú¯ Ù†Ù‚Ù„ Ù‚ÙˆÙ„ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŒ ÙŠØ§ Ù¾Ù†Ù‡Ø§Ù† Ø´ÙˆÙ†Ø¯ØŸ Ø§ÙŠÙ†  ØªÙ†Ø¸ÙŠÙ… Ø¨Ù‡ Ø±Ø§ØØªÛŒ "
-"Ø¯Ø± Ù‡Ø± Ø²Ù…Ø§Ù† Ú©Ù‡ Ø¨Ø®ÙˆØ§Ù‡ÙŠØ¯ Ù‚Ø§Ø¨Ù„ ØªØºÙŠÙŠØ± Ø§Ø³Øª"
+"Ø¢ÛŒØ§ Ø¨Ù„ÙˆÚ©Ù‡Ø§ÛŒ Ø¨Ø²Ø±Ú¯ Ù†Ù‚Ù„ Ù‚ÙˆÙ„ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŒ ÛŒØ§ Ù¾Ù†Ù‡Ø§Ù† Ø´ÙˆÙ†Ø¯ØŸ Ø§ÛŒÙ†  ØªÙ†Ø¸ÛŒÙ… Ø¨Ù‡ Ø±Ø§ØØªÛŒ "
+"Ø¯Ø± Ù‡Ø± Ø²Ù…Ø§Ù† Ú©Ù‡ Ø¨Ø®ÙˆØ§Ù‡ÛŒØ¯ Ù‚Ø§Ø¨Ù„ ØªØºÛŒÛŒØ± Ø§Ø³Øª"
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
-msgstr "Ø¢ÙŠØ§ Ø¨Ø¯Ù†Ù‡ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ text/plain Ø¨Ø±Ø§ÛŒ Ø¯Ø§Ø¯Ù‡ PGP Ù¾ÙˆÙŠÙŠØ¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¨Ø¯Ù†Ù‡Ù” Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¨Ø§ Ù…ØªÙ† Ø³Ø§Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ø¯Ø§Ø¯Ù‡ PGP Ù¾ÙˆÛŒÛŒØ¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
-msgstr "Ø¢ÙŠØ§ ØµÙØÙ‡ Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù… Ø¨Ø§ÙŠØ¯ Ø¨Ø¹Ø¯ Ø§Ø² Ø°Ø®ÙŠØ±Ù‡ Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³ Ø¨Ø³ØªÙ‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ ØµÙØÙ‡ Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù… Ø¨Ø§ÛŒØ¯ Ø¨Ø¹Ø¯ Ø§Ø² ØÙØ¸ ÛŒÚ© Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³ Ø¨Ø³ØªÙ‡ Ø´ÙˆØ¯ØŸ"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
-msgstr "Ø¢ÙŠØ§ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø§ÙŠØ¯ Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¨Ù‡ Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ Ø¶Ù…ÙŠÙ…Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ø§ÛŒØ¯ Ø¨Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ø¨Ù‡ Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ Ù¾ÛŒÙˆØ³Øª Ø´ÙˆØ¯ØŸ"
 
 #: templates/search/main.inc:92
 msgid "Show All Folders"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù‡Ù…Ù‡ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù‡Ù…Ù‡Ù” Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
 
 #: templates/message/headers.inc:67
 msgid "Show All Headers"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù‡Ù…Ù‡ Ø³Ø±Ø¢Ù…Ø¯Ù‡Ø§"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù‡Ù…Ù‡Ù” Ø³Ø±Ø¢Ù…Ø¯Ù‡Ø§"
 
-#: mailbox.php:354
+#: mailbox.php:365
 msgid "Show Deleted"
-msgstr "Ù†Ù…Ø§ÙŠØ´ ØØ°Ù Ø´Ø¯Ù‡â€ŒÙ‡Ø§"
+msgstr "Ù†Ù…Ø§ÛŒØ´ ØØ°Ù Ø´Ø¯Ù‡â€ŒÙ‡Ø§"
 
 #: templates/message/headers.inc:61
 msgid "Show Limited Headers"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ø³Ø±Ø¢Ù…Ø¯Ù‡Ø§ÛŒ Ù…ØØ¯ÙˆØ¯ Ø´Ø¯Ù‡"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø³Ø±Ø¢Ù…Ø¯Ù‡Ø§ÛŒ Ù…ØØ¯ÙˆØ¯ Ø´Ø¯Ù‡"
 
 #: templates/message/headers.inc:70
 msgid "Show Mailing List Information"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙÙ‡Ø±Ø³Øª Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙÙ‡Ø±Ø³Øª Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§"
 
 #: templates/search/main.inc:92
 msgid "Show Only Subscribed Folders"
-msgstr "ÙÙ‚Ø· Ù†Ù…Ø§ÙŠØ´ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø¹Ø¶Ùˆ"
+msgstr "ÙÙ‚Ø· Ù†Ù…Ø§ÛŒØ´ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø¹Ø¶Ùˆ"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Show Unsubscribed"
-msgstr "Ù†Ù…Ø§ÙŠØ´ ØºÙŠØ± Ø¹Ø¶Ùˆâ€ŒÙ‡Ø§"
+msgstr "Ù†Ù…Ø§ÛŒØ´ ØºÛŒØ±Ø¹Ø¶Ùˆâ€ŒÙ‡Ø§"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
-msgstr "Ø¢ÙŠØ§ ÙŠÚ© Ø¢ÙŠÚ©ÙˆÙ† Ø¨Ø±Ø§ÛŒ Ú¯Ø±ÙØªÙ† Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ Ø§Ø² Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ ÛŒÚ© Ø¢ÛŒÚ©ÙˆÙ† Ø¨Ø±Ø§ÛŒ Ø§Ø®Ø° Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ Ø§Ø² Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
-msgstr "Ø¢ÙŠØ§ Ø´Ø±Ø Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ù†Ù…Ø§ÙŠØ´ ØµÙ†Ø¯ÙˆÙ‚ Ù¾Ø³ØªÛŒ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø´Ø±Ø Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ù†Ù…Ø§ÛŒØ´ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØ´ Ù†Ù…Ø§ÙŠØ´â€ŒÙ‡Ø§ ÙÙ‚Ø· Ø¨Ø±Ø§ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØ´â€ŒÙ†Ù…Ø§ÛŒØ´Ù‡Ø§ ÙÙ‚Ø· Ø¨Ø±Ø§ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù‡ Ù†Ø´Ø¯Ù‡ Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
-msgstr "Ø¢ÙŠØ§ Ù¾ÙŠØ´ Ù†Ù…Ø§ÙŠØ´â€ŒÙ‡Ø§ Ø¯Ø± tooltip Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù¾ÛŒØ´ Ù†Ù…Ø§ÛŒØ´Ù‡Ø§ Ø¯Ø± Ø±Ø§Ù‡Ù†Ù…Ø§ÛŒ Ø¢Ù†ÛŒ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
-msgstr "Ø¢ÙŠØ§ Ø¢ÙŠÚ©ÙˆÙ† ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¯Ø± ÙÙ‡Ø±Ø³Øª Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¢ÛŒÚ©ÙˆÙ† ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡ Ø¯Ø± Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:95
 msgid "Show the Images"
-msgstr "Ù†Ù…Ø§ÙŠØ´ ØªØµØ§ÙˆÙŠØ±"
+msgstr "Ù†Ù…Ø§ÛŒØ´ ØªØµØ§ÙˆÛŒØ±"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
-msgstr "Ø¢ÙŠØ§ Ø¢ÙŠÚ©ÙˆÙ† ÙÙŠÙ„ØªØ± Ø¯Ø± Ù…Ù†Ùˆ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ø¢ÛŒÚ©ÙˆÙ† ÙÛŒÙ„ØªØ± Ø¯Ø± Ú¯Ø²ÛŒÙ†Ú¯Ø§Ù† Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
-msgstr "Ø¢ÙŠØ§ Ù…Ø¬Ù…ÙˆØ¹ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ ØªØ¹Ø¯Ø§Ø¯ Ú©Ù„ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ù†Ø´Ø§Ù† Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:666
 msgid "Shown"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù†"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr "Ø¹Ø¶Ùˆ Ø´Ø¯Ù† Ø¯Ø± ØµÙˆØ±Øª Ø«Ø¨Øª Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯Ù†"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Ø§Ù…Ø¶Ø§ Ø´Ø¯Ù‡"
@@ -3448,151 +3704,182 @@
 msgid "Size"
 msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¬Ù‡Øªâ€ŒÙ‡Ø§"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
-msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ Ø±Ø³ÙŠØ¯Ù‡"
+msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ ÙˆØ±ÙˆØ¯"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
-msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ ØªØ§Ø±ÙŠØ®"
+msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ ØªØ§Ø±ÛŒØ®"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ Ø¢Ø¯Ø±Ø³ ÙØ±Ø³ØªÙ†Ø¯Ù‡"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
-msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ Ø§Ù†Ø¯Ø§Ø²Ù‡ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Ù¾ÛŒØºØ§Ù…"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ Ø¹Ù†ÙˆØ§Ù†"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
-msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø± Ø§Ø³Ø§Ø³ Ù…ÙˆØ±Ø¯"
+msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø³Ù„Ø³Ù„Ù‡â€ŒØ§ÛŒÛŒ"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
-msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø±Ø§Ø³Ø§Ø³ Ø¢Ø¯Ø±Ø³ Ú¯ÙŠØ±Ù†Ø¯Ù‡"
+msgstr "Ù…Ø±ØªØ¨ Ø³Ø§Ø²ÛŒ Ø¨Ø±Ø§Ø³Ø§Ø³ Ø¢Ø¯Ø±Ø³ Ú¯ÛŒØ±Ù†Ø¯Ù‡"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
-msgstr "Ù¾ÙˆØ´Ù‡ Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡:"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
-msgstr "Ù†ÙˆÙŠØ³Ù‡â€ŒÙ‡Ø§ÛŒ Ø®Ø§Øµ"
+msgstr "Ù†ÙˆÛŒØ³Ù‡â€ŒÙ‡Ø§ÛŒ Ø®Ø§Øµ"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø¬Ø§Ø²ÛŒ Ø®Ø§Øµ Ù‚Ø§Ø¨Ù„ ÙˆÛŒØ±Ø§ÛŒØ´ Ù†ÛŒØ³ØªÙ†Ø¯ "
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
-msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ"
+msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
-msgstr "Ø®Ø·Ø§ÙŠØ§Ø¨ Ø§Ù…Ù„Ø§ÙŠÛŒ"
+msgstr "Ø®Ø·Ø§ÛŒØ§Ø¨ Ø§Ù…Ù„Ø§ÛŒÛŒ"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
-msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ Ú©Ø§Ù…Ù„ Ø´Ø¯"
+msgstr "Ø¨Ø±Ø±Ø³ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ Ú©Ø§Ù…Ù„ Ø´Ø¯"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
-msgstr "Ø®Ø·Ø§Ù‡Ø§ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ Ø¯Ø± Ù‡Ø± ØµÙØÙ‡ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø±Ø±Ø³ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ"
+msgstr "Ø®Ø·Ø§Ù‡Ø§ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ Ø¯Ø± Ù‡Ø± ØµÙØÙ‡ Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø±Ø±Ø³ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ"
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr "Ø´Ø±ÙˆØ¹"
 
-#: lib/MIME/Viewer/itip.php:673
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Ù†Ø§Ù… Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Ù†ÙˆØ¹ Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø±:"
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
-msgstr "ÙˆØ¶Ø¹ÙŠØªâ€Œ"
+msgstr "ÙˆØ¶Ø¹ÛŒØªâ€Œ"
 
-#: lib/MIME/Contents.php:222
+#: lib/MIME/Contents.php:215
 msgid "Strip Attachment"
-msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ø¶Ù…ÙŠÙ…Ù‡"
+msgstr "ØØ°Ù Ù¾ÛŒÙˆØ³Øª"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
-msgstr "ØØ°Ù Ø¬Ø¯Ø§Ú©Ù†Ù†Ø¯Ù‡ Ø®Ø·ÙˆØ·"
+msgstr "ØØ°Ù Ø¬Ø¯Ø§Ú©Ù†Ù†Ø¯Ù‡Ù” Ø®Ø·ÙˆØ·"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Ø¹Ù†ÙˆØ§Ù†"
 
-#: search.php:157 message.php:260 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Ø¹Ù†ÙˆØ§Ù†"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:920
 msgid "Subject Field"
-msgstr "ÙÙŠÙ„Ø¯ Ø¹Ù†ÙˆØ§Ù†"
+msgstr "ÙÛŒÙ„Ø¯ Ø¹Ù†ÙˆØ§Ù†"
 
-#: search.php:360 templates/pgp/passphrase.inc:31
-#: templates/smime/passphrase.inc:21
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
-msgstr "Ø§Ø±Ø³Ø§Ù„"
+msgstr "Ø§Ø±Ø§Ø¦Ù‡"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
-msgstr "Ø®Ø§Ù„ÛŒ Ú©Ø±Ø¯Ù† Ù¾ÙˆØ´Ù‡ (Ù‡Ø§)"
+msgstr "Ø¹Ø¶ÙˆÛŒØª Ø¯Ø± Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
-#: lib/MIME/Viewer/pgp.php:395 lib/MIME/Viewer/status.php:90
-#: lib/MIME/Viewer/pkcs7.php:370
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
-msgstr "Ù…ÙˆÙÙ‚ÙŠØª Ø¢Ù…ÙŠØ²"
+msgstr "Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
-msgstr "Ù¾ÙŠØ´Ù†Ù‡Ø§Ø¯Ø§Øª"
+msgstr "Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯Ø§Øª"
 
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Ø®Ù„Ø§ØµÙ‡"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
-msgstr "ØªØ¹ÙˆÙŠØ¶ Ø´ÙŠÙˆÙ‡ Ø§Ù†Ø´Ø§Ø¡"
+msgstr "ØªØ¹ÙˆÛŒØ¶ Ø´ÛŒÙˆÙ‡Ù” Ø§Ù†Ø´Ø§Ø¡"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
-msgstr "ØªØ¹ÙˆÙŠØ¶ Ø¨Ù‡ Ù…Ø¯ HTML"
+msgstr "ØªØ¹ÙˆÛŒØ¶ Ø¨Ù‡ Ù…Ø¯ HTML"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
-msgstr "ØªØ¹ÙˆÙŠØ¶ Ø¨Ù‡ Ù…Ø¯ Ù…ØªÙ†"
+msgstr "ØªØ¹ÙˆÛŒØ¶ Ø¨Ù‡ Ù…Ø¯ Ø§Ù†Ø´Ø§ÛŒ Ù…ØªÙ† Ø³Ø§Ø¯Ù‡"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "Ù…ØªÙ†"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr "Ø¢Ø²Ù…Ø§ÛŒØ´ÛŒ"
+
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
-msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ø·ÙˆØ± Ø¢Ø²Ù…Ø§ÙŠØ´ÛŒ Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ø´Ø¯"
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¨Ø·ÙˆØ± Ø¢Ø²Ù…Ø§ÛŒØ´ÛŒ Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´Ø¯"
 
-#: lib/MIME/Viewer/itip.php:746
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
-msgstr "Ø¨Ø·ÙˆØ± Ø¢Ø²Ù…Ø§ÙŠØ´ÛŒ Ù¾Ø°ÙŠØ±ÙØªÙ‡ Ø´Ø¯"
+msgstr "Ù¾Ø°ÛŒØ±ÙØªÙ‡ Ø´Ø¯Ù‡Ù” Ø¢Ø²Ù…Ø§ÛŒØ´ÛŒ"
 
 # 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
-msgstr "Ù…ÙˆØ§Ø±Ø¯ Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø³Ø±ÙˆÙŠØ³ Ø¯Ø± conf.php Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù…ÙˆØ§Ø±Ø¯ Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Ø³Ø±ÙˆÛŒØ³ Ø¯Ø± conf.php Ù…Ø´Ø®Øµ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Ù…ØªÙ†"
+
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
-msgstr "Ø³ØªÙˆÙ† ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ù¾ÙŠØºØ§Ù… Ø¨Ø§ÙŠØ¯ Ù¾ÙŠÙˆÙ†Ø¯ Ø¨Ø®ÙˆØ±Ø¯ Ø¨Ù‡: "
+msgstr "Ø³ØªÙˆÙ† ÙØ±Ø³ØªÙ†Ø¯Ù‡Ù” Ù¾ÛŒØºØ§Ù… Ø¨Ø§ÛŒØ¯ Ù¾ÛŒÙˆÙ†Ø¯ Ø´ÙˆØ¯: "
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr ""
@@ -3607,502 +3894,552 @@
 #: fetchmailprefs.php:74
 #, php-format
 msgid "The account \"%s\" has been saved."
-msgstr "ØØ³Ø§Ø¨ \"%s\" Ø°Ø®ÙŠØ±Ù‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
-
-# 
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Ø¢Ø¯Ø±Ø³ \"%s\" Ø¨Ù‡ %s Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯"
+msgstr "ØØ³Ø§Ø¨ \"%s\" ØÙØ¸ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
 #: attachment.php:43
 msgid "The attachment was not found."
-msgstr "Ù‡ÙŠÚ† Ø¶Ù…ÙŠÙ…Ù‡â€ŒØ§ÛŒ Ù¾ÙŠØ¯Ø§ Ù†Ø´Ø¯"
+msgstr "Ù¾ÛŒÙˆØ³Øª Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯"
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr " Ø¯Ø§Ø¯Ù‡Ù” ØªÙ‚ÙˆÛŒÙ… Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª "
 
 #: templates/javascript/open_compose_win.js:37
 msgid ""
 "The compose window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
-"ØµÙØÙ‡ ØªÙˆÙ„ÙŠØ¯ Ù¾ÙŠØºØ§Ù… Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨Ø§Ø² Ø´ÙˆØ¯ . Ø´Ø§ÙŠØ¯ Ø´Ù…Ø§ Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø²Ù†Ú©Ø±Ø¯Ù† "
-"Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ ØªÙ†Ø¸ÙŠÙ… Ú©Ø±Ø¯Ù‡â€ŒØ§ÙŠØ¯ØŸ"
+"ØµÙØÙ‡Ù” ØªÙˆÙ„ÛŒØ¯ Ù¾ÛŒØºØ§Ù… Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨Ø§Ø² Ø´ÙˆØ¯. Ø´Ø§ÛŒØ¯ Ø´Ù…Ø§ Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø²Ù†Ú©Ø±Ø¯Ù† "
+"Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ ØªÙ†Ø¸ÛŒÙ… Ú©Ø±Ø¯Ù‡â€ŒÛŒØ¯ØŸ"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
-msgstr "Ù…ØØªÙˆÙŠØ§Øª Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Macintosh Ø¯Ø± Ø°ÙŠÙ„ Ø¢Ù…Ø¯Ù‡ Ø§Ø³Øª."
+msgstr "Ù…ØØªÙˆÛŒØ§Øª Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Macintosh Ø¯Ø± Ø°ÛŒÙ„ Ø¢Ù…Ø¯Ù‡ Ø§Ø³Øª."
 
 # 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
-msgstr "Ù¾ÙˆØ´Ù‡(Ù‡Ø§)ÛŒ Ø¬Ø§Ø±ÛŒ \"%s\" Ø¨Ù‡ \"%s\" ØªØºÙŠÙŠØ± Ù†Ø§Ù… ÙŠØ§ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡(Ù‡Ø§)ÛŒ Ø¬Ø§Ø±ÛŒ \"%s\" Ø¨Ù‡ \"%s\" ØªØºÛŒÛŒØ± Ù†Ø§Ù… ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª"
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
-msgstr "ÙÙ‡Ø±Ø³Øª Ú©Ù†ÙˆÙ†ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø§ Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ø§ÙŠÙ† Ù¾ÙˆØ´Ù‡ Ù‚Ø§Ø¨Ù„ Ø¨Ø§Ø²ÙŠØ§Ø¨ÛŒ Ù†ÙŠØ³Øª"
+msgstr "ÙÙ‡Ø±Ø³Øª Ú©Ù†ÙˆÙ†ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø§ Ø§Ø¬Ø§Ø²Ù‡Ù” Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ø§ÛŒÙ† Ù¾ÙˆØ´Ù‡ Ù‚Ø§Ø¨Ù„ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ù†ÛŒØ³Øª"
 
 # 
-#: compose.php:1146
+#: compose.php:1236
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
-msgstr "Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³ Ø¯Ø± Ù¾ÙˆØ´Ù‡ \"%s\" Ø°Ø®ÙŠØ±Ù‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³ Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” \"%s\" ØÙØ¸ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
-msgstr "Ø±ÙˆÙŠØ¯Ø§Ø¯ Ø¨Ù‡ ØªÙ‚ÙˆÙŠÙ… Ø´Ù…Ø§ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡ Ø¨ÙˆØ¯"
+msgstr "Ø±ÙˆÛŒØ¯Ø§Ø¯ Ø¨Ù‡ ØªÙ‚ÙˆÛŒÙ… Ø´Ù…Ø§ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡ Ø¨ÙˆØ¯"
 
 # 
 #: templates/compose/expand.inc:9
-#, php-format
-msgid "The field '%s' can't be expanded."
-msgstr "ÙÙŠÙ„Ø¯ '%s' Ù‚Ø§Ø¨Ù„ Ø¨Ø§Ø² Ø´Ø¯Ù† Ù†ÙŠØ³Øª"
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "ÙÛŒÙ„Ø¯ '%s' Ù‚Ø§Ø¨Ù„ Ø¨Ø§Ø² Ø´Ø¯Ù† Ù†ÛŒØ³Øª"
 
 # 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" Ù‡Ù… Ø§Ú©Ù†ÙˆÙ† Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø§Ø² Ù‚Ø¨Ù„ Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³Øª"
 
 # 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
-"Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ \"%s\" Ø´Ø§Ù…Ù„ Ù†ÙˆÙŠØ³Ù‡â€ŒÙ‡Ø§ÛŒ ØºÙŠØ± Ù…Ø¬Ø§Ø² Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ú©Ù‡ Ø§ÙŠÙ† Ù…Ø³Ø¦Ù„Ù‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ú©Ù„Ø§ØªÛŒ "
-"Ø±Ø§ Ø§ÙŠØ¬Ø§Ø¯ Ú©Ù†Ø¯. Ù„Ø·ÙØ§Ù‹ Ø¨Ø§ Ù…Ø³Ø¦ÙˆÙ„ Ø³ÙŠØ³ØªÙ… Ø®ÙˆØ¯ ØªÙ…Ø§Ø³ Ø¨Ú¯ÙŠØ±ÙŠØ¯"
+"Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø´Ø§Ù…Ù„ Ù†ÙˆÛŒØ³Ù‡â€ŒÙ‡Ø§ÛŒ ØºÛŒØ± Ù…Ø¬Ø§Ø² Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ú©Ù‡ Ø§ÛŒÙ† Ù…Ø³Ø¦Ù„Ù‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ú©Ù„Ø§ØªÛŒ "
+"Ø±Ø§ Ø§ÛŒØ¬Ø§Ø¯ Ú©Ù†Ø¯. Ù„Ø·ÙØ§Ù‹ Ø¨Ø§ Ø³Ø±Ù¾Ø±Ø³Øª Ø³Ø§Ù…Ø§Ù†Ù‡Ù” Ø®ÙˆØ¯ ØªÙ…Ø§Ø³ Ø¨Ú¯ÛŒØ±ÛŒØ¯"
 
 # 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" Ø§ÙŠØ¬Ø§Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª Ø§Ù…Ø§ Ø´Ù…Ø§ Ø¯Ø± Ø¢Ù† Ø¹Ø¶Ùˆ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´ÙŠØ¯ "
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª Ø§Ù…Ø§ Ø´Ù…Ø§ Ø¯Ø± Ø¢Ù† Ø¹Ø¶Ùˆ Ù†Ù…ÛŒâ€ŒØ¨Ø§Ø´ÛŒØ¯ "
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª Ø§Ù…Ø§ Ø´Ù…Ø§ Ø¹Ø¶ÙˆÙŠØª Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø± Ø¢Ù† Ù„ØºÙˆ Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§ÙŠØ¯ "
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª Ø§Ù…Ø§ Ø´Ù…Ø§ Ø¹Ø¶ÙˆÛŒØª Ø®ÙˆØ¯ Ø±Ø§ Ø¯Ø± Ø¢Ù† Ù„ØºÙˆ Ù†Ú©Ø±Ø¯Ù‡â€ŒÛŒØ¯ "
 
 # 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" Ø§ÙŠØ¬Ø§Ø¯ Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø§ÛŒØ¬Ø§Ø¯ Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª"
 
 # 
-#: lib/Folder.php:373
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
-msgstr "Ù¾ÙˆØ´Ù‡ '%s' ØØ°Ù Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” '%s' ØØ°Ù Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§ÙŠØ¬Ø§Ø¯ Ø´Ø¯"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯"
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª ØØ°Ù Ø´Ø¯"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª ØØ°Ù Ø´Ø¯"
 
 # 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
-msgstr "Ù¾ÙˆØ´Ù‡ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø¨Ù‡ \"%s\" ØªØºÙŠÙŠØ± Ù†Ø§Ù… ÙŠØ§ÙØªÙ‡ Ø§Ø³Øª"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¨Ù‡ \"%s\" ØªØºÛŒÛŒØ± Ù†Ø§Ù… ÛŒØ§ÙØªÙ‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œâ€ŒÙ‡Ø§ÛŒ Ø²ÙŠØ± Ø¨Ù‡ Ø§ÙŠÙ† Ù‚Ø³Ù…Øª Ø¶Ù…ÙŠÙ…Ù‡ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯:"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œâ€ŒÙ‡Ø§ÛŒ Ø²ÛŒØ± Ø¨Ù‡ Ø§ÛŒÙ† Ù‚Ø³Ù…Øª Ù¾ÛŒÙˆØ³Øª Ø´Ø¯Ù‡â€Œ Ø§Ø³Øª:"
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Ù¾Ù†Ø¬Ø±Ù‡Ù” ØÙØ¸ ØªØµÙˆÛŒØ± Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ø¨Ø§Ø² Ø´ÙˆØ¯. Ø´Ø§ÛŒØ¯ Ø´Ù…Ø§ Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø²Ù†Ú©Ø±Ø¯Ù† "
+"Ù¾Ù†Ø¬Ø±Ù‡â€ŒÙ‡Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù†ÛŒ ØªÙ†Ø¸ÛŒÙ… Ú©Ø±Ø¯Ù‡â€ŒÛŒØ¯ØŸ"
 
-#: lib/MIME/Viewer/html.php:96
+#: lib/MIME/Viewer/html.php:97
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
-msgstr "ØªØµÙˆÙŠØ±Ù‡Ø§ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ Ú†ÙˆÙ† ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡ Ø¢Ø¯Ø³ Ø´Ù…Ø§ ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯"
+msgstr "ØªØµÙˆÛŒØ±Ù‡Ø§ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ Ú†ÙˆÙ† ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ø¯Ø± Ú©ØªØ§Ø¨Ú†Ù‡Ù” Ø¢Ø¯Ø³ Ø´Ù…Ø§ ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯"
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
-msgstr "Ø³Ø±ÙˆØ± Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø®Ø·Ø§ÛŒ Ø²ÙŠØ± Ø±Ø§ ØªÙˆÙ„ÙŠØ¯ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª:"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø®Ø·Ø§ÛŒ Ø²ÛŒØ± Ø±Ø§ ØªÙˆÙ„ÛŒØ¯ Ú©Ø±Ø¯:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
-msgstr "Ø³Ø±ÙˆØ± Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ Ø²ÙŠØ± Ø±Ø§ ØªÙˆÙ„ÙŠØ¯ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª:"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ Ø²ÛŒØ± Ø±Ø§ ØªÙˆÙ„ÛŒØ¯ Ú©Ø±Ø¯:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
-msgstr "Ø³Ø±ÙˆØ± Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø²ÙŠØ± Ø±Ø§ ØªÙˆÙ„ÙŠØ¯ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª:"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ø§Ù…Ù‡Ù” Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø±Ø§ ØªÙˆÙ„ÛŒØ¯ Ú©Ø±Ø¯:"
 
 # 
-#: lib/Message.php:645
+#: lib/Message.php:651
 #, php-format
 msgid "The mailbox %s is already empty."
-msgstr "ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ %s Ù‚Ø¨Ù„Ø§Ù‹ Ø®Ø§Ù„ÛŒ Ø¨ÙˆØ¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† %s Ù‚Ø¨Ù„Ø§Ù‹ Ø®Ø§Ù„ÛŒ Ø¨ÙˆØ¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
-msgstr "Ù¾ÙŠØºØ§Ù… \"%s\" Ø§Ø² \"%s\"  (%d Ø¨Ø§ÙŠØª ) ØªØ¬Ø§ÙˆØ² Ø§Ø² ØØ¯Ø§Ú©Ø«Ø± Ø§Ù†Ø¯Ø§Ø²Ù‡ ÙˆØ§Ú©Ø´ÛŒ"
+msgstr "Ù¾ÛŒØºØ§Ù… \"%s\" Ø§Ø² \"%s\" (%d Ø¨Ø§ÛŒØª) ØªØ¬Ø§ÙˆØ² Ø§Ø² ØØ¯Ø§Ú©Ø«Ø± Ø§Ù†Ø¯Ø§Ø²Ù‡ ÙˆØ§Ú©Ø´ÛŒ"
 
 #: templates/contacts/contacts.inc:103
 msgid "The message being composed has been closed. Exiting."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø§ÙŠØ¬Ø§Ø¯ Ø´Ø¯Ù‡ Ø¨Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯Ù‡ Ø¨Ø³ØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª: Ø®Ø±ÙˆØ¬"
 
-#: message.php:143
+#: message.php:148
 msgid "The message has been deleted."
-msgstr "Ù¾ÙŠØºØ§Ù… ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ù¾ÛŒØºØ§Ù… ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø¨Ø§Ø²Ø¨ÙŠÙ†ÛŒ Ø´Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø§Ø²Ø¨ÛŒÙ†ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:374
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
 msgid "The message has been verified. Sender: %s."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø¨Ø±Ø±Ø³ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª. ÙØ±Ø´ØªÙ†Ø¯Ù‡: %s"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø¨Ø§Ø²Ø¨ÛŒÙ†ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª. ÙØ±Ø³ØªÙ†Ø¯Ù‡: %s"
 
-#: templates/pgp/open_pgp_win.js:10 templates/smime/open_smime_win.js:10
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
 "The passphrase window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
-"Ù¾Ù†Ø¬Ø±Ù‡ passphrase Ù‚Ø§Ø¯Ø± Ø¨Ù‡ Ø¨Ø§Ø² Ø´Ø¯Ù† Ù†ÙŠØ³Øª. Ø´Ø§ÙŠØ¯ Ø´Ù…Ø§ Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ¯ Ø±Ø§ Ø§ÙŠÙ†Ú¯ÙˆÙ†Ù‡ ØªÙ†Ø¸ÙŠÙ… "
-"Ú©Ø±Ø¯Ù‡â€ŒØ§ÙŠØ¯ØŸ"
+"Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ù‚Ø§Ø¯Ø± Ø¨Ù‡ Ø¨Ø§Ø² Ø´Ø¯Ù† Ù†ÛŒØ³Øª. Ø´Ø§ÛŒØ¯ Ø´Ù…Ø§ Ù…Ø±ÙˆØ±Ú¯Ø± Ø®ÙˆØ¯ Ø±Ø§ Ø§ÛŒÙ†Ú¯ÙˆÙ†Ù‡ ØªÙ†Ø¸ÛŒÙ… "
+"Ú©Ø±Ø¯Ù‡â€ŒØ§â€ŒÛŒØ¯ØŸ"
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
-msgstr "Ù…ØªÙ† Ø®Ø§Ù… Ø§Ø² Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´ÙˆØ¯ %s"
+msgstr "Ù…ØªÙ† Ø®Ø§Ù… Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´ÙˆØ¯ %s"
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø¯Ø±Ø®ÙˆØ§Ø³ØªÛŒ Ø¯Ø± Ø¶Ù…ÙŠÙ…Ù‡ MS-TNEF ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Ø¯Ø±Ø®ÙˆØ§Ø³ØªÛŒ Ø¯Ø± Ù¾ÛŒÙˆØ³Øª MS-TNEF ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø¯Ø± Ø®ÙˆØ§Ø³ØªÛŒ Ø¯Ø± Ø¶Ù…ÙŠÙ…Ù‡ Zip ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Ø¯Ø± Ø®ÙˆØ§Ø³ØªÛŒ Ø¯Ø± Ù¾ÛŒÙˆØ³Øª Zip ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
 
-#: message.php:548
+#: message.php:547
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
 "from you when you have read this message. Please click %s to send the "
 "notification message."
 msgstr ""
-"ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… ØªÙ‚Ø§Ø¶Ø§ Ø¯Ø§Ø±Ø¯ Ú©Ù‡ ÙŠÚ© ØªØ£ÙŠÙŠØ¯ÙŠÙ‡ Ø¨Ø±Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù† Ù¾ÙŠØºØ§Ù… Ø¯Ø±ÙŠØ§ÙØª Ú©Ù†Ø¯Ù„Ø·ÙØ§Ù‹ "
-"Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø®ÙˆØ§Ù†Ø¯ÙŠØ¯ Ø¨Ø± Ø±ÙˆÛŒ %s ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯ ØªØ§ Ø§ÙŠÙ† ØªØ£ÙŠÙŠØ¯ÙŠÙ‡ Ø§Ø±Ø³Ø§Ù„ Ø´ÙˆØ¯"
+"ÙØ±Ø³ØªÙ†Ø¯Ù‡ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… ØªÙ‚Ø§Ø¶Ø§ Ø¯Ø§Ø±Ø¯ Ú©Ù‡ ÛŒÚ© ØªØ£Ø¦ÛŒØ¯ÛŒÙ‡ Ø¨Ø±Ø§ÛŒ Ø®ÙˆØ§Ù†Ø¯Ù† Ù¾ÛŒØºØ§Ù… Ø¯Ø±ÛŒØ§ÙØª Ú©Ù†Ø¯ Ù„Ø·ÙØ§Ù‹ "
+"Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø®ÙˆØ§Ù†Ø¯ÛŒØ¯ Ø¨Ø± Ø±ÙˆÛŒ %s Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯ ØªØ§ Ø§ÛŒÙ† ØªØ£Ø¦ÛŒØ¯ÛŒÙ‡ Ø§Ø±Ø³Ø§Ù„ Ø´ÙˆØ¯"
+
+# 
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr " Ú©Ø§Ø±Ø³Ø§Ø² Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ ØªØµÙˆÛŒØ± Ú©ÙˆÚ†Ú©ÛŒ Ø§Ø² Ø§ÛŒÙ† ØªØµÙˆÛŒØ± Ø±Ø§ Ø§ÛŒØ¬Ø§Ø¯ Ú©Ù†Ø¯"
 
 #: templates/compose/compose.js:104
 msgid "The signature could not be replaced."
-msgstr "Ø§Ù…Ø¶Ø§Ø¡ Ø±Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¬Ø§ÛŒ Ú¯Ø°Ø§Ø±ÛŒ Ú©Ø±Ø¯"
+msgstr "Ø§Ù…Ø¶Ø§Ø¡ Ø±Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ú©Ø±Ø¯"
 
 #: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
-msgstr "Ø§Ù…Ø¶Ø§Ø¡ Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø¬Ø§ÛŒ Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯"
+msgstr "Ø§Ù…Ø¶Ø§Ø¡ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯"
 
 #: attachment.php:59
 msgid "The specified file does not exist."
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ù…Ø´Ø®Øµ Ø´Ø¯Ù‡ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Ù…Ø´Ø®Øµ Ø´Ø¯Ù‡ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯"
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø± \"%s\" Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø± \"%s\" ØØ°Ù Ø´Ø¯Ù‡ Ø§Ø³Øª"
+
+# #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
+# 
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø± \"%s\" Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/itip.php:159
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
-msgstr "ÙˆØ·ÙŠÙÙ‡ Ù…ÙˆØ±Ø¯ Ù†Ø¸Ø± Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª ÙˆØ¸Ø§ÙŠÙ Ø´Ù…Ø§ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "ÙˆØ¸ÛŒÙÙ‡Ù” Ù…ÙˆØ±Ø¯ Ù†Ø¸Ø± Ø¨Ù‡ ÙÙ‡Ø±Ø³Øª ÙˆØ¸Ø§ÛŒÙ Ø´Ù…Ø§ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
-msgstr "Ù…ØªÙ† Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù…ØªÙ† Ù¾ÛŒØºØ§Ù…"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
+#, php-format
 msgid "The text of the message can be viewed %s."
-msgstr "Ù…ØªÙ† Ù¾ÙŠØºØ§Ù…"
+msgstr "Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… Ù‚Ø§Ø¨Ù„ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø§Ø³Øª %s"
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
-msgstr "Ù…ØªÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ø±Ú¯Ø±Ù†Ø¯Ø§Ù†Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ø±Ú¯Ø±Ù†Ø¯Ø§Ù†Ø¯Ù‡ Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
+#, php-format
 msgid "The text of the returned message can be viewed %s."
-msgstr " Ù…ØªÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ø±Ú¯Ø±Ù†Ø¯Ø§Ù†Ø¯Ù‡ Ø´Ø¯Ù‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´ÙˆØ¯ %s"
+msgstr " Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ø±Ú¯Ø±Ù†Ø¯Ø§Ù†Ø¯Ù‡ Ø´Ø¯Ù‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´ÙˆØ¯ %s"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
-msgstr "Ù…ØªÙ† Ù¾ÙŠØºØ§Ù… ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡"
+msgstr "Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
 msgid "The text of the sent message can be viewed %s."
-msgstr "Ù…ØªÙ† Ù¾ÙŠØºØ§Ù… ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´ÙˆØ¯ %s"
+msgstr "Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ø´ÙˆØ¯ %s"
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
-msgstr "Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø§Ø·Ù„Ø§Ø¹Ø§Øª free/busy Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø°Ø®ÙŠØ±Ù‡ Ø´Ø¯Ù†Ø¯"
+msgstr "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø°Ø®ÛŒØ±Ù‡ Ø´Ø¯"
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
-msgstr "Ø¨Ø®Ø´ Ø¬Ø§ÙŠÚ¯Ø²ÙŠÙ†ÛŒ Ú©Ù‡ Ø¨ØªÙˆØ§Ù†Ø¯ Ø¯Ø±Ø®Ø· Ù†Ù…Ø§ÙŠØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ Ù†ÙŠØ³Øª"
+msgstr "Ø¨Ø®Ø´ Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†ÛŒ Ú©Ù‡ Ø¨ØªÙˆØ§Ù†Ø¯ Ø¯Ø±Ø®Ø· Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ Ù…ÙˆØ¬ÙˆØ¯ Ù†ÛŒØ³Øª"
 
 #: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
-msgstr "Ù¾ÙŠØºØ§Ù…ÛŒ Ø¯Ø± ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ Ù†ÙŠØ³Øª"
+msgstr "Ù¾ÛŒØºØ§Ù…ÛŒ Ø¯Ø± Ø§ÛŒÙ† Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ù†ÛŒØ³Øª"
+
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Ø¨Ø®Ø´ Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†ÛŒ Ú©Ù‡ Ø¨ØªÙˆØ§Ù†Ø¯ Ø¯Ø±Ø®Ø· Ù†Ù…Ø§ÛŒØ´ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆØ¯ Ù…ÙˆØ¬ÙˆØ¯ Ù†ÛŒØ³Øª"
 
 # 
-#: lib/Message.php:604
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù %s Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª: "
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† %s Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª: "
 
 # 
-#: lib/Message.php:647
+#: lib/Message.php:653
+#, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
-msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØª: %s"
 
 # 
-#: lib/Message.php:613
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
+"Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
 
 # 
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØªÙ‡ÙŠÙ‡ Ø±ÙˆÙ†ÙˆØ´Øª Ø§Ø² \"%s\" Ø¨Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± "
-"Ú¯ÙØªÙ‡ Ø§Ø³Øª"
+"Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ØªÙ‡ÛŒÙ‡Ù” Ø±ÙˆÙ†ÙˆØ´Øª Ù¾ÛŒØºØ§Ù… Ø§Ø² \"%s\" Ø¨Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ "
+"Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª"
 
 # 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø§Ø² Ù¾ÙˆØ´Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ "
+"Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ØØ°Ù Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø§Ø² Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ "
 "Ø§Ø³Øª"
 
 # 
-#: lib/Message.php:296
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ "
+"Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ØØ°Ù Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ "
 "Ø§Ø³Øª"
 
 # 
-#: lib/Message.php:230
+#: lib/Message.php:211
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ØØ°Ù Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª: %s"
 
 # 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:99
 #, php-format
 msgid "There was an error deleting the event: %s."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ØØ°Ù Ø±ÙˆÙŠØ¯Ø§Ø¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ØØ°Ù Ø±ÙˆÛŒØ¯Ø§Ø¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± Ù†Ù…Ø§ÙŠØ´ Ø§ÙŠÙ† Ø¨Ø®Ø´ Ù¾ÙŠØºØ§Ù… Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ù†Ù…Ø§ÛŒØ´ Ø§ÛŒÙ† Ø¨Ø®Ø´ Ù¾ÛŒØºØ§Ù… Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± Ù†Ø´Ø§Ù†Ù‡ Ú¯Ø°Ø§Ø±ÛŒ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ "
-"Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª"
+"Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ù¾Ø±Ú†Ù…â€ŒÚ¯Ø°Ø§Ø±ÛŒ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ "
+"Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª"
 
 # 
-#: folders.php:155
+#: folders.php:165
 #, php-format
 msgid "There was an error importing %s."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† %s Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ø±Ø¯Ù† %s Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ø±ÙˆÙŠØ¯Ø§Ø¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ø±Ø¯Ù† Ø±ÙˆÛŒØ¯Ø§Ø¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ø§Ø± Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ø±Ø¯Ù† Ú©Ø§Ø± Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ÙˆØ§Ø±Ø¯ Ú©Ø±Ø¯Ù† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ú©Ø§Ø±Ø¨Ø±Ø§Ù† free/busy Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ø¯Ø±ÙˆÙ†â€ŒØ¨Ø±Ø¯ Ú©Ø±Ø¯Ù† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¢Ø²Ø§Ø¯/Ù…Ø´ØºÙˆÙ„ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
 
 # 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
-"Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± Ø¬Ø§ Ø¨Ù‡ Ø¬Ø§ Ú©Ø±Ø¯Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø§Ø² \"%s\" Ø¨Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÙŠÙ† Ú†ÙŠØ²ÛŒ Ø§Ø³Øª "
-"Ú©Ù‡ Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª"
+"Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ø§Ù†ØªÙ‚Ø§Ù„ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø§Ø² \"%s\" Ø¨Ù‡ \"%s\" Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ "
+"Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØªÙ‡ Ø§Ø³Øª"
 
-#: compose.php:1154
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± Ø°Ø®ÙŠØ±Ù‡ Ù¾ÙŠØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ÙŠÚ© Ù¾ÙŠØ´ Ù†ÙˆÙŠØ³ Ø±ÙˆÛŒ Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ØÙØ¸ Ù¾ÛŒØºØ§Ù… Ø¨Ø¹Ù†ÙˆØ§Ù† ÛŒÚ© Ù¾ÛŒØ´ Ù†ÙˆÛŒØ³ Ø±ÙˆÛŒ Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª"
 
 # 
-#: compose.php:915
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
 
 # 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
-msgstr "Ø®Ø·Ø§ÙŠÛŒ Ø¯Ø± Ø¨Ù‡ Ø±ÙˆØ² Ú©Ø±Ø¯Ù† Ø±ÙˆÙŠØ¯Ø§Ø¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
+msgstr "Ø®Ø·Ø§ÛŒÛŒ Ø¯Ø± Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø±ÙˆÛŒØ¯Ø§Ø¯ Ø±Ø® Ø¯Ø§Ø¯Ù‡ Ø§Ø³Øª: %s"
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
-msgstr "Ù…ØªÙ†ÛŒ Ø¯Ø± Ø§ÙŠÙ† Ø¨Ø®Ø´ Ù¾ÙŠØºØ§Ù… Ù†ÙŠØ³Øª"
+msgstr "Ù…ØªÙ†ÛŒ Ø¯Ø± Ø§ÛŒÙ† Ø¨Ø®Ø´ Ù¾ÛŒØºØ§Ù… Ù†ÛŒØ³Øª"
 
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… HTML ØªØµØ§ÙˆÙŠØ±ÛŒ Ø¯Ø§Ø±Ø¯ Ú©Ù‡ Ø¯Ø± Ø¢Ù† Ø¬Ø§Ø³Ø§Ø²ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… HTML Ø´Ø§Ù…Ù„ ØªØµØ§ÙˆÛŒØ± Ø§Ø³Øª"
 
 #: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
-msgstr ""
-"Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… HTML ØªØµØ§ÙˆÙŠØ±ÛŒ Ø¯Ø§Ø±Ø¯ Ú©Ù‡ Ø¯Ø± Ø¢Ù† Ø¬Ø§Ø³Ø§Ø²ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª. Ø¨Ù„ÙˆÚ© ØªØµØ§ÙˆÙŠØ± Ø´Ø¨ÙŠÙ‡ Ø¨Ù‡ Ø§ÙŠÙ† "
-"Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯:"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… HTML Ø´Ø§Ù…Ù„ ØªØµØ§ÙˆÛŒØ± Ø§Ø³Øª. Ø¨Ù„ÙˆÚ© ØªØµØ§ÙˆÛŒØ± Ø´Ø¨ÛŒÙ‡ Ø¨Ù‡ Ø§ÛŒÙ† Ø¸Ø§Ù‡Ø± Ù…ÛŒâ€ŒØ´ÙˆØ¯:"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
-msgstr "Ø§ÙŠÙ† Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ù‡ Ù¾ÙŠØºØ§Ù… Ø¶Ù…ÙŠÙ…Ù‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ PGP Ø¨Ù‡ Ù¾ÛŒØºØ§Ù… Ù¾ÛŒÙˆØ³Øª  Ø´Ø¯Ù‡ Ø¨ÙˆØ¯"
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
-msgstr "Ø§ÙŠÙ† Ø¹Ù…Ù„ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯"
+msgstr "Ø§ÛŒÙ† Ø¹Ù…Ù„ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯"
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
-msgstr "Ø§ÙŠÙ† Ø¹Ù…Ù„ Ù‡Ù†ÙˆØ² Ù¾ÙŠØ§Ø¯Ù‡ Ø³Ø§Ø²ÛŒ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ø¹Ù…Ù„ Ù‡Ù†ÙˆØ² Ù¾ÛŒØ§Ø¯Ù‡â€ŒØ³Ø§Ø²ÛŒ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Ø§ÙŠÙ† Ø¹Ù…Ù„ Ú©Ù…ÛŒ Ø²Ù…Ø§Ù† Ù…ÛŒâ€ŒØ¨Ø±Ø¯. Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ Ø§Ø¯Ø§Ù…Ù‡ Ø¯Ù‡ÙŠØ¯ØŸ"
+msgstr "Ø§ÛŒÙ† Ø¹Ù…Ù„ Ú©Ù…ÛŒ Ø²Ù…Ø§Ù† Ù…ÛŒâ€ŒØ¨Ø±Ø¯. Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø§Ø¯Ø§Ù…Ù‡ Ø¯Ù‡ÛŒØ¯ØŸ"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø´Ø§Ù…Ù„ ÙŠÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Macintosh Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø´Ø§Ù…Ù„ ÛŒÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Macintosh Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
-"Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø´Ø§Ù…Ù„ ÙŠÚ© Ø¶Ù…ÙŠÙ…Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø² Ø·Ø±ÙŠÙ‚ S/MIME Ø¨Ø·ÙˆØ± Ø¯ÙŠØ¬ÙŠØªØ§Ù„ÛŒ Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+"Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø´Ø§Ù…Ù„ ÛŒÚ© Ù¾ÛŒÙˆØ³Øª Ø§Ø³Øª Ú©Ù‡ Ø§Ø² Ø·Ø±ÛŒÙ‚ S/MIME Ø¨Ø·ÙˆØ± Ø¯ÛŒØ¬ÛŒØªØ§Ù„ÛŒ Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:414
 msgid "This message contains an attachment that has been encrypted via S/MIME."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… ØØ§ÙˆÛŒ ÙŠÚ© Ø¶Ù…ÙŠÙ…Ù‡ Ø§Ø³Øª Ú©Ù‡ Ø§Ø² Ø·Ø±ÙŠÙ‚ S/MIME Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… ØØ§ÙˆÛŒ ÛŒÚ© Ù¾ÛŒÙˆØ³Øª Ø§Ø³Øª Ú©Ù‡ Ø§Ø² Ø·Ø±ÛŒÙ‚ S/MIME Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
-msgstr ""
-"Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… ØØ§ÙˆÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙˆØ¶Ø¹ÙŠØª Ø§Ø±Ø³Ø§Ù„ Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ø§Ù…Ø§ Ù‚Ø§Ù„Ø¨ Ù¾ÙŠØºØ§Ù… Ù†Ø§Ø´Ù†Ø§Ø®ØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… ØØ§ÙˆÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª ÙˆØ¶Ø¹ÛŒØª ØªØÙˆÛŒÙ„ Ù…ÛŒâ€ŒØ¨Ø§Ø´Ø¯ Ø§Ù…Ø§ Ù‚Ø§Ù„Ø¨ Ù¾ÛŒØºØ§Ù… Ù†Ø§Ø´Ù†Ø§Ø®ØªÙ‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ ÙŠÚ© Ù¾ÙŠØºØ§Ù… Ù…Ø¹ØªØ¨Ø± Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ø´Ø¯Ù‡ PGP Ø¨Ø§Ø´Ø¯. Ø®Ø·Ø§: "
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ù…Ø¹ØªØ¨Ø± Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡Ù” PGP Ø¨Ø§Ø´Ø¯. Ø®Ø·Ø§: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
-msgstr "Ø¨Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¯Ø± Ù‚Ø§Ù„Ø¨ ØµØÙŠØ PGP Ø¨Ø§Ø´Ø¯ ( Ø¨Ø§ØªÙˆØ¬Ù‡ Ø¨Ù‡RFC 2015) "
+msgstr "Ø¨Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¯Ø± Ù‚Ø§Ù„Ø¨ ØµØÛŒØ PGP Ø¨Ø§Ø´Ø¯ ( Ø¨Ø§ØªÙˆØ¬Ù‡ Ø¨Ù‡RFC 2015) "
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
-msgstr "Ø¨Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¯Ø± Ù‚Ø§Ù„Ø¨ ØµØÙŠØ S/MIME Ø¨Ø§Ø´Ø¯"
+msgstr "Ø¨Ù†Ø¸Ø± Ù†Ù…ÛŒâ€ŒØ±Ø³Ø¯ Ú©Ù‡ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¯Ø± Ù‚Ø§Ù„Ø¨ ØµØÛŒØ S/MIME Ø¨Ø§Ø´Ø¯"
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø§Ø² Ø·Ø±ÙŠÙ‚ PGP Ø¨Ø·ÙˆØ± Ø¯ÙŠØ¬ÙŠØªØ§Ù„ÛŒ Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø§Ø² Ø·Ø±ÛŒÙ‚ PGP Ø¨Ø·ÙˆØ± Ø¯ÛŒØ¬ÛŒØªØ§Ù„ÛŒ Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø§Ø² Ø·Ø±ÙŠÙ‚ S/MIME Ø¨Ø·ÙˆØ± Ø¯ÙŠØ¬ÙŠØªØ§Ù„ÛŒ Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø§Ø² Ø·Ø±ÛŒÙ‚ S/MIME Ø¨Ø·ÙˆØ± Ø¯ÛŒØ¬ÛŒØªØ§Ù„ÛŒ Ø§Ù…Ø¶Ø§Ø¡ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ø§ S/MIME Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ø§ S/MIME Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ø§  PGP Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ø§ PGP Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: message.php:203
+#: message.php:211
 msgid "This message to"
-msgstr "Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¨Ù‡"
+msgstr "Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¨Ù‡"
 
 #: acl.php:46
 msgid "This server does not support sharing folders."
-msgstr "Ø§ÙŠÙ† Ø³Ø±ÙˆØ± Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø´ØªØ±Ú© Ø±Ø§ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
+msgstr "Ø§ÛŒÙ† Ú©Ø§Ø±Ø³Ø§Ø² Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø´ØªØ±Ú© Ø±Ø§ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
 
 #: templates/contacts/contacts.inc:109
 msgid "This window must be called from a compose window."
-msgstr "Ø§ÙŠÙ† Ù¾Ù†Ø¬Ø±Ù‡ Ø¨Ø§ÙŠØ¯ Ø§Ø² Ø·Ø±ÙŠÙ‚ ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù… ØµØ¯Ø§ Ø´ÙˆØ¯"
+msgstr "Ø§ÛŒÙ† Ù¾Ù†Ø¬Ø±Ù‡ Ø¨Ø§Ø¨ÛŒØ¯ Ø§Ø² Ø·Ø±ÛŒÙ‚ ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÛŒØºØ§Ù… ØµØ¯Ø§ Ø´ÙˆØ¯"
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:152
+msgid "Thread Display"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø³Ù„Ø³Ù„Ù‡â€ŒØ§ÛŒÛŒ"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù…ÙˆØ±Ø¯ "
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø³Ù„Ø³Ù„Ù‡â€ŒØ§ÛŒÛŒ "
 
-#: search.php:145 mailbox.php:570 message.php:256
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Ø¨Ù‡"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:919
 msgid "To Address"
-msgstr "Ø¢Ø¯Ø±Ø³ Ú¯ÙŠØ±Ù†Ø¯Ù‡"
+msgstr "Ø¢Ø¯Ø±Ø³ Ú¯ÛŒØ±Ù†Ø¯Ù‡"
 
 #: templates/prefs/sourceselect.inc:326
 msgid ""
 "To select multiple fields, hold down the Control (PC) or Command (Mac) while "
 "clicking."
 msgstr ""
-"Ø¨Ø±Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ú†Ù†Ø¯ ÙÙŠÙ„Ø¯ØŒ Ø¯Ú©Ù…Ù‡ Ctrl Ø±ÙˆÛŒ (PC) ÙŠØ§ Command Ø±Ø§ Ø±ÙˆÛŒ (Mac) Ø±Ø§ Ø¯Ø± Ù…Ø¯Øª "
-"Ú©Ù„ÙŠÚ© Ú©Ø±Ø¯Ù† Ù†Ú¯Ù‡Ø¯Ø§Ø±ÙŠØ¯"
+"Ø¨Ø±Ø§ÛŒ Ø§Ù†ØªØ®Ø§Ø¨ Ú†Ù†Ø¯ ÙÛŒÙ„Ø¯ØŒ Ø¯Ú©Ù…Ù‡ Ctrl Ø±Ø§ Ø±ÙˆÛŒ (PC) ÛŒØ§ Command Ø±Ø§ Ø±Ø§ Ø±ÙˆÛŒ (Mac)ØŒ Ø¯Ø± "
+"Ù…Ø¯Øª Ú©Ù„ÛŒÚ© Ú©Ø±Ø¯Ù† Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒØ¯"
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹ Ø§Ù†Ø¯Ø§Ø²Ù‡ Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§:"
+msgstr "Ù…Ø¬Ù…ÙˆØ¹ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Ù¾ÛŒÙˆØ³ØªÙ‡Ø§:"
 
-#: folders.php:354
+#: folders.php:388
 msgid "Trash folder"
-msgstr "Ù¾ÙˆØ´Ù‡ Ø¢Ø´ØºØ§Ù„"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ø¢Ø´ØºØ§Ù„"
 
 #: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
-msgstr "Ù¾ÙˆØ´Ù‡ Ø¢Ø´ØºØ§Ù„:"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ø¢Ø´ØºØ§Ù„:"
 
-#: lib/Quota/mercury32.php:84 lib/Quota/mdaemon.php:51 lib/Quota/cyrus.php:70
-#: lib/Quota/courier.php:54 lib/Quota/logfile.php:93 lib/Quota/command.php:77
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
-msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù†Ù‚Ù„ Ù‚ÙˆÙ„ Ø±Ø§ Ø¨Ø§Ø²ÙŠØ§Ø¨ÛŒ Ú©Ø±Ø¯ "
+msgstr "Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ù…Ù‚Ø¯Ø§Ø± Ø³Ù‡Ù…ÛŒÙ‡ Ø±Ø§ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ú©Ø±Ø¯ "
 
 #: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
 #: templates/mailbox/navbar.inc:36
@@ -4111,82 +4448,92 @@
 
 #: templates/search/main.inc:35
 msgid "Unanswered messages"
-msgstr "Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
 
 #: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
-msgstr "Ø®Ù†Ø«ÛŒ Ø³Ø§Ø²ÛŒ Ø¹Ù…Ù„ ØØ°Ù"
+msgstr "Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ"
 
-#: mailbox.php:554 mailbox.php:566 lib/MIME/Headers.php:218
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
-msgstr "Ú¯ÙŠØ±Ù†Ø¯Ù‡ Ù†Ø§Ø´Ù†Ø§Ø³"
+msgstr "Ú¯ÛŒØ±Ù†Ø¯Ù‡Ù” Ù†Ø§Ø´Ù†Ø§Ø³"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
-msgstr ""
+msgstr "Ù…Ø¤Ù„ÙÙ‡Ù”  Ø¨Ø¯ÙˆÙ† Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ: %s"
 
-#: mailbox.php:531
+#: mailbox.php:565
 msgid "Unknown Date"
-msgstr "ØªØ§Ø±ÙŠØ® Ù†Ø§Ø´Ù†Ø§Ø®ØªÙ‡"
+msgstr "ØªØ§Ø±ÛŒØ® Ù†Ø§Ù…Ø¹Ù„ÙˆÙ…"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
-msgstr "Ù…Ù„Ø§Ù‚Ø§Øª Ù†Ø§Ø´Ù†Ø§Ø³"
+msgstr "Ù…Ù„Ø§Ù‚Ø§Øª Ù†Ø§Ù…Ø¹Ù„ÙˆÙ…"
 
-#: mailbox.php:582
+#: mailbox.php:618
 msgid "Unknown Recipient"
-msgstr "Ú¯ÙŠØ±Ù†Ø¯Ù‡ Ù†Ø§Ø´Ù†Ø§Ø³"
+msgstr "Ú¯ÛŒØ±Ù†Ø¯Ù‡Ù” Ù†Ø§Ù…Ø¹Ù„ÙˆÙ…"
 
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
-msgstr "Ø¨Ø±Ø¯Ø§Ø´ØªÙ† Passphrase"
+msgstr "Ø¨Ø±Ø¯Ø§Ø´ØªÙ† Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø±"
 
 #: fetchmailprefs.php:65
 msgid "Unnamed"
-msgstr "Ø¨ÛŒ Ù†Ø§Ù…"
+msgstr "Ø¨ÛŒâ€ŒÙ†Ø§Ù…"
 
-#: mailbox.php:665 message.php:490 templates/message/navbar_navigate.inc:6
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø´Ø¯Ù‡"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
-msgstr "Ù…Ù„ØºÛŒ Ú©Ø±Ø¯Ù† Ø¹Ø¶ÙˆÙŠØª Ø§Ø² Ù¾ÙˆØ´Ù‡ (Ù‡Ø§)"
+msgstr "Ù„ØºÙˆ Ø¹Ø¶ÙˆÛŒØª Ø§Ø² Ù¾ÙˆØ´Ù‡(Ù‡Ø§)"
 
-#: templates/compose/compose.inc:574
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
-msgstr "Ø¨Ù‡ Ø±ÙˆØ² Ú©Ø±Ø¯Ù† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¶Ù…ÙŠÙ…Ù‡"
+msgstr "Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ù¾ÛŒÙˆØ³Øª"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
-msgstr "Ø¨Ù‡ Ø±ÙˆØ² Ú©Ø±Ø¯Ù† ØØ§Ù„Ø§Øª Ù¾Ø§Ø³Ø®Ú¯Ùˆ"
+msgstr "Ø¨Ø±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ ÙˆØ¶Ø¹ÛŒØª Ù¾Ø§Ø³Ø®"
 
-#: templates/pgp/import_key.inc:56 templates/smime/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
-msgstr "ÙØ±Ø³ØªØ§Ø¯Ù†"
+msgstr "Ø§Ø±Ø³Ø§Ù„"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
-msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù…Ù‚Ø¯Ø§Ø± Ù¾ÙŠØ´ ÙØ±Ø¶"
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù…Ù‚Ø¯Ø§Ø± Ù¾ÛŒØ´ ÙØ±Ø¶"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
-msgstr "Ø¢ÙŠØ§ Ø§Ø² Ø¹Ø¶ÙˆÙŠØª Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒIMAP Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ "
+msgstr "Ø¢ÛŒØ§ Ø§Ø² Ø¹Ø¶ÙˆÛŒØª Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ IMAP Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ "
+
+#: config/prefs.php.dist:735
+msgid "Use Virtual Trash Folder?"
+msgstr "Ø¢ÛŒØ§ Ø§Ø² Ù¾ÙˆØ´Ù‡Ù” Ø¢Ø´ØºØ§Ù„ Ù…Ø¬Ø§Ø²ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø´ÙˆØ¯ØŸ"
 
-#: templates/acl/acl.inc:140
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "Ú©Ø§Ø±Ø¨Ø±"
 
 # 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
-msgstr "Ú©Ø§Ø±Ø¨Ø± '%s' Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø¯Ø³ØªØ±Ø³ÛŒâ€ŒÙ‡Ø§ÛŒ Ù…Ø´Ø®Øµ Ø´Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ù¾ÙˆØ´Ù‡ '%s' Ø±Ø§ Ø¯Ø§Ø¯"
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "Ú©Ø§Ø±Ø¨Ø± '%s' Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¯Ø³ØªØ±Ø³ÛŒÙ‡Ø§ÛŒ Ù…Ø´Ø®Øµ Ø´Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ù¾ÙˆØ´Ù‡ '%s' Ø±Ø§ Ø¯Ø§Ø¯"
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±"
 
@@ -4194,467 +4541,603 @@
 msgid "Username:"
 msgstr "Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±:"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
-#: templates/smime/smime.inc:113 templates/smime/smime.inc:117
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
-msgstr "Ù†Ù…Ø§ÙŠØ´"
+msgstr "Ù†Ù…Ø§"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
-msgstr "Ù†Ù…Ø§ÙŠØ´ %s"
+msgstr "Ù†Ù…Ø§ÛŒØ´ %s"
 
 # 
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ %s"
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:116
 msgid "View HTML content in a separate window"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù…ØªÙ† HTML Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù…ØªÙ† HTML Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡"
 
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡Ù” Ù¾ÛŒØºØ§Ù…Ù‡Ø§"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ Ø´Ø®ØµÛŒ"
 
-#: templates/pgp/pgp.inc:147 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ø®ØµÛŒ"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù…ÙˆØ±Ø¯ "
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø³Ù„Ø³Ù„Ù‡â€Œ "
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
-msgstr "Ù†Ù…Ø§ÙŠØ´ ØªØµÙˆÙŠØ± Ú©ÙˆÚ†Ú© Ø´Ø¯Ù‡"
+msgstr "Ù†Ù…Ø§ÛŒØ´ ØªØµÙˆÛŒØ± Ú©ÙˆÚ†Ú© Ø´Ø¯Ù‡"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:418
 msgid "View attachment in a separate window"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ø¶Ù…Ø§Ø¦Ù… Ø¯Ø± ÙŠÚ© Ù¾Ù†Ø¬Ø±Ù‡ Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù…ØªÙ† Ø¯Ø± ÛŒÚ© Ù¾Ù†Ø¬Ø±Ù‡Ù” Ø¬Ø¯Ø§Ú¯Ø§Ù†Ù‡"
+
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ø±ÙˆÙŠØ¯Ø§Ø¯"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø±ÙˆÛŒØ¯Ø§Ø¯"
 
 # 
-#: folders.php:346 mailbox.php:500
+#: folders.php:380 mailbox.php:534
 #, php-format
 msgid "View messages in %s"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ Ø¯Ø± %s"
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒØºØ§Ù…Ù‡Ø§ Ø¯Ø± %s"
 
 # #-#-#-#-#  compendium.po (Horde 3)  #-#-#-#-#
 # 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
-msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ùˆ ÙŠØ§ ØµÙ†Ø¯ÙˆÙ‚ Ù¾Ø³ØªÛŒ Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÙŠØ´ Ø¨Ø¹Ø¯ Ø§Ø² ÙˆØ±ÙˆØ¯"
+msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ù†Ø§Ù…Ù‡ Ùˆ ÛŒØ§ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´ Ø¨Ø¹Ø¯ Ø§Ø² ÙˆØ±ÙˆØ¯"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
-msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡ ÙˆØ¸ÙŠÙÙ‡"
+msgstr "Ù…Ø´Ø§Ù‡Ø¯Ù‡Ù” ÙˆØ¸ÛŒÙÙ‡"
 
-#: lib/MIME/Viewer/html.php:111
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
-msgstr "Ù†Ù…Ø§ÙŠØ´ ØªØµØ§ÙˆÙŠØ±"
+msgstr "Ù†Ù…Ø§ÛŒØ´ ØªØµØ§ÙˆÛŒØ±"
 
-#: search.php:309
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
-msgstr "Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§ÙŠØ¬Ø§Ø¯ Ø´Ø¯"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ù…Ø¬Ø§Ø²ÛŒ \"%s\" Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§ÛŒØ¬Ø§Ø¯ Ø´Ø¯"
 
-#: lib/IMAP/Tree.php:118 lib/IMAP/Tree.php:308 lib/IMAP/Tree.php:332
-#: lib/IMAP/Tree.php:374 templates/search/main.inc:111
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
-msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø¬Ø§Ø²ÛŒ"
+msgstr "Ù¾ÙˆØ´Ù‡&#x200c;Ù‡Ø§ÛŒ Ù…Ø¬Ø§Ø²ÛŒ"
 
-#: search.php:291
+#: search.php:245
 msgid "Virtual Folders require a label."
-msgstr "Ù¾ÙˆØ´Ù‡ Ù…Ø¬Ø§Ø²ÛŒ Ø¨Ù‡ ÙŠÚ© Ù†Ø§Ù… Ù†ÙŠØ§Ø² Ø¯Ø§Ø±Ø¯"
+msgstr "Ù¾ÙˆØ´Ù‡Ù” Ù…Ø¬Ø§Ø²ÛŒ Ø¨Ù‡ ÛŒÚ© Ø¨Ø±Ú†Ø³Ø¨ Ù†ÛŒØ§Ø² Ø¯Ø§Ø±Ø¯"
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr "Ù¾ÙˆØ´Ù‡Ù”â€Œ Ù…Ø¬Ø§Ø²ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø¯Ø±ÛŒØ§ÙØªÛŒ"
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ” Ù…Ø¬Ø§Ø²ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø¯Ø±ÛŒØ§ÙØªÛŒ"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr "Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ Ù…Ø¬Ø§Ø²ÛŒ"
+
+#: folders.php:413
+msgid "Virtual Trash Folder"
+msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ” Ù…Ø¬Ø§Ø²ÛŒ Ø¢Ø´ØºØ§Ù„"
 
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
-msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ù…Ø¬Ø§Ø²ÛŒ"
+msgstr "Ø¨Ø±Ú†Ø³Ø¨ Ù¾ÙˆØ´Ù‡Ù” Ù…Ø¬Ø§Ø²ÛŒ"
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr "Ø§Ø®Ø·Ø§Ø±: "
 
-#: login.php:131
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
-msgstr "Ø¨Ù‡ %s Ø®ÙˆØ´ Ø¢Ù…Ø¯ÙŠØ¯ "
+msgstr "Ø¨Ù‡ %s Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯ "
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "Ø¢ÛŒØ§ Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ Ø¨Ø¹Ø¯ Ø§Ø² Ø§ÛŒÙ†Ú©Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† Ù‡Ø±Ø²Ù†Ø§Ù…Ù‡ Ú¯Ø²Ø§Ø±Ø´ Ø´Ø¯Ù†Ø¯ ØØ°Ù Ø´ÙˆÙ†Ø¯ØŸ"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr ""
-"Ø¢ÙŠØ§ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… ØØ°Ù Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§ØŒ Ø¢Ù†Ù‡Ø§ Ø¨Ø¬Ø§ÛŒ Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ø¹Ù†ÙˆØ§Ù† ØØ°Ù Ø´Ø¯Ù‡ Ø¨Ù‡ Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ "
+"Ø¢ÛŒØ§ Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… ØØ°Ù Ù¾ÛŒØºØ§Ù…Ù‡Ø§ØŒ Ø¨Ø¬Ø§ÛŒ Ø¹Ù„Ø§Ù…Øª Ú¯Ø°Ø§Ø±ÛŒ Ø¢Ù†Ù‡Ø§ Ø¨Ø¹Ù†ÙˆØ§Ù† ØØ°Ù Ø´Ø¯Ù‡ Ø¨Ù‡ Ø³Ø·Ù„ Ø¢Ø´ØºØ§Ù„ "
 "Ø´Ù…Ø§ Ø§Ù†ØªÙ‚Ø§Ù„ Ø¯Ø§Ø¯Ù‡ Ø´ÙˆÙ†Ø¯ØŸ"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
-msgstr "Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† ÙŠÚ© ØµÙ†Ø¯ÙˆÙ‚ Ù¾Ø³ØªÛŒ Ø¬Ø¯ÙŠØ¯ØŒ Ú©Ø¯Ø§Ù… ØµÙØÙ‡ Ø¨Ø±Ø§ÛŒ Ø´Ø±ÙˆØ¹ Ø¨Ø§Ø² Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¯Ø± Ù‡Ù†Ú¯Ø§Ù… Ø¨Ø§Ø²Ú©Ø±Ø¯Ù† ÛŒÚ© Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù† Ø¬Ø¯ÛŒØ¯ØŒ Ú©Ø¯Ø§Ù… ØµÙØÙ‡ Ø¨Ø±Ø§ÛŒ Ø´Ø±ÙˆØ¹ Ø¨Ø§Ø² Ø´ÙˆØ¯ØŸ"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
-msgstr "Ø¢ÙŠØ§ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ù†Ø§Ù…Ù‡ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ Ø°Ø®ÙŠØ±Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ØŒ Ø¨Ø§ÙŠØ¯ Ø¶Ù…ÙŠÙ…Ù‡ Ù‡Ù… Ø°Ø®ÙŠØ±Ù‡ Ø´ÙˆØ¯ØŸ"
+msgstr "Ø¢ÛŒØ§ Ù‡Ù†Ú¯Ø§Ù…ÛŒ Ú©Ù‡ Ù†Ø§Ù…Ù‡Ù” ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯Ù‡ ØÙØ¸ Ù…ÛŒâ€ŒØ´ÙˆØ¯ØŒ Ø¨Ø§ÛŒØ¯ Ù¾ÛŒÙˆØ³Øª Ù‡Ù… ØÙØ¸ Ø´ÙˆØ¯ØŸ"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
-msgid "Whitelist"
-msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙÙŠØ¯"
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù…ØŒ Ú†Ù‡ Ù†Ø§Ù… ØÙˆØ²Ù‡â€ŒØ§ÛŒÛŒ Ø±Ø§ Ø¨Ø§ÛŒØ¯ Ø¨Ù‡ Ø¢Ø¯Ø±Ø³Ù‡Ø§ÛŒ ØºÛŒØ± Ú©Ø§Ù…Ù„ (Ø¨Ø¯ÙˆÙ† @) "
+"Ø§Ø¶Ø§ÙÙ‡ Ù†Ù…ÙˆØ¯"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Ø´Ú©Ø³ØªÙ† Ù…ØªÙ† Ø¨Ù‡ Ù‡Ù†Ú¯Ø§Ù… ÙˆØ¬ÙˆØ¯ Ù†ÙˆÙŠØ³Ù‡â€ŒÙ‡Ø§ÛŒ Ø¨ÙŠØ´ Ø§Ø²"
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙÛŒØ¯"
 
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
-msgstr "Ø¢Ø±ÛŒ"
+msgstr "Ø¨Ù„Ù‡"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
-msgstr "Ø´Ù…Ø§ Ø¯Ø± ØµØ¯Ø¯ ÙˆØ§Ú©Ø´ÛŒ Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ© Ø§Ø² ØØ³Ø§Ø¨â€Œ(Ù‡Ø§ÛŒ) Ø²ÙŠØ± Ù‡Ø³ØªÙŠØ¯:"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± ØµØ¯Ø¯ ÙˆØ§Ú©Ø´ÛŒ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø§Ø² ØØ³Ø§Ø¨â€Œ(Ù‡Ø§ÛŒ) Ø²ÛŒØ± Ù‡Ø³ØªÛŒØ¯:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÛŒ ØØ°Ù Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø²ÙŠØ± Ù‡Ø³ØªÙŠØ¯:"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÛŒ ØØ°Ù Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø²ÛŒØ± Ù‡Ø³ØªÛŒØ¯:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÛŒ ØØ°Ù Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§ÛŒ Ø²ÛŒØ± Ù‡Ø³ØªÛŒØ¯:"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
-msgstr "Ø´Ù…Ø§ Ø¯Ø§Ø±ÙŠØ¯ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÙŠØ¯ Ø±Ø§ Ø¬Ø§Ø¨Ø¬Ø§/Ù†Ø³Ø®Ù‡ Ø¨Ø±Ø¯Ø§Ø±ÛŒ Ù…ÛŒâ€ŒÚ©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø±ÙˆÙ†ÙˆØ´Øª Ú¯Ø±ÙØªÙ†/Ø§Ù†ØªÙ‚Ø§Ù„ Ø¨Ù‡ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø¬Ø¯ÛŒØ¯ Ù‡Ø³ØªÛŒØ¯"
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
-msgstr "Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø³Ø§Ø®ØªÙ† ÙŠÚ© Ø²ÙŠØ± Ù¾ÙˆØ´Ù‡ Ù‡Ø³ØªÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø³Ø§Ø®ØªÙ† ÛŒÚ© Ø²ÛŒØ±Ù¾ÙˆØ´Ù‡ Ù‡Ø³ØªÛŒØ¯"
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
-msgstr "Ø´Ù…Ø§ Ø¯Ø§Ø±ÙŠØ¯ ÙŠÚ© Ù¾ÙˆØ´Ù‡ Ø³Ø·Ø Ø¨Ø§Ù„Ø§ Ø§ÙŠØ¬Ø§Ø¯ Ù…ÛŒâ€ŒÚ©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø§ÛŒØ¬Ø§Ø¯ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø³Ø·Ø Ø¨Ø§Ù„Ø§ Ù‡Ø³ØªÛŒØ¯"
+
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr "Ø´Ù…Ø§ Ù…Ø¬ÙˆØ² Ø§ÛŒØ¬Ø§Ø¯ Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯"
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Ø´Ù…Ø§ Ù…Ø¬ÙˆØ² Ø§ÛŒØ¬Ø§Ø¯ Ø¨ÛŒØ´ Ø§Ø² %d Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯"
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
-msgstr "Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ ØªØºÙŠÙŠØ± Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù‡Ø³ØªÙŠØ¯:"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù‡Ø³ØªÛŒØ¯:"
+
+#: lib/Folder.php:557
+#, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Ù„ØºÙˆ Ø¹Ø¶ÙˆÛŒØª Ø´Ù…Ø§ Ø§Ø² \"%s\" Ù…Ù…Ú©Ù† Ù†ÛŒØ³Øª"
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Ø´Ù…Ø§ Ø§Ø² ØªØ±Ú©ÛŒØ¨Ø§Øª Ø²ÛŒØ± Ø¯Ø± Ù†ÙˆØ´Øªâ€ŒØ§ÙØ²Ø§Ø± Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ù†Ù…Ø§ÛŒÛŒØ¯: %c Ø¨Ø±Ø§ÛŒ Ø§Ø´Ø§Ø±Ù‡ Ø¨Ù‡ "
+"Ù…ØªÙ† Ù¾ÛŒØºØ§Ù… ÙØ¹Ù„ÛŒ Ùˆ %s Ø¨Ø±Ø§ÛŒ Ø§Ù…Ø¶Ø§Ø¡"
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
-"Ø´Ù…Ø§ Ø¨Ø§ Ø´Ø±Ø§ÙŠØ· ØªÙˆØ§ÙÙ‚ÛŒ Ø®Ø¯Ù…ØªÚ¯Ø²Ø§Ø± Ù…ÙˆØ§ÙÙ‚Øª Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§ÙŠØ¯ØŒ Ø¨Ù†Ø§Ø¨Ø±Ø§ÙŠÙ† Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ ÙˆØ±ÙˆØ¯ Ù†Ø¯Ø§Ø±ÙŠØ¯"
+"Ø´Ù…Ø§ Ø¨Ø§ Ø´Ø±ÛŒØ· ØªÙˆØ§ÙÙ‚ÛŒ Ø®Ø¯Ù…ØªÚ¯Ø²Ø§Ø± Ù…ÙˆØ§ÙÙ‚Øª Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§â€ŒÛŒØ¯ØŒ Ø¨Ù†Ø§Ø¨Ø±Ø§ÛŒÙ† Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ ÙˆØ±ÙˆØ¯ Ù†Ø¯Ø§Ø±ÛŒØ¯"
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
-msgstr "Ø´Ù…Ø§ Ø§Ø¬Ø§Ø²Ù‡ Ù†Ø¯Ø§Ø±ÙŠØ¯ Ú©Ù‡ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¨Ù‡ Ø§ÙŠÙ† Ù¾ÙˆØ´Ù‡ Ø±Ø§ ØªØºÙŠÙŠØ± Ø¯Ù‡ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ù…Ø¬ÙˆØ² ØªØºÛŒÛŒØ± Ø¯Ø³ØªØ±Ø³ÛŒ Ø§ÛŒÙ† Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ù†Ø¯Ø§Ø±ÛŒØ¯"
 
 # 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr "Ø´Ù…Ø§ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨Ø± %%s Ø¨Ù‡ Ú¯ÙŠØ±Ù†Ø¯Ú¯Ø§Ù† Ø²ÙŠØ± Ù¾ÙŠØ´ ÙØ±Ø³ØªØ§Ø¯ÙŠØ¯: %s"
+msgstr "Ø´Ù…Ø§ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨Ø± %%s Ø¨Ù‡ Ú¯ÛŒØ±Ù†Ø¯Ú¯Ø§Ù† Ø²ÛŒØ± Ø§Ø±Ø¬Ø§Ø¹ Ú©Ø±Ø¯ÛŒØ¯: %s"
 
 # 
 #: templates/mailbox/alert.inc:3
 #, php-format
 msgid "You have %s new messages."
-msgstr "Ø´Ù…Ø§ %s Ù¾ÙŠØºØ§Ù… Ø¬Ø¯ÙŠØ¯ Ø¯Ø§Ø±ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ %s Ù¾ÛŒØºØ§Ù… Ø¬Ø¯ÛŒØ¯ Ø¯Ø§Ø±ÛŒØ¯"
 
 #: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
-msgstr "Ø´Ù…Ø§ ÙŠÚ© Ù¾ÙŠØºØ§Ù… Ø¬Ø¯ÙŠØ¯ Ø¯Ø§Ø±ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¬Ø¯ÛŒØ¯ Ø¯Ø§Ø±ÛŒØ¯"
+
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Ø´Ù…Ø§ ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø¬Ø¯ÛŒØ¯ Ø¯Ø§Ø±ÛŒØ¯"
 
-#: templates/compose/attachments.js:116
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
 msgstr ""
-"Ø´Ù…Ø§ ØØ¯Ø§Ù‚Ù„ ÙŠÚ© Ø¶Ù…ÙŠÙ…Ù‡ Ø¯Ø§Ø±ÙŠØ¯ Ú©Ù‡ Ù‡Ù†ÙˆØ² Ø¢Ù†Ø±Ø§ Ø¨Ø§Ø± Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§ÙŠØ¯. Ø¢ÙŠØ§ Ù…Ø·Ù…Ø¦Ù†ÙŠØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÙŠØ¯ "
-"Ø¨Ø¯ÙˆÙ† Ø§ÙŠÙ† Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§ Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨ÙØ±Ø³ØªÙŠØ¯ØŸ"
+"Ø´Ù…Ø§ ØØ¯Ø§Ù‚Ù„ ÛŒÚ© Ù¾ÛŒÙˆØ³Øª Ø§Ù†ØªØ®Ø§Ø¨ Ø´Ø¯Ù‡ Ø¯Ø§Ø±ÛŒØ¯ Ú©Ù‡ Ù‡Ù†ÙˆØ² Ø¢Ù†Ø±Ø§ Ø§Ø±Ø³Ø§Ù„ Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§â€ŒÛŒØ¯. Ø¢ÛŒØ§ Ù…Ø·Ù…Ø¦Ù†ÛŒØ¯ "
+"Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¨Ø¯ÙˆÙ† Ø§ÛŒÙ† Ù¾ÛŒÙˆØ³ØªÙ‡Ø§ Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨ÙØ±Ø³ØªÛŒØ¯ØŸ"
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
-msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ø²ÙŠØ± Ù¾ÙŠØºØ§Ù… Ø¬Ø¯ÙŠØ¯ Ø¯Ø§Ø±ÙŠØ¯:"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” Ø²ÛŒØ± Ù¾ÛŒØºØ§Ù… Ø¬Ø¯ÛŒØ¯ Ø¯Ø§Ø±ÛŒØ¯:"
 
-#: lib/IMP.php:1008
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
-msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡ Ø²ÙŠØ± Ù¾ÙŠØºØ§Ù… Ø¬Ø¯ÙŠØ¯ Ø¯Ø§Ø±ÙŠØ¯:"
+msgstr "Ø´Ù…Ø§ Ø¯Ø± Ù¾ÙˆØ´Ù‡Ù” Ø²ÛŒØ± Ù¾ÛŒØºØ§Ù… Ø¬Ø¯ÛŒØ¯ Ø¯Ø§Ø±ÛŒØ¯:"
 
-#: compose.php:127
+#: compose.php:153
 msgid "You must enter at least one recipient."
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ ØØ¯Ø§Ù‚Ù„ ÙŠÚ© Ú¯ÙŠØ±Ù†Ø¯Ù‡ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¨Ø§ÛŒØ¯ ØØ¯Ø§Ù‚Ù„ ÛŒÚ© Ú¯ÛŒØ±Ù†Ø¯Ù‡ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
-"Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ passphrase Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ PGP ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯ ØªØ§ Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ú©Ù†ÙŠØ¯"
+"Ø´Ù…Ø§ Ø¨Ø§ÛŒØ¯ Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ PGP Ø®ÙˆØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯ ØªØ§ Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ù…Ø´Ø§Ù‡Ø¯Ù‡ "
+"Ú©Ù†ÛŒØ¯"
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
-"Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ passphrase Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÙŠØ¯ Ø®ØµÙˆØµÛŒ S/MIME ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯ ØªØ§ Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ù…Ø´Ø§Ù‡Ø¯Ù‡ "
-"Ú©Ù†ÙŠØ¯"
+"Ø´Ù…Ø§ Ø¨Ø§ÛŒØ¯ Ø¹Ø¨Ø§Ø±Øª Ú¯Ø°Ø± Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú©Ù„ÛŒØ¯ Ø®ØµÙˆØµÛŒ S/MIME Ø®ÙˆØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯ ØªØ§ Ù¾ÛŒØºØ§Ù… Ø±Ø§ "
+"Ù…Ø´Ø§Ù‡Ø¯Ù‡ Ú©Ù†ÛŒØ¯"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ ÙŠÚ© ØµÙ†Ø¯ÙˆÙ‚ Ù¾Ø³ØªÛŒ Ù…Ø´Ø®Øµ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø§Ø¨ØªØ¯Ø§ Ø¨Ø§ÛŒØ¯ ÛŒÚ© Ù†Ø§Ù…Ù‡ Ø¯Ø§Ù† Ù…Ù‚ØµØ¯ Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯"
 
 #: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ ÙŠÚ© ØØ³Ø§Ø¨ Ø±Ø§ Ø¨Ø±Ø§ÛŒ ØØ°Ù Ú©Ø±Ø¯Ù† Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¨Ø§ÛŒØ¯ ÛŒÚ© ØØ³Ø§Ø¨ Ø¨Ø±Ø§ÛŒ ØØ°Ù Ú©Ø±Ø¯Ù† Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
 #: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ ÙŠÚ© Ø¢Ø¯Ø±Ø³ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø§Ø¨ØªØ¯Ø§ Ø¨Ø§ÛŒØ¯ ÛŒÚ© Ø¢Ø¯Ø±Ø³ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ ÙŠÚ© Ù¾ÙŠØºØ§Ù… Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø§Ø¨ØªØ¯Ø§ Ø¨Ø§ÛŒØ¯ ØØ¯Ø§Ù‚Ù„ ÛŒÚ© Ù¾ÛŒØºØ§Ù… Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
 #: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ÙŠØ¯ ÙŠÚ© Ú¯ÙŠØ±Ù†Ø¯Ù‡ Ù…Ø´Ø®Øµ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¨Ø§ÛŒØ¯ ÛŒÚ© Ú¯ÛŒØ±Ù†Ø¯Ù‡ Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯"
 
 #: templates/compose/attachments.js:29
 msgid "You must specify at least one file to attach."
-msgstr "Ø´Ù…Ø§ ØØ¯Ø§Ù‚Ù„ Ø¨Ø§ÙŠØ¯ ÙŠÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø¨Ø±Ø§ÛŒ Ø¶Ù…ÙŠÙ…Ù‡ Ú©Ø±Ø¯Ù† Ù…Ø´Ø®Øµ Ú©Ù†ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ ØØ¯Ø§Ù‚Ù„ Ø¨Ø§ÛŒØ¯ ÛŒÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ Ø¨Ø±Ø§ÛŒ Ù¾ÛŒÙˆØ³Øª Ú©Ø±Ø¯Ù† Ù…Ø´Ø®Øµ Ú©Ù†ÛŒØ¯"
 
 # 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "Ø´Ù…Ø§ Ù†ÙŠØ§Ø² Ø¯Ø§Ø±ÙŠØ¯ Ú©Ù‡ '%s' Ø±Ø§ Ø¯Ø± Ú¯Ø²ÙŠÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒØŒ ÙØ¹Ø§Ù„ Ú©Ù†ÙŠØ¯"
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Ø´Ù…Ø§ Ù†ÛŒØ§Ø² Ø¯Ø§Ø±ÛŒØ¯ Ú©Ù‡ '%s' Ø±Ø§ Ø¯Ø± Ú¯Ø²ÛŒÙ†Ù‡â€ŒÙ‡Ø§ÛŒ Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒØŒ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯"
 
 # 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
-msgstr "Ø´Ù…Ø§ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø±Ø§ Ø¨Ù‡ %s Ø¨Ø± %%s ØªØºÙŠÙŠØ± Ù…Ø³ÙŠØ± Ø¯Ø§Ø¯Ù‡â€ŒØ§ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø±Ø§ Ø¨Ù‡ %s Ø¨Ø± %%s ØªØºÛŒÛŒØ± Ù…Ø³ÛŒØ± Ø¯Ø§Ø¯Ù‡â€ŒØ§â€ŒÛŒØ¯"
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
-msgstr "Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÙŠÙ† Ù¾ÙŠØºØ§Ù… Ø¯Ø± %s Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡â€ŒØ§ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¨Ù‡ Ø§ÛŒÙ† Ù¾ÛŒØºØ§Ù… Ø¯Ø± %s Ù¾Ø§Ø³Ø® Ø¯Ø§Ø¯Ù‡â€ŒØ§ÛŒØ¯"
 
 # 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
-msgstr "Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª Ú©Ù‡ Ø´Ù…Ø§ Ø¹Ø¶Ùˆ \"%s\" Ù†Ø¨ÙˆØ¯Ù‡â€ŒØ§ÙŠØ¯"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØª Ú©Ù‡ Ø´Ù…Ø§ Ø¹Ø¶Ùˆ \"%s\" Ù†Ø¨ÙˆØ¯â€ŒÛŒØ¯"
 
 # 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr "Ø³Ø±ÙˆØ± Ú¯ÙØªÙ‡ Ø§Ø³Øª Ú©Ù‡ Ø´Ù…Ø§ ØºÙŠØ± Ø¹Ø¶Ùˆ Ø¯Ø± \"%s\" Ù†Ø¨ÙˆØ¯Ù‡â€ŒØ§ÙŠØ¯"
+msgstr "Ú©Ø§Ø±Ø³Ø§Ø² Ú¯ÙØª Ú©Ù‡ Ø¹Ø¶ÙˆÛŒÙ‘Øª Ø´Ù…Ø§ Ø¯Ø± \"%s\" Ù„ØºÙˆ Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
-msgstr "Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø¨Ù‡ \"%s\" Ø¹Ø¶Ùˆ Ø´Ø¯ÙŠØ¯"
+msgstr "Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø¯Ø± \"%s\" Ø¹Ø¶Ùˆ Ø´Ø¯ÛŒØ¯"
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
-msgstr "Ø¹Ø¶ÙˆÙŠØª Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø² \"%s\" Ù…Ù„ØºÛŒ Ø´Ø¯"
+msgstr "Ø¹Ø¶ÙˆÛŒØª Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø² \"%s\" Ù„ØºÙˆ Ø´Ø¯"
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Ù†Ø§Ù… Ø´Ù…Ø§"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
-msgstr "Ú©Ù„ÙŠØ¯â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ/Ø®ØµÙˆØµÛŒ PGP Ø´Ù…Ø§"
+msgstr "Ú©Ù„ÛŒØ¯â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ/Ø®ØµÙˆØµÛŒ PGP Ø´Ù…Ø§"
 
-#: templates/pgp/pgp.inc:150 templates/smime/smime.inc:116
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
-msgstr "Ú©Ù„ÙŠØ¯ Ø´Ø®ØµÛŒ Ø´Ù…Ø§"
+msgstr "Ú©Ù„ÛŒØ¯ Ø´Ø®ØµÛŒ Ø´Ù…Ø§"
 
-#: templates/pgp/pgp.inc:146 templates/smime/smime.inc:112
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
-msgstr "Ú©Ù„ÙŠØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ù…Ø§"
+msgstr "Ú©Ù„ÛŒØ¯ Ø¹Ù…ÙˆÙ…ÛŒ Ø´Ù…Ø§"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Ù¾Ø§Ø³Ø® Ø´Ù…Ø§ Ø¨Ù‡: Ø¢Ø¯Ø±Ø³ <i>(Ø§Ø®ØªÙŠØ§Ø±ÛŒ)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Ù¾Ø§Ø³Ø® Ø´Ù…Ø§ Ø¨Ù‡: Ø¢Ø¯Ø±Ø³ <em>(Ø§Ø®ØªÛŒØ§Ø±ÛŒ)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
-msgstr "Ú©Ù„ÙŠØ¯â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ/Ø®ØµÙˆØµÛŒ S/MIME Ø´Ù…Ø§"
+msgstr "Ú¯ÙˆØ§Ù‡ÛŒÙ‡Ø§ÛŒ Ú©Ù„ÛŒØ¯â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ/Ø®ØµÙˆØµÛŒ S/MIME Ø´Ù…Ø§"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
-msgstr "ØØ³Ø§Ø¨â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§:"
+msgstr "ØØ³Ø§Ø¨Ù‡Ø§ÛŒ Ø´Ù…Ø§:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
-msgstr "Ø¢Ø¯Ø±Ø³ Ù…Ø³ØªØ¹Ø§Ø± Ø´Ù…Ø§: <i>(Ø§Ø®ØªÙŠØ§Ø±ÛŒØŒ Ù‡Ø± Ø¢Ø¯Ø±Ø³ Ø±Ø§ Ø¯Ø± ÙŠÚ© Ø®Ø· Ø¬Ø¯ÙŠØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÙŠØ¯)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
+"Ø¢Ø¯Ø±Ø³ Ù…Ø³ØªØ¹Ø§Ø± Ø´Ù…Ø§: <em>(Ø§Ø®ØªÛŒØ§Ø±ÛŒØŒ Ù‡Ø± Ø¢Ø¯Ø±Ø³ Ø±Ø§ Ø¯Ø± ÛŒÚ© Ø®Ø· Ø¬Ø¯ÛŒØ¯ ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯)</em>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
-msgstr "Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ Ù†Ù…Ø§ÙŠØ´ Ø¯Ø±Ø®Ø· Ø§ÙŠÙ† Ù†ÙˆØ¹ ØªØµÙˆÙŠØ± Ø±Ø§ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
+msgstr "Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ Ù†Ù…Ø§ÛŒØ´ Ø¯Ø±Ø®Ø· Ø§ÛŒÙ† Ù†ÙˆØ¹ ØªØµÙˆÛŒØ± Ø±Ø§ Ù¾Ø´ØªÛŒØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯"
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Ù…Ø±ÙˆØ±Ú¯Ø± Ø´Ù…Ø§ Ø§ÙŠÙ† Ú¯Ø²ÙŠÙ†Ù‡ Ú†Ø§Ù¾ Ø±Ø§ Ù¾Ø´ØªÙŠØ¨Ø§Ù†ÛŒ Ù†Ù…ÛŒâ€ŒÚ©Ù†Ø¯ Control/Option + P Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ú†Ø§Ù¾ "
-"ÙØ´Ø§Ø± Ø¯Ù‡ÙŠØ¯"
-
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
-msgstr "Ù…Ø¬Ù…ÙˆØ¹Ù‡ Ù†ÙˆÙŠØ³Ù‡ Ù¾ÙŠØ´ ÙØ±Ø¶ Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÙŠØºØ§Ù…â€ŒÙ‡Ø§:"
+msgstr "Ù…Ø¬Ù…ÙˆØ¹Ù‡ Ù†ÙˆÛŒØ³Ù‡Ù” Ù¾ÛŒØ´ ÙØ±Ø¶ Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù…Ù‡Ø§:"
 
 #: templates/prefs/encryptselect.inc:1
 msgid "Your default encryption method for sending messages:"
-msgstr "Ø±ÙˆØ´ Ø±Ù…Ø²Ù†Ú¯Ø§Ø±ÛŒ Ù¾ÙŠØ´ ÙØ±Ø¶ Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÙŠØºØ§Ù…:"
+msgstr "Ø´ÛŒÙˆÙ‡Ù” Ø±Ù…Ø²Ø¨Ù†Ø¯ÛŒ Ù¾ÛŒØ´ ÙØ±Ø¶ Ø´Ù…Ø§ Ø¨Ø±Ø§ÛŒ Ø§Ø±Ø³Ø§Ù„ Ù¾ÛŒØºØ§Ù…:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
-msgstr "Ù¾ÙŠØºØ§Ù… Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‚ÙŠØª Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
+msgstr "Ù¾ÛŒØºØ§Ù… Ø´Ù…Ø§ Ø¨Ø§ Ù…ÙˆÙÙ‘Ù‚ÛŒÙ‘Øª Ø§Ø±Ø³Ø§Ù„ Ø´Ø¯"
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Ø§Ù…Ø¶Ø§ÛŒ Ø´Ù…Ø§:"
 
-#: compose.php:1194 mailbox.php:515 message.php:280 lib/Compose.php:731
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Ø¨Ø¯ÙˆÙ† Ø¹Ù†ÙˆØ§Ù†]"
 
-#: templates/compose/compose.inc:216
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "Ø±ÙˆÙ†ÙˆØ´Øª Ù…Ø®ÙÛŒ"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
-msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙŠØ§Ù‡"
+msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÛŒØ§Ù‡"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "Ø±ÙˆÙ†ÙˆØ´Øª"
 
-#: lib/IMP.php:904
-msgid "_Compose"
-msgstr "Ø§ÙŠØ¬Ø§Ø¯ Ù¾ÙŠØºØ§Ù…"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "ØØ°Ù"
 
-#: lib/IMP.php:906
+#: lib/IMP.php:979
 msgid "_Folders"
-msgstr "Ù¾ÙˆØ´Ù‡â€ŒÙ‡Ø§"
+msgstr "Ù¾ÙˆØ´Ù‡&#x200c;Ù‡Ø§"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
-msgstr "Ù‡ÙˆÙŠØª"
+msgstr "Ø§Ø²"
 
-#: lib/IMP.php:897
+#: lib/IMP.php:961
 msgid "_Inbox"
 msgstr "Inbox"
 
-#: lib/IMP.php:947
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "Ø®Ø±ÙˆØ¬"
 
-#: message.php:376
+#: message.php:384
 msgid "_Message Source"
-msgstr "Ù…ØªÙ† Ø§ØµÙ„ÛŒ Ù¾ÙŠØºØ§Ù…"
+msgstr "Ø³Ø±Ú†Ø´Ù…Ù‡ Ù¾ÛŒØºØ§Ù…"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Ù¾ÛŒØºØ§Ù…Ù‡Ø§ÛŒ Ø¬Ø¯ÛŒØ¯"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "Ú†Ø§Ù¾"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
-msgstr "Ø§ÙˆÙ„ÙˆÙŠØª"
+msgstr "Ø§ÙˆÙ„ÙˆÛŒØª"
 
 # 
-#: mailbox.php:389
+#: mailbox.php:418
 #, php-format
 msgid "_Refresh %s"
-msgstr "Ù†ÙˆØ³Ø§Ø²ÛŒ %s"
+msgstr "Ø¨Ø§Ø²Ø¢ÙˆØ±ÛŒ %s"
 
 #: templates/message/navbar_actions.inc:8
 msgid "_Reply"
 msgstr "Ù¾Ø§Ø³Ø®"
 
-#: lib/IMP.php:908
+#: lib/IMP.php:981
 msgid "_Search"
 msgstr "Ø¬Ø³ØªØ¬Ùˆ"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
-msgstr "ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÙŠØºØ§Ù…"
+msgstr "ÙØ±Ø³ØªØ§Ø¯Ù† Ù¾ÛŒØºØ§Ù…"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
-msgstr "Ù…ÙˆØ±Ø¯ "
+msgstr "Ø³Ù„Ø³Ù„Ù‡"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "Ø¨Ù‡"
 
 #: templates/mailbox/actions.inc:13
 msgid "_Undelete"
-msgstr "Ø®Ù†Ø«ÛŒ Ø³Ø§Ø²ÛŒ ØØ°Ù"
+msgstr "Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
-msgstr "Ù†Ù…Ø§ÙŠØ´ Ù…ÙˆØ±Ø¯ "
+msgstr "Ù†Ù…Ø§ÛŒØ´ Ø³Ù„Ø³Ù„Ù‡"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
-msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙÙŠØ¯"
+msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙÛŒØ¯"
 
-#: lib/Compose.php:344
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
 msgid "attachment"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡"
+msgstr "Ù¾ÛŒÙˆØ³Øª"
 
-#: view.php:102
+#: view.php:99
 msgid "attachments.zip"
-msgstr "Ø¶Ù…ÙŠÙ…Ù‡â€ŒÙ‡Ø§.zip"
+msgstr "Ù¾ÛŒÙˆØ³ØªÙ‡Ø§.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "bytes"
-msgstr "Ø¨Ø§ÙŠØªâ€ŒÙ‡Ø§"
+msgstr "Ø¨Ø§ÛŒØªâ€Œ"
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "Ø§Ø²"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
 msgid "key"
-msgstr "Ú©Ù„ÙŠØ¯"
+msgstr "Ú©Ù„ÛŒØ¯"
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
-msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€Œ ØµÙ†Ø¯ÙˆÙ‚ Ù†Ø§Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÙŠÚ©ÛŒ"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù”â€Œ Ù†Ø§Ù…Ù‡â€ŒØ¯Ø§Ù†"
 
-#: compose.php:976 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "Ù†Ø§Ù…"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
-msgstr "Ù‡ÙŠÚ†Ú©Ø¯Ø§Ù…"
+msgstr "Ù‡ÛŒÚ†â€ŒÛŒÚ©"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "or"
-msgstr "ÙŠØ§"
+msgstr "ÛŒØ§"
+
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
-msgstr "Ø®Ø·Ø§ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ"
+msgstr "Ø®Ø·Ø§ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
-msgstr "Ø®Ø·Ø§Ù‡Ø§ÛŒ Ø§Ù…Ù„Ø§ÙŠÛŒ"
+msgstr "Ø®Ø·Ø§Ù‡Ø§ÛŒ Ø§Ù…Ù„Ø§ÛŒÛŒ"
+
+#: lib/Compose.php:192
+msgid "system error"
+msgstr "Ø®Ø·Ø§ÛŒ Ø³Ø§Ù…Ø§Ù†Ù‡"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr "Ø´Ú©Ø³Øª Ù…ÙˆÙ‚ØªÛŒ"
 
-#: lib/Filter.php:56
+#: lib/Filter.php:51
 msgid "your blacklist"
-msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙŠØ§Ù‡ Ø´Ù…Ø§"
+msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÛŒØ§Ù‡ Ø´Ù…Ø§"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:61
 msgid "your whitelist"
-msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙÙŠØ¯ Ø´Ù…Ø§"
+msgstr "ÙÙ‡Ø±Ø³Øª Ø³ÙÛŒØ¯ Ø´Ù…Ø§"


--- orig/templates/compose/spelling.js
+++ mod/templates/compose/spelling.js
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function change_selected(sel)


--- orig/templates/search/javascript.inc
+++ mod/templates/search/javascript.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function toggleAll(checked)
@@ -24,7 +24,7 @@
 
 function formCheck()
 {
-<?php if (!$search['mbox']): ?>
+<?php if (empty($search['mbox'])): ?>
     var num_selected = 0;
 
     for (i = 0; i < document.search.elements.length; i++) {


--- orig/lib/Quota/cyrus.php
+++ mod/lib/Quota/cyrus.php
@@ -2,9 +2,9 @@
 /**
  * Implementation of the Quota API for Cyrus IMAP servers.
  *
- * $Horde: imp/lib/Quota/cyrus.php,v 1.22.10.4 2005/07/03 03:42:46 selsky Exp $
+ * $Horde: imp/lib/Quota/cyrus.php,v 1.22.10.7 2006/01/02 09:54:49 slusarz Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -24,11 +24,10 @@
     {
         $this->_params = $params;
 
-        if (!isset($this->_params['login'])) {
-            $this->_params['login'] = '';
-        }
-        if (!isset($this->_params['password'])) {
-            $this->_params['password'] = '';
+        foreach (array('login', 'password', 'userhierarchy') as $val) {
+            if (!isset($this->_params[$val])) {
+                $this->_params[$val] = '';
+            }
         }
     }
 


--- orig/po/imp.pot
+++ mod/po/imp.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-13 17:13+0200\n"
+"POT-Creation-Date: 2006-03-06 12:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,28 +16,32 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr ""
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr ""
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr ""
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr ""
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:408 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr ""
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr ""
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr ""
 
@@ -45,162 +49,165 @@
 msgid "#"
 msgstr ""
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr ""
 
-#: mailbox.php:196
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr ""
+
+#: mailbox.php:175
 #, php-format
 msgid "%d messages have been deleted."
 msgstr ""
 
-#: lib/Spam.php:178
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 
-#: lib/Spam.php:158
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr ""
 
-#: lib/Spam.php:170
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
 
-#: lib/Spam.php:150
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr ""
 
-#: mailbox.php:369
+#: mailbox.php:358
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr ""
 
-#: mailbox.php:619
+#: mailbox.php:635
 #, php-format
 msgid "%s KB"
 msgstr ""
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr ""
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr ""
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr ""
 
-#: lib/Message.php:612
+#: lib/Message.php:685
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:256
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
+msgid "%s has cancelled \"%s\"."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:262
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
+msgid "%s has replied to the invitation to \"%s\"."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:482
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:268
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:487
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
+msgid "%s requests your presence at \"%s\"."
 msgstr ""
 
-#: lib/Message.php:377
+#: lib/Message.php:461
 #, php-format
-msgid "%s was successfully added to %s."
+msgid "%s was successfully added to \"%s\"."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:597
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
+msgid "%s wishes to ammend \"%s\"."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:574
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
+msgid "%s wishes to make you aware of \"%s\"."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:602
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
 msgstr ""
 
-#: message.php:269 message.php:274
+#: message.php:292 message.php:297
 #, php-format
 msgid "%s: %s"
 msgstr ""
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr ""
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr ""
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr ""
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -214,43 +221,43 @@
 msgid "* Please select address(es) *"
 msgstr ""
 
-#: mailbox.php:194
+#: mailbox.php:173
 msgid "1 message has been deleted."
 msgstr ""
 
-#: lib/Spam.php:180
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 
-#: lib/Spam.php:160
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr ""
 
-#: lib/Spam.php:172
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr ""
 
-#: lib/Spam.php:152
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr ""
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr ""
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr ""
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr ""
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr ""
@@ -265,19 +272,19 @@
 msgid "AND"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:590
-msgid "Accept request"
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:587
-msgid "Accept request and add it to my calendar"
+#: lib/MIME/Viewer/itip.php:585
+msgid "Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:257
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr ""
 
@@ -285,32 +292,36 @@
 msgid "Account's name:"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr ""
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr ""
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr ""
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
 msgstr ""
 
-#: compose.php:1191
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr ""
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 
 #: lib/MIME/Viewer/notification.php:62
@@ -340,38 +351,38 @@
 msgid "Additional message error details can be viewed %s."
 msgstr ""
 
-#: contacts.php:90 templates/contacts/contacts.inc:180
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr ""
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr ""
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr ""
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -388,12 +399,16 @@
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr ""
 
@@ -401,25 +416,29 @@
 msgid "Alternative parts for this section:"
 msgstr ""
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr ""
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr ""
 
-#: lib/Message.php:468
+#: lib/Message.php:551
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
 
-#: lib/Message.php:364
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
+msgstr ""
+
+#: lib/Message.php:434
 msgid "An unknown error occured while creating the new task."
 msgstr ""
 
-#: message.php:484 mailbox.php:693 templates/message/navbar_navigate.inc:9
+#: message.php:503 mailbox.php:708 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -438,19 +457,23 @@
 msgid "Apply Filters to %s"
 msgstr ""
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr ""
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr ""
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr ""
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -459,11 +482,11 @@
 msgid "Are you sure you want to do this?"
 msgstr ""
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr ""
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr ""
 
@@ -471,7 +494,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr ""
 
-#: lib/IMP.php:931
+#: lib/IMP.php:951
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr ""
+
+#: lib/IMP.php:944
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr ""
 
@@ -487,60 +514,64 @@
 msgid "Are you sure you wish to report this message as spam?"
 msgstr ""
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr ""
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr ""
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr ""
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr ""
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:470
 msgid "Attach Files"
 msgstr ""
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:451
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr ""
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr ""
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:498 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr ""
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr ""
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr ""
+
+#: compose.php:1105 lib/Message.php:513
 msgid "Attachment stripped: Original attachment type"
 msgstr ""
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr ""
 
@@ -552,7 +583,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr ""
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -562,7 +593,7 @@
 msgid "Available Address books:"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:719
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr ""
 
@@ -571,13 +602,36 @@
 msgid "Bac_k to %s"
 msgstr ""
 
-#: thread.php:86 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr ""
 
-#: message.php:250 search.php:147 templates/contacts/contacts.inc:222
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr ""
+
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr ""
 
@@ -585,15 +639,15 @@
 msgid "Below is the raw text of the status information message."
 msgstr ""
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr ""
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 
-#: search.php:155
+#: lib/Search.php:609
 msgid "Body"
 msgstr ""
 
@@ -602,11 +656,15 @@
 msgid "Both"
 msgstr ""
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr ""
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
+
+#: templates/compose/compose.inc:270
 msgid "C_harset"
 msgstr ""
 
@@ -629,15 +687,16 @@
 "mailbox."
 msgstr ""
 
-#: folders.php:273 templates/contacts/contacts.inc:255
-#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
-#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
-#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr ""
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr ""
 
@@ -645,28 +704,34 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
 
-#: message.php:249 search.php:143 templates/contacts/contacts.inc:221
-#: templates/compose/recompose.inc:15
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:701
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr ""
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr ""
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr ""
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr ""
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -682,23 +747,23 @@
 "reply to your email."
 msgstr ""
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr ""
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr ""
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr ""
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr ""
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr ""
 
@@ -706,19 +771,15 @@
 msgid "Choose Action:"
 msgstr ""
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr ""
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
 msgid "Choose a match or edit the address to the right:"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
-msgid "Choose an action:"
-msgstr ""
-
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr ""
@@ -727,32 +788,32 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr ""
 
-#: lib/Filter.php:107
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:424
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr ""
@@ -762,11 +823,7 @@
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr ""
-
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr ""
 
@@ -776,48 +833,48 @@
 "search."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr ""
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr ""
 
-#: compose.php:775 compose.php:1082
+#: compose.php:418
 msgid "Close this window"
 msgstr ""
 
-#: folders.php:416
+#: folders.php:410
 msgid "Closed Folder"
 msgstr ""
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse"
 msgstr ""
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr ""
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr ""
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr ""
 
@@ -825,32 +882,23 @@
 msgid "Color Indicator: "
 msgstr ""
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr ""
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr ""
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr ""
-
-#: compose.php:774 compose.php:1081
+#: compose.php:417
 msgid "Compose another message"
 msgstr ""
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr ""
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -860,31 +908,39 @@
 msgid "Configure how messages are displayed."
 msgstr ""
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr ""
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr ""
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr ""
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr ""
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr ""
 
@@ -896,25 +952,30 @@
 msgid "Copy to folder"
 msgstr ""
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr ""
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr ""
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr ""
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr ""
 
-#: lib/Message.php:603
+#: lib/Message.php:676
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr ""
 
-#: lib/Session.php:293
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr ""
 
@@ -926,23 +987,28 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr ""
 
-#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr ""
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr ""
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr ""
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr ""
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr ""
-
 #: templates/fetchmail/account_select.inc:26
 msgid "Create a New Account"
 msgstr ""
@@ -955,7 +1021,7 @@
 msgid "Create a new drafts folder"
 msgstr ""
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr ""
 
@@ -963,18 +1029,26 @@
 msgid "Create a new trash folder"
 msgstr ""
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr ""
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr ""
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
 
@@ -991,84 +1065,97 @@
 msgid "Dat_e"
 msgstr ""
 
-#: message.php:246 thread.php:92
+#: message.php:269 thread.php:153
 msgid "Date"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:263
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
 msgstr ""
 
-#: config/prefs.php.dist:530
+#: config/prefs.php.dist:537
 msgid "Default"
 msgstr ""
 
-#: config/prefs.php.dist:894
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr ""
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr ""
 
-#: folders.php:407 templates/fetchmail/manage.inc:68
+#: folders.php:400 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr ""
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr ""
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr ""
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr ""
 
-#: folders.php:274
+#: folders.php:271
 msgid "Delete Selected Folders"
 msgstr ""
 
-#: folders.php:407
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr ""
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr ""
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr ""
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr ""
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr ""
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr ""
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
 msgstr ""
 
-#: message.php:487 mailbox.php:719 templates/mailbox/navbar.inc:20
+#: message.php:506 mailbox.php:734 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr ""
@@ -1077,7 +1164,7 @@
 msgid "Deleted messages"
 msgstr ""
 
-#: compose.php:280
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr ""
@@ -1086,29 +1173,33 @@
 msgid "Deleting and Moving Messages"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:592
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:540
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr ""
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr ""
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr ""
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr ""
 
-#: config/prefs.php.dist:671
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr ""
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr ""
 
@@ -1116,20 +1207,24 @@
 msgid "Display"
 msgstr ""
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr ""
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr ""
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr ""
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr ""
 
 #: templates/compose/attachments.inc:11
@@ -1140,23 +1235,27 @@
 msgid "Do NOT match"
 msgstr ""
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr ""
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr ""
 
-#: lib/IMP.php:1031
+#: lib/IMP.php:1055
 msgid "Do you want to open that folder?"
 msgstr ""
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr ""
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr ""
@@ -1165,25 +1264,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr ""
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr ""
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr ""
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr ""
 
-#: message.php:485 mailbox.php:698 templates/message/navbar_navigate.inc:11
+#: message.php:504 mailbox.php:713 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr ""
 
-#: folders.php:387
+#: folders.php:373
 msgid "Draft folder"
 msgstr ""
 
@@ -1191,11 +1290,11 @@
 msgid "Drafts folder:"
 msgstr ""
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr ""
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:316
 msgid "END"
 msgstr ""
 
@@ -1203,20 +1302,23 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr ""
 
-#: folders.php:408
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr ""
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr ""
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr ""
 
-#: folders.php:408 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr ""
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr ""
 
@@ -1225,23 +1327,23 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr ""
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr ""
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr ""
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr ""
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr ""
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr ""
 
@@ -1249,16 +1351,20 @@
 msgid "Email Address"
 msgstr ""
 
-#: lib/Message.php:620
+#: lib/Message.php:693
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr ""
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr ""
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr ""
 
-#: folders.php:275
+#: folders.php:272
 msgid "Empty Selected Folders"
 msgstr ""
 
@@ -1266,44 +1372,53 @@
 msgid "Empty Trash folder"
 msgstr ""
 
-#: lib/IMP.php:931
+#: lib/IMP.php:951
+msgid "Empty _Spam"
+msgstr ""
+
+#: lib/IMP.php:944
 msgid "Empty _Trash"
 msgstr ""
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr ""
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr ""
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr ""
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:437
 msgid "Encr_yption Options"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr ""
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr ""
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr ""
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr ""
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr ""
 
@@ -1315,7 +1430,7 @@
 msgid "Enter the name for your new drafts folder"
 msgstr ""
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr ""
 
@@ -1323,92 +1438,98 @@
 msgid "Enter the name for your new trash folder"
 msgstr ""
 
-#: search.php:159
+#: lib/Search.php:613
 msgid "Entire Message"
 msgstr ""
 
-#: message.php:178 compose.php:1068 thread.php:39
+#: message.php:194 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr ""
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:386
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr ""
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr ""
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr ""
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr ""
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr ""
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr ""
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand"
 msgstr ""
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr ""
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr ""
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand Folder"
 msgstr ""
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr ""
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr ""
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:142 templates/compose/compose.inc:192
+#: templates/compose/compose.inc:243 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 msgid "Expanding"
 msgstr ""
 
-#: lib/IMP.php:940 lib/IMP.php:942
+#: lib/IMP.php:962 lib/IMP.php:964
 msgid "F_etch Mail"
 msgstr ""
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr ""
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr ""
 
@@ -1416,57 +1537,57 @@
 msgid "Fetch messages upon logging on?"
 msgstr ""
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
 #, php-format
 msgid "Fetched %d messages from %s"
 msgstr ""
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr ""
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr ""
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr ""
 
-#: lib/IMP.php:946
+#: lib/IMP.php:968
 msgid "Fi_lters"
 msgstr ""
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:494 templates/compose/attachments.js:40
 msgid "File"
 msgstr ""
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr ""
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr ""
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr ""
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr ""
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr ""
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr ""
 
-#: lib/Filter.php:106
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr ""
@@ -1475,11 +1596,11 @@
 msgid "Find"
 msgstr ""
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr ""
 
-#: mailbox.php:341
+#: mailbox.php:330
 msgid "First Page"
 msgstr ""
 
@@ -1487,67 +1608,51 @@
 msgid "Fo_rward"
 msgstr ""
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:252 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
 msgstr ""
 
-#: folders.php:292 templates/folders/head.inc:9
+#: folders.php:289 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr ""
 
-#: templates/login/login.inc:175
-msgid "Folder Prefix"
-msgstr ""
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr ""
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr ""
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr ""
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr ""
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr ""
 
-#: compose.php:712
+#: compose.php:805
 msgid "Forward:"
 msgstr ""
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr ""
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:483
-msgid "Free/Busy Information"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:494
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:488
-msgid "Free/Busy Request"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:401
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr ""
 
@@ -1555,24 +1660,24 @@
 msgid "Fro_m"
 msgstr ""
 
-#: message.php:247 search.php:135 thread.php:93
-#: templates/compose/compose.inc:98
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
 msgstr ""
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr ""
 
-#: compose.php:724 compose.php:728
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr ""
 
-#: compose.php:1229
+#: compose.php:1311
 msgid "Fwd: "
 msgstr ""
 
-#: compose.php:1231
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr ""
@@ -1586,34 +1691,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr ""
 
-#: thread.php:85
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr ""
 
-#: lib/IMP.php:553
+#: lib/IMP.php:502
 #, php-format
 msgid "Go to address book entry of \"%s\""
 msgstr ""
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr ""
 
-#: message.php:530 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
 #: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
-#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:407
-#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:424
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:80
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr ""
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr ""
 
@@ -1625,43 +1736,39 @@
 msgid "Here is the message you were composing:"
 msgstr ""
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr ""
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr ""
 
-#: mailbox.php:363
+#: mailbox.php:352
 msgid "Hide Deleted"
 msgstr ""
 
-#: folders.php:287
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr ""
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr ""
 
-#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+#: message.php:304 mailbox.php:718 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr ""
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:291
 msgid "Highest"
 msgstr ""
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr ""
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr ""
 
@@ -1673,7 +1780,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr ""
 
-#: templates/login/login.inc:163 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr ""
 
@@ -1681,11 +1793,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr ""
 
-#: templates/login/login.inc:164
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr ""
 
-#: templates/login/login.inc:162 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr ""
 
@@ -1693,44 +1809,48 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr ""
 
-#: lib/IMP.php:886
-msgid "INBOX"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
 msgstr ""
 
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr ""
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr ""
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr ""
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr ""
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr ""
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr ""
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr ""
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr ""
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr ""
 
 #: templates/pgp/import_key.inc:14
@@ -1745,7 +1865,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr ""
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr ""
 
@@ -1770,7 +1890,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr ""
 
-#: message.php:486 mailbox.php:713 templates/message/navbar_navigate.inc:7
+#: message.php:505 mailbox.php:728 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1780,25 +1900,25 @@
 msgid "Important messages"
 msgstr ""
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:773
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr ""
 
-#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:85
+#: lib/IMP.php:832 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr ""
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr ""
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr ""
 
@@ -1806,21 +1926,21 @@
 msgid "Info"
 msgstr ""
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr ""
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr ""
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:499
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr ""
 
@@ -1840,11 +1960,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:412
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr ""
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:574 mailbox.php:621
 msgid "Invalid Address"
 msgstr ""
 
@@ -1852,20 +1972,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr ""
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr ""
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr ""
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr ""
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr ""
 
@@ -1873,56 +1993,66 @@
 msgid "Invert"
 msgstr ""
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr ""
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr ""
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid ""
 "Key generation may take a long time to complete.  Continue with key "
 "generation?"
 msgstr ""
 
-#: pgp.php:318
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr ""
 
-#: templates/login/login.inc:199
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr ""
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr ""
 
-#: mailbox.php:354
+#: mailbox.php:343
 msgid "Last Page"
 msgstr ""
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
 msgstr ""
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr ""
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr ""
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr ""
 
@@ -1930,20 +2060,20 @@
 msgid "Local Mailbox:"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr ""
 
-#: templates/login/login.inc:207
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr ""
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr ""
 
-#: templates/login/login.inc:136
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr ""
 
@@ -1951,15 +2081,15 @@
 msgid "Login Tasks"
 msgstr ""
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr ""
 
-#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+#: message.php:306 mailbox.php:721 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr ""
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:295
 msgid "Lowest"
 msgstr ""
 
@@ -1967,11 +2097,11 @@
 msgid "Macintosh File"
 msgstr ""
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr ""
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr ""
 
@@ -1979,19 +2109,19 @@
 msgid "Mail server type to connect to:"
 msgstr ""
 
-#: folders.php:397
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr ""
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr ""
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr ""
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr ""
 
@@ -1999,7 +2129,7 @@
 msgid "Mark as:"
 msgstr ""
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr ""
 
@@ -2007,84 +2137,64 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr ""
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr ""
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr ""
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr ""
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "Maximum Attachment Size"
 msgstr ""
 
-#: templates/compose/compose.inc:484
-msgid "Maximum number of attachments reached."
-msgstr ""
-
-#: templates/compose/compose.inc:479
-msgid "Maximum total attachment size reached."
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:626
-msgid "Meeting Cancellation"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:575
-msgid "Meeting Information"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:585
-msgid "Meeting Proposal"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:617
-msgid "Meeting Reply"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:598
-msgid "Meeting Update"
+#: templates/compose/compose.inc:487
+msgid "Maximum number of attachments reached."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:603
-msgid "Meeting Update Request"
+#: templates/compose/compose.inc:483
+msgid "Maximum total attachment size reached."
 msgstr ""
 
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr ""
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
 msgstr ""
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr ""
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr ""
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr ""
 
-#: search.php:359
+#: search.php:302
 msgid "Message Search"
 msgstr ""
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr ""
 
-#: message.php:368
+#: message.php:391
 msgid "Message Source"
 msgstr ""
 
@@ -2092,10 +2202,6 @@
 msgid "Message Viewing"
 msgstr ""
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr ""
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr ""
@@ -2104,45 +2210,45 @@
 msgid "Message folders"
 msgstr ""
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr ""
 
-#: mailbox.php:646
+#: mailbox.php:662
 msgid "Message has attachments"
 msgstr ""
 
-#: mailbox.php:637
+#: mailbox.php:653
 msgid "Message is encrypted"
 msgstr ""
 
-#: mailbox.php:632
+#: mailbox.php:648
 msgid "Message is signed"
 msgstr ""
 
-#: templates/search/header.inc:33
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr ""
 
-#: compose.php:771 compose.php:785
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr ""
 
-#: compose.php:1018
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr ""
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr ""
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr ""
 
-#: mailbox.php:318
+#: mailbox.php:310
 msgid "Messages to"
 msgstr ""
 
@@ -2150,7 +2256,7 @@
 msgid "Modify"
 msgstr ""
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
 msgid "More than one address found for field \"%s\"."
 msgstr ""
@@ -2163,6 +2269,10 @@
 msgid "Move down"
 msgstr ""
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr ""
@@ -2175,49 +2285,66 @@
 msgid "Multipart/alternative"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr ""
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr ""
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr ""
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:778
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr ""
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr ""
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr ""
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr ""
 
-#: lib/IMP.php:615
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr ""
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr ""
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr ""
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr ""
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr ""
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr ""
 
@@ -2225,15 +2352,16 @@
 msgid "Next Message"
 msgstr ""
 
-#: mailbox.php:352
+#: mailbox.php:341
 msgid "Next Page"
 msgstr ""
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr ""
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr ""
 
@@ -2241,36 +2369,36 @@
 msgid "No Encryption"
 msgstr ""
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr ""
 
-#: mailbox.php:371
+#: mailbox.php:360
 #, php-format
 msgid "No Messages"
 msgstr ""
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr ""
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr ""
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:333
 msgid "No Preview Text"
 msgstr ""
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr ""
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr ""
 
@@ -2278,73 +2406,87 @@
 msgid "No email information located in the public key."
 msgstr ""
 
-#: acl.php:72 acl.php:98
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr ""
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr ""
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
 msgid "No folders were specified"
 msgstr ""
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr ""
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr ""
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr ""
 
-#: lib/Mailbox.php:365
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr ""
+
+#: lib/Mailbox.php:375
 msgid "No messages matched your search."
 msgstr ""
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr ""
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr ""
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr ""
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr ""
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr ""
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr ""
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
-#: lib/MIME/Viewer/itip.php:664
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr ""
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:293
 msgid "Normal"
 msgstr ""
 
@@ -2382,20 +2524,27 @@
 msgid "Note that this can take some time"
 msgstr ""
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr ""
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr ""
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 
-#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
-#: lib/MIME/Viewer/itip.php:733
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr ""
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr ""
@@ -2408,43 +2557,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr ""
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr ""
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr ""
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr ""
-
-#: templates/menu.inc:23
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
 msgstr ""
 
-#: folders.php:414
+#: folders.php:408
 msgid "Opened Folder"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr ""
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr ""
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr ""
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr ""
 
@@ -2452,19 +2601,15 @@
 msgid "PGP Encrypt Message"
 msgstr ""
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr ""
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr ""
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr ""
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr ""
 
@@ -2472,25 +2617,25 @@
 msgid "PGP Passphrase Input"
 msgstr ""
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr ""
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr ""
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr ""
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr ""
 
@@ -2502,34 +2647,34 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr ""
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr ""
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr ""
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:208
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 
 #: lib/Fetchmail/imap.php:105
@@ -2548,7 +2693,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr ""
 
-#: templates/login/login.inc:166
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr ""
 
@@ -2556,16 +2701,16 @@
 msgid "POP3, no TLS"
 msgstr ""
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr ""
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr ""
 
@@ -2573,32 +2718,32 @@
 msgid "Part(s)"
 msgstr ""
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr ""
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr ""
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr ""
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr ""
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr ""
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:193
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr ""
 
@@ -2606,11 +2751,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr ""
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr ""
 
-#: message.php:477 mailbox.php:682 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:697 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr ""
@@ -2619,39 +2764,46 @@
 msgid "Personal Information"
 msgstr ""
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr ""
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr ""
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr ""
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr ""
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr ""
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr ""
 
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
 #: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr ""
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr ""
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr ""
 
@@ -2669,7 +2821,7 @@
 "to enter this passphrase once per %s session."
 msgstr ""
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2677,41 +2829,31 @@
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr ""
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr ""
 
-#: compose.php:79 lib/IMP.php:509
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:642
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-
-#: templates/folders/javascript.inc:53
-msgid "Please select a folder before you perform any actions."
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:502
-msgid "Please select an action from the menu below."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
 msgstr ""
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr ""
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr ""
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr ""
 
@@ -2719,11 +2861,11 @@
 msgid "Powered by Horde"
 msgstr ""
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr ""
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 msgid "Preferences successfully updated."
 msgstr ""
 
@@ -2735,11 +2877,11 @@
 msgid "Previous Message"
 msgstr ""
 
-#: mailbox.php:343
+#: mailbox.php:332
 msgid "Previous Page"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr ""
 
@@ -2747,15 +2889,15 @@
 msgid "Priority"
 msgstr ""
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr ""
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr ""
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr ""
 
@@ -2763,40 +2905,40 @@
 msgid "Protocol:"
 msgstr ""
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr ""
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr ""
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr ""
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr ""
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr ""
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr ""
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr ""
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr ""
 
@@ -2815,24 +2957,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr ""
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr ""
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
 msgstr ""
 
-#: search.php:163
+#: lib/Search.php:617
 msgid "Received On"
 msgstr ""
 
-#: search.php:171
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr ""
 
-#: search.php:167
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr ""
 
@@ -2844,23 +2986,19 @@
 msgid "Redirect"
 msgstr ""
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr ""
 
-#: compose.php:734
+#: compose.php:827
 msgid "Redirect this message"
 msgstr ""
 
-#: compose.php:794
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr ""
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr ""
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr ""
 
@@ -2872,11 +3010,11 @@
 msgid "Reload View"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr ""
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr ""
 
@@ -2892,15 +3030,15 @@
 msgid "Remove source"
 msgstr ""
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr ""
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr ""
 
-#: lib/Folder.php:440
+#: lib/Folder.php:425
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -2909,7 +3047,7 @@
 msgid "Repl_y to List"
 msgstr ""
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr ""
 
@@ -2917,7 +3055,7 @@
 msgid "Reply"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr ""
 
@@ -2925,7 +3063,7 @@
 msgid "Reply to All"
 msgstr ""
 
-#: compose.php:680
+#: compose.php:771
 msgid "Reply to All:"
 msgstr ""
 
@@ -2933,7 +3071,7 @@
 msgid "Reply to List"
 msgstr ""
 
-#: compose.php:682
+#: compose.php:773
 msgid "Reply to List:"
 msgstr ""
 
@@ -2941,99 +3079,99 @@
 msgid "Reply to _All"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:535
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:534
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr ""
 
-#: message.php:251
+#: message.php:274
 msgid "Reply-To"
 msgstr ""
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr ""
 
-#: compose.php:678
+#: compose.php:769
 msgid "Reply:"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr ""
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:384
 msgid "Request a _Read Receipt"
 msgstr ""
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr ""
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr ""
 
-#: mailbox.php:204
+#: mailbox.php:188
 msgid "Requested message not found."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:697
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr ""
 
-#: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:140 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr ""
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr ""
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr ""
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
-#: templates/fetchmail/account_select.inc:32
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
 msgstr ""
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/smime/notactive.inc:33
-#: templates/pgp/pgp.inc:268 templates/pgp/notactive.inc:33
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr ""
 
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:688
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:425
 msgid "S/MIME"
 msgstr ""
 
@@ -3041,44 +3179,40 @@
 msgid "S/MIME Encrypt Message"
 msgstr ""
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr ""
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr ""
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr ""
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr ""
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr ""
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr ""
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr ""
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr ""
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr ""
 
@@ -3090,105 +3224,125 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr ""
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr ""
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:253
 msgid "S_ubject"
 msgstr ""
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:361
 msgid "Sa_ve a copy in "
 msgstr ""
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr ""
 
-#: search.php:363 templates/fetchmail/manage.inc:67
+#: search.php:304 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr ""
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:534
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save Draft"
 msgstr ""
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr ""
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr ""
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save _Draft"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr ""
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr ""
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr ""
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:123
 msgid "Save search as a virtual folder?"
 msgstr ""
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr ""
 
-#: compose.php:1162
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr ""
 
 #: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
-#: lib/Block/tree_folders.php:50
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr ""
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr ""
 
-#: search.php:316
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr ""
+
+#: search.php:258
 msgid "Search Results"
 msgstr ""
 
@@ -3212,7 +3366,11 @@
 msgid "Select a field"
 msgstr ""
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr ""
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 
@@ -3232,6 +3390,10 @@
 msgid "Select none"
 msgstr ""
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr ""
@@ -3240,31 +3402,35 @@
 msgid "Selected Address books:"
 msgstr ""
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr ""
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "Send Message"
 msgstr ""
 
-#: config/prefs.php.dist:698
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr ""
+
+#: config/prefs.php.dist:692
 msgid "Send read receipt when requested by the sender?"
 msgstr ""
 
-#: folders.php:392
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr ""
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr ""
 
-#: templates/login/login.inc:132 templates/login/login.inc:145
+#: templates/login/login.inc:133 templates/login/login.inc:145
 #: templates/login/login.inc:152
 msgid "Server"
 msgstr ""
@@ -3281,7 +3447,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr ""
 
@@ -3297,21 +3463,21 @@
 msgid "Share your mail folders with other users."
 msgstr ""
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 
@@ -3323,7 +3489,7 @@
 msgid "Show All Headers"
 msgstr ""
 
-#: mailbox.php:361
+#: mailbox.php:350
 msgid "Show Deleted"
 msgstr ""
 
@@ -3339,43 +3505,43 @@
 msgid "Show Only Subscribed Folders"
 msgstr ""
 
-#: folders.php:287
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr ""
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr ""
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr ""
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr ""
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr ""
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr ""
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr ""
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr ""
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr ""
 
@@ -3383,10 +3549,6 @@
 msgid "Si_ze"
 msgstr ""
 
-#: templates/login/login.inc:213
-msgid "Sign up if not registered"
-msgstr ""
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr ""
@@ -3395,10 +3557,6 @@
 msgid "Size"
 msgstr ""
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr ""
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr ""
@@ -3431,39 +3589,60 @@
 msgid "Spam folder:"
 msgstr ""
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:344
 msgid "Special Characters"
 msgstr ""
 
-#: templates/compose/compose.inc:334
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:341
 msgid "Spell Check"
 msgstr ""
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr ""
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr ""
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:688
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr ""
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr ""
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr ""
 
@@ -3471,61 +3650,62 @@
 msgid "Sub_ject"
 msgstr ""
 
-#: message.php:252 search.php:151 templates/compose/recompose.inc:25
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr ""
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr ""
 
-#: search.php:365 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:306 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr ""
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr ""
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr ""
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
 msgid "Switch Composition Method"
 msgstr ""
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to HTML composition"
 msgstr ""
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to plain text composition"
 msgstr ""
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:414
 msgid "Te_xt"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:269
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr ""
 
@@ -3534,10 +3714,20 @@
 msgid "Terms of Service file not specified in conf.php"
 msgstr ""
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr ""
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr ""
 
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr ""
@@ -3557,45 +3747,34 @@
 msgid "The account \"%s\" has been saved."
 msgstr ""
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr ""
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr ""
 
-#: templates/javascript/open_compose_win.js:37
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-
 #: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr ""
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 
-#: compose.php:1171
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr ""
 
@@ -3604,58 +3783,64 @@
 msgid "The field \"%s\" can't be expanded."
 msgstr ""
 
-#: lib/Folder.php:328
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr ""
 
-#: lib/Folder.php:171
+#: lib/Folder.php:150
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
 
-#: lib/Folder.php:347
+#: lib/Folder.php:312
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr ""
 
-#: lib/Folder.php:285
+#: lib/Folder.php:229
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr ""
 
-#: lib/Folder.php:334
+#: lib/Folder.php:299
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr ""
 
-#: lib/Folder.php:278
+#: lib/Folder.php:222
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr ""
 
-#: lib/Folder.php:350
+#: lib/Folder.php:315
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr ""
 
-#: lib/Folder.php:288
+#: lib/Folder.php:232
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr ""
 
-#: lib/Folder.php:438
+#: lib/Folder.php:421
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3673,12 +3858,12 @@
 msgid "The mail server generated the following message:"
 msgstr ""
 
-#: lib/Message.php:614
+#: lib/Message.php:687
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr ""
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3687,26 +3872,24 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr ""
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr ""
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:390
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr ""
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr ""
@@ -3719,7 +3902,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr ""
 
-#: message.php:531
+#: message.php:550
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3727,15 +3910,15 @@
 "notification message."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
 msgstr ""
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr ""
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr ""
 
@@ -3743,7 +3926,22 @@
 msgid "The specified file does not exist."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:85
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr ""
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr ""
+
+#: stationery.php:88
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr ""
 
@@ -3774,7 +3972,7 @@
 msgid "The text of the sent message can be viewed %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr ""
 
@@ -3786,51 +3984,42 @@
 msgid "There are no messages in this mailbox."
 msgstr ""
 
-#: thread.php:69
+#: thread.php:110
 msgid "There is no text that can be displayed inline."
 msgstr ""
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr ""
-
-#: lib/Message.php:616
+#: lib/Message.php:689
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-
-#: lib/Message.php:92
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
 
-#: lib/Message.php:277
+#: lib/Message.php:318
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
 
-#: lib/Message.php:213
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr ""
@@ -3839,83 +4028,79 @@
 msgid "There was an error displaying this message part"
 msgstr ""
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:591
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 
-#: lib/Message.php:87
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
 
-#: compose.php:1179
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr ""
 
-#: compose.php:940
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr ""
 
-#: lib/MIME/Viewer/plain.php:59
-msgid "There was no text in this message part"
-msgstr ""
-
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr ""
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr ""
 
@@ -3923,13 +4108,13 @@
 msgid "This message contains a Macintosh file."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:416
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:420
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
@@ -3939,42 +4124,42 @@
 "this message is unknown."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:315
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr ""
 
-#: message.php:195
+#: message.php:210
 msgid "This message to"
 msgstr ""
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr ""
 
@@ -3982,18 +4167,21 @@
 msgid "This window must be called from a compose window."
 msgstr ""
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr ""
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr ""
 
-#: message.php:248 mailbox.php:585 search.php:139
-#: templates/contacts/contacts.inc:219
-#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:271 mailbox.php:601 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr ""
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr ""
 
@@ -4003,11 +4191,17 @@
 "clicking."
 msgstr ""
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr ""
 
-#: folders.php:383
+#: folders.php:369
 msgid "Trash folder"
 msgstr ""
 
@@ -4015,7 +4209,7 @@
 msgid "Trash folder:"
 msgstr ""
 
-#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
 #: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr ""
@@ -4033,28 +4227,45 @@
 msgid "Undelete"
 msgstr ""
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr ""
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr ""
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr ""
 
-#: mailbox.php:544
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr ""
 
-#: mailbox.php:597
+#: mailbox.php:613
 msgid "Unknown Recipient"
 msgstr ""
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr ""
 
@@ -4062,47 +4273,51 @@
 msgid "Unnamed"
 msgstr ""
 
-#: message.php:483 mailbox.php:687 templates/message/navbar_navigate.inc:6
+#: message.php:502 mailbox.php:702 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr ""
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr ""
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
+#: templates/compose/compose.inc:513
+msgid "Update"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:620
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr ""
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr ""
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr ""
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr ""
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr ""
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr ""
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 
-#: templates/login/login.inc:181
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr ""
 
@@ -4110,43 +4325,47 @@
 msgid "Username:"
 msgstr ""
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr ""
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr ""
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr ""
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "View attachment in a separate window"
 msgstr ""
 
@@ -4154,84 +4373,103 @@
 msgid "View content in a separate window"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr ""
 
-#: folders.php:375 mailbox.php:513
+#: folders.php:361 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr ""
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr ""
 
-#: search.php:314
+#: search.php:255
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr ""
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr ""
 
-#: search.php:296
+#: search.php:247
 msgid "Virtual Folders require a label."
 msgstr ""
 
-#: templates/search/main.inc:133
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: lib/Mailbox.php:171 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr ""
+
+#: templates/search/main.inc:129
 msgid "Virtual folder label"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr ""
 
-#: login.php:130
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr ""
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr ""
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr ""
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr ""
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr ""
 
@@ -4253,21 +4491,37 @@
 msgid "You are copying/moving to a new folder."
 msgstr ""
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr ""
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr ""
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr ""
+
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr ""
 
-#: lib/Folder.php:537
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Folder.php:524
 #, php-format
-msgid "You can not unsubscribe from \"%s\"."
+msgid "You cannot unsubscribe from \"%s\"."
 msgstr ""
 
 #: lib/Maintenance/Task/tos_agreement.php:34
@@ -4276,11 +4530,11 @@
 "to login."
 msgstr ""
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr ""
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
@@ -4294,30 +4548,28 @@
 msgid "You have 1 new message."
 msgstr ""
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
+#: compose.php:482
+msgid "You have already submitted this page."
 msgstr ""
 
-#: lib/IMP.php:1030
+#: lib/IMP.php:1054
 msgid "You have new mail in the following folder:"
 msgstr ""
 
-#: lib/IMP.php:1035
+#: lib/IMP.php:1059
 msgid "You have new mail in the following folders:"
 msgstr ""
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:302
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4344,66 +4596,62 @@
 msgid "You must specify a recipient."
 msgstr ""
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr ""
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr ""
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr ""
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr ""
 
-#: lib/Folder.php:487
+#: lib/Folder.php:474
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
 
-#: lib/Folder.php:539
+#: lib/Folder.php:526
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 
-#: lib/Folder.php:490
+#: lib/Folder.php:477
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr ""
 
-#: lib/Folder.php:542
+#: lib/Folder.php:529
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr ""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr ""
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr ""
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr ""
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr ""
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
 
@@ -4411,16 +4659,16 @@
 msgid "Your accounts:"
 msgstr ""
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr ""
 
@@ -4428,44 +4676,65 @@
 msgid "Your default encryption method for sending messages:"
 msgstr ""
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr ""
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr ""
 
-#: message.php:272 compose.php:1219 mailbox.php:528 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr ""
+
+#: message.php:295 compose.php:1301 mailbox.php:535 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr ""
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr ""
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr ""
+
+#: templates/compose/compose.inc:203
 msgid "_Bcc"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr ""
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:152
 msgid "_Cc"
 msgstr ""
 
-#: lib/IMP.php:933
-msgid "_Compose"
-msgstr ""
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr ""
 
-#: lib/IMP.php:935
+#: lib/IMP.php:957
 msgid "_Folders"
 msgstr ""
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:79
 msgid "_Identity"
 msgstr ""
 
@@ -4473,23 +4742,27 @@
 msgid "_Inbox"
 msgstr ""
 
-#: lib/IMP.php:976
+#: lib/IMP.php:998
 msgid "_Log out"
 msgstr ""
 
-#: message.php:368
+#: message.php:391
 msgid "_Message Source"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr ""
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
 msgid "_Priority"
 msgstr ""
 
-#: mailbox.php:402
+#: mailbox.php:404
 #, php-format
 msgid "_Refresh %s"
 msgstr ""
@@ -4498,11 +4771,11 @@
 msgid "_Reply"
 msgstr ""
 
-#: lib/IMP.php:937
+#: lib/IMP.php:959
 msgid "_Search"
 msgstr ""
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "_Send Message"
 msgstr ""
 
@@ -4510,7 +4783,7 @@
 msgid "_Thread"
 msgstr ""
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:114
 msgid "_To"
 msgstr ""
 
@@ -4518,62 +4791,131 @@
 msgid "_Undelete"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr ""
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr ""
 
-#: lib/Compose.php:351
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr ""
 
-#: view.php:99
+#: view.php:97
 msgid "attachments.zip"
 msgstr ""
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "bytes"
 msgstr ""
 
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr ""
+
 #: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr ""
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr ""
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr ""
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr ""
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr ""
 
-#: templates/compose/spelling.inc:111
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr ""
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr ""
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr ""
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr ""
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr ""
 
-#: lib/Filter.php:51
+#: lib/Compose.php:191
+msgid "system error"
+msgstr ""
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr ""
 
-#: lib/Filter.php:61
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr ""


--- orig/lib/MIME/Viewer/html.php
+++ mod/lib/MIME/Viewer/html.php
@@ -6,11 +6,11 @@
  * The MIME_Viewer_html class renders out HTML text with an effort to
  * remove potentially malicious code.
  *
- * $Horde: imp/lib/MIME/Viewer/html.php,v 1.75.2.7 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/html.php,v 1.75.2.12 2006/03/23 23:56:37 slusarz Exp $
  *
- * Copyright 1999-2005 Anil Madhavapeddy <anil at recoil.org>
- * Copyright 1999-2005 Jon Parise <jon at recoil.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at horde.org>
+ * Copyright 1999-2006 Anil Madhavapeddy <anil at recoil.org>
+ * Copyright 1999-2006 Jon Parise <jon at recoil.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -53,16 +53,19 @@
 
         /* Convert links to open in new windows. But first we hide all
            links that have an "#xyz" anchor. */
-        $data = preg_replace('|<a([^>]*href=["\']?#)|i', "<\x01\\1", $data);
-        $data = str_replace('<a', '<a target="_blank"', $data);
-        $data = str_replace('<A', '<a target="_blank"', $data);
-        $data = preg_replace("|\x01|", 'a', $data);
+        $data = preg_replace('|<a ([^>]*href=["\']?#)|i', "<\x01\\1", $data);
+        $data = str_replace('<a ', '<a target="_blank" ', $data);
+        $data = str_replace('<A ', '<a target="_blank" ', $data);
+        $data = preg_replace("|\x01|", 'a ', $data);
 
         /* Filter bad language. */
         $data = IMP::filterText($data);
 
-        /* Put div around message. */
-        if (!$attachment) {
+        if ($attachment) {
+            $charset = $this->mime_part->getCharset();
+        } else {
+            $charset = NLS::getCharset();
+            /* Put div around message. */
             $data = '<div id="html-message">' . $data . '</div>';
         }
 
@@ -71,7 +74,7 @@
             $GLOBALS['prefs']->getValue('html_image_replacement')) {
 
             /* Check to see if images exist. */
-            $img_regex = '/(<img[^>]*src=|<input[^>]*src=|<body[^>]*background=|<td[^>]*background=|<table[^>]*background=|style=[^>]*background-image:.*url\()(")?(?(2)[^">]*"([>)])|[^\s]*(\s+))/iUs';
+            $img_regex = '/(<img[^>]*src=|<input[^>]*src=|<body[^>]*background=|<td[^>]*background=|<table[^>]*background=|style=[^>]*background-image:.*url\()(["\'])?((?(2)[^"\'>]*|[^\s>]*))/is';
             if (preg_match($img_regex, $data)) {
                 /* Make sure the URL parameters are correct for the current
                    message. */
@@ -87,26 +90,14 @@
 
                 if (!$view_img && !$addr_check) {
                     $block_img = 'spacer_red.png';
-                    $msg = array(_("This HTML message has images embedded in it. Blocked images appear like this: ") . Horde::img($block_img, null, 'height="10" width="10"'));
+                    $msg = array(String::convertCharset(_("This HTML message has images embedded in it. Blocked images appear like this: "), NLS::getCharset(), $charset) . Horde::img($block_img, null, 'height="10" width="10"'));
                     $newSrc = Horde::url($GLOBALS['registry']->getImageDir('imp') . '/' . $block_img);
                     $data = preg_replace($img_regex, '\\1"' . $newSrc . '"\\3', $data);
-                } else {
-                    $msg[] = _("This HTML message has images embedded in it.");
-                    if ($addr_check) {
-                        $msg[] = _("The images will be displayed because the sender is present in your addressbook.");
-                    }
-                }
-
-                /* Print link to view/hide images now. */
-                if (!$addr_check) {
-                    if ($view_img) {
-                        $url = Util::removeParameter($url, array('view_html_images'));
-                        $msg[] = Horde::link($url, _("Hide the Images"), null, null, null, _("Hide the Images"), null) . _("Click here to HIDE the Images") . '</a>.';
-                    } else {
-                        $url = Util::addParameter($url, 'view_html_images', 1);
-                        $attributes = $attachment ? array('style' => 'color:blue') : array();
-                        $msg[] = Horde::link($url, _("Show the Images"), null, null, null, _("Show the Images"), null, $attributes) . _("Click here to SHOW the Images") . '</a>.';
-                    }
+                    $url = Util::addParameter($url, 'view_html_images', 1);
+                    $attributes = $attachment ? array('style' => 'color:blue') : array();
+                    $msg[] = Horde::link($url, String::convertCharset(_("Show the Images"), NLS::getCharset(), $charset), null, null, null, String::convertCharset(_("Show the Images"), NLS::getCharset(), $charset), null, $attributes) . String::convertCharset(_("Click here to SHOW the Images"), NLS::getCharset(), $charset) . '</a>.';
+                } elseif ($addr_check) {
+                    $msg = array(String::convertCharset(_("This HTML message has images embedded in it."), NLS::getCharset(), $charset), String::convertCharset(_("The images will be displayed because the sender is present in your addressbook."), NLS::getCharset(), $charset));
                 }
 
                 if (isset($msg)) {
@@ -117,7 +108,7 @@
                     if (stristr($data, '<body') === false) {
                         $data = $msg . $data;
                     } else {
-                        $data = preg_replace('/(.*<body.*?>)(.*)/i', '$1' . $msg . '$2', $data);
+                        $data = preg_replace('/(.*<body.*?>)(.*)/is', '$1' . $msg . '$2', $data);
                     }
                 }
             }


--- orig/templates/mailbox/actions_deleted.inc
+++ mod/templates/mailbox/actions_deleted.inc
@@ -1,11 +1,10 @@
-<?php $mailbox_link = Util::addParameter($mailbox_url, 'page', $pageOb->page) ?>
  <tr>
   <td class="control" colspan="6">
    <table width="100%">
     <tr>
-     <td align="right">
-      <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'hide_deleted'), $deleted_prompt, 'widget', '', '', $deleted_prompt); ?> |
-      <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'expunge_mailbox'), _("Purge Deleted"), 'widget', '', '', _("Pur_ge Deleted")); ?>
+     <td class="rightAlign">
+      <?php echo Horde::widget(Util::addParameter($refresh_url, 'actionID', 'hide_deleted'), $deleted_prompt, 'widget', '', '', $deleted_prompt); ?> |
+      <?php echo Horde::widget(Util::addParameter($refresh_url, 'actionID', 'expunge_mailbox'), _("Purge Deleted"), 'widget', '', '', _("Pur_ge Deleted")); ?>
      </td>
     </tr>
    </table>


--- orig/templates/thread/thread.html
+++ mod/templates/thread/thread.html
@@ -1,33 +1,55 @@
-<loop:messages>
-<table border="0" width="100%">
-  <tr valign="top">
-    <td class="item">
+<h1 class="header">
+  <tag:header />: <tag:subject />
+</h1>
+<p />
+
+<a id="display"></a>
+<div class="solidbox">
+<div class="smallheader"><tag:header /></div>
+<loop:tree>
+<div class="<tag:tree.class />">&nbsp;<tag:tree.subject /></div>
+</loop:tree>
+</div>
+
+<p />
+
+<table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
 
+<loop:messages>
+ <tr>
+  <td class="item">
+  <a id="<tag:messages.idx />"></a>
+   <table border="0" width="100%">
+    <tr valign="top">
+     <td class="item">
       <table border="0" align="center" width="100%" cellpadding="2" cellspacing="0">
-        <tr>
-          <td class="item0" align="right" valign="top" nowrap="nowrap"><b><tag:date_string />:</b>&nbsp;</td>
-          <td class="item0" align="left"><tag:messages.date /></td>
-          <td class="item0" align="right"><tag:messages.link /></td>
-        </tr>
-        <tr>
-          <td class="item1" align="right" valign="top" nowrap="nowrap"><b><tag:from_string />:</b>&nbsp;</td>
-          <td class="item1" align="left" width="100%" colspan="2"><tag:messages.from /></td>
-        </tr>
+       <tr>
+        <td class="item0 rightAlign" valign="top" nowrap="nowrap"><strong><tag:date_string />:</strong>&nbsp;</td>
+        <td class="item0 leftAlign"><tag:messages.date /></td>
+        <td class="item0 rightAlign"><tag:messages.link /></td>
+       </tr>
+       <tr>
+        <td class="item1 rightAlign" valign="top" nowrap="nowrap"><strong><tag:from_string />:</strong>&nbsp;</td>
+        <td class="item1 leftAlign" width="100%" colspan="2"><tag:messages.from /></td>
+       </tr>
+<if:messages.subject>
+       <tr>
+        <td class="item0 rightAlign" valign="top" nowrap="nowrap"><strong><tag:subject_string />:</strong>&nbsp;</td>
+        <td class="item0 leftAlign" width="100%" colspan="2"><tag:messages.subject /></td>
+       </tr>
+</if:messages.subject>
       </table>
 
-      <table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-        <tr>
-          <td class="control" align="center">
-            <table border="0" align="center" width="100%" cellpadding="2" cellspacing="3">
-              <tr>
-                <td class="text" align="left"><tag:messages.body /></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>   
+      <div class="text">
+        <tag:messages.body />
+      </div>
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 
-    </td>
-  </tr>
-</table>
+ <tr><td>&nbsp;</td></tr>
 </loop:messages>
+
+</table>


--- orig/filterprefs.php
+++ mod/filterprefs.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: imp/filterprefs.php,v 2.16.10.2 2005/05/23 14:18:07 chuck Exp $
+ * $Horde: imp/filterprefs.php,v 2.16.10.5 2006/02/04 19:02:04 slusarz Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -11,7 +11,6 @@
 @define('IMP_BASE', dirname(__FILE__));
 $authentication = OP_HALFOPEN;
 require_once IMP_BASE . '/lib/base.php';
-require_once IMP_BASE . '/lib/Filter.php';
 require_once 'Horde/Prefs/UI.php';
 require IMP_BASE . '/config/prefs.php';
 


--- orig/docs/TODO
+++ mod/docs/TODO
@@ -2,8 +2,8 @@
  IMP Development TODO List 
 ===========================
 
-:Last update:   $Date: 2005/03/04 06:30:35 $
-:Revision:      $Revision: 1.22.8.1 $
+:Last update:   $Date: 2005/11/03 11:21:50 $
+:Revision:      $Revision: 1.22.8.3 $
 :Contact:       imp at lists.horde.org
 
 In no particular order:
@@ -14,12 +14,6 @@
 
 - The folders page should be rendered by the Horde_Tree:: html renderer.
 
-- Add 'hotmail' (see www.hailware.com, but we actually want to do this with
-  HTTP_WebDAV_Client) Fetchmail driver.
-
-- Virtual trash folder (i.e. holds messages in session until user can delete
-  messages in mailboxes to put them under quota).
-
 - Print all messages in a mailbox.
 
 - Access readonly IMAP mailboxes.
@@ -32,3 +26,5 @@
   signatures.
 
 - Implement combinations of AND and OR rules in the IMP search screen.
+
+- Allow thread sort in search results.


--- orig/templates/common-header.inc
+++ mod/templates/common-header.inc
@@ -6,7 +6,7 @@
 }
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<!-- IMP: Copyright 2001-2005, The Horde Project. IMP is under the GPL. -->
+<!-- IMP: Copyright 2001-2006, The Horde Project. IMP is under the GPL. -->
 <!--   Horde Project: http://horde.org/ | IMP: http://horde.org/imp/    -->
 <!--      GNU Public License: http://www.fsf.org/copyleft/gpl.html      -->
 <?php
@@ -25,21 +25,21 @@
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
 <link href="<?php echo $GLOBALS['registry']->getImageDir() ?>/favicon.ico" rel="SHORTCUT ICON" />
-<?php if (isset($mailbox_url)): ?>
+<?php if ($mailbox_url = Util::nonInputVar('mailbox_url')): ?>
 <link href="<?php echo $mailbox_url ?>" rel="Up" />
 <?php else: ?>
 <link href="<?php echo Util::addParameter(Horde::applicationUrl('mailbox.php'), 'mailbox', 'INBOX') ?>" rel="Top" />
 <?php endif; ?>
-<?php if (isset($first_url)): ?>
+<?php if ($first_url = Util::nonInputVar('first_url')): ?>
 <link href="<?php echo $first_url ?>" rel="First" />
 <?php endif; ?>
-<?php if (isset($prev_url)): ?>
-<link href="<?php echo $prev_url ?>" rel="Previous" />
+<?php if ($prev_url = Util::nonInputVar('prev_url')): ?>
+<link href="<?php echo $prev_url ?>" rel="Previous" id="prev" />
 <?php endif; ?>
-<?php if (isset($next_url)): ?>
-<link href="<?php echo $next_url ?>" rel="Next" />
+<?php if ($next_url = Util::nonInputVar('next_url')): ?>
+<link href="<?php echo $next_url ?>" rel="Next" id="next" />
 <?php endif; ?>
-<?php if (isset($last_url)): ?>
+<?php if ($last_url = Util::nonInputVar('last_url')): ?>
 <link href="<?php echo $last_url ?>" rel="Last" />
 <?php endif; ?>
 <link href="<?php echo Horde::applicationUrl('search.php') ?>" rel="search" />
@@ -47,5 +47,5 @@
 <?php if (!empty($ie_clientcaps)): ?><style>IE\:clientcaps {behavior:url(#default#clientcaps)}</style><?php endif; ?>
 </head>
 
-<body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"'; if (!empty($nls['rtl'][$language])) echo ' style="direction:rtl"'; ?>>
+<body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"'; ?>>
 <?php if (!empty($ie_clientcaps)): ?><IE:clientcaps ID="objCCaps" /><?php endif; ?>


--- orig/locale/fr_FR/help.xml
+++ mod/locale/fr_FR/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Horde: imp/locale/fr_FR/help.xml,v 1.17.6.1 2005/01/25 22:05:53 jan Exp $ -->
+<!-- $Horde: imp/locale/fr_FR/help.xml,v 1.17.6.5 2006/03/23 00:24:12 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Rédaction de message: Actions</title>
@@ -193,6 +193,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Recherche</title>
     <heading>Critères de recherche</heading>
@@ -646,6 +652,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -664,6 +676,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -693,4 +720,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/locale/pl_PL/help.xml
+++ mod/locale/pl_PL/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/pl_PL/help.xml,v 1.16.6.1 2005/01/25 22:05:52 jan Exp $ -->
+<!-- $Horde: imp/locale/pl_PL/help.xml,v 1.16.6.5 2006/03/23 00:24:09 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/lib/Identity/imp.php
+++ mod/lib/Identity/imp.php
@@ -7,10 +7,10 @@
  * user might have. Its methods take care of any site-specific
  * restrictions configured in prefs.php and conf.php.
  *
- * $Horde: imp/lib/Identity/imp.php,v 1.44.2.5 2005/07/03 03:42:44 selsky Exp $
+ * $Horde: imp/lib/Identity/imp.php,v 1.44.2.8 2006/01/05 07:58:22 slusarz Exp $
  *
- * Copyright 2001-2005 Jan Schneider <jan at horde.org>
- * Copyright 2001-2005 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 2001-2006 Jan Schneider <jan at horde.org>
+ * Copyright 2001-2006 Chuck Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -400,7 +400,7 @@
     }
 
     /**
-     * Returns the users full name.
+     * Returns the user's full name.
      *
      * @param integer $ident  The identity to retrieve the name from.
      *
@@ -427,8 +427,6 @@
      */
     function getSignature($ident = null)
     {
-        global $conf;
-
         if (isset($this->_signatures[$ident])) {
             return $this->_signatures[$ident];
         }
@@ -448,7 +446,7 @@
             }
         }
 
-        if (!empty($conf['hooks']['signature'])) {
+        if (!empty($GLOBALS['conf']['hooks']['signature'])) {
             include_once HORDE_BASE . '/config/hooks.php';
             if (function_exists('_imp_hook_signature')) {
                 $val = call_user_func('_imp_hook_signature', $val);
@@ -481,31 +479,14 @@
     }
 
     /**
-     * Returns the sent-mail folder name.
-     *
-     * @param integer $ident            The identity to retrive the folder name
-     *                                  from.
-     * @param string $sent_mail_folder  A default folder that is returned no
-     *                                  identity is selected and the
-     *                                  sent_mail_folder preference is not
-     *                                  locked.
-     *
-     * @return string  The folder name with the folder prefix.
+     * @see Identity::getValue()
      */
-    function getSentmailFolder($ident = null, $sent_mail_folder = '')
+    function getValue($key, $identity = null)
     {
-        if (!isset($ident)) {
-            $folder = $sent_mail_folder;
-        }
-        if (empty($folder) || $this->_prefs->isLocked('sent_mail_folder')) {
-            $folder = $this->getValue('sent_mail_folder', $ident);
+        if ($key == 'sent_mail_folder') {
+            return IMP::folderPref(parent::getValue('sent_mail_folder', $identity), true);
         }
-
-        if (substr($folder, 0, strlen(IMP::preambleString())) != IMP::preambleString()) {
-            $folder = IMP::addPreambleString($folder);
-        }
-
-        return $folder;
+        return parent::getValue($key, $identity);
     }
 
     /**
@@ -517,7 +498,7 @@
     function getAllSentmailFolders()
     {
         foreach ($this->_identities as $key => $identity) {
-            $list[$this->getSentmailFolder($key)] = true;
+            $list[$this->getValue('sent_mail_folder', $key)] = true;
         }
         return array_keys($list);
     }
@@ -531,9 +512,7 @@
      */
     function saveSentmail($ident = null)
     {
-        global $conf;
-
-        if (!$conf['user']['allow_folders']) {
+        if (!$GLOBALS['conf']['user']['allow_folders']) {
             return false;
         }
 


--- orig/lib/Maillog.php
+++ mod/lib/Maillog.php
@@ -6,9 +6,9 @@
  * The IMP_Maillog:: class contains all functions related to handling
  * logging of responses to individual e-mail messages.
  *
- * $Horde: imp/lib/Maillog.php,v 1.15.10.6 2005/08/03 04:56:22 slusarz Exp $
+ * $Horde: imp/lib/Maillog.php,v 1.15.10.12 2006/03/03 23:00:28 chuck Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -80,7 +80,8 @@
     function &getLog($msg_id)
     {
         $history = &Horde_History::singleton();
-        return $log = &$history->getHistory(IMP_Maillog::_getUniqueHistoryId($msg_id));
+        $log = &$history->getHistory(IMP_Maillog::_getUniqueHistoryId($msg_id));
+        return $log;
     }
 
     /**
@@ -96,7 +97,7 @@
     function sentMDN($msg_id, $type)
     {
         $msg_history = IMP_Maillog::getLog($msg_id);
-        if (!is_a($msg_history, 'PEAR_Error')) {
+        if ($msg_history && !is_a($msg_history, 'PEAR_Error')) {
             foreach ($msg_history->getData() as $entry) {
                 if (($entry['action'] == 'mdn') && ($entry['type'] == $type)) {
                     return true;
@@ -118,7 +119,7 @@
         global $notification, $prefs;
 
         $msg_history = IMP_Maillog::getLog($msg_id);
-        if (!is_a($msg_history, 'PEAR_Error')) {
+        if ($msg_history && !is_a($msg_history, 'PEAR_Error')) {
             foreach ($msg_history->getData() as $entry) {
                 $msg = null;
                 if (isset($entry['desc'])) {


--- orig/compose.php
+++ mod/compose.php
@@ -1,16 +1,42 @@
 <?php
 /**
- * $Horde: imp/compose.php,v 2.800.2.35 2005/10/17 13:42:46 jan Exp $
+ * $Horde: imp/compose.php,v 2.800.2.67 2006/03/12 07:20:28 slusarz Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
 /**
+ * Determines the actionID.
+ */
+function _getActionID()
+{
+    if (!($aid = Util::getFormData('actionID'))) {
+        foreach (array('send_message', 'save_draft', 'cancel_compose', 'add_attachment') as $val) {
+            if (Util::getFormData('btn_' . $val)) {
+                $aid = $val;
+                break;
+            }
+        }
+    }
+
+    /* Alter the 'Send Message' action if the "Spell check before sending
+     * message?" preference has been enabled. */
+    if (($aid == 'send_message') &&
+        (Util::getFormData('done_action') != 'send') &&
+        !empty($GLOBALS['conf']['utils']['spellchecker']) &&
+        $GLOBALS['prefs']->getValue('compose_spellcheck')) {
+        return 'spell_check_send';
+    } else {
+        return $aid;
+    }
+}
+
+/**
  * Return an url for mailbox.php depending on what kind of start/page
  * information we have.
  *
@@ -212,6 +238,10 @@
     /* Send in flowed format. */
     require_once 'Text/Flowed.php';
     $flowed = &new Text_Flowed($textBody->getContents(), $charset);
+    if (method_exists($flowed, 'setDelSp')) {
+        $flowed->setDelSp(true);
+        $textBody->setContentTypeParameter('DelSp', 'Yes');
+    }
     $textBody->setContents($flowed->toFlowed());
     $textBody->setContentTypeParameter('format', 'flowed');
 
@@ -221,7 +251,7 @@
         $htmlBody = &new MIME_Part('text/html', String::wrap($message_html), null, 'inline');
         if (!is_null($trailer)) {
             require_once 'Horde/Text/Filter.php';
-            $htmlBody->appendContents(Text_Filter::filter($trailer, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null)));
+            $htmlBody->appendContents(Text_Filter::filter($trailer, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null)));
         }
         $basepart = &new MIME_Part('multipart/alternative');
         $textBody->setDescription(_("Plaintext Version of Message"));
@@ -257,33 +287,6 @@
 }
 
 /**
- * Update the attachment information.
- */
-function _updateAttachmentInformation($notify = true)
-{
-    $deleteList = Util::getPost('delattachments', array());
-
-    /* Update the attachment information. */
-    for ($i = 1; $i <= $GLOBALS['imp_compose']->numberOfAttachments(); $i++) {
-        if (!in_array($i, $deleteList)) {
-            $disposition = Util::getFormData('file_disposition_' . $i);
-            $description = Util::getFormData('file_description_' . $i);
-            $GLOBALS['imp_compose']->updateAttachment($i, array('disposition' => $disposition, 'description' => $description));
-        }
-    }
-
-    /* Delete attachments. */
-    if (!empty($deleteList)) {
-        $filenames = $GLOBALS['imp_compose']->deleteAttachment($deleteList);
-        if ($notify) {
-            foreach ($filenames as $val) {
-                $GLOBALS['notification']->push(sprintf(_("Deleted the attachment \"%s\"."), $val), 'horde.success');
-            }
-        }
-    }
-}
-
-/**
  * Create the base MIME_Message for sending.
  */
 function _createMimeMessage($to, $body)
@@ -354,11 +357,11 @@
             break;
 
         case IMP_SMIME_ENCRYPT:
-            $body = $imp_smime->IMPencryptMIMEPart($body, $to);
+            $body = $imp_smime->IMPencryptMIMEPart($body, $to[0]);
             break;
 
         case IMP_SMIME_SIGNENC:
-            $body = $imp_smime->IMPsignAndEncryptMIMEPart($body, $to);
+            $body = $imp_smime->IMPsignAndEncryptMIMEPart($body, $to[0]);
             break;
         }
 
@@ -380,7 +383,7 @@
         $mime_message->addPart($GLOBALS['imp_pgp']->publicKeyMIMEPart());
     }
 
-    return array('to' => $to, 'msg' => &$mime_message);
+    return array('to' => implode(', ', $to), 'msg' => &$mime_message);
 }
 
 function _cleanAddrList($addrs)
@@ -405,15 +408,25 @@
     return array_values($addrlist);
 }
 
+function _popupSuccess()
+{
+    global $registry;
+    require_once 'Horde/Menu.php';
+    $menu = &new Menu(HORDE_MENU_MASK_NONE);
+    $menu->add(Horde::applicationUrl('compose.php'), _("Compose another message"), 'compose.png');
+    $menu->add('', _("Close this window"), 'close.png', $registry->getImageDir('horde'), '', 'window.close();');
+    require IMP_TEMPLATES . '/common-header.inc';
+    require IMP_TEMPLATES . '/compose/success.inc';
+    IMP::status();
+    require $registry->get('templates', 'horde') . '/common-footer.inc';
+}
+
 @define('IMP_BASE', dirname(__FILE__));
 $session_control = 'netscape';
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Compose.php';
-require_once IMP_BASE . '/lib/MIME/Contents.php';
-require_once IMP_BASE . '/lib/MIME/Headers.php';
 require_once IMP_BASE . '/lib/Folder.php';
 require_once 'Horde/Identity.php';
-require_once 'Horde/Menu.php';
 require_once 'Horde/MIME.php';
 require_once 'Horde/MIME/Part.php';
 
@@ -422,12 +435,11 @@
 $s_var = array('to', 'cc', 'bcc', 'to_list', 'cc_list', 'bcc_list',
                'to_field', 'cc_field', 'bcc_field', 'to_new', 'cc_new',
                'bcc_new', 'link_attachments', 'rtemode', 'pgp_attach_pubkey',
-               'in_reply_to', 'references', 'identity', 'charset', 'index',
+               'in_reply_to', 'references', 'identity', 'charset',
                'messageCache', 'popup', 'oldrtemode', 'mailto', 'from',
                'encrypt_options', 'x_priority', 'request_read_receipt',
-               'request_delivery_confirmation', 'subject', 'reply_type',
-               'save_sent_mail', 'save_attachments_select', 'reloaded',
-               'sent_mail_folder');
+               'subject', 'reply_index', 'reply_type', 'save_sent_mail',
+               'save_attachments_select', 'reloaded', 'sent_mail_folder');
 
 /* The message text. */
 $msg = '';
@@ -449,10 +461,31 @@
 $imp_pgp = $imp_smime = $usePGP = $useSMIME = null;
 
 $identity = &Identity::singleton(array('imp', 'imp'));
-$sent_mail_folder = $identity->getSentmailFolder(Util::getFormData('identity'));
-$actionID = Util::getFormData('actionID');
+$sent_mail_folder = $identity->getValue('sent_mail_folder', Util::getFormData('identity'));
+$actionID = _getActionID();
+$reply_index = Util::getFormData('reply_index');
+$thismailbox = Util::getFormData('thismailbox', $imp['mailbox']);
+
+/* Check for duplicate submits. */
+require_once 'Horde/Token.php';
+if (isset($conf['token'])) {
+    /* If there is a configured token system, set it up. */
+    $tokenSource = &Horde_Token::singleton($conf['token']['driver'], Horde::getDriverConfig('token', $conf['token']['driver']));
+} else {
+    /* Default to the file system if no config. */
+    $tokenSource = &Horde_Token::singleton('file');
+}
+if (($token = Util::getFormData('__formToken_compose')) &&
+    !$tokenSource->verify($token)) {
+    /* Notify and reset the actionID. */
+    $notification->push(_("You have already submitted this page."), 'horde.error');
+    $actionID = '';
+}
+
 if (($index = Util::getFormData('index'))) {
-    $imp_contents = &IMP_Contents::singleton($index);
+    require_once IMP_BASE . '/lib/MIME/Contents.php';
+    require_once IMP_BASE . '/lib/MIME/Headers.php';
+    $imp_contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $_SESSION['imp']['thismailbox']);
     $imp_headers = &new IMP_Headers($index);
 }
 $imp_folder = &IMP_Folder::singleton();
@@ -461,9 +494,9 @@
 NLS::setTimeZone();
 
 /* Set the default charset & encoding.
- * $charset holds the charset to use when sending messages,
- * $encoding the best guessed charset offered to the user
- * as the default value in the charset dropdown list. */
+ * $charset holds the charset to use when sending messages, $encoding the best
+ * guessed charset offered to the user as the default value in the charset
+ * dropdown list. */
 if ($prefs->isLocked('sending_charset')) {
     $charset = NLS::getEmailCharset();
 } else {
@@ -494,13 +527,70 @@
     }
 }
 
-/* Alter the 'Send Message' action if the "Spell check before sending
- * message?" preference has been enabled. */
-if (!empty($conf['utils']['spellchecker']) &&
-    $prefs->getValue('compose_spellcheck')) {
-    $send_action = 'spell_check_send';
-} else {
-    $send_action = 'send_message';
+/* Load stationery. */
+if (!$prefs->isLocked('stationery')) {
+    $stationery = null;
+    $all_stationery = @unserialize($prefs->getValue('stationery', false));
+    if (is_array($all_stationery)) {
+        $all_stationery = String::convertCharset($all_stationery, $prefs->getCharset());
+        $stationery_list = array();
+        foreach ($all_stationery as $stationery_id => $stationery_choice) {
+            if ($stationery_choice['t'] == 'plain' ||
+                ($stationery_choice['t'] == 'html' && $rtemode)) {
+                $stationery_list[$stationery_id] = $stationery_choice;
+            }
+        }
+    } else {
+        $stationery_list = null;
+    }
+}
+
+/* Update the file attachment information. */
+if ($imp['file_upload']) {
+    /* Only notify if we are reloading the compose screen. */
+    $notify = ($actionID != 'send_message') && ($actionID != 'save_draft');
+
+    $deleteList = Util::getPost('delattachments', array());
+
+    /* Update the attachment information. */
+    for ($i = 1; $i <= $imp_compose->numberOfAttachments(); $i++) {
+        if (!in_array($i, $deleteList)) {
+            $disposition = Util::getFormData('file_disposition_' . $i);
+            $description = Util::getFormData('file_description_' . $i);
+            $imp_compose->updateAttachment($i, array('disposition' => $disposition, 'description' => $description));
+        }
+    }
+
+    /* Delete attachments. */
+    if (!empty($deleteList)) {
+        $filenames = $imp_compose->deleteAttachment($deleteList);
+        if ($notify) {
+            foreach ($filenames as $val) {
+                $notification->push(sprintf(_("Deleted the attachment \"%s\"."), $val), 'horde.success');
+            }
+        }
+    }
+
+    /* Add new attachments. */
+    for ($i = 1; $i <= count($_FILES); $i++) {
+        $key = 'upload_' . $i;
+        if (isset($_FILES[$key]) &&
+            ($_FILES[$key]['error'] != 4)) {
+            if ($_FILES[$key]['size'] == 0) {
+                $actionID = null;
+                $notification->push(sprintf(_("Did not attach \"%s\" as the file was empty."), $_FILES[$key]['name']), 'horde.warning');
+            } else {
+                $result = $imp_compose->addUploadAttachment($key, Util::getFormData('upload_disposition_' . $i));
+                if (is_a($result, 'PEAR_Error')) {
+                    /* Don't send message immediately if we hit an error. */
+                    $actionID = null;
+                    $notification->push($result, 'horde.error');
+                } elseif ($notify) {
+                    $notification->push(sprintf(_("Added \"%s\" as an attachment."), $result), 'horde.success');
+                }
+            }
+        }
+    }
 }
 
 /* Run through the action handlers. */
@@ -573,12 +663,12 @@
 
         if ($rtemode && ($body_part->getType() != 'text/html')) {
             require_once 'Horde/Text/Filter.php';
-            $msg = Text_Filter::filter($msg, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null));
+            $msg = Text_Filter::filter($msg, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null));
         }
 
         if (($fromaddr = $imp_headers->getOb('fromaddress'))) {
             $_GET['identity'] = $identity->getMatchingIdentity($fromaddr);
-            $sent_mail_folder = $identity->getSentmailFolder(Util::getFormData('identity'));
+            $sent_mail_folder = $identity->getValue('sent_mail_folder', Util::getFormData('identity'));
         }
         $header['to'] = MIME::addrArray2String($imp_headers->getOb('to'));
         $header['cc'] = MIME::addrArray2String($imp_headers->getOb('cc'));
@@ -662,7 +752,7 @@
         $msg = $imp_compose->replyMessage($imp_contents, $qfrom, $imp_headers);
         if ($rtemode) {
             require_once 'Horde/Text/Filter.php';
-            $msg = Text_Filter::filter($msg, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null));
+            $msg = Text_Filter::filter($msg, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null));
         }
 
         $header['subject'] = $imp_headers->getOb('subject', true);
@@ -681,6 +771,8 @@
         } elseif ($actionID == 'reply_list') {
             $title = _("Reply to List:") . ' ' . $header['subject'];
         }
+
+        $reply_index = $index;
     }
     break;
 
@@ -691,7 +783,7 @@
         $msg = $imp_compose->forwardMessage($imp_contents, $imp_headers);
         if ($rtemode) {
             require_once 'Horde/Text/Filter.php';
-            $msg = Text_Filter::filter($msg, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null));
+            $msg = Text_Filter::filter($msg, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null));
         }
 
         $res = $imp_compose->attachFilesFromMessage($imp_contents);
@@ -769,14 +861,7 @@
             if ($isPopup) {
                 if ($prefs->getValue('compose_confirm')) {
                     $notification->push(_("Message redirected successfully."), 'horde.success');
-                    require_once 'Horde/Menu.php';
-                    $menu = &new Menu(HORDE_MENU_MASK_NONE);
-                    $menu->add(Horde::applicationUrl('compose.php'), _("Compose another message"), 'compose.png');
-                    $menu->add('', _("Close this window"), 'close.png', $registry->getImageDir('horde'), '', 'window.close();');
-                    require IMP_TEMPLATES . '/common-header.inc';
-                    IMP::status();
-                    require IMP_TEMPLATES . '/compose/success.inc';
-                    require $registry->get('templates', 'horde') . '/common-footer.inc';
+                    _popupSuccess();
                 } else {
                     Util::closeWindowJS();
                 }
@@ -798,8 +883,6 @@
 case 'send_message':
     $f_cc = $f_bcc = null;
 
-    _updateAttachmentInformation(false);
-
     $f_to = _getAddressList('to');
     if ($conf['compose']['allow_cc']) {
         $f_cc = _getAddressList('cc');
@@ -828,6 +911,10 @@
 
     /* Set up the base message now. */
     $body = _baseMessage($imp_compose, $charset);
+    if (is_a($body, 'PEAR_Error')) {
+        $notification->push($res, 'horde.error');
+        break;
+    }
 
     /* Prepare the array of messages to send out.  May be more than one if
      * we are encrypting for multiple recipients are storing an encrypted
@@ -836,16 +923,27 @@
 
     /* Do encryption. */
     $encrypt = Util::getFormData('encrypt_options');
-    $usePGP = ($prefs->getValue('use_pgp') && $conf['utils']['gnupg']);
+    $usePGP = ($prefs->getValue('use_pgp') && !empty($conf['utils']['gnupg']));
     $useSMIME = $prefs->getValue('use_smime');
+    $multiple_pgp_msg = false;
+
+    if ($usePGP &&
+        in_array($encrypt, array(IMP_PGP_ENCRYPT, IMP_PGP_SIGNENC))) {
+        if (empty($imp_pgp)) {
+            require_once IMP_BASE .'/lib/Crypt/PGP.php';
+            $imp_pgp = &new IMP_PGP();
+        }
+        if (empty($imp_pgp->multipleRecipientEncryption)) {
+            $multiple_pgp_msg = true;
+        }
+    }
 
-    if (($usePGP &&
-         in_array($encrypt, array(IMP_PGP_ENCRYPT, IMP_PGP_SIGNENC))) ||
+    if ($multiple_pgp_msg ||
         ($useSMIME &&
          in_array($encrypt, array(IMP_SMIME_ENCRYPT, IMP_SMIME_SIGNENC)))) {
         /* Must encrypt & send the message one recipient at a time. */
         foreach ($recipientArray as $val) {
-            $res = _createMimeMessage($val, $body);
+            $res = _createMimeMessage(array($val), $body);
             if (is_a($res, 'PEAR_Error')) {
                 $get_sig = false;
                 $notification->push($res, 'horde.error');
@@ -856,7 +954,7 @@
 
         /* Must target the encryption for the sender before saving message in
          * sent-mail. */
-        $messageToSave = _createMimeMessage($from, $body);
+        $messageToSave = _createMimeMessage(array($from), $body);
         if (is_a($messageToSave, 'PEAR_Error')) {
             $get_sig = false;
             $notification->push($messageToSave, 'horde.error');
@@ -864,7 +962,7 @@
         }
     } else {
         /* No encryption - can send in clear-text all at once. */
-        $res = _createMimeMessage($recipients, $body);
+        $res = _createMimeMessage($recipientArray, $body);
         if (is_a($res, 'PEAR_Error')) {
             $get_sig = false;
             $notification->push($res, 'horde.error');
@@ -874,6 +972,7 @@
     }
 
     /* Initalize a header object for the outgoing message. */
+    require_once IMP_BASE . '/lib/MIME/Headers.php';
     $msg_headers = &new IMP_Headers();
 
     /* Add a Received header for the hop from browser to server. */
@@ -897,25 +996,24 @@
             $mdn = &new MIME_MDN();
             $mdn->addMDNRequestHeaders($msg_headers, $barefrom);
         }
-        if (Util::getFormData('request_delivery_confirmation')) {
-            $msg_headers->addDeliveryReceiptHeaders($barefrom);
-        }
     }
 
-    $msg_headers->addHeader('From', String::convertCharset($from, NLS::getCharset(), $charset));
+    $browser_charset = NLS::getCharset();
+
+    $msg_headers->addHeader('From', String::convertCharset($from, $browser_charset, $charset));
 
     if (!empty($replyto) && ($replyto != $barefrom)) {
-        $msg_headers->addHeader('Reply-to', String::convertCharset($replyto, NLS::getCharset(), $charset));
+        $msg_headers->addHeader('Reply-to', String::convertCharset($replyto, $browser_charset, $charset));
     }
     if (!empty($f_to)) {
-        $msg_headers->addHeader('To', String::convertCharset($f_to, NLS::getCharset(), $charset));
+        $msg_headers->addHeader('To', String::convertCharset($f_to, $browser_charset, $charset));
     } elseif (empty($f_to) && empty($f_cc)) {
         $msg_headers->addHeader('To', 'undisclosed-recipients:;');
     }
     if (!empty($f_cc)) {
-        $msg_headers->addHeader('Cc', String::convertCharset($f_cc, NLS::getCharset(), $charset));
+        $msg_headers->addHeader('Cc', String::convertCharset($f_cc, $browser_charset, $charset));
     }
-    $msg_headers->addHeader('Subject', String::convertCharset(Util::getFormData('subject', ''), NLS::getCharset(), $charset));
+    $msg_headers->addHeader('Subject', String::convertCharset(Util::getFormData('subject', ''), $browser_charset, $charset));
 
     /* Add necessary headers for replies. */
     $reply_type = Util::getFormData('reply_type');
@@ -952,9 +1050,12 @@
             IMP_Maillog::log($reply_type, $irt, $recipients);
         }
 
-        if ($index && ($reply_type == 'reply')) {
+        if ($reply_index && ($reply_type == 'reply')) {
             /* Make sure to set the IMAP reply flag. */
-            imap_setflag_full($imp['stream'], $index, '\\ANSWERED', SE_UID);
+            require_once IMP_BASE . '/lib/Message.php';
+            $imp_message = &IMP_Message::singleton();
+            $flag = array($_SESSION['imp']['thismailbox'] => array($reply_index));
+            $imp_message->flag('\\ANSWERED', $flag);
         }
     }
 
@@ -966,7 +1067,9 @@
     $imp_compose->deleteAllAttachments();
 
     /* Should we save this message in the sent mail folder? */
-    $sent_mail_folder = $identity->getSentmailFolder(null, Util::getFormData('sent_mail_folder'));
+    if ($smf = Util::getFormData('sent_mail_folder')) {
+        $sent_mail_folder = $smf;
+    }
     if (!empty($sent_mail_folder) &&
         ((!$prefs->isLocked('save_sent_mail') &&
           Util::getFormData('save_sent_mail')) ||
@@ -1056,7 +1159,7 @@
                 if (empty($name)) {
                     $name = $recipient->mailbox;
                 }
-                $name = MIME::decode($name, NLS::getCharset());
+                $name = MIME::decode($name, $browser_charset);
 
                 $result = $registry->call('contacts/import', array(array('name' => $name, 'email' => $recipient->mailbox . '@' . $recipient->host),
                                                                    'array', $abook));
@@ -1076,14 +1179,7 @@
             if ($sent_saved) {
                 $notification->push(_("Message sent successfully."), 'horde.success');
             }
-            require_once 'Horde/Menu.php';
-            $menu = &new Menu(HORDE_MENU_MASK_NONE);
-            $menu->add(Horde::applicationUrl('compose.php'), _("Compose another message"), 'compose.png');
-            $menu->add('', _("Close this window"), 'close.png', $registry->getImageDir('horde'), '', 'window.close();');
-            require IMP_TEMPLATES . '/common-header.inc';
-            require IMP_TEMPLATES . '/compose/success.inc';
-            IMP::status();
-            require $registry->get('templates', 'horde') . '/common-footer.inc';
+            _popupSuccess();
         } else {
             Util::closeWindowJS();
         }
@@ -1096,7 +1192,7 @@
     exit;
 
 case 'save_draft':
-    $drafts_folder = $prefs->getValue('drafts_folder');
+    $drafts_folder = IMP::folderPref($prefs->getValue('drafts_folder'), true);
     if (!empty($drafts_folder)) {
         require_once 'Horde/MIME/Message.php';
         $mime = &new MIME_Message($imp['maildomain']);
@@ -1107,6 +1203,10 @@
 
         /* Set up the base message now. */
         $body = _baseMessage($imp_compose, $charset, false);
+        if (is_a($body, 'PEAR_Error')) {
+            $notification->push($res, 'horde.error');
+            break;
+        }
 
         $mime->addPart($body);
         $body = $mime->toString();
@@ -1114,6 +1214,7 @@
         $from = $identity->getFromLine(Util::getFormData('identity'), Util::getFormData('from'));
 
         /* Initalize a header object for the draft. */
+        require_once IMP_BASE . '/lib/MIME/Headers.php';
         $draft_headers = &new IMP_Headers();
 
         $draft_headers->addHeader('Date', date('r'));
@@ -1148,7 +1249,6 @@
             $append_flags = '\\Draft \\Seen';
         }
 
-        $drafts_folder = IMP::addPreambleString($drafts_folder);
         $draft_success = false;
 
         if ($imp_folder->exists($drafts_folder)) {
@@ -1169,7 +1269,7 @@
                 exit;
             } else {
                 $notification->push(sprintf(_("The draft has been saved to the \"%s\" folder."),
-                                            IMP::stripPreambleString($drafts_folder)));
+                                            IMP::displayFolder($drafts_folder)));
                 $get_sig = false;
                 break;
             }
@@ -1179,31 +1279,10 @@
     $notification->push(_("There was an error saving this message as a draft."), 'horde.error');
     break;
 
-case 'add_attachment':
-    for ($i = 1; $i <= count($_FILES); $i++) {
-        $key = 'upload_' . $i;
-        if (isset($_FILES[$key]) &&
-            ($_FILES[$key]['error'] != 4)) {
-            $result = $imp_compose->addUploadAttachment($key, Util::getFormData('upload_disposition_' . $i));
-            if (is_a($result, 'PEAR_Error')) {
-                $notification->push($result, 'horde.error');
-            } else {
-                $notification->push(sprintf(_("Added \"%s\" as an attachment."), $result), 'horde.success');
-            }
-        }
-    }
-
-    $get_sig = false;
-    break;
-
-case 'update_attachment':
-    _updateAttachmentInformation();
-    $get_sig = false;
-    break;
-
 case 'fwd_digest':
     $indices = Util::getFormData('fwddigest');
     if (!empty($indices)) {
+        require_once IMP_BASE . '/lib/MIME/Contents.php';
         $msglist = unserialize(urldecode($indices));
         foreach ($msglist as $index) {
             if (strstr($index, IMP_IDX_SEP)) {
@@ -1211,15 +1290,17 @@
                 $imp_imap = &IMP_IMAP::singleton();
                 list($index, $mailbox) = explode(IMP_IDX_SEP, $index);
                 $imp_imap->changeMbox($mailbox);
+            } else {
+                $mailbox = $_SESSION['imp']['thismailbox'];
             }
             $part = &new MIME_Part('message/rfc822');
-            $contents = &IMP_Contents::singleton($index);
-            $digest_headers = &$contents->getHeaderOb($index);
+            $contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $mailbox);
+            $digest_headers = &$contents->getHeaderOb();
             if (!($name = $digest_headers->getOb('subject', true))) {
                 $name = _("[No Subject]");
             }
             $part->setName($name);
-            $part->setContents($contents->fullMessageText($index));
+            $part->setContents($contents->fullMessageText());
             $res = $imp_compose->addMIMEPartAttachment($part);
             if (is_a($res, 'PEAR_Error')) {
                 $notification->push($res, 'horde.error');
@@ -1241,7 +1322,6 @@
         header('Location: ' . _mailboxReturnURL(false));
     }
     exit;
-    break;
 
 case 'spell_check_cancel':
     $msg = "\n" . Util::getFormData('message');
@@ -1297,6 +1377,43 @@
         }
     }
     break;
+
+case 'change_stationery':
+    if (!$prefs->isLocked('stationery')) {
+        $stationery = Util::getFormData('stationery');
+        if (strlen($stationery)) {
+            $stationery = (int)$stationery;
+            $stationery_content = $stationery_list[$stationery]['c'];
+            $msg = Util::getFormData('message', '');
+            if (strpos($stationery_content, '%s') !== false) {
+
+                if (!is_null($selected_identity = Util::getFormData('identity'))) {
+                    $sig = $identity->getSignature($selected_identity);
+                } else {
+                    $sig = $identity->getSignature();
+                }
+                if ($rtemode) {
+                    require_once 'Horde/Text/Filter.php';
+                    $sig = Text_Filter::filter($sig, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null));
+                    $stationery_content = Text_Filter::filter($stationery_content, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null));
+                }
+                $msg = str_replace(array("\r\n", $sig), array("\n", ''), $msg);
+                $stationery_content = str_replace('%s', $sig, $stationery_content);
+            }
+            if (strpos($stationery_content, '%c') === false) {
+                $msg .= $stationery_content;
+            } else {
+                $msg = str_replace('%c', $msg, $stationery_content);
+            }
+        }
+    }
+    $get_sig = false;
+    break;
+
+case 'add_attachment':
+    $get_sig = false;
+    break;
+
 }
 
 if ($rtemode) {
@@ -1326,8 +1443,8 @@
     /* If the attachments cache is not empty, we must reload this page
      * and delete the attachments. */
     if ($messageCacheID) {
-        $url = Util::addParameter(Horde::selfUrl(), array('actionID' => 'cancel_compose', 'messageCache' => $messageCacheID, 'popup' => 1));
-        $cancel_js = 'self.location.href=\'' . $url . ';\'';
+        $url = Util::addParameter(Horde::selfUrl(), array('actionID' => 'cancel_compose', 'messageCache' => $messageCacheID, 'popup' => 1), null, false);
+        $cancel_js = 'self.location.href=\'' . $url . '\';';
     } else {
         $cancel_js = 'self.close();';
     }
@@ -1335,7 +1452,7 @@
     /* If the attachments cache is not empty, we must reload this page and
        delete the attachments. */
     if ($messageCacheID) {
-        $url = Util::addParameter(_mailboxReturnURL(true, Horde::selfUrl()), array('actionID' => 'cancel_compose', 'messageCache' => $messageCacheID));
+        $url = Util::addParameter(_mailboxReturnURL(true, Horde::selfUrl()), array('actionID' => 'cancel_compose', 'messageCache' => $messageCacheID), null, false);
         $cancel_js = 'window.location = \'' . $url . '\';';
     } else {
         $cancel_js = 'window.location = \'' . _mailboxReturnURL(true) . '\';';
@@ -1386,24 +1503,10 @@
 }
 
 $all_sigs = $identity->getAllSignatures();
-$folders = $imp_folder->flist_IMP(array('INBOX'));
 foreach ($all_sigs as $ident => $sig) {
-    $sentmail_folder = $identity->getSentmailFolder($ident);
-    if ($conf['user']['select_sentmail_folder']) {
-        $i = 0;
-        $select = null;
-        foreach ($folders as $folder) {
-            if ($folder['val'] == $sentmail_folder) {
-                $select = $i;
-            }
-            $i++;
-        }
-    } else {
-        $select = $sentmail_folder;
-    }
     $identities[$ident] = array($sig,
                                 $identity->getValue('sig_first', $ident),
-                                $select,
+                                $identity->getValue('sent_mail_folder', $ident),
                                 $identity->saveSentmail($ident),
                                 MIME::addrArray2String($identity->getBccAddresses($ident)));
 }
@@ -1412,7 +1515,7 @@
 if ($get_sig && isset($msg) && !empty($sig)) {
     if ($rtemode) {
         require_once 'Horde/Text/Filter.php';
-        $sig = Text_Filter::filter($sig, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null));
+        $sig = Text_Filter::filter($sig, 'text2html', array('parselevel' => TEXT_HTML_MICRO_LINKURL, 'class' => null, 'callback' => null));
     }
 
     if ($identity->getValue('sig_first')) {
@@ -1463,11 +1566,11 @@
 
 /* Open the passphrase window here. */
 if ($pgp_passphrase_dialog) {
-    require_once IMP_TEMPLATES . '/pgp/open_pgp_win.js';
-    echo '<script language="JavaScript" type="text/javascript">' . $imp_pgp->getJSOpenWinCode('open_passphrase_dialog', "opener.focus();opener.document.compose.actionID.value='send_message';opener.uniqSubmit();") . '</script>';
+    Horde::addScriptFile('popup.js');
+    echo '<script type="text/javascript">' . $imp_pgp->getJSOpenWinCode('open_passphrase_dialog', "opener.focus();opener.document.compose.actionID.value='send_message';opener.uniqSubmit();") . '</script>';
 } elseif ($smime_passphrase_dialog) {
-    require_once IMP_TEMPLATES . '/smime/open_smime_win.js';
-    echo '<script language="JavaScript" type="text/javascript">' . $imp_smime->getJSOpenWinCode('open_passphrase_dialog', "opener.focus();opener.document.compose.actionID.value='send_message';opener.uniqSubmit();") . '</script>';
+    Horde::addScriptFile('popup.js');
+    echo '<script type="text/javascript">' . $imp_smime->getJSOpenWinCode('open_passphrase_dialog', "opener.focus();opener.document.compose.actionID.value='send_message';opener.uniqSubmit();") . '</script>';
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/lib/Block/tree_folders.php
+++ mod/lib/Block/tree_folders.php
@@ -4,7 +4,7 @@
 $block_type = 'tree';
 
 /**
- * $Horde: imp/lib/Block/tree_folders.php,v 1.28.2.9 2005/09/09 02:58:18 slusarz Exp $
+ * $Horde: imp/lib/Block/tree_folders.php,v 1.28.2.17 2006/03/08 07:20:34 slusarz Exp $
  *
  * @package Horde_Block
  */
@@ -22,27 +22,31 @@
         require_once IMP_BASE . '/lib/IMAP/Tree.php';
         require_once 'Horde/Identity.php';
 
-        /* Abort immediately if we're not currently logged in to
-         * IMP or using a POP3 server. */
-        if (IMP::checkAuthentication(OP_HALFOPEN, true) !== true ||
-            $_SESSION['imp']['base_protocol'] == 'pop3') {
+        /* Abort immediately if we're not currently logged in. */
+        if (IMP::checkAuthentication(OP_HALFOPEN, true) !== true) {
             return;
         }
 
+        /* Call the mailbox icon hook, if requested. */
+        $mbox_icons = array();
+        if (!empty($GLOBALS['conf']['hooks']['mbox_icon'])) {
+            require_once HORDE_BASE . '/config/hooks.php';
+            if (function_exists('_imp_hook_mbox_icons')) {
+                $mbox_icons = call_user_func('_imp_hook_mbox_icons');
+            }
+        }
+
+        /* Cache some additional values. */
+        $image_dir = $registry->getImageDir();
+        $use_vtrash = $prefs->getValue('use_vtrash');
+
         /* Initialize the user's identities. */
         $identity = &Identity::singleton(array('imp', 'imp'));
 
-        /* Get special folders. */
-        $trash = IMP::addPreambleString($prefs->getValue('trash_folder'));
-        $draft = IMP::addPreambleString($prefs->getValue('drafts_folder'));
-        $sent = $identity->getAll('sent_mail_folder');
-        $sent = array_filter($sent, create_function('$mbox', 'return !empty($mbox);'));
-        $sent = array_map(array('IMP', 'addPreambleString'), $sent);
-
-        $tree->addNode($parent . 'compose', $parent, _("Compose"),
+        $tree->addNode($parent . 'compose', $parent, _("New Message"),
                        $indent, false,
                        array('icon' => 'compose.png',
-                             'icondir' => $registry->getImageDir(),
+                             'icondir' => $image_dir,
                              'url' => IMP::composeLink(),
                              'target' => $prefs->getValue('compose_popup') ? 'horde_menu' : 'horde_main'));
 
@@ -53,14 +57,26 @@
                              'icondir' => $registry->getImageDir('horde'),
                              'url' => Horde::applicationUrl('search.php')));
 
+        if ($_SESSION['imp']['base_protocol'] == 'pop3') {
+            return;
+        }
+
+        /* Get special folders. */
+        $trash = IMP::folderPref($prefs->getValue('trash_folder'), true);
+        $draft = IMP::folderPref($prefs->getValue('drafts_folder'), true);
+        $sent = $identity->getAllSentmailFolders();
+
         $name_url = Util::addParameter(Horde::applicationUrl('mailbox.php'), 'no_newmail_popup', 1);
 
         /* Initialize the IMP_Tree object. */
         $imptree = &IMP_Tree::singleton();
+        $mask = IMAPTREE_NEXT_SHOWCLOSED;
+        if ($prefs->getValue('subscribe') &&
+            defined('IMAPTREE_NEXT_SHOWSUB')) {
+            $mask |= IMAPTREE_NEXT_SHOWSUB;
+        }
 
         /* Start iterating through the list of mailboxes, displaying them. */
-        $prefix = $imptree->getPrefix();
-        $notrail_prefix = $imptree->noTrailingDelimiter($prefix);
         $unseen = 0;
         $inbox = null;
         $mailbox = $imptree->reset();
@@ -97,7 +113,7 @@
                         break;
 
                     case $trash:
-                        $dir2 = 'trash.png';
+                        $dir2 = ($use_vtrash) ? 'folder.png' : 'trash.png';
                         break;
 
                     case $draft:
@@ -105,14 +121,16 @@
                         break;
 
                     default:
-                        if (in_array($mailbox['value'], $sent)) {
+                        if ($imptree->isVFolder($mailbox) &&
+                            $GLOBALS['imp_search']->isVTrashFolder($mailbox['value'])) {
+                            $dir2 = 'trash.png';
+                        } elseif ($imptree->isVFolder($mailbox) &&
+                                  $GLOBALS['imp_search']->isVINBOXFolder($mailbox['value'])) {
+                            $dir2 = 'inbox.png';
+                        } elseif (in_array($mailbox['value'], $sent)) {
                             $dir2 = 'sent.png';
                         } else {
-                            if (isset($mbox_icons[$mailbox['value']])) {
-                                $dir2 = $mbox_icons[$mailbox['value']];
-                            } else {
-                                $dir2 = 'folder.png';
-                            }
+                            $dir2 = 'folder.png';
                         }
                         break;
                     }
@@ -121,55 +139,49 @@
                     $dir2 = 'folder.png';
                 }
 
-                /* The indent level of the current folder. */
-                $indent_level = $mailbox['level'];
-
-                /* If we have a folder prefix, shift each folder in the
-                 * hierarchy up one level before showing it to the
-                 * user. */
-                if (!empty($prefix) &&
-                    ($mailbox['value'] != 'INBOX') &&
-                    String::substr($mailbox['value'], 0, String::length($notrail_prefix)) == $notrail_prefix) {
-                    $indent_level--;
+                if (isset($mbox_icons[$mailbox['value']]) &&
+                    preg_match('/src="([^"]+)"/', $mbox_icons[$mailbox['value']], $match)) {
+                    $icon = $match[1];
+                    $icondir = '';
+                } else {
+                    $icon = 'folders/' . $dir2;
+                    $icondir = $image_dir;
                 }
 
-                if ($indent_level >= 0) {
-                    $node_params += array('icon' => 'folders/' . $dir2,
-                                          'icondir' => $registry->getImageDir(),
-                                          'url' => ($imptree->isContainer($mailbox)) ? null : Util::addParameter($name_url, 'mailbox', $mailbox['value']),
-                                         );
-                    $tree->addNode($parent . $mailbox['value'],
-                                   $parent . $mailbox['parent'],
-                                   $mailbox['label'], $indent + $indent_level, false, $node_params);
-                }
-            } while (($mailbox = $imptree->next(IMAPTREE_NEXT_SHOWCLOSED)));
+                $node_params += array('icon' => $icon,
+                                      'icondir' => $icondir,
+                                      'url' => ($imptree->isContainer($mailbox)) ? null : Util::addParameter($name_url, 'mailbox', $mailbox['value']),
+                                     );
+                $tree->addNode($parent . $mailbox['value'],
+                               $parent . $mailbox['parent'],
+                               $mailbox['label'], $indent + $mailbox['level'], $imptree->isOpenSidebar($mailbox['value']), $node_params);
+            } while (($mailbox = $imptree->next($mask)));
         }
 
         /* We want to rewrite the parent node of the INBOX to include new mail
          * notification. */
         if ($inbox) {
-            if ($registry->get('url', $parent)) {
-                $url = $registry->get('url', $parent);
-            } elseif ($registry->get('status', $parent) == 'heading' ||
-                      !$registry->get('webroot')) {
-                $url = null;
-            } else {
-                $url = Horde::url($registry->getInitialPage($parent));
+            $url = $registry->get('url', $parent);
+            if (empty($url)) {
+                if (($registry->get('status', $parent) == 'heading') ||
+                    !$registry->get('webroot')) {
+                    $url = null;
+                } else {
+                    $url = Horde::url($registry->getInitialPage($parent));
+                }
             }
 
             $node_params = array('url' => $url,
                                  'icon' => $registry->get('icon', $parent),
                                  'icondir' => '');
+            $menu_parent = $registry->get('menu_parent', $parent);
+            $name = $registry->get('name', $parent);
             if ($unseen) {
                 $node_params['icon'] = 'newmail.png';
-                $node_params['icondir'] = $registry->getImageDir();
-                $tree->addNode($parent, $registry->get('menu_parent', $parent),
-                               sprintf('<strong>%s</strong> (%s)', $registry->get('name', $parent), $unseen),
-                               $indent - 1, false, $node_params);
-            } else {
-                $tree->addNode($parent, $registry->get('menu_parent', $parent),
-                               $registry->get('name', $parent), $indent - 1, false, $node_params);
+                $node_params['icondir'] = $image_dir;
+                $name = sprintf('<strong>%s</strong> (%s)', $name, $unseen);
             }
+            $tree->addNode($parent, $menu_parent, $name, $indent - 1, $imptree->isOpenSidebar($parent), $node_params);
         }
     }
 


--- orig/docs/CHANGES
+++ mod/docs/CHANGES
@@ -1,4 +1,148 @@
 ------
+v4.1.1
+------
+
+[mms] Silence some undefined warnings if folders are off (Bug #3755).
+[cjh] Escape X-color data (Bug #3751).
+[mms] Never open connection to specific mailbox unless we need it.
+[mms] Don't allow IMP preference access unless authenticated.
+[mms] Fix moving message to trash folder when over quota (Bug #3687).
+[mms] Add preference for default charset to be used for messages with improper
+      charset information (requires Horde 3.1.1) (Request #2702).
+[mms] Fix stripping attachments (Bug #3510).
+[mms] Fix creation of duplicate Virtual INBOXes.
+[mms] Fix displaying Show/Hide/Purge links for deleted messages in certain
+      cases.
+[jan] Fix downloading of all attachments from certain messages in a ZIP file
+      with Internet Explorer.
+[mms] Use other login methods in IMP_IMAP_Client:: if the first method is
+      unsuccessful, to make Exchange working again.
+[mms] If an IMP maintenance task is activated, make sure the Horde preference
+      controlling maintenance is also activated (Bug #2987).
+[mms] Fix spellcheck on send (Bug #3589).
+[mms] Allow user to select sent-mail folder in public namespace if public
+      namespace is blank (Bug #3603).
+[mms] Add preference to define how we want to expand folder list in sidebar.
+
+
+----
+v4.1
+----
+
+[mms] Correctly expunge current mailbox when deleting messages on a POP3
+      server (Bug #3156).
+
+
+--------
+v4.1-RC3
+--------
+
+[mms] Attempt to login to mail server multiple times on non-auth failure to
+      eliminate some "random" session timeouts (ag at netside.de, Bug #3404).
+[mms] Allow configuration of server timeouts in servers.php.
+[jan] Less intrusive notification when expanding of addresses in the compose
+      view fails (Dmitriy MiksIr <miksir at maker.ru>).
+[mms] IMP_IMAPClient:: now uses the Auth_SASL PEAR module during CRAM-MD5 and
+      DIGEST-MD5 authentication.
+
+
+--------
+v4.1-RC2
+--------
+
+[jan] Add Khmer translation (Leang Chumsoben <soben at khmeros.info>).
+[mms] Make Linked attachments work in multipart/alternative messages
+      (Bug #3335).
+[mms] Allow selection of Virtual Folder for login mailbox (Bug #3315).
+[mms] Prompt user before sending messages with empty subjects (Bug #3333).
+[mms] Add ability to edit search queries.
+[jan] Log correct address in login success message if connecting through a
+      proxy (Bug #3289).
+[jan] Fix forwarding of multiple messages.
+[jan] Fix confirmations after successfully sending messages (Bug #3233).
+[jan] Apply _imp_hook_mbox_icons hook to the sidebar folder tree (Bug #3132).
+[mms] Re-add option to rebuild folder tree from IMAP server.
+[mms] Fix sent-mail folder selection in compose view (Bug #2802).
+[cjh] Fix redirection to initial_application preference after running
+      Maintenance tasks.
+
+
+--------
+v4.1-RC1
+--------
+
+[mms] Removed 'dotfiles' server parameter.
+[mms] Allow PHP expressions to be executed for user-defined headers (Bug
+      #3093).
+[mms] Support 'DelSp' parameter in flowed text messages (requires Horde 3.1).
+[mms] Remove outdated, non-standards request for delivery confirmation.
+[mms] Hide lengthy address lists by default in message view and allow the user
+      to toggle viewing (flachapelle at inverse.ca, Bug #3028).
+[cjh] Account for changes to strtotime() in PHP 5.1.
+[mms] It is not possible to hide deleted messages when using thread sort.
+[mms] Option to send notification that linked attachment has been downloaded,
+      and link to delete the attachment (Bug #696).
+[mms] After fetching mail, return to the local mailbox where mail is
+      downloaded to (Bug #2211).
+[mms] Check the IMAP server to see if it supports searches in the current
+      charset.
+[mms] Do not require users to click on 'Attach' button when attaching files
+      in the compose screen (Bug #2848).
+[mms] Don't display unsubscribed folders in sidebar (Bug #2869).
+[mms] Rename folders from top of tree to bottom to prevent errors on IMAP
+      servers that automatically rename all child folders (Bug #2882).
+[mms] Fix opening compose popups when the mailbox contains urlencoded
+      characters (Bug #2872).
+[mms] Fix refresh of folders when not using IMAP subscriptions (Bug #2878).
+[cjh] Skip results with empty email addresses when expanding names
+      (Bug #2757).
+[cjh] Replace %u with the current username in spam reporting shell calls
+      (Dmitriy MiksIr <miksir at maker.ru>).
+[mms] Don't ask for password for decryption when the user does not have a
+      personal private key (Bug #2771).
+[mms] Add API method to return logged in server hostname.
+[mms] PGP encrypted messages now encrypted to all recipients in the same
+      message (Bug #2670) (requires Horde 3.1).
+[mms] Added preference to define the default search field (Bug #2650).
+[jan] Add ability to create notes from email messages.
+[jmf] Add support for changing SMTP server/port on login (Bug #327).
+[mms] Removed 'folders', 'namespace, and 'hierarchies' server parameters.
+[mms] Add auto-detection of namespace information from IMAP server.
+[cjh] Support configuring where the "Report as" spam/innocent links appear
+      (dustin at ywlcs.org, Bug #1096).
+[mms] Add preference to move spam/innocent messages to appropriate mailbox
+      after reporting.
+[mms] Add multiple message view page (Bug #481).
+[jan] Add stationery and form responses.
+[cjh] Differentiate between signed and encrypted attachments (Bug #1712).
+[jmf] Ability to play sound on new mail.
+[jan] Add permissions to restrict creation of folders.
+[mms] Add configuration option to allow message bodies to be cached across
+      page loads.
+[ben] Honor horde's alternate_login and redirect_on_logout settings.
+[jan] Add "Empty Spam" menu item (Bug #1765, jens at peino.de).
+[mms] Add Virtual INBOX to Virtual Folders.
+[mms] Make sure special Virtual Folders can never be edited.
+[mms] Allow import of photo attachments into a gallery application.
+[mms] Fix IMAP thread display when the base level contains more than one
+      message.
+[mms] Better/more complete preview message generation.
+[mms] Graphical representation of thread on thread view screen.
+[mms] Virtual Trash folder support (Todd Merritt <tmerritt at email.arizona.edu>).
+[mms] All composed messages are now sent in "flowed" format. The "wrap_width"
+      preference has been eliminated.
+[mms] Success messages are not shown when adding a blacklist/whitelist address
+      if an error in adding the address(es) occurred.
+[mms] No need to show a "Hide HTML images" link if the images have already
+      been displayed.
+[mms] Include Cc: header information in the header text we display for forward
+      and reply messages (Bug #1079).
+[jan] Show ZIP icon with "Download all attachments" link.
+[mms] S/MIME parts should always attempt to be viewed inline, notwithstanding
+      the Content-Disposition for the part (requires Horde 3.1).
+
+
+------
 v4.0.4
 ------
 
@@ -59,11 +203,11 @@
 [mms] Don't pass server information via login page if not being altered by
       the user. (Bug #1883)
 [mms] Add separate confirmation page when deleting/emptying folders (Bug #783).
+[cjh] Allow sending blank searches to Turba even if the display_contact
+      preference is false (Bug #1854).
 [mms] Encode attachment parameters with the same character set used in the
       base message (Bug #1591).
 [mms] Don't allow user to unsubscribe from INBOX.
-[cjh] Allow sending blank searches to Turba even if the display_contact
-      preference is false (Bug #1854).
 [mms] Don't alter header encodings when redirecting messages (Bug #1823).
 [mms] Fix charset issues with strip attachment message (Bug #1861).
 [cjh] Add missing binary.png for the TNEF MIME Viewer (Bug #1873).
@@ -146,7 +290,7 @@
 v4.0.2-RC1
 ----------
 
-[mms] Decode the contents of the preview messages.
+[mms] Decode the contents of preview messages.
 [mms] Fix reload of underlying window after entering PGP or S/MIME passphrase
       (Bug #1145).
 [cjh] Fix recompose recovery of messages written before a session timeout
@@ -319,7 +463,7 @@
 [mms] HTML composed messages with image links now have the images downloaded
       and sent inline with the message in a multipart/related part.
 [jan] Show graphical emoticons.
-[mms] For images that can not be viewed directly by the browser, IMP can
+[mms] For images that cannot be viewed directly by the browser, IMP can
       automatically convert to a format that can be viewed.
 [cjh] Log reply/forward/redirect actions and display these logs when viewing
       the messages.


--- orig/templates/prefs/initialpageselect.inc
+++ mod/templates/prefs/initialpageselect.inc
@@ -1,34 +1,26 @@
+<?php if (!$prefs->isLocked('initial_page')): ?>
 <?php
-if (!$prefs->isLocked('initial_page')):
-    if ($prefs->getValue('initial_page') == 'folders.php' &&
-        $GLOBALS['conf']['user']['allow_folders']) {
-        $folders_option = '<option value="folders.php" selected="selected">' .
-            _("Folder Navigator") . "</option>\n";
-        $mailbox_option = IMP::flistSelect();
-    } else {
-        if ($GLOBALS['conf']['user']['allow_folders']) {
-            $folders_option = '<option value="folders.php">' . _("Folder Navigator") . "</option>\n";
-            $mailbox_selected = $prefs->getValue('initial_page');
-            if ($mailbox_selected != 'INBOX') {
-                $mailbox_selected = IMP::preambleString() . $mailbox_selected;
-            }
-            $mailbox_option = IMP::flistSelect('', true, array(), $mailbox_selected);
-        } else {
-            $mailbox_option = '<option value="INBOX" selected="selected">INBOX</option>';
-            $folders_option = '';
-        }
+if (empty($GLOBALS['conf']['user']['allow_folders'])) {
+    $mailbox_option = '<option value="INBOX" selected="selected">' . _("Inbox") . '</option>';
+} else {
+    $mailbox_selected = $prefs->getValue('initial_page');
+    $mailbox_option = '<option value="folders.php"';
+    if ($mailbox_selected == 'folders.php') {
+        $mailbox_option .= ' selected="selected"';
     }
+    $mailbox_option .= '>' . _("Folder Navigator") . "</option>\n";
+    $mailbox_option .= IMP::flistSelect('', true, array(), $mailbox_selected, false, false, true);
+}
 ?>
 
-<table border="0">
-<tr>
-    <td>
-        <?php echo _("View or mailbox to display after login:") ?><br />
-        <select name="initial_page">
-            <?php echo $folders_option ?>
-            <?php echo $mailbox_option ?>
-        </select>
-    </td>
-</tr></table>
-
+<table>
+ <tr>
+  <td>
+   <?php echo _("View or mailbox to display after login:") ?><br />
+   <select name="initial_page">
+    <?php echo $mailbox_option ?>
+   </select>
+  </td>
+ </tr>
+</table>
 <?php endif; ?>


--- orig/templates/fetchmail/manage.inc
+++ mod/templates/fetchmail/manage.inc
@@ -5,7 +5,7 @@
 <input type="hidden" name="fm_driver" value="<?php echo $driver ?>" />
 
 <?php echo _("Account's name:") ?><br />
-<input name="fm_id" size="30" maxlength="60" class="fixed" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('id', $to_edit) ?>" /><br />
+<input name="fm_id" size="30" maxlength="60" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('id', $to_edit) ?>" /><br />
 
 <?php echo _("Protocol:") ?><br />
 <select name="fm_protocol">
@@ -15,17 +15,17 @@
 </select><br />
 
 <?php echo _("Username:") ?><br />
-<input name="fm_username" size="30" maxlength="60" class="fixed" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('username', $to_edit) ?>" /><br />
+<input name="fm_username" size="30" maxlength="60" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('username', $to_edit) ?>" /><br />
 
 <?php echo _("Password") ?><br />
-<input name="fm_password" size="30" maxlength="60" class="fixed" type="password" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('password', $to_edit) ?>" /><br />
+<input name="fm_password" size="30" maxlength="60" type="password" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('password', $to_edit) ?>" /><br />
 
 <?php echo _("Server:") ?><br />
-<input name="fm_server" size="30" maxlength="60" class="fixed" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('server', $to_edit) ?>" /><br />
+<input name="fm_server" size="30" maxlength="60" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('server', $to_edit) ?>" /><br />
 
 <?php if ($conf['user']['allow_folders']): ?>
 <?php echo _("Remote Mailbox:") ?><br />
-<input name="fm_rmailbox" size="30" maxlength="60" class="fixed" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('rmailbox', $to_edit) ?>" /><br />
+<input name="fm_rmailbox" size="30" maxlength="60" value="<?php if (!is_null($to_edit)) echo $fm_account->getValue('rmailbox', $to_edit) ?>" /><br />
 
 <?php echo _("Local Mailbox:") ?><br />
 <select name="fm_lmailbox">


--- orig/templates/prefs/spamselect.inc
+++ mod/templates/prefs/spamselect.inc
@@ -1,5 +1,5 @@
 <?php if (!$prefs->isLocked('spam_folder')): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function newSpamFolderName()
@@ -21,7 +21,7 @@
 <table border="0">
  <tr>
   <td><?php echo _("Spam folder:") ?><br />
-   <select name="spam" onchange="newSpamFolderName();"><option><?php echo _("None") ?></option><?php echo IMP::flistSelect(_("Create a new Spam folder"), true, array('INBOX'), IMP::addPreambleString($prefs->getValue('spam_folder'))) ?></select>
+   <select name="spam" onchange="newSpamFolderName();"><option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(_("Create a new Spam folder"), true, array('INBOX'), IMP::folderPref($prefs->getValue('spam_folder'), true)) ?></select>
    <input type="hidden" name="spam_new" value="" />
   </td>
  </tr>


--- orig/lib/Spam.php
+++ mod/lib/Spam.php
@@ -7,9 +7,9 @@
  * The IMP_Spam:: class contains functions related to reporting spam
  * messages in IMP.
  *
- * $Horde: imp/lib/Spam.php,v 1.3.4.7 2005/09/04 00:06:07 selsky Exp $
+ * $Horde: imp/lib/Spam.php,v 1.3.4.13 2006/01/31 22:58:28 slusarz Exp $
  *
- * Copyright 2004-2005 Michael Slusarz <slusarz at curecanti.org>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at curecanti.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -47,7 +47,7 @@
      * Report a list of messages as spam, based on the local configuration
      * parameters.
      *
-     * @param array &$indices  See IMP::parseIndicesList().
+     * @param mixed &$indices  See IMP::parseIndicesList().
      * @param string $action   Either 'spam' or 'notspam'.
      */
     function reportSpam(&$indices, $action)
@@ -76,9 +76,9 @@
             $imp_imap->changeMbox($folder);
 
             foreach ($msgIndices as $msgnum) {
-                /* Fetch the raw message contents (headers and complete 
+                /* Fetch the raw message contents (headers and complete
                  * body). */
-                $imp_contents = &IMP_Contents::singleton($msgnum);
+                $imp_contents = &IMP_Contents::singleton($msgnum . IMP_IDX_SEP . $folder);
 
                 $to = null;
                 $report_flag = false;
@@ -90,9 +90,27 @@
                     $raw_msg = $imp_contents->fullMessageText();
                     /* Use a pipe to write the message contents. This should
                      * be secure. */
-                    $pipe = popen($GLOBALS['conf'][$action]['program'], 'w');
-                    fwrite($pipe, $raw_msg);
-                    pclose($pipe);
+                    $prog = str_replace('%u', escapeshellarg(Auth::getAuth()), $GLOBALS['conf'][$action]['program']);
+                    $proc = proc_open($prog,
+                                      array(0 => array('pipe', 'r'),
+                                            1 => array('pipe', 'w'),
+                                            2 => array('pipe', 'w')),
+                                      $pipes);
+                    if (!is_resource($proc)) {
+                        Horde::logMessage('Cannot open process ' . $prog, __FILE__, __LINE__, PEAR_LOG_ERR);
+                        return;
+                    }
+                    fwrite($pipes[0], $raw_msg);
+                    fclose($pipes[0]);
+                    $stderr = '';
+                    while (!feof($pipes[2])) {
+                        $stderr .= fgets($pipes[2]);
+                    }
+                    fclose($pipes[2]);
+                    if (!empty($stderr)) {
+                        Horde::logMessage('Error reporting spam: ' . $stderr, __FILE__, __LINE__, PEAR_LOG_ERR);
+                    }
+                    proc_close($proc);
                     $report_msg_count++;
                     $report_flag = true;
                 }
@@ -105,7 +123,7 @@
                     }
                     $this->_sendSpamReportMessage($action, $raw_msg);
                     $email_msg_count++;
-                }
+               }
 
                 /* If a (not)spam bounce email address has been provided, use
                  * it. */


--- orig/lib/MIME/Viewer/partial.php
+++ mod/lib/MIME/Viewer/partial.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_partial class allows multipart/partial messages to be
  * displayed (RFC 2046 [5.2.2]).
  *
- * $Horde: imp/lib/MIME/Viewer/partial.php,v 1.17.10.5 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/partial.php,v 1.17.10.10 2006/03/30 10:15:31 selsky Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -35,19 +35,19 @@
         $id = $this->mime_part->getContentTypeParameter('id');
         $parts = array();
 
-        require_once 'Horde/IMAP/Search.php';
+        require_once IMP_BASE . '/lib/IMAP/Search.php';
         require_once 'Horde/MIME/Contents.php';
         require_once 'Horde/MIME/Structure.php';
 
         /* Perform the search to find the other parts of the message. */
-        $imap_search = &IMAP_Search::singleton(array('pop3' => ($imp['base_protocol'] == 'pop3')));
-        $query = &new IMAP_Search_Query();
+        $imap_search = &IMP_IMAP_Search::singleton(array('pop3' => ($imp['base_protocol'] == 'pop3')));
+        $query = &new IMP_IMAP_Search_Query();
         $query->header('Content-Type', $id);
         $indices = $imap_search->searchMailbox($query, $imp['stream'], IMP::serverString($imp['mailbox']));
-     
+
         /* If not able to find the other parts of the message, print error. */
         if (count($indices) != $this->mime_part->getContentTypeParameter('total')) {
-            return $contents->formatStatusMsg(sprintf(_("Can not display - found only %s of %s parts of this message in the current mailbox."), count($indices), $this->mime_part->getContentTypeParameter('total')));
+            return $contents->formatStatusMsg(sprintf(_("Cannot display - found only %s of %s parts of this message in the current mailbox."), count($indices), $this->mime_part->getContentTypeParameter('total')));
         }
 
         /* Get the contents of each of the parts. */
@@ -58,7 +58,7 @@
             } else {
                 require_once IMP_BASE . '/lib/MIME/Contents.php';
                 require_once IMP_BASE . '/lib/MIME/Headers.php';
-                $imp_contents = &IMP_Contents::singleton($val);
+                $imp_contents = &IMP_Contents::singleton($val . IMP_IDX_SEP . $_SESSION['imp']['thismailbox']);
                 $part = &$imp_contents->getMIMEPart(0);
                 $parts[$part->getContentTypeParameter('number')] = $imp_contents->getBody();
             }


--- orig/locale/et_EE/help.xml
+++ mod/locale/et_EE/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/et_EE/help.xml,v 1.16.6.1 2005/01/25 22:05:54 jan Exp $ -->
+<!-- $Horde: imp/locale/et_EE/help.xml,v 1.16.6.5 2006/03/23 00:24:12 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/README
+++ mod/README
@@ -1,8 +1,8 @@
 What is IMP?
 ============
 
-:Last update:   $Date: 2004/10/20 06:05:48 $
-:Revision:      $Revision: 2.21 $
+:Last update:   $Date: 2005/10/18 12:13:27 $
+:Revision:      $Revision: 2.21.10.1 $
 :Contact:       imp at lists.horde.org
 
 .. contents:: Contents
@@ -36,11 +36,12 @@
 
 The following documentation is available in the IMP distribution:
 
-:README:             This file
+:README_:            This file
 :COPYING_:           Copyright and license information
-:docs/CHANGES:       List of changes by release
-:`docs/CREDITS`_:    Who developed this software
-:`docs/INSTALL`_:    Installation instructions
+:`docs/CHANGES`_:    Changes by release
+:`docs/CREDITS`_:    Project developers
+:`docs/INSTALL`_:    Installation instructions and notes
+:`docs/TODO`_:       Development TODO list
 :`docs/UPGRADING`_:  Pointers on upgrading from previous IMP versions
 
 
@@ -66,8 +67,9 @@
 
   http://www.horde.org/mail/
 
-Lastly, Horde developers, contributors and users also make appearances on IRC,
-on the channel #horde on the Freenode Network (irc.freenode.net).
+Lastly, Horde developers, contributors and users also make occasional
+appearances on IRC, on the channel #horde on the freenode Network
+(irc.freenode.net).
 
 
 Licensing
@@ -81,9 +83,11 @@
 The IMP team
 
 
+.. _README: ?f=README.html
 .. _COPYING: http://www.horde.org/licenses/gpl.php
-.. _docs/CONTRIBUTING: ?f=CONTRIBUTING.html
+.. _docs/CHANGES: ?f=CHANGES.html
 .. _docs/CREDITS: ?f=CREDITS.html
 .. _INSTALL:
 .. _docs/INSTALL: ?f=INSTALL.html
+.. _docs/TODO: ?f=TODO.html
 .. _docs/UPGRADING: ?f=UPGRADING.html


--- orig/po/es_ES.po
+++ mod/po/es_ES.po
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-12-01 07:34+0100\n"
-"PO-Revision-Date: 2004-12-01 07:34+0100\n"
+"POT-Creation-Date: 2006-02-15 17:32+0100\n"
+"PO-Revision-Date: 2006-02-15 17:32+0100\n"
 "Last-Translator: Manuel P. Ayala <mayala at unex.es>\n"
 "Language-Team: i18n at lists.horde.org\n"
 "MIME-Version: 1.0\n"
@@ -17,32 +17,36 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "      Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "    Para: "
 
-#: lib/Compose.php:241 lib/Compose.php:293
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "   Fecha: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "      De: "
 
-#: mailbox.php:401
+#: mailbox.php:409 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Alt + %s)"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr " Asunto: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " en "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
@@ -51,151 +55,154 @@
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:198
+#: thread.php:156
 #, php-format
-msgid "%d message(s) have been deleted."
+msgid "%d Messages"
+msgstr "%d mensajes"
+
+#: mailbox.php:176
+#, php-format
+msgid "%d messages have been deleted."
 msgstr "Se ha(n) eliminado %d mensaje(s)."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "Se han notificado %d mensajes normales al administrador de sistemas."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "Se han notificado %d mensajes normales."
 
-#: lib/Spam.php:161
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "Se han notificado %d mensajes spam al administrador de sistemas."
 
-#: lib/Spam.php:141
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "Se han notificado %d mensajes spam."
 
-#: mailbox.php:370
+#: mailbox.php:359
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d al %d de %d mensaje(s)"
 
-#: mailbox.php:608
+#: mailbox.php:636
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "Administración PGP de %s"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "Administración S/MIME de %s"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ya existe. La carpeta %s no se ha renombrado."
 
-#: lib/Message.php:643
+#: lib/Message.php:689
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s no parece un buzón válido."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "La carpeta %s se renombrará al inicio del mes."
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s ha aceptado."
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s ha cancelado %s."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s ha cancelado \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s ha rechazado."
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s ha respondido a una consulta de tiempo disponible."
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s ha respondido a la invitación para %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s ha respondido a la invitación para \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s le ha informado sobre su tiempo disponible."
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s ha aceptado provisionalmente."
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s desea conocer su tiempo disponible."
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s solicita su asistencia a %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s solicita su asistencia a \"%s\"."
 
-#: lib/Message.php:398
+#: lib/Message.php:463
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s se ha añadido correctamente a %s."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s se ha añadido correctamente a \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
+msgid "%s wishes to ammend \"%s\"."
 msgstr "%s desea corregir %s."
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s desea ponerle al tanto sobre %s."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s desea ponerle al tanto sobre \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s desea recibir información actualizada sobre %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s desea recibir información actualizada sobre \"%s\"."
 
-#: message.php:278 message.php:283
+#: message.php:293 message.php:298
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aplicar los cambios y pasar a la siguiente pantalla.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Desechar los cambios y regresar a la pantalla de redacción.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Sólo texto)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -203,7 +210,7 @@
 "(Regresar a la pantalla de redacción después de aplicar los cambios hechos "
 "hasta el momento. Los cambios de la pantalla actual NO se aplicarán.)"
 
-#: spelling.php:274
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -215,52 +222,52 @@
 msgid "* Add these by clicking OK *"
 msgstr "* Añadir éstos haciendo clic en Aceptar *"
 
-#: templates/contacts/contacts.inc:207
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Por favor, seleccione la(s) dirección(es) *"
 
-#: lib/Spam.php:171
+#: mailbox.php:174
+msgid "1 message has been deleted."
+msgstr "Se ha eliminado 1 mensaje."
+
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "Se ha notificado 1 mensaje normal al administrador de sistemas."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "Se ha notificado 1 mensaje normal."
 
-#: lib/Spam.php:163
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "Se ha notificado 1 mensaje spam al administrador de sistemas."
 
-#: lib/Spam.php:143
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "Se ha notificado 1 mensaje spam."
 
-#: config/prefs.php.dist:787
+#: config/.bak/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 caracteres"
 
-#: config/prefs.php.dist:790
+#: config/.bak/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 caracteres"
 
-#: config/prefs.php.dist:788
+#: config/.bak/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 caracteres"
 
-#: config/prefs.php.dist:789
+#: config/.bak/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 caracteres"
 
-#: lib/MIME/Viewer/itip.php:62
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>Los datos de la agenda no son válidos</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Se ha adjuntado a este mensaje una imagen grande llamada %s."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -272,114 +279,117 @@
 msgid "AND"
 msgstr "Y"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Aceptar y añadir a la agenda"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Aceptar petición"
 
-#: lib/MIME/Viewer/itip.php:740
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Aceptada"
 
-#: templates/menu/menu.inc:32 templates/menu/menu.inc:34 lib/IMP.php:876
-#: lib/IMP.php:878
-msgid "Acco_unts"
-msgstr "_Identidades"
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr "Aceptada: "
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
-msgstr "Nombre de la identidad:"
+msgstr "Nombre de la cuenta:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Acciones"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Añadir %s a la Libreta de direcciones"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Añadir fuente"
 
-#: lib/MIME/Viewer/itip.php:535 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Añadir a la agenda"
 
-#: lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Añadir a la Libreta de direcciones (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Añadir a la agenda"
 
-#: compose.php:1137
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Se ha añadido \"%s\" como adjunto."
 
-#: config/prefs.php.dist:190
+#: config/.bak/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Cabeceras adicionales mostradas al visualizar: <i>(opcional, indique cada "
-"cabecera en líneas distintas)</i>"
+"Cabeceras adicionales mostradas al visualizar: <em>(opcional, indique cada "
+"cabecera en líneas distintas)</em>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Se puede visualizar %s la información adicional."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Detalles de información adicional"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Detalles adicionales del mensaje"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Se pueden visualizar %s los detalles adicionales del mensaje."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Detalles adicionales de mensaje de error"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Se pueden visualizar %s los detalles adicionales de mensaje de error."
 
-#: contacts.php:95 templates/contacts/contacts.inc:174
-#: templates/compose/compose.inc:334 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Direcciones"
 
-#: config/prefs.php.dist:126
+#: config/.bak/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Libretas de direcciones"
 
-#: config/prefs.php.dist:181
+#: config/.bak/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Direcciones a las que BCC todos los mensajes: <i>(opcional, indique cada "
-"dirección en una línea distinta)</i>"
+"Direcciones a las que BCC todos los mensajes: <em>(opcional, indique cada "
+"dirección en una línea distinta)</em>"
 
-#: config/prefs.php.dist:173
+#: config/.bak/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Direcciones enlazadas explícitamente a esta identidad: <i>(opcional, indique "
-"cada dirección en una línea distinta)</i>"
+"Direcciones enlazadas explícitamente a esta identidad: <em>(opcional, "
+"indique cada dirección en una línea distinta)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:791
+#: templates/mailbox/navbar.inc:10 config/.bak/prefs.php.dist:812
 msgid "All"
 msgstr "Todos"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "¡Todos los mensajes de la(s) carpeta(s) se perderán!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -387,7 +397,7 @@
 "Todos los mensajes de la(s) siguiente(s) carpeta(s) se descargarán como un "
 "único archivo MBOX: "
 
-#: lib/Maintenance/Task/purge_trash.php:86
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -396,61 +406,66 @@
 "Se eliminarán permanentemente todos los mensajes de su carpeta \"%s\" con "
 "antigüedad superior a %s días."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr ""
 "Se eliminarán todos los adjuntos vinculados con más de %s meses de "
 "antigüedad."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
-"Se eliminarán todas las carpetas sent-mail con más de %s meses de antigüedad."
+"Se eliminarán todas las carpetas \"Enviados\" con más de %s meses de "
+"antigüedad."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
-"Se han eliminado correctamente de la carpeta '%s' todos los derechos del "
-"usuario '%s'."
+"Se han eliminado correctamente de la carpeta \"%s\" todos los derechos del "
+"usuario \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "¿Permitir la creación de carpetas?"
 
-#: templates/filters/prefs.inc:55
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "¿Aplicar reglas de filtrado a cualquier buzón?"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Partes alternativas de esta sección:"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/.bak/prefs.php.dist:572
 msgid "Always"
 msgstr "Siempre"
 
-#: config/prefs.php.dist:549
+#: config/.bak/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Guardar siempre los adjuntos"
 
-#: lib/Message.php:491
+#: lib/Message.php:554
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
-"Se ha producido un error al intentar extraer el adjunto. Ésto es lo que dijo "
-"el servidor IMAP: "
+"Se ha producido un error al intentar eliminar el adjunto. Ésto es lo que "
+"dijo el servidor IMAP: "
 
-#: compose.php:1016 message.php:185
-msgid "An unknown error occured adding the new entry."
-msgstr "Se ha producido un error desconocido al añadir la entrada."
+#: lib/Message.php:437
+msgid "An unknown error occured while creating the new note."
+msgstr "Se ha producido un error desconocido al crear la nota."
 
-#: lib/Message.php:385
+#: lib/Message.php:436
 msgid "An unknown error occured while creating the new task."
 msgstr "Se ha producido un error desconocido al crear la tarea."
 
-#: mailbox.php:678 message.php:492 templates/message/navbar_navigate.inc:9
-#: templates/mailbox/legend.inc:6 templates/mailbox/navbar.inc:18
-#: templates/mailbox/navbar.inc:35
+#: message.php:504 mailbox.php:709 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Respondido"
 
@@ -459,45 +474,45 @@
 msgstr "Mensajes respondidos"
 
 #: templates/mailbox/header.inc:7
-msgid "Apply Filters on"
-msgstr "Aplicar filtros en"
+msgid "Apply Filters"
+msgstr "Aplicar filtros"
 
-#: templates/filters/prefs.inc:43
+#: templates/mailbox/header.inc:7
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "Aplicar filtros en %s"
+
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "¿Aplicar reglas de filtrado al iniciar sesión?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "¿Aplicar reglas de filtrado al visualizar la carpeta de ENTRADA?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "¿Está SEGURO de que desea continuar?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "¿Está completamente seguro de que desea continuar?"
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "¿Está seguro de que desea eliminar esta definición de Carpeta Virtual?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "¿Está seguro de que desea eliminar esta clave pública?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
 "¿Esta seguro de que desea eliminar su clave? (¡No es NADA recomendable!)"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "¿Está seguro de que desea hacer ésto?"
 
-#: message.php:400 templates/mailbox/javascript.inc:63
-#: templates/folders/javascript.inc:73
+#: message.php:409 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "¿Está seguro de que desea eliminar PERMANENTEMENTE estos mensajes?"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "¿Está seguro de que desea eliminar PERMANENTEMENTE este adjunto?"
 
@@ -505,7 +520,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "¿Está seguro de que desea vaciar esta carpeta?"
 
-#: templates/menu/menu.inc:23 lib/IMP.php:867
+#: lib/IMP.php:949
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "¿Está seguro de que desea vaciar la carpeta de spam?"
+
+#: lib/IMP.php:942
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "¿Está seguro de que desea vaciar la papelera?"
 
@@ -513,43 +532,39 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "¿Está seguro de que desea eliminar PERMANENTEMENTE estos mensajes?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "¿Está seguro de que desea considerar este mensaje como inofensivo?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "¿Está seguro de que desea considerar este mensaje como spam?"
 
-#: config/prefs.php.dist:886
+#: config/.bak/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Por hora de llegada"
 
-#: config/prefs.php.dist:901
+#: config/.bak/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
+#: config/.bak/prefs.php.dist:571
 msgid "Ask"
 msgstr "Consultar"
 
-#: templates/compose/compose.inc:513
-msgid "Attach"
-msgstr "Adjuntar"
-
-#: templates/compose/compose.inc:470
+#: templates/compose/compose.inc:472
 msgid "Attach Files"
 msgstr "Adjuntar archivos"
 
-#: templates/compose/compose.inc:451
+#: templates/compose/compose.inc:453
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "¿Adjuntar una copia de la clave PGP pública al mensaje?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Archivo adjunto:"
 
-#: lib/Compose.php:352 lib/Compose.php:439
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -557,38 +572,46 @@
 "El archivo adjunto \"%s\" supera el límite de tamaño de adjuntos. NO se ha "
 "adjuntado el archivo."
 
-#: lib/MIME/Viewer/itip.php:342
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Se adjunta la respuesta a la solicitud de agenda que había hecho."
 
-#: mailbox.php:712 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/attachments.js:98
-#: templates/compose/compose.inc:500
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:500 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: compose.php:966 lib/Message.php:452
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Se ha borrado el adjunto %s."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Información de adjunto"
+
+#: compose.php:1105 lib/Message.php:515
 msgid "Attachment stripped: Original attachment type"
-msgstr "Adjunto extraído: Tipo de adjunto original"
+msgstr "Adjunto eliminado: Tipo de adjunto original"
 
-#: templates/compose/compose.inc:344 templates/compose/compose.inc:468
-#: lib/Compose.php:987
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:470
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: lib/MIME/Viewer/itip.php:669
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "Asistentes"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Atención"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: hace falta la extensión IMAP."
 
-#: config/prefs.php.dist:642
+#: config/.bak/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -600,40 +623,63 @@
 msgid "Available Address books:"
 msgstr "Libretas de direcciones disponibles:"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Esperando respuesta"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Regresar a %s (_k)"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Regresar a %s"
 
-#: message.php:259 search.php:153 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Regresar al índice de mensajes"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Regresar a la vista por secuencias"
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "Usuario o contraseña incorrectos."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Petición incorrecta o malformada. El servidor ha respondido: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Petición inválida: %s."
+
+#: message.php:274 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "A continuación se muestra el mensaje de información de estado."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: config/prefs.php.dist:630
+#: config/.bak/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "¿Bloquear las imágenes de los mensajes HTML a menos que se soliciten "
 "específicamente?"
 
-#: search.php:161
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Cuerpo"
 
@@ -642,27 +688,32 @@
 msgid "Both"
 msgstr "Ambos"
 
-#: config/prefs.php.dist:689
+#: config/.bak/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Tanto en las cabeceras como en el cuerpo del mensaje"
 
-#: templates/compose/compose.inc:287
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
+"Para usar CRAM-MD5 o DIGEST-MD5 hay que tener instalado el paquete Auth_SASL."
+
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "_Juego de caracteres"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Agenda"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "No se puede conectar al servidor de correo remoto."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "No se puede conectar al servidor de correo remoto: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -671,44 +722,53 @@
 "No se puede mostrar - en el buzón actual sólo se ha encontrado %s partes de %"
 "s de este mensaje."
 
-#: templates/smime/import_key.inc:85 templates/smime/passphrase.inc:22
-#: templates/pgp/import_key.inc:66 templates/pgp/passphrase.inc:32
-#: templates/folders/import.inc:21 templates/contacts/contacts.inc:252
-#: templates/compose/spelling.inc:106
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/compose/compose.inc:74 templates/compose/compose.inc:430
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:432
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Cancelar mensaje"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Cancelar este mensaje desechará permanentemente su contenido."
 
-#: message.php:258 search.php:149 templates/contacts/contacts.inc:222
-#: templates/compose/recompose.inc:15
+#: message.php:273 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:687
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"No se dispone de importación de certificados. Este servidor no tiene "
+"activada la carga de archivos."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Ocupante"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Cambiar"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Cambiar todos"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Cambiar carpeta"
 
-#: config/prefs.php.dist:111
+#: config/.bak/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -716,11 +776,11 @@
 "Cambia opciones de visualización tales como la cantidad de mensajes por "
 "página y cómo ordenarlos."
 
-#: config/prefs.php.dist:24
+#: config/.bak/prefs.php.dist:24
 msgid "Change mail server and folder settings."
 msgstr "Cambia la configuración de servidor y carpeta de correo."
 
-#: config/prefs.php.dist:15
+#: config/.bak/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -728,23 +788,23 @@
 "Cambia el nombre, dirección electrónica y firma visibles al leer o responder "
 "a sus mensajes."
 
-#: config/prefs.php.dist:792
+#: config/.bak/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Caracteres visualizados:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Comprobar correo nuevo"
 
-#: templates/mailbox/message_headers.inc:65 templates/folders/actions.inc:2
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Comprobar _Todas/Ninguna"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Comprobar todos los servidores de los que quiere traer correo:"
 
-#: config/prefs.php.dist:454
+#: config/.bak/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "¿Comprobar ortografía antes de enviar un mensaje?"
 
@@ -752,15 +812,16 @@
 msgid "Choose Action:"
 msgstr "Elegir acción:"
 
-#: config/servers.php.dist:165
+#: config/.bak/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Elija un servidor de correo:"
 
-#: lib/MIME/Viewer/itip.php:479 lib/MIME/Viewer/itip.php:718
-msgid "Choose an action:"
-msgstr "Elija una acción:"
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr "Seleccione una coincidencia o modifique la dirección de la derecha:"
 
-#: templates/prefs/sourceselect.inc:350
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Elija la libreta de direcciones usada al añadir direcciones."
 
@@ -768,38 +829,45 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Elija el orden de búsqueda en las libretas al expandir direcciones."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Pulse %s para convertir el archivo de imagen a un formato soportado por su "
 "navegador."
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Pulse %s para descargar la imagen."
 
-#: lib/Filter.php:103
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Pulse %s para ir a la página de gestión de %s."
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Pulse %s para ver el contenido HTML en una ventana separada."
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Pulse %s para ver una miniatura de la imagen."
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Click here to HIDE the Images"
-msgstr "Pulse aquí para OCULTAR las imágenes"
+#: lib/MIME/Viewer/pkcs7.php:423
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Pulse %s para ver el adjunto en una ventana separada."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+"Pulse %s para ver esta parte multiparte/relacionada en una ventana separada."
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Pulse aquí para MOSTRAR las imágenes"
 
@@ -811,47 +879,49 @@
 "Pulse sobre una de las libretas de direcciones y luego seleccione los campos "
 "por los que desea buscar."
 
-#: lib/MIME/Viewer/pgp.php:174
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Pulse para guardar la clave PGP pública en la Libreta de direcciones"
 
-#: lib/MIME/Viewer/pkcs7.php:203
-msgid "Click to Save S/MIME certificate in your Address book"
-msgstr "Pulse para guardar el certificado S/MIME en la Libreta de direcciones"
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+"Pulse para guardar el certificado S/MIME de %s en la Libreta de direcciones"
 
-#: config/prefs.php.dist:920
+#: config/.bak/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Al pulsar en la dirección se redactará un mensaje para el remitente"
 
-#: config/prefs.php.dist:921
+#: config/.bak/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Al pulsar en la dirección se abrirá el mensaje"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Cerrar"
 
-#: templates/compose/success.inc:4
+#: compose.php:418
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: folders.php:383
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Carpeta cerrada"
 
-#: folders.php:403
+#: folders.php:430
 msgid "Collapse"
 msgstr "Colapsar"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Colapsar todas"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Colapsar todas las carpetas"
 
-#: folders.php:403
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Colapsar carpeta"
 
@@ -859,32 +929,23 @@
 msgid "Color Indicator: "
 msgstr "Indicador de color: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Comentario"
 
-#: lib/MIME/Viewer/itip.php:756
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Terminado"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Redactar"
-
-#: mailbox.php:742 lib/MIME/Headers.php:196
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Redactar mensaje (%s)"
-
-#: templates/compose/success.inc:3
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Redactar otro mensaje"
 
-#: config/prefs.php.dist:429
+#: config/.bak/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "¿Redactar mensajes en una ventana separada?"
 
-#: config/prefs.php.dist:446
+#: config/.bak/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -892,29 +953,37 @@
 "¿Redactar mensajes por omisión en un entorno GUI de HTML (si el navegador lo "
 "soporta)?"
 
-#: config/prefs.php.dist:70
+#: config/.bak/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Configura cómo se muestran los mensajes."
 
-#: config/prefs.php.dist:96
+#: config/.bak/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Configurar las opciones de vista previa del correo."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Conexión desactivada por el servidor IMAP."
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Error al conectar al servidor"
 
-#: config/prefs.php.dist:135
+#: config/.bak/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Controla el soporte PGP para %s."
 
-#: config/prefs.php.dist:144
+#: config/.bak/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Controla el soporte S/MIME para %s."
 
-#: config/prefs.php.dist:88
+#: config/.bak/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Opciones de control relacionadas con la búsqueda de mensajes."
+
+#: config/.bak/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -922,7 +991,7 @@
 "Controla la comprobación de correo nuevo y si se le notificará o no al "
 "recibirlo."
 
-#: config/prefs.php.dist:699
+#: config/.bak/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "¿Convertir emoticones de texto en gráficos?"
 
@@ -930,64 +999,81 @@
 msgid "Copy"
 msgstr "Copiar"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Copiar a la carpeta"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corregir"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Texto corregido"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "No se puede completar la petición. Razón alegada: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "No se puede crear el motor VFS: %s"
 
-#: lib/Message.php:634
+#: lib/Message.php:680
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr ""
 "No se pueden eliminar los mensajes de %s. Ésto es lo que dijo el servidor: %s"
 
-#: lib/Session.php:276
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "No se pueden realizar las operaciones de mantenimiento."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "No se puede extraer el archivo solicitado del adjunto MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "No se puede extraer el archivo solicitado del archivo Zip."
 
-#: search.php:351 templates/fetchmail/account_select.inc:26
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "No se puede abrir una conexión segura con el servidor IMAP. %s : %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "No se puede recuperar la información de nombres del servidor IMAP."
+
 #: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Crear"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Crear carpeta"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Crear claves"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Crear carpeta virtual"
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Crear una cuenta"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Crear una carpeta de spam"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Crear carpeta de borradores"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Crear carpeta de correo enviado"
 
@@ -995,7 +1081,7 @@
 msgid "Create a new trash folder"
 msgstr "Crear papelera"
 
-#: config/prefs.php.dist:120
+#: config/.bak/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1003,94 +1089,128 @@
 "Crea reglas de filtrado para organizar el correo entrante, clasificarlo en "
 "carpetas y eliminar spam."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Crear plantilla"
+
+#: config/.bak/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Crear plantillas y respuestas de formularios."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Acceso actual a %s"
 
-#: config/prefs.php.dist:104
+#: config/.bak/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
-msgstr "Personaliza identidades para traer correo de otras cuentas."
+msgstr "Personaliza cuentas para traer correo de otras identidades."
 
-#: config/prefs.php.dist:51
+#: config/.bak/prefs.php.dist:51
 msgid "Customize how you send mail."
 msgstr "Personalizar el envío de correo."
 
-#: config/prefs.php.dist:40
+#: config/.bak/prefs.php.dist:40
 #, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Personaliza las tareas a ejecutar al iniciar sesión en %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "_Fecha"
 
-#: message.php:255 thread.php:72
+#: message.php:270 thread.php:153
 msgid "Date"
 msgstr "Fecha"
 
-#: lib/MIME/Viewer/itip.php:744
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "Rechazada"
 
-#: config/prefs.php.dist:893
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr "Rechazada: "
+
+#: config/.bak/prefs.php.dist:537
+msgid "Default"
+msgstr "Por omisión"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Campo de búsqueda por omisión"
+
+#: config/.bak/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Criterio de clasificación por omisión:"
 
-#: config/prefs.php.dist:903
+#: config/.bak/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Sentido de clasificación por omisión:"
 
-#: lib/MIME/Viewer/itip.php:752
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Delegado"
 
-#: folders.php:374 templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
-#: templates/mailbox/actions.inc:10 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:243 templates/compose/attachments.inc:28
+#: folders.php:400 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Eliminar la clave pública de %s"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Eliminar las claves actuales"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Eliminar carpeta(s)"
 
-#: folders.php:374
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "Eliminar carpetas seleccionadas"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Eliminar plantilla"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Eliminar carpeta virtual"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Eliminar la definición de carpeta virtual de %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "¿Borrar del servidor remoto los mensajes traídos?"
 
-#: lib/MIME/Viewer/itip.php:607
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Quitar de mi agenda"
 
-#: config/prefs.php.dist:362
+#: config/.bak/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "¿Eliminar adjuntos vinculados antiguos al inicio del mes?"
 
-#: config/prefs.php.dist:344
+#: config/.bak/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
-msgstr "¿Eliminar carpetas sent-mail antiguas al inicio del mes?"
+msgstr "¿Eliminar carpetas \"Enviados\" antiguas al inicio del mes?"
 
-#: config/prefs.php.dist:620
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "¿Eliminar los mensajes SPAM tras comunicarlos?"
+#: config/.bak/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Eliminar mensajes spam"
 
-#: mailbox.php:702 message.php:495 templates/mailbox/legend.inc:8
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+#: message.php:507 mailbox.php:735 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Eliminado"
 
@@ -1098,38 +1218,42 @@
 msgid "Deleted messages"
 msgstr "Mensajes eliminados"
 
-#: compose.php:300
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Se ha eliminado el adjunto \"%s\"."
 
-#: config/prefs.php.dist:79
+#: config/.bak/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Eliminando y trasladando mensajes"
 
-#: lib/MIME/Viewer/itip.php:549
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Denegar la petición"
 
-#: lib/MIME/Viewer/itip.php:498
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Denegar la petición de información de tiempo disponible"
 
-#: config/prefs.php.dist:902
+#: config/.bak/prefs.php.dist:921
 msgid "Descending"
 msgstr "Descendente"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:657
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Descripción"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Detalles"
 
-#: config/prefs.php.dist:679
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "No se ha adjuntado \"%s\" ya que el archivo está vacío."
+
+#: config/.bak/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "¿Atenuar firmas?"
 
@@ -1137,47 +1261,55 @@
 msgid "Display"
 msgstr "Mostrar"
 
-#: config/prefs.php.dist:470
+#: config/.bak/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "¿Mostrar una confirmación tras enviar un mensaje?"
 
-#: config/prefs.php.dist:688
+#: config/.bak/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Mostrar en el cuerpo del mensaje"
 
-#: config/prefs.php.dist:767
+#: config/.bak/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "¿Mostrar aviso emergente de correo nuevo?"
 
-#: config/prefs.php.dist:732
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "¿Mostrar el vínculo 'Vaciar papelera' en la barra de menús?"
+#: config/.bak/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "¿Mostrar el vínculo purgar \"Spam\" en la barra de menús?"
+
+#: config/.bak/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "¿Mostrar el vínculo \"Vaciar\" papelera en la barra de menús?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Disposición"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "NO hay coincidencias"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "No comprobar correo nuevo"
 
-#: config/prefs.php.dist:922
+#: config/.bak/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "No generar vínculo en la columna De:"
 
-#: lib/IMP.php:969
+#: lib/IMP.php:1053
 msgid "Do you want to open that folder?"
 msgstr "¿Desea abrir esa carpeta?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "¿No dispone de cuenta? Solicítela."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Hecho"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Descargar %s en formato .zip"
@@ -1186,25 +1318,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Descargar todos los adjuntos (en un archivo .zip)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Descargar carpeta(s)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Descargar carpeta(s) [formato .zip]"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Descargar en formato .zip"
 
-#: mailbox.php:683 message.php:493 templates/message/navbar_navigate.inc:11
-#: templates/mailbox/legend.inc:9 templates/mailbox/navbar.inc:22
-#: templates/mailbox/navbar.inc:41
+#: message.php:505 mailbox.php:714 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Borrador"
 
-#: folders.php:354
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Carpeta de borradores:"
 
@@ -1212,27 +1344,35 @@
 msgid "Drafts folder:"
 msgstr "Carpeta de borradores:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Correo electrónico"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:302
+msgid "END"
+msgstr "FINAL"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "ERROR: No se puede enviar el mensaje."
 
-#: folders.php:375
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Modificar"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Modificar lista negra"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Modificar filtros"
 
-#: folders.php:375 templates/search/header.inc:16
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Modificar consulta de búsqueda"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Modificar carpeta virtual"
 
@@ -1241,23 +1381,23 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Modificar la definición de carpeta virtual de %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Modificar lista blanca"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Modificar la lista negra"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Modificar las reglas de filtrado"
 
-#: config/prefs.php.dist:829
+#: config/.bak/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Modificar las opciones para acceder a otras cuentas de correo."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Modificar la lista blanca"
 
@@ -1265,65 +1405,86 @@
 msgid "Email Address"
 msgstr "Dirección de correo"
 
-#: lib/Message.php:651
+#: lib/Message.php:697
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Se han eliminado todos los mensajes de %s."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:673
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Se han eliminado todos los mensajes de la Papelera virtual."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Vaciar carpeta(s)"
 
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "Vaciar carpetas seleccionadas"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Vaciar"
 
-#: templates/menu/menu.inc:23 lib/IMP.php:867
+#: lib/IMP.php:949
+msgid "Empty _Spam"
+msgstr "Spam (_n)"
+
+#: lib/IMP.php:942
 msgid "Empty _Trash"
 msgstr "Vaciar (_x)"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "¿Activar capacidad PGP?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "¿Activar capacidad S/MIME?"
 
-#: config/prefs.php.dist:779
+#: config/.bak/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "¿Activar vistas previas de mensajes?"
 
-#: templates/compose/compose.inc:437
+#: templates/compose/compose.inc:439
 msgid "Encr_yption Options"
 msgstr "_Opciones de cifrado"
 
-#: lib/MIME/Viewer/itip.php:475 lib/MIME/Viewer/itip.php:645
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Cifrado"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Final"
 
-#: lib/Compose.php:318
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Terminar mensaje reenviado"
 
-#: lib/Compose.php:259
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Terminar mensaje"
 
-#: lib/Compose.php:257
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Terminar mensaje de %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Introduzca la frase clave"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Introduzca el nombre de la carpeta de spam"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Introduzca el nombre de la nueva carpeta de borradores"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Introduzca el nombre de la nueva carpeta de correo enviado"
 
@@ -1331,184 +1492,172 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Introduzca el nombre de la nueva papelera"
 
-#: compose.php:1018 message.php:187
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "Todo el mensaje"
+
+#: message.php:195 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr ""
 "Se ha añadido correctamente el registro \"%s\" a la libreta direcciones"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pgp.php:390 lib/MIME/Viewer/pkcs7.php:357
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Error"
 
-#: lib/Fetchmail/hotmail.php:228
-msgid "Error 403: Request was forbidden."
-msgstr "Error 403: No se permiten peticiones."
-
-#: lib/Fetchmail/hotmail.php:232
-msgid "Error 503: Service is unavailable."
-msgstr "Error 503: El servicio no está disponible."
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Error al conectar al servidor IMAP. %s : %s."
 
-#: lib/MIME/Viewer/itip.php:278 lib/MIME/Viewer/itip.php:371
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Error al enviar la respuesta: %s."
 
-#: lib/Fetchmail/hotmail.php:242
-#, php-format
-msgid ""
-"Error: Had to make %d requests, check username and password or increase "
-"request count limit."
-msgstr ""
-"Error: %d peticiones pendientes, compruebe el nombre de usuario y la "
-"contraseña o incremente el límite del número de peticiones."
-
-#: lib/Fetchmail/hotmail.php:235
-#, php-format
-msgid "Error: Unrecognized HTTP status was recieved: %s."
-msgstr "Error: Se ha recibido un estado HTTP desconocido: %s."
-
-#: lib/Fetchmail/hotmail.php:263
-msgid "Error: fsockopen() failed."
-msgstr "Error: Ha fallado fsockopen()."
-
-#: lib/Fetchmail/hotmail.php:261
-#, php-format
-msgid "Error: fsockopen() failed. Error no: %s. Error string %s."
-msgstr "Error: Ha fallado fsockopen(). Error nº: %s. Cadena de error %s."
-
-#: lib/MIME/Viewer/itip.php:93
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Se ha eliminado correctamente el acontecimiento."
 
-#: config/prefs.php.dist:757
+#: config/.bak/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: config/prefs.php.dist:754
+#: config/.bak/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Cada 30 segundos"
 
-#: config/prefs.php.dist:756
+#: config/.bak/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Cada 5 minutos"
 
-#: config/prefs.php.dist:758
+#: config/.bak/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Cada media hora"
 
-#: config/prefs.php.dist:755
+#: config/.bak/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Cada minuto"
 
-#: folders.php:412
+#: folders.php:438
 msgid "Expand"
 msgstr "Expandir"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Expandir todas"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Expandir todas las carpetas"
 
-#: folders.php:412
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Expandir carpeta"
 
-#: templates/compose/compose.inc:335 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Expandir nombres"
 
-#: config/prefs.php.dist:1020
+#: config/.bak/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 "¿Expandir automáticamente como tarea de fondo los nombres en la ventana de "
 "redacción?"
 
-#: config/prefs.php.dist:950
+#: config/.bak/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Por omisión, ¿expandir el árbol entero en la vista de carpetas?"
 
-#: templates/compose/compose.inc:159 templates/compose/compose.inc:209
-#: templates/compose/compose.inc:260 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 msgid "Expanding"
 msgstr "Expandiendo"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:960 lib/IMP.php:962
+msgid "F_etch Mail"
+msgstr "_Traer"
+
+#: templates/fetchmail/fetchmail.inc:26 config/.bak/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Traer correo"
 
-#: config/prefs.php.dist:838
+#: config/.bak/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "¿Traer correo en una ventana separada?"
 
 #: templates/fetchmail/manage.inc:46
 msgid "Fetch messages upon logging on?"
-msgstr "¿Traer correo al iniciar sesión?"
+msgstr "¿Traer mensajes al iniciar sesión?"
+
+#: lib/Fetchmail.php:291
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Se han traído %d mensajes de %s"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:289
 #, php-format
-msgid "Fetched %d message(s) from %s"
-msgstr "Se han traído %d mensaje(s) de %s"
+msgid "Fetched 1 message from %s"
+msgstr "Se ha traído 1 mensaje de %s"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Traer correo: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: no hay mensajes nuevos."
 
-#: templates/menu/menu.inc:38 lib/IMP.php:882
+#: lib/IMP.php:966
 msgid "Fi_lters"
 msgstr "_Filtros"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:496
+#: templates/compose/compose.inc:496 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Archivo"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Opciones de filtrado"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Configuración de filtrado"
 
-#: config/prefs.php.dist:602
+#: config/.bak/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "¿Filtrar contenido obsceno en el mensaje?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "En este sistema se ha deshabilitado el soporte de filtrado."
 
-#: config/prefs.php.dist:119
+#: config/.bak/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtros"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Los filtros NO están activos"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtros: página de gestión de %s"
 
-#: templates/contacts/contacts.inc:182
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Encontrar"
 
-#: config/prefs.php.dist:875
+#: config/.bak/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Primera página del buzón"
 
-#: mailbox.php:342
+#: mailbox.php:331
 msgid "First Page"
 msgstr "Primera página"
 
@@ -1516,93 +1665,82 @@
 msgid "Fo_rward"
 msgstr "Reen_viar"
 
-#: folders.php:255 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:2
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Acciones de carpeta - Confirmación"
+
+#: folders.php:289 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Navegador de carpetas"
 
-#: templates/login/login.inc:195
-msgid "Folder Prefix"
-msgstr "Prefijo de carpetas"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Resumen de la carpeta"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "No se ha activado la compartición de carpetas."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "No se ha activado el uso de carpetas."
 
-#: config/prefs.php.dist:939
+#: config/.bak/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Formato de fecha de los mensajes fechados hoy en la vista de buzones"
 
-#: compose.php:696 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Reenviar"
 
-#: compose.php:681
+#: compose.php:805
 msgid "Forward:"
 msgstr "Reenviar:"
 
-#: lib/Compose.php:287
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: lib/Compose.php:285
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Mensaje reenviado de %s"
 
-#: lib/MIME/Viewer/itip.php:443
-msgid "Free/Busy Information"
-msgstr "Información de tiempo disponible"
-
-#: lib/MIME/Viewer/itip.php:454
-msgid "Free/Busy Reply"
-msgstr "Respuesta de tiempo disponible"
-
-#: lib/MIME/Viewer/itip.php:448
-msgid "Free/Busy Request"
-msgstr "Petición de tiempo disponible"
-
-#: lib/MIME/Viewer/itip.php:365
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Respuesta a petición de tiempo disponible"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "_De"
 
-#: message.php:256 search.php:141 thread.php:73
-#: templates/contacts/contacts.inc:186 templates/compose/compose.inc:102
+#: message.php:271 thread.php:154 templates/compose/compose.inc:99
+#: lib/Search.php:589
 msgid "From"
 msgstr "De"
 
-#: config/prefs.php.dist:888
+#: config/.bak/prefs.php.dist:907
 msgid "From Address"
 msgstr "Por remitente"
 
-#: compose.php:693 compose.php:697
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1169
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#: compose.php:1171
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u mensajes reenviados"
 
-#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
-#: config/prefs.php.dist:38
+#: config/.bak/prefs.php.dist:13 config/.bak/prefs.php.dist:22
+#: config/.bak/prefs.php.dist:30 config/.bak/prefs.php.dist:38
 msgid "General Options"
 msgstr "Opciones generales"
 
@@ -1610,28 +1748,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "¿Traer sólo mensajes nuevos? (sólo IMAP)"
 
-#: thread.php:65
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Ir"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Ir al mensaje"
 
-#: templates/acl/acl.inc:135
+#: lib/IMP.php:502
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Ir al registro de \"%s\" en la libreta de direcciones"
+
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Conceder acceso"
 
-#: message.php:548 lib/Filter.php:102 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/html.php:114 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/notification.php:65
-#: lib/MIME/Viewer/notification.php:71 lib/MIME/Viewer/pgp.php:176
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:550 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "AQUÍ"
 
-#: lib/MIME/Viewer/html.php:115
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:251
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "Versión HTML del mensaje"
 
@@ -1643,109 +1793,122 @@
 msgid "Here is the message you were composing:"
 msgstr "Aquí tiene el mensaje que estaba redactando:"
 
-#: config/prefs.php.dist:670
+#: config/.bak/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Oculto"
 
-#: config/prefs.php.dist:669
+#: config/.bak/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Oculto en la vista de secuencias"
 
-#: mailbox.php:364
+#: mailbox.php:353
 msgid "Hide Deleted"
 msgstr "Ocultar eliminados"
 
-#: folders.php:250
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Ocultar no suscritos"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Hide the Images"
-msgstr "Ocultar imágenes"
-
-#: templates/compose/compose.inc:309
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Alta"
 
-#: mailbox.php:688 message.php:290 templates/mailbox/legend.inc:12
+#: message.php:305 mailbox.php:719 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Prioridad alta"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Elevada"
 
-#: lib/Fetchmail/hotmail.php:50
-msgid "Hotmail Accounts"
-msgstr "Cuentas Hotmail"
-
-#: config/prefs.php.dist:690
+#: config/.bak/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "¿Cómo desea mostrar los adjuntos?"
 
-#: config/prefs.php.dist:496
+#: config/.bak/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Cómo resaltar las líneas citadas en una respuesta"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Autodetección de protocolos)"
 
-#: templates/login/login.inc:170 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "El servidor IMAP ha cerrado la conexión. El servidor dijo: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP sobre SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP sobre SSL (certificado auto-firmado)"
 
-#: templates/login/login.inc:171
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP sobre SSL (auto-firmado)"
 
-#: templates/login/login.inc:169 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "El servidor IMAP ha cortado la conexión."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, sin TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "Servidores de correo IMAP/POP3"
 
-#: folders.php:346
-msgid "INBOX"
-msgstr "Entrada"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr "Si se utiliza SSL o TLS necesita cargar la extensión PHP openssl."
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Si sigue, ¡todos los mensajes de la(s) carpeta(s) se perderán!"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorar todas"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Imagen"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importar"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importar clave"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Importar claves"
 
-#: pgp.php:42
+#: templates/folders/actions.inc:27
+msgid "Import Messages"
+msgstr "Importar mensajes"
+
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "Importar clave PGP"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Importar certificados personales"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Importar certificado personal"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1759,7 +1922,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Importar certificados personales S/MIME"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Importar clave pública"
 
@@ -1775,7 +1938,7 @@
 msgid "Import S/MIME Key"
 msgstr "Importar clave S/MIME"
 
-#: templates/folders/actions.inc:25 templates/folders/import.inc:9
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "Importar archivo mbox"
 
@@ -1784,9 +1947,9 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Importar el archivo mbox %s a la carpeta %s."
 
-#: mailbox.php:696 message.php:494 templates/message/navbar_navigate.inc:7
-#: templates/mailbox/legend.inc:7 templates/mailbox/navbar.inc:16
-#: templates/mailbox/navbar.inc:33
+#: message.php:506 mailbox.php:729 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Importante"
 
@@ -1794,46 +1957,48 @@
 msgid "Important messages"
 msgstr "Mensajes importantes"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Importados %d mensajes de %s."
 
-#: lib/MIME/Viewer/itip.php:760
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "Procesando"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:830 lib/IMAP/Tree.php:119
+#: lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Entrada"
 
-#: config/prefs.php.dist:484
+#: config/.bak/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "¿Incluir un resumen de la cabecera en la respuesta?"
 
-#: config/prefs.php.dist:478
+#: config/.bak/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "¿Incluir mensaje original en la respuesta?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Información"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Información de la clave pública de %s"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Información de la clave personal privada"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Información de la clave personal pública"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:501
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:501
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "En línea"
 
@@ -1853,32 +2018,32 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Insertar aquí la clave PGP pública"
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Se ha seleccionado una acción no válida para este componente."
 
-#: mailbox.php:556 mailbox.php:597
+#: mailbox.php:575 mailbox.php:622
 msgid "Invalid Address"
 msgstr "La dirección no es válida"
 
-#: lib/Fetchmail/hotmail.php:102 lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "El buzón remoto no es válido"
 
-#: compose.php:141
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Caracteres no válidos en la dirección de correo: %s."
 
-#: pgp.php:16 smime.php:82
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "Clave no válida"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Clave personal PGP privada no válida"
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Clave personal PGP pública no válida"
 
@@ -1886,39 +2051,66 @@
 msgid "Invert"
 msgstr "Invertir"
 
-#: templates/compose/compose.inc:571
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Tamaño de clave"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+"La generación de las claves puede tardar bastante tiempo. ¿Continuar con la "
+"generación de las claves?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"No se dispone de importación de claves. Este servidor no tiene activada la "
+"carga de archivos."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"No se dispone de importación de claves. No ha definido una libreta de "
+"direcciones a la que añadir los contactos."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Clave enviada correctamente al servidor de claves público."
 
-#: templates/login/login.inc:223
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Idioma"
 
-#: config/prefs.php.dist:876
+#: config/.bak/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Última página del buzón"
 
-#: mailbox.php:355
+#: mailbox.php:344
 msgid "Last Page"
 msgstr "Última página"
 
-#: templates/compose/compose.inc:384
-msgid "Li_nk Attachments"
-msgstr "_Vincular adjuntos"
+#: templates/compose/compose.inc:549
+msgid "Link Attachments?"
+msgstr "¿Vincular adjuntos?"
 
-#: attachment.php:34 lib/Compose.php:977
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "No se permiten adjuntos vinculados."
 
-#: config/prefs.php.dist:1039
+#: lib/Compose.php:1100
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Los vínculos expirarán el %s"
+
+#: config/.bak/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1926,7 +2118,7 @@
 "¿Listar todos los contactos al cargar la pantalla de contactos? (Si está "
 "deshabilitado, sólo verá los contactos que busque de forma explícita)"
 
-#: config/prefs.php.dist:687
+#: config/.bak/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Listar en la cabecera"
 
@@ -1934,15 +2126,15 @@
 msgid "Local Mailbox:"
 msgstr "Buzón local:"
 
-#: lib/MIME/Viewer/itip.php:662
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Ubicación"
 
-#: templates/login/login.inc:231
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: lib/Block/summary.php:118
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Iniciar sesión en %s"
@@ -1951,31 +2143,31 @@
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: config/prefs.php.dist:39
+#: config/.bak/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Tareas de inicio de sesión"
 
-#: templates/compose/compose.inc:311
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Baja"
 
-#: mailbox.php:691 message.php:292 templates/mailbox/legend.inc:13
+#: message.php:307 mailbox.php:722 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Prioridad baja"
 
-#: templates/compose/compose.inc:312
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Reducida"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Archivo Macintosh"
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Correo"
 
-#: config/prefs.php.dist:95
+#: config/.bak/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Vistas previas de correo"
 
@@ -1983,19 +2175,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Tipo de servidor de correo al que conectarse:"
 
-#: folders.php:364
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Buzón"
 
-#: config/prefs.php.dist:110
+#: config/.bak/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Opciones de visualización de buzones y carpetas"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Marcar los mensajes de la carpeta como leídos"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Marcar los mensajes de la carpeta como sin leer"
 
@@ -2003,7 +2195,7 @@
 msgid "Mark as:"
 msgstr "Marcar como:"
 
-#: config/prefs.php.dist:652
+#: config/.bak/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "¿Resaltar niveles de citas con colores distintos?"
 
@@ -2011,15 +2203,15 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "¿Marcar mensajes como leidos? (Sólo IMAP)"
 
-#: config/prefs.php.dist:660
+#: config/.bak/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "¿Resaltar marcador simple?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Coincidir en todas"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Coincidir en cualquiera"
 
@@ -2027,79 +2219,57 @@
 msgid "Maximum Attachment Size"
 msgstr "Tamaño máximo de adjunto"
 
-#: templates/compose/compose.inc:488
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Número máximo de carpetas"
+
+#: templates/compose/compose.inc:489
 msgid "Maximum number of attachments reached."
 msgstr "Se ha alcanzado el número máximo de adjuntos."
 
-#: templates/compose/compose.inc:483
+#: templates/compose/compose.inc:485
 msgid "Maximum total attachment size reached."
 msgstr "Se ha alcanzado el tamaño máximo de adjuntos."
 
-#: lib/MIME/Viewer/itip.php:605
-msgid "Meeting Cancellation"
-msgstr "Anulación de reunión"
-
-#: lib/MIME/Viewer/itip.php:533
-msgid "Meeting Information"
-msgstr "Información de reunión"
-
-#: lib/MIME/Viewer/itip.php:543
-msgid "Meeting Proposal"
-msgstr "Propuesta de reunión"
-
-#: lib/MIME/Viewer/itip.php:585
-msgid "Meeting Reply"
-msgstr "Respuesta a reunión"
-
-#: lib/MIME/Viewer/itip.php:555
-msgid "Meeting Update"
-msgstr "Actualización de reunión"
-
-#: lib/MIME/Viewer/itip.php:560
-msgid "Meeting Update Request"
-msgstr "Solicitud de actualización de reunión"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Listado del menú de carpetas"
 
-#: lib/Compose.php:234
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Mensaje"
 
-#: compose.php:498 compose.php:525 compose.php:558 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679
+#: config/.bak/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Redacción del mensaje"
 
-#: config/prefs.php.dist:887
+#: config/.bak/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Por fecha"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/.bak/prefs.php.dist:49 config/.bak/prefs.php.dist:65
+#: config/.bak/prefs.php.dist:78 config/.bak/prefs.php.dist:87
+#: config/.bak/prefs.php.dist:95 config/.bak/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Opciones de mensajes"
 
-#: search.php:349
+#: search.php:306
 msgid "Message Search"
 msgstr "Búsqueda de mensajes"
 
-#: config/prefs.php.dist:891
+#: config/.bak/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Por tamaño"
 
-#: message.php:377
+#: message.php:392
 msgid "Message Source"
 msgstr "Origen del mensaje"
 
-#: config/prefs.php.dist:69
+#: config/.bak/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Visualización de mensajes"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Campos del mensaje"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Banderas del mensaje"
@@ -2108,33 +2278,45 @@
 msgid "Message folders"
 msgstr "Carpetas de mensajes"
 
-#: lib/Compose.php:232
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Mensaje de %s"
 
-#: templates/search/header.inc:33
+#: mailbox.php:663
+msgid "Message has attachments"
+msgstr "El mensaje tiene adjuntos"
+
+#: mailbox.php:654
+msgid "Message is encrypted"
+msgstr "El mensaje está cifrado"
+
+#: mailbox.php:649
+msgid "Message is signed"
+msgstr "El mensaje está firmado"
+
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Mensajes coincidentes"
 
-#: compose.php:740 compose.php:750
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Se ha redirigido correctamente el mensaje."
 
-#: compose.php:983
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Se envió correctamente el mensaje, pero no se guardó en %s"
 
-#: compose.php:1027 compose.php:1038
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Se envió correctamente el mensaje."
 
-#: config/prefs.php.dist:911
+#: config/.bak/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Mensajes por página en el listado del buzón."
 
-#: mailbox.php:319
+#: mailbox.php:311
 msgid "Messages to"
 msgstr "Mensajes a"
 
@@ -2142,10 +2324,10 @@
 msgid "Modify"
 msgstr "Modificar"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
-msgid "More than one address found for field '%s'."
-msgstr "Se ha encontrado más de una dirección para el campo '%s'."
+msgid "More than one address found for field \"%s\"."
+msgstr "Se ha encontrado más de una dirección para el campo \"%s\"."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
@@ -2155,7 +2337,13 @@
 msgid "Move down"
 msgstr "Desplazar hacia abajo"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/.bak/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"Trasladar los mensajes de spam a la carpeta de spam y los mensajes "
+"inofensivosa la carpeta de Entrada"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Trasladar a la carpeta"
 
@@ -2163,53 +2351,70 @@
 msgid "Move up"
 msgstr "Desplazar hacia arriba"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/smime/smime.inc:24 templates/pgp/pgp.inc:24
-#: templates/fetchmail/manage.inc:48
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Visualización de mensajes"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "NINGUNO"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "OBSERVACIÓN"
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:674
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Nombre"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "El nombre y/o la dirección no pueden dejarse en blanco"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Se necesita una acción"
 
-#: config/prefs.php.dist:562 config/prefs.php.dist:583
-#: config/prefs.php.dist:753
+#: config/.bak/prefs.php.dist:570 config/.bak/prefs.php.dist:767
 msgid "Never"
 msgstr "Nunca"
 
-#: config/prefs.php.dist:552
+#: config/.bak/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Nunca guardar adjuntos"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Nuevos"
 
-#: lib/IMP.php:569
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Carpeta nueva"
 
-#: config/prefs.php.dist:87
+#: config/.bak/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Correo nuevo"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Redactar"
+
+#: mailbox.php:771 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Mensaje nuevo para %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Mensajes nuevos"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Siguiente"
 
@@ -2217,15 +2422,16 @@
 msgid "Next Message"
 msgstr "Próximo mensaje"
 
-#: mailbox.php:353
+#: mailbox.php:342
 msgid "Next Page"
 msgstr "Próxima página"
 
-#: templates/compose/compose.inc:536 config/prefs.php.dist:947
+#: templates/compose/compose.inc:540 templates/compose/compose.inc:553
+#: config/.bak/prefs.php.dist:966
 msgid "No"
 msgstr "No"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "No se ha encontrado un certificado"
 
@@ -2233,101 +2439,125 @@
 msgid "No Encryption"
 msgstr "Sin cifrar"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "No hay claves en el llavero"
 
-#: mailbox.php:372
+#: mailbox.php:361
 #, php-format
 msgid "No Messages"
 msgstr "Sin mensajes"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "No se ha importado una clave PGP pública."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "No hay un certificado personal"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:319
+msgid "No Preview Text"
+msgstr "Vista previa sin texto"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "No se han encontrado claves públicas"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "No se ha importado la clave S/MIME pública."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "No se han encontrado adjuntos."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "No se encuentra información de dirección en la clave pública."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "no hay carpetas seleccionadas."
 
-#: lib/Block/summary.php:131
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "No se comprueba el correo nuevo en ninguna carpeta."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:201 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "No se especificaron carpetas"
 
-#: lib/Block/summary.php:137
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "No hay carpetas con mensajes nuevos"
 
-#: lib/Block/summary.php:134
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "No hay carpetas con mensajes sin leer"
 
-#: lib/Compose.php:228
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "No hay texto en el cuerpo del mensaje"
 
-#: lib/Mailbox.php:1134
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "No se ha devuelto ningún mensaje."
+
+#: lib/Mailbox.php:362
 msgid "No messages matched your search."
 msgstr "No hay mensajes que coincidan con su búsqueda."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "No se ha importado la clave personal PGP privada."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "No se ha importado la clave personal PGP pública."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "No se han importado certificados personales S/MIME."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"No hay clave privada personal por lo que no se puede descifrar el mensaje."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "No se ha configurado un programa de correción ortográfica."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "No hay errores de ortografía"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "No hay sugerencias"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr "No se puede localizar un método de autentificación IMAP soportado."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "No se ha especificado un usuario."
 
-#: lib/MIME/Viewer/itip.php:695
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Sin participantes"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/mailbox/navbar.inc:11 lib/MIME/Viewer/itip.php:652
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Ninguna"
 
-#: templates/compose/compose.inc:310
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normal"
 
@@ -2349,8 +2579,7 @@
 msgid "Not Personal"
 msgstr "No personal"
 
-#: lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157 lib/Crypt/SMIME.php:166
-#: lib/Crypt/PGP.php:154
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "No es una clave pública válida."
 
@@ -2362,26 +2591,34 @@
 msgid "Not important messages"
 msgstr "Mensajes no importantes"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Tenga en cuenta que ésto puede llevar un rato"
 
-#: config/prefs.php.dist:371
+#: config/.bak/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Nada"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Notificación: Adjunto vinculado descargado"
+
+#: config/.bak/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Número de meses que se conservan los adjuntos vinculados antiguos al "
 "eliminarlos mensualmente."
 
-#: config/prefs.php.dist:353
+#: config/.bak/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
-msgstr "Carpetas sent-mail antiguas que se conservan al eliminar mensualmente."
+msgstr ""
+"Carpetas \"Enviados\" antiguas que se conservan al eliminar mensualmente."
 
-#: templates/contacts/contacts.inc:251 lib/MIME/Viewer/itip.php:510
-#: lib/MIME/Viewer/itip.php:720
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "Aceptar"
 
-#: templates/smime/import_key.inc:47 templates/search/fields.inc:5
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "O"
@@ -2390,49 +2627,47 @@
 msgid "Old messages"
 msgstr "Mensajes antiguos"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
-msgstr "Purgando carpetas sent-mail antiguas."
+msgstr "Purgando carpetas \"Enviados\" antiguas."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "¿Mostrar sólo las carpetas que contengan mensajes sin leer?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Para esta acción hay que seleccionar sólo una carpeta."
 
-#: templates/menu.inc:26 templates/menu.inc:27 templates/menu/menu.inc:82
-#: templates/menu/menu.inc:83
-msgid "Ope_n Folder"
-msgstr "Abrir carpe_ta"
-
-#: templates/menu.inc:17 templates/menu.inc:20 templates/menu/menu.inc:73
-#: templates/menu/menu.inc:76
-msgid "Open Folder"
-msgstr "Abrir carpeta"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "Abr_ir carpeta"
 
-#: folders.php:381
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Carpeta abierta"
 
-#: lib/MIME/Viewer/itip.php:691
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Otras cuentas de correo"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/.bak/prefs.php.dist:110 config/.bak/prefs.php.dist:119
+#: config/.bak/prefs.php.dist:126 config/.bak/prefs.php.dist:133
+#: config/.bak/prefs.php.dist:141 config/.bak/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Otras opciones"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:294
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Servidor de salida"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2440,20 +2675,16 @@
 msgid "PGP Encrypt Message"
 msgstr "Cifrar mensaje con PGP"
 
-#: compose.php:351
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "Error de PGP: "
 
-#: compose.php:330
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr ""
 "Error de PGP: Hace falta una frase clave para la clave personal privada."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP NO está activo"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/.bak/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "Opciones de PGP"
 
@@ -2461,27 +2692,27 @@
 msgid "PGP Passphrase Input"
 msgstr "Entrada de frase clave PGP"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 "Hace falta una conexión web segura para utilizar el soporte de claves "
 "personales PGP"
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Texto de la clave PGP pública"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Se ha añadido correctamente la clave PGP pública de \"%s (%s)\"."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Se ha eliminado correctamente la clave PGP pública de \"%s\"."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Llavero PGP público"
 
@@ -2493,19 +2724,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Mensaje firmado/cifrado con PGP"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Se ha añadido correctamente la clave PGP privada."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Se ha añadido correctamente la clave PGP pública."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "En este sistema se ha desactivado el soporte PGP."
 
-#: lib/MIME/Viewer/pgp.php:212
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2513,57 +2744,57 @@
 "El soporte PGP no está activado actualmente por lo que no se puede comprobar "
 "la firma digital."
 
-#: lib/MIME/Viewer/pgp.php:299
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "El soporte PGP no está activado actualmente por lo que no se puede descifrar "
 "el mensaje."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "El soporte PGP necesita utilizar ventanas emergentes. Si las ha desactivado "
 "en su navegador, tendrá que reactivarlas o las características PGP no "
 "funcionarán correctamente."
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Autodetección de protocolos)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 sobre SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 sobre SSL (certificado auto-firmado)"
 
-#: templates/login/login.inc:173
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 sobre SSL (auto-firmado)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, sin TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: config/prefs.php.dist:873
+#: config/.bak/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Página del primer mensaje sin leer"
 
-#: config/prefs.php.dist:874
+#: config/.bak/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Página del último mensaje sin leer"
 
@@ -2571,85 +2802,95 @@
 msgid "Part(s)"
 msgstr "Parte(s)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Frase clave"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Frase clave (repetición)"
 
-#: pgp.php:310 smime.php:235
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "Frase clave descargada correctamente."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Frase clave:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr "Las frases clave no pueden dejarse en blanco"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Las frases clave no coinciden"
 
-#: templates/smime/import_key.inc:69 templates/login/login.inc:217
-#: templates/fetchmail/manage.inc:20
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Contraseña"
 
 #: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
-msgstr "¿Realizar operaciones de mantenimiento al iniciar sesión?"
+msgstr "¿Realizar operaciones de mantenimiento al iniciar sesión??"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "No se pueden cambiar los privilegios de este usuario."
 
-#: mailbox.php:667 message.php:485 templates/mailbox/legend.inc:10
-#: templates/mailbox/navbar.inc:24
+#: message.php:494 mailbox.php:698 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Personal"
 
-#: config/prefs.php.dist:14
+#: config/.bak/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Se han generado correctamente las claves personales PGP."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Se han eliminado correctamente las claves personales PGP."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "No se han importado certificados personales S/MIME."
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Se han eliminado correctamente las claves personales S/MIME."
 
-#: config/prefs.php.dist:214
+#: config/.bak/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "¿Añadir su firma antes de la contestación o el reenvío?"
 
-#: compose.php:249
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Versión en texto del mensaje"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/.bak/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"¿Reproducir sonido con la recepción de correo? Hace falta que el navegador "
+"permita archivos de sonido incluidos. La mayoría de los de Windows y Mac lo "
+"permiten, pero otras plataformas pueden precisar un plugin."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Introduzca el nombre de la nueva carpeta:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Introduzca el nombre de la nueva carpeta:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Introduzca el nuevo nombre:"
 
@@ -2671,7 +2912,7 @@
 "Introduzca la frase clave para la clave S/MIME privada. Sólo tendrá que "
 "introducirla una vez por sesión de %s."
 
-#: recompose.php:88
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2683,60 +2924,43 @@
 "tendrá que iniciar sesión también en la ventana principal. Es necesario para "
 "evitar que un asaltante suplante su ID de sesión. Disculpe las molestias."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Introduzca su contraseña."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Introduzca su nombre de usuario."
 
-#: compose.php:79 lib/IMP.php:514
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Resuelva direcciones electrónicas ambiguas o inválidas."
 
-#: lib/MIME/Viewer/itip.php:632
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Lea con atención la información siguiente y seleccione una acción del menú "
-"de debajo."
-
-#: templates/folders/javascript.inc:56
-msgid "Please select a folder before you perform any actions."
-msgstr "Seleccione una carpeta antes de realizar cualquier acción."
-
-#: lib/MIME/Viewer/itip.php:462
-msgid "Please select an action from the menu below."
-msgstr "Seleccione una acción del menú de debajo."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Seleccione una carpeta antes de realizar esta acción."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Seleccione al menos una carpeta para la búsqueda."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Seleccione una única carpeta para esta operación."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Seleccione o modifique en el recuadro de la derecha:"
 
-#: templates/compose/compose.inc:131 templates/compose/compose.inc:181
-#: templates/compose/compose.inc:232
-msgid "Please select or edit right next:"
-msgstr "Seleccione o modifique lo siguiente:"
-
-#: config/motd.php.dist:41
+#: config/.bak/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Potenciado por Horde"
 
-#: config/prefs.php.dist:206
+#: config/.bak/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "¿Encabezar la firma con guiones ('-- ')?"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 msgid "Preferences successfully updated."
 msgstr "Se han actualizado correctamente las preferencias."
 
@@ -2748,11 +2972,11 @@
 msgid "Previous Message"
 msgstr "Mensaje anterior"
 
-#: mailbox.php:344
+#: mailbox.php:333
 msgid "Previous Page"
 msgstr "Página anterior"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Imprimir"
 
@@ -2760,15 +2984,15 @@
 msgid "Priority"
 msgstr "Prioridad"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Contraseña de clave privada"
 
-#: config/prefs.php.dist:551
+#: config/.bak/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Consultar cada vez que se envíe un adjunto; NO por omisión"
 
-#: config/prefs.php.dist:550
+#: config/.bak/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Consultar cada vez que se envíe un adjunto; SÍ por omisión"
 
@@ -2776,45 +3000,43 @@
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: lib/Crypt/PGP.php:451
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Se ha desactivado el soporte de servidores de claves PGP públicos."
 
-#: templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Vaciar (_x)"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:9
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Vaciar"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Vaciar carpeta(s)"
 
-#: config/prefs.php.dist:390
+#: config/.bak/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Cuán a menudo vaciar la papelera:"
 
-#: config/prefs.php.dist:399
+#: config/.bak/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr ""
 "Eliminar de la papelera los mensajes más antiguos que este número de días."
 
-#: config/prefs.php.dist:380
+#: config/.bak/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "¿Eliminar de la papelera los mensajes antiguos?"
 
-#: lib/Maintenance/Task/purge_trash.php:63
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Eliminando %d mensaje(s) de la papelera."
+msgid "Purging %d messages from Trash folder."
+msgstr "Eliminando %d mensajes de la papelera."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Añadir ésto tras la @ al expandir las direcciones por omisión enviando "
-"correo:"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "Eliminando 1 mensaje de la papelera."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2831,23 +3053,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Estado del espacio asignado: SIN LÍMITE"
 
-#: config/prefs.php.dist:492
-msgid "Quoting"
-msgstr "Citado por"
-
-#: templates/compose/compose.inc:381
-msgid "Re_quest Delivery Confirmation"
-msgstr "Solicitar con_firmación del envío"
+#: config/.bak/prefs.php.dist:500
+#, php-format
+msgid "Quoting %f:"
+msgstr "%f ha escrito:"
+
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Reconstruir árbol de carpetas"
 
-#: search.php:165
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Recibidos el"
 
-#: search.php:173
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Recibidos desde"
 
-#: search.php:169
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Recibidos hasta"
 
@@ -2859,35 +3082,35 @@
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "_Redirigir mensaje"
 
-#: compose.php:703
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Redigir este mensaje"
 
-#: compose.php:759
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Falló el redireccionamiento."
 
-#: templates/compose/compose.inc:577
-msgid "Refresh"
-msgstr "Actualizar"
-
-#: config/prefs.php.dist:759
+#: config/.bak/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Actualizar vistas de carpeta:"
 
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+msgid "Reload"
+msgstr "Actualizar"
+
 #: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Actualizar vista"
 
-#: lib/MIME/Viewer/itip.php:484 lib/MIME/Viewer/itip.php:503
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Recordar la información de tiempo disponible."
 
-#: config/prefs.php.dist:949
+#: config/.bak/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Recordar la última vista"
 
@@ -2895,7 +3118,7 @@
 msgid "Remote Mailbox:"
 msgstr "Buzón remoto:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Quitar campos de la búsqueda"
 
@@ -2903,15 +3126,15 @@
 msgid "Remove source"
 msgstr "Eliminar origen"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Renombrar carpeta(s)"
 
-#: config/prefs.php.dist:335
+#: config/.bak/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
-msgstr "¿Renombrar la carpeta sent-mail al inicio del mes?"
+msgstr "¿Renombrar la carpeta \"Enviados\" al inicio del mes?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:458
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Error al renombrar \"%s\" como \"%s\". Ésto es lo que dijo el servidor"
@@ -2920,7 +3143,7 @@
 msgid "Repl_y to List"
 msgstr "Responder a la lista"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Sustituir por:"
 
@@ -2928,7 +3151,7 @@
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/MIME/Viewer/itip.php:280 lib/MIME/Viewer/itip.php:373
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Respuesta enviada."
 
@@ -2936,7 +3159,7 @@
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: compose.php:650
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Responder a todos:"
 
@@ -2944,7 +3167,7 @@
 msgid "Reply to List"
 msgstr "Responder a la lista"
 
-#: compose.php:652
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Responder a la lista:"
 
@@ -2952,106 +3175,100 @@
 msgid "Reply to _All"
 msgstr "Responder a todos (_z)"
 
-#: lib/MIME/Viewer/itip.php:486 lib/MIME/Viewer/itip.php:495
-#: lib/MIME/Viewer/itip.php:505
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Responder con un mensaje no soportado"
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Responder con el tiempo disponible durante los próximos 2 meses."
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Responder con la información de tiempo disponible pedida."
 
-#: message.php:260
+#: message.php:275
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Responder-A: "
 
-#: compose.php:648
+#: compose.php:769
 msgid "Reply:"
 msgstr "Responder:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Notificar como inofensivo"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Notificar como spam"
 
-#: templates/compose/compose.inc:378
+#: templates/compose/compose.inc:386
 msgid "Request a _Read Receipt"
 msgstr "Solicitar un acuse de _recibo"
 
-#: config/prefs.php.dist:586
-msgid "Request delivery confirmation?"
-msgstr "¿Solicitar confirmación del envío?"
-
-#: config/prefs.php.dist:565
+#: config/.bak/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "¿Solicitar acuses de recibo?"
 
-#: mailbox.php:205
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr "No se encontró el mensaje solicitado."
 
-#: lib/MIME/Viewer/itip.php:683
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: templates/search/header.inc:26 templates/search/main.inc:143
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:138 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Limpiar"
 
-#: lib/MIME/Viewer/itip.php:107
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Actualizado el estado de respuesta."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Reanudar"
 
-#: recompose.php:89
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Reanudar sesión"
 
-#: templates/fetchmail/account_select.inc:32
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Volver a \"Redacción del mensaje\""
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
 msgstr "Regresar a Traer correo"
 
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
-msgid "Return to Main Preferences Screen"
-msgstr "Regresar a la pantalla principal de preferencias"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Regresar a opciones"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Regresar a la pantalla anterior"
-
-#: config/prefs.php.dist:713
+#: config/.bak/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "¿Regresar al listado del buzón tras eliminar, trasladar o copiar un mensaje?"
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Función"
 
-#: lib/MIME/Viewer/pkcs7.php:141 lib/MIME/Viewer/pkcs7.php:201
-#: lib/MIME/Viewer/pkcs7.php:226
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3059,47 +3276,43 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Mensaje cifrado en S/MIME"
 
-#: compose.php:387
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "Error S/MIME: "
 
-#: compose.php:366
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr ""
 "Error S/MIME: Hace falta una frase clave para la clave personal privada."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "NO se ha activado S/MIME"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/.bak/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "Opciones S/MIME"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "Entrada de frase clave S/MIME"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "Hace falta una conexión web segura para utilizar el soporte de claves "
 "personales S/MIME"
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Se ha eliminado correctamente la clave S/MIME pública de \"%s\"."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Se ha añadido correctamente la clave pública S/MIME"
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Llavero S/MIME público"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Se han añadido correctamente las claves pública/privada S/MIME"
 
@@ -3111,11 +3324,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Mensaje firmado/cifrado en S/MIME"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "En este sistema se ha desactivado el soporte S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3123,7 +3336,15 @@
 "El soporte S/MIME no está activado actualmente por lo que no se puede "
 "descifrar el mensaje."
 
-#: lib/MIME/Viewer/pkcs7.php:145
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message cannot "
+"be displayed."
+msgstr ""
+"El soporte S/MIME no está activado por lo que no se puede mostrar el "
+"contenidode este mensaje firmado."
+
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3131,91 +3352,108 @@
 "El soporte S/MIME no está activado actualmente por lo que no se puede "
 "comprobar la firma digital."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "El soporte S/MIME necesita utilizar ventanas emergentes. Si las ha "
 "desactivado en su navegador, tendrá que reactivarlas o las características S/"
 "MIME no funcionarán correctamente."
 
-#: templates/compose/compose.inc:270
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "As_unto"
 
-#: templates/compose/compose.inc:358
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Guar_dar una copia en "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Guardar como (_w)"
 
-#: search.php:353 templates/fetchmail/manage.inc:67
+#: search.php:308 templates/fetchmail/manage.inc:67
 msgid "Save"
-msgstr "_Guardar"
+msgstr "Guardar"
 
-#: templates/compose/compose.inc:532
+#: templates/compose/compose.inc:536
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "¿Guardar adjuntos con los mensajes en la carpeta de correo enviado?"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:37
-#: templates/pgp/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/filters/prefs.inc:69
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Guardar imagen"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Guardar imagen en la galería"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Guardar opciones"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Guardar plantilla"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save _Draft"
 msgstr "_Guardar borrador"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Guardar como"
 
-#: config/prefs.php.dist:513
+#: config/.bak/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "¿Guardar borradores como no leídos?"
 
-#: config/prefs.php.dist:1029
+#: config/.bak/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr ""
 "¿Añadir automáticamente los destinatarios a la Libreta de direcciones por "
 "omisión?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:122
 msgid "Save search as a virtual folder?"
 msgstr "¿Guardar búsqueda como una carpeta virtual?"
 
-#: config/prefs.php.dist:223
+#: config/.bak/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "¿Guardar correo enviado?"
 
-#: compose.php:1108
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Fallo al guardar el borrador. Ésto es lo que dijo el servidor: %s"
 
-#: templates/contacts/contacts.inc:196
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Buscar"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Buscar en %s"
 
-#: lib/Block/tree_folders.php:170
-msgid "Search Mail"
-msgstr "Buscar correo"
+#: config/.bak/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Opciones de búsqueda"
 
-#: search.php:306
+#: search.php:263
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 
@@ -3229,9 +3467,9 @@
 
 #: templates/fetchmail/manage.inc:70
 msgid "Select Another Account"
-msgstr "Seleccione otra identidad"
+msgstr "Seleccione otra cuenta"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Seleccione una fecha"
 
@@ -3239,7 +3477,11 @@
 msgid "Select a field"
 msgstr "Seleccione un campo"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Seleccionar una plantilla:"
+
+#: config/.bak/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 "Selecciona la libreta de direcciones origen para adición y búsqueda de "
@@ -3255,12 +3497,16 @@
 
 #: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
-msgstr "Seleccione una identidad"
+msgstr "Seleccione una cuenta"
 
 #: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Anular selección"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Seleccione la galería en la que guardar la imagen."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Seleccione el tipo de servidor de correo"
@@ -3269,36 +3515,40 @@
 msgid "Selected Address books:"
 msgstr "Libretas de direcciones seleccionadas:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Enviar clave al servidor de claves público"
 
-#: lib/MIME/Viewer/itip.php:561
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Enviar información actualizada"
 
-#: config/prefs.php.dist:574
-msgid "Send MDN when requested by the sender?"
-msgstr "¿Enviar NCM si lo solicita el remitente?"
-
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Send Message"
 msgstr "Enviar mensaje"
 
-#: folders.php:359
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "¿Enviar el mensaje SIN Asunto?"
+
+#: config/.bak/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "¿Enviar confirmación de lectura si lo solicita el remitente?"
+
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "Carpeta de correos enviados"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Carpeta de correos enviados:"
 
-#: templates/login/login.inc:134 templates/login/login.inc:148
-#: templates/login/login.inc:155
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Servidor"
 
-#: config/prefs.php.dist:23
+#: config/.bak/prefs.php.dist:23
 msgid "Server and Folder Information"
 msgstr "Información de servidor y de carpeta"
 
@@ -3306,16 +3556,16 @@
 msgid "Server:"
 msgstr "Servidor:"
 
-#: config/prefs.php.dist:80
+#: config/.bak/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 "Establece preferencias de lo que ocurrirá al trasladar o eliminar mensajes."
 
-#: config/prefs.php.dist:522
+#: config/.bak/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "¿Establecer la cabecera X-Priority al redactar mensajes?"
 
-#: config/prefs.php.dist:31
+#: config/.bak/prefs.php.dist:31
 msgid "Share Folders"
 msgstr "Compartir carpetas"
 
@@ -3323,11 +3573,11 @@
 msgid "Share mail folders"
 msgstr "Compartir carpetas de correo"
 
-#: config/prefs.php.dist:32
+#: config/.bak/prefs.php.dist:32
 msgid "Share your mail folders with other users."
 msgstr "Compartir sus carpetas de correo con otros usuarios."
 
-#: config/prefs.php.dist:671
+#: config/.bak/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3335,15 +3585,15 @@
 "¿Mostrar u ocultar por omisión los bloques grandes de texto citado? Se puede "
 "conmutar con facilidad elija lo que elija."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "¿Buscar datos PGP en el cuerpo de los mensajes de texto/plano?"
 
-#: config/prefs.php.dist:505
+#: config/.bak/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "¿Cerrar la ventana de redacción tras guardar un borrador?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "¿Adjuntar por omisión la clave PGP pública a los mensajes?"
 
@@ -3355,7 +3605,7 @@
 msgid "Show All Headers"
 msgstr "Mostrar todas las cabeceras"
 
-#: mailbox.php:362
+#: mailbox.php:351
 msgid "Show Deleted"
 msgstr "Mostrar eliminados"
 
@@ -3371,56 +3621,52 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Mostrar sólo carpetas suscritas"
 
-#: folders.php:250
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Mostrar no suscritos"
 
-#: config/prefs.php.dist:611
+#: config/.bak/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr ""
-"¿Mostrar un icono para permitir la extracción de los adjuntos de los "
+"¿Mostrar un icono para permitir la eliminación de los adjuntos de los "
 "mensajes?"
 
-#: config/prefs.php.dist:973
+#: config/.bak/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "¿Mostrar comentarios en la vista del buzón?"
 
-#: config/prefs.php.dist:808
+#: config/.bak/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "¿Mostrar vista previa sólo de los mensajes sin leer?"
 
-#: config/prefs.php.dist:816
+#: config/.bak/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr "¿Mostrar vista previa en los consejos?"
 
-#: config/prefs.php.dist:847
+#: config/.bak/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "¿Mostrar el icono Traer correo en la barra de menú?"
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Mostrar imágenes"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "¿Mostrar el icono de filtrado en la barra de menú?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "¿Mostrar el número total de mensajes por carpeta?"
 
-#: config/prefs.php.dist:668
+#: config/.bak/prefs.php.dist:654
 msgid "Shown"
 msgstr "Mostrado"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Ta_maño"
 
-#: templates/login/login.inc:237
-msgid "Sign up if not registered"
-msgstr "Solicitar alta si no está registrado"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Firmado"
@@ -3429,152 +3675,186 @@
 msgid "Size"
 msgstr "Tamaño"
 
-#: templates/mailbox/message_headers.inc:3
-msgid "Sort Direction"
-msgstr "Sentido de clasificación"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Ordenar por llegada"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Ordenar por fecha"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Ordenar por remitente"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Ordenar por tamaño del mensaje"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Ordenar por asunto"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Ordenar por secuencia"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Ordenar por destinatario"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Carpeta de spam:"
 
-#: templates/compose/compose.inc:341
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Caracteres especiales"
 
-#: templates/compose/compose.inc:338
+#: search.php:142
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Las carpetas virtuales especiales no se pueden modificar."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Corrección ortográfica"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Corrector ortográfico"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Corrección ortográfica completa"
 
-#: config/prefs.php.dist:462
+#: config/.bak/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr ""
 "Número de errores ortográficos por pantalla durante la corrección "
 "ortográfica."
 
-#: lib/MIME/Viewer/itip.php:470 lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Empieza"
 
-#: lib/MIME/Viewer/itip.php:674
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Plantilla"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Nombre de la plantilla:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Tipo de plantilla:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Plantilla:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Estado"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
-msgstr "Extraer adjunto"
+msgstr "Eliminar adjunto"
 
-#: config/prefs.php.dist:800
+#: config/.bak/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "¿Extraer saltos de línea?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "As_unto"
 
-#: message.php:261 search.php:157 templates/compose/recompose.inc:25
+#: message.php:276 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Asunto"
 
-#: config/prefs.php.dist:890
+#: config/.bak/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Por asunto"
 
-#: search.php:355 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:310 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Suscribirse a la(s) carpeta(s)"
 
-#: lib/MIME/Viewer/pgp.php:393 lib/MIME/Viewer/pkcs7.php:360
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Éxito"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Sugerencias"
 
-#: lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Resumen"
 
-#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
+#: templates/compose/compose.inc:397 templates/compose/compose.inc:400
 msgid "Switch Composition Method"
 msgstr "Conmutar método de redacción"
 
-#: templates/compose/compose.inc:399
+#: templates/compose/compose.inc:401
 msgid "Switch to HTML composition"
 msgstr "Conmutar a redacción HTML"
 
-#: templates/compose/compose.inc:399
+#: templates/compose/compose.inc:401
 msgid "Switch to plain text composition"
 msgstr "Conmutar a redacción de texto"
 
-#: templates/compose/compose.inc:414
+#: templates/compose/compose.inc:416
 msgid "Te_xt"
 msgstr "_Texto"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr "Provisional: "
+
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Aceptar petición provisionalmente"
 
-#: lib/MIME/Viewer/itip.php:748
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Aceptada provisionalmente"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "No se han indicado los términos del archivo de servicio en conf.php"
 
-#: config/prefs.php.dist:924
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Texto"
+
+#: config/.bak/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "Cómo vincular la columna De: del mensaje:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"No parece que el servidor IMAP soporte el sistema de autentificación "
+"seleccionado. Póngase en contacto con el administrador del sistema."
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Fork de recursos de Macintosh"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Se puede descargar %s el fork de recursos de Macintosh."
@@ -3582,66 +3862,57 @@
 #: fetchmailprefs.php:81
 #, php-format
 msgid "The account \"%s\" has been deleted."
-msgstr "Se ha eliminado la identidad \"%s\"."
+msgstr "Se ha eliminado la cuenta \"%s\"."
 
 #: fetchmailprefs.php:74
 #, php-format
 msgid "The account \"%s\" has been saved."
-msgstr "Se ha guardado la identidad \"%s\"."
-
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Se ha añadido la dirección \"%s\" a %s."
+msgstr "Se ha guardado la cuenta \"%s\"."
 
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "No se encontró el adjunto."
 
-#: templates/javascript/open_compose_win.js:34
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"No se puede abrir la ventana de redacción. ¿Ha configurado su navegador para "
-"que bloquee las ventanas emergentes?"
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr "Los datos de la agenda no son válidos"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "A continuación está el contenido del archivo Macintosh."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "La(s) carpeta(s) \"%s\" se renombrará(n) como \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "No se puede obtener la lista de usuarios actual que tienen acceso a esta "
 "carpeta"
 
-#: compose.php:1117
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Se ha guardado el borrador en la carpeta \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Se ha añadido el acontecimiento a la agenda."
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
-msgstr "No se puede expandir el campo '%s'."
+msgid "The field \"%s\" can't be expanded."
+msgstr "No se puede expandir el campo \"%s\"."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:332
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Ya existe la carpeta \"%s\""
 
-#: lib/Folder.php:192
+#: lib/Folder.php:162
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3650,46 +3921,54 @@
 "La carpeta \"%s\" tiene caracteres ilegales en el nombre. Ésto puede "
 "originar problemas. Consulte al administrador de sistemas."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:351
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Se ha creado la carpeta \"%s\" pero no se ha suscrito a ella."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:269
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Se ha eliminado la carpeta \"%s\" pero no se ha desuscrito de ella."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:338
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "No se ha creado la carpeta \"%s\". Ésto es lo que dijo el servidor"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:262
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "No se ha eliminado la carpeta \"%s\". Ésto es lo que dijo el servidor"
+
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Se ha creado correctamente la carpeta \"%s\"."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Se ha eliminado correctamente la carpeta \"%s\"."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:456
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Se ha renombrado correctamente la carpeta \"%s\" como \"%s\"."
 
-#: lib/Folder.php:373
-#, php-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "No se ha eliminado la carpeta '%s'. Ésto es lo que dijo el servidor"
-
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Se habían añadido los archivos siguientes a esta parte:"
 
-#: lib/MIME/Viewer/html.php:93
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"No se puede abrir la ventana de guardado de imágenes. ¿Ha configurado su "
+"navegador para que bloquee las ventanas emergentes?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3697,24 +3976,24 @@
 "Se mostrarán las imágenes ya que el remitente está en su Libreta de "
 "direcciones."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "El servidor de correo ha generado el siguiente mensaje de error:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "El servidor de correo ha generado el siguiente mensaje de información:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "El servidor de correo ha generado el siguiente mensaje:"
 
-#: lib/Message.php:645
+#: lib/Message.php:691
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "El buzón %s ya está vacío."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3724,36 +4003,37 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Se ha cerrado el mensaje que estaba redactando. Saliendo."
 
-#: message.php:143
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "El mensaje carece de Asunto."
+
+#: message.php:149
 msgid "The message has been deleted."
 msgstr "Se ha eliminado el mensaje."
 
-#: lib/MIME/Viewer/pgp.php:397 lib/MIME/Viewer/pkcs7.php:364
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Se ha comprobado el mensaje."
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"No se puede abrir la ventana de frase clave. ¿Ha configurado su navegador "
-"para que bloquee las ventanas emergentes?"
+#: lib/MIME/Viewer/pkcs7.php:389
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Se ha comprobado el mensaje. Remitente: %s."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Se puede ver %s el texto de la clave PGP pública."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "No existe el archivo solicitado en el adjunto MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "No existe el archivo solicitado en el adjunto Zip."
 
-#: message.php:549
+#: message.php:551
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3763,11 +4043,15 @@
 "El remitente de este mensaje le solicita una Notificación de Consulta de "
 "Mensaje cuando lo haya leído. Pulse %s para enviársela."
 
-#: templates/compose/compose.js:104
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "El servidor no pudo generar una miniatura de esta imagen."
+
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "No se pudo sustituir la firma."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Se sustituyó correctamente la firma."
 
@@ -3775,43 +4059,58 @@
 msgid "The specified file does not exist."
 msgstr "El archivo especificado no existe."
 
-#: lib/MIME/Viewer/itip.php:160
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Se ha añadido la plantilla \"%s\"."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Se ha eliminado la plantilla \"%s\"."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Se ha actualizado la plantilla \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "Se ha añadido la tarea a su lista de tareas."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "El texto del mensaje"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Se puede ver %s el texto del mensaje."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "El texto del mensaje devuelto"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Se puede ver %s el texto del mensaje devuelto."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "El texto del mensaje enviado"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Se puede ver %s el texto del mensaje enviado."
 
-#: lib/MIME/Viewer/itip.php:145
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr ""
 "Se almacenó correctamente la información de tiempo disponible del usuario."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "No hay partes alternativas que se puedan mostrar en línea."
 
@@ -3819,24 +4118,18 @@
 msgid "There are no messages in this mailbox."
 msgstr "No hay mensajes en este buzón."
 
-#: lib/Message.php:604
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Se produjo un problema al vaciar %s. Ésto es lo que dijo el servidor"
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr "No hay texto que se pueda mostrar en línea."
 
-#: lib/Message.php:647
+#: lib/Message.php:693
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 "Se produjo un problema al vaciar el buzón. Ésto es lo que dijo el servidor: %"
 "s"
 
-#: lib/Message.php:613
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-"Se produjo un problema al vaciar el buzón. Ésto es lo que dijo el servidor"
-
-#: lib/Message.php:107
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3845,7 +4138,7 @@
 "Se produjo un error al copiar mensajes de \"%s\" a \"%s\". Ésto es lo que "
 "dijo el servidor"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3854,7 +4147,7 @@
 "Se produjo un error al eliminar mensajes de la carpeta \"%s\". Ésto es lo "
 "que dijo el servidor"
 
-#: lib/Message.php:296
+#: lib/Message.php:320
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3863,22 +4156,22 @@
 "Se produjo un error al eliminar mensajes de la carpeta \"%s\". Ésto es lo "
 "que dijo el servidor"
 
-#: lib/Message.php:230
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr ""
 "Se produjo un error al eliminar mensajes. Ésto es lo que dijo el servidor: %s"
 
-#: lib/MIME/Viewer/itip.php:91
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Se produjo un error al eliminar el acontecimiento: %s."
 
-#: lib/MIME/Viewer/enriched.php:40 lib/MIME/Viewer/plain.php:55
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Se produjo un error al mostrar esta parte del mensaje"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:594
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3887,29 +4180,29 @@
 "Se produjo un error al marcar mensajes de la carpeta \"%s\". Ésto es lo que "
 "dijo el servidor"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Se produjo un error al importar %s."
 
-#: lib/MIME/Viewer/itip.php:127
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Se produjo un error al importar el acontecimiento: %s."
 
-#: lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Se produjo un error al importar la tarea: %s."
 
-#: lib/MIME/Viewer/itip.php:143
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Se produjo un error al importar la información de tiempo disponible del "
 "usuario: %s."
 
-#: lib/Message.php:102
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3918,29 +4211,29 @@
 "Se produjo un error al trasladar mensajes de \"%s\" a \"%s\". Ésto es lo que "
 "dijo el servidor"
 
-#: compose.php:1125
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "Se produjo un error al guardar este mensaje como borrador."
 
-#: compose.php:905
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Se produjo un error al enviar el mensaje: %s"
 
-#: lib/MIME/Viewer/itip.php:105
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Se produjo un error al actualizar el acontecimiento: %s."
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "No había texto en esta parte del mensaje"
 
-#: lib/MIME/Viewer/html.php:91
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "Este mensaje HTML tiene imágenes incorporadas."
 
-#: lib/MIME/Viewer/html.php:87
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -3948,29 +4241,41 @@
 "Este mensaje HTML tiene imágenes incorporadas. Las imágenes bloqueadas "
 "aparecen así: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Se adjuntó esta clave PGP pública al mensaje."
 
-#: lib/MIME/Viewer/itip.php:96 lib/MIME/Viewer/itip.php:110
-#: lib/MIME/Viewer/itip.php:134 lib/MIME/Viewer/itip.php:148
-#: lib/MIME/Viewer/itip.php:164 lib/MIME/Viewer/itip.php:283
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Esta acción no está soportada."
 
-#: lib/MIME/Viewer/itip.php:170 lib/MIME/Viewer/itip.php:383
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Esta acción todavía no está desarrollada."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Esto puede tardar un rato. ¿Esta seguro de que desea continuar?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Este mensaje contiene un archivo Macintosh."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/pkcs7.php:415
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+"Este mensaje contiene un adjunto que se ha firmado digitalmente mediante S/"
+"MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Este mensaje contiene un adjunto que se ha cifrado mediante S/MIME."
+
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -3983,7 +4288,7 @@
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Este mensaje  no parece ser un mensaje cifrado PGP válido. Error: "
 
-#: lib/MIME/Viewer/pgp.php:244 lib/MIME/Viewer/pgp.php:354
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
@@ -3991,31 +4296,31 @@
 "Este mensaje no parece ser del formato PGP correcto (de acuerdo con la RFC "
 "2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:169
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Este mensaje no parece estar en el formato S/MIME correcto."
 
-#: lib/MIME/Viewer/pgp.php:209 lib/MIME/Viewer/pgp.php:420
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Este mensaje se ha firmado digitalmente mediante PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:142
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Este mensaje se ha firmado digitalmente mediante S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:138 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Este mensaje se ha cifrado mediante S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Este mensaje se ha cifrado mediante PGP."
 
-#: message.php:204
+#: message.php:211
 msgid "This message to"
 msgstr "Este mensaje a"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Este servidor no soporta la compartición de carpetas."
 
@@ -4023,18 +4328,21 @@
 msgid "This window must be called from a compose window."
 msgstr "Esta ventana sólo puede abrirse desde una de redacción."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:892
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Visualizar secuencias"
+
+#: thread.php:76 config/.bak/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Por secuencias"
 
-#: mailbox.php:577 message.php:257 search.php:145
-#: templates/mailbox/message_headers.inc:17
-#: templates/contacts/contacts.inc:220 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: message.php:272 mailbox.php:602 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "Para"
 
-#: config/prefs.php.dist:889
+#: config/.bak/prefs.php.dist:908
 msgid "To Address"
 msgstr "Por destinatario"
 
@@ -4046,11 +4354,19 @@
 "Para seleccionar varios campos, mantenga pulsada la tecla Control (PC) o "
 "Comando (Mac) al pulsar con el ratón."
 
-#: templates/compose/compose.inc:571
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"Para utilizar una conexión TLS tiene que utilizar PHP versión 5.1.0 o "
+"superior."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Tamaño total de adjuntos:"
 
-#: folders.php:350
+#: folders.php:369
 msgid "Trash folder"
 msgstr "Papelera"
 
@@ -4058,9 +4374,8 @@
 msgid "Trash folder:"
 msgstr "Papelera:"
 
-#: lib/Quota/command.php:77 lib/Quota/courier.php:54 lib/Quota/cyrus.php:70
-#: lib/Quota/logfile.php:93 lib/Quota/mdaemon.php:51
-#: lib/Quota/mercury32.php:84
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Incapaz de obtener el espacio disponible"
 
@@ -4077,28 +4392,45 @@
 msgid "Undelete"
 msgstr "Recuperar"
 
-#: mailbox.php:561 mailbox.php:573 lib/MIME/Headers.php:219
+#: mailbox.php:580 mailbox.php:598 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Destinatarios ocultos"
 
-#: lib/MIME/Viewer/itip.php:409
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Respuesta inesperada del servidor al mandato AUTHENTICATE."
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Respuesta inesperada del servidor a la respuesta Digest-MD5."
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Respuesta inesperada del servidor al mandato LOGIN."
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Componente no soportado de tipo: %s"
 
-#: mailbox.php:538
+#: mailbox.php:558
 msgid "Unknown Date"
 msgstr "Fecha desconocida"
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Respuesta IMAP desconocida del servidor. El servidor respondió: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Reunión desconocida"
 
-#: mailbox.php:589
+#: mailbox.php:614
 msgid "Unknown Recipient"
 msgstr "Destinatario desconocido"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Olvidar frase clave"
 
@@ -4106,48 +4438,53 @@
 msgid "Unnamed"
 msgstr "Sin nombre"
 
-#: mailbox.php:672 message.php:491 templates/message/navbar_navigate.inc:6
-#: templates/mailbox/legend.inc:5 templates/mailbox/navbar.inc:15
-#: templates/mailbox/navbar.inc:32
+#: message.php:503 mailbox.php:703 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Desuscribirse de la(s) carpeta(s)"
 
-#: templates/compose/compose.inc:578
-msgid "Update Attachment Information"
-msgstr "Actualizar información de adjuntos"
+#: templates/compose/compose.inc:515
+msgid "Update"
+msgstr "Actualizar"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Actualizar estado de respuesta"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Cargar"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Usar valor por omisión"
 
-#: config/prefs.php.dist:250
+#: config/.bak/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "¿Usar suscripciones a carpetas IMAP?"
 
-#: templates/acl/acl.inc:140
+#: config/.bak/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "¿Usar papelera virtual?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Usuario"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
-"Se han concedido correctamente al usuario '%s' los derechos especificados "
-"para la carpeta '%s'."
+"Se han concedido correctamente al usuario \"%s\" los derechos especificados "
+"para la carpeta \"%s\"."
 
-#: templates/login/login.inc:205
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Usuario"
 
@@ -4155,83 +4492,128 @@
 msgid "Username:"
 msgstr "Usuario:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Ver"
 
-#: lib/MIME/Viewer/tnef.php:112 lib/MIME/Viewer/zip.php:95
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "Ver %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Ver clave pública de %s"
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "Ver contenido HTML en una ventana separada"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Ver mensajes"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Ver clave personal privada"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Ver clave personal pública"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Ver secuencia"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Ver miniatura"
 
-#: lib/MIME/Viewer/itip.php:131
+#: lib/MIME/Viewer/pkcs7.php:423
+msgid "View attachment in a separate window"
+msgstr "Ver adjunto en una ventana separada"
+
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Ver contenido en una ventana separada"
+
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Ver acontecimiento"
 
-#: folders.php:342 mailbox.php:507
+#: folders.php:361 mailbox.php:521
 #, php-format
 msgid "View messages in %s"
 msgstr "Ver mensajes de %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Vista o buzón mostrados al iniciar la sesión:"
 
-#: lib/MIME/Viewer/itip.php:161
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Ver tarea"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Ver las imágenes"
 
-#: search.php:304
+#: search.php:260
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Se ha creado correctamente la carpeta virtual \"%s\"."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:117 lib/IMAP/Tree.php:305
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:371
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
-msgstr "Carpetas virtuales"
+msgstr "Virtuales"
+
+#: search.php:252
+msgid "Virtual Folders require a label."
+msgstr "Las carpetas virtuales necesitan una etiqueta."
+
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Entrada"
 
-#: templates/search/main.inc:133
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Carpeta de Entrada virtual"
+
+#: lib/Mailbox.php:156 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Papelera"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Carpeta Papelera virtual"
+
+#: templates/search/main.inc:128
 msgid "Virtual folder label"
 msgstr "Etiqueta de carpeta virtual"
 
-#: login.php:141
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "Aviso"
+
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Bienvenidos a %s"
 
-#: config/prefs.php.dist:723
+#: config/.bak/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"¿Qué deberíamos hacer con los mensajes spam tras haberlos notificado como "
+"spam o inofensivos?"
+
+#: config/.bak/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4239,51 +4621,85 @@
 "Al eliminar mensajes, ¿trasladarlos a la papelera en vez de marcarlos como "
 "eliminados?"
 
-#: config/prefs.php.dist:877
+#: config/.bak/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Al abrir un buzón, ¿en qué página desea empezar?"
 
-#: config/prefs.php.dist:553
+#: config/.bak/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "¿Guardar datos adjuntos al guardar el correo enviado?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/.bak/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"Al enviar correo o expandir direcciones, ¿Qué dominio se debería añadir a "
+"las direcciones no calificadas (direcciones de correo sin \"@\")?"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Lista blanca"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Ajustar texto a este número de carácteres."
-
-#: templates/compose/compose.inc:535 config/prefs.php.dist:948
+#: templates/compose/compose.inc:539 templates/compose/compose.inc:552
+#: config/.bak/prefs.php.dist:967
 msgid "Yes"
 msgstr "Sí"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Está a punto de traer correo de la(s) siguiente(s) cuenta(s):"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Intenta eliminar las siguientes carpetas:"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Intenta eliminar todos los mensajes de las siguientes carpetas."
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Intenta eliminar la(s) siguiente(s) carpeta(s)."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Está copiando/trasladando a una nueva carpeta."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "Está creando una sub-carpeta de "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "Está creando una carpeta del nivel superior."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:315
+msgid "You are not allowed to create folders."
+msgstr "No dispone de privilegios para crear carpetas."
+
+#: lib/Folder.php:322
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "No dispone de privilegios para crear más de %d carpetas."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "Está renombrando la carpeta: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Puede utilizar los siguientes comodines en el texto de la plantilla: %c para "
+"el contenido actual del mensaje; %s para la firma."
+
+#: lib/Folder.php:557
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "Se ha desuscrito correctamente de \"%s\""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
@@ -4291,11 +4707,11 @@
 "No está de acuerdo con las condiciones del Servicio, por lo que no se le "
 "permite iniciar sesión."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "No dispone de privilegios para cambiar el acceso a esta carpeta"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Ha reenviado este mensaje de %%s a los siguientes destinatarios: %s."
@@ -4309,23 +4725,19 @@
 msgid "You have 1 new message."
 msgstr "Tiene 1 mensaje nuevo."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Ha seleccionado al menos un adjunto que aún no ha cargado. ¿Está seguro de "
-"que quiere enviar el mensaje sin esos adjuntos?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Ya ha enviado esta página."
 
-#: lib/IMP.php:968
+#: lib/IMP.php:1052
 msgid "You have new mail in the following folder:"
 msgstr "Tiene correo nuevo en la siguiente carpeta:"
 
-#: lib/IMP.php:973
+#: lib/IMP.php:1057
 msgid "You have new mail in the following folders:"
 msgstr "Tiene correo nuevo en las siguientes carpetas:"
 
-#: compose.php:136
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Tiene que indicar al menos un destinatario."
 
@@ -4336,7 +4748,7 @@
 "Para ver este mensaje tiene que introducir la frase clave de su clave PGP "
 "privada"
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4344,20 +4756,20 @@
 "Para ver este mensaje tiene que introducir la frase clave de su clave S/MIME "
 "privada"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Primero tiene que seleccionar un buzón de destino."
 
 #: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
-msgstr "Tiene que seleccionar una identidad a eliminar."
+msgstr "Tiene que seleccionar una cuenta a eliminar."
 
 #: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Primero tiene que seleccionar una dirección."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Primero tiene que seleccionar al menos un mensaje."
 
@@ -4365,94 +4777,82 @@
 msgid "You must specify a recipient."
 msgstr "Tiene que indicar un destinatario."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Tiene que indicar al menos un archivo a adjuntar."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "Tiene que tener '%s' activado en las opciones de mantenimiento."
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Tiene que activar \"%s\" en sus opciones de mantenimiento."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Ha redirigido este mensaje a %s en %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Ha contestado a este mensaje en %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "No se ha suscrito a \"%s\". Ésto es lo que dijo el servidor"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "No se ha desuscrito de \"%s\". Ésto es lo que dijo el servidor"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Se ha suscrito correctamente a \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Se ha desuscrito correctamente de \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Su nombre"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Claves PGP Pública/Privada"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Su clave privada"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Su clave pública"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Su dirección \"Responder-a\": <i>(opcional)</i>"
+#: config/.bak/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Su dirección Responder-a: <em>(opcional)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Sus certificados S/MIME Público/Privado"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
-msgstr "Sus identidades:"
+msgstr "Sus cuentas:"
 
-#: config/prefs.php.dist:165
+#: config/.bak/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Sus direcciones apodo: <i>(opcional, indique cada dirección en una línea "
-"distinta)</i>"
+"Sus direcciones apodo: <em>(opcional, indique cada dirección en una línea "
+"distinta)</em>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "El navegador no admite la visualización en línea de este tipo de imagen."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"El navegador no admite esta opción de impresión. Presione Control/Opción + P "
-"para imprimir."
-
-#: config/prefs.php.dist:531
+#: config/.bak/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Juego de caracteres por omisión para el envío de mensajes:"
 
@@ -4460,80 +4860,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Método de cifrado por omisión para el envío de mensajes:"
 
-#: lib/MIME/Viewer/status.php:92
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"El archivo adjunto vinculado ha sido descargado al menos por un usuario:\n"
+"\n"
+"Nombre del adjunto: %s\n"
+"Fecha del adjunto: %s\n"
+"\n"
+"Pulse el vínculo siguiente para eliminar de forma permanente el adjunto:\n"
+"%s"
+
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Se envió correctamente su mensaje."
 
-#: config/prefs.php.dist:198
+#: config/.bak/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Firma:"
 
-#: compose.php:1159 mailbox.php:522 message.php:281 lib/Compose.php:728
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Ocultar direcciones]"
+
+#: message.php:296 compose.php:1301 mailbox.php:536 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Sin asunto]"
 
-#: templates/compose/compose.inc:220
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Mostrar direcciones -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Mostrar direcciones - %s destinatarios]"
+
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Lista ne_gra"
 
-#: templates/compose/compose.inc:169
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: templates/menu/menu.inc:25 lib/IMP.php:869
-msgid "_Compose"
-msgstr "_Redactar"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "E_liminar"
 
-#: templates/menu/menu.inc:27 lib/IMP.php:871
+#: lib/IMP.php:955
 msgid "_Folders"
 msgstr "_Carpetas"
 
-#: templates/menu/menu.inc:51
-msgid "_Help"
-msgstr "A_yuda"
-
-#: templates/compose/compose.inc:84
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identidad"
 
-#: templates/menu/menu.inc:18 lib/IMP.php:862
+#: lib/IMP.php:924
 msgid "_Inbox"
 msgstr "_Entrada"
 
-#: lib/IMP.php:912
+#: lib/IMP.php:996
 msgid "_Log out"
 msgstr "_Salir"
 
-#: templates/menu/menu.inc:61 templates/menu/menu.inc:64
-msgid "_Logout"
-msgstr "_Salir"
-
-#: message.php:377
+#: message.php:392
 msgid "_Message Source"
 msgstr "Origen del mensa_je"
 
-#: templates/menu/menu.inc:46
-msgid "_Options"
-msgstr "_Opciones"
+#: lib/IMP.php:952
+msgid "_New Message"
+msgstr "_Redactar"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: templates/compose/compose.inc:287 templates/compose/compose.inc:304
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "Prioridad (_y)"
 
-#: mailbox.php:397
+#: mailbox.php:405
 #, php-format
 msgid "_Refresh %s"
 msgstr "Actuali_zar %s"
@@ -4542,19 +4962,19 @@
 msgid "_Reply"
 msgstr "Respon_der"
 
-#: templates/menu/menu.inc:29 lib/IMP.php:873
+#: lib/IMP.php:957
 msgid "_Search"
 msgstr "_Buscar"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "_Send Message"
 msgstr "_Enviar mensaje"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "Sec_uencia"
 
-#: templates/compose/compose.inc:119
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Para"
 
@@ -4562,19 +4982,23 @@
 msgid "_Undelete"
 msgstr "Recuperar (_w)"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Ver secuencia"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Lista bl_anca"
 
-#: lib/Compose.php:341
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "destinatario desconocido"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "adjunto"
 
-#: view.php:102
+#: view.php:97
 msgid "attachments.zip"
 msgstr "adjuntos.zip"
 
@@ -4582,38 +5006,107 @@
 msgid "bytes"
 msgstr "bytes"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "no se puede crear el archivo de destino"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "no se puede abrir el origen"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "error de línea de comando"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "error de configuración"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "falta un archivo crítico del sistema"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "error de formato de datos"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "entrada no encontrada"
+
+#: templates/contacts/contacts.inc:190
+msgid "from"
+msgstr "de"
+
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "nombre de anfitrión desconocido"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "error de entrada/salida"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "error de software interno"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "clave"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "archivo de buzón"
 
-#: compose.php:966 lib/Message.php:452
+#: compose.php:1105 lib/Message.php:515
 msgid "name"
 msgstr "nombre"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ninguno"
 
-#: templates/compose/spelling.inc:90
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "o"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "privilegio denegado"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "destinatarios]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "error remoto de protocolo"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "servicio no disponible"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "error de ortografía"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "errores de ortografía"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "error del sistema"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "fallo temporal"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "su lista negra"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "su lista blanca"


--- orig/docs/RELEASE_NOTES
+++ mod/docs/RELEASE_NOTES
@@ -17,54 +17,38 @@
 /* Mailing list release notes. */
 $this->notes['ml']['changes'] = <<<ML
 The Horde Team is pleased to announce the final release of the IMP Webmail
-Client version H3 (4.0.4).
+Client version H3 (4.1.1).
 
 IMP, the Internet Messaging Program, is one of the most popular webmail
 applications available.  It allows universal, web-based access to IMAP and
 POP3 mail servers and provides a full range of features normally found only in
 desktop email clients.
 
-Major changes compared to the IMP version H3 (4.0.4-RC2) are:
-    * Added warning that PGP key generation may take awhile.
-    * Added confirmation when reporting spam/innocent from message view.
-    * Fixed check for duplicate addresses when automatically saving recipients.
-    * Updated Finnish, German, Korean, and Slovak translations.
-
-Major changes compared to the IMP version H3 (4.0.4-RC1) are:
-    * Added entire message search to search page.
-    * Use "Fetch Mail" consistently in the user interface.
-    * Fixed warnings when expanding names with spaces.
-    * Updated Finnish, German, Korean, and Slovak translations.
-    * Minor bug fixes.
-
-Major changes compared to the IMP version H3 (4.0.3) are:
-    * Allow non-ascii searches.
-    * Show meeting invitations inline.
-    * Allow to accept invitations and add them to the calendar at once.
-    * Added separate confirmation page when deleting or emptying folders.
-    * Localized all remaining INBOX strings in the interface.
-    * Ensure that no maintenance tasks may be skipped.
-    * Fixed blank screens in Internet Explorer after failed logins.
-    * Minor character set related fixes.
-    * Improved draft saving of HTML messages.
-    * Work around broken c-client sort by arrival.
-    * Added Bosnian translation.
-    * A few improvements and minor bug fixes.
+Major changes compared to the IMP H3 (4.1) version are:
+    * X-Color data, normally set by the fetchmail process, is now escaped
+      to protect against malicious senders.
+    * Added preference for default charset when reading messages.
+    * Added preference to define how to expand the folder list in sidebar.
+    * Fixed logins to Exchange and other IMAP servers that propagate wrong
+      authentication methods.
+    * Fixed creation of duplicate Virtual INBOXes.
+    * Fixed spellcheck on send.
+    * Updated Danish, Dutch, Greek, Estonian, French, Japanese and Norwegian
+      translations.
+    * More small bugfixes and improvements.
 ML;
 
 /* Freshmeat release notes, not more than 600 characters. */
 $this->notes['fm']['changes'] = <<<FM
-Non-ascii and entire message searches are possible now.
-Meeting invitations are shown inline and can be accepted and added to the
-calendar at once.
-A confirmation page when deleting or emptying folders has been added.
-All remaining INBOX strings in the interface are localized.
-No maintenance tasks may be skipped anymore.
-Blank screens in Internet Explorer after failed logins have been fixed.
-Minor character set related fixes have been made.
-Draft saving of HTML messages has been improved.
-A workaround for broken c-clients and sorting by arrival has been implemented.
-A Bosnian translation has been added.
+Message color information is now escaped to protect against malicious senders.
+Preferences for the default charset when reading messages and to define how to
+expand the folder list in sidebar have been added.
+Logins to Exchange and other IMAP servers that propagate wrong authentication
+methods have been fixed.
+Creation of duplicate Virtual INBOXes and spellcheck on send have been fixed.
+More small bugfixes and improvements have been made.
+Danish, Dutch, Greek, Estonian, French, Japanese and Norwegian translations
+have been updated.
 FM;
 
 $this->notes['name'] = 'IMP';


--- orig/locale/el_GR/help.xml
+++ mod/locale/el_GR/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-7"?>
-<!-- $Horde: imp/locale/el_GR/help.xml,v 1.18.6.1 2005/01/25 22:05:54 jan Exp $ -->
+<!-- $Horde: imp/locale/el_GR/help.xml,v 1.18.6.5 2006/03/23 00:24:13 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Óýíèåóç Ìçíýìáôïò: ÅíÝñãåéåò</title>
@@ -182,6 +182,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>ÁíáæÞôçóç ÌçíõìÜôùí</title>
     <heading>ÊñéôÞñéá ÅðéëïãÞò</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/spelling.php
+++ mod/spelling.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/spelling.php,v 2.67.6.4 2005/06/02 08:28:56 selsky Exp $
+ * $Horde: imp/spelling.php,v 2.67.6.7 2006/01/01 21:28:52 jan Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -224,7 +224,7 @@
     if (isset($nls['spelling'][$language])) {
         $spell_opt = $nls['spelling'][$language];
     }
-    if (strpos($spellchecker, 'aspell') !== false) {
+    if (strpos($spellchecker, 'aspell') != false) {
         $spell_opt .= ' -e';
     }
     if ($f_rtemode) {
@@ -264,8 +264,7 @@
 $display_msg = $f_message = "\n" . $f_newmsg . $f_currmsg;
 if (!$f_rtemode) {
     $display_msg = htmlspecialchars($display_msg);
-    $display_msg = String::wrap($display_msg, $prefs->getValue('wrap_width'), "\n", NLS::getCharset(), (Util::getFormData('reply_type') == 'reply'));
-    $display_msg = '<pre>' . $display_msg . '</pre>';
+    $display_msg = String::wrap($display_msg, 80, "\n", NLS::getCharset(), true);
 }
 if ($browser->hasQuirk('double_linebreak_textarea')) {
     $display_msg = preg_replace('/(\r?\n){3}/', '$1', $display_msg);


--- orig/templates/mailbox/message_footers.inc
+++ mod/templates/mailbox/message_footers.inc
@@ -6,7 +6,7 @@
 <input type="hidden" name="flag" value="" />
 </form>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 Flags = new Array(<?php


--- orig/templates/message/navbar_top.inc
+++ mod/templates/message/navbar_top.inc
@@ -8,10 +8,18 @@
 <input type="hidden" name="newMbox" value="0" />
 
 <table border="0" cellpadding="0" cellspacing="0" align="center" width="100%">
-<tr>
-    <td align="left" class="header">
-    <?php echo sprintf(_("%s: %s (%d&nbsp;of&nbsp;%d)"), htmlspecialchars($page_label), $shortsub, $msgindex, $msgcount); echo '&nbsp;&nbsp;' . $status ?>
-    </td>
-</tr>
+ <tr>
+  <td class="header leftAlign">
+<?php
+    /* If this is a search mailbox, display a link to the parent mailbox of the
+     * message in the header. */
+    $header_label = htmlspecialchars($page_label);
+    if (isset($imp_search) && $imp_search->isVINBOXFolder()) {
+        $header_label .= ' [' . Horde::link(Util::addParameter(Horde::applicationUrl('mailbox.php'), 'mailbox', $mailbox_name)) . IMP::displayFolder($mailbox_name) . '</a>]';
+    }
+    printf(_("%s: %s (%d&nbsp;of&nbsp;%d)"), $header_label, $shortsub, $msgindex, $msgcount); echo '&nbsp;&nbsp;' . $status
+?>
+  </td>
+ </tr>
 </table>
 <table border="0" align="center" width="100%" cellspacing="0" cellpadding="2">


--- orig/po/mk_MK.po
+++ mod/po/mk_MK.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mk_MK\n"
-"POT-Creation-Date: 2003-06-05 18:13+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-06-26 14:53+0200\n"
 "Last-Translator: Stojan Pesov <ssp at eureka.com.mk>\n"
 "Language-Team: Macedonian <i18n at list.horde.org>\n"
@@ -15,1545 +16,5241 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      ´Þ: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      ´Þ: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    ´ÐâãÜ: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    ¾Ô: "
 
-msgid " - $nm new message"
-msgstr " - $nm ÝÞÒÐ ßÞàÐÚÐ"
-
-msgid " - $nm new messages"
-msgstr " - $nm ÝÞÒØ ßÞàÐÚØ"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " ½ÐáÛÞÒ: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " ÒÞ "
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr "%A, %B %e, %Y, %I:%M:%S %p %Z"
+#: templates/mailbox/message_headers.inc:12
+msgid "#"
+msgstr ""
+
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d ÞÔ %d ßÞàÐÚØ"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "¿àØÚÐÖØ ßÞàÐÚÐ ÚÞÓÐ äØÛâàØâÕ áÕ ßàØÜÕÝÕâØ."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d ÔÞ %d ÞÔ %d ßÞàÐÚØ"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ÒÕüÕ ßÞáâÞØ. ²ÐèÐâÐ %s ßÐßÚÐ ÝÕ Õ àÕØÜÕÝãÒÐÝÐ."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s Õ àÕØÜÕÝãÒÐÝÐ ÝÐ ßÞçÕâÞÚÞâ ÝÐ ÜÕáÕæÞâ."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ ßàÕØÜÕÝãÒÐÝÐ ÒÞ \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;ÞÔ&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(¿àØÜÕÝØ ÓØ ßàÞÜÕÝØâÕ Ø ÞÔØ ÝÐ áÛÕÔÝØÞâ ßàÞ×Þà.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(¾âäàÛØ ÓØ ßàÞÜÕÝØâÕ Ø ÒàÐâØ áÕ ÝÐ ÁÞáâÐÒØ ßàÞ×ÞàÞâ.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(²àÐâØ áÕ ÝÐ ÁÞáâÐÒØ ßàÞ×ÞàÞâ ßÞ ßàØÜÕÝãÒÐúÕ ÝÐ áØâÕ ßàÞÜÕÝØ ÝÐßàÐÒÕÝØ ÔÞ áÕÓÐ. "
-"¿àÞÜÕÝØâÕ ÞÔ âÕÚÞÒÝØÞâ ßàÞ×Þà ½µ¼° ÔÐ ÑØÔÐâ ßàØÜÕÝÕâØ.)"
+"(²àÐâØ áÕ ÝÐ ÁÞáâÐÒØ ßàÞ×ÞàÞâ ßÞ ßàØÜÕÝãÒÐúÕ ÝÐ áØâÕ ßàÞÜÕÝØ ÝÐßàÐÒÕÝØ ÔÞ "
+"áÕÓÐ. ¿àÞÜÕÝØâÕ ÞÔ âÕÚÞÒÝØÞâ ßàÞ×Þà ½µ¼° ÔÐ ÑØÔÐâ ßàØÜÕÝÕâØ.)"
+
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(²àÐâØ áÕ ÝÐ ÁÞáâÐÒØ ßàÞ×ÞàÞâ ßÞ ßàØÜÕÝãÒÐúÕ ÝÐ áØâÕ ßàÞÜÕÝØ ÝÐßàÐÒÕÝØ ÔÞ "
+"áÕÓÐ. ¿àÞÜÕÝØâÕ ÞÔ âÕÚÞÒÝØÞâ ßàÞ×Þà ½µ¼° ÔÐ ÑØÔÐâ ßàØÜÕÝÕâØ.)"
+
+#: templates/contacts/contacts.inc:227
+msgid "* Add these by clicking OK *"
+msgstr ""
+
+#: templates/contacts/contacts.inc:206
+msgid "* Please select address(es) *"
+msgstr ""
+
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ Ø×ÑàØèÐÝ."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "ÁßÕæØøÐÛÝØ ×ÝÐæØ"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "ÁßÕæØøÐÛÝØ ×ÝÐæØ"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "ÁßÕæØøÐÛÝØ ×ÝÐæØ"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "ÁßÕæØøÐÛÝØ ×ÝÐæØ"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
 msgstr ""
-"<p><i>¾ÒÐÐ ßÞàÐÚÐ ÑÕèÕ ÝÐßØèÐÝÐ ÒÞ ßÞØÝÐÚÞÒ character set ÞÔ âÒÞøÞâ. °ÚÞ ÝÕ "
-"Õ ßàØÚÐÖÐÝ ßàÐÒØÛÝÞ, %sclick ÞÒÔÕ</a> ×Ð ÔÐ ÓÞ ÞâÒÞàÕâÕ ÒÞ ÝÞÒ ßàÞ×Þà.</"
-"i></p>\n"
 
-msgid "Action"
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "¸ÜÕ ÝÐ ØÔÕÝâØâÕâÞâ:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "´ÕøáâÒØÕ"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "´ÞÔÐÔØ ÒÞ ÐÔàÕáÐà (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "ÔÞÔÐÔØ Ø×ÒÞà"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "¿àØÚÐçÕÝ Õ äÐøÛ."
 
-msgid "Addressbooks"
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "»ØçÝØ ØÝäÞàÜÐæØØ"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
+#, fuzzy
+msgid "Address Book"
 msgstr "°ÔàÕáÐàØ"
 
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "°ÔàÕáÐàØ"
+
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
 msgid ""
-"All messages in the folder(s) will be lost!\\nAre you completely sure you "
-"wish to continue?\\n"
-msgstr "ÁØâÕ ßÞàÐÚØ ÞÔ ßÐßÚÐâÐ üÕ ÑØÔÐâ Ø×ÓãÑÕÝØ\\n´ÐÛØ áâÕ áØÓãàÝØ ÔÕÚÐ áÐÚÐâÕ ÔÐ ßàÞÔÞÛÖØâÕ?\\n"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "ÁØâÕ"
 
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "ÁØâÕ ßÞàÐÚØ ÞÔ ßÐßÚÐÒÐ üÕ ÑØÔÐâ ßàÕäàÛÕÝØ ÒÞ ÕÔÕÝ MBOX äÐøÛ:"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
-msgstr "ÁØâÕ ßÞàÐÚØ ÞÔ ÒÐèÐâÐ \"%s\" ßÐßÚÐ ßÞáâÐàØ ÞÔ %s ÔÕÝÞÒØ üÕ ÑØÔÐâ æÕÛÞáÝÞ Ø×ÑàØèÐÝØ."
+msgstr ""
+"ÁØâÕ ßÞàÐÚØ ÞÔ ÒÐèÐâÐ \"%s\" ßÐßÚÐ ßÞáâÐàØ ÞÔ %s ÔÕÝÞÒØ üÕ ÑØÔÐâ æÕÛÞáÝÞ "
+"Ø×ÑàØèÐÝØ."
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "ÁØâÕ sent-mail ßÐßÚØ ßÞáâÐàØ ÞÔ %s ÜÕáÕæØ üÕ ÑØÔÐâ Ø×ÑàØèÐÝØ."
 
-#, c-format
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "ÁØâÕ sent-mail ßÐßÚØ ßÞáâÐàØ ÞÔ %s ÜÕáÕæØ üÕ ÑØÔÐâ Ø×ÑàØèÐÝØ."
 
-msgid ""
-"All sessions begin at the Login screen.  Before you can use any of the "
-"webmail features, you must connect to your IMAP account using the username "
-"and password assigned to you by your network administrator."
-msgstr "ÁØâÕ áÕáØØ ×ÐßÞçÝãÒÐÐâ"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ ßàÕØÜÕÝãÒÐÝÐ ÒÞ \"%s\"."
 
-msgid "All"
-msgstr "ÁØâÕ"
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "¿àØÚÐçÕÝ Õ äÐøÛ."
 
-msgid "An illegal value was specified."
-msgstr "²ÝÕáÕÝÐ Õ ÝÕÒÐÛØÔÝÐ ÒàÕÔÝÞáâ."
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "ÁÕ ßÞøÐÒØ ÝÕÔÕäØÝØàÐÝÐ ÓàÕèÚÐ ßàØ ÔÞÔÐÒÐúÕ ÝÞÒÐ ÒàÕÔÝÞáâ."
 
-msgid "Answered messages"
-msgstr "¾ÔÓÞÒÞàÕÝØ ßÞàÐÚØ"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "ÁÕ ßÞøÐÒØ ÝÕÔÕäØÝØàÐÝÐ ÓàÕèÚÐ ßàØ ÔÞÔÐÒÐúÕ ÝÞÒÐ ÒàÕÔÝÞáâ."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "¾ÔÓÞÒÞàÕÝØ"
 
-msgid "Apply All Rules"
-msgstr "¿àØÜÕÝØ ÓØ áØâÕ ßàÐÒØÛÐ"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "¾ÔÓÞÒÞàÕÝØ ßÞàÐÚØ"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "¿àØÜÕÝØ äØÛâàØ"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "¿àØÜÕÝØ äØÛâàØ"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "¿àØÜÕÝØ ßàÐÒØÛÐ ÝÐ äØÛâàØàÐúÕ ßàØ ßàØøÐÒãÒÐúÕ."
 
-msgid "April"
-msgstr "°ßàØÛ"
+#: templates/filters/prefs.inc:42
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
-msgid "Are you SURE you want to continue?"
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Are you sure you want to do this?"
 msgstr "´ÐÛØ áâÕ Á¸³ÃÀ½¸ ÔÕÚÐ áÐÚÐâÕ ÔÐ ßàÞÔÞÛÖØâÕ?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: templates/mailbox/actions.inc:39
+#, fuzzy
+msgid "Are you sure you wish to empty this folder?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "´ÐÛØ áÐÚÐâÕ º¾¼¿»µÂ½¾ ÔÐ ÓØ Ø×ÑàØèÕâÕ ßÞàÐÚØÒÕ?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "²àÕÜÕ ÝÐ ßàØáâØÓÝãÒÐúÕ"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "ÀÐáâÕçÚØ"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "¿àØÚÐçØ"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "¿àØÚÐçØ"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "¿àØÚÐçÕÝ äÐøÛ"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
 
-msgid "August"
-msgstr "°ÒÓãáâ"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "´ÕøáâÒØÕ"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "´ÞáâÐßÝØ ÐÔàÕáÐàØ:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "½Ð×ÐÔ ÔÞ %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "½Ð×ÐÔ ÔÞ %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "½ÕÒØÔÛØÒÐ ÚÞßØøÐ"
 
-msgid ""
-"Begin by entering your user and password in the appropriate fields.  You'll "
-"then need to select the IMAP mail server to which you'd like to connect."
-msgstr "·ÐßÞçÝÕâÕ áÞ ÒÝÕáãÒÐúÕ ÝÐ ÒÐèÕâÞ ÚÞàØáÝØçÚÞ ØÜÕ Ø ÛÞ×ØÝÚÐ ÒÞ áÞÞÔÒÕâÝØâÕ ßÞÛØúÐ."
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
 
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "ÆàÝÐ ÛØáâÐ"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "ÂÕÛÞ"
 
-msgid "Body:"
-msgstr "ÂÕÛÞ:"
-
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "¸ ÔÒÕâÕ"
 
-msgid "Cancel Message"
-msgstr "¾âÚÐÖØ øÐ ßÞàÐÚÐâÐ"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "¾âÚÐÖØ"
 
-msgid ""
-"Cancelling this message will permanently discard its contents.\\nAre you "
-"sure you want to do this?"
-msgstr "ÁÞ ÞâÚÐÖãÒÐúÕ ÝÐ ßÞàÐÚÐÒÐ øÐ ÓãÑØâÕ Ø ÝÕø×ØÝÐâÐ áÞÔàèØÝÐ.\\n´ÐÛØ áâÕ áØÓãàÝØ ÔÕÚÐ ÓÞ áÐÚÐâÕ âÞÐ?"
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "¾âÚÐÖØ øÐ ßÞàÐÚÐâÐ"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Cancelling this message will permanently discard its contents."
+msgstr ""
+"ÁÞ ÞâÚÐÖãÒÐúÕ ÝÐ ßÞàÐÚÐÒÐ øÐ ÓãÑØâÕ Ø ÝÕø×ØÝÐâÐ áÞÔàèØÝÐ.\\n´ÐÛØ áâÕ áØÓãàÝØ "
+"ÔÕÚÐ ÓÞ áÐÚÐâÕ âÞÐ?"
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "ºÞßØøÐ"
 
-msgid "Cc:"
-msgstr "ºÞßØøÐ:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "»ØçÝÞ"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "¿àÞÜÕÝØ"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "¿àÞÜÕÝØ ÓØ áØâÕ"
 
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "¿àÞÜÕÝØ ßÐßÚÐ"
 
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
-msgstr "¿àÞÜÕÝØ ÓØ ÞßæØØâÕ ×Ð ßàØÚÐ× ÝÐ ÑàÞøÞâ ÝÐ ßÞàÐÚØ ßÞ áâàÐÝÐ Ø ßàÐÒØÛÐâÐ ×Ð áÞàâØàÐúÕ."
+msgstr ""
+"¿àÞÜÕÝØ ÓØ ÞßæØØâÕ ×Ð ßàØÚÐ× ÝÐ ÑàÞøÞâ ÝÐ ßÞàÐÚØ ßÞ áâàÐÝÐ Ø ßàÐÒØÛÐâÐ ×Ð "
+"áÞàâØàÐúÕ."
+
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
+msgstr "¿àÞÜÕÝØ ÓØ ØÝäÞàÜÐæØØâÕ ×Ð áÕàÒÕàÞâ Ø ßÐßÚÐâÐ."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
-msgstr "¿àÞÜÕÝØ ÓØ ØÜÕâÞ, ÐÔàÕáÐâÐ Ø ßÞâßØáÞâ èâÞ ÛãóÕâÞ ÓØ ÓÛÕÔÐÐâ ÚÞÓÐ ÓØ çØâÐÐâ Ø ÞÔÓÞÒÐàÐÐâ ÝÐ âÒÞØâÕ ßÞàÐÚØ."
-
-msgid "Change your mail server and folder information."
-msgstr "¿àÞÜÕÝØ ÓØ ØÝäÞàÜÐæØØâÕ ×Ð áÕàÒÕàÞâ Ø ßÐßÚÐâÐ."
+msgstr ""
+"¿àÞÜÕÝØ ÓØ ØÜÕâÞ, ÐÔàÕáÐâÐ Ø ßÞâßØáÞâ èâÞ ÛãóÕâÞ ÓØ ÓÛÕÔÐÐâ ÚÞÓÐ ÓØ çØâÐÐâ Ø "
+"ÞÔÓÞÒÐàÐÐâ ÝÐ âÒÞØâÕ ßÞàÐÚØ."
 
-msgid "Change"
-msgstr "¿àÞÜÕÝØ"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "½Ð×ÝÐçØ ßÐßÚÐ(Ø) ×Ð ÝÞÒÐ ßÞèâÐ"
 
-msgid "Checkbox"
-msgstr "¿ÞÛÕ ×Ð áÕÛÕÚâØàÐúÕ"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÐüÐúÕ ÝÐ ßÞàÐÚÐâÐ"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "¸×ÑÕàØ ÔÕøáâÒØÕ:"
 
-msgid "Choose the addressbook to use when adding addresses."
-msgstr "¸×ÑÕàØ ÐÔàÕáÐà ×Ð ÔÞÔÐÒÐúÕ ÝÞÒØ ÐÔàÕáØ."
+#: config/servers.php.dist:182
+msgid "Choose a mail server:"
+msgstr ""
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
-msgstr "¸×ÑÕàØ ßÞ ÚÞø àÕÔ ÔÐ áÕ ßàÕÑÐàãÒÐÐâ ÐÔàÕáÐàØâÕ ßàØ àÐèØàãÒÐúÕ ÝÐ ÐÔàÕáØâÕ."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
-msgstr "¿àØâØáÝÕâÕ ÝÐ ÕÔÕÝ ÞÔ Ø×ÑàÐÝØâÕ ÐÔàÕáÐàØ Ø ßÞâÞÐ Ø×ÑÕàÕâÕ ÓØ ßÞÛØúÐâÐ ×Ð ßàÕÑÐàãÒÐúÕ."
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "¸×ÑÕàØ ÔÕøáâÒØÕ:"
 
-msgid "Closed Folder"
-msgstr "·ÐâÒÞàÕÝÐ ßÐßÚÐ"
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
+msgstr "¸×ÑÕàØ ÐÔàÕáÐà ×Ð ÔÞÔÐÒÐúÕ ÝÞÒØ ÐÔàÕáØ."
 
-msgid "Collapse All Folders"
-msgstr "ÁÞÑÕàØ ÓØ áØâÕ ßÐßÚØ"
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+"¸×ÑÕàØ ßÞ ÚÞø àÕÔ ÔÐ áÕ ßàÕÑÐàãÒÐÐâ ÐÔàÕáÐàØâÕ ßàØ àÐèØàãÒÐúÕ ÝÐ ÐÔàÕáØâÕ."
 
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"¿àØâØáÝÕâÕ ÝÐ ÕÔÕÝ ÞÔ Ø×ÑàÐÝØâÕ ÐÔàÕáÐàØ Ø ßÞâÞÐ Ø×ÑÕàÕâÕ ÓØ ßÞÛØúÐâÐ ×Ð "
+"ßàÕÑÐàãÒÐúÕ."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "ÁÞáâÐÒØ"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "·ÐâÒÞàÕÝÐ ßÐßÚÐ"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "ÁÞÑÕàØ ÓØ áØâÕ"
+
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "ÁÞÑÕàØ ÓØ áØâÕ"
 
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "ÁÞÑÕàØ ÓØ áØâÕ ßÐßÚØ"
+
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "ÁÞÑÕàØ ßÐßÚÐ"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "ÁÞáâÐÒØ ßÞàÐÚÐ (%s)"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "ÁÞáâÐÒØ"
 
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "ÁÞáâÐÒØ ßÞàÐÚÐ"
 
-msgid "Compose messages in a separate window."
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
 msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
 
-msgid "Compose"
-msgstr "ÁÞáâÐÒØ"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
 
-msgid "Conclusion"
-msgstr "·ÐÚÛãçÞÚ"
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+msgid "Configure mail preview options."
+msgstr ""
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
 
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
-msgstr "ºÞÝâàÞÛÐ ÝÐÔ äàÕÚÒÕÝâÝÞáâ ÝÐ ßàÞÒÕàãÒÐúÕ ÔÐÛØ ØÜÐ ÝÞÒØ ßÞàÐÚØ Ø ÔÐÛØ ÔÐ áÕ ÒàèØ Ø×ÒÕáâãÒÐúÕ ×Ð ÝØÒÝÞâÞ ßàØáâØÓÝãÒÐúÕ."
+msgstr ""
+"ºÞÝâàÞÛÐ ÝÐÔ äàÕÚÒÕÝâÝÞáâ ÝÐ ßàÞÒÕàãÒÐúÕ ÔÐÛØ ØÜÐ ÝÞÒØ ßÞàÐÚØ Ø ÔÐÛØ ÔÐ áÕ "
+"ÒàèØ Ø×ÒÕáâãÒÐúÕ ×Ð ÝØÒÝÞâÞ ßàØáâØÓÝãÒÐúÕ."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "ºÞßØàÐø"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "ÁÞÑÕàØ ßÐßÚÐ"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "ºÞàÕÓØàÐø"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "ºÞàÕÓØàÐÝ âÕÚáâ"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr ""
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØâÕ ÞÔ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ "
+"áÕàÒÕàÞâ"
+
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "¾ßÕàÐæØØ ×Ð ÞÔàÖãÒÐúÕ"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "ºàÕØàÐø"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "ºàÕØàÐø ßÐßÚÐ"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "ºàÕØàÐø"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "ºàÕØàÐø ßÐßÚÐ"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "ºàÕØàÐø ÝÞÒÐ ßÐßÚÐ ×Ð ÞâßÐÔÞæØ"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "ºàÕØàÐø ÝÞÒÐ ßÐßÚÐ ×Ð ÝÕ×ÐÒàèÕÝØ ßÞàÐÚØ"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "ºàÕØàÐø ÝÞÒÐ ßÐßÚÐ ×Ð ßàÐâÕÝØ ßÞàÐÚØ"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "ºàÕØàÐø ÝÞÒÐ ßÐßÚÐ ×Ð ÞâßÐÔÞæØ"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
-msgstr "ºàÕØàÐø ßàÐÒØÛÐ ×Ð äØÛâàØàÐúÕ Ø ÞàÓÐÝØ×ØàÐúÕ ÝÐ ßÞàÐÚØâÕ èâÞ áÕ ßàØÜÐÐâ, áÞàâØàÐúÕ ÝÐ ØáâØâÕ ÒÞ ßÐßÚØ Ø ÑàØèÕúÕ ÝÐ ÝÕßÞÖÕÛÝØâÕ ßÞàÐÚØ."
+msgstr ""
+"ºàÕØàÐø ßàÐÒØÛÐ ×Ð äØÛâàØàÐúÕ Ø ÞàÓÐÝØ×ØàÐúÕ ÝÐ ßÞàÐÚØâÕ èâÞ áÕ ßàØÜÐÐâ, "
+"áÞàâØàÐúÕ ÝÐ ØáâØâÕ ÒÞ ßÐßÚØ Ø ÑàØèÕúÕ ÝÐ ÝÕßÞÖÕÛÝØâÕ ßÞàÐÚØ."
 
-msgid "Create"
-msgstr "ºàÕØàÐø"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "ºàÕØàÐø ÝÞÒÐ ßÐßÚÐ ×Ð ßàÐâÕÝØ ßÞàÐÚØ"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "¸×ÑÕàØ ÚÐÚÞ ÔÐ áÕ ßàÐüÐÐâ ßÞàÐÚØâÕ Ø ÚÐÔÕ üÕ áÕ çãÒÐÐâ ÝÕ×ÐÒàèÕÝØâÕ ßÞàÐÚØ."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
 
-msgid "Customize maintenance operations run upon login to IMP."
-msgstr "¸×ÑÕàØ ÞßÕàÐæØØ ×Ð ÞÔàÖãÒÐúÕ ÚÞØ üÕ áÕ Ø×ÒàèãÒÐÐâ ßàØ ßàØøÐÒãÒÐúÕ."
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
 
-msgid "Customize tasks to run upon logon to IMP."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr ""
+"¸×ÑÕàØ ÚÐÚÞ ÔÐ áÕ ßàÐüÐÐâ ßÞàÐÚØâÕ Ø ÚÐÔÕ üÕ áÕ çãÒÐÐâ ÝÕ×ÐÒàèÕÝØâÕ ßÞàÐÚØ."
+
+#: config/prefs.php.dist:40
+#, fuzzy, php-format
+msgid "Customize tasks to run upon logon to %s."
 msgstr "¸×ÑÕàØ ×ÐÔÐçØ ÚÞØ üÕ áÕ Ø×ÒàèãÒÐÐâ ßàØ ßàØøÐÒãÒÐúÕ."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "´ÐâãÜ"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "´ÐâãÜ"
 
-msgid "December"
-msgstr "´ÕÚÕÜÒàØ"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "¸×ÑàØèÐÝØ"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "¸×ÑàØèØ"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "ÁâÐÝÔÐàÔÕÝ ÚàØâÕàãÜ ×Ð áÞàâØàÐúÕ:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "ÁâÐÝÔÐàÔÕÝ àÕÔÞáÛÕÔ ×Ð áÞàâØàÐúÕ:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "¸×ÑàØèÐÝØ"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "¸×ÑàØèØ"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
 
-msgid "Delete messages"
-msgstr "¸×ÑàØèØ ßÞàÐÚØ"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "¸×ÑàØèØ ÓØ áâÐàØâÕ sent-mail ßÐßÚØ ÝÐ ßÞçÕâÞÚÞâ ÝÐ ÜÕáÕæÞâ"
 
-msgid "Delete"
-msgstr "¸×ÑàØèØ"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "¸×ÑàØèØ ÓØ áâÐàØâÕ sent-mail ßÐßÚØ ÝÐ ßÞçÕâÞÚÞâ ÝÐ ÜÕáÕæÞâ"
 
-msgid "Deleted an attachment."
-msgstr "¸×ÑàØèØ ßàØÚÐçÕÝ äÐøÛ"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "¸×ÑàØèØ ßÞàÐÚØ"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "¸×ÑàØèÐÝØ"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "¸×ÑàØèÐÝØ ßÞàÐÚØ"
 
-msgid "Deleted"
-msgstr "¸×ÑàØèÐÝØ"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "¸×ÑàØèØ ßàØÚÐçÕÝ äÐøÛ"
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "±àØèÕúÕ Ø ßàÕÜÕáâãÒÐúÕ ßÞàÐÚØ"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "¾ßÐóÐçÚØ"
 
-msgid "Display Options"
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+msgid "Description"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
+#, fuzzy
+msgid "Dim signatures?"
+msgstr "¿ÞâßØá:"
+
+#: templates/contacts/contacts.inc:236
+#, fuzzy
+msgid "Display"
 msgstr "¿ÞÔÕáãÒÐúÐ ×Ð ßàØÚÐ×"
 
-msgid "Display message when filters have been applied."
-msgstr "¿àØÚÐÖØ ßÞàÐÚÐ ÚÞÓÐ äØÛâàØâÕ áÕ ßàØÜÕÝÕâØ."
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "¿àØÚÐÖØ Ø×ÒÕáâãÒÐúÕ ×Ð ÝÞÒÐ ßÞàÐÚÐ."
 
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "¿ÞÔÕáãÒÐúÐ ×Ð ßàØÚÐ×"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "½Õ øÐ ßàÞÒÕàãÒÐø ßÐßÚÐâÐ ×Ð ÝÞÒÐ ßÞèâÐ"
 
-#, c-format
-msgid "Do you want to open %s?"
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
+#, fuzzy
+msgid "Do you want to open that folder?"
 msgstr "ÁÐÚÐâÕ ÛØ ÔÐ øÐ ÞâÒÞàØâÕ %s?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "·ÐÒàèØ"
 
-#, c-format
-msgid "Download %s"
-msgstr "¿àÕÒ×ÕÜØ %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "¿àÕÒ×ÕÜØ ßÐßÚÐ(Ø)"
 
-msgid "Download"
-msgstr "¿àÕÒ×ÕÜØ"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "¿àÕÒ×ÕÜØ ßÐßÚÐ(Ø)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "½Õ×ÐÒàèÕÝØ"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "¿ÐßÚÐ ½Õ×ÐÒàèÕÝØ:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "¿ÐßÚÐ ½Õ×ÐÒàèÕÝØ:"
 
-msgid "Edit my filter rules"
-msgstr "ÃàÕÔØ ÓØ ÜÞØâÕ ßàÐÒØÛÐ ×Ð äØÛâàØàÐúÕ"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "¾Ô ÐÔàÕáÐ"
 
-msgid "Edit your identities"
-msgstr "ÃàÕÔØ ÓØ ØÔÕÝâØâÕâØâÕ"
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "ÃàÕÔØ"
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "ÆàÝÐ ÛØáâÐ"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "¿ÞèâÕÝáÚØ äØÛâàØ"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "ÃàÕÔØ ÓØ ØÔÕÝâØâÕâØâÕ"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit your filter rules"
+msgstr "ÃàÕÔØ ÓØ ÜÞØâÕ ßàÐÒØÛÐ ×Ð äØÛâàØàÐúÕ"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "ÃàÕÔØ ÓØ ØÔÕÝâØâÕâØâÕ"
+
+#: templates/contacts/contacts.inc:239
+#, fuzzy
+msgid "Email Address"
+msgstr "¾Ô ÐÔàÕáÐ"
+
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "¿àÕßàÐâÕÝÐ ßÞàÐÚÐ ÞÔ %s"
+
+#: templates/folders/actions.inc:22
+#, fuzzy
+msgid "Empty Folder(s)"
+msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
+
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
+
+#: templates/mailbox/actions.inc:39
+#, fuzzy
+msgid "Empty Trash folder"
+msgstr "¿ÐßÚÐ ¾âßÐÔÞÚ:"
+
+#: lib/IMP.php:973
+msgid "Empty _Spam"
+msgstr ""
+
+#: lib/IMP.php:966
+msgid "Empty _Trash"
+msgstr ""
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "·ÐÒàèØ øÐ ßàÕßàÐâÕÝÐâÐ ßÞàÐÚÐ"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "ÁâÐàØ ßÞàÐÚØ"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "¿àÕßàÐâÕÝÐ ßÞàÐÚÐ ÞÔ %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "²ÝÕáÕâÕ ØÜÕ ×Ð ÝÞÒÐâÐ ßÐßÚÐ ×Ð ÞâßÐÔÞæØ"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "²ÝÕáÕâÕ ØÜÕ ×Ð ÝÞÒÐâÐ ßÐßÚÐ ×Ð ÝÕ×ÐÒàèÕÝØ ßÞàÐÚØ"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "²ÝÕáÕâÕ ØÜÕ ×Ð ÝÞÒÐâÐ ßÐßÚÐ ×Ð ßàÐâÕÝØ ßÞàÐÚØ"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "²ÝÕáÕâÕ ØÜÕ ×Ð ÝÞÒÐâÐ ßÐßÚÐ ×Ð ÞâßÐÔÞæØ"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "¿àÕÝÐáÞçØ ßÞàÐÚÐ:"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "²ÝÕáÞâ \"%s\" Õ ãáßÕèÝÞ ÔÞÔÐÔÕÝ ÒÞ ÐÔàÕáÐàÞâ"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "³àÕèÚÐ"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ Ø×ÑàØèÐÝÐ."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "ÁÕÚÞØ 15 ÜØÝãâØ"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "ÁÕÚÞØ 30 áÕÚãÝÔØ"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "ÁÕÚÞØ 5 ÜØÝãâØ"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "ÁÕÚÞø ßÞÛÐ çÐá"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "ÁÕÚÞøÐ ÜØÝãâÐ"
 
-msgid "Expand All Folders"
-msgstr "ÀÐèØàØ ÓØ áØâÕ ßÐßÚØ"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "ÀÐèØàØ ÓØ áØâÕ"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "ÀÐèØàØ ÓØ áØâÕ"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "ÀÐèØàØ ÓØ áØâÕ ßÐßÚØ"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "ÀÐèØàØ äÞÛÔÕà"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "ÀÐèØàØ ØÜØúÐ"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "ÀÐèØàØ ÓÞ æÕÛÞâÞ ÔàÒÞ ÞÔ ßÐßÚØ ßàØ ßàØÚÐ× ÝÐ ßÐßÚØâÕ."
 
-msgid "February"
-msgstr "ÄÕÒàãÐàØ"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "ÀÐèØàØ ÓØ áØâÕ"
 
-msgid "Field"
-msgstr "¿ÞÛÕ"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "½ÞÒÐ ßÞàÐÚÐ"
 
-msgid "Filename"
-msgstr "¸ÜÕ ÝÐ äÐøÛ"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "½ÞÒÐ ßÞàÐÚÐ"
 
-msgid "Filter Rules"
-msgstr "¿àÐÒØÛÐ ×Ð äØÛâàØàÐúÕ"
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
 
-msgid "Filter message content for profanity."
-msgstr "ÄØÛâàØàÐø øÐ áÞÔàÖØÝÐâÐ ÝÐ ßÞàÐÚÐâÐ áßÞàÕÔ áÞÔàÖØÝÐ."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "¿àØÜÕÝØ ßàÐÒØÛÐ ÝÐ äØÛâàØàÐúÕ ßàØ ßàØøÐÒãÒÐúÕ."
 
-msgid "Filter"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "¿àÕßàÐâÕÝÐ ßÞàÐÚÐ ÞÔ %s"
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "¿àÕßàÐâÕÝÐ ßÞàÐÚÐ ÞÔ %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr ""
+
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "¸ÜÐâÕ %s ÝÞÒØ ßÞàÐÚØ."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "ÄØÛâàØ"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
 msgstr "ÄØÛâÕà"
 
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "´àãÓØ ÞßæØØ"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
+msgstr "¿àÐÒØÛÐ ×Ð äØÛâàØàÐúÕ"
+
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
+msgstr "ÄØÛâàØàÐø øÐ áÞÔàÖØÝÐâÐ ÝÐ ßÞàÐÚÐâÐ áßÞàÕÔ áÞÔàÖØÝÐ."
+
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "ÄØÛâàØ"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
+#, fuzzy
+msgid "Find"
+msgstr "¿ÞÛÕ"
+
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "¿àÒÐ áâàÐÝÐ"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "¿àÒÐ áâàÐÝÐ"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "¿àÕßàÐâØ"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "½ÐÒØÓÐâÞà ×Ð ßÐßÚØ"
 
-msgid "Folder Prefix"
-msgstr "¿àÕäØÚá ÝÐ ßÐßÚÐ"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "ÄÕÒàãÐàØ"
 
-msgid "Folders"
-msgstr "¿ÐßÚØ"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "¿àÕßàÐâØ"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "¿àÕßàÐâØ:"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "·ÐÒàèØ øÐ ßàÕßàÐâÕÝÐâÐ ßÞàÐÚÐ"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "¿àÕßàÐâÕÝÐ ßÞàÐÚÐ ÞÔ %s"
 
-msgid "From Address"
-msgstr "¾Ô ÐÔàÕáÐ"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "¸ÝäÞàÜÐæØøÐ ×Ð áÕàÒÕàÞâ"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
 
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "¾Ô"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "¾Ô"
 
-msgid "From:"
-msgstr "¾Ô:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "¾Ô ÐÔàÕáÐ"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "¿àÕßàÐâØ:"
 
-msgid "Getting Started"
-msgstr "´Ð ×ÐßÞçÝÕÜÕ"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "¿àÕßàÐâØ:"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "·ÐÒàèØ øÐ ßàÕßàÐâÕÝÐâÐ ßÞàÐÚÐ"
 
-msgid "Help"
-msgstr "¿ÞÜÞè"
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "´àãÓØ ÞßæØØ"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "ÁÛÕÔÝÐ ßÞàÐÚÐ"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "´ÞÔÐÔØ ÒÞ ÐÔàÕáÐà (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr ""
+
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "ÁÚàØø ÓØ Ø×ÑàØèÐÝØâÕ"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "ÁÚàØø ÓØ ÝÕßàÕÒ×ÕÜÐÝØâÕ"
 
-msgid "How to prefix quoted lines in a reply:"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+#, fuzzy
+msgid "How do you want to display attachments?"
+msgstr "ÁÐÚÐâÕ ÛØ ÔÐ øÐ ÞâÒÞàØâÕ %s?"
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "¿àÕäØÚá ßàÕÔ æØâØàÐÝØÞâ âÕÚáâ ßàØ ÞÔÓÞÒÞà:"
 
-msgid "IMP is not properly configured"
-msgstr "IMP ÝÕ Õ ßàÐÒØÛÝÞ ÚÞÝäØÓãàØàÐÝ"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
 
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "ÁÐÝÔÐçÕ"
 
-msgid "Identities"
-msgstr "¸ÔÕÝâØâÕâØâÕ"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity's name:"
-msgstr "¸ÜÕ ÝÐ ØÔÕÝâØâÕâÞâ:"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
 
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "¸ÓÝÞàØàÐø"
+
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "¸ÓÝÞàØàÐø áÕ"
 
-msgid "Ignore"
-msgstr "¸ÓÝÞàØàÐø"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Important messages"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "²ÐÖÝØ"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "²ÐÖÝØ"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "²ÐÖÝØ"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
 msgstr "²ÐÖÝØ ßÞàÐÚØ"
 
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "²ÐÖÝØ"
 
-#, c-format
-msgid "Introduction to %s"
-msgstr "²ÞÒÕÔ ÒÞ %s"
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "²ÐÖÝØ ßÞàÐÚØ"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "¿àÕßàÐâÕÝÐ ßÞàÐÚÐ ÞÔ %s"
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
 
-msgid "Introduction"
-msgstr "²ÞÒÕÔ"
+#: config/prefs.php.dist:492
+msgid "Include a brief summary of the header in a reply?"
+msgstr ""
 
-msgid "January"
-msgstr "¨ÐÝãÐàØ"
+#: config/prefs.php.dist:487
+msgid "Include original message in a reply?"
+msgstr ""
 
-msgid "July"
-msgstr "¨ãÛØ"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "¸ÓÝÞàØàÐø"
 
-msgid "June"
-msgstr "¨ãÝØ"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
 
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "ÝØÕÔÝÐ"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+msgid "Invalid Address"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "¨Ð×ØÚ"
 
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "¿ÞáÛÕÔÝÐ áâàÐÝÐ"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "¿ÞáÛÕÔÝÐ áâàÐÝÐ"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "¿ÞáÛÕÔÝÞ ßàØøÐÒãÒÐúÕ: %s"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
 
-msgid "Last login: Never"
-msgstr "¿ÞáÛÕÔÝÞ ßàØøÐÒãÒÐúÕ: ÝØÚÞÓÐè"
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
 
-#, c-format
-msgid "Log in to %s"
-msgstr "¿àØøÐÒØ áÕ ÒÞ %s"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "¿ÞèâÕÝáÚÞ áÐÝÔÐçÕ"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "´ÕøáâÒØÕ"
+
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "¿àØøÐÒãÒÐúÕ"
 
-msgid "Logging In"
+#: lib/Block/summary.php:115
+#, php-format
+msgid "Log in to %s"
+msgstr "¿àØøÐÒØ áÕ ÒÞ %s"
+
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "¿àØøÐÒãÒÐúÕ"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "·ÐÔÐçØ ßàØ ßàØøÐÒãÒÐúÕ"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr "¿àØøÐÒãÒÐúÕâÞ ÝÕ ÑÕèÕ ãáßÕèÝÞ, ÝÐøÒÕàÞøÐâÝÞ ßÞàÐÔØ ÝÕßàÐÒØÛÝÞ ÒÝÕáãÒÐúÕ ÝÐ ÚÞàØáÝØçÚÞâÞ ØÜÕ ØÛØ ÛÞ×ØÝÚÐâÐ."
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr ""
 
-msgid "Logout"
-msgstr "¾ÔøÐÒÐ"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "¿ÞèâÕÝáÚØ äØÛâàØ"
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "¿ÞèâÕÝáÚÞ áÐÝÔÐçÕ"
 
-msgid "Mail Filters"
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
 msgstr "¿ÞèâÕÝáÚØ äØÛâàØ"
 
-msgid "Mail Management"
-msgstr "¿ÞèâÕÝáÚØ ÜÕÝÐÿÜÕÝâ"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
+#: folders.php:402
 msgid "Mailbox"
 msgstr "¿ÞèâÕÝáÚÞ áÐÝÔÐçÕ"
 
-msgid "Maintenance Operations"
-msgstr "¾ßÕàÐæØØ ×Ð ÞÔàÖãÒÐúÕ"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "¿ÞÔÕáãÒÐúÐ ×Ð ßàØÚÐ×"
 
-msgid "March"
-msgstr "¼Ðàâ"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
 
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "¼ÐàÚØàÐø ÚÐÚÞ:"
 
-msgid "May"
-msgstr "¼Ðø"
+#: config/prefs.php.dist:650
+msgid "Mark different levels of quoting with different colors?"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
 
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "¿àØÚÐçÕÝ äÐøÛ"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "¸ÝäÞàÜÐæØøÐ ×Ð áÕàÒÕàÞâ"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+#, fuzzy
+msgid "Meeting Update"
+msgstr "´Ð ×ÐßÞçÝÕÜÕ"
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "¾âÒÞàØ ßÐßÚÐ"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "¿ÞàÐÚÐ"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "ÁÞáâÐÒãÒÐúÕ ßÞàÐÚÐ"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "´ÐâãÜ ÝÐ ßÞàÐÚÐ"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "¿ÞàÐÚØ ÔÞ"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "±ÐàÐø ßÞàÐÚÐ"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "³ÞÛÕÜØÝÐ ÝÐ ßÞàÐÚÐ"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "¸×ÒÞà ÝÐ ßÞàÐÚÐ"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "¿àÕÓÛÕÔãÒÐúÕ ßÞàÐÚØ"
 
-msgid "Message fields"
-msgstr "¿ÞÛØúÐ ÝÐ ßÞàÐÚÐ"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "°âàØÑãâØ ÝÐ ßÞàÐÚÐ"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "¿ÐßÚØ ×Ð ßÞàÐÚØ"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "¿ÐßÚØ ×Ð ßÞàÐÚØ"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "¸×ÑàØèØ ßàØÚÐçÕÝ äÐøÛ"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "¿ÞÛØúÐ ÝÐ ßÞàÐÚÐ"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "¿ÞÛØúÐ ÝÐ ßÞàÐÚÐ"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "´ÐâãÜ ÝÐ ßÞàÐÚÐ"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
 msgstr "¿ÞàÐÚÐâÐ Õ ãáßÕèÝÞ ßàÐâÕÝÐ, ÝÞ ÝÕ Õ ×ÐçãÒÐÝÐ ÒÞ"
 
-msgid "Message"
-msgstr "¿ÞàÐÚÐ"
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "¿ÞàÐÚÐâÐ Õ ãáßÕèÝÞ ßàÐâÕÝÐ, ÝÞ ÝÕ Õ ×ÐçãÒÐÝÐ ÒÞ"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "¿ÞàÐÚÐâÐ Õ ãáßÕèÝÞ ßàÐâÕÝÐ, ÝÞ ÝÕ Õ ×ÐçãÒÐÝÐ ÒÞ"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "±àÞø ÝÐ ßÞàÐÚØ ßÞ áâàÐÝÐ ßàØ ßàØÚÐ× ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ"
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "¿ÞàÐÚØ ÔÞ"
 
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "¼ÞÔØäØæØàÐø"
 
-msgid "Move Down"
-msgstr "¾ÔØ ÔÞÛÕ"
-
-msgid "Move Up"
-msgstr "¾ÔØ ÓÞàÕ"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "¿àÕÜÕáâØ ÓØ ßÞàÐÚØâÕ ÒÞ <b>%s</b> ßÐßÚÐâÐ"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "¿àÕÜÕáâØ"
 
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "ÞÔØ ÔÞÛÕ"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "Ø×ÑÕàØ ßÐßÚÐ"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "ßàÕÜÕáâØ ÓÞàÕ"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "¿àÕÓÛÕÔãÒÐúÕ ßÞàÐÚØ"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
+msgid "Name"
+msgstr ""
+
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "´ÕøáâÒØÕ"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "½ØÚÞÓÐè"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "¸×ÑàØèØ ßàØÚÐçÕÝ äÐøÛ"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "½ÞÒ"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "¾âÒÞàØ ßÐßÚÐ"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "½ÞÒÐ ßÞàÐÚÐ"
 
-msgid "New User Introduction"
-msgstr "²ÞÒÕÔ ×Ð ÝÞÒØ ÚÞàØáÝØæØ"
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "ÁÛÕÔÝÐ ßÞàÐÚÐ"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "½ÞÒØ ßÞàÐÚØ"
 
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "½ÞÒØ ßÞàÐÚØ"
 
-msgid "New"
-msgstr "½ÞÒ"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "ÁÛÕÔÝÞ"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "ÁÛÕÔÝÐ ßÞàÐÚÐ"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "ÁÛÕÔÝÐ áâàÐÝÐ"
 
-msgid "Next"
-msgstr "ÁÛÕÔÝÞ"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "½Õ"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "½ÞÒØ ßÞàÐÚØ"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
 
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "ºÞàÕÓØàÐÝ âÕÚáâ"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "ÝÕ Õ Ø×ÑàÐÝÐ ßÐßÚÐ"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "½Õ áÕ ÝÐÒÕÔÕÝØ ßÐßÚØ"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "½Õ Ø×ÑàØèÐÝØ ßÞàÐÚØ"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "½Õ Ø×ÑàØèÐÝØ ßÞàÐÚØ"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "ßàÕÜÕáâØ ßÞàÐÚÐ ÒÞ"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "½Õ Õ ßàÞÝÐøÔÕÝÐ ÝØâã ÕÔÝÐ ßÞàÐÚÐ"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "½ÕÜÐ ßàÐÒÞßØáÝØ ÓàÕèÚØ"
 
-msgid "No subject"
-msgstr "±Õ× âÕÜÐ"
+#: templates/compose/spelling.inc:100
+#, fuzzy
+msgid "No suggestions"
+msgstr "¿àÕÔÛÞ×Ø"
 
-msgid "No"
-msgstr "½Õ"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "½Õ áÕ ÝÐÒÕÔÕÝØ ßÐßÚØ"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "½ØÕÔÝÐ"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "½Õ Ø×ÑàØèÐÝØ"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "½Õ ÝÕ×ÐÒàèÕÝØ (Draft)"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "½ÕÒÐÖÝØ"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "½Õ ÛØçÝØ"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "½Õ Ø×ÑàØèÐÝØ ßÞàÐÚØ"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "½ÕÒÐÖÝØ ßÞàÐÚØ"
 
-msgid "November"
-msgstr "½ÞÕÜÒàØ"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "ÆØâÐâ"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "±àÞø ÝÐ áâÐàØ sent-mail ßÐßÚØ ÔÐ áÕ çãÒÐÐâ, ÐÚÞ áÕ ÑàØèÕ ÕÔÝÐè ÜÕáÕçÝÞ"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "±àÞø ÝÐ áâÐàØ sent-mail ßÐßÚØ ÔÐ áÕ çãÒÐÐâ, ÐÚÞ áÕ ÑàØèÕ ÕÔÝÐè ÜÕáÕçÝÞ"
 
-msgid "October"
-msgstr "¾ÚâÞÜÒàØ"
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr ""
 
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "ÁâÐàØ ßÞàÐÚØ"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "ÁâÐàØâÕ sent-mail ßÐßÚØ áÕ ØáçØáâÕÝØ."
 
-msgid ""
-"Once you've filled in these three fields, click the \"Login\" button to "
-"proceed."
-msgstr "¿Þ ßÞßÞÛÝãÒÐúÕ ÝÐ ÞÒØÕ âàØ ßÞÛØúÐ, ßàØâØáÝØ ÝÐ ÚÞßçÕâÞ \"¿àØøÐÒãÒÐúÕ\" ×Ð ÔÐ ÒÛÕ×ÕâÕ ÒÞ áØáâÕÜÞâ."
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "¸×ÑÕàØ áÐÜÞ ÕÔÝÐ ßÐßÚÐ ×Ð ÞÒÐÐ ÞßÕàÐæØøÐ."
 
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "¾âÒÞàØ ßÐßÚÐ"
 
-msgid "Options"
-msgstr "¾ßæØØ"
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "¾âÒÞàØ ßÐßÚÐ"
 
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "´àãÓØ ÞßæØØ"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "´àãÓØ ÞßæØØ"
 
-#, c-format
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "¾âÚÐÖØ øÐ ßÞàÐÚÐâÐ"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "³àÕèÚÐ"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "¾ßæØØ"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ ÚàÕØàÐÝÐ."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ Ø×ÑàØèÐÝÐ."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "¸áßàÐâØ ßÞàÐÚÐ"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "¿ÞâßØáÞâ Õ ãáßÕèÝÞ ×ÐÜÕÝÕâ."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
+
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "ÁâàÐÝÐ %d ÞÔ %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "´ÕÛ(ÞÒØ)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "¿ÞàÐÚÐâÐ Õ ãáßÕèÝÞ ßàÐâÕÝÐ, ÝÞ ÝÕ Õ ×ÐçãÒÐÝÐ ÒÞ"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "»Þ×ØÝÚÐ"
 
-msgid "Path to your mail folders:"
-msgstr "¿ÐâÕÚÐ ÔÞ ÒÐèØâÕ ßÞèâÕÝáÚØ ßÐßÚØ:"
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
+msgstr "¸×ÑÕàØ ÞßÕàÐæØØ ×Ð ÞÔàÖãÒÐúÕ ÚÞØ üÕ áÕ Ø×ÒàèãÒÐÐâ ßàØ ßàØøÐÒãÒÐúÕ."
 
-msgid "Personal Information"
-msgstr "»ØçÝØ ØÝäÞàÜÐæØØ"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
 
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "»ØçÝÞ"
 
-msgid "Place your signature before replies and forwards?"
-msgstr "²ÜÕâÝØ ßÞâßØá ßàÕÔ âÕÚáâÞâ ÝÐ ÚÞø áÕ ÞÔÓÞÒÐàÐ ØÛØ ßàÕßàÐüÐ?"
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "»ØçÝØ ØÝäÞàÜÐæØØ"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
+msgid "Place your signature before replies and forwards?"
+msgstr "²ÜÕâÝØ ßÞâßØá ßàÕÔ âÕÚáâÞâ ÝÐ ÚÞø áÕ ÞÔÓÞÒÐàÐ ØÛØ ßàÕßàÐüÐ?"
+
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "\\n²ÝÕáÕâÕ ØÜÕ ÝÐ ÝÞÒÐâÐ ßÐßÚÐ:\\n"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
+#, fuzzy
+msgid "Please enter the name of the new folder:"
+msgstr "\\n²ÝÕáÕâÕ ØÜÕ ÝÐ ÝÞÒÐâÐ ßÐßÚÐ:\\n"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "²ÝÕáÕâÕ ÓÞ ÝÞÒÞâÞ ØÜÕ:"
 
-msgid "Please enter valid search criteria."
-msgstr "²ÝÕáÕâÕ ÒÐÛØÔÕÝ ÚàØâÕàØãÜ ×Ð ßàÕÑÐàãÒÐúÕ."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "²Õ ÜÞÛØÜÕ ÝÐÒÕÔÕâÕ ÒÐèÕ ÚÞàØáÝØçÚÞ ØÜÕ Ø ÛÞ×ØÝÚÐ"
 
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "²Õ ÜÞÛØÜÕ ÝÐÒÕÔÕâÕ ÒÐèÕ ÚÞàØáÝØçÚÞ ØÜÕ Ø ÛÞ×ØÝÚÐ"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "ÀÐ×àÕèØ ÔÒÞáÜØáÛÕÝØ ØÛØ ÝÕÒÐÛØÔÝØ ÐÔàÕáØ."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "¸×ÑÕàØ ßÐßÚÐ ßàÕÔ Ø×ÒàèãÒÐúÕ ÝÐ ÑØÛÞ ÚÞøÐ ÐÚæØøÐ."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "¸×ÑÕàØ ÑÐàÕÜ ÕÔÝÐ ßÐßÚÐ ×Ð ßàÕÑÐàãÒÐúÕ."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "¸×ÑÕàØ ÑÐàÕÜ ÕÔÝÐ ßÐßÚÐ ×Ð ßàÕÑÐàãÒÐúÕ."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "¸×ÑÕàØ áÐÜÞ ÕÔÝÐ ßÐßÚÐ ×Ð ÞÒÐÐ ÞßÕàÐæØøÐ."
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "¸×ÑÕàØ ØÛØ ãàÕÔØ áÛÕÔÝÞ:"
 
-msgid "Preceed your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "¾ÔÔÕÛØ ÓÞ ßÞâßØáÞâ áÞ æàâØ ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ ÚàÕØàÐÝÐ."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "¿àÕâåÞÔÝÐ áâàÐÝÐ"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "¿àÕâåÞÔÝÐ ßÞàÐÚÐ"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "¿àÕâåÞÔÝÐ áâàÐÝÐ"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "¿ÕçÐâØ"
 
-msgid "Problem?"
-msgstr "¿àÞÑÛÕÜ?"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "¿ÕçÐâØ"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "¾áâàÐÝØ Ø×ÑàØèÐÝØ"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "¾áâàÐÝØ Ø×ÑàØèÐÝØ"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "¸×ÑàØèØ ßÐßÚÐ(Ø)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "ºÞÛÚã çÕáâÞ ÔÐ ÓØ ÞâáâàÐÝãÒÐÜ Ø×ÑàØèÐÝØâÕ ÞÔ ßÐßÚÐâÐ ×Ð ÞâßÐÔÞæØ:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "ÔÕÝÐ áâÐàØâÕ ßÞàÐÚØ ÞâáâàÐÝØ ÓØ ÞÔ ßÐßÚÐâÐ ×Ð ÞâßÐÔÞæØ"
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Purge old message in the Trash folder"
 
-msgid "Purging "
-msgstr "¾âáâàÐÝãÒÐúÕ"
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr " ßÞàÐÚÐ(Ø) ÞÔ ßÐßÚÐâÐ ×Ð ÞâßÐÔÞæØ."
 
-msgid " message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr " ßÞàÐÚÐ(Ø) ÞÔ ßÐßÚÐâÐ ×Ð ÞâßÐÔÞæØ."
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "ÆØâÐâ"
 
-msgid "Received after:"
-msgstr "¿àØÜÕÝØ ßÞáÛÕ:"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "¿àØÜÕÝØ ÝÐ:"
 
-msgid "Received before:"
-msgstr "¿àØÜÕÝØ ßàÕÔ:"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "¿àØÜÕÝØ ÝÐ:"
 
-msgid "Received on:"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "¿àØÜÕÝØ ÝÐ:"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "¿àÕÝÐáÞçØ"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "¿àÕÝÐáÞçØ"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "¿àÕÝÐáÞçØ ßÞàÐÚÐ:"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "¿àÕÝÐáÞçØ øÐ ßÞàÐÚÐÒÐ:"
 
-msgid "Redirect"
-msgstr "¿àÕÝÐáÞçØ"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "½Õ ãáßÕèÝÞ ßàÕÝÐáÞçãÒÐúÕ."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "¾áÒÕÖØ"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "¾áÒÕÖØ ßàØÚÐ× ÝÐ ßÐßÚØ:"
 
-msgid "Refresh"
-msgstr "¾áÒÕÖØ"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "¾áÒÕÖØ ßàØÚÐ×"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "¾áÒÕÖØ ßàØÚÐ×"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "·ÐßÐÜÕâØ ßÞáÛÕÔÕÝ ßàØÚÐ×"
 
-msgid "Remove Selected"
-msgstr "¾ÔáâàÐÝØ áÕÛÕÚâØàÐÝØ"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "¿ÞèâÕÝáÚÞ áÐÝÔÐçÕ"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "ÞÔáâàÐÝØ Ø×ÒÞà"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "¿àÕØÜÕÝãÒÐø ßÐßÚÐ"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "¿àÕØÜÕÝãÒÐø øÐ ßÐßÚÐâÐ ¿àÐâÕÝØ ÝÐ ßÞçÕâÞÚÞâ ÞÔ ÜÕáÕæÞâ"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "¿àÕØÜÕÝãÒÐúÕâÞ ÝÐ \"%s\" ÒÞ \"%s\" ÝÕ ãáßÕÐ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "¾ÔÓÞÒÞàØ ÝÐ áØâÕ"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "·ÐÜÕÝØ áÞ:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "¾ÔÓÞÒÞàØ"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "¾ÔÓÞÒÞàØ ÝÐ"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "¾ÔÓÞÒÞàØ ÝÐ áØâÕ"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "¾ÔÓÞÒÞàØ ÝÐ áØâÕ:"
 
-msgid "Reply"
-msgstr "¾ÔÓÞÒÞàØ"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "¾ÔÓÞÒÞàØ ÝÐ áØâÕ"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "¾ÔÓÞÒÞàØ ÝÐ áØâÕ:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "¾ÔÓÞÒÞàØ ÝÐ áØâÕ"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "¾ÔÓÞÒÞàØ ÝÐ: "
 
-msgid "Reply-to"
-msgstr "¾ÔÓÞÒÞàØ ÝÐ"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "¾ÔÓÞÒÞàØ ÝÐ: "
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "¾ÔÓÞÒÞàØ:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "´ÕäØÝØàÐø ÚÐÚÞ ½ÕßÞÖÕÛÝÐ ßÞàÐÚÐ"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "´ÕäØÝØàÐø ÚÐÚÞ ½ÕßÞÖÕÛÝÐ ßÞàÐÚÐ"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "¿ÞÑÐàÐø ßÞâÒàÔÐ ×Ð ßàØÜÕÝÐ ßÞàÐÚÐ"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "¿ÞÑÐàÐø ßÞâÒàÔÐ ×Ð ßàØÜÕÝÐ ßÞàÐÚÐ"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "¾ÔÝÞÒÞ"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "¿àÞÔÞÛÖØ"
 
-msgid "Return to Welcome Screen"
-msgstr "²àÐâÕâÕ áÕ ÝÐ áâàÐÝÐâÐ ´ÞÑàÕÔÞøÔÕ"
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "ÁÞáâÐÒãÒÐúÕ ßÞàÐÚÐ"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "´àãÓØ ÞßæØØ"
+
+#: config/prefs.php.dist:718
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr ""
+"²àÐâØ áÕ ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ ßÞ ÑàØèÕúÕ, ßàÕÜÕáâãÒÐúÕ ØÛØ ÚÞßØàÐúÕ ßÞàÐÚØ?"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "¾ßæØØ"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ Ø×ÑàØèÐÝÐ."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "¸áßàÐâØ ßÞàÐÚÐ"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "ÂÕÜÐ"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "·ÐçãÒÐø ÚÞßØøÐ ÒÞ "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "·ÐçãÒÐø ÚÐÚÞ"
 
-msgid "Return to the mailbox listing after deleting, moving, or copying a message?"
-msgstr "²àÐâØ áÕ ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ ßÞ ÑàØèÕúÕ, ßàÕÜÕáâãÒÐúÕ ØÛØ ÚÞßØàÐúÕ ßÞàÐÚØ?"
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "·ÐçãÒÐø ÚÐÚÞ"
 
-msgid "Rule Definition"
-msgstr "´ÕäØÝØæØøÐ ÝÐ ßàÐÒØÛÞ"
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "·ÐçãÒÐø ÝÕ×ÐÒàèÕÝÐ"
 
-msgid "Save a copy in "
-msgstr "·ÐçãÒÐø ÚÞßØøÐ ÒÞ "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "·ÐçãÒÐø ÚÐÚÞ"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "¾ßæØØ"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "·ÐçãÒÐø ÝÕ×ÐÒàèÕÝÐ"
 
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "·ÐçãÒÐø ÚÐÚÞ"
 
-msgid "Save as..."
-msgstr "·ÐçãÒÐø.ÚÐÚÞ..."
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "·ÐçãÒÐø ßàÐâÕÝÐ ßÞàÐÚÐ"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "½ÕãáßÕèÝÞ ×ÐçãÒãÒÐúÕ ÒÞ ßÐßÚÐâÐ ½Õ×ÐÒàèÕÝØ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ: %s"
 
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
+msgid "Search"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "´àãÓØ ÞßæØØ"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "ÀÕ×ãÛâÐâØ ÞÔ ßàÕÑÐàãÒÐúÕâÞ"
 
-msgid "Search"
-msgstr "¿àÕÑÐàãÒÐø"
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
+msgid "Seen"
+msgstr "¿àÞçØâÐÝØ"
+
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "¸×ÑÕàØ"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "¸×ÑÕàØ ÝØÕÔÝÞ"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "¸×ÑÕàØ ØÔÕÝâØâÕâ"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "¸×ÑÕàØ ÓØ áØâÕ"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "¸×ÑÕàØ ÝØÕÔÝÞ"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
+msgstr "¸×ÑÕàØ Ø×ÒÞà ×Ð ÑÐàÐúÕ Ø ÔÞÔÐÒÐúÕ ÐÔàÕáØ ÒÞ ÐÔàÕáÐàÞâ."
+
+#: templates/search/main.inc:88
+msgid "Select all"
+msgstr "¸×ÑÕàØ ÓØ áØâÕ"
+
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"¸×ÑÕàØ ßÞ ÚÞø àÕÔ ÔÐ áÕ ßàÕÑÐàãÒÐÐâ ÐÔàÕáÐàØâÕ ßàØ àÐèØàãÒÐúÕ ÝÐ ÐÔàÕáØâÕ."
+
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "¸×ÑÕàØ ÝØÕÔÝÞ"
+
+#: templates/search/main.inc:89
+msgid "Select none"
+msgstr "¸×ÑÕàØ ÝØÕÔÝÞ"
+
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
+msgstr "¸×ÑàÐÝØ ÐÔàÕáÐàØ:"
+
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "¸ÝäÞàÜÐæØøÐ ×Ð áÕàÒÕàÞâ"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+msgid "Send Message"
+msgstr "¸áßàÐâØ ßÞàÐÚÐ"
+
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "¿ÐßÚÐ ¿àÐâÕÝØ:"
+
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "¿ÐßÚÐ ¿àÐâÕÝØ:"
+
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "ÁÕàÒÕà"
+
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
+msgstr "¸ÝäÞàÜÐæØøÐ ×Ð áÕàÒÕàÞâ"
+
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
+msgstr "ÁÕàÒÕà"
+
+#: config/prefs.php.dist:80
+msgid "Set preferences for what happens when you move and delete messages."
+msgstr ""
+"¸×ÑÕàÕâÕ ßÞÔÕáãÒÐúÐ ×Ð ÞÝÐ èâÞ áÕ áÛãçãÒÐ ßàØ ßàÕÜÕáâãÒÐúÕ Ø ÑàØèÕúÕ ßÞàÐÚØ."
+
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "¿àÞÜÕÝØ ßÐßÚÐ"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "¿ÐßÚÐ ¿àÐâÕÝØ:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
 
-msgid "Seen"
-msgstr "¿àÞçØâÐÝØ"
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Select addressbook sources for adding and searching for addresses."
-msgstr "¸×ÑÕàØ Ø×ÒÞà ×Ð ÑÐàÐúÕ Ø ÔÞÔÐÒÐúÕ ÐÔàÕáØ ÒÞ ÐÔàÕáÐàÞâ."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
 
-msgid "Select all"
-msgstr "¸×ÑÕàØ ÓØ áØâÕ"
+#: config/prefs.php.dist:513
+msgid "Should the compose window be closed after saving a draft?"
+msgstr ""
+"´ÐÛØ ÔÐ ÓÞ ×ÐâÒÞàÐÜ ßàÞ×ÞàÞâ ÁÞáâÐÒØ ßÞ ×ÐçãÒãÒÐúÕ ÝÐ ßÞàÐÚÐâÐ ÒÞ ½Õ×ÐÒàèÕÝØ?"
 
-msgid "Select an identity"
-msgstr "¸×ÑÕàØ ØÔÕÝâØâÕâ"
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
 
-msgid "Select charset:"
-msgstr "¸×ÑÕàØ charset:"
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "ÁÞÑÕàØ ÓØ áØâÕ ßÐßÚØ"
 
-msgid "Select none"
-msgstr "¸×ÑÕàØ ÝØÕÔÝÞ"
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
 
-msgid "Select your preferred language:"
-msgstr "¾ÔÑÕàØ ÓÞ áÒÞøÞâ ÜÐâØçÕÝ øÐ×ØÚ:"
+#: mailbox.php:365
+msgid "Show Deleted"
+msgstr "¿àØÚÐÖØ Ø×ÑàØèÐÝØ"
 
-msgid "Select"
-msgstr "¸×ÑÕàØ"
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
 
-msgid "Selected Addressbooks:"
-msgstr "¸×ÑàÐÝØ ÐÔàÕáÐàØ:"
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "»ØçÝØ ØÝäÞàÜÐæØØ"
 
-msgid "Send Message"
-msgstr "¸áßàÐâØ ßÞàÐÚÐ"
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "¿àÕÒ×ÕÜØ ßÐßÚÐ(Ø)"
 
-msgid "Sent mail folder:"
-msgstr "¿ÐßÚÐ ¿àÐâÕÝØ:"
+#: folders.php:298
+msgid "Show Unsubscribed"
+msgstr "¿àØÚÐÖØ ÝÕßàÕÒ×ÕÜÐÝØ"
 
-msgid "September"
-msgstr "ÁÕßâÕÜÒàØ"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-msgid "Server Information"
-msgstr "¸ÝäÞàÜÐæØøÐ ×Ð áÕàÒÕàÞâ"
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
+msgstr "±àÞø ÝÐ ßÞàÐÚØ ßÞ áâàÐÝÐ ßàØ ßàØÚÐ× ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ"
 
-msgid "Server"
-msgstr "ÁÕàÒÕà"
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "¸×ÑÕàÕâÕ ßÞÔÕáãÒÐúÐ ×Ð äØÛâàØàÐúÕ ßÞàÐÚØ áÞ ÝÕáÐÚÐÝÐ áÞÔàÖØÝÐ."
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
 
-msgid "Set preferences for what happens when you move and delete messages."
-msgstr "¸×ÑÕàÕâÕ ßÞÔÕáãÒÐúÐ ×Ð ÞÝÐ èâÞ áÕ áÛãçãÒÐ ßàØ ßàÕÜÕáâãÒÐúÕ Ø ÑàØèÕúÕ ßÞàÐÚØ."
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
 
-msgid "Set the current time zone."
-msgstr "¸×ÑÕàØ âÕÚÞÒÝÐ ÒàÕÜÕÝáÚÐ ×ÞÝÐ"
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "½ÐÒÕÔØ øÐ×ØÚ ×Ð ÜÕÝØøÐâÐ, ÞÑøÐáÝãÒÐúÐâÐ Ø ßÞÜÞèâÐ."
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
 
-msgid "Should the compose window be closed after saving a draft?"
-msgstr "´ÐÛØ ÔÐ ÓÞ ×ÐâÒÞàÐÜ ßàÞ×ÞàÞâ ÁÞáâÐÒØ ßÞ ×ÐçãÒãÒÐúÕ ÝÐ ßÞàÐÚÐâÐ ÒÞ ½Õ×ÐÒàèÕÝØ?"
+#: lib/Block/summary.php:28
+#, fuzzy
+msgid "Show total number of mails in folder?"
+msgstr "¿ÐâÕÚÐ ÔÞ ÒÐèØâÕ ßÞèâÕÝáÚØ ßÐßÚØ:"
 
-msgid "Show Deleted"
-msgstr "¿àØÚÐÖØ Ø×ÑàØèÐÝØ"
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
 
-msgid "Show Unsubscribed"
-msgstr "¿àØÚÐÖØ ÝÕßàÕÒ×ÕÜÐÝØ"
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "³ÞÛÕÜØÝÐ"
 
-msgid "Show last login time when logging in"
-msgstr "¿àØÚÐÖØ ÚÞÓÐ ßÞáÛÕÔÕÝ ßÐâ áâÕ áÕ ßàØøÐÒØÛÕ ßàØ ßàØøÐÒãÒÐúÕ"
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "³ÞÛÕÜØÝÐ"
 
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "³ÞÛÕÜØÝÐ"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "½ÕÚÞØ ÞÔ ÚÞÝäØÓãàÐæØÞÝØâÕ äÐøÛÞÒØ ÝÐ IMPÝÕÔÞáâÐáãÒÐÐâ:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "¾Ô ÐÔàÕáÐ"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "³ÞÛÕÜØÝÐ ÝÐ ßÞàÐÚÐ"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr " ½ÐáÛÞÒ: "
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr ""
 
-msgid "Sort Direction"
-msgstr "ÁÞàâØàÐçÚØ àÕÔÞáÛÕÔ"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "¾Ô ÐÔàÕáÐ"
 
-msgid "Spam Report from"
-msgstr "¸×ÒÕáâãÒÐúÕ ×Ð ÝÕßÞÖÕÛÝØ ßÞàÐÚØ ÞÔ"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "¿ÐßÚÐ ¾âßÐÔÞÚ:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "ÁßÕæØøÐÛÝØ ×ÝÐæØ"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "¿àÞÒÕàÚÐ ÝÐ ßàÐÒÞßØá"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "¿àÞÒÕàãÒÐç ÝÐ ßàÐÒÞßØá"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "·ÐÒàèØ ßàÞÒÕàÚÐâÐ ÝÐ ßàÐÒÞßØá"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "¿àÐÒÞßØáÝØ ÓàÕèÚØ ßÞ ßàÞ×Þà ßàØ ßàÞÒÕàÚÐ ÝÐ ßàÐÒÞßØáÞâ."
 
-msgid "Subject Field"
-msgstr "ÂÕÜÐ ÝÐ ßÞàÐÚÐ"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "¿àØÚÐçÕÝ äÐøÛ"
 
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "ÂÕÜÐ"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "ÂÕÜÐ"
 
-msgid "Subject:"
-msgstr "ÂÕÜÐ:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "ÂÕÜÐ ÝÐ ßÞàÐÚÐ"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "ÂÕÜÐ"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "¿àÕÒ×ÕÜØ ßÐßÚÐ(Ø)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "ÃáßÕèÝÞ"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "¿àÕÔÛÞ×Ø"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "ÂÕÚáâ"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "ÂÕÚáâ"
 
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ Ø×ÑàØèÐÝ."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ ×ÐçãÒÐÝ."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
 msgid ""
-"The Compose Window allows you to set, among other things, the message "
-"recipient's address (who you're sending mail to), the message subject, and "
-"the message contents.  Simply fill out the appropriate fields at the top of "
-"the window (only the To: address is required, but the Subject: is suggested) "
-"and type your message in the large lower field.  Once you've completed "
-"entering your message, you may choose to Spell Check your message text.  "
-"Once you're done composing your new message, click the \"Send\" button to "
-"send the message to the recipient."
-msgstr "ÁÞáâÐÒØ ßàÞ×ÞàÕæÞâ ÞÒÞ×ÜÞÖãÒÐ ÔÐ ÝÐÒÕÔÕâÕ ßàØÜÐç (ÐÔàÕáÐ ÚÞÜã øÐ ßàÐüÐâÕ ßÞàÐÚÐâÐ), âÕÜÐ ÝÐ ßÞàÐÚÐâÐ Ø ÝÕø×ØÝÐ áÞÔàÖØÝÐ.  µÔÝÞáâÐÒÝÞ ßÞßÞÛÝÕâÕ ÓØ áÞÞÔÒÕâÝØâÕ ßÞÛØúÐ (×ÐÔÞÛÖØâÕÛÝÞ Õ áÐÜÞ ßÞÛÕâÞ ´Þ:, ÔÞÔÕÚÐ ßÞÛÕâÞ ÂÕÜÐ: Õ ßàÕßÞàÐçÛØÒÞ) Ø ÝÐßØèÕâÕ øÐ ÒÐèÐâÐ ßÞàÐÚÐ ÒÞ ÓÞÛÕÜÞâÞ ßÞÛÕ ×Ð âÕÚáâ.  ¿ÞâÞÐ ÜÞÖÕâÕ ÔÐ Ø×ÑÕàÕâÕ ßàÞÒÕàÚÐ ÝÐ ßàÐÒÞßØáÞâ.  ½Ð ÚàÐø ßàÕâØáÝÕâÕ ÝÐ ÚÞßçÕâÞ \"¸áßàÐâØ\" ×Ð ÔÐ øÐ ßàÐâØâÕ ßÞàÐÚÐâÐ."
-
-msgid "The Compose Window"
-msgstr "ÁÞáâÐÒØ ßàÞ×ÞàÕæÞâ"
-
-msgid "The Mailbox Listing"
-msgstr "¿àÕÓÛÕÔ ÝÐ ßÞèâÕÝáÚÞ áÐÝÔÐçÕ"
-
-msgid ""
-"The Message Screen display the contents of the selected message.  From here, "
-"you can browse message attachments, reply to the current message, delete the "
-"current message, or advance to the next message in your current mailbox."
-msgstr "¿àÞ×ÞàÕæÞâ ×Ð ßàÕÓÛÕÔ ÝÐ ßÞàÐÚÐâÐ øÐ ßàØÚÐÖãÒÐ áÞÔàÖØÝÐâÐ ÝÐ Ø×ÑàÐÝÐâÐ ßÞàÐÚÐ.  ¾Ô ÞÒÔÕ ÜÞÖÕâÕ ÔÐ ÓØ ßàÕÓÛÕÔÐâÕ ßàØÚÐçÕÝØâÕ äÐøÛÞÒØ, ÔÐ ÞÔÓÞÒÞàØâÕ ÝÐ ßÞàÐÚÐâÐ, ÔÐ øÐ Ø×ÑàØèÕâÕ ØáâÐâÐ, ØÛØ ÔÐ ßàÕÜØÝÕâÕ ÝÐ áÛÕÔÝÐâÐ ßÞàÐÚÐ ÞÔ âÕÚÞÒÝÐâÐ ßÐßÚÐ."
-
-msgid "The Message Screen"
-msgstr "¿àÞ×ÞàÕæ ×Ð ßàÕÓÛÕÔ ÝÐ ßÞàÐÚÐ"
-
-msgid ""
-"The contents of your Inbox folder will be displayed immediately upon logging "
-"in.  The Mailbox Listing shows the contents of each message's header "
-"(message status, date sent, sender, subject, and size).  Each column has a "
-"heading.  Clicking on the heading will cause the listing to be sorted by "
-"that column."
-msgstr "ÁÞÔàÖØÝÐâÐ ÝÐ ÒÐèÐâÐ ßÐßÚÐ ÁÐÝÔÐçÕ üÕ ÑØÔÕ ÐÒâÞÜÐâáÚØ ßàØÚÐÖÐÝÐ ßÞ ßàØøÐÒãÒÐúÕ ÒÞ áØáâÕÜÞ.  ²Þ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ üÕ ÜÞÖÕâÕ ÔÐ øÐ ÒØÔØâÕ áÞÔàÖØÝÐâÐ ÞÔ ×ÐÓÛÐÒøÕâÞ ÝÐ áÕÚÞøÐ ßÞàÐÚÐ (áâÐâãá, ÔÐâãÜ ÝÐ ØáßàÐüÐúÕ, ØáßàÐüÐç, âÕÜÐ Ø ÓÞÛÕÜØÝÐ). ÁÕÚÞøÐ ÚÞÛÞÝÐ áÞÔàÖØ ÝÐáÛÞÒ. ÁÞ ÚÛØÚÐúÕ ÝÐ ÝÐáÛÞÒÞâ üÕ ßàÕÔØ×ÒØÚÐâÕ áÞàâØàÐúÕ ßÞ âÐÐ ÚÞÛÞÝÐ."
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "¿ÐßÚÐâÐ(ØâÕ) \"%s\" üÕ ÑØÔÐâ ßàÕØÜÕÝãÒÐÝØ ÒÞ \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ Ø×ÑàØèÐÝ."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "¿ÐßÚÐâÐ \"%s\" ÒÕüÕ ßÞáâÞØ"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
-msgstr "¿ÐßÚÐâÐ \"%s\" áÞÔàÖØ ÝÕÒÐÛØÔÝØ ×ÝÐæØ ÒÞ ØÜÕâÞ, èâÞ ÜÞÖÕ ÔÐ ßàÕÔØ×ÒØÚÐ ßàÞÑÛÕÜØ. ¾ÑàÐâÕâÕ áÕ ÔÞ ÒÐèØÞâ áØáâÕÜ ÐÔÜØÝØáâàÐâÞà."
+msgstr ""
+"¿ÐßÚÐâÐ \"%s\" áÞÔàÖØ ÝÕÒÐÛØÔÝØ ×ÝÐæØ ÒÞ ØÜÕâÞ, èâÞ ÜÞÖÕ ÔÐ ßàÕÔØ×ÒØÚÐ "
+"ßàÞÑÛÕÜØ. ¾ÑàÐâÕâÕ áÕ ÔÞ ÒÐèØÞâ áØáâÕÜ ÐÔÜØÝØáâàÐâÞà."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "¿ÐßÚÐâÐ \"%s\" Õ ÚàÕØàÐÝÐ, ÝÞ áÕ ãèâÕ øÐ ÝÕÜÐâÕ ßàÕÒ×ÕÜÐÝÞ."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "¿ÐßÚÐâÐ \"%s\" Õ Ø×ÑàØèÐÝÐ, ÝÞ áÕ ãèâÕ øÐ ØÜÐâÕ ßàÕÒ×ÕÜÐÝÞ."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "¿ÐßÚÐâÐ \"%s\" ÝÕ Õ ÚàÕØàÐÝÐ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "¿ÐßÚÐâÐ \"%s\" ÝÕ Õ Ø×ÑàØèÐÝÐ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ ÚàÕØàÐÝÐ."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ Ø×ÑàØèÐÝÐ."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ ßàÕØÜÕÝãÒÐÝÐ ÒÞ \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+#, fuzzy
+msgid "The mail server generated the following informational message:"
+msgstr "¿àÞÜÕÝØ ÓØ ØÝäÞàÜÐæØØâÕ ×Ð áÕàÒÕàÞâ Ø ßÐßÚÐâÐ."
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "¿ÐßÚÐâÐ \"%s\" ÒÕüÕ ßÞáâÞØ"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr ""
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ Ø×ÑàØèÐÝ."
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ ×ÐçãÒÐÝ."
 
-msgid "The signature couldn't be replaced."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "¿ÞâßØáÞâ ÝÕ ÜÞÖÕ ÔÐ ÑØÔÕ ×ÐÜÕÝÕâ."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "¿ÞâßØáÞâ Õ ãáßÕèÝÞ ×ÐÜÕÝÕâ."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ ×ÐçãÒÐÝ."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ Ø×ÑàØèÐÝ."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "¸ÔÕÝâØâÕâÞâ \"%s\" Õ Ø×ÑàØèÐÝ."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "Ø×ÑàØèØ ßÞàÐÚÐ"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "¿àÕÝÐáÞçØ øÐ ßÞàÐÚÐÒÐ:"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "¿ÞâßØáÞâ Õ ãáßÕèÝÞ ×ÐÜÕÝÕâ."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "½ÕÜÐ ßÞàÐÚØ ÒÞ ÞÒÐ ßÞèâÕÝáÚÞ áÐÝÔÐçÕ."
 
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "½ÐáâÐÝÐ ßàÞÑÛÕÜ ßàØ ÑàØèÕúÕ ÝÐ %s. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "½ÐáâÐÝÐ ßàÞÑÛÕÜ ßàØ ÑàØèÕúÕ ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr ""
+"½ÐáâÐÝÐ ßàÞÑÛÕÜ ßàØ ÑàØèÕúÕ ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ áÝØÜÐúÕ ÝÐ ÔÞÚãÜÕÝâÞâ. ¼ÞÖÕÑØ äÐøÛÞâ Õ ßÞÓÞÛÕÜ ÞÔ ÜÐÚáØÜÐÛÝÞ ÔÞ×ÒÞÛÕÝÐâÐ ÓÞÛÕÜØÝÐ (%d MB)."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr ""
+"½ÐáâÐÝÐ ßàÞÑÛÕÜ ßàØ ÑàØèÕúÕ ÝÐ ßÞèâÕÝáÚÞâÞ áÐÝÔÐçÕ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ áÝØÜÐúÕ ÝÐ ÔÞÚãÜÕÝâÞâ. ¼ÞÖÕÑØ ÔÞÚãÜÕÝâÞâ Õ ßÞÓÞÛÕÜ ÞÔ ÜÐÚáØÜÐÛÝÞ ÔÞ×ÒÞÛÕÝÐâÐ ÓÞÛÕÜØÝÐ."
-
-#, c-format
-msgid "There was an error copying messages to \"%s\". This is what the server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÚÞßØàÐúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÚÞßØàÐúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØâÕ ÞÔ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØâÕ ÞÔ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ "
+"áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ "
+"áÕàÒÕàÞâ"
 
-msgid "There was an error deleting messages. This is what the server said"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØâÕ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàØÚÐ× ÝÐ ÑÐàÐÝÐâÐ ßÞàÐÚÐ."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
+#, fuzzy
+msgid "There was an error displaying this message part"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÐüÐúÕ ÝÐ ßÞàÐÚÐâÐ"
+
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßÞáâÐÒãÒÐúÕ ÐâàØÑãâØ ÝÐ ßÞàÐÚØâÕ ÒÞ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßÞáâÐÒãÒÐúÕ ÐâàØÑãâØ ÝÐ ßÞàÐÚØâÕ ÒÞ ßÐßÚÐâÐ \"%s\". ¾ÒÐ "
+"ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ×ÐçãÒãÒÐúÕ ÝÐ ÝÕ×ÐÒàèÕÝÐ ßÞàÐÚÐ."
+
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàØÚÐ× ÝÐ ÑÐàÐÝÐâÐ ßÞàÐÚÐ."
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßÞáâÐÒãÒÐúÕ ÐâàØÑãâØ ÝÐ ßÞàÐÚØâÕ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàØÚÐ× ÝÐ ÑÐàÐÝÐâÐ ßÞàÐÚÐ."
 
-#, c-format
-msgid "There was an error moving messages to \"%s\". This is what the server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÕÜÕáâãÒÐúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàØÚÐ× ÝÐ ÑÐàÐÝÐâÐ ßÞàÐÚÐ."
 
-msgid "There was an error moving messages to the trash. This is what the server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÕÜÕáâãÒÐúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ ¾âßÐÔÞÚ ßÐßÚÐâÐ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
+#: lib/Message.php:85
+#, fuzzy, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÕÜÕáâãÒÐúÕ ÝÐ ßÞàÐÚØâÕ ÒÞ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-msgid "There was an error saving a draft."
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
 msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ×ÐçãÒãÒÐúÕ ÝÐ ÝÕ×ÐÒàèÕÝÐ ßÞàÐÚÐ."
 
-msgid "There was an error sending your message"
+#: compose.php:1006
+#, fuzzy, php-format
+msgid "There was an error sending your message: %s"
 msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÐüÐúÕ ÝÐ ßÞàÐÚÐâÐ"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ àÕáâÐÒàÐæØøÐ ÝÐ ßÞàÐÚØâÕ. ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
-
-msgid "There was an error viewing the requested message."
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
 msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàØÚÐ× ÝÐ ÑÐàÐÝÐâÐ ßÞàÐÚÐ."
 
-msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr "¾ÒÞø äÐøÛ ÓØ ÚÞÝâàÞÛØàÐ ÛÞÚÐÛÝØâÕ MIME ÔàÐøÒÕàØ ×Ð IMP, ÞÔÝÞáÝÞ ÚÐÚÒØ âØßÞÒØ ÝÐ ßàØÚÐçÕÝØ äÐøÛÞÒØ áÕ ßàØÚÐÖÛØÒØ Ø/ØÛØ ÜÞÖÐâ ÔÐ áÕ ßàÕÒ×ÕÜÐâ."
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "½ÐáâÐÝÐ ÓàÕèÚÐ ßàØ ßàÐüÐúÕ ÝÐ ßÞàÐÚÐâÐ"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr ""
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
-msgstr "¾ÒÞø äÐøÛ ÓØ ÚÞÝâàÞÛØàÐ áâÐÝÔÐàÔÝØâÕ ßÞÔÕáãÒÐúÐ ×Ð IMP ÚÐÚÞ Ø âÞÐ ÚÞØ ßÞÔÕáãÒÐúÐ ÜÞÖÐâ ÔÐ ÑØÔÐâ Ø×ÜÕÝÕâØ ÞÔ áâàÐÝÐ ÝÐ ÚÞàØáÝØæØâÕ."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "¾ÒÐ ÜÞÖÕ ÔÐ ßÞâàÐÕ. ´ÐÛØ áâÕ áØÓãàÝØ ÔÕÚÐ áÐÚÐâÕ ÔÐ ßàÞÔÞÛÖØâÕ?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
-msgstr "¾ÒÞø äÐøÛ ÓØ ÚÞÝâàÞÛØàÐ áâÐÝÔÐàÔÝØâÕ ßÞÔÕáãÒÐúÐ ×Ð IMP Ø áÞÔàÖØ ÛØáâÐ ÝÐ ÔÞáâÐßÝØ áÕàÒÕàØ, ÐÚÞ ÚÞàØáâØâÕ ÛØáâÐ ÝÐ áÕàÒÕàØ."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
 
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr "¾ÒÞø ÔÞÚãÜÕÝâ áÞÔàÖØ ßÞÔÕáãÒÐúÐ ÚÞØ ÓØ ×ÐÜÕÝãÒÐÐâ ØÛØ ÔÞßÞÛÝãÒÐÐâ ßÞçÕâÝØâÕ ßÞÔÕáãÒÐúÐ ×Ð Horde."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
-"This has hopefully given you a general understanding of how to web mail "
-"interface works.  You'll surely become comfortable with it after seeing how "
-"easy and convenient it is for reading and sending mail, as well as managing "
-"your IMAP mail account."
-msgstr "ÁÕ ÝÐÔÕÒÐÜÕ ÔÕÚÐ ÒÞ ÓÛÞÑÐÛÐ áäÐâØÒâÕ ÚÐÚÞ web mail áØáâÕÜÞâ äãÝÚæØÞÝØàÐ.  ¿ÞÛÕáÝÞ üÕ ÒØ ÑØÔÕ ÞâÚÐÚÞ üÕ ßàÞÒÕàØâÕ ÚÞÛÚã Õ ÛÕáÝÞ ÔÐ áÕ çØâÐ Ø ßàÐüÐ ßÞèâÐ, ÚÐÚÞ Ø ãàÕÔãÒÐúÕ ÝÐ ÒÐèØÞâ IMAP áØáâÕÜ."
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
-msgstr "¾ÒÐ Õ ÓÛÐÒÝØÞâ ÚÞÝäØÓãàÐæØÞÝÕÝ äÐøÛ ×Ð IMP áØáâÕÜÞâ. ÁÞÔàÖØ ßÐâÕÚØ Ø ÞßæØØ ×Ð ÝÕÓÞÒØâÕ áÚàØßâØ."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "¾ÒÐ ÜÞÖÕ ÔÐ ßÞâàÐÕ. ´ÐÛØ áâÕ áØÓãàÝØ ÔÕÚÐ áÐÚÐâÕ ÔÐ ßàÞÔÞÛÖØâÕ?"
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "°ÔÜØÝØáâàÐâÞàÞâ ÑÕèÕ Ø×ÒÕáâÕÝ ÔÕÚÐ ÞÒÐÐ ßÞàÐÚÐ Õ ÝÕßÞÖÕÛÝÐ."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr ""
 
+#: message.php:211
 msgid "This message to"
 msgstr "¾ÒÐÐ ßÞàÐÚÐ ÔÞ"
 
-msgid "This number must be at least one."
-msgstr "¾ÒÞø ÑàÞø ÜÞàÐ ÔÐ ÑØÔÕ ÑÐàÕÜ ÕÔÕÝ."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-msgid "This value must be a number."
-msgstr "¾ÒÐÐ ÒàÕÔÝÞáâ ÜÞàÐ ÔÐ ÑØÔÕ ÑàÞø."
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
 
-msgid "Time Zone"
-msgstr "²àÕÜÕÝáÚÐ ×ÞÝÐ"
+#: thread.php:152
+msgid "Thread Display"
+msgstr ""
 
-msgid ""
-"To view the contents of a message, click on the message's subject.  You'll "
-"be taken to the Message screen."
-msgstr "·Ð ßàØÚÐ× ÝÐ áÞÔàÖØÝÐâÐ ÝÐ ßÞàÐÚÐâÐ, ÚÛØÚÝÕâÕ ÝÐ âÕÜÐâÐ ÝÐ ßÞàÐÚÐâÐ."
+#: thread.php:76 config/prefs.php.dist:922
+#, fuzzy
+msgid "Thread View"
+msgstr "¾áÒÕÖØ ßàØÚÐ×"
 
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "´Þ"
 
-msgid "To:"
-msgstr "´Þ:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "¾Ô ÐÔàÕáÐ"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "²ÚãßÝÐ ÓÞÛÕÜØÝÐ: %s KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "¿ÐßÚÐ ¾âßÐÔÞÚ:"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "¿ÐßÚÐ ¾âßÐÔÞÚ:"
 
-msgid "Unanswered messages"
-msgstr "½ÕÞÔÓÞÒÞàÕÝØ ßÞàÐÚØ"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "½ÕÞÔÓÞÒÞàÕÝØ"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "½ÕÞÔÓÞÒÞàÕÝØ ßÞàÐÚØ"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "¿ÞÒàÐâØ"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "½ÕßÞ×ÝÐâ ßàØÜÐâÕÛ"
 
-msgid "Unnamed"
-msgstr "½ÕØÜÕÝãÒÐÝ"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
 
-msgid "Unread"
-msgstr "½ÕßàÞçØâÐÝÐ"
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
 
-msgid "Unseen Messages"
-msgstr "½ÕßàÞçØâÐÝØ ßÞàÐÚØ"
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "½ÕßÞ×ÝÐâ ßàØÜÐâÕÛ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
+
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "½ÕØÜÕÝãÒÐÝ"
 
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "½ÕßàÞçØâÐÝØ"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "ÁÞÚàØø ßÐßÚÐ(Ø)"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "ºÞàØáâÕâÕ Use Ctrl/¾ßæØøÐ+Click ×Ð ÔÐ Ø×ÑÕàÕâÕ ßÞÒÕüÕ ßÞÛØúÐ"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
+
+#: templates/prefs/sentmailselect.inc:41
+msgid "Use Default Value"
+msgstr ""
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
 msgstr "ºÞàØáâÕâÕ ßÐßÚØ ßàÕÒ×ÕÜÕÝØ ÞÔ IMAP"
 
-msgid "User Preferences"
-msgstr "ºÞàØáÝØçÚØ ßÞÔÕáãÒÐúÐ"
+#: config/prefs.php.dist:735
+msgid "Use Virtual Trash Folder?"
+msgstr ""
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "ºÞàØáÝØçÚÞ ØÜÕ"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
 
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "ºÞàØáÝØçÚÞ ØÜÕ"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "ºÞàØáÝØçÚÞ ØÜÕ"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "¿àØÚÐÖØ %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "¿àØÚÐÖØ %s"
 
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "½ÞÒØ ßÞàÐÚØ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+msgid "View Thread"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "ÁÞáâÐÒãÒÐúÕ ÝÐ ßÞàÐÚØ ÒÞ ÝÞÒ (ßÞáÕÑÕÝ) ßàÞ×ÞàÕæ."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
+msgstr "¿àØÚÐÖØ ßÞàÐÚØ ÒÞ "
+
+#: templates/prefs/initialpageselect.inc:23
+msgid "View or mailbox to display after login:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "¿àØÚÐÖØ %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
 msgstr "¿àØÚÐÖØ ßÞàÐÚØ ÒÞ "
 
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ Ø×ÑàØèÐÝÐ."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "ºàÕØàÐø ßÐßÚÐ"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "¿ÐßÚÐ ¾âßÐÔÞÚ:"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "²ÝØÜÐÝØÕ"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "´ÞÑàÕÔÞøÔÞÒâÕ ÒÞ %s"
 
+#: config/prefs.php.dist:619
 msgid ""
-"Welcome to the Internet Message Program (IMP)!  Through IMP's intuitive "
-"interface, you'll be able to access and manage your IMAP mail account using "
-"the simplicity of a standard web browser."
-msgstr ""
-"´ÞÑàÕÔÞøÔÞÒâÕ ÒÞ Internet Message Program (IMP)!  ¿àÕÚã ØÝâãØâØÒÝØÞâ IMP"
-"Ø×ÓÛÕÔ, ÜÞÖÕâÕ ÔÐ ßàØáâÐßØâÕ Ø ÔÐ ÓÞ ãàÕÔØâÕ ÒÐèÐâÐ IMAP áÕàÒØá"
-"ÚÞàØáâÕøüØ øÐ ÕÔÝÞáâÐÒÝÞáâÐ ÝÐ áâÐÝÔÐàÔÕÝ ØÝâÕàÝÕâ ßàÕâàÐÖãÒÐç."
-
-msgid "Welcome"
-msgstr "´ÞÑàÕÔÞøÔÕ"
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
 
+#: config/prefs.php.dist:727
+#, fuzzy
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
-msgstr "¿àØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØ, ßàÕÜÕáâØ ÓØ ÒÞ ßÐßÚÐâÐ ¾âßÐÔÞÚ ÝÐÜÕáâÞ ÔÐ ÓØ Þ×ÝÐçãÒÐè ÚÐÚÞ Ø×ÑàØèÐÝØ."
+"them as deleted?"
+msgstr ""
+"¿àØ ÑàØèÕúÕ ÝÐ ßÞàÐÚØ, ßàÕÜÕáâØ ÓØ ÒÞ ßÐßÚÐâÐ ¾âßÐÔÞÚ ÝÐÜÕáâÞ ÔÐ ÓØ "
+"Þ×ÝÐçãÒÐè ÚÐÚÞ Ø×ÑàØèÐÝØ."
+
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
 
-msgid "Wrap text at this many characters."
-msgstr "¿ÞÔàÕÔØ ÓÞ âÕÚáâÞâ ÝÐ ÒÞÛÚã ×ÝÐæØ."
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "´Ð"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "ÁÕ ÞÑØÔãÒÐâÕ ÔÐ ÓØ Ø×ÑàØèÕâÕ áÛÕÔÝØÒÕ ßÐßÚØ:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "ÁÕ ÞÑØÔãÒÐâÕ ÔÐ ÓØ Ø×ÑàØèÕâÕ áÛÕÔÝØÒÕ ßÐßÚØ:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "ÁÕ ÞÑØÔãÒÐâÕ ÔÐ ÓØ Ø×ÑàØèÕâÕ áÛÕÔÝØÒÕ ßÐßÚØ:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "¨Ð àÕØÜÕÝãÒÐâÕ ßÐßÚÐâÐ: "
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "ºàÕØàÐâÕ ÝÞÒÐ ßÐßÚÐ ÒÞ "
 
-msgid ""
-"You are creating a top-level folder.\\nPlease enter the name of the new "
-"folder:\\n"
-msgstr "ºàÕØàÐâÕ ßÐßÚÐ ÒÞ ÝÐøÒØáÞÚÞâÞ ÝØÒÞ.\\n²ÝÕáÕâÕ ØÜÕ ×Ð ÝÞÒÐâÐ ßÐßÚÐ.\\n"
+#: templates/javascript/folders.js:104
+#, fuzzy
+msgid "You are creating a top-level folder."
+msgstr "ºàÕØàÐâÕ ÝÞÒÐ ßÐßÚÐ ÒÞ "
+
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr ""
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
 
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "¨Ð àÕØÜÕÝãÒÐâÕ ßÐßÚÐâÐ: "
 
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "ÃáßÕèÝÞ øÐ áÞÚàØÒâÕ ßÐßÚÐâÐ \"%s\"."
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
-"You can send mail in a variety ways.  You might choose to compose a new "
-"message or perhaps to reply to an existing message.  Whichever method you "
-"choose, however, will open the standard Compose Window."
-msgstr ""
-"¼ÞÖÕâÕ ÔÐ ßàÐüÐâÕ ßÞèâÐ ÝÐ àÐ×ÛØçÝØ ÝÐçØÝØ.  ¼ÞÖÕâÕ ÔÐ Ø×ÑÕàÕâÕ ÔÐ áÞáâÐÒÕâÕ "
-"ÝÞÒÐ ßÞàÐÚÐ ØÛØ ÜÞÖÕÑØ ÔÐ ÞÔÓÞÒÞàØâÕ ÝÐ ßÞáâÞÕçÚÐ ßÞàÐÚÐ.  ºÞø ÜÕâÞÔ Ø ÔÐ ÓÞ "
-"ÞÔÑÕàÕâÕ, üÕ ÒØ áÕ ÞâÒÞàØ áâÐÝÔÐàÔÝØÞâ ßàÞ×ÞàÕæ ÁÞáâÐÒØ."
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
 
-#, c-format
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "¸ÜÐâÕ %s ÝÞÒØ ßÞàÐÚØ."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "¸ÜÐâÕ ÕÔÝÐ ÝÞÒÐ ßÞàÐÚÐ."
 
-#, c-format
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "¸ÜÐâÕ ÕÔÝÐ ÝÞÒÐ ßÞàÐÚÐ."
+
+#: templates/compose/attachments.js:115
 msgid ""
-"You have been logged out of %s. Thank you for using the system. If you wish "
-"to log in again, please use the form below."
-msgstr "²ØÕ áÕ ÞÔøÐÒØÒâÕ ÞÔ %s. ±ÛÐÓÞÔÐàØÜÕ èâÞ ÓÞ ÚÞàØáâÕÒâÕ ÝÐèØÞâ áØáâÕÜ. °ÚÞ áÐÚÐâÕ ßÞÒâÞàÝÞ ÔÐ áÕ ßàØøÐÒØâÕ, ÚÞàØáâÕâÕ øÐ äÞàÜÐâÐ ÔÞÛã."
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
-msgid "You have new mail in the following folders:\\n"
+#: lib/IMP.php:1074
+#, fuzzy
+msgid "You have new mail in the following folder:"
 msgstr "¸ÜÐâÕ ÝÞÒØ ßÞàÐÚØ ÒÞ áÛÕÔÝØÒÕ ßÐßÚØ:\\n"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "¸×ÑÕàÕâÕ ßàÒÞ ÚÞø ßàØÚÐçÕÝ äÐøÛ ÔÐ áÕ Ø×ÑàØèÕ."
-
-msgid "You must first specify the file to attach."
-msgstr "¸×ÑÕàÕâÕ ßàÒÞ ÚÞø äÐøÛ ÔÐ áÕ ßàØÚÐçØ."
+#: lib/IMP.php:1079
+#, fuzzy
+msgid "You have new mail in the following folders:"
+msgstr "¸ÜÐâÕ ÝÞÒØ ßÞàÐÚØ ÒÞ áÛÕÔÝØÒÕ ßÐßÚØ:\\n"
 
-msgid "You must have at least one recipient."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
 msgstr "¼ÞàÐ ÔÐ ÒÝÕáÕâÕ ÑÐàÕÜ ÕÔÕÝ ßàØÜÐç."
 
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "¼ÞàÐ ßàÒÞ ÔÐ áÕÛÕÚâØàÐâÕ æÕÛÝÞ ßÞèâÕÝáÚÞ áÐÝÔÐçÕ."
 
-msgid "You must select an identity to be deleted."
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
 msgstr "¼ÞàÐ ÔÐ Ø×ÑÕàÕâÕ ÚÞø ØÔÕÝâØâÕâ ÔÐ áÕ Ø×ÑàØèÕ."
 
+#: templates/contacts/contacts.inc:81
+#, fuzzy
+msgid "You must select an address first."
+msgstr "¼ÞàÐ ßàÒÞ ÔÐ áÕÛÕÚâØàÐâÕ æÕÛÝÞ ßÞèâÕÝáÚÞ áÐÝÔÐçÕ."
+
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "¼ÞàÐ ßàÒÞ ÔÐ Ø×ÑÕàÕâÕ ÑÐàÕÜ ÕÔÝÐ ßÞàÐÚÐ."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "¼ÞàÐ ÔÐ ÒÝÕáÕâÕ ßàØÜÐç."
 
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "¸×ÑÕàÕâÕ ßàÒÞ ÚÞø äÐøÛ ÔÐ áÕ ßàØÚÐçØ."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "¿àÕÝÐáÞçØ øÐ ßÞàÐÚÐÒÐ:"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "¿àÕÝÐáÞçØ øÐ ßÞàÐÚÐÒÐ:"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "½Õ øÐ ØÜÐâÕ ßàÕÒ×ÕÜÐÝÞ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "½Õ øÐ ØÜÐâÕ áÚàØÕÝÞ ßÐßÚÐâÐ \"%s\". ¾ÒÐ ÓÞ ÒàÐâØ áÕàÒÕàÞâ"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "ÃáßÕèÝÞ øÐ ßàÕÒ×ÕÜÐÒâÕ ßÐßÚÐâÐ \"%s\"."
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "ÃáßÕèÝÞ øÐ áÞÚàØÒâÕ ßÐßÚÐâÐ \"%s\"."
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "²ÐèÐâÐ %s áÕáØøÐ ×ÐÒàèØ. ¿àØøÐÒÕâÕ áÕ ßÞÒâÞàÝÞ."
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "¸ÜÕ Ø ßàÕ×ØÜÕ:"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-msgid "Your From: address:"
-msgstr "°ÔàÕáÐ ÞÔ ÚÞøÐ ßàÐüÐâÕ:"
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-msgid "Your Information"
-msgstr "²ÐèØ ØÝäÞàÜÐæØØ"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "¸ÜÕ Ø ßàÕ×ØÜÕ:"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "°ÔàÕáÐ ÝÐ ÚÞøÐ üÕ ÒØ ÞÔÓÞÒÞàÐÐâ: <i>(ÝÕ×ÐÔÞÛÖØâÕÛÝÞ)</i>"
 
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr "²ÐèØÞâ ßàÕâàÐÖãÒÐç ÝÕ ßÞÔàÖãÒÐ ÒÐÚÒÞ ßÕçÐâÕúÕ. ¿àØâØáÝÕâÕ Control/¾ßæØøÐ + P ×Ð ÔÐ ßÕçÐâÕâÕ."
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
 
-msgid "Your current time zone:"
-msgstr "¼ÞÜÕÝâÐÛÝÐ ÒàÕÜÕÝáÚÐ ×ÞÝÐ:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "²ÐèØ ØÔÕÝâØâÕâØ:"
 
-msgid "Your default identity:"
-msgstr "²Ðè áâÐÝÔÐàÔÕÝ ØÔÕÝâØâÕâ:"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-msgid "Your full name:"
-msgstr "¸ÜÕ Ø ßàÕ×ØÜÕ:"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+"²ÐèØÞâ ßàÕâàÐÖãÒÐç ÝÕ ßÞÔàÖãÒÐ ÒÐÚÒÞ ßÕçÐâÕúÕ. ¿àØâØáÝÕâÕ Control/¾ßæØøÐ + P "
+"×Ð ÔÐ ßÕçÐâÕâÕ."
 
-msgid "Your identities:"
-msgstr "²ÐèØ ØÔÕÝâØâÕâØ:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your preferences have been updated."
-msgstr "²ÐèØâÕ ßÞÔÕáãÒÐúÐ áÕ ßàØäÐâÕÝØ Ø ßàØÜÕÝÕâØ."
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "¿ÐßÚÐâÐ \"%s\" Õ ãáßÕèÝÞ Ø×ÑàØèÐÝÐ."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "¿ÞâßØá:"
 
-msgid "[No subject]"
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
+#, fuzzy
+msgid "[No Subject]"
 msgstr "[±Õ× âÕÜÐ]"
 
-msgid "\\nPlease enter the name of the new folder:\\n"
-msgstr "\\n²ÝÕáÕâÕ ØÜÕ ÝÐ ÝÞÒÐâÐ ßÐßÚÐ:\\n"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "½ÕÒØÔÛØÒÐ ÚÞßØøÐ"
 
-msgid "add source"
-msgstr "ÔÞÔÐÔØ Ø×ÒÞà"
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "ÆàÝÐ ÛØáâÐ"
+
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "ºÞßØøÐ"
 
-msgid "cannot move past the beginning"
-msgstr "cannot move past the beginning"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "¸×ÑàØèØ"
 
-msgid "cannot move past the end"
-msgstr "cannot move past the end"
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "¿ÐßÚØ"
 
-msgid "delete message"
-msgstr "Ø×ÑàØèØ ßÞàÐÚÐ"
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "¸ÔÕÝâØâÕâØâÕ"
 
-msgid "move down"
-msgstr "ÞÔØ ÔÞÛÕ"
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
 
-msgid "move message to"
-msgstr "ßàÕÜÕáâØ ßÞàÐÚÐ ÒÞ"
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "¾ÔøÐÒÐ"
 
-msgid "move up"
-msgstr "ßàÕÜÕáâØ ÓÞàÕ"
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "¸×ÒÞà ÝÐ ßÞàÐÚÐ"
 
-msgid "no folder selected"
-msgstr "ÝÕ Õ Ø×ÑàÐÝÐ ßÐßÚÐ"
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "½ÞÒØ ßÞàÐÚØ"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "¿ÕçÐâØ"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "ÝÕ Õ Ø×ÑàÐÝÞ ßàÐÒØÛÞ"
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "¾áÒÕÖØ"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "¾ÔÓÞÒÞàØ"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "¿àÕÑÐàãÒÐø"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "¸áßàÐâØ ßÞàÐÚÐ"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "½ÕßàÞçØâÐÝÐ"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "´Þ"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "¿ÞÒàÐâØ"
+
+#: templates/message/navbar_actions.inc:18
+msgid "_View Thread"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "¿àØÚÐçÕÝ äÐøÛ"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "¿àØÚÐçÕÝØ äÐøÛÞÒØ"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
+#, fuzzy
+msgid "from"
+msgstr "¾Ô"
+
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
+
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "¿ÞèâÕÝáÚÞ áÐÝÔÐçÕ"
 
-msgid "no text specified"
-msgstr "ÝÕ Õ ÝÐÒÕÔÕÝ âÕÚáâ"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "½ÕØÜÕÝãÒÐÝ"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ÝØÕÔÝÐ"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ØÛØ"
 
-msgid "or:"
-msgstr "ØÛØ:"
-
-msgid "please fill in the text and choose a field and an action"
-msgstr "ÒÝÕáØ âÕÚáâ Ø Ø×ÑÕàØ ßÞÛÕ Ø ÐÚæØøÐ"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "ÞÔáâàÐÝØ Ø×ÒÞà"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "Ø×ÑÕàØ ßÐßÚÐ"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ßàÐÒÞßØáÝÐ ÓàÕèÚÐ"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ßàÐÒÞßØáÝØ ÓàÕèÚØ"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "ÚÐÔÕ èâÞ %s ßÞÛÕâÞ áÞÔàÖØ <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "ßàÐÒÞßØáÝÐ ÓàÕèÚÐ"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "ÆàÝÐ ÛØáâÐ"
 
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/templates/fetchmail/top.inc
+++ mod/templates/fetchmail/top.inc
@@ -1,8 +1,7 @@
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-<tr><td class="header" align="left"><b><?php echo _("Other Mail Accounts") ?></b></td>
-<?php Prefs_UI::generateNavigationCell('fetchmail') ?>
-</tr>
-</table>
+<div class="header">
+  <?php Prefs_UI::generateNavigationCell('fetchmail') ?>
+  <?php echo _("Other Mail Accounts") ?>
+</div>
 <table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
 <tr><td class="item"><table border="0"><tr valign="top"><td class="item">
 


--- orig/templates/mailbox/empty_mailbox.inc
+++ mod/templates/mailbox/empty_mailbox.inc
@@ -1,5 +1,5 @@
 <tr>
-  <td class="text" colspan="6">
-    &nbsp;<i><?php echo _("There are no messages in this mailbox.") ?></i>
-  </td>
+ <td class="text" colspan="6">
+  &nbsp;<em><?php echo _("There are no messages in this mailbox.") ?></em>
+ </td>
 </tr>


--- orig/lib/Quota/mdaemon.php
+++ mod/lib/Quota/mdaemon.php
@@ -5,9 +5,9 @@
  * Parameters required:
  *   'app_location'  --  TODO
  *
- * $Horde: imp/lib/Quota/mdaemon.php,v 1.11.10.5 2005/07/03 03:42:46 selsky Exp $
+ * $Horde: imp/lib/Quota/mdaemon.php,v 1.11.10.8 2006/01/01 21:28:59 jan Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -17,7 +17,7 @@
  * @package IMP_Quota
  */
 class IMP_Quota_mdaemon extends IMP_Quota {
-    
+
     /**
      * Get quota information (used/allocated), in bytes.
      *
@@ -61,9 +61,7 @@
      */
     function _mailboxSize($path)
     {
-        $fp = @fopen($path . '\imap.mrk', 'rb');
-        $contents = @fread($fp, filesize($path . '\imap.mrk'));
-        @fclose($fp);
+        $contents = file_get_contents($path . '\imap.mrk');
 
         $pointer = 36;
         $size = 0;
@@ -78,7 +76,7 @@
         while (($entry = $d->read()) !== false) {
             if (($entry != '.') &&
                 ($entry != '..') &&
-                (substr($entry, -5, 5) == '.IMAP')) { 
+                (substr($entry, -5, 5) == '.IMAP')) {
                 $size += $this->_mailboxSize($path . $entry . '\\');
             }
         }


--- orig/folders.php
+++ mod/folders.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * $Horde: imp/folders.php,v 2.309.2.10 2005/09/16 20:25:04 jan Exp $
+ * $Horde: imp/folders.php,v 2.309.2.32 2006/04/10 05:03:43 slusarz Exp $
  *
- * Copyright 2000-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 2000-2005 Jon Parise <jon at horde.org>
- * Copyright 2000-2005 Anil Madhavapeddy <avsm at horde.org>
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2000-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Jon Parise <jon at horde.org>
+ * Copyright 2000-2006 Anil Madhavapeddy <avsm at horde.org>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -13,12 +13,6 @@
 
 /**
  * Utility function to return a url for the various images.
- *
- * @param string $name  Image filename.
- * @param string $alt   Image alt tag.
- * @param string $type  Either 'folder' or 'tree'.
- *
- * @return string  Link to the folder image.
  */
 function _image($name, $alt, $type)
 {
@@ -39,13 +33,14 @@
     return $cache[$type][$name];
 }
 
-$authentication = OP_HALFOPEN;
 @define('IMP_BASE', dirname(__FILE__));
+$authentication = OP_HALFOPEN;
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/IMAP/Tree.php';
 require_once IMP_BASE . '/lib/Folder.php';
 require_once 'Horde/Identity.php';
 require_once 'Horde/Template.php';
+Horde::addScriptFile('folders.js', 'imp');
 
 /* Redirect back to the mailbox if folder use is not allowed. */
 if (!$conf['user']['allow_folders']) {
@@ -102,14 +97,14 @@
     $imptree->collapseAll();
     break;
 
-case 'refresh_folders':
-    $imptree->init(($imp['showunsub']) ? IMAPTREE_INIT_UNSUB : IMAPTREE_INIT_SUB);
+case 'rebuild_tree':
+    $imptree->init();
     break;
 
 case 'expunge_folder':
     if (!empty($folder_list)) {
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->expungeMailbox($folder_list);
     }
     break;
@@ -120,11 +115,10 @@
     }
     break;
 
-case 'delete_vfolder':
-    $vfolder = Util::getFormData('vfolder');
-    if (!empty($vfolder)) {
-        IMP_VFolder::deleteVFolder($vfolder);
-        $imptree->delete($vfolder);
+case 'delete_search_query':
+    $queryid = Util::getFormData('queryid');
+    if (!empty($queryid)) {
+        $imp_search->deleteSearchQuery($queryid);
     }
     break;
 
@@ -170,11 +164,11 @@
     if (!empty($new_mailbox)) {
         $new_mailbox = String::convertCharset($new_mailbox, NLS::getCharset(), 'UTF7-IMAP');
         if (count($folder_list) == 1) {
-            $new_mailbox = $folder_list[0] . $imp['delimiter'] . $new_mailbox;
-        } elseif (!empty($imp['folders'])) {
-            $new_mailbox = $imp['folders'] . $new_mailbox;
+            $namespace_info = IMP::getNamespace($folder_list[0]);
+            $new_mailbox = $folder_list[0] . $namespace_info['delimiter'] . $new_mailbox;
+        } else {
+            $new_mailbox = IMP::appendNamespace($new_mailbox);
         }
-
         $imp_folder->create($new_mailbox, $subscribe);
     }
     break;
@@ -189,8 +183,8 @@
         for ($i = 0; $i < $iMax; $i++) {
             $oldname = trim($old_names[$i], "\r\n");
             $newname = trim($new_names[$i], "\r\n");
-            $newname = IMP::addPreambleString(String::convertCharset($newname, NLS::getCharset(), 'UTF7-IMAP'));
-            $imp_folder->rename($oldname, $newname);
+            $newname = String::convertCharset($newname, NLS::getCharset(), 'UTF7-IMAP');
+            $imp_folder->rename($oldname, IMP::appendNamespace($newname));
         }
     }
     break;
@@ -219,19 +213,21 @@
 case 'poll_folder':
     if (!empty($folder_list)) {
         $imptree->addPollList($folder_list);
+        $imp_search->createVINBOXFolder();
     }
     break;
 
 case 'nopoll_folder':
     if (!empty($folder_list)) {
         $imptree->removePollList($folder_list);
+        $imp_search->createVINBOXFolder();
     }
     break;
 
 case 'folders_empty_mailbox':
     if (!empty($folder_list)) {
         include_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->emptyMailbox($folder_list);
     }
     break;
@@ -240,7 +236,7 @@
 case 'mark_folder_unseen':
     if (!empty($folder_list)) {
         include_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->flagAllInMailbox("\\SEEN", $folder_list, ($actionID == 'mark_folder_seen'));
     }
     break;
@@ -280,7 +276,7 @@
         require $registry->get('templates', 'horde') . '/common-footer.inc';
         exit;
     }
-     break;
+    break;
 }
 
 /* Display the correct message on the action bar */
@@ -299,16 +295,9 @@
     require IMP_TEMPLATES . '/quota/quota.inc';
 }
 
-/* Default to the very top of the hierarchy */
-if (!isset($pattern)) {
-    $pattern = '%';
-}
-
 $i = $rowct = 0;
 $displayNames = $newmsgs = array();
-$last_item = false;
 
-require_once IMP_TEMPLATES . '/folders/javascript.inc';
 if ($imp['file_upload'] && ($actionID == 'import_mbox')) {
     require IMP_TEMPLATES . '/folders/import.inc';
     require $registry->get('templates', 'horde') . '/common-footer.inc';
@@ -319,16 +308,12 @@
 }
 
 /* Get special folders. */
-$trash = IMP::addPreambleString($prefs->getValue('trash_folder'));
-$draft = IMP::addPreambleString($prefs->getValue('drafts_folder'));
-$sent = $identity->getAll('sent_mail_folder');
-$sent = array_filter($sent, create_function('$mbox', 'return !empty($mbox);'));
-$sent = array_map(array('IMP', 'addPreambleString'), $sent);
+$trash = IMP::folderPref($prefs->getValue('trash_folder'), true);
+$draft = IMP::folderPref($prefs->getValue('drafts_folder'), true);
+$sent = $identity->getAllSentmailFolders();
 
 $name_url = Util::addParameter(Horde::applicationUrl('mailbox.php'), 'no_newmail_popup', 1);
 
-$prefix = $imptree->getPrefix();
-$notrail_prefix = $imptree->noTrailingDelimiter($prefix);
 $mbox_icons = $morembox = $rows = array();
 
 /* Call the mailbox icon hook, if requested. */
@@ -367,7 +352,7 @@
                 /* Highlight mailboxes with unread messages in bold. */
                 $row['new'] = $msgs_info['unseen'];
                 if (!empty($row['new'])) {
-                    $mailbox['label'] = '<b>' . $mailbox['label'] . '</b>';
+                    $mailbox['label'] = '<strong>' . $mailbox['label'] . '</strong>';
                 }
             }
         }
@@ -380,7 +365,7 @@
             break;
 
         case $trash:
-            $dir2 = _image('trash.png', _("Trash folder"), 'folder');
+            $dir2 = ($prefs->getValue('use_vtrash')) ? _image(($imptree->isOpen($mailbox)) ? 'folder_open.png' : 'folder.png', _("Mailbox"), 'folder') :_image('trash.png', _("Trash folder"), 'folder');
             break;
 
         case $draft:
@@ -402,10 +387,18 @@
 
         /* Virtual folders. */
         if ($imptree->isVFolder($mailbox)) {
-            $row['vfolder'] = true;
             $row['nocheckbox'] = true;
-            $row['delvfolder'] = Horde::link(Util::addParameter($folders_url, array('actionID' => 'delete_vfolder', 'vfolder' => $mailbox['value'])), _("Delete Virtual Folder")) . _("Delete") . '</a>';
-            $row['editvfolder'] = Horde::link(Util::addParameter(Horde::applicationUrl('search.php'), array('edit_vfolder' => 1, 'vfolder' => $mailbox['value'])), _("Edit Virtual Folder")) . _("Edit") . '</a>';
+            if ($imp_search->isVTrashFolder($mailbox['value'])) {
+                $row['vfolder'] = false;
+                $dir2 = _image('trash.png', _("Virtual Trash Folder"), 'folder');
+            } elseif ($imp_search->isVINBOXFolder($mailbox['value'])) {
+                $row['vfolder'] = false;
+                $dir2 = _image('inbox.png', _("Virtual INBOX Folder"), 'folder');
+            } else {
+                $row['vfolder'] = true;
+                $row['delvfolder'] = Horde::link($imp_search->deleteURL($mailbox['value']), _("Delete Virtual Folder")) . _("Delete") . '</a>';
+                $row['editvfolder'] = Horde::link($imp_search->editURL($mailbox['value']), _("Edit Virtual Folder")) . _("Edit") . '</a>';
+            }
         }
     } else {
         /* We are dealing with folders here. */
@@ -437,60 +430,61 @@
         } else {
             $dir = Util::addParameter($dir, 'actionID', 'expand_folder');
             if ($mailbox['value'] == 'INBOX') {
-                $plus_img = 'plusonly.png';
-                $last_item = true;
+                $plus_img = 'plustop.png';
             } else {
                 $plus_img = ($peek) ? 'plus.png' : 'plusbottom.png';
             }
             $dir = Horde::link($dir, _("Expand Folder")) . _image($plus_img, _("Expand"), 'tree') . "</a>$dir2";
         }
     } else {
-        $join_img = ($peek) ? 'join.png' : (($mailbox['value'] == 'INBOX') ? 'blank.png' : 'joinbottom.png');
+        if ($mailbox['value'] == 'INBOX') {
+            $join_img = ($peek) ? 'joinbottom-down.png' : 'blank.png';
+        } else {
+            $join_img = ($peek) ? 'join.png' : 'joinbottom.png';
+        }
         $dir = _image($join_img, '', 'tree') . $dir2;
     }
 
     /* Highlight line differently if folder/mailbox is
      * unsubscribed. */
     $row['class'] = (++$rowct % 2) ? 'item0' : 'item1';
-    if ($showAll && $subscribe && !$imptree->isSubscribed($mailbox)) {
+    if ($showAll && $subscribe && !$imptree->isSubscribed($mailbox) && !$imptree->isContainer($mailbox)) {
         $row['class'] .= ' folderunsub';
     }
 
-    /* The indent level of the current folder. */
-    $indent_level = $mailbox['level'];
-
-    /* If we have a folder prefix, shift each folder in the hierarchy
-     * up one level before showing it to the user. */
-    if (!empty($prefix) &&
-        ($mailbox['value'] != 'INBOX') &&
-        String::substr($mailbox['value'], 0, String::length($notrail_prefix)) == $notrail_prefix) {
-        $indent_level--;
-    }
-
     $row['mbox_val'] = htmlspecialchars($mailbox['value']);
-
     $row['line'] = '';
-    $morembox[$indent_level] = $peek;
-    for ($i = 0; $i < $indent_level; $i++) {
+    $morembox[$mailbox['level']] = $peek;
+    for ($i = 0; $i < $mailbox['level']; $i++) {
         $row['line'] .= _image(($morembox[$i]) ? 'line.png' : 'blank.png', '', 'tree');
     }
     $row['line'] .= $dir;
 
     /* Hide folder prefixes from the user. */
-    if ($indent_level >= 0) {
+    if ($mailbox['level'] >= 0) {
         $rows[] = $row;
         $displayNames[] = addslashes(IMP::displayFolder($mailbox['value']));
     }
 
-    if ($last_item) {
-        break;
-    }
 } while (($mailbox = $imptree->next()));
 
 /* Check to see if user wants new mail notification */
 if ($prefs->getValue('nav_popup')) {
     $notification->push(IMP::getNewMessagePopup($newmsgs), 'javascript');
 }
+if ($prefs->getValue('nav_audio')) {
+    $play = false;
+    foreach ($newmsgs as $mb => $nm) {
+        if ($nm > 0) {
+            $play = true;
+            break;
+        }
+    }
+    if ($play) {
+        $notification->push($registry->getImageDir() . '/audio/theetone.wav',
+                            'audio');
+    }
+}
 
 /* Render the rows now. */
 $template = &new Horde_Template();
@@ -505,15 +499,18 @@
 
 if (!empty($open_compose_window)) {
     $args = 'popup=1';
-    if (isset($options)) {
-        foreach ($options as $arg => $value) {
-            $args .= !empty($value) ? '&' . $arg . '=' . urlencode($value) : '';
-        }
+    if (!isset($options)) {
+        $options = array();
     }
-    foreach (IMP::getComposeArgs() as $arg => $value) {
+    foreach (array_merge($options, IMP::getComposeArgs()) as $arg => $value) {
         $args .= !empty($value) ? '&' . $arg . '=' . urlencode($value) : '';
     }
-    echo "<script language='JavaScript' type='text/javascript'>open_compose_win('" . addslashes($args) . "'); focus_compose_win();</script>";
+    Horde::addScriptFile('popup.js');
+    echo "<script type='text/javascript'>popup_imp('" . Horde::applicationUrl('compose.php') . "',700,650,'" . addslashes($args) . "');</script>";
 }
 
+/* BC check. */
+if (class_exists('Notification_Listener_audio')) {
+    $notification->notify(array('listeners' => 'audio'));
+}
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/po/sk_SK.po
+++ mod/po/sk_SK.po
@@ -1,41 +1,45 @@
 # IMP Slovak translation.
 # Copyright (C) 2002 Leo Mrafko <leo at oel.sk> (original translator)
-# (C) 2002, 2003, 2004, 2005 Ivan Noris <vix at vazka.sk>
+# (C) 2002, 2003 Ivan Noris <vix at vazka.sk>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0.4\n"
+"Project-Id-Version: IMP 4.1\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-09-01 19:40+0200\n"
-"PO-Revision-Date: 2005-09-01 19:59+0100\n"
+"POT-Creation-Date: 2006-01-06 22:00+0100\n"
+"PO-Revision-Date: 2006-01-30 21:26+0100\n"
 "Last-Translator: Ivan Noris <vix at vazka.sk>\n"
 "Language-Team: Slovak <vix at vazka.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding:  8-bit\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "   Kópia: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "       Pre: "
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "     Dátum: "
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "        Od: "
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:405 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Klávesová skratka %s)"
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr "   Predmet: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " v "
 
@@ -43,139 +47,136 @@
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:196
+#: thread.php:150
+#, php-format
+msgid "%d Messages"
+msgstr "%d správ"
+
+#: mailbox.php:174
 #, php-format
 msgid "%d messages have been deleted."
 msgstr "Správy (%d) boli vymazané."
 
-#: lib/Spam.php:177
+#: lib/Spam.php:195
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "Správy (%d) boli ohlásené Vá¹mu správcovi ako be¾ná (nie nevy¾iadaná) po¹ta."
 
-#: lib/Spam.php:157
+#: lib/Spam.php:175
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "Správy (%d) boli ohlásené ako be¾ná (nie nevy¾iadaná) po¹ta."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:187
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
-msgstr "Správy (%d) boli oznaèené za Spam a zaslané Vá¹mu správcovi."
+msgstr ""
+"Správy (%d) boli oznaèené za nevy¾iadanú po¹tu (SPAM) a zaslané Vá¹mu "
+"správcovi."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:167
 #, php-format
 msgid "%d messages have been reported as spam."
-msgstr "Správy (%d) boli oznaèené ako Spam."
+msgstr "Správy (%d) boli oznaèené za nevy¾iadanú po¹tu (SPAM)."
 
-#: mailbox.php:369
+#: mailbox.php:355
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "Správy %d a¾ %d z %d správ"
 
-#: mailbox.php:619
+#: mailbox.php:628
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s administrácia PGP"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s administrácia S/MIME"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s u¾ existuje. Vá¹ prieèinok %s nebol premenovaný."
 
-#: lib/Message.php:612
+#: lib/Message.php:656
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s pravdepodobne nie je platná schránka."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Prieèinok %s bude premenovaný na zaèiatku mesiaca."
 
-#: lib/MIME/Viewer/itip.php:252
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s akceptoval."
 
-#: lib/MIME/Viewer/itip.php:621
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s zru¹il %s."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s zru¹il \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:258
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s odmietol."
 
-#: lib/MIME/Viewer/itip.php:489
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s odpovedal(a) na po¾iadavku zis»ovania zaneprázdnenosti."
 
-#: lib/MIME/Viewer/itip.php:612
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s odpovedal na pozvanie %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s odpovedal na pozvanie na \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:478
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s Vám poslal informáciu o zaneprázdnenosti."
 
-#: lib/MIME/Viewer/itip.php:264
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s predbe¾ne akceptoval."
 
-#: lib/MIME/Viewer/itip.php:483
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s po¾aduje informáciu o Va¹ej zaneprázdnenosti."
 
 #: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s vy¾aduje Va¹u prítomnos» na %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s vy¾aduje Va¹u prítomnos» na \"%s\"."
 
-#: lib/Message.php:377
+#: lib/Message.php:424
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "Pridanie %s do %s bolo úspe¹né."
+msgid "%s was successfully added to \"%s\"."
+msgstr "Pridanie %s do \"%s\" bolo úspe¹né."
 
-#: lib/MIME/Viewer/itip.php:593
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s by rád upravil %s."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s by rád upravil \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:570
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s by Vás rád upozornil na %s."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s by Vás rád upozornil na \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s by rád dostal najnov¹ie informácie o %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s by rád dostal najnov¹ie informácie o \"%s\"."
 
-#: message.php:269 message.php:274
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -185,15 +186,23 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;z&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Potvrdi» tieto zmeny a pokraèova» nasledujúcou obrazovkou.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Zru¹i» v¹etky zmeny a vráti» sa k písaniu správy.)"
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Iba text)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -201,7 +210,7 @@
 "(Návrat k písaniu správy po aplikovaní v¹etkých doteraj¹ích zmien. Zmeny na "
 "aktuálnej obrazovke NEBUDÚ aplikované.)"
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -209,53 +218,55 @@
 "(Odosla» správu po aplikovaní v¹etkých doteraj¹ích zmien. Zmeny na aktuálnej "
 "obrazovke NEBUDÚ aplikované.)"
 
-#: templates/contacts/contacts.inc:222
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Pridajte kliknutím na OK *"
 
-#: templates/contacts/contacts.inc:201
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Prosím vyberte adresu(y) *"
 
-#: mailbox.php:194
+#: mailbox.php:172
 msgid "1 message has been deleted."
 msgstr "1 správa bola vymazaná."
 
-#: lib/Spam.php:179
+#: lib/Spam.php:197
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
-"1 správa bola ohlásená Vá¹mu systémovému správcovi ako be¾ná (nie "
+"1 správa bola ohlásená Vá¹mu systémovému správcovi ako normálna (nie "
 "nevy¾iadaná) po¹ta."
 
-#: lib/Spam.php:159
+#: lib/Spam.php:177
 msgid "1 message has been reported as not spam."
 msgstr "1 správa bola ohlásená ako be¾ná (nie nevy¾iadaná) po¹ta."
 
-#: lib/Spam.php:171
+#: lib/Spam.php:189
 msgid "1 message has been reported as spam to your system administrator."
-msgstr "Jedna správa bola oznaèená za Spam a zaslaná Vá¹mu správcovi."
+msgstr ""
+"Jedna správa bola oznaèená za nevy¾iadanú po¹tu (SPAM) a zaslaná Vá¹mu "
+"správcovi."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:169
 msgid "1 message has been reported as spam."
 msgstr "Jedna správa bola oznaèená za nevy¾iadanú po¹tu (SPAM)."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:807
 msgid "100 characters"
 msgstr "100 znakov"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:810
 msgid "1000 characters"
 msgstr "1000 znakov"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:808
 msgid "250 characters"
 msgstr "250 znakov"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:809
 msgid "500 characters"
 msgstr "500 znakov"
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "K tejto správe je pripojený veµký obrázok pomenovaný %s."
@@ -270,59 +281,59 @@
 msgid "AND"
 msgstr "A ZÁROVEÒ"
 
-#: lib/MIME/Viewer/itip.php:586
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Prija» a prida» do môjho kalendára"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Prija» po¾iadavku"
 
-#: lib/MIME/Viewer/itip.php:583
-msgid "Accept request and add it to my calendar"
-msgstr "Akceptova» udalos» a prida» ju do môjho kalendára."
-
-#: lib/MIME/Viewer/itip.php:749
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Prijatá"
 
-#: lib/MIME/Viewer/itip.php:253
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "Prijatá: "
 
-#: lib/IMP.php:938 lib/IMP.php:940
-msgid "Acco_unts"
-msgstr "Úè_ty"
-
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Názov úètu:"
 
-#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:726
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Akcie"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Prida» %s do môjho adresára"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Prida» zdroj"
 
-#: lib/MIME/Viewer/itip.php:573 lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Prida» do môjho kalendára"
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Prida» do adresára (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Prida» do môjho kalendára"
 
-#: compose.php:1191
+#: compose.php:588
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Príloha \"%s\" bola pripojená"
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Ïal¹ie hlavièky zobrazované pri prezeraní: <i> (voliteµné, zadajte ka¾dú "
-"hlavièku na novom riadku)</i>"
+"Ïal¹ie hlavièky zobrazované pri prezeraní: <em>(voliteµné, zadajte ka¾dú "
+"hlavièku na novom riadku)</em>"
 
 #: lib/MIME/Viewer/notification.php:62
 #, php-format
@@ -351,43 +362,43 @@
 msgid "Additional message error details can be viewed %s."
 msgstr "Ïal¹ie detaily chybovej správy mô¾u by» zobrazené %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adresár"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adresáre"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Adresy, na ktoré sa majú posiela» skryté kópie (BCC) v¹etkých správ: <i>"
-"(voliteµné, zadajte ka¾dú adresu na novom riadku)</i>"
+"Adresy, na ktoré sa majú posiela» skryté kópie (BCC) v¹etkých správ: <em>"
+"(voliteµné, zadajte ka¾dú adresu na novom riadku)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Adresy, ktoré sa majú explicitne zviaza» s touto identitou: <i>(voliteµné, "
-"zadajte ka¾dú adresu na novom riadku)</i>"
+"Adresy, ktoré sa majú explicitne zviaza» s touto identitou: <em>(voliteµné, "
+"zadajte ka¾dú adresu na novom riadku)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:811
 msgid "All"
 msgstr "V¹etky"
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "V¹etky správy v nasledujúcich prieèinkoch sa stiahnu do jedného súboru MBOX:"
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -408,14 +419,18 @@
 msgstr ""
 "V¹etky prieèinky odoslanej po¹ty star¹ie ako %s mesiacov budú vymazané."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
-"V¹etky práva pre prieèinok \"%s\" pre pou¾ívateµa \"%s\" boli úspe¹ne "
+"V¹etky práva pre prieèinok \"%s\" platné pre pou¾ívateµa \"%s\" boli úspe¹ne "
 "odstránené."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Povoli» vytváranie prieèinkov?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Povoli» aplikovanie filtrovacích pravidiel na µubovoµnú schránku?"
 
@@ -423,25 +438,29 @@
 msgid "Alternative parts for this section:"
 msgstr "Alternatívne èasti pre túto sekciu:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "V¾dy"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "V¾dy uklada» prílohy"
 
-#: lib/Message.php:468
+#: lib/Message.php:515
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr "Pri pokuse o odstránenie prílohy nastala chyba. IMAP server:"
 
-#: lib/Message.php:364
+#: lib/Message.php:398
+msgid "An unknown error occured while creating the new note."
+msgstr "Pri vytváraní novej poznámky sa vyskytla neznáma chyba."
+
+#: lib/Message.php:397
 msgid "An unknown error occured while creating the new task."
 msgstr "Pri vytváraní novej úlohy sa vyskytla neznáma chyba."
 
-#: message.php:484 mailbox.php:693 templates/message/navbar_navigate.inc:9
+#: message.php:496 mailbox.php:701 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -460,19 +479,25 @@
 msgid "Apply Filters to %s"
 msgstr "Aplikova» filtre na %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Aplikova» filtrovacie pravidlá pri prihlásení?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
-msgstr "Aplikova» filtrovacie pravidlá pri obnovení zobrazenia schránky?"
+msgstr ""
+"Aplikova» filtrovacie pravidlá pri obnovení zobrazenia schránky prijatých "
+"správ?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Naozaj chcete vymaza» túto definíciu virtuálneho prieèinka?"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Naozaj chcete vymaza» tento verejný kµúè?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "Naozaj chcete vymaza» tento Vá¹ kµúèový pár? (Neodporúèame!)"
@@ -481,11 +506,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Naozaj to chcete urobi»?"
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:401 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Urèite chcete NATRVALO vymaza» tieto správy?"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:222
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Urèite chcete NATRVALO vymaza» túto prílohu?"
 
@@ -493,7 +518,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Urèite chcete vyprázdni» tento prieèinok?"
 
-#: lib/IMP.php:929
+#: lib/IMP.php:956
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Urèite chcete vyprázdni» prieèinok so spamom?"
+
+#: lib/IMP.php:949
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Urèite chcete vyprázdni» Vá¹ Kô¹?"
 
@@ -501,43 +530,39 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Urèite chcete vymaza» tieto správy ?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Urèite chcete ohlási» túto správu ako ne¹kodnú?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
-msgstr "Urèite chcete ohlási» túto správu ako Spam?"
+msgstr "Urèite chcete ohlási» túto správu ako nevy¾iadanú po¹tu (spam)?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:904
 msgid "Arrival Time"
 msgstr "Èas doruèenia"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:919
 msgid "Ascending"
 msgstr "Vzostupne"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Spýta» sa"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Pripoji»"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:469
 msgid "Attach Files"
 msgstr "Pripoji» súbory"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:450
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Vlo¾i» Vá¹ verejný kµúè do správy?"
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Pripojený súbor:"
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -545,22 +570,26 @@
 "Pripojený súbor \"%s\" prekraèuje limit na veµkos» prílohy. Súbor NEBOL "
 "pripojený."
 
-#: lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "V prílohe je odpoveï na Va¹u kalendárovú po¾iadavku."
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:497 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Príloha"
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Príloha %s bola vymazaná."
+
+#: compose.php:1097 lib/Message.php:476
 msgid "Attachment stripped: Original attachment type"
 msgstr "Príloha bola odstránená: pôvodný typ prílohy"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:467
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Prílohy"
 
@@ -576,7 +605,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: po¾adované roz¹írenie IMAP nebolo nájdené."
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -586,7 +615,7 @@
 msgid "Available Address books:"
 msgstr "Dostupné adresáre:"
 
-#: lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Èaká sa na odpoveï"
 
@@ -595,13 +624,26 @@
 msgid "Bac_k to %s"
 msgstr "_Spä» na %s"
 
-#: thread.php:82 templates/message/navbar_navigate.inc:26
+#: thread.php:136 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Spä» na %s"
 
-#: message.php:250 search.php:146 templates/contacts/contacts.inc:217
-#: templates/compose/recompose.inc:20
+#: thread.php:133
+msgid "Back to Multiple Message View Index"
+msgstr "Spä» na zobrazenie viacerých správ"
+
+#: thread.php:131
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Zlá alebo zle formulovaná po¾iadavka. Server odpovedal: %s"
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -609,15 +651,15 @@
 msgid "Below is the raw text of the status information message."
 msgstr "Ni¾¹ie je pôvodný text správy o stave."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Èierna listina"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Zablokova» obrázky v HTML správach a¾ do explicitného vy¾iadania?"
 
-#: search.php:154
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Telo"
 
@@ -626,15 +668,15 @@
 msgid "Both"
 msgstr "Obe"
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:675
 msgid "Both Header Listing and Body of Message"
 msgstr "Hlavièky a telo správy"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "Z_naková sada"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Kalendár"
 
@@ -654,15 +696,16 @@
 msgstr ""
 "Nemo¾no zobrazi» - v tejto schránke je iba prvých %s z %s èastí správy."
 
-#: folders.php:272 templates/contacts/contacts.inc:250
-#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
-#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
-#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
+#: folders.php:263 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Zru¹i»"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:429
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Zru¹i» správu"
 
@@ -670,28 +713,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Zru¹ením správy natrvalo zru¹íte jej obsah."
 
-#: message.php:249 search.php:142 templates/contacts/contacts.inc:216
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:697
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Import certifikátov nie je dostupný. Nahrávanie súborov nie je na tomto "
+"serveri povolené."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Vedúci"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Zmeni»"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Zmeni» v¹etky"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Zmeni» prieèinok"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -711,23 +762,23 @@
 "Nastavenie mena, adresy a signatúry, ktoré sa zobrazujú vo Vami napísaných "
 "správach."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:812
 msgid "Characters to display:"
 msgstr "Poèet znakov na zobrazenie:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Kontrola novej po¹ty v prieèinkoch"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Za¹krtnú» _v¹etky/¾iadne"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Za¹krtnite v¹etky mailové servery, z ktorých chcete s»ahova» po¹tu:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Skontrolova» pravopis pred odoslaním správy?"
 
@@ -735,18 +786,14 @@
 msgid "Choose Action:"
 msgstr "Vyberte akciu:"
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:179
 msgid "Choose a mail server:"
 msgstr "Vyberte mailový server:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
 msgid "Choose a match or edit the address to the right:"
-msgstr "Prosím vyberte adresu alebo ju upravte vpravo:"
-
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:727
-msgid "Choose an action:"
-msgstr "Vyberte akciu:"
+msgstr "Prosím vyberte alebo upravte adresu v priestore vpravo:"
 
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
@@ -757,48 +804,43 @@
 msgstr ""
 "Vyberte poradie, v akom sa budú prehµadáva» adresáre pri dopåòaní adries."
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Kliknite %s pre konverziu obrázku do formátu, ktorý podporuje Vá¹ prehliadaè."
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Kliknite %s pre stiahnutie obrázku."
 
-#: lib/Filter.php:107
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Kliknite %s pre stránku administrácie %s."
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Kliknite %s pre zobrazenie HTML obsahu v samostatnom okne."
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Kliknite %s pre zobrazenie zmen¹enej kópie obrázku."
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Kliknite %s pre zobrazenie prílohy v samostatnom okne."
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
-msgstr ""
-"Kliknite %s pre zobrazenie tejto multipart/related èasti v samostatnom okne."
-
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Kliknite sem pre UKRYTIE obrázkov"
+msgstr "Kliknite %s pre zobrazenie multipart/related èasti v samostatnom okne."
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Kliknite sem pre ZOBRAZENIE obrázkov"
 
@@ -810,48 +852,48 @@
 "Kliknite na jeden z Va¹ich vybraných adresárov a potom oznaète polia, ktoré "
 "chcete prehµadáva»."
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Kliknite pre ulo¾enie verejného PGP kµúèa do Vásho adresára"
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "Kliknite pre ulo¾enie S/MIME certifikátu %s do Vá¹ho adresára"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:938
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Kliknutím na adresu zaènete písa» novú správu odosielateµovi"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will open the message to be read"
 msgstr "Kliknutím na adresu sa otvorí správa"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Zatvori»"
 
-#: compose.php:775 compose.php:1082
+#: compose.php:417
 msgid "Close this window"
 msgstr "Zatvori» okno"
 
-#: folders.php:415
+#: folders.php:408
 msgid "Closed Folder"
 msgstr "Zatvorený prieèinok"
 
-#: folders.php:435
+#: folders.php:428
 msgid "Collapse"
 msgstr "Zbali»"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Zbali» v¹etko"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Zbali» v¹etky prieèinky"
 
-#: folders.php:435
+#: folders.php:428
 msgid "Collapse Folder"
 msgstr "Zbali» prieèinok"
 
@@ -859,32 +901,23 @@
 msgid "Color Indicator: "
 msgstr "Uká¾ka farby:"
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Komentár"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Hotovo"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Písa» správu"
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Písa» správu (%s)"
-
-#: compose.php:774 compose.php:1081
+#: compose.php:416
 msgid "Compose another message"
 msgstr "Písa» ïal¹iu správu"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
-msgstr "Písa» správy v samostatnom okne?"
+msgstr "Písa» správy v novom okne?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -895,25 +928,33 @@
 msgid "Configure how messages are displayed."
 msgstr "Nastavenie spôsob zobrazenia správ."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Nastavenie zobrazenia uká¾ok správ."
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "IMAP server ukonèil spojenie."
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Spojenie so serverom zlyhalo"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Nastavenie podpory PGP pre aplikáciu %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Nastavenie podpory S/MIME pre aplikáciu %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Nastavi» mo¾nosti pre hµadanie správ."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -921,7 +962,7 @@
 "Nastavenia, ktoré urèujú, kedy sa budú kontrolova» nové správy a èi sa "
 "zobrazí informácia o príchode novej správy."
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:684
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Skonvertova» textové emotikony na grafické?"
 
@@ -933,25 +974,30 @@
 msgid "Copy to folder"
 msgstr "Skopírova» do prieèinka"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Opravi»"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Opravený text"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Nepodarilo sa dokonèi» po¾iadavku. Dôvod: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Nepodarilo sa vytvori» VFS backend: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:647
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nemo¾no vymaza» správy z %s: %s"
 
-#: lib/Session.php:293
+#: lib/Session.php:322
 msgid "Could not execute maintenance operations."
 msgstr "Nemo¾no vykona» operácie údr¾by."
 
@@ -963,17 +1009,25 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Nemo¾no vybra» po¾adovaný súbor zo Zip archívu."
 
-#: search.php:349 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Nepodarilo sa vytvori» bezpeèné spojenie s IMAP serverom. %s : %s."
+
+#: lib/Session.php:272
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Nepodarilo sa získa» informáciu o menných oblastiach z IMAP servera."
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Vytvori»"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Vytvori» prieèinok"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Vytvori» kµúèe"
 
@@ -981,15 +1035,19 @@
 msgid "Create Virtual Folder"
 msgstr "Vytvori» virtuálny prieèinok"
 
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Vytvori» nový úèet"
+
 #: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
 msgid "Create a new Spam folder"
-msgstr "Vytvori» nový prieèinok pre Spam"
+msgstr "Vytvori» nový prieèinok spamu"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Vytvori» nový prieèinok konceptov"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Vytvori» nový prieèinok odoslanej po¹ty"
 
@@ -997,20 +1055,28 @@
 msgid "Create a new trash folder"
 msgstr "Vytvori» nový odpadkový kô¹"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
 "Vytváranie pravidiel na usporiadanie Va¹ej prichádzajúcej po¹ty, jej "
-"triedenie do prieèinkov a mazanie Spam-u."
+"triedenie do prieèinkov a mazanie nevy¾iadanej po¹ty."
+
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Vytvori» novú ¹ablónu"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Vytvori» ¹ablónu a odpovede."
 
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Aktuálny prístup do %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Nastavenie úètov pre s»ahovanie po¹ty z iných úètov."
 
@@ -1027,80 +1093,97 @@
 msgid "Dat_e"
 msgstr "Dát_um"
 
-#: message.php:246 thread.php:88
+#: message.php:262 thread.php:147
 msgid "Date"
 msgstr "Dátum"
 
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
-msgstr "Odmietnutá"
+msgstr "Odmietnuté"
 
-#: lib/MIME/Viewer/itip.php:259
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
-msgstr "Odmietnutá: "
+msgstr "Odmietnuté: "
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Prednastavené"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr "Prednastavené pole hµadania"
+
+#: config/prefs.php.dist:911
 msgid "Default sorting criteria:"
 msgstr "Prednastavené kritérium triedenia:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:921
 msgid "Default sorting direction:"
 msgstr "Prednastavený smer triedenia:"
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Prideli»"
 
-#: folders.php:406 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:239 templates/message/navbar_actions.inc:6
+#: folders.php:398 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Vymaza»"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Vymaza» %s verejný kµúè"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Zmaza» aktuálne kµúèe"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Vymaza» prieèinok (prieèinky)"
 
-#: folders.php:273
+#: folders.php:264
 msgid "Delete Selected Folders"
 msgstr "Vymaza» vybrané prieèinky"
 
-#: folders.php:406
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Vymaza» ¹ablónu"
+
+#: folders.php:398
 msgid "Delete Virtual Folder"
 msgstr "Vymaza» virtuálny prieèinok"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Vymaza» definíciu virtuálneho prieèinku pre %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Vymaza» stiahnuté správy zo vzdialeného servera?"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Odstráni» z môjho kalendára"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Vymaza» staré nalinkované prílohy na zaèiatku mesiaca?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Vymaza» staré prieèinky odoslanej po¹ty na zaèiatku mesiaca?"
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Vymaza» správy s nevy¾iadanou po¹tou po ich ohlásení?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Vymaza» správy so spamom"
 
-#: message.php:487 mailbox.php:719 templates/mailbox/navbar.inc:20
+#: message.php:499 mailbox.php:727 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Vymazané"
@@ -1109,7 +1192,7 @@
 msgid "Deleted messages"
 msgstr "Vymazané správy"
 
-#: compose.php:280
+#: compose.php:568
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Príloha \"%s\" bola vymazaná."
@@ -1118,77 +1201,89 @@
 msgid "Deleting and Moving Messages"
 msgstr "Vymazávanie a presúvanie správ"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Zamietnu» po¾iadavku"
 
-#: lib/MIME/Viewer/itip.php:536
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Zamietnu» po¾iadavku na zistenie zaneprázdnenosti"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:920
 msgid "Descending"
 msgstr "Zostupne"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:665
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Popis"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: config/prefs.php.dist:671
+#: compose.php:580
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "Súbor \"%s\" nebol pripojený, lebo bol prázdny."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Zobrazova» signatúry menej výrazne?"
 
-#: templates/contacts/contacts.inc:231
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Nastavenie zobrazenia"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Zobrazi» potvrdenie po odoslaní správy?"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:674
 msgid "Display in Body of Message"
 msgstr "Zobrazi» v tele správy"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:780
 msgid "Display pop-up notification of new mail?"
 msgstr "Zobrazi» oznámenie o prijatí novej správy?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Zobrazi» linku na Vyprázdnenie ko¹a v menu?"
+#: config/prefs.php.dist:746
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Zobrazi» linku \"Odstráni» spam\" v menu?"
+
+#: config/prefs.php.dist:738
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Zobrazi» linku \"Vyprázdni» Odpadkový kô¹\" v menu?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Pou¾itie"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "Nevyhovuje"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Nekontrolova» prieèinky na novú po¹tu"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:940
 msgid "Do not generate a link in the From: column"
 msgstr "Nevytvára» linku zo ståpca Od:"
 
-#: lib/IMP.php:1029
+#: lib/IMP.php:1057
 msgid "Do you want to open that folder?"
 msgstr "Chcete otvori» ten prieèinok?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Nemáte e¹te úèet? Zaregistrujte sa."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Hotovo"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:199
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Stiahnu» %s vo formáte .zip"
@@ -1197,25 +1292,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Stiahnu» v¹etky prílohy (formát .zip)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Stiahnu» prieèinok (prieèinky)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Stiahnu» prieèinok (prieèinky) [formát .zip]"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:199
 msgid "Download in .zip Format"
 msgstr "Stiahnu» vo formáte .zip"
 
-#: message.php:485 mailbox.php:698 templates/message/navbar_navigate.inc:11
+#: message.php:497 mailbox.php:706 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Koncept"
 
-#: folders.php:386
+#: folders.php:371
 msgid "Draft folder"
 msgstr "Prieèinok konceptov"
 
@@ -1223,11 +1318,11 @@
 msgid "Drafts folder:"
 msgstr "Prieèinok konceptov:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "E-mailová adresa"
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:319
 msgid "END"
 msgstr "KONIEC"
 
@@ -1235,20 +1330,19 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr "CHYBA: Va¹u správu nebolo mo¾né doruèi»"
 
-#: folders.php:407
+#: folders.php:399 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Upravi»"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Upravi» èiernu listinu"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Upravi» po¹tové filtre"
 
-#: folders.php:407 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:399 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
 msgstr "Upravi» virtuálny prieèinok"
 
@@ -1257,40 +1351,40 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Upravi» definíciu virtuálneho prieèinku pre %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Upravi» bielu listinu"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Upravi» èiernu listinu"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Upravi» filtrovacie pravidlá"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:849
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Upravi» nastavenia pre prístup k iným e-mailovým úètom."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Upravi» bielu listinu"
 
-#: templates/contacts/contacts.inc:234
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "E-mailová adresa"
 
-#: lib/Message.php:620
+#: lib/Message.php:664
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Vymazané v¹etky správy z %s."
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Vyprázdni» prieèinok (prieèinky)"
 
-#: folders.php:274
+#: folders.php:265
 msgid "Empty Selected Folders"
 msgstr "Vyprázdni» vybrané prieèinky"
 
@@ -1298,56 +1392,65 @@
 msgid "Empty Trash folder"
 msgstr "Vyprázdni» Odpadkový kô¹"
 
-#: lib/IMP.php:929
+#: lib/IMP.php:956
+msgid "Empty _Spam"
+msgstr "Odstráni» _spam"
+
+#: lib/IMP.php:949
 msgid "Empty _Trash"
 msgstr "Vyprázdni» Odpadkový _kô¹"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Povoli» prácu s PGP?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Povoli» prácu s S/MIME?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:799
 msgid "Enable message previews?"
 msgstr "Povoli» zobrazovanie uká¾ok správ?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:436
 msgid "Encr_yption Options"
 msgstr "Nastavenia ¹i_frovania"
 
-#: lib/MIME/Viewer/itip.php:513 lib/MIME/Viewer/itip.php:653
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Za¹ifrované"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Koniec"
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Koniec preposlanej správy"
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Koniec správy"
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Koniec správy od %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Zadajte heslo pre kµúè"
 
 #: templates/prefs/spamselect.inc:9
 msgid "Enter the name for your new Spam folder"
-msgstr "Zadajte meno pre Vá¹ nový prieèinok na Spam"
+msgstr "Zadajte meno pre Vá¹ nový prieèinok so spamom"
 
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Zadajte meno pre Vá¹ nový prieèinok konceptov"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Zadajte meno pre Vá¹ nový prieèinok odoslanej po¹ty"
 
@@ -1355,155 +1458,168 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Zadajte meno pre Vá¹ nový odpadkový kô¹"
 
-#: message.php:178 compose.php:1068 thread.php:39
+#: lib/Search.php:46
+msgid "Entire Message"
+msgstr "Celá správa"
+
+#: message.php:194 compose.php:1164 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Polo¾ka \"%s\" bola úspe¹ne vlo¾ená do adresára"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:387
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Chyba"
 
-#: lib/MIME/Viewer/itip.php:305 lib/MIME/Viewer/itip.php:403
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Chyba pri pripájani sa k IMAP serveru. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Chyba pri odosielaní odpovede: %s."
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Udalos» bola úspe¹ne vymazaná."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:770
 msgid "Every 15 minutes"
 msgstr "Ka¾dých 15 minút"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:767
 msgid "Every 30 seconds"
 msgstr "Ka¾dých 30 sekúnd"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:769
 msgid "Every 5 minutes"
 msgstr "Ka¾dých 5 minút"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:771
 msgid "Every half hour"
 msgstr "Ka¾dú pol hodinu"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:768
 msgid "Every minute"
 msgstr "Ka¾dú minútu"
 
-#: folders.php:444
+#: folders.php:436
 msgid "Expand"
 msgstr "Rozbali»"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Rozbali» v¹etko"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Rozbali» v¹etky prieèinky"
 
-#: folders.php:444
+#: folders.php:436
 msgid "Expand Folder"
 msgstr "Rozbali» prieèinok"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Doplni» mená/adresy"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1051
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Doplni» mená v okne na písanie správy automaticky na pozadí?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:968
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Implicitne rozbali» celý strom prieèinkov v zozname prieèinkov?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Robzaµuje sa"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:967 lib/IMP.php:969
+msgid "F_etch Mail"
+msgstr "S_tiahnu» po¹tu"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Stiahnu» po¹tu"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:857
 msgid "Fetch Mail in a separate window?"
-msgstr "Stiahnu» po¹tu v samostatnom okne?"
+msgstr "Stiahnu» po¹tu v novom okne?"
 
 #: templates/fetchmail/manage.inc:46
 msgid "Fetch messages upon logging on?"
 msgstr "Stiahnu» správy pri prihlásení?"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
 #, php-format
 msgid "Fetched %d messages from %s"
 msgstr "Stiahnutých %d správ z %s"
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr "Stiahnutá 1 správa z %s"
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Fetchmail:"
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: ¾iadne nové správy."
 
-#: lib/IMP.php:944
+#: lib/IMP.php:973
 msgid "Fi_lters"
 msgstr "Fi_ltre"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:493 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Súbor"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Nastavenia filtrov"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Nastavenia filtrov"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Odstráni» zo správy nadávky a neslu¹né výrazy?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Na tomto systéme je podpora filtrov zakázaná."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtre"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filtre nie sú aktivované"
 
-#: lib/Filter.php:106
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtre: stránka na správu %s"
 
-#: templates/contacts/contacts.inc:181
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Hµada»"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:893
 msgid "First Mailbox Page"
 msgstr "Prvá stránka schránky"
 
-#: mailbox.php:341
+#: mailbox.php:327
 msgid "First Page"
 msgstr "Prvá stránka"
 
@@ -1511,67 +1627,51 @@
 msgid "Fo_rward"
 msgstr "P_reposla»"
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:245 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
-msgstr "Akcie pre prieèinky - Potvrdenie"
+msgstr "Akcie s prieèinkami - potvrdenie"
 
-#: folders.php:291 templates/folders/head.inc:9
+#: folders.php:282 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Správa prieèinkov"
 
-#: templates/login/login.inc:172
-msgid "Folder Prefix"
-msgstr "Prefix pre prieèinky"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Informácie o prieèinku"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "Zdieµanie prieèinkov nie je povolené."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "Pou¾itie prieèinkov nie je povolené."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:957
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Formát dátumu zobrazených správ pre správy datované dnes"
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:818 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Preposla»"
 
-#: compose.php:712
+#: compose.php:803
 msgid "Forward:"
 msgstr "Preposla»:"
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Preposlaná správa"
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Preposlaná správa od %s"
 
-#: lib/MIME/Viewer/itip.php:479
-msgid "Free/Busy Information"
-msgstr "Informácie o zaneprázdnenosti"
-
-#: lib/MIME/Viewer/itip.php:490
-msgid "Free/Busy Reply"
-msgstr "Odpoveï na ¾iados» o zistenie zaneprázdnenosti"
-
-#: lib/MIME/Viewer/itip.php:484
-msgid "Free/Busy Request"
-msgstr "®iados» o zistenie zaneprázdnenosti"
-
-#: lib/MIME/Viewer/itip.php:397
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Odpoveï na ¾iados» o zistenie zaneprázdnenosti (XXX)"
 
@@ -1579,24 +1679,24 @@
 msgid "Fro_m"
 msgstr "_Od"
 
-#: message.php:247 search.php:134 thread.php:89
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:148 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Od"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:906
 msgid "From Address"
 msgstr "Spiatoèná adresa"
 
-#: compose.php:724 compose.php:728
+#: compose.php:815 compose.php:819
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1229
+#: compose.php:1296
 msgid "Fwd: "
 msgstr "Fwd:"
 
-#: compose.php:1231
+#: compose.php:1298
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u preposlaných správ"
@@ -1610,34 +1710,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Stiahnu» iba nové správy (iba IMAP)"
 
-#: thread.php:81
+#: templates/folders/actions.inc:31 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Odosla»"
+
+#: thread.php:135
 msgid "Go to Message"
 msgstr "Prejs» na správu"
 
-#: lib/IMP.php:551
+#: lib/IMP.php:509
 #, php-format
 msgid "Go to address book entry of \"%s\""
-msgstr "Prejs» na záznam \"%s\" v adresári"
+msgstr "Prejs» do adresára na polo¾ku \"%s\""
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Umo¾ni» prístup"
 
-#: message.php:540 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: message.php:542 lib/Filter.php:105 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
 #: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
-#: lib/MIME/Viewer/related.php:61 lib/MIME/Viewer/pkcs7.php:407
-#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "TU"
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:62
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML verzia správy"
 
@@ -1649,43 +1755,39 @@
 msgid "Here is the message you were composing:"
 msgstr "Tu je správa, ktorú ste písali:"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Skryté"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Skryté v zobrazení vlákien"
 
-#: mailbox.php:363
+#: mailbox.php:349
 msgid "Hide Deleted"
 msgstr "Skry» vymazané"
 
-#: folders.php:286
+#: folders.php:277
 msgid "Hide Unsubscribed"
 msgstr "Skry» neprihlásené"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Skry» obrázky"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Vysoká"
 
-#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:711 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Vysoká priorita"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Najvy¹¹ia"
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:676
 msgid "How do you want to display attachments?"
 msgstr "Ako sa majú zobrazi» prílohy?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Ako oznaèi» citované riadky v odpovedi"
 
@@ -1697,7 +1799,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Automaticky detekova» protokoly)"
 
-#: templates/login/login.inc:160 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP server ukonèil spojenie. Server odpovedal: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP cez SSL"
 
@@ -1705,11 +1812,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP cez SSL (certifikát podpísaný samým sebou)"
 
-#: templates/login/login.inc:161
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP cez SSL (certifikát podpísaný samým sebou)"
 
-#: templates/login/login.inc:159 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP server ukonèil spojenie."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, bez TLS"
 
@@ -1717,46 +1828,54 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 e-mailové servery"
 
-#: lib/IMP.php:884
+#: lib/IMP.php:837
 msgid "INBOX"
 msgstr "Prijaté správy"
 
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr "Ak pou¾ívate SSL alebo TLS, musíte nahra» PHP roz¹írenie openssl."
+
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr ""
 "Ak budete pokraèova», v¹etky správy v prieèinku(prieèinkoch) budú stratené!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "ignorova»"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorova» v¹etky"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Obrázok"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Import"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importova» kµúè"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Importova» kµúèový pár"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Importova» správy"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "Importova» PGP kµúè"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Importova» osobné certifikáty"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Importova» osobný certifikát"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1770,7 +1889,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Importova» osobné S/MIME certifikáty"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Importova» verejný kµúè"
 
@@ -1795,7 +1914,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Importova» súbor mbox %s do prieèinka %s."
 
-#: message.php:486 mailbox.php:713 templates/message/navbar_navigate.inc:7
+#: message.php:498 mailbox.php:721 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1805,25 +1924,25 @@
 msgid "Important messages"
 msgstr "Dôle¾ité správy"
 
-#: folders.php:157
+#: folders.php:147
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Importovaných %d správ z %s."
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "Spracúva sa"
 
-#: folders.php:378 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:363 lib/Folder.php:86 lib/Folder.php:212 lib/IMP.php:313
+#: lib/IMAP/Tree.php:109 lib/IMAP/Tree.php:214
 msgid "Inbox"
 msgstr "Prijaté správy"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Vlo¾i» do odpovede najdôle¾itej¹ie hlavièky pôvodnej správy?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Vlo¾i» pôvodnú správu do odpovede?"
 
@@ -1831,21 +1950,21 @@
 msgid "Info"
 msgstr "Info"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Informácie o %s verejnom kµúèi"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Informácie o osobnom privátnom kµúèi"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Informácie o osobnom verejnom kµúèi"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:498
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "V tele správy"
 
@@ -1865,11 +1984,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Tu vlo¾te verejný PGP kµúè"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Pre tento komponent bola vybraná neplatná akcia."
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:572 mailbox.php:614
 msgid "Invalid Address"
 msgstr "Neplatná adresa"
 
@@ -1877,20 +1996,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr "Neplatná vzdialená schránka."
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Neplatný znak v e-mailovej adrese: %s."
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "Neplatný kµúè"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Neplatný osobný PGP privátny kµúè."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Neplatný osobný PGP verejný kµúè."
 
@@ -1898,44 +2017,64 @@
 msgid "Invert"
 msgstr "Invertova»"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:588
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Då¾ka kµúèa"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "Generovanie kµúèa mô¾e trva» dlho.  Pokraèova» v generovaní kµúèa?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Import kµúèov nie je dostupný. Nahrávanie súborov nie je na tomto serveri "
+"povolené."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Import kµúèov nie je dostupný. Nemáte definovaný adresár na pridávanie "
+"kontaktov."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Kµúè bol úspe¹ne odoslaný na server verejných kµúèov."
 
-#: templates/login/login.inc:196
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Jazyk"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:894
 msgid "Last Mailbox Page"
 msgstr "Posledná stránka schránky"
 
-#: mailbox.php:354
+#: mailbox.php:340
 msgid "Last Page"
 msgstr "Posledná stránka"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "Nali_nkova» prílohy"
+#: templates/compose/compose.inc:546
+msgid "Link Attachments?"
+msgstr "Nalinkova» prílohy?"
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1083
 msgid "Linked attachments are forbidden."
 msgstr "Nalinkované prílohy sú zakázané."
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Platnos» liniek vypr¹í %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1070
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1943,7 +2082,7 @@
 "Zobrazi» v¹etky kontakty pri nahrávaní obrazovky s kontaktmi? (Ak je "
 "zakázané uvidíte iba kontakty, ktoré ste explicitne vyhµadávali)."
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:673
 msgid "Listing in the Header"
 msgstr "Zoznam v hlavièke"
 
@@ -1951,20 +2090,20 @@
 msgid "Local Mailbox:"
 msgstr "Lokálna schránka:"
 
-#: lib/MIME/Viewer/itip.php:670
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: templates/login/login.inc:204
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:118
 #, php-format
 msgid "Log in to %s"
 msgstr "Prihlási» sa na %s"
 
-#: templates/login/login.inc:133
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Prihlásenie"
 
@@ -1972,15 +2111,15 @@
 msgid "Login Tasks"
 msgstr "Úlohy pri prihlásení"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Nízka"
 
-#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:714 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Nízka priorita"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Najni¾¹ia"
 
@@ -1988,11 +2127,11 @@
 msgid "Macintosh File"
 msgstr "Súbor Macintosh"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Po¹ta"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Uká¾ky správ"
 
@@ -2000,19 +2139,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Typ mailového servera na pripojenie:"
 
-#: folders.php:396
+#: folders.php:367 folders.php:381
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Nastavenie zobrazenia schránok a prieèinkov"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Oznaèi» v¹etky správy v prieèinku ako preèítané"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Oznaèi» v¹etky správy v prieèinku ako nepreèítané"
 
@@ -2020,7 +2159,7 @@
 msgid "Mark as:"
 msgstr "Oznaèi» ako:"
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Rozli¹ova» vnorené citáty rôznymi farbami?"
 
@@ -2028,7 +2167,7 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Oznaèi» správy ako preèítané? (iba IMAP)"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Oznaèi» jednoduché formátovanie?"
 
@@ -2040,72 +2179,52 @@
 msgid "Match Any Query"
 msgstr "Vyhovuje µubovoµnej po¾iadavke"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:504
 msgid "Maximum Attachment Size"
 msgstr "Maximálna veµkos» prílohy"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Maximálny poèet prieèinkov"
+
+#: templates/compose/compose.inc:486
 msgid "Maximum number of attachments reached."
 msgstr "Bol dosiahnutý maximálny poèet príloh."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:482
 msgid "Maximum total attachment size reached."
 msgstr "Bola dosiahnutá maximálna celková veµkos» príloh."
 
-#: lib/MIME/Viewer/itip.php:622
-msgid "Meeting Cancellation"
-msgstr "Zru¹enie stretnutia"
-
-#: lib/MIME/Viewer/itip.php:571
-msgid "Meeting Information"
-msgstr "Informácie o stretnutí"
-
-#: lib/MIME/Viewer/itip.php:581
-msgid "Meeting Proposal"
-msgstr "Návrh stretnutia"
-
-#: lib/MIME/Viewer/itip.php:613
-msgid "Meeting Reply"
-msgstr "Odpoveï na návrh stretnutia"
-
-#: lib/MIME/Viewer/itip.php:594
-msgid "Meeting Update"
-msgstr "Aktualizácia stretnutia"
-
-#: lib/MIME/Viewer/itip.php:599
-msgid "Meeting Update Request"
-msgstr "®iados» o aktualizáciu stretnutia"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Zoznam prieèinkov menu"
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Správa"
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:596 compose.php:623 compose.php:677 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Písanie správy"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:905
 msgid "Message Date"
 msgstr "Dátum správy"
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Nastavenia správ"
 
-#: search.php:347
+#: search.php:312
 msgid "Message Search"
 msgstr "Vyhµadanie správy"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:909
 msgid "Message Size"
 msgstr "Veµkos» správy"
 
-#: message.php:368
+#: message.php:384
 msgid "Message Source"
 msgstr "Zdrojový text správy"
 
@@ -2113,10 +2232,6 @@
 msgid "Message Viewing"
 msgstr "Zobrazenie správy"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Polia správy"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Príznaky správy"
@@ -2125,20 +2240,20 @@
 msgid "Message folders"
 msgstr "Prieèinky správ"
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Správa od %s"
 
-#: mailbox.php:646
+#: mailbox.php:655
 msgid "Message has attachments"
 msgstr "Správa má prílohy"
 
-#: mailbox.php:637
+#: mailbox.php:646
 msgid "Message is encrypted"
 msgstr "Správa je za¹ifrovaná"
 
-#: mailbox.php:632
+#: mailbox.php:641
 msgid "Message is signed"
 msgstr "Správa je podpísaná"
 
@@ -2146,24 +2261,24 @@
 msgid "Message matches"
 msgstr "Správa vyhovuje"
 
-#: compose.php:771 compose.php:785
+#: compose.php:862 compose.php:869
 msgid "Message redirected successfully."
 msgstr "Správa bola úspe¹ne presmerovaná"
 
-#: compose.php:1018
+#: compose.php:1114
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Správa bola úspe¹ne odoslaná, ale nie ulo¾ená do %s"
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1173 compose.php:1181
 msgid "Message sent successfully."
 msgstr "Správa bola úspe¹ne odoslaná."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:929
 msgid "Messages per page in the mailbox view."
 msgstr "Správ na stránku v zozname správ"
 
-#: mailbox.php:318
+#: mailbox.php:308
 msgid "Messages to"
 msgstr "Správy do"
 
@@ -2184,6 +2299,10 @@
 msgid "Move down"
 msgstr "Presunú» ni¾¹ie"
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "Presunú» spam do prieèinka spamov a ne¹kodné správy do prijatej po¹ty"
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Presunú» do prieèinka"
@@ -2196,49 +2315,66 @@
 msgid "Multipart/alternative"
 msgstr "Viacero èastí/alternatívy"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:151
+msgid "Multiple Message View"
+msgstr "Zobrazenie viacerých správ"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr "®IADNE"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "POZNÁMKA"
 
-#: templates/contacts/contacts.inc:233 lib/MIME/Viewer/itip.php:684
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Meno"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "Meno a/alebo e-mailová adresa nemô¾u by» prázdne"
 
-#: lib/MIME/Viewer/itip.php:774
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Vy¾aduje akciu"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:766
 msgid "Never"
 msgstr "Nikdy"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Nikdy neuklada» prílohy"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Nové"
 
-#: lib/IMP.php:613
+#: lib/IMP.php:574
 msgid "New Folder"
 msgstr "Nový prieèinok"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nová po¹ta"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:37
+msgid "New Message"
+msgstr "Nová správa"
+
+#: mailbox.php:763 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Nová správa pre %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nové správy"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Ïalej"
 
@@ -2246,15 +2382,16 @@
 msgid "Next Message"
 msgstr "Ïal¹ia správa"
 
-#: mailbox.php:352
+#: mailbox.php:338
 msgid "Next Page"
 msgstr "Ïal¹ia strana"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:965
 msgid "No"
 msgstr "Nie"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "®iaden certifikát nebol nájdený"
 
@@ -2262,106 +2399,120 @@
 msgid "No Encryption"
 msgstr "Bez ¹ifrovania"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Databáza kµúèov je prázdna"
 
-#: mailbox.php:371
+#: mailbox.php:357
 #, php-format
 msgid "No Messages"
 msgstr "®iadne správy"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Nebol importovaný ¾iaden verejný PGP kµúè."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Nie je prítomný ¾iaden osobný certifikát"
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:336
 msgid "No Preview Text"
-msgstr "®iadna uká¾ka"
+msgstr "Bez uká¾ky"
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Neboli nájdené ¾iadne verejné kµúèe"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Nebol importovaný ¾iaden verejný S/MIME kµúè."
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Neboli nájdené ¾iadne prílohy."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Vo verejnom kµúèi nie je ¾iadna informácia o e-mailovej adrese."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "®iaden prieèinok nie je oznaèený."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:146
 msgid "No folders are being checked for new mail."
 msgstr "®iadne prieèinky sa nekontrolujú na výskyt novej po¹ty."
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:197 lib/Folder.php:508 lib/Folder.php:558
 msgid "No folders were specified"
 msgstr "Neboli ¹pecifikované prieèinky"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:152
 msgid "No folders with new messages"
 msgstr "V ¾iadnom prieèinku nie sú nové správy"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:149
 msgid "No folders with unseen messages"
 msgstr "V ¾iadnom prieèinku nie sú nepreèítané správy"
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "®iaden text v tele správy"
 
-#: lib/Mailbox.php:365
+#: lib/Mailbox.php:380
 msgid "No messages matched your search."
 msgstr "®iadna správa nevyhovuje Vá¹mu zadaniu."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Nebol importovaný ¾iaden privátny PGP kµúè."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Nebol importovaný ¾iaden verejný PGP kµúè."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Neboli importované ¾iadne osobné S/MIME certifikáty."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr "Neexistuje ¾iaden privátny kµúè, tak¾e správu nemo¾no de¹ifrova»."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Nebol nastavený ¾iaden program na kontrolu pravopisu."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "®iadne chyby pravopisu"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "®iadne návrhy"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:570
+msgid "No supported IMAP authentication method could be found."
+msgstr "Nepodarilo sa nájs» ¾iadnu podporovanú metódu IMAP autentifikácie."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Nebol ¹pecifikovaný pou¾ívateµ."
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Nie je úèastník"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
-#: lib/MIME/Viewer/itip.php:660
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "®iadne"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normálna"
 
@@ -2383,8 +2534,7 @@
 msgid "Not Personal"
 msgstr "Nie je osobné"
 
-#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:140
-#: lib/Crypt/SMIME.php:149
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Neplatný verejný kµúè."
 
@@ -2400,24 +2550,31 @@
 msgid "Note that this can take some time"
 msgstr "Mô¾e to chvíµu trva»."
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Niè"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Upozornenie: nalinkovaná príloha bola stiahnutá"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Poèet mesiacov, poèas ktorých sa majú ponecha» staré nalinkované prílohy pri "
 "mesaènom mazaní."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Poèet starých prieèinkov odoslanej po¹ty, ktoré sa majú ponecha» pri "
 "mesaènom mazaní."
 
-#: templates/contacts/contacts.inc:249 lib/MIME/Viewer/itip.php:548
-#: lib/MIME/Viewer/itip.php:729
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "ALEBO"
@@ -2430,43 +2587,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr "Staré prieèinky odoslaných správ sa vymazávajú."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Zobrazi» len prieèinky s nepreèítanými správami?"
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
 msgstr "Pre túto akciu by mal by» vybratý iba jeden prieèinok."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "Otvo_ri» prieèinok"
-
-#: templates/menu.inc:23
-msgid "Open Folder"
-msgstr "Otvori» prieèinok"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "Otvori» _prieèinok"
 
-#: folders.php:413
+#: folders.php:406
 msgid "Opened Folder"
 msgstr "Otvorený prieèinok"
 
-#: lib/MIME/Viewer/itip.php:701
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Nepovinný úèastník"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Iné po¹tové úèty"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Iné nastavenia"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:291
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2474,19 +2631,15 @@
 msgid "PGP Encrypt Message"
 msgstr "Za¹ifrova» správu pomocou PGP"
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "Chyba PGP: "
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "Chyba PGP: pre osobný privátny kµúè treba zada» heslo."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP nie je aktivované"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "Nastavenia PGP"
 
@@ -2494,27 +2647,27 @@
 msgid "PGP Passphrase Input"
 msgstr "Zadávanie hesla pre PGP"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 "Pre podporu osobného kµúèového páru PGP musíte ma» bezpeèné pripojenie "
 "(https)."
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Text PGP verejného kµúèa"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Verejný PGP kµúè pre \"%s (%s)\" bol úspe¹ne pridaný."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Verejný PGP kµúè pre \"%s\" bol úspe¹ne vymazaný."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Databáza verejných PGP kµúèov"
 
@@ -2526,19 +2679,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Podpísa»/za¹ifrova» správu pomocou PGP"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Privátny PGP kµúè bol úspe¹ne pridaný."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Verejný PGP kµúè bol úspe¹ne pridaný."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Na tomto systéme je podpora PGP zakázaná."
 
-#: lib/MIME/Viewer/pgp.php:209
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2546,17 +2699,17 @@
 "Podpora PGP nie je momentálne aktivovaná, tak¾e nemo¾no overi» digitálny "
 "podpis."
 
-#: lib/MIME/Viewer/pgp.php:296
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "Podpora PGP nie je momentálne aktivovaná, tak¾e nemo¾no de¹ifrova» správu."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "Podpora PGP vy¾aduje pou¾itie vyskakovacích okien. Ak Vá¹ prehliadaè "
 "momentálne blokuje vyskakovacie okná, musíte toto nastavenie zmeni», inak "
@@ -2578,7 +2731,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 cez SSL (certifikát podpísaný samým sebou)"
 
-#: templates/login/login.inc:163
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 cez SSL (certifikát podpísaný samým sebou)"
 
@@ -2586,16 +2739,16 @@
 msgid "POP3, no TLS"
 msgstr "POP3, bez TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:20
 #, php-format
 msgid "Page %d of %d"
 msgstr "Strana %d z %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:891
 msgid "Page with the First Unseen Message"
 msgstr "Stránka s prvou nepreèítanou správou"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:892
 msgid "Page with the Last Unseen Message"
 msgstr "Stránka s poslednou nepreèítanou správou"
 
@@ -2603,32 +2756,32 @@
 msgid "Part(s)"
 msgstr "Èas»(i)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Heslo pre kµúè"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Heslo pre kµúè (znovu)"
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "Heslo bolo úspe¹ne odstránené z pamäti."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Heslo pre kµúè:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
-msgstr "Heslo pre kµúè nemô¾e by» prázdne"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "Heslá pre kµúèe nemô¾u by» prázdne"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Heslá nie sú rovnaké"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:190
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Heslo"
 
@@ -2636,11 +2789,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Vykona» operácie údr¾by pri prihlásení?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "Práva pre tohto pou¾ívateµa nemo¾no zmeni»."
 
-#: message.php:477 mailbox.php:682 templates/mailbox/navbar.inc:24
+#: message.php:486 mailbox.php:690 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Osobné"
@@ -2649,39 +2802,49 @@
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Osobný PGP kµúèový pár bol úspe¹ne vygenerovaný."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Osobné PGP kµúèe boli úspe¹ne vymazané."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Osobné S/MIME certifikáty NEBOLI importované: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Osobné S/MIME kµúèe boli úspe¹ne vymazané."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Vklada» Va¹u signatúru pred odpovede a preposlanú po¹tu?"
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Zobrazi» textovú verziu správy"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:787
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Prehra» zvuk pri príchode novej po¹ty?  Toto vy¾aduje podporu Vá¹ho "
+"prehliadaèa pre vlo¾ené zvukové súbory.  Na platformách Windows a Mac sú to "
+"takmer v¹etky, na iných platformách budete potrebova» plugin."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Zadajte prosím meno pre nový prieèinok:"
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Zadajte prosím meno pre nový prieèinok:"
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Zadajte prosím nové meno:"
 
@@ -2703,7 +2866,7 @@
 "Zadajte prosím heslo pre Vá¹ privátny S/MIME kµúè. Heslo musíte zada» iba "
 "raz a platí poèas celej relácie %s."
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2716,43 +2879,31 @@
 "útoèníkmi, ktorí by zneu¾ili identifikaèné èíslo Va¹ej relácie. Ïakujeme za "
 "pochopenie."
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Prosím zadajte svoje heslo"
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Prosím zadajte svoje pou¾ívateµské meno"
 
-#: compose.php:79 lib/IMP.php:507
+#: compose.php:106 lib/IMP.php:470
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Prosím rozlú¹ti» nejednoznaèné a neplatné adresy."
 
-#: lib/MIME/Viewer/itip.php:638
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Prosím skontrolujte nasledujúce informácie a potom vyberte akciu z ni¾¹ie "
-"uvedeného menu."
-
-#: templates/folders/javascript.inc:53
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Pred vykonaním akcie vyberte prosím prieèinok."
 
-#: lib/MIME/Viewer/itip.php:498
-msgid "Please select an action from the menu below."
-msgstr "Prosím vyberte akciu z menu uvedeného ni¾¹ie."
-
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Prosím vyberte aspoò jeden prieèinok na hµadanie."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Prosím vyberte iba jeden prieèinok pre túto operáciu."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Prosím oznaète alebo upravte v priestore vpravo:"
 
@@ -2760,11 +2911,11 @@
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Oddeli» signatúru od správy pomlèkami ('-- ')?"
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Nastavenia boli úspe¹ne aktualizované."
 
@@ -2776,11 +2927,11 @@
 msgid "Previous Message"
 msgstr "Predchádzajúca správa"
 
-#: mailbox.php:343
+#: mailbox.php:329
 msgid "Previous Page"
 msgstr "Predchádzajúca stránka"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Tlaèi»"
 
@@ -2788,15 +2939,15 @@
 msgid "Priority"
 msgstr "Priorita"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Heslo k privátnemu kµúèu"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Pýta» sa zaka¾dým pri posielaní prílohy; ¹tandardne NIE"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Pýta» sa zaka¾dým pri posielaní prílohy; ¹tandardne ÁNO"
 
@@ -2804,40 +2955,40 @@
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Podpora PGP kµúèových serverov bola zakázaná."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "O_dstráni» vymazané"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Odstráni» vymazané"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Vyprázdni» prieèinok (prieèinky)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Ako èasto vyprázdni» Kô¹:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Odstráni» z Ko¹a správy star¹ie ako tento poèet dní."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Odstráni» staré správy z Ko¹a?"
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
 msgid "Purging %d messages from Trash folder."
-msgstr "Odstraòujem správy (%d) z Ko¹a."
+msgstr "Odstraòujem %d správ z Ko¹a."
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr "Odstraòujem 1 správu z Ko¹a."
 
@@ -2856,24 +3007,20 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Stav kvóty: BEZ OBMEDZENIA"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Citát %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "_Vy¾iada» si potvrdenie o doruèení"
-
-#: search.php:158
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "Prijaté dòa"
 
-#: search.php:166
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Prijaté od"
 
-#: search.php:162
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Prijaté do"
 
@@ -2885,23 +3032,19 @@
 msgid "Redirect"
 msgstr "Presmerova»"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Presmerova» správu"
 
-#: compose.php:734
+#: compose.php:825
 msgid "Redirect this message"
 msgstr "Presmerova» túto správu"
 
-#: compose.php:794
+#: compose.php:878
 msgid "Redirecting failed."
 msgstr "Presmerovanie zlyhalo."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Obnovi»"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:772
 msgid "Refresh Folder Views:"
 msgstr "Obnovi» zobrazenie prieèinkov:"
 
@@ -2913,11 +3056,11 @@
 msgid "Reload View"
 msgstr "Obnovi» zobrazenie"
 
-#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "pamäta» si informácie o zaneprázdnenosti."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:967
 msgid "Remember the last view"
 msgstr "Pamäta» si posledné zobrazenie"
 
@@ -2925,7 +3068,7 @@
 msgid "Remote Mailbox:"
 msgstr "Vzdialená schránka:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Odstráni» pole z prehµadávania"
 
@@ -2933,15 +3076,15 @@
 msgid "Remove source"
 msgstr "Odobra» zdroj"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Premenova» prieèinok(prieèinky)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Premenova» prieèinok odoslanej po¹ty na zaèiatku mesiaca?"
 
-#: lib/Folder.php:440
+#: lib/Folder.php:463
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Premenovanie \"%s\" na \"%s\" zlyhalo. "
@@ -2950,7 +3093,7 @@
 msgid "Repl_y to List"
 msgstr "Odpoveda» do e-mailovej _konferencie"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Prepísa» na:"
 
@@ -2958,7 +3101,7 @@
 msgid "Reply"
 msgstr "Odpoveda»"
 
-#: lib/MIME/Viewer/itip.php:307 lib/MIME/Viewer/itip.php:405
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Odpoveï bola odoslaná."
 
@@ -2966,7 +3109,7 @@
 msgid "Reply to All"
 msgstr "Odpoveda» v¹etkým"
 
-#: compose.php:680
+#: compose.php:769
 msgid "Reply to All:"
 msgstr "Odpoveda» v¹etkým:"
 
@@ -2974,7 +3117,7 @@
 msgid "Reply to List"
 msgstr "Odpoveda» do e-mailovej konferencie"
 
-#: compose.php:682
+#: compose.php:771
 msgid "Reply to List:"
 msgstr "Odpoveda» do e-mailovej konferencie:"
 
@@ -2982,106 +3125,100 @@
 msgid "Reply to _All"
 msgstr "Odpoveda» _v¹etkým"
 
-#: lib/MIME/Viewer/itip.php:524 lib/MIME/Viewer/itip.php:533
-#: lib/MIME/Viewer/itip.php:543
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Odpoveda» so správou: Nepodporované"
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Odpoveda» správou o zaneprázdnenosti na nasledujúce 2 mesiace."
 
-#: lib/MIME/Viewer/itip.php:530
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Odpoveda» správou s po¾adovanou informáciou o zaneprázdnenosti."
 
-#: message.php:251
+#: message.php:267
 msgid "Reply-To"
 msgstr "Odpoveda»"
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Odpoveda»: "
 
-#: compose.php:678
+#: compose.php:767
 msgid "Reply:"
 msgstr "Odpoveda»:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Ohlási» ako ne¹kodnú po¹tu"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "Ohlási» ako Spam"
+msgstr "Ohlási» ako nevy¾iadanú po¹tu"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "Vy¾iada» si správu o p_reèítaní"
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr "Vy¾adova» potvrdenie o doruèení?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Vy¾adova» správu o preèítaní?"
 
-#: mailbox.php:204
+#: mailbox.php:187
 msgid "Requested message not found."
 msgstr "Po¾adovaná správa nebola nájdená."
 
-#: lib/MIME/Viewer/itip.php:693
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Po¾adovaný úèastník"
 
 #: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Vymaza» formulár"
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Stav úèastníka bol aktualizovaný."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Obnovi»"
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Pokraèova» v relácii"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Návrat do menu \"Písanie správy\""
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 #: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "Návrat k s»ahovaniu po¹ty"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Návrat na obrazovku s hlavnými nastaveniami"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Návrat na nastavenia"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Návrat na predchádzajúcu obrazovku"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:706
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Vráti» sa na zoznam správ po vymazaní, presune alebo kopírovaní správy?"
 
-#: lib/MIME/Viewer/itip.php:684
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Rola"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3089,46 +3226,42 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Za¹ifrova» správu pomocou S/MIME"
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "Chyba S/MIME: "
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "Chyba S/MIME: pre osobný privátny kµúè treba zada» heslo."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME nie je aktivované"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "Nastavenia S/MIME"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "Zadávanie hesla pre S/MIME"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "Pre podporu osobného kµúèového páru S/MIME musíte ma» bezpeèné pripojenie "
 "(https)."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Verejný S/MIME kµúè pre \"%s\" bol úspe¹ne vymazaný."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Verejný S/MIME kµúè bol úspe¹ne pridaný."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Databáza verejných S/MIME kµúèov"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Kµúèový pár S/MIME bol úspe¹ne pridaný."
 
@@ -3140,26 +3273,26 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Podpísa»/za¹ifrova» správu pomocou S/MIME"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Na tomto systéme je podpora S/MIME je zakázaná."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 "Podpora S/MIME nie je momentálne aktivovaná, tak¾e nemo¾no de¹ifrova» správu."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
-"Podpora S/MIME nie je aktivovaná, tak¾e nemo¾no zobrazi» obsah tejto "
-"podpísanej správy."
+"Podpora S/MIME nie je momentálne aktivovaná, tak¾e obsah podpísanej správy "
+"nemo¾no zobrazi»."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3167,59 +3300,75 @@
 "Podpora S/MIME nie je momentálne aktivovaná, tak¾e nemo¾no overi» digitálny "
 "podpis."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
-"Podpora S/MIME vy¾aduje pou¾itie vyskakovacích okien. Ak Vá¹ prehliadaè "
+"Podpora S/MIME vy¾aduje pou¾itie vyskakovacích okien.  Ak Vá¹ prehliadaè "
 "momentálne blokuje vyskakovacie okná, musíte toto nastavenie zmeni», inak "
 "nebude S/MIME fungova» správne."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "P_redmet"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "U_lo¾i» kópiu do "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Ulo¾i» _ako"
 
-#: search.php:351 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Ulo¾i»"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:533
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Ulo¾i» prílohy so správou do prieèinka odoslanej po¹ty?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:427
 msgid "Save Draft"
 msgstr "Ulo¾i» koncept"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Ulo¾i» obrázok"
+
+#: lib/MIME/Contents.php:211
+msgid "Save Image in Gallery"
+msgstr "Ulo¾i» obrázok do galérie"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Ulo¾i» nastavenia"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Ulo¾i» ¹ablónu"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:427
 msgid "Save _Draft"
 msgstr "Ulo¾i» _koncept"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Ulo¾i» ako"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Ulo¾i» koncepty ako nepreèítané?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1060
 msgid "Save recipients automatically to the default address book?"
 msgstr "Uklada» príjemcov automaticky do ¹tandardného adresára kontaktov?"
 
@@ -3227,17 +3376,17 @@
 msgid "Save search as a virtual folder?"
 msgstr "Ulo¾i» vyhµadávanie ako virtuálny prieèinok?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Ulo¾i» odoslanú po¹tu?"
 
-#: compose.php:1162
+#: compose.php:1251
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Ukladanie konceptu zlyhalo. Chyba: %s"
 
-#: templates/contacts/contacts.inc:194 templates/mailbox/header.inc:11
-#: lib/Block/tree_folders.php:50
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:45
 msgid "Search"
 msgstr "Prehµadáva»"
 
@@ -3246,7 +3395,11 @@
 msgid "Search %s"
 msgstr "Prehµadáva» %s"
 
-#: search.php:304
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Nastavenia hµadania"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "Výsledok hµadania"
 
@@ -3262,7 +3415,7 @@
 msgid "Select Another Account"
 msgstr "Vyberte iný úèet"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Vyberte dátum"
 
@@ -3270,7 +3423,11 @@
 msgid "Select a field"
 msgstr "Vyberte pole"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Vyberte ¹ablónu:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Nastavenie adresárov pre pridávanie a vyhµadávanie adries."
 
@@ -3290,6 +3447,10 @@
 msgid "Select none"
 msgstr "Zru¹i» oznaèenie"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Vyberte galériu, do ktorej sa má ulo¾i» obrázok."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Vyberte typ e-mailového servera"
@@ -3298,32 +3459,32 @@
 msgid "Selected Address books:"
 msgstr "Vybrané adresáre:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Odosla» kµúè na server verejných kµúèov"
 
-#: lib/MIME/Viewer/itip.php:600
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Odosla» najnov¹ie informácie"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:425
 msgid "Send Message"
 msgstr "Odosla» správu"
 
-#: config/prefs.php.dist:698
+#: config/prefs.php.dist:691
 msgid "Send read receipt when requested by the sender?"
-msgstr "Odosla» oznámenie o preèítaní správy, ak ho vy¾aduje odosielateµ?"
+msgstr "Odosla» oznámenie o preèítaní, ak ho vy¾aduje odosielateµ?"
 
-#: folders.php:391
+#: folders.php:376
 msgid "Sent mail folder"
 msgstr "Prieèinok odoslanej po¹ty"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Prieèinok odoslanej po¹ty:"
 
-#: templates/login/login.inc:129 templates/login/login.inc:142
-#: templates/login/login.inc:149
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Server"
 
@@ -3339,7 +3500,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Nastavenia presúvania a mazania správ."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Nastavi» hlavièku X-Priority pri písaní správy?"
 
@@ -3355,7 +3516,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Zdieµa» Va¹e prieèinky po¹ty s inými pou¾ívateµmi."
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3363,15 +3524,15 @@
 "Majú by» veµké bloky citovaného textu ¹tandardne zobrazené alebo skryté? "
 "Nastavenie mô¾e by» kedykoµvek jednoducho prepnuté."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Majú sa v tele správ typu text/plain hµada» údaje pre PGP?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Má sa okno na písanie správy zatvori» po ulo¾ení konceptu ?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Má sa Vá¹ verejný PGP kµúè pripoji» k správam?"
 
@@ -3383,7 +3544,7 @@
 msgid "Show All Headers"
 msgstr "Zobrazi» v¹etky hlavièky"
 
-#: mailbox.php:361
+#: mailbox.php:347
 msgid "Show Deleted"
 msgstr "Ukáza» vymazané"
 
@@ -3399,43 +3560,43 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Zobrazi» iba prihlásené prieèinky"
 
-#: folders.php:286
+#: folders.php:277
 msgid "Show Unsubscribed"
 msgstr "Ukáza» neprihlásené"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Zobrazi» ikonu na odstránenie príloh zo správ?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:990
 msgid "Show legend in the mailbox view?"
 msgstr "Zobrazi» vysvetlivky v zozname správ?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:828
 msgid "Show previews for unread messages only?"
 msgstr "Zobrazova» uká¾ky iba pre nepreèítané správy?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:836
 msgid "Show previews in tooltips?"
 msgstr "Zobrazova» uká¾ky ako popisky?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:865
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Zobrazi» ikonu na s»ahovanie po¹ty v menu?"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Zobrazi» obrázky"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Zobrazi» ikonu filtrov v menu?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Zobrazi» celkový poèet správ v prieèinku?"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Zobrazené"
 
@@ -3443,10 +3604,6 @@
 msgid "Si_ze"
 msgstr "Veµko_s»"
 
-#: templates/login/login.inc:210
-msgid "Sign up if not registered"
-msgstr "Prihlási» sa, ak nie som registrovaný"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Podpísané"
@@ -3455,10 +3612,6 @@
 msgid "Size"
 msgstr "Veµkos»"
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr "Smer triedenia"
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Triedi» podµa èasu príchodu"
@@ -3491,39 +3644,60 @@
 msgid "Spam folder:"
 msgstr "Prieèinok pre spam:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "©peciálne znaky"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders cannot be edited."
+msgstr "©peciálne virtuálne prieèinky nemo¾no upravi»."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Kontrola pravopisu"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Kontrola pravopisu"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Kontrola pravopisu ukonèená"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Poèet chýb na stránku pri kontrole pravopisu."
 
-#: lib/MIME/Viewer/itip.php:508 lib/MIME/Viewer/itip.php:648
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "©tart"
 
-#: lib/MIME/Viewer/itip.php:684
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "©ablóna"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Meno ¹ablóny:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Typ ¹ablóny:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "©ablóna:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Stav"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:222
 msgid "Strip Attachment"
 msgstr "Odstráni» prílohu"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:820
 msgid "Strip linebreaks?"
 msgstr "Odstráni» konce riadkov?"
 
@@ -3531,61 +3705,62 @@
 msgid "Sub_ject"
 msgstr "P_redmet"
 
-#: message.php:252 search.php:150 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:149 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Predmet"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:908
 msgid "Subject Field"
 msgstr "Pole predmetu"
 
-#: search.php:353 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Odosla»"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Prihlási» sa do prieèinka (prieèinkov)"
 
-#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Úspech"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Návrhy"
 
-#: lib/MIME/Viewer/itip.php:658 lib/MIME/Viewer/itip.php:660
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Zhrnutie"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:394 templates/compose/compose.inc:397
 msgid "Switch Composition Method"
 msgstr "Prepnú» spôsob písania správ"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:398
 msgid "Switch to HTML composition"
 msgstr "Prepnú» na písanie správ v HTML"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:398
 msgid "Switch to plain text composition"
 msgstr "Prepnú» na písanie obyèajných textových správ"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:413
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: lib/MIME/Viewer/itip.php:265
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
-msgstr "Predbe¾ne: "
+msgstr "Predbe¾ne akceptovaná: "
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Predbe¾ne akceptova» po¾iadavku"
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Predbe¾ne akceptovaná"
 
@@ -3594,10 +3769,22 @@
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Podmienky pou¾itia nie sú ¹pecifikované v conf.php"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Text"
+
+#: config/prefs.php.dist:942
 msgid "The From: column of the message should be linked:"
 msgstr "Pole Od: v správe by má by» prepojené s:"
 
+#: lib/IMAP/Client.php:533
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"IMAP server pravdepodobne nepodporuje vybranú autentifikaènú metódu. "
+"Kontaktujte prosím svojho administrátora."
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintosh resource fork"
@@ -3617,16 +3804,11 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Úèet \"%s\" bol ulo¾ený."
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Adresa \"%s\" bola pridaná do va¹ej %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Príloha nebola nájdená."
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "Údaje kalendára sú neplatné"
 
@@ -3642,22 +3824,22 @@
 msgid "The contents of the Macintosh file are below."
 msgstr "Obsah súboru Macintosh je uvedený ni¾¹ie."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Aktuálny prieèinok (prieèinky) \"%s\" bude premenovaný na \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr "Nemo¾no získa» zoznam pou¾ívateµov s prístupom k tomuto prieèinku"
 
-#: compose.php:1171
+#: compose.php:1260
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Koncept bol ulo¾ený do prieèinka \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Udalos» bola pridaná do Vá¹ho kalendára."
 
@@ -3666,12 +3848,12 @@
 msgid "The field \"%s\" can't be expanded."
 msgstr "Pole \"%s\" sa nepodarilo doplni»."
 
-#: lib/Folder.php:328
+#: lib/Folder.php:335
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Prieèinok \"%s\" u¾ existuje"
 
-#: lib/Folder.php:171
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3680,46 +3862,54 @@
 "Prieèinok \"%s\" obsahuje v mene neprípustné znaky, èo mô¾e spôsobi» "
 "problémy. Prosím kontaktujte správcu Vá¹ho systému."
 
-#: lib/Folder.php:347
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Prieèinok \"%s\" bol vytvorený, ale neboli ste doò prihlásený."
 
-#: lib/Folder.php:285
+#: lib/Folder.php:270
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Prieèinok \"%s\" bol vymazaný, ale neboli ste z neho odhlásený."
 
-#: lib/Folder.php:334
+#: lib/Folder.php:341
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Prieèinok \"%s\" nebol vytvorený. "
 
-#: lib/Folder.php:278
+#: lib/Folder.php:263
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
-msgstr "Prieèinok \"%s\" nebol vymazaný. "
+msgstr "Prieèinok \"%s\" nebol vymazaný. Server odpovedal"
 
-#: lib/Folder.php:350
+#: lib/Folder.php:357
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Prieèinok \"%s\" bol úspe¹ne vytvorený."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:273
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Prieèinok \"%s\" bol úspe¹ne vymazaný."
 
-#: lib/Folder.php:438
+#: lib/Folder.php:461
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Prieèinok \"%s\" bol úspe¹ne premenovaný na \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "K tejto èasti boli pripojené nasledujúce súbory:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Okno na ulo¾enie obrázka sa nepodarilo otvori». Nemáte nastavený prehliadaè "
+"na blokovanie vyskakovacích okien?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3737,12 +3927,12 @@
 msgid "The mail server generated the following message:"
 msgstr "Mailový server vygeneroval nasledovné hlásenie:"
 
-#: lib/Message.php:614
+#: lib/Message.php:658
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Schránka %s je u¾ prázdna."
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3752,15 +3942,15 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Správa, na ktorej ste pracovali, bola zatvorená. Koniec."
 
-#: message.php:142
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Správa bola vymazaná."
 
-#: lib/MIME/Viewer/pgp.php:394
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Správa bola overená."
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:389
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Správa bola overená. Odosielateµ: %s."
@@ -3773,7 +3963,7 @@
 "Okno na zadanie hesla sa nepodarilo otvori». Nemáte nastavený prehliadaè na "
 "blokovanie vyskakovacích okien?"
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Text tohto verejného PGP kµúèa mô¾e by» zobrazený %s."
@@ -3786,7 +3976,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Po¾adovaný súbor neexistuje v prílohe Zip."
 
-#: message.php:541
+#: message.php:543
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3796,15 +3986,15 @@
 "Odosielateµ tejto správy vy¾aduje od Vás oznámenie o preèítaní správy. "
 "Kliknite prosím %s pre odoslanie správy s oznámením."
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
-msgstr "Serveru sa nepodarilo vytvori» zmen¹enú kópiu tohto obrázku."
+msgstr "Server nemohol vytvori» zmen¹enú kópiu tohto obrázku."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:107
 msgid "The signature could not be replaced."
 msgstr "Signatúru sa nepodarilo nahradi»."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:105
 msgid "The signature was successfully replaced."
 msgstr "Signatúra bola úspe¹ne nahradená."
 
@@ -3812,7 +4002,22 @@
 msgid "The specified file does not exist."
 msgstr "©pecifikovaný súbor neexistuje."
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "©ablóna \"%s\" bola ulo¾ená."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "©ablóna \"%s\" bola vymazaná."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "©ablóna \"%s\" bola aktualizovaná."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "Úloha bola pridaná do Vá¹ho zoznamu úloh."
 
@@ -3843,7 +4048,7 @@
 msgid "The text of the sent message can be viewed %s."
 msgstr "Text odoslanej správy mô¾e by» zobrazený %s."
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Informácia o zaneprázdnenosti pou¾ívateµa bola úspe¹ne ulo¾ená."
 
@@ -3855,47 +4060,42 @@
 msgid "There are no messages in this mailbox."
 msgstr "Táto schránka je prázdna."
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Vyskytol sa problém pri vymazávaní %s. "
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr "®iaden text nemo¾no zobrazi» v tele správy."
 
-#: lib/Message.php:616
+#: lib/Message.php:660
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Vyskytol sa problém pri vymazávaní schránky: %s"
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Vyskytol sa problém pri vymazávaní schránky. "
-
-#: lib/Message.php:92
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "Vyskytol sa problém pri kopírovaní správ z \"%s\" do \"%s\": "
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:201 lib/Message.php:219
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "Vyskytla sa chyba pri mazaní správ z prieèinka \"%s\". "
 
-#: lib/Message.php:277
+#: lib/Message.php:281
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Vyskytla sa chyba pri mazaní správ v prieèinku \"%s\". "
 
-#: lib/Message.php:213
+#: lib/Message.php:217
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Vyskytla sa chyba pri mazaní správ: %s"
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Nastala chyba pri vymazávaní udalosti: %s."
@@ -3904,7 +4104,7 @@
 msgid "There was an error displaying this message part"
 msgstr "Nastala chyba pri zobrazovaní tejto èasti správy"
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:555
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3912,44 +4112,44 @@
 msgstr ""
 "Vyskytla sa chyba pri nastavovaní príznakov správy v prieèinku \"%s\". "
 
-#: folders.php:155
+#: folders.php:145
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Nastala chyba pri importe %s."
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Nastala chyba pri importe udalosti: %s."
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Nastala chyba pri importe úlohy: %s."
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Nastala chyba pri importe informácií o zaneprázdnenosti pou¾ívateµa: %s."
 
-#: lib/Message.php:87
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "Nastala chyba pri presúvaní správ z \"%s\" do \"%s\". "
 
-#: compose.php:1179
+#: compose.php:1268
 msgid "There was an error saving this message as a draft."
 msgstr "Nastala chyba pri ukladaní konceptu."
 
-#: compose.php:940
+#: compose.php:1033
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Chyba pri posielaní správy: %s"
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Nastala chyba pri aktualizácii objektu: %s"
@@ -3958,32 +4158,32 @@
 msgid "There was no text in this message part"
 msgstr "Táto èas» správy neobsahovala text"
 
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "Táto HTML správa obsahuje obrázky."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
 "Táto HTML správa obsahuje obrázky. Blokované obrázky sa zobrazia takto: "
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Tento verejný PGP kµúè bol pripojený k správe."
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:310
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Táto akcia nie je podporovaná."
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:415
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Táto akcia e¹te nie je implementovaná."
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Toto mô¾e chvíµu trva». Naozaj chcete pokraèova»?"
 
@@ -3991,16 +4191,16 @@
 msgid "This message contains a Macintosh file."
 msgstr "Táto správa obsahuje súbor Macintosh."
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:415
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
-"Táto správa obsahuje prílohu, ktorá bola digitálne podpísaná pomocou S/MIME."
+"Táto správa obsahuje prílohu, ktrá bola digitálne podpísaná pomocou S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
-msgstr "Táto spáva obsahuje prílohu, ktorá bola za¹ifrovaná pomocou S/MIME."
+msgstr "Táto správa obsahuje prílohu, ktorá bola za¹ifrovaná pomocou S/MIME."
 
 #: lib/MIME/Viewer/status.php:160
 msgid ""
@@ -4010,43 +4210,43 @@
 "Táto správa obsahuje informáciu o stave doruèenia po¹ty, ale formát správy "
 "nie je známy."
 
-#: lib/MIME/Viewer/pgp.php:316
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Táto správa pravdepodobne nie je za¹ifrovaná PGP. Chyba: "
 
-#: lib/MIME/Viewer/pgp.php:241 lib/MIME/Viewer/pgp.php:351
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 "Táto správa pravdepodobne nie je v správnom PGP formáte (podµa RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Táto správa pravdepodobne nie je v správnom S/MIME formáte."
 
-#: lib/MIME/Viewer/pgp.php:206 lib/MIME/Viewer/pgp.php:417
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Táto správa bola digitálne podpísaná pomocou PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Táto správa bola digitálne podpísaná pomocou S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
-msgstr "Táto spáva bola za¹ifrovaná pomocou S/MIME."
+msgstr "Táto správa bola za¹ifrovaná pomocou S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:202 lib/MIME/Viewer/pgp.php:292
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Táto správa bola za¹ifrovaná pomocou PGP."
 
-#: message.php:195
+#: message.php:211
 msgid "This message to"
 msgstr "Túto správu do"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Tento server nepodporuje zdieµanie prieèinkov."
 
@@ -4054,18 +4254,22 @@
 msgid "This window must be called from a compose window."
 msgstr "Toto okno sa musí vola» z okna pre písanie správy."
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:151
+#, fuzzy
+msgid "Thread Display"
+msgstr "Nastavenie zobrazenia"
+
+#: thread.php:76 config/prefs.php.dist:910
 msgid "Thread View"
 msgstr "Zobrazi» vlákna"
 
-#: message.php:248 mailbox.php:585 search.php:138
-#: templates/contacts/contacts.inc:214
-#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:594 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Pre"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:907
 msgid "To Address"
 msgstr "Adresa príjemcu"
 
@@ -4077,11 +4281,18 @@
 "Pre výber viacerých polí dr¾te Contrll (PC) alebo Command (Mac) poèas "
 "klikania."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+"Aby ste mohli pou¾i» TLS spojenie, musíte pou¾íva» PHP 5.0.6 alebo vy¹¹ie."
+
+#: templates/compose/compose.inc:588
 msgid "Total Attachments Size:"
 msgstr "Celková veµkos» príloh:"
 
-#: folders.php:382
+#: folders.php:367
 msgid "Trash folder"
 msgstr "Odpadkový kô¹"
 
@@ -4089,7 +4300,7 @@
 msgid "Trash folder:"
 msgstr "Odpadkový kô¹:"
 
-#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
 #: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Nemo¾no získa» informáciu o kvóte"
@@ -4107,28 +4318,33 @@
 msgid "Undelete"
 msgstr "Obnovi»"
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:577 mailbox.php:590 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Nezverejnení príjemcovia"
 
-#: lib/MIME/Viewer/itip.php:443
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Neo¹etrený komponent typu: %s"
 
-#: mailbox.php:544
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "Neznámy dátum"
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Neznáma IMAP odpoveï od servera. Server odpovedal: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Neznáme stretnutie"
 
-#: mailbox.php:597
+#: mailbox.php:606
 msgid "Unknown Recipient"
 msgstr "Neznámy príjemca"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Odstráni» heslo z pamäti"
 
@@ -4136,48 +4352,52 @@
 msgid "Unnamed"
 msgstr "Nepomenovaná"
 
-#: message.php:483 mailbox.php:687 templates/message/navbar_navigate.inc:6
+#: message.php:495 mailbox.php:695 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Nepreèítané"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Odhlási» sa z prieèinka (prieèinkov)"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Aktualizova» informáciu o prílohách"
+#: templates/compose/compose.inc:512
+msgid "Update"
+msgstr "Aktualizácia"
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Aktualizova» stav úèastníka"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Nahra»"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Pou¾i» prednastavenú hodnotu"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Pou¾i» prihlásenie do prieèinkov IMAP?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:723
+msgid "Use Virtual Trash Folder?"
+msgstr "Pou¾i» prieèinok virtuálneho Ko¹a?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Pou¾ívateµ"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 "Pou¾ívateµovi \"%s\" boli úspe¹ne pridelené práva pre prieèinok \"%s\"."
 
-#: templates/login/login.inc:178
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Prihlasovacie meno"
 
@@ -4185,100 +4405,136 @@
 msgid "Username:"
 msgstr "Prihlasovacie meno:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Zobrazi»"
 
-#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "Zobrazi» %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Zobrazi» %s verejný kµúè"
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
-msgstr "Zobrazi» HTML obsah v samostatnom okne"
+msgstr "Zobrazi» HTML obsah v novom okne"
+
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Zobrazi» správy"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Zobrazi» osobný privátny kµúè"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Zobrazi» osobný verejný kµúè"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Zobrazi» vlákno"
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Zobrazi» ikonu"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 msgid "View attachment in a separate window"
-msgstr "Zobrazi» prílohu v samostatnom okne"
+msgstr "Zobrazi» prílohu v novom okne"
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
-msgstr "Zobrazi» obsah v samostatnom okne"
+msgstr "Zobrazi» obsah v novom okne"
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Zobrazi» udalos»"
 
-#: folders.php:374 mailbox.php:513
+#: folders.php:359 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "Zobrazi» správy v %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Po prihlásení zobrazi»:"
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Zobrazi» úlohu"
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Zobrazi» obrázky"
 
-#: search.php:302
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Virtuálny prieèinok \"%s\" bol úspe¹ne vytvorený."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: lib/Auth/imp.php:175
+msgid "Virtual Folder does not exist."
+msgstr "Virtuálny prieèinok neexistuje."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:133 lib/IMAP/Tree.php:146
+#: lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:152 lib/IMAP/Tree.php:153
+#: lib/IMAP/Tree.php:363 lib/IMAP/Tree.php:387 lib/IMAP/Tree.php:425
 msgid "Virtual Folders"
 msgstr "Virtuálne prieèinky"
 
-#: search.php:284
+#: search.php:245
 msgid "Virtual Folders require a label."
-msgstr "Virtuálne prieèinky vy¾adujú popisok."
+msgstr "Virtuálny prieèinok potrebuje popisok."
+
+#: lib/VFolder.php:176 lib/VFolder.php:186
+msgid "Virtual INBOX"
+msgstr "Virtuálna schránka prijatých správ"
+
+#: folders.php:395
+msgid "Virtual INBOX Folder"
+msgstr "Virtuálny prieèinok prijatých správ"
+
+#: mailbox.php:435 lib/Mailbox.php:170 lib/VFolder.php:111 lib/VFolder.php:123
+msgid "Virtual Trash"
+msgstr "Virtuálny Kô¹"
+
+#: folders.php:392
+msgid "Virtual Trash Folder"
+msgstr "Prieèinok virtuálneho ko¹a"
+
+#: lib/Message.php:639
+msgid "Virtual Trash Folder does not exist."
+msgstr "Prieèinok virtuálneho ko¹a neexistuje."
 
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "Popisok virtuálneho prieèinku"
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr "Varovanie"
 
-#: login.php:130
+#: login.php:148
 #, php-format
 msgid "Welcome to %s"
 msgstr "Víta Vás %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Èo sa má urobi» s nevy¾iadanou po¹tou po jej ohlásení ako spam alebo "
+"ne¹kodnú po¹tu?"
+
+#: config/prefs.php.dist:715
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4286,32 +4542,29 @@
 "Presunú» vymazané správy do Odpadkového ko¹a namiesto ich oznaèenia za "
 "vymazané?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:895
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
 "Na ktorej strane chcete zaèa» prezeranie správ pri otvorení novej schránky?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Majú sa ulo¾i» prílohy pri ukladaní odoslanej po¹ty?"
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
 msgstr ""
-"Aká adresa sa má prida» k neúplným adresám (bez \"@\") pri posielaní po¹ty "
-"alebo dopåòaní adries?"
+"Pri posielaní po¹ty alebo dopåòaní adries, aká doména sa má doplni» za "
+"neúplné adresy (e-mailové adresy bez \"@\")?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Biela listina"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Zalomi» textový riadok pri takomto poète znakov."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:536 templates/compose/compose.inc:549
+#: config/prefs.php.dist:966
 msgid "Yes"
 msgstr "Áno"
 
@@ -4323,31 +4576,50 @@
 msgid ""
 "You are attempting to delete all messages contained in the following folder"
 "(s)."
-msgstr "Chystáte sa vymaza» v¹etky správy v nasledujúcich prieèinkoch."
+msgstr ""
+"Chystáte sa vymaza» v¹etky správy v nasledujúcom prieèinku (prieèinkoch)."
 
 #: templates/folders/folders_confirm.html:9
 msgid "You are attempting to delete the following folder(s)."
-msgstr "Chystáte sa vymaza» nasledujúce prieèinky."
+msgstr "Chystáte sa vymaza» nasledujúci prieèinok (prieèinky)."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Kopírujete/presúvate do nového prieèinka."
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Vytvárate prieèinok v "
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Vytvárate prieèinok najvy¹¹ej úrovne."
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:318
+msgid "You are not allowed to create folders."
+msgstr "Nemáte oprávnenie na vytváranie prieèinkov."
+
+#: lib/Folder.php:325
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Nemáte oprávnenie vytvori» viac ako %d prieèinkov."
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Premenúvate prieèinok: "
 
-#: lib/Folder.php:537
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"V texte ¹ablóny mô¾ete pou¾i» nasledujúce ¹peciálne znaky: %c pre obsah "
+"aktuálnej správy; %s pre signatúru."
+
+#: lib/Folder.php:565
 #, php-format
-msgid "You can not unsubscribe from \"%s\"."
+msgid "You cannot unsubscribe from \"%s\"."
 msgstr "Nemô¾ete sa odhlási» z \"%s\"."
 
 #: lib/Maintenance/Task/tos_agreement.php:34
@@ -4356,11 +4628,11 @@
 "to login."
 msgstr "Nesúhlasili ste s podmienkami pou¾itia, tak¾e sa nemô¾ete prihlási»."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "Nemáte právo nastavi» prístup k tomuto prieèinku"
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Preposlali ste túto správu %%s nasledovným príjemcom: %s."
@@ -4374,34 +4646,30 @@
 msgid "You have 1 new message."
 msgstr "Máte 1 novú správu."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Vybrali ste najmenej jednu prílohu, ktorá e¹te nebola nahraná na server. Ste "
-"si istý/á, ¾e chcete posla» túto správu bez týchto príloh?"
+#: compose.php:480
+msgid "You have already submitted this page."
+msgstr "Túto stránku ste u¾ odoslali."
 
-#: lib/IMP.php:1028
+#: lib/IMP.php:1056
 msgid "You have new mail in the following folder:"
 msgstr "Máte novú po¹tu v nasledujúcom prieèinku:"
 
-#: lib/IMP.php:1033
+#: lib/IMP.php:1061
 msgid "You have new mail in the following folders:"
 msgstr "Máte novú po¹tu v nasledujúcich prieèinkoch:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Musíte zada» ma» aspoò jedného príjemcu."
 
-#: lib/MIME/Viewer/pgp.php:303
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Na zobrazenie tejto správy musíte zada» heslo pre Vá¹ osobný privátny PGP "
 "kµúè"
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4409,7 +4677,7 @@
 "Na zobrazenie tejto správy musíte zada» heslo pre Vá¹ osobný privátny S/MIME "
 "kµúè"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Musíte najprv vybra» cieµovú schránku."
 
@@ -4421,8 +4689,8 @@
 msgid "You must select an address first."
 msgstr "Musíte najprv vybra» adresu."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Musíte najprv vybra» aspoò jednu správu."
 
@@ -4430,66 +4698,62 @@
 msgid "You must specify a recipient."
 msgstr "Musíte urèi» príjemcu."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Musíte vybra» aspoò jeden súbor pre pripojenie."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "V nastaveniach údr¾by musíte ma» povolené \"%s\"."
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Presmerovali ste túto správu %s %%s."
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Odpovedali ste na túto správu %s."
 
-#: lib/Folder.php:487
+#: lib/Folder.php:515
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Neboli ste prihlásený do \"%s\". "
 
-#: lib/Folder.php:539
+#: lib/Folder.php:567
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Neboli ste odhlásený z \"%s\". "
 
-#: lib/Folder.php:490
+#: lib/Folder.php:518
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Boli ste úspe¹ne prihlásený do \"%s\"."
 
-#: lib/Folder.php:542
+#: lib/Folder.php:570
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Boli ste úspe¹ne odhlásený z \"%s\"."
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Va¹e celé meno"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Va¹e PGP kµúèe"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Vá¹ privátny kµúè"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Vá¹ verejný kµúè"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Va¹a adresa pre odpoveï (Reply-to): <i>(nepovinné)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Va¹a adresa pre odpoveï (Reply-to): <em>nepovinné)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Va¹e S/MIME verejné/privátne certifikáty"
 
@@ -4497,16 +4761,17 @@
 msgid "Your accounts:"
 msgstr "Va¹e úèty:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
-msgstr "Va¹e aliasy: <i>(voliteµné, zadajte ka¾dú adresu na novom riadku)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
+"Va¹e aliasy: <em>(voliteµné, zadajte ka¾dú adresu na novom riadku)</em>"
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr "Vá¹ prehliadaè nepodporuje priame zobrazenie tohto typu obrázkov."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Va¹a prednastavená znaková sada pre posielanie správ:"
 
@@ -4514,68 +4779,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Vá¹ prednastavený spôsob ¹ifrovania pre posielanie správ:"
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Va¹a nalinkovaná príloha bola stiahnutá najmenej jedným pou¾ívateµom.\n"
+"\n"
+"Meno prílohy: %s\n"
+"Dátum prílohy: %s\n"
+"\n"
+"Kliknite na nasledujúcu linku na odstránenie prílohy:\n"
+"%s"
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Správa bola úspe¹ne doruèená."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Va¹a signatúra:"
 
-#: message.php:272 compose.php:1219 mailbox.php:528 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Skry» adresy]"
+
+#: message.php:288 compose.php:1286 mailbox.php:535 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[®iadny predmet správy]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Zobrazi» adresy -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Zobrazi» adresy - %s príjemcov]"
+
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Èierna _listina"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:931
-msgid "_Compose"
-msgstr "_Písa» správu"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Vymaza»"
 
-#: lib/IMP.php:933
+#: lib/IMP.php:962
 msgid "_Folders"
 msgstr "_Prieèinky"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identita"
 
-#: lib/IMP.php:924
+#: lib/IMP.php:931
 msgid "_Inbox"
 msgstr "_Prijaté správy"
 
-#: lib/IMP.php:974
+#: lib/IMP.php:1003
 msgid "_Log out"
 msgstr "_Odhlási»"
 
-#: message.php:368
+#: message.php:384
 msgid "_Message Source"
 msgstr "_Zdrojový text správy"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:959
+msgid "_New Message"
+msgstr "_Nová správa"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Tlaèi»"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "_Priorita"
 
-#: mailbox.php:402
+#: mailbox.php:401
 #, php-format
 msgid "_Refresh %s"
 msgstr "_Obnovi» %s"
@@ -4584,11 +4881,11 @@
 msgid "_Reply"
 msgstr "_Odpoveda»"
 
-#: lib/IMP.php:935
+#: lib/IMP.php:964
 msgid "_Search"
 msgstr "_Prehµadáva»"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:425
 msgid "_Send Message"
 msgstr "_Posla» správu"
 
@@ -4596,7 +4893,7 @@
 msgid "_Thread"
 msgstr "_Vlákno"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Pre"
 
@@ -4604,58 +4901,126 @@
 msgid "_Undelete"
 msgstr "Obno_vi»"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Zobrazi» vlákno"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "_Biela listina"
 
-#: lib/Compose.php:351
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "neznámy adresát"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "príloha"
 
-#: view.php:98
+#: view.php:97
 msgid "attachments.zip"
 msgstr "attachments.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:504
 msgid "bytes"
 msgstr "bajtov"
 
-#: templates/contacts/contacts.inc:185
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "nepodarilo sa vytvori» súbor"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "nepodarilo sa otvori» vstup"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "chybné pou¾itie príkazového riadku"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "chyba konfigurácie"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "chýba kriticky dôke¾itý systémový súbor"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "chyba dátového formátu"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "polo¾ka nenájdená"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "od"
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "nenzáme meno hostiteµa"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "chyba vstupu/výstupu"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "vnútorná chyba softvéru"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "kµúè"
 
-#: folders.php:151
+#: folders.php:141
 msgid "mailbox file"
 msgstr "súbor s po¹tou"
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1097 lib/Message.php:476
 msgid "name"
 msgstr "meno"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "¾iadne"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "alebo"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "prístup zamietnutý"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "príjemcov]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "vzdialená chyba protokolu"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "slu¾ba nedostupná"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "chyba pravopisu"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "chyby pravopisu"
 
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "systémová chyba"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "doèasná chyba"
+
 #: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "Va¹a èierna listina"


--- orig/locale/pt_BR/help.xml
+++ mod/locale/pt_BR/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Horde: imp/locale/pt_BR/help.xml,v 1.18.4.1 2005/01/25 22:05:52 jan Exp $ -->
+<!-- $Horde: imp/locale/pt_BR/help.xml,v 1.18.4.5 2006/03/23 00:24:09 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="uptodate" md5="3259ba00a198559c7faa76e7867600d9">
     <title>Composição de Mensagem: Ações</title>
@@ -65,7 +65,7 @@
     Ative o botão ao lado de "Salvar uma cópia em" para salvar uma cópia desta mensagem na sua pasta "Enviados". Salve cópias de mensagens importantes que você envia para você ter referências posteriores e para você ter um registro preciso do que você disse. Nós não recomendamos você gravar todas as mensagens, pois sua caixa-postal encherá rapidamente (especialmente quando você envia anexos) o deixando inapto a receber novas mensagens. Você pode, entretanto, deixar esta opcção sempre ligada utilizando 'Opções' na na barra de navegação ao topo. Tome cuidado ao utilizar esta opção, pois você terá que periodicamente limpar a pasta de mensagens enviadas ou isto deixará sua caixa-postal cheia e inutilizável.
     </para>
 </entry>
-  <entry id="compose-attach" state="uptodate" md5="98dd30f32af1fa86a9f0fea3124c4ee1">
+  <entry id="compose-attach" state="changed" md5="98dd30f32af1fa86a9f0fea3124c4ee1">
     <title>Composição de Mensagem: Anexar</title>
     <heading>"Anexar"</heading>
     <para>
@@ -76,7 +76,49 @@
     </para>
     <para>Passo 2: clique no botão "Anexar". O nome do arquivo e tamanho serão adicionados a sua lista de Anexos. Por favor note que para arquivos grandes e/ou conexões lentas, o processo de envio e anexação a mensagem poderá demorar um pouco. Por favor seja paciente e não clique em outras coisas enquanto espera.
     </para>
-</entry>
+<!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
+    <para>
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
+    </para>
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--><!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
+    <para>
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
+    </para>
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--><!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
+    <para>
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
+    </para>
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--></entry>
   <entry id="compose-attachments" state="uptodate" md5="8ac032c4ac182f3f0d6446c20f0089dd">
     <title>Composição de Mensagem: Anexos</title>
     <heading>"Anexos"</heading>
@@ -101,6 +143,12 @@
     Determina se os anexos em sua composição são salvos com a mensagem quando armazenados na pasta "Enviados". Se "SIM", os dados do anexo serão salvos. Se "NÃO", os dados do anexo serão removidos da mensagem após ela ser enviada para todos os destinatários. Escolhendo "Não" ajudará  a conservar espaço em disco ao remover anexos (potencialmente grandes) de suas mensagens.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="uptodate" md5="86b2ef57b1194890833d9dd49ebc9b32">
     <title>Procurar</title>
     <heading>Critérios da Procura</heading>
@@ -142,6 +190,76 @@
     <para>
       This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
     </para>
+</entry>--><!-- English entry:
+<entry id="folder-options">
+    <title>Folder Navigator: Actions</title>
+    <heading>Folder Actions</heading>
+    <para>
+      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
+    </para>
+    <para>
+      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
+    </para>
+    <heading>Import Messages</heading>
+    <para>
+      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-options">
+    <title>Folder Navigator: Actions</title>
+    <heading>Folder Actions</heading>
+    <para>
+      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
+    </para>
+    <para>
+      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
+    </para>
+    <heading>Import Messages</heading>
+    <para>
+      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-options">
+    <title>Folder Navigator: Actions</title>
+    <heading>Folder Actions</heading>
+    <para>
+      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
+    </para>
+    <para>
+      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
+    </para>
+    <heading>Import Messages</heading>
+    <para>
+      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-options">
+    <title>Folder Navigator: Actions</title>
+    <heading>Folder Actions</heading>
+    <para>
+      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
+    </para>
+    <para>
+      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
+    </para>
+    <heading>Import Messages</heading>
+    <para>
+      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-options">
+    <title>Folder Navigator: Actions</title>
+    <heading>Folder Actions</heading>
+    <para>
+      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
+    </para>
+    <para>
+      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
+    </para>
+    <heading>Import Messages</heading>
+    <para>
+      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
+    </para>
 </entry>--></entry>
   <entry id="folder-widgets" state="changed" md5="d2f58063352d072d02714488914b53dd">
     <title>Gerenciamento de Pastas: Exibição</title>
@@ -172,6 +290,81 @@
     <para>
     Collapse all folder entries.
     </para>
+</entry>--><!-- English entry:
+<entry id="folder-widgets">
+    <title>Folder Navigator: Display</title>
+    <heading>Show/Hide Unsubscribed</heading>
+    <para>
+    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
+    </para>
+    <heading>Expand All</heading>
+    <para>
+    Expand all folder entries.
+    </para>
+    <heading>Collapse All</heading>
+    <para>
+    Collapse all folder entries.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-widgets">
+    <title>Folder Navigator: Display</title>
+    <heading>Show/Hide Unsubscribed</heading>
+    <para>
+    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
+    </para>
+    <heading>Expand All</heading>
+    <para>
+    Expand all folder entries.
+    </para>
+    <heading>Collapse All</heading>
+    <para>
+    Collapse all folder entries.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-widgets">
+    <title>Folder Navigator: Display</title>
+    <heading>Show/Hide Unsubscribed</heading>
+    <para>
+    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
+    </para>
+    <heading>Expand All</heading>
+    <para>
+    Expand all folder entries.
+    </para>
+    <heading>Collapse All</heading>
+    <para>
+    Collapse all folder entries.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-widgets">
+    <title>Folder Navigator: Display</title>
+    <heading>Show/Hide Unsubscribed</heading>
+    <para>
+    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
+    </para>
+    <heading>Expand All</heading>
+    <para>
+    Expand all folder entries.
+    </para>
+    <heading>Collapse All</heading>
+    <para>
+    Collapse all folder entries.
+    </para>
+</entry>--><!-- English entry:
+<entry id="folder-widgets">
+    <title>Folder Navigator: Display</title>
+    <heading>Show/Hide Unsubscribed</heading>
+    <para>
+    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
+    </para>
+    <heading>Expand All</heading>
+    <para>
+    Expand all folder entries.
+    </para>
+    <heading>Collapse All</heading>
+    <para>
+    Collapse all folder entries.
+    </para>
 </entry>--></entry>
   <entry id="filters" state="uptodate" md5="5ef60786767e638fbf5ba8fc5bd5d9d2">
     <title>Filtros: Aplicar</title>
@@ -384,13 +577,48 @@
     O endereço de e-mail que você quer associar a suas chaves pessoais. Campo obrigatório.
     </para>
 </entry>
-  <entry id="pgp-personalkey-create-keylength" state="uptodate" md5="546a087650cada2d1d4a01b478311bb9">
+  <entry id="pgp-personalkey-create-keylength" state="changed" md5="546a087650cada2d1d4a01b478311bb9">
     <title>PGP: Criar Chave Pessoal - Tamanho da Chave</title>
     <heading>Tamanho da Chave</heading>
     <para>
     O tamanho da chave, em bytes, de sua chave gerada. Quanto maior o valor, maior a proteção (e também maior o tempo de geração e criptografia). 1024 bytes é o padrão - este valor oferece uma excelente proteção.
     </para>
-</entry>
+<!-- English entry:
+<entry id="pgp-personalkey-create-keylength">
+    <title>PGP: Create Personal Key - Keylength</title>
+    <heading>Keylength</heading>
+    <para>
+    The keylength, in bit, of your generated key. The greater the value, the greater the protection (and also greater generation time and encryption time). 1024 bit is the default - this value provides excellent protection.
+    </para>
+</entry>--><!-- English entry:
+<entry id="pgp-personalkey-create-keylength">
+    <title>PGP: Create Personal Key - Keylength</title>
+    <heading>Keylength</heading>
+    <para>
+    The keylength, in bit, of your generated key. The greater the value, the greater the protection (and also greater generation time and encryption time). 1024 bit is the default - this value provides excellent protection.
+    </para>
+</entry>--><!-- English entry:
+<entry id="pgp-personalkey-create-keylength">
+    <title>PGP: Create Personal Key - Keylength</title>
+    <heading>Keylength</heading>
+    <para>
+    The keylength, in bit, of your generated key. The greater the value, the greater the protection (and also greater generation time and encryption time). 1024 bit is the default - this value provides excellent protection.
+    </para>
+</entry>--><!-- English entry:
+<entry id="pgp-personalkey-create-keylength">
+    <title>PGP: Create Personal Key - Keylength</title>
+    <heading>Keylength</heading>
+    <para>
+    The keylength, in bit, of your generated key. The greater the value, the greater the protection (and also greater generation time and encryption time). 1024 bit is the default - this value provides excellent protection.
+    </para>
+</entry>--><!-- English entry:
+<entry id="pgp-personalkey-create-keylength">
+    <title>PGP: Create Personal Key - Keylength</title>
+    <heading>Keylength</heading>
+    <para>
+    The keylength, in bit, of your generated key. The greater the value, the greater the protection (and also greater generation time and encryption time). 1024 bit is the default - this value provides excellent protection.
+    </para>
+</entry>--></entry>
   <entry id="pgp-personalkey-create-passphrase" state="uptodate" md5="2fb9372970bf33f51e988ba39dbd7193">
     <title>PGP: Criar Chave Pessoal - Senha</title>
     <heading>SEnha</heading>
@@ -565,6 +793,12 @@
      <para> %% : O sinal '%'</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="uptodate" md5="89e92c4d68224b2345b59959878a7174">
     <title>Preferências: Solicitar Confirmação de Leitura</title>
     <para>
@@ -583,6 +817,21 @@
     "Solicitar Confirmação de Entrega" envia ao servidor de e-mail do destinatário uma solicitação de notificação quando a mensagem for entregue na caixa postal do destinatário. Isto não significa que a mensagem foi lida, simplesmente ela está em uma caixa postal em algum lugar. Nem todos os servidores de e-mail suportam isto.
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="uptodate" md5="28e1cf08e328345a8e7274c853492d4f">
     <title>Preferências: Substituição de Imagem HTML</title>
     <para>
@@ -612,4 +861,16 @@
      <para>* "Perguntar sempre que um anexo for enviado; padrão NÃO" - SEMPRE pergunta se salvará anexos na janela de composição; o padrão é não salvar os anexos.</para>
      <para>* "Nunca salvar anexos" - NUNCA perguntar, na tela de composição de mensagem, se salvará anexos; os anexos NUNCA são salvos com a mensagem.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/login.php
+++ mod/login.php
@@ -2,10 +2,10 @@
 /**
  * Login screen for IMP.
  *
- * $Horde: imp/login.php,v 2.222.2.3 2005/05/20 00:14:14 slusarz Exp $
+ * $Horde: imp/login.php,v 2.222.2.9 2006/01/16 16:02:33 jan Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -15,7 +15,6 @@
 @define('IMP_BASE', dirname(__FILE__));
 $authentication = 'none';
 require_once IMP_BASE . '/lib/base.php';
-require_once 'Horde/Menu.php';
 require IMP_BASE . '/config/servers.php';
 
 /* Get an Auth object. */
@@ -26,6 +25,7 @@
 $autologin = Util::getFormData('autologin', false);
 $actionID = (Util::getFormData('action') == 'compose') ? 'login_compose' : Util::getFormData('actionID');
 $server_key = Util::getFormData('server_key');
+$url_param = Util::getFormData('url');
 
 /* Handle cases where we already have a session. */
 if (!empty($_SESSION['imp']) && is_array($_SESSION['imp'])) {
@@ -65,7 +65,8 @@
         $registry->loadPrefs('horde');
         $registry->loadPrefs();
     } else {
-        header('Location: ' . IMP::getInitialUrl($actionID, false));
+        require_once IMP_BASE . '/lib/Session.php';
+        header('Location: ' . IMP_Session::getInitialUrl($actionID, false));
         exit;
     }
 }
@@ -81,16 +82,37 @@
 }
 
 /* Redirect the user on logout if redirection is enabled. */
-if (($logout_reason == AUTH_REASON_LOGOUT) &&
-    $conf['user']['redirect_on_logout']) {
-    $url = Auth::addLogoutParameters($conf['user']['redirect_on_logout'], AUTH_REASON_LOGOUT);
+if ($logout_reason == AUTH_REASON_LOGOUT &&
+    ($conf['user']['redirect_on_logout'] ||
+     !empty($conf['auth']['redirect_on_logout']))) {
+    if (!empty($conf['auth']['redirect_on_logout'])) {
+        $url = Auth::addLogoutParameters($conf['auth']['redirect_on_logout'], AUTH_REASON_LOGOUT);
+    } else {
+        $url = Auth::addLogoutParameters($conf['user']['redirect_on_logout'], AUTH_REASON_LOGOUT);
+    }
+    if (!isset($_COOKIE[session_name()])) {
+        $url = Util::addParameter($url, session_name(), session_id());
+    }
     header('Location: ' . $url);
     exit;
 }
 
 /* Redirect the user if an alternate login page has been specified. */
-if ($conf['user']['alternate_login']) {
+if (!empty($conf['auth']['alternate_login'])) {
+    $url = Auth::addLogoutParameters($conf['auth']['alternate_login']);
+    if (!isset($_COOKIE[session_name()])) {
+        $url = Util::addParameter($url, session_name(), session_id(), false);
+    }
+    if ($url_param) {
+        $url = Util::addParameter($url, 'url', $url_param, false);
+    }
+    header('Location: ' . $url);
+    exit;
+} elseif ($conf['user']['alternate_login']) {
     $url = Auth::addLogoutParameters($conf['user']['alternate_login']);
+    if (!isset($_COOKIE[session_name()])) {
+        $url = Util::addParameter($url, session_name(), session_id(), false);
+    }
     header('Location: ' . $url);
     exit;
 }
@@ -150,6 +172,7 @@
     $ie_clientcaps = true;
 }
 
+require_once 'Horde/Menu.php';
 require IMP_TEMPLATES . '/common-header.inc';
 require IMP_TEMPLATES . '/login/login.inc';
 if (@is_readable(IMP_BASE . '/config/motd.php')) {


--- orig/po/ca_ES.po
+++ mod/po/ca_ES.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Horde 2.1\n"
-"POT-Creation-Date: 2003-02-18 09:39+0100\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-02-18 09:39+0100\n"
 "Last-Translator: Angels Guimerà <Angels.Guimera at uab.es>\n"
 "Language-Team: Catalan <dev at lists.horde.org>\n"
@@ -13,222 +14,760 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "    Per a: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "    Per a: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "   Data: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "      De: "
 
-msgid " - $nm new message"
-msgstr " - $nm nou missatge"
-
-msgid " - $nm new messages"
-msgstr " - $nm nous missatges"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Assumpte: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " a "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr "%A, %B %e, %Y, %I:%M:%S %p %Z"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d de %d Missatges"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Visualitzar el missatge quan els filtres hagin estat aplicats."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d al %d de %d Missatges"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ja existeix. La carpeta %s no ha estat renomenada."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "La carpeta %s es renomena a principi de mes."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "La carpeta \"%s\" ha estat renomenada satisfactòriament a \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aplicar els canvis i passar a la pantalla següent.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Rebutjar tots els canvis i tornar a la pantalla de redacció.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Tornar a la pantalla de redacció després d'aplicar tots el canvis "
-"fets fins aquí. Els canvis a la pantalla actual NO seran aplicats.)"
+"(Tornar a la pantalla de redacció després d'aplicar tots el canvis fets fins "
+"aquí. Els canvis a la pantalla actual NO seran aplicats.)"
 
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Tornar a la pantalla de redacció després d'aplicar tots el canvis fets fins "
+"aquí. Els canvis a la pantalla actual NO seran aplicats.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Afergir aquests fent clic a OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Si us plau, seleccioneu la adreça(ces)*"
 
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "La identitat \"%s\" ha estat eliminada."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr ""
+"Aquest missatge ha estat reportat com spam amb el vostre administrador del "
+"sistema."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Caràcters Especials"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Caràcters Especials"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Caràcters Especials"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Caràcters Especials"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
 msgstr ""
-"<p><i>Aquest missatge ha estat escrit utilitzant un joc de caràcters diferent "
-"al vostre. Si no es desplega correctamene, feu %sclick aquí</a> per  "
-"obrir-lo en una nova finestra.</i></p>\n"
 
-msgid "Action"
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "Nom de la identitat:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Acció"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Afegir a la Llibreta d'adreces (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "afegir font"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "S'ha adjuntat un arxiu."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Informació Personal"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Llibreta d'Adreces"
 
-msgid "Addressbooks"
-msgstr "Libretes d'adreces"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "Llibreta d'Adreces"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "¡Tots els missatges de la carpeta(es) es perdran!"
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Tots"
 
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
-"Tots els missatges de la carpeta(es) següent(s) es descarregaran en un"
-"arxiu MBOX: "
+"Tots els missatges de la carpeta(es) següent(s) es descarregaran en unarxiu "
+"MBOX: "
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
-"Tots els missatges de la vostra carpeta\"%s\" amb més de %s dies d'antiguitat "
-"seran eliminats permanentment."
+"Tots els missatges de la vostra carpeta\"%s\" amb més de %s dies "
+"d'antiguitat seran eliminats permanentment."
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Totes les carpetes sent-mail amb més de %s mesos d'antiguitat seran "
+"eliminades."
 
-#, c-format
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Totes les carpetes sent-mail amb més de %s mesos d'antiguitat seran "
 "eliminades."
 
-msgid "All"
-msgstr "Tots"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "La carpeta \"%s\" ha estat renomenada satisfactòriament a \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "S'ha adjuntat un arxiu."
 
-msgid "An illegal value was specified."
-msgstr "S'ha especificat un valor il·legal."
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "S'ha produit un error desconegut al afegir el nou registre."
 
-msgid "Answered messages"
-msgstr "Missatges contestats"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "S'ha produit un error desconegut al afegir el nou registre."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Contestat"
 
-msgid "Apply All Rules"
-msgstr "Aplicar Totes les Regles"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Missatges contestats"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Aplicar Filtres"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Aplicar Filtres"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "Aplicar regles de filtrat a l'iniciar la sessió."
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Aplicar regles de filtrat quan refresqueu la bústia."
 
-msgid "April"
-msgstr "Abril"
-
-msgid "Are you SURE you want to continue?"
-msgstr "¿Està SEGUR que desitjeu continuar?"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "¿Està segur que desitja fer això?"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "¿Està completament segur que desitja continuar?"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "¿Està segur que desitja fer això?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "¿Està segur que desitja eliminar PERMANENTEMENTaquests missatges?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "¿Està segur que desitja eliminar PERMANENTEMENTaquests missatges?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "¿Està segur que desitja buidar aquesta carpeta?"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "¿Està segur que desitja buidar aquesta carpeta?"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "¿Està segur que desitja buidar aquesta carpeta?"
+
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "¿Està segur que desitja eliminar PERMANENTEMENTaquests missatges?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "¿Està segur que desitja buidar aquesta carpeta?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "¿Està segur que desitja buidar aquesta carpeta?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Per Hora d'Arribada"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Ascendent"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Adjuntar"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Adjuntar"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "Adjuntar"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Adjuntar arxiu"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Adjuntar"
 
-msgid "August"
-msgstr "Agost"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Adjuntar"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Acció"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "Llibretes d'adreces disponibles:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Tornar a %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Tornar a %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Llista negra"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Text"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Ambdós"
 
-msgid "Cancel Message"
-msgstr "Cancel·lar Missatge"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Cancel·lar"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Cancel·lar Missatge"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
-msgstr "Cancel·lant aquest missatge rebutjareu permanentement el seu contingut."
+msgstr ""
+"Cancel·lant aquest missatge rebutjareu permanentement el seu contingut."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
-msgstr "Cc:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Personal"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Canviar"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Canviar totes"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Crear Carpeta"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -236,107 +775,326 @@
 "Canviar opcions de visualització tals com quants missatges veure per pàgina "
 "i el criteri de classificació dels missatges."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Canviar les configuracions del servidor de correu."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr ""
-"Canviar el nom, l'adreça electrònica, i la signatura, que els contactes veuen "
-"quan llegeixen i responen els vostres missatges."
+"Canviar el nom, l'adreça electrònica, i la signatura, que els contactes "
+"veuen quan llegeixen i responen els vostres missatges."
 
-msgid "Change"
-msgstr "Canviar"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Examinar Carpeta(es) per Correu Nou"
 
-msgid "Checkbox"
-msgstr "Selecció"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "Hi ha hagut un error al enviar el vostre missatge: %s"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Escollir Acció:"
 
-msgid "Choose the addressbook to use when adding addresses."
-msgstr "Escolliu la llibreta d'acreces a utilitzar quan afegiu adreces."
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "Canviar les configuracions del servidor de correu."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
 msgstr ""
-"Escolliu l'ordre de les llibretes d'adreces a buscar quan expandiu "
-"adreces."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "S'han alliberat tots els missatges de %s."
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Escollir Acció:"
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
-msgstr ""
-"Feu click al damunt d'una de les vostres llibretes d'adreces seleccionades i després "
-"seleccioneu els camps pels que desitjeu buscar."
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
+msgstr "Escolliu la llibreta d'acreces a utilitzar quan afegiu adreces."
 
-msgid "Closed Folder"
-msgstr "Carpeta Tancanda"
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+"Escolliu l'ordre de les llibretes d'adreces a buscar quan expandiu adreces."
 
-msgid "Collapse All Folders"
-msgstr "Col·lapsar Totes les Carpetes"
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
 
-msgid "Collapse All"
-msgstr "Col·lapsar Totes"
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
 
-msgid "Collapse Folder"
-msgstr "Col·lapsar Carpeta"
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Redacció del Missatge (%s)"
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Redactar missatges en una finestra apart."
 
-msgid "Compose a message"
-msgstr "Redactar un missatge"
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
 
-msgid "Compose messages in a separate window."
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
 msgstr "Redactar missatges en una finestra apart."
 
-msgid "Compose"
-msgstr "Nou"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
 
-msgid "Contact List"
-msgstr "Llista de Contactes"
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
 
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"Feu click al damunt d'una de les vostres llibretes d'adreces seleccionades i "
+"després seleccioneu els camps pels que desitjeu buscar."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Nou"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "Carpeta Tancanda"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Col·lapsar Totes"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All"
+msgstr "Col·lapsar Totes"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Col·lapsar Totes les Carpetes"
+
+#: folders.php:449
+msgid "Collapse Folder"
+msgstr "Col·lapsar Carpeta"
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "Nou"
+
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
+msgstr "Redactar un missatge"
+
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
+msgstr "Redactar missatges en una finestra apart."
+
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Canviar les configuracions del servidor de correu."
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"Regular quan es verificarà per correu nou i, si notificar o no quan es "
-"rebin."
+"Regular quan es verificarà per correu nou i, si notificar o no quan es rebin."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Copiar"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Buidar la carpeta Paperera"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corregir"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Text Corregit"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "No s'han pogut eliminar missatges de %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "No s'han pogut eliminar missatges de %s: %s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Operacions de Manteniment"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Crear"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Crear Carpeta"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "Crear"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Crear Carpeta"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Crear una nova carpeta per a la Paperera"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Crear una nova carpeta d'esborranys"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Crear una nova carpeta de correu enviat"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Crear una nova carpeta per a la Paperera"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -344,832 +1102,2979 @@
 "Crear regles de filtrat per organitzar el correu entrant, classificar-lo en "
 "carpetes i eliminar spam."
 
-msgid "Create"
-msgstr "Crear"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Crear una nova carpeta de correu enviat"
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "Personalitzar la tramesa de correu i on desar els esborranys."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
-"Personalitzar l'execució de les operacions de manteniment al iniciar"
-"sessió en %s."
 
-#, c-format
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "Personalitzar la tramesa de correu i on desar els esborranys."
+
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Personalitzar les tasques a executar al iniciar sessió en %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Data"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Data"
 
-msgid "December"
-msgstr "Desembre"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Eliminats"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Criteri de classificació per defecte:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Ordre de clasificació per defecte:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminats"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Eliminar Carpeta(es)"
 
-msgid "Delete messages"
-msgstr "Eliminar missatges"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Eliminar Carpeta(es)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Eliminar Carpeta(es)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Eliminar Carpeta(es)"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "Eliminar les carpetes sent-mail a principi de mes"
 
-msgid "Delete"
-msgstr "Eliminar"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "Eliminar les carpetes sent-mail a principi de mes"
 
-msgid "Deleted an attachment."
-msgstr "S'ha eliminat un arxiu."
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Eliminar missatges"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Eliminats"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Missatges eliminats"
 
-msgid "Deleted"
-msgstr "Eliminats"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "S'ha eliminat un arxiu."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Eliminant i movent missatges"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Descendent"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Opcions de l'Usuari"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "¿Atenuar signatures?"
 
-msgid "Display Options"
-msgstr "Opcions de Visualització"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Visualitzar"
 
-msgid "Display message when filters have been applied."
-msgstr "Visualitzar el missatge quan els filtres hagin estat aplicats."
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "Mostrar finestra de notificació de correu nou."
 
-msgid "Display"
-msgstr "Visualitzar"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
 
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "Opcions de Visualització"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "No Examinar Carpeta(es) per Correu Nou"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "¿Desitjeu obrir aquesta carpeta?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Acabar"
 
-#, c-format
-msgid "Download %s"
-msgstr "Descarregar %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Descarregar Carpeta(es)"
 
-msgid "Download"
-msgstr "Descarregar"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Descarregar Carpeta(es)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Esborrany"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "Carpeta d'esborranys:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Carpeta d'esborranys:"
 
-msgid "Edit your filter rules"
-msgstr "Editar regles de filtrat"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "Adreça Electrònica"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
 
-msgid "Edit your identities"
-msgstr "Editeu les vostres identitats"
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Editar"
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "Llista negra"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Filtres de Correu"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Editar regles de filtrat"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Editar regles de filtrat"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Editar regles de filtrat"
+
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Adreça Electrònica"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "S'han alliberat tots els missatges de %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Buidar Carpeta(es)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Buidar Carpeta(es)"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Buidar la carpeta Paperera"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Buidar Paperera"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Buidar Paperera"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Fi del missatge reenviat"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "Missatges Antics"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "Missatge reenviat de %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Introduïu el nom de la nova carpeta de Paperera"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Introduïu el nom de la nova carpeta d'esborranys"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Introduïu el nom de la nova carpeta de correu enviat"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Introduïu el nom de la nova carpeta de Paperera"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Redirigir Missatge"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr ""
 "El registre \"%s\" ha estat afegit satisfactòriament a la llibreta d'adreces"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Error"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "La carpeta \"%s\" ha estat eliminada satisfactòriament."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Cada 15 minuts"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Cada 30 segons"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Cada 5 minuts"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Cada mitja hora"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Cada minut"
 
-msgid "Expand All Folders"
-msgstr "Expandir Totes les Carpetes"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Expandir "
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Expandir "
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Expandir Totes les Carpetes"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Expandir Carpeta"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Expandir Noms"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Expandir l'àrbre sencer per defecte en la vista de carpetes."
 
-msgid "February"
-msgstr "Febrer"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Expandir "
 
-msgid "Field"
-msgstr "Camp"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Nou Correu"
 
-msgid "Filename"
-msgstr "Nom d'arxiu"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "Nou Correu"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Activitat del Filtre: El missatge \"%s\" de \"%s\" ha estat eliminat."
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "Redactar missatges en una finestra apart."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"Activitat del Filtre: El missatge \"%s\" de\"%s\" s'ha mogut a la "
-"carpeta \"%s\"."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Aplicar regles de filtrat a l'iniciar la sessió."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "S'han alliberat tots els missatges de %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Missatge reenviat de %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
-"Activitat del Filtre: El missatge \"%s\" de \"%s\" s'ha mogut a la vostra  "
-"carpeta Paperera."
 
-msgid "Filter Rules"
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Teniu %s missatges nous."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Filtres"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Filtres"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Altres Opcions"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Regles de Filtrat"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
 msgstr "Filtrar contingut obscé en el missatge."
 
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtres"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Trobar"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Primera Pàgina"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Primera Pàgina"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Reenviar"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Navegador de Carpetes"
 
-msgid "Folder Prefix"
-msgstr "Carpetes"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Febrer"
 
-msgid "Folders"
-msgstr "Carpetes"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
 
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Reenviar"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Reenviar"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Fi del missatge reenviat"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Missatge reenviat de %s"
 
-msgid "From Address"
-msgstr "D'Adreça Electrònica"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Informació del Servidor"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "De"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "De"
 
-msgid "From:"
-msgstr "De:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "D'Adreça Electrònica"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fwd:"
 
-msgid "Help"
-msgstr "Ajuda"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "Fwd:"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Fi del missatge reenviat"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Opcions de l'Usuari"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "MIssatge Següent"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Afegir a la Llibreta d'adreces (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "Per Seqüència"
 
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Ocultar Eliminats"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Ocultar Desubscrits"
 
-msgid "How to prefix quoted lines in a reply:"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Prefix per citar les línies del missatge de resposta:"
 
-msgid "IMP is not properly configured"
-msgstr "IMP no està correctament configurat"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
 
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-msgid "Identities"
-msgstr "Identitats"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity"
-msgstr "Identitat"
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "¡Tots els missatges de la carpeta(es) es perdran!"
 
-msgid "Identity's name:"
-msgstr "Nom de la identitat:"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignorar"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorar Totes"
 
-msgid "Ignore"
-msgstr "Ignorar"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Important messages"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Important"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "Important"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "Important"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
 msgstr "Missatges importants"
 
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Important"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Missatges importants"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "S'han alliberat tots els missatges de %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "¿Incloure missatge original a la resposta?"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "¿Incloure missatge original a la resposta?"
 
-msgid "January"
-msgstr "Gener"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Ignorar"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "cap"
 
-msgid "July"
-msgstr "Juliol"
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
 
-msgid "June"
-msgstr "Juny"
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
 
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Adreça Electrònica"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Idioma"
 
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "Darrera Pàgina"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Darrera Pàgina"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Darrera Sessió: %s"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Adjuntar"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
 
-msgid "Last login: Never"
-msgstr "Darrera Sessió: Mai"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-#, c-format
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "Bústia"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Acció"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Entrar"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Entrar a %s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Entrar"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Tasques d'Inici de Sessió"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: templates/compose/compose.inc:296
+msgid "Low"
 msgstr ""
-"Per algún motiu, no s'ha aconseguit obrir la sessió. Probablement, el vostre "
-"nom d'usuari o contrasenya han estat introduïts incorrectament."
 
-msgid "Logout"
-msgstr "Sortir de la sessió"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
 
-msgid "Mail Filters"
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
 msgstr "Filtres de Correu"
 
-msgid "Mail Management"
-msgstr "Utilització del Correu"
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "Bústia"
 
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "Filtres de Correu"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Bústia"
 
-msgid "Maintenance Operations"
-msgstr "Operacions de Manteniment"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Opcions de Visualització"
 
-msgid "March"
-msgstr "Març"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Marcar com:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "¿Marcar diferents nivells de quota amb diferents colors?"
 
-msgid "May"
-msgstr "Maig"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Adjuntar arxiu"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Informació del Servidor"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
 
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Obrir Carpeta"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "Missatge"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Redactar Missatge"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Per Data del Missatge"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "Missatges a"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Cerca de Missatges"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Per Tamany del Missatge"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Font"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Presentació de Missatges"
 
-msgid "Message fields"
-msgstr "Camps del missatge"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Banderes del missatge"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Carpetes del Missatge"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "Carpetes del Missatge"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "S'ha eliminat un arxiu."
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Camps del missatge"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Camps del missatge"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Per Data del Missatge"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
 msgstr "Missatge enviat satisfactòriament, però no ha estat desat a"
 
-msgid "Message"
-msgstr "Missatge"
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Missatge enviat satisfactòriament, però no ha estat desat a"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "Missatge enviat satisfactòriament, però no ha estat desat a"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Missatges per pàgina al llistat de la bústia."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Missatges a"
 
-msgid "Mime Type"
-msgstr "Tipus MIME"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Modificar"
 
-msgid "Move Down"
-msgstr "Moure Abaix"
-
-msgid "Move Up"
-msgstr "Moure Amunt"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Moure missatges a la caperta <b>%s</b>"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Moure"
 
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "moure abaix"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "seleccionar carpeta"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "moure amunt"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Presentació de Missatges"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nom"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Acció"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Mai"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "S'ha eliminat un arxiu."
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Nou"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "Obrir Carpeta"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nou Correu"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "MIssatge Següent"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "MIssatges Nous"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "MIssatges Nous"
 
-msgid "New"
-msgstr "Nou"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Sigüent"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "MIssatge Següent"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Pàgina Següent"
 
-msgid "Next"
-msgstr "Sigüent"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "No"
 
-msgid "No Subject"
-msgstr "Sense Assumpte"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "MIssatges Nous"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Text Corregit"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "Adjuntar"
 
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "no s'ha seleccionat cap carpeta"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "No s'han especificat carpetes"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Missatges No eliminats"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Missatges No eliminats"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "moure missatge a"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "No hi ha missatges que coincideixin amb la vostra cerca"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "No hi ha errors d'ortografia"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "No hi ha suggeriments"
 
-msgid "No"
-msgstr "No"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "No s'han especificat carpetes"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Cap"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "No Eliminat"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "No Esborrany"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "No Important"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "No Personal"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Missatges No eliminats"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Missatges No importants"
 
-msgid "November"
-msgstr "Novembre"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Missatge citat per"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr "Nombre de carpetes sent-mail a mantenir si s'eliminen mensualment"
 
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr "Nombre de carpetes sent-mail a mantenir si s'eliminen mensualment"
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-msgid "October"
-msgstr "Octubre"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Missatges Antics"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Purgant carpetes sent-mail antigues."
 
-msgid "Open Folder"
-msgstr "Obrir Carpeta"
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "Seleccioneu una sola carpeta per a aquesta operació"
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Obrir Carpeta"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Obrir Carpeta"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "Altres Opcions"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "Altres Opcions"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "Cancel·lar Missatge"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "Error"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "Opcions"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "La carpeta \"%s\" ha estat creada satisfactòriament."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "La carpeta \"%s\" ha estat eliminada satisfactòriament."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "Enviar Missatge"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "La signatura s'ha reemplaçat satisfactòriament."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "Options"
-msgstr "Opcions"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-msgid "Other Options"
-msgstr "Altres Opcions"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Pàgina %d de %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Part(s)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "Missatge enviat satisfactòriament, però no ha estat desat a"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Contrasenya"
 
-msgid "Perform maintenance operations on login"
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
 msgstr "Realitzar operacions de manteniment al iniciar sessió"
 
-msgid "Personal Information"
-msgstr "Informació Personal"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
 
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Personal"
 
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "Informació Personal"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "¿Voleu Col·locar la vostra signatura abans dels missatges de resposta i els reenviaments?"
+msgstr ""
+"¿Voleu Col·locar la vostra signatura abans dels missatges de resposta i els "
+"reenviaments?"
+
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "Si us plau, introduïu el nom de la nova carpeta:"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Si us plau, introduïu el nom de la nova carpeta:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Introduïu el nou  nom:"
 
-msgid "Please enter valid search criteria."
-msgstr "Introduïu un criteri de cerca vàlid."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "Faciliteu el vostre nom d'usuari i contrasenya"
 
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "Faciliteu el vostre nom d'usuari i contrasenya"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Si us plau, resoleu les adreces electròniques ambigües o invàlides."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Seleccioneu una carpeta abans de realitzar cap acció."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "Seleccioneu com a mínim una carpeta per a realitzar la cerca."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Seleccioneu com a mínim una carpeta per a realitzar la cerca."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Seleccioneu una sola carpeta per a aquesta operació"
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "Si us plau, seleccioneu o editeu a continuació de:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Precediu la vostra signatura amb guions ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "La carpeta \"%s\" ha estat creada satisfactòriament."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Pàgina Anterior"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Missatge Anterior"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Pàgina Anterior"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Imprimir"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problema amb la regla de filtrat %d: la carpeta no existeix: %s"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "Imprimir"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
 
-msgid "Problem?"
-msgstr "¿Problemes?"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Buidar Paperera"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Buidar Paperera"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Eliminar Carpeta(es)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Periodicitat del buidat de la Paperera:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr ""
 "Buidar els missatges a la capeta Paperera que siguin més antics que aquesta "
 "quantitat de dies"
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Buidar missatge antic a la carpeta Paperera"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Buidant %d missatge(es) de la carpeta Paperera."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "Buidant %d missatge(es) de la carpeta Paperera."
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Missatge citat per"
 
-msgid "Received after"
-msgstr "Rebut després del"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Rebut el"
 
-msgid "Received before"
-msgstr "Rebut abans del"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Rebut el"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Rebut el"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Redirigir"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Redirigir"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Redirigir Missatge"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Redirigir aquest missatge"
 
-msgid "Redirect"
-msgstr "Redirigir"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "El redireccionament ha fallat."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Refrescar Vistes de Carpeta"
 
-msgid "Refresh"
-msgstr "Refrescar"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Recarregar Vista"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Recarregar Vista"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Recordar la darrera vista"
 
-msgid "Remove Selected"
-msgstr "Eliminar Seleccionat"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "Bústia"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "treure font"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "Renomenar Carpeta"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Renomenar la carpeta sent-mail a principi de mes"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "Ha fallat al renomenar \"%s\" a \"%s\". Això és el que ha dit el servidor"
+msgstr ""
+"Ha fallat al renomenar \"%s\" a \"%s\". Això és el que ha dit el servidor"
+
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Respondre a Tots"
 
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Reemplaçar amb:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Respondre"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Respondre-a"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Respondre a Tots"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Respondre a Tots:"
 
-msgid "Reply"
-msgstr "Respondre"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "Respondre a Tots"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "Respondre a Tots:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Respondre a Tots"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "Respondre-A: "
 
-msgid "Reply-to"
-msgstr "Respondre-a"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "Respondre-A: "
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Respondre:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Reportar com Spam"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Reportar com Spam"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "Sol·licitar Avís de Rebuda"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "Sol·licitar Avís de Rebuda"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Netejar"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Reprendre"
 
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Redactar Missatge"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Opcions de l'Usuari"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "¿Tornar al llista de la bústia després d'eliminar, moure o copiar un "
 "missatge?"
 
-msgid "Rule Definition"
-msgstr "Definició de la Regla"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "Opcions"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "La carpeta \"%s\" ha estat eliminada satisfactòriament."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "Enviar Missatge"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Assumpte"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "Desar còpia a "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Desar com"
 
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Desar com"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Desar Esborrany"
 
-msgid "Save a copy in "
-msgstr "Desar còpia a "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Desar com"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
 
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "Opcions de l'Usuari"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Desar Esborrany"
+
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Desar com"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Desar correu enviat"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Ha fallat al desar l'esborrany. Això és el que ha dit el servidor: %s"
 
-msgid "Search Results"
-msgstr "Resultats de la Cerca"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Cercar"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Cercar"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Opcions de l'Usuari"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "Resultats de la Cerca"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Vist"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Seleccionar"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Treure selecció"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Seleccioneu una identitat"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Seleccionar tots"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Treure selecció"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 "Seleccioneu la procedència de les llibretes d'adreces per afegir i cercar "
 "adreces de correu."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Seleccionar tots"
 
-msgid "Select an identity"
-msgstr "Seleccioneu una identitat"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"Escolliu l'ordre de les llibretes d'adreces a buscar quan expandiu adreces."
 
-msgid "Select charset:"
-msgstr "Seleccioneu joc de caràcters:"
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "Treure selecció"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Treure selecció"
 
-msgid "Select your preferred language:"
-msgstr "Seleccioneu el vostre idioma preferit:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Seleccionar"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Llibretes d'Adreces seleccionades:"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informació del Servidor"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Enviar Missatge"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "Carpeta de correus enviats:"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Carpeta de correus enviats:"
 
-msgid "September"
-msgstr "Setembre"
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "Servidor"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "Informació del Servidor"
 
-msgid "Server"
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
 msgstr "Servidor"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Establiu preferències per filtrar missatges amb contingut no desitjat."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 "Establiu preferències del que ha de succeir quan moveu i elimineu missatges."
 
-msgid "Set the current time zone."
-msgstr "Establiu la zona horària."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Carpetes"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Carpeta de correus enviats:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
-"Establiu l'idioma per als elements del menú, explicacions i ajuda."
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "¿S'ha de tancar la finestra de redacció després de desar un esborrany?"
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Col·lapsar Totes les Carpetes"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Mostrar Eliminats"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "Informació Personal"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Subscriure's a la Carpeta(es)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Mostrar Desubscrits"
 
-msgid "Show last login time when logging in"
-msgstr "Mostrar l'hora de la darrera sessió"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-msgid "Show legend in the mailbox view."
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
 msgstr "Mostrar llegenda en el llistat de la bústia."
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "Tamany"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Tamany"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Tamany"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Falten alguns arxius de configuració d'IMP:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "D'Adreça Electrònica"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "Per Tamany del Missatge"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "Sense Assumpte"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "Seqüència"
 
-msgid "Sort Direction"
-msgstr "Ordre de clasificació"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "D'Adreça Electrònica"
 
-msgid "Spam Report from"
-msgstr "Informe sobre Spam de"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Carpeta Paperera:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Caràcters Especials"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Correcció d'Ortografia"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Corrector d'Ortografia"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Revisió d'ortografia completa"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Errors d'ortografia per pantalla durant la revisió."
 
-msgid "Subject Field"
-msgstr "Per Assumpte"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Adjuntar arxiu"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Assumpte"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Assumpte"
 
-msgid "Subject:"
-msgstr "Assumpte:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Per Assumpte"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "Assumpte"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Subscriure's a la Carpeta(es)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Èxit"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Suggeriments"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Text"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Text"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "La identitat \"%s\" ha estat eliminada."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "La identitat \"%s\" ha estat desada."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "La(es) carpeta(es) \"%s\" serà(n) renomenada(es) a \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "La identitat \"%s\" ha estat eliminada."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "La carpeta \"%s\" ja existeix"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1177,451 +4082,1196 @@
 "La carpeta \"%s\" conté caràcters il·legals en el seu nom. Això pot causar  "
 "problemes. Si us plau, contacteu l'administrador del sistema."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "La carpeta \"%s\" ha estat creada però no hi heu estat subscrit."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "La carpeta \"%s\" ha estat eliminada però no hi heu estat desubscrit."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "La carpeta \"%s\" no ha estat creada. Això és el que ha dit el servidor"
+msgstr ""
+"La carpeta \"%s\" no ha estat creada. Això és el que ha dit el servidor"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "La carpeta \"%s\" no ha estat eliminada. Això é que ha dit el servidor"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "La carpeta \"%s\" ha estat creada satisfactòriament."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "La carpeta \"%s\" ha estat eliminada satisfactòriament."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "La carpeta \"%s\" ha estat renomenada satisfactòriament a \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "La carpeta \"%s\" ja existeix"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
+msgstr "El missatge que estaveu redactant s'ha tancat. Sortint."
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "La identitat \"%s\" ha estat eliminada."
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "La identitat \"%s\" ha estat desada."
 
-msgid "The message being composed has been closed.  Exiting."
-msgstr "El missatge que estaveu redactant s'ha tancat. Sortint."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
 
-msgid "The signature couldn't be replaced."
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "La signatura no ha pogut ésser reemplaçada."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "La signatura s'ha reemplaçat satisfactòriament."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "La identitat \"%s\" ha estat desada."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "La identitat \"%s\" ha estat eliminada."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "La identitat \"%s\" ha estat eliminada."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "eliminar missatge"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Redirigir aquest missatge"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "La signatura s'ha reemplaçat satisfactòriament."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "No hi ha missatges en aquesta bústia."
 
-#, c-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Hi ha hagut un problema al buidar %s. Això és el que ha dit el servidor"
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Hi ha hagut un problema albuidar la bústia. Això és el que ha dit el servidor"
+#: lib/Message.php:612
+#, php-format
+msgid "There was a problem expunging %s. This is what the server said"
+msgstr ""
+"Hi ha hagut un problema al buidar %s. Això és el que ha dit el servidor"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
-"Hi ha hagut un problema al pujar l'arxiu. L'arxiu podia haver estat més gran "
-"que el tamany màxim permès (%d MB)."
+"Hi ha hagut un problema albuidar la bústia. Això és el que ha dit el servidor"
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
-"HI ha hagut un problema al pujar l'arxiu. L'arxiu podia haver estat més gran "
-"que el tamany màxim permès."
+"Hi ha hagut un problema albuidar la bústia. Això és el que ha dit el servidor"
 
-#, c-format
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"HI ha hagut un error al copiar missatges a \"%s\". Això és que el que ha dit el servidor"
+"HI ha hagut un error al copiar missatges a \"%s\". Això és que el que ha dit "
+"el servidor"
 
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Hi ha hagut un error al eliminar missatges de la carpeta \"%s\". Això és el que ha dit el servidor"
+"Hi ha hagut un error al eliminar missatges de la carpeta \"%s\". Això és el "
+"que ha dit el servidor"
 
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Hi ha hagut un error al eliminar els missatges de la carpeta \"%s\". Això és el que ha dit "
-"el servidor"
+"Hi ha hagut un error al eliminar els missatges de la carpeta \"%s\". Això és "
+"el que ha dit el servidor"
+
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr ""
+"Hi ha hagut un error al eliminar missatges. Això és el que ha dit el servidor"
 
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "Hi ha hagut un error al eliminar missatges. Això és el que ha dit el servidor"
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Hi ha hagut un error al visualitzar el missatge sol·licitat."
 
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Hi ha hagut un error al visualitzar aquesta part del missatge"
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Hi ha hagut un error al marcar missatges a la carpeta \"%s\". Això és el que ha dit"
-"el servidor"
+"Hi ha hagut un error al marcar missatges a la carpeta \"%s\". Això és el que "
+"ha ditel servidor"
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "HI ha hagut un error al marcar missatges. Això és el que ha dit el servidor"
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "Hi ha hagut un error al desar l'esborrany."
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr ""
-"Hi ha hagut un error al moure missatges a \"%s\". Això és el que ha dit el servidor"
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Hi ha hagut un error al visualitzar el missatge sol·licitat."
+
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Hi ha hagut un error al visualitzar el missatge sol·licitat."
 
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Hi ha hagut un error al enviar el vostre missatge: %s"
+
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Hi ha hagut un error al moure missatges a la Paperera. Això és el que ha dit el servidor "
-"dijo"
+"Hi ha hagut un error al moure missatges a \"%s\". Això és el que ha dit el "
+"servidor"
 
-msgid "There was an error saving a draft."
-msgstr "Hi ha hagut un error al desar l'esborrany."
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "Hi ha hagut un error al visualitzar aquesta part del missatge"
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Hi ha hagut un error al enviar el vostre missatge: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "H ha hagut un error al recuperar el missatge. Això és el que ha dit el servidor"
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Hi ha hagut un error al enviar el vostre missatge: %s"
 
-msgid "There was an error viewing the requested message."
-msgstr "Hi ha hagut un error al visualitzar el missatge sol·licitat."
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Hi ha hagut un error al visualitzar aquesta part del missatge"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Això pot tardar una mica. ¿Estàs segur que desitja continuar?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+"This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
-"Aquests arxiu controla els drivers locals de MIME per a IMP, "
-"específicament arxius adjunts que són visualitzables o descarregables."
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
 msgstr ""
-"Aquest arxiu controla les preferències per defecte per a IMP, i també "
-"controla totes aquelles preferències que els usuaris puguin alterar."
 
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
-"AQuest arxiu controla la configuració per defecte per a IMP, i defineix també "
-"un llistat de servidors disponibles si s'utilitza la llista de "
-"servidors."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
 msgstr ""
-"Aquest arxiu controla el full d'estil utilitzat per fixar els colors i"
-"fonts, a més, anul·la les configuracions per defecte de Horde."
 
-msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
-"Aquest és l'arxiu principal de configuració d'IMP. Conté rutes a "
-"arxius i opcions per al scripts d'IMP."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Això pot tardar una mica. ¿Estàs segur que desitja continuar?"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
 msgstr ""
-"Aquest missatge ha estat reportat com spam amb el vostre administrador del sistema."
 
+#: message.php:211
 msgid "This message to"
 msgstr "Aquest missatge a"
 
-msgid "This number must be at least one."
-msgstr "Aquest número ha de ser al menys un 1."
-
-msgid "This value must be a number."
-msgstr "Aquest valor ha de ser un número."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "Heu de cridar aquesta finestra des de la finestra de redacció"
 
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Visualitzar"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Per Seqüència"
 
-msgid "Thread"
-msgstr "Seqüència"
-
-msgid "Time Zone"
-msgstr "Zona Horària"
-
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Per a"
 
-msgid "To:"
-msgstr "Per a:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "D'Adreça Electrònica"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Adjuntar"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Tamany Total: %s KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Carpeta Paperera:"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Carpeta Paperera:"
 
-msgid "Unanswered messages"
-msgstr "Missatges sense respondre"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Sense respondre"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Missatges sense respondre"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Recuperar"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Destinataris Desconegut"
 
-msgid "Unnamed"
-msgstr "Sense nom"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
 
-msgid "Unread"
-msgstr "Sense llegir"
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "Destinataris Desconegut"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
 
-msgid "Unseen Messages"
-msgstr "Missatges No vistos"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "Sense nom"
 
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "No vist"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Desubscriure's de la(es) Carpeta(es)"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Utilitzeu Ctrl/Option+Click per seleccionar diversos camps"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Utilitzar Valor Per Defecte"
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
 msgstr "Utilitar subscripcions a carpetes IMAP"
 
-msgid "User Options"
-msgstr "Opcions de l'Usuari"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Buidar la carpeta Paperera"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Nom d'Usuari"
 
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Nom d'Usuari"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "Nom d'Usuari"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "Veure %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Veure %s"
 
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Redactar missatges en una finestra apart."
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "MIssatges Nous"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Seqüència"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Redactar missatges en una finestra apart."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Redactar missatges en una finestra apart."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "Veure missatges a"
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Vista o bústia a desplegar després d'iniciar la sessió:"
 
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "Veure %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Veure missatges a"
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "La carpeta \"%s\" ha estat eliminada satisfactòriament."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Crear Carpeta"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Buidar la carpeta Paperera"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "Avís"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Benvinguts a %s"
 
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
+#, fuzzy
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
+msgstr ""
+"Quan elimineu missatges, els heu de moure a la Paperera en lloc de marcar-"
+"los com eliminats."
+
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
-"Quan elimineu missatges, els heu de moure a la Paperera en lloc de marcar-los com "
-"eliminats."
 
-msgid "Wrap text at this many characters."
-msgstr "Ajustar text del missatge a aquest nombre de caràcters."
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
 
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
+
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Sí"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Esteu intentant eliminar les carpetes següents:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Esteu intentant eliminar les carpetes següents:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Esteu intentant eliminar les carpetes següents:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "Esteu renomenant la carpeta: "
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Esteu creant una sub-carpeta a "
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Esteu creant una carpeta de nivell superior."
 
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Esteu creant una carpeta de nivell superior."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Esteu renomenant la carpeta: "
 
-#, c-format
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Heu estat desubscrit satisfactòriament de \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Teniu %s missatges nous."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Teniu 1 missatge nou."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Heu tancat la sessió.<br />Gràcies per utilitzar el sistema."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Teniu 1 missatge nou."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Teniu correu nou a la carpeta següent:"
 
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Teniu correu nou a les carpetes següents:"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Primer heu de seleccionar l'arxiu adjunt que voleu eliminar."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Heu de tenir, al menys, un destinatari en el camp PER A:"
 
-msgid "You must first specify the file to attach."
-msgstr "Primer heu d'especificar l'arxiu que voleu adjuntar."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-msgid "You must have at least one recipient."
-msgstr "Heu de tenir, al menys, un destinatari en el camp PER A:"
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Primer heu de seleccionar una bústia de destí."
 
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "Heu de seleccionar una identitat a eliminar."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Primer heu de seleccionar una adreça."
 
-msgid "You must select an identity to be deleted."
-msgstr "Heu de seleccionar una identitat a eliminar."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Primer heu de seleccionar, al menys, un missatge."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Heu d'especificar un destinatari en el camp PER A:"
 
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Primer heu d'especificar l'arxiu que voleu adjuntar."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Redirigir aquest missatge"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Redirigir aquest missatge"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "No heu estat subscrit a \"%s\". Això és el que ha dit el servidor"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "No heu estat desubscrit de \"%s\". Això és el que ha dit el servidor"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Heu estat subscrit satisfactòriament a \"%s\""
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Heu estat desubscrit satisfactòriament de \"%s\""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "La vostra sessió a %s ha expirat. Si us plau, inicieu una nova sessió."
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "El vostre nomcomplet:"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-msgid "Your From: address:"
-msgstr "La vostra adreça electrònica \"De:\""
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-msgid "Your Information"
-msgstr "La vostra informació"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "El vostre nomcomplet:"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "La vostra adreça electrònica \"Respondre-a\": <i>(opcional)</i>"
 
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
-"El vostre navegador no admet l'opció d'impressió. Pressioneu Control/Opció + P "
-"per imprimir."
 
-msgid "Your current time zone:"
-msgstr "La vostra zona horària:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "Les vostres identitats:"
 
-msgid "Your default identity:"
-msgstr "La vostra identitat per defecte:"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-msgid "Your full name:"
-msgstr "El vostre nomcomplet:"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+"El vostre navegador no admet l'opció d'impressió. Pressioneu Control/Opció + "
+"P per imprimir."
 
-msgid "Your identities:"
-msgstr "Les vostres identitats:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Les vostres opcions han estat actualitzades."
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "La carpeta \"%s\" ha estat eliminada satisfactòriament."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "La vostra signatura:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Sense Assumpte]"
 
-msgid "add source"
-msgstr "afegir font"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Bcc"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "Llista negra"
 
-msgid "cannot move past the beginning"
-msgstr "no es pot moure després de l'inici"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Cc"
 
-msgid "cannot move past the end"
-msgstr "no es pot seguir després del final"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Eliminar"
 
-msgid "delete message"
-msgstr "eliminar missatge"
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Carpetes"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitat"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Sortir de la sessió"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "Font"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "MIssatges Nous"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Imprimir"
 
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Refrescar"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Respondre"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Cercar"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Enviar Missatge"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Seqüència"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Per a"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Recuperar"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Seqüència"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Adjuntar arxiu"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Adjuntar"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "de"
 
-msgid "move down"
-msgstr "moure abaix"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-msgid "move message to"
-msgstr "moure missatge a"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-msgid "move up"
-msgstr "moure amunt"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-msgid "no folder selected"
-msgstr "no s'ha seleccionat cap carpeta"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "no s'ha seleccionat cap regla"
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Bústia"
 
-msgid "no text specified"
-msgstr "no s'ha especificat cap text"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Nom"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "cap"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "o"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "Si us plau, ompliu amb text i escolliu un camp i una acció"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "treure font"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "seleccionar carpeta"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "error d'ortografia"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "errors d'ortografia"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "on el camp %s conté <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "error d'ortografia"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "Llista negra"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/locale/sk_SK/help.xml
+++ mod/locale/sk_SK/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- $Horde: imp/locale/sk_SK/help.xml,v 1.17.6.1 2005/01/25 22:05:51 jan Exp $ -->
+<!-- $Horde: imp/locale/sk_SK/help.xml,v 1.17.6.5 2006/03/23 00:24:08 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Písanie správy: Akcie</title>
@@ -234,6 +234,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Vyhµadávanie správy</title>
     <heading>Kritérium hµadania</heading>
@@ -694,6 +700,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -712,6 +724,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -741,4 +768,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/po/th_TH.po
+++ mod/po/th_TH.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Imp 3.1\n"
-"POT-Creation-Date: 2003-02-08 15:45+0700\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-02-08 15:45+0700\n"
 "Last-Translator: Surasak Srisawan <surasak at rirc.ac.th>\n"
 "Language-Team: i18n at lists.horde.org\n"
@@ -14,1868 +15,5196 @@
 "Content-Type: text/plain; charset=TIS-620\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: compose.php:635
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      ¶Ö§: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      ¶Ö§: "
 
-#: compose.php:619
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    ÇÑ¹·Õè: "
 
-#: compose.php:623
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    ¨Ò¡: "
 
-#: folders.php:439 lib/api.php:84
-msgid " - $nm new message"
-msgstr " - $nm ¢éÍ¤ÇÒÁãËÁè"
-
-#: folders.php:439 lib/api.php:84
-msgid " - $nm new messages"
-msgstr " - $nm ¢éÍ¤ÇÒÁãËÁè"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
-#: compose.php:631
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " àÃ×èÍ§: "
 
-#: templates/compose/spelling.inc:59
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " ã¹ "
 
-#: templates/mailbox/message_headers.inc:9
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/IMP.php:304
-#, c-format
-msgid "%c"
-msgstr "%c"
-
-#: mailbox.php:552
-#, c-format
-msgid "%d of %d Messages"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d ¨Ò¡ %d ¢éÍ¤ÇÒÁ"
 
-#: mailbox.php:550
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "áÊ´§¢éÍ¤ÇÒÁ·Õè¡ÃÍ§áÅéÇ"
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d ¶Ö§ %d ¨Ò¡ %d ¢éÍ¤ÇÒÁ"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ÁÕÍÂÙèáÅéÇ â¿Åà´ÍÃì %s ¨Ö§äÁè¶Ù¡à»ÅÕèÂ¹ª×èÍ"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:40
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "â¿Åà´ÍÃì %s ¨Ð¶Ù¡à»ÅÕèÂ¹ª×èÍ·Ø¡æ µé¹à´×Í¹"
 
-#: templates/message/navbar_aux_top.inc:13
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡à»ÅÕèÂ¹ª×èÍà»ç¹ \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;¨Ò¡&nbsp;%d)"
 
-#: templates/compose/spelling.inc:126
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(ºÑ¹·Ö¡¤ÇÒÁà»ÅÕèÂ¹á»Å§áÅéÇä»ÂÑ§Ë¹éÒµèÍä»)"
 
-#: templates/compose/spelling.inc:113
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Â¡àÅÔ¡¡ÒÃà»ÅÕèÂ¹á»Å§·Ñé§ËÁ´áÅÐ¡ÅÑºÊÙèË¹éÒ¨Íà¢ÕÂ¹¨´ËÁÒÂ"
 
-#: templates/compose/spelling.inc:119
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
-msgstr "(ºÑ¹·Ö¡à©¾ÒÐ¡ÒÃà»ÅÕèÂ¹á»Å§·Õè¼èÒ¹ÁÒáÅéÇáÅÐ¡ÅÑºÊÙèË¹éÒ¨Íà¢ÕÂ¹¨´ËÁÒÂ "
+msgstr ""
+"(ºÑ¹·Ö¡à©¾ÒÐ¡ÒÃà»ÅÕèÂ¹á»Å§·Õè¼èÒ¹ÁÒáÅéÇáÅÐ¡ÅÑºÊÙèË¹éÒ¨Íà¢ÕÂ¹¨´ËÁÒÂ "
+"¤ÇÒÁà»ÅÕèÂ¹á»Å§·Õèà¡Ô´¢Öé¹ã¹Ë¹éÒ¨Í¹Õé¨ÐäÁè¶Ù¡ºÑ¹·Ö¡)"
+
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(ºÑ¹·Ö¡à©¾ÒÐ¡ÒÃà»ÅÕèÂ¹á»Å§·Õè¼èÒ¹ÁÒáÅéÇáÅÐ¡ÅÑºÊÙèË¹éÒ¨Íà¢ÕÂ¹¨´ËÁÒÂ "
 "¤ÇÒÁà»ÅÕèÂ¹á»Å§·Õèà¡Ô´¢Öé¹ã¹Ë¹éÒ¨Í¹Õé¨ÐäÁè¶Ù¡ºÑ¹·Ö¡)"
 
-#: templates/contacts/contacts.inc:56
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* à¾ÔèÁª×èÍµèÍä»¹Õéâ´Â¤ÅÔ¡·Õè»ØèÁ OK *"
 
-#: templates/contacts/contacts.inc:40
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* ¡ÃØ³ÒàÅ×Í¡ª×èÍ·ÕèµéÍ§¡ÒÃ *"
 
-#: lib/MIME/Viewer/enriched.php:176 lib/MIME/Viewer/text.php:96
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "ÍÑ¡¢ÃÐ¾ÔàÈÉ"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "ÍÑ¡¢ÃÐ¾ÔàÈÉ"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "ÍÑ¡¢ÃÐ¾ÔàÈÉ"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "ÍÑ¡¢ÃÐ¾ÔàÈÉ"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
 msgstr ""
-"<p><i>¢éÍ¤ÇÒÁ¹Õé¶Ù¡à¢ÕÂ¹¢Öé¹´éÇÂªØ´ÍÑ¡¢ÃÐ·Õèáµ¡µèÒ§¨Ò¡·Õè¤Ø³ãªé "
-"ËÒ¡¡ÒÃáÊ´§¼Åã¹Ë¹éÒ¨Í¹ÕéäÁè¶Ù¡µéÍ§ ãËé%s¤ÅÔ¡·Õè¹Õè</a> à¾×èÍáÊ´§¼Åã¹Ë¹éÒµèÒ§ãËÁè</i></p>\n"
 
-#: templates/filters/manage.inc:50
-msgid "Action"
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "ª×èÍàÃÕÂ¡àÍ¡ÅÑ¡É³ì"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "¡ÒÃ¡ÃÐ·Ó"
 
-#: message.php:58
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "à¾ÔèÁÅ§ã¹·ÕèµÔ´µèÍ (%s)"
 
-#: compose.php:956
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "à¾ÔèÁáËÅè§"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "á¹ºàÍ¡ÊÒÃ"
 
-#: templates/compose/compose.inc:298
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "¢éÍÁÙÅÊèÇ¹µÑÇ"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "·ÕèµÔ´µèÍ"
 
-#: config/prefs.php.dist:114
-msgid "Addressbooks"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
 msgstr "·ÕèµÔ´µèÍ"
 
-#: templates/mailbox/navbar.inc:10
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "·Ñé§ËÁ´"
 
-#: lib/Maintenance/Task/purge_trash.php:90
-#, c-format
+#: templates/javascript/folders.js:13
+msgid ""
+"All messages in the following folder(s) will be downloaded into one MBOX "
+"file:"
+msgstr ""
+
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
-msgstr ""
-"¨´ËÁÒÂ·Õè¤éÒ§ÍÂÙèã¹â¿Åà´ÍÃì \"%s\" ¹Ò¹¡ÇèÒ %s ÇÑ¹ ¨Ð¶Ù¡ÅºÍÂèÒ§¶ÒÇÃ"
+msgstr "¨´ËÁÒÂ·Õè¤éÒ§ÍÂÙèã¹â¿Åà´ÍÃì \"%s\" ¹Ò¹¡ÇèÒ %s ÇÑ¹ ¨Ð¶Ù¡ÅºÍÂèÒ§¶ÒÇÃ"
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "Åºâ¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·ÕèÁÕÍÒÂØ¹Ò¹¡ÇèÒ %s à´×Í¹"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:72
-#, c-format
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "Åºâ¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·ÕèÁÕÍÒÂØ¹Ò¹¡ÇèÒ %s à´×Í¹"
 
-#: prefs.php:98
-msgid "An illegal value was specified."
-msgstr "¢éÍÁÙÅ·ÕèÃÐºØÁÒÁÕ¤èÒäÁè¶Ù¡µéÍ§"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡à»ÅÕèÂ¹ª×èÍà»ç¹ \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "á¹ºàÍ¡ÊÒÃ"
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
+
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "à¡Ô´¤ÇÒÁ¼Ô´¾ÅÒ´ÃÐËÇèÒ§¡ÒÃà¾ÔèÁª×èÍ"
 
-#: message.php:391
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
 msgstr "à¡Ô´¤ÇÒÁ¼Ô´¾ÅÒ´ÃÐËÇèÒ§¡ÒÃà¾ÔèÁª×èÍ"
 
-#: templates/mailbox/legend.inc:12 templates/mailbox/navbar.inc:17
-#: templates/mailbox/navbar.inc:34 config/conf.php.dist:132
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "µÍºáÅéÇ"
 
-#: templates/search/main.inc:180
+#: templates/search/main.inc:31
 msgid "Answered messages"
 msgstr "¢éÍ¤ÇÒÁ·ÕèµÍº¡ÅÑºáÅéÇ"
 
-#: templates/mailbox/header.inc:21
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "ãªéµÑÇ¡ÃÍ§¡Ñº"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "ãªéµÑÇ¡ÃÍ§¡Ñº"
 
-#: config/prefs.php.dist:318
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "ãªéµÑÇ¡ÃÍ§àÁ×èÍÅ§ºÑ¹·Ö¡à¢éÒ"
 
-#: config/prefs.php.dist:328
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "ãªéµÑÇ¡ÃÍ§àÁ×èÍµÙéä»ÃÉ³ÕÂì¶Ù¡ÃÕà¿Ãª"
 
-#: templates/search/main.inc:79 templates/search/main.inc:108
-#: templates/search/main.inc:137
-msgid "April"
-msgstr "àÁÉÒÂ¹"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÂèÒ§¶ÒÇÃËÃ×ÍäÁè?"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Are you sure you want to do this?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁ·Ñé§ËÁ´ã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐËÃ×ÍäÁè?"
 
-#: message.php:543
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÂèÒ§¶ÒÇÃËÃ×ÍäÁè?"
 
-#: templates/menu/menu.inc:18
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÂèÒ§¶ÒÇÃËÃ×ÍäÁè?"
+
+#: templates/mailbox/actions.inc:39
+#, fuzzy
+msgid "Are you sure you wish to empty this folder?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁ·Ñé§ËÁ´ã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐËÃ×ÍäÁè?"
+
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁ·Ñé§ËÁ´ã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐËÃ×ÍäÁè?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁ·Ñé§ËÁ´ã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐËÃ×ÍäÁè?"
 
-#: config/prefs.php.dist:506
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÂèÒ§¶ÒÇÃËÃ×ÍäÁè?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÂèÒ§¶ÒÇÃËÃ×ÍäÁè?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "¤Ø³µéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁàËÅèÒ¹ÕéÍÂèÒ§¶ÒÇÃËÃ×ÍäÁè?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "àÇÅÒ·Õèä´éÃÑº"
 
-#: config/prefs.php.dist:521
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "àÃÕÂ§¨Ò¡Ë¹éÒä»ËÅÑ§"
 
-#: templates/compose/compose.inc:402
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
+#, fuzzy
+msgid "Attach"
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+msgid "Attached File:"
+msgstr ""
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "àÍ¡ÊÒÃá¹º"
 
-#: templates/compose/compose.inc:307 templates/compose/compose.inc:397
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "àÍ¡ÊÒÃá¹º"
 
-#: templates/search/main.inc:83 templates/search/main.inc:112
-#: templates/search/main.inc:141
-msgid "August"
-msgstr "ÊÔ§ËÒ¤Á"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "¡ÒÃ¡ÃÐ·Ó"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:264
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "·ÕèµÔ´µèÍ·Õè¾º:"
 
-#: templates/message/navbar.inc:29
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "¡ÅÑºä»ÊÙè %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "¡ÅÑºä»ÊÙè %s"
 
-#: templates/compose/compose.inc:215 templates/message/headers.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "ÊÓà¹Ò«èÍ¹¶Ö§"
 
-#: templates/mailbox/actions.inc:16 templates/message/navbar.inc:14
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "ºÑªÕ´Ó"
 
-#: filters.php:141 templates/filters/manage.inc:17
-#: templates/search/main.inc:62
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "à¹×éÍËÒ"
 
-#: templates/search/main.inc:174 templates/search/main.inc:188
-#: templates/search/main.inc:202 templates/search/main.inc:216
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "·Ñé§ÊÍ§»ÃÐàÀ·"
 
-#: templates/compose/compose.inc:159 templates/message/headers.inc:16
-#: templates/search/main.inc:46
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
+#, fuzzy
+msgid "Cancel"
+msgstr "à»ÅÕèÂ¹á»Å§"
+
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+#, fuzzy
+msgid "Cancel Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+msgid "Cancelling this message will permanently discard its contents."
+msgstr ""
+
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "ÊÓà¹Ò¶Ö§"
 
-#: filters.php:138 templates/filters/manage.inc:14
-msgid "Cc:"
-msgstr "ÊÓà¹Ò¶Ö§:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "ÊèÇ¹µÑÇ"
 
-#: templates/compose/spelling.inc:68
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "à»ÅÕèÂ¹á»Å§"
 
-#: templates/compose/spelling.inc:69
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "à»ÅÕèÂ¹á»Å§·Ñé§ËÁ´"
 
-#: config/prefs.php.dist:84
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
-msgstr ""
-"à»ÅÕèÂ¹µÑÇàÅ×Í¡ã¹¡ÒÃáÊ´§¼Å àªè¹ ¨Ó¹Ç¹¨´ËÁÒÂµèÍË¹éÒáÅÐ¡ÒÃ¨Ñ´àÃÕÂ§¨´ËÁÒÂ"
+msgstr "à»ÅÕèÂ¹µÑÇàÅ×Í¡ã¹¡ÒÃáÊ´§¼Å àªè¹ ¨Ó¹Ç¹¨´ËÁÒÂµèÍË¹éÒáÅÐ¡ÒÃ¨Ñ´àÃÕÂ§¨´ËÁÒÂ"
 
-#: config/prefs.php.dist:32
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "à»ÅÕèÂ¹¡ÒÃµÑé§¤èÒà¤Ã×èÍ§ºÃÔ¡ÒÃàÁÅ"
 
-#: config/prefs.php.dist:25
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
+msgstr "à»ÅÕèÂ¹ª×èÍ, ·ÕèÍÂÙè áÅÐÅÒÂà«ç¹·ÕèÊè§ä»¾ÃéÍÁ¡ÑºÍÕàÁÅ"
+
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
 msgstr ""
-"à»ÅÕèÂ¹ª×èÍ, ·ÕèÍÂÙè áÅÐÅÒÂà«ç¹·ÕèÊè§ä»¾ÃéÍÁ¡ÑºÍÕàÁÅ"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ÊÓÃÇ¨¨´ËÁÒÂãËÁè"
 
-#: templates/mailbox/message_headers.inc:6
-msgid "Checkbox"
-msgstr "µÑÇàÅ×Í¡"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊè§¢éÍ¤ÇÒÁ¢Í§¤Ø³: %s"
 
 #: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "àÅ×Í¡¡ÒÃ¡ÃÐ·Ó:"
 
-#: templates/prefs/sourceselect.inc:304
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "à»ÅÕèÂ¹¡ÒÃµÑé§¤èÒà¤Ã×èÍ§ºÃÔ¡ÒÃàÁÅ"
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "àÅ×Í¡¡ÒÃ¡ÃÐ·Ó:"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
 msgstr "àÅ×Í¡·ÕèµÔ´µèÍ·ÕèµéÍ§¡ÒÃãªéã¹¡ÒÃà¾ÔèÁÃÒÂª×èÍ"
 
-#: templates/prefs/sourceselect.inc:258
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr "¡ÓË¹´ÅÓ´Ñº¢Í§·ÕèµÔ´µèÍ·ÕèµéÍ§¡ÒÃãËé¤é¹ËÒã¹¢³Ð·Ó¡ÒÃàµÔÁàµçÁª×èÍ"
 
-#: folders.php:259
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Åº¨´ËÁÒÂ·Ñé§ËÁ´¨Ò¡ %s"
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:287
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
-msgstr "¤ÅÔ¡ÊÁØ´ÃÒÂª×èÍ·ÕèµéÍ§¡ÒÃ áÅéÇàÅ×Í¡à¢µ¢éÍ¤ÇÒÁ·ÕèµéÍ§¡ÒÃ¤é¹ËÒ"
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
 
-#: folders.php:359
-msgid "Closed Folder"
-msgstr "»Ô´â¿Åà´ÍÃì"
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr "¤ÅÔ¡ÊÁØ´ÃÒÂª×èÍ·ÕèµéÍ§¡ÒÃ áÅéÇàÅ×Í¡à¢µ¢éÍ¤ÇÒÁ·ÕèµéÍ§¡ÒÃ¤é¹ËÒ"
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "ÊÃéÒ§"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "»Ô´â¿Åà´ÍÃì"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "ÂØº·Ñé§ËÁ´"
 
-#: templates/folders/actions.inc:29
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "ÂØº·Ñé§ËÁ´"
 
-#: templates/folders/actions.inc:28
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "ÂØºâ¿Åà´ÍÃì·Ñé§ËÁ´"
 
-#: folders.php:367 folders.php:368
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "ÂØºâ¿Åà´ÍÃì"
 
-#: lib/api.php:37 templates/menu/menu.inc:20
-msgid "Compose"
-msgstr "ÊÃéÒ§"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
 
-#: mailbox.php:840 message.php:53
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁ (%s)"
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "ÊÃéÒ§"
 
-#: compose.php:419 compose.php:428 compose.php:443 compose.php:493
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁãËÁè"
 
-#: config/prefs.php.dist:638
-msgid "Compose messages in a separate window."
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
 msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
 
-#: contacts.php:89 templates/contacts/contacts.inc:8
-msgid "Contact List"
-msgstr "ÃÒÂª×èÍµÔ´µèÍ"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "à»ÅÕèÂ¹¡ÒÃµÑé§¤èÒà¤Ã×èÍ§ºÃÔ¡ÒÃàÁÅ"
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
 
-#: config/prefs.php.dist:108
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "¤Çº¤ØÁ¡ÒÃµÃÇ¨ÊÍº¨´ËÁÒÂãËÁèáÅÐ¡ÒÃàµ×Í¹àÁ×èÍÁÕ¨´ËÁÒÂãËÁè"
 
-#: templates/mailbox/navbar.inc:62 templates/message/navbar_aux_bottom.inc:6
-#: templates/message/navbar_aux_top.inc:19
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "ÊÓà¹Ò"
 
-#: templates/compose/spelling.inc:52
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "ÅéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "¶Ù¡µéÍ§"
 
-#: templates/compose/spelling.inc:131
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "¢éÍ¤ÇÒÁ·Õèá¡éä¢áÅéÇ"
 
-#: folders.php:248 folders.php:253 folders.php:255
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "äÁèÊÒÁÒÃ¶Åº¢éÍ¤ÇÒÁ¨Ò¡ %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "äÁèÊÒÁÒÃ¶Åº¢éÍ¤ÇÒÁ¨Ò¡ %s: %s"
 
-#: templates/folders/actions.inc:5
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "¡ÒÃ´Óà¹Ô¹¡ÒÃºÓÃØ§ÃÑ¡ÉÒ"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+#, fuzzy
+msgid "Create"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "ÊÃéÒ§â¿Åà´ÍÃì"
 
-#: templates/prefs/folderselect.inc:24
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "ÊÃéÒ§â¿Åà´ÍÃìáººÃèÒ§"
 
-#: templates/identities/manage.inc:95
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "ÊÃéÒ§â¿Åà´ÍÃì¨´ËÁÒÂ·ÕèÊè§áÅéÇ"
 
-#: templates/prefs/trashselect.inc:24
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "ÊÃéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
 
-#: config/prefs.php.dist:53
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
+msgstr "ÊÃéÒ§µÑÇ¡ÃÍ§à¾×èÍ¨Ñ´¡ÒÃ¨´ËÁÒÂ¢Òà¢éÒ, ¨Ñ´à¡çºÅ§â¿Åà´ÍÃì áÅÐÅº¨´ËÁÒÂ¢ÂÐ"
+
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì¨´ËÁÒÂ·ÕèÊè§áÅéÇ"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
 msgstr ""
-"ÊÃéÒ§µÑÇ¡ÃÍ§à¾×èÍ¨Ñ´¡ÒÃ¨´ËÁÒÂ¢Òà¢éÒ, ¨Ñ´à¡çºÅ§â¿Åà´ÍÃì áÅÐÅº¨´ËÁÒÂ¢ÂÐ"
 
-#: config/prefs.php.dist:93
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "¡ÓË¹´ÅÑ¡É³Ð¡ÒÃÊè§¨´ËÁÒÂáÅÐ¡ÒÃºÑ¹·Ö¡áººÃèÒ§"
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
 
-#: config/prefs.php.dist:74
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "¡ÓË¹´»¯ÔºÑµÔ¡ÒÃºÓÃØ§ÃÑ¡ÉÒÃÐººàÁ×èÍÅ§ª×èÍà¢éÒÊÙè %s"
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "¡ÓË¹´ÅÑ¡É³Ð¡ÒÃÊè§¨´ËÁÒÂáÅÐ¡ÒÃºÑ¹·Ö¡áººÃèÒ§"
 
-#: config/prefs.php.dist:101
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "¡ÓË¹´§Ò¹·ÕèµéÍ§¡ÒÃãËéÃÑ¹àÁ×èÍÅ§ª×èÍà¢éÒÊÙè %s"
 
-#: templates/mailbox/message_headers.inc:13 templates/message/headers.inc:4
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "ÇÑ¹·Õè"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "ÇÑ¹·Õè"
 
-#: templates/search/main.inc:87 templates/search/main.inc:116
-#: templates/search/main.inc:145
-msgid "December"
-msgstr "¸Ñ¹ÇÒ¤Á"
-
-#: templates/prefs/identityselect.inc:5
-msgid "Default Identity"
-msgstr "àÍ¡ÅÑ¡É³ìâ´Â»ÃÔÂÒÂ"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "ÅºáÅéÇ"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Åº"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
-#: config/prefs.php.dist:512
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "à§×èÍ¹ä¢¡ÒÃ¨Ñ´àÃÕÂ§â´Â»ÃÔÂÒÂ:"
 
-#: config/prefs.php.dist:523
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "·ÔÈ·Ò§¡ÒÃ¨Ñ´àÃÕÂ§â´Â»ÃÔÂÒÂ:"
 
-#: templates/mailbox/actions.inc:9 templates/message/navbar.inc:7
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "ÅºáÅéÇ"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Åº"
 
-#: templates/folders/actions.inc:7
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Åºâ¿Åà´ÍÃì"
 
-#: templates/filters/list.inc:38
-msgid "Delete messages"
-msgstr "Åº¨´ËÁÒÂ"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Åºâ¿Åà´ÍÃì"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Åºâ¿Åà´ÍÃì"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Åºâ¿Åà´ÍÃì"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Åºâ¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·Ø¡æ µé¹à´×Í¹"
 
-#: config/prefs.php.dist:446
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Åºâ¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·Ø¡æ µé¹à´×Í¹"
 
-#: templates/mailbox/legend.inc:16 templates/mailbox/navbar.inc:19
-#: templates/mailbox/navbar.inc:37 config/conf.php.dist:128
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Åº¨´ËÁÒÂ"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "ÅºáÅéÇ"
 
-#: compose.php:981
-msgid "Deleted an attachment."
-msgstr "ÅºàÍ¡ÊÒÃá¹º"
-
-#: templates/search/main.inc:208
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
 
-#: config/prefs.php.dist:66
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "ÅºàÍ¡ÊÒÃá¹º"
+
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "¡ÒÃÅºáÅÐà¤Å×èÍ¹ÂéÒÂ¨´ËÁÒÂ"
 
-#: config/prefs.php.dist:522
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "àÃÕÂ§¨Ò¡ËÅÑ§ä»Ë¹éÒ"
 
-#: config/prefs.php.dist:597
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "µÑÇàÅ×Í¡à¡ÕèÂÇ¡Ñº¼Ùéãªé"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "áÊ´§ÅÒÂà«ç¹´éÇÂÊÕÍèÍ¹?"
 
-#: templates/contacts/contacts.inc:65
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "áÊ´§¼Å"
 
-#: config/prefs.php.dist:83
-msgid "Display Options"
-msgstr "µÑÇàÅ×Í¡¡ÒÃáÊ´§¼Å"
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
 
-#: config/prefs.php.dist:338
-msgid "Display message when filters have been applied."
-msgstr "áÊ´§¢éÍ¤ÇÒÁ·Õè¡ÃÍ§áÅéÇ"
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-#: config/prefs.php.dist:723
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "áÊ´§µÑÇàµ×Í¹àÁ×èÍÁÕ¨´ËÁÒÂãËÁè"
 
-#: templates/folders/actions.inc:14
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "µÑÇàÅ×Í¡¡ÒÃáÊ´§¼Å"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "äÁèµéÍ§¡ÒÃµÃÇ¨ÊÍº¨´ËÁÒÂãËÁè"
 
-#: lib/IMP.php:950
-msgid "Download"
-msgstr "´ÒÇ¹ìâËÅ´"
-
-#: lib/IMP.php:949
-#, c-format
-msgid "Download %s"
-msgstr "´ÒÇ¹ìâËÅ´ %s"
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
 
-#: templates/folders/actions.inc:16
+#: lib/IMP.php:1075
+msgid "Do you want to open that folder?"
+msgstr ""
+
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
+#, fuzzy
+msgid "Done"
+msgstr "äÁèàÅ×Í¡"
+
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
+
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "´ÒÇ¹ìâËÅ´â¿Åà´ÍÃì"
 
-#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:40
-#: config/conf.php.dist:136
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "´ÒÇ¹ìâËÅ´â¿Åà´ÍÃì"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
+
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "áººÃèÒ§"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "â¿Åà´ÍÃìáººÃèÒ§"
+
 #: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "â¿Åà´ÍÃìáººÃèÒ§"
 
-#: config/prefs.php.dist:308
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "·ÕèÍÂÙèÍÕàÁÅ"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
+msgid "Edit"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "ºÑªÕ´Ó"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "µÑÇ¡ÃÍ§¨´ËÁÒÂ"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "á¡éä¢µÑÇ¡ÃÍ§"
+
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "á¡éä¢µÑÇ¡ÃÍ§"
 
-#: config/prefs.php.dist:170
-msgid "Edit your identities"
-msgstr "á¡éä¢àÍ¡ÅÑ¡É³ì¢Í§¤Ø³"
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "á¡éä¢µÑÇ¡ÃÍ§"
 
-#: templates/contacts/contacts.inc:68
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "·ÕèÍÂÙèÍÕàÁÅ"
 
-#: templates/folders/actions.inc:17
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Åº¨´ËÁÒÂ·Ñé§ËÁ´¨Ò¡ %s"
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "ÅéÒ§â¿Åà´ÍÃì"
 
-#: templates/menu/menu.inc:18
-msgid "Empty Trash"
-msgstr "ÅéÒ§¶Ñ§¢ÂÐ"
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "ÅéÒ§â¿Åà´ÍÃì"
 
-#: templates/mailbox/actions.inc:32
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "ÅéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
 
-#: compose.php:644
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "ÅéÒ§¶Ñ§¢ÂÐ"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
+msgstr "ÅéÒ§¶Ñ§¢ÂÐ"
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "¨º¡ÒÃÊè§µèÍ¢éÍ¤ÇÒÁ"
 
-#: message.php:393
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "¢éÍ¤ÇÒÁà¡èÒ"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "¢éÍ¤ÇÒÁ·ÕèÊè§µèÍÁÒ¨Ò¡ %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr ""
+
+#: templates/prefs/folderselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new drafts folder"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃìáººÃèÒ§"
+
+#: templates/prefs/sentmailselect.inc:23
+#, fuzzy
+msgid "Enter the name for your new sent mail folder"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì¨´ËÁÒÂ·ÕèÊè§áÅéÇ"
+
+#: templates/prefs/trashselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new trash folder"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" ¶Ù¡à¾ÔèÁàµÔÁÅ§ã¹·ÕèµÔ´µèÍàÃÕÂºÃéÍÂáÅéÇ"
 
-#: status.php:35
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "¼Ô´¾ÅÒ´"
 
-#: config/prefs.php.dist:712
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "·Ø¡ 15 ¹Ò·Õ"
 
-#: config/prefs.php.dist:709
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "·Ø¡ 30 ÇÔ¹Ò·Õ"
 
-#: config/prefs.php.dist:711
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "·Ø¡ 5 ¹Ò·Õ"
 
-#: config/prefs.php.dist:713
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "·Ø¡¤ÃÖè§ªÑèÇâÁ§"
 
-#: config/prefs.php.dist:710
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "·Ø¡¹Ò·Õ"
 
-#: templates/folders/actions.inc:27
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "¢ÂÒÂ·Ñé§ËÁ´"
+
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "¢ÂÒÂ·Ñé§ËÁ´"
 
-#: templates/folders/actions.inc:26
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "¢ÂÒÂâ¿Åà´ÍÃì·Ñé§ËÁ´"
 
-#: folders.php:371 folders.php:372
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "¢ÂÒÂâ¿Åà´ÍÃì"
 
-#: templates/compose/compose.inc:299
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "àµÔÁª×èÍ"
 
-#: config/prefs.php.dist:553
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "¡ÓË¹´ãËé¢ÂÒÂâ¤Ã§ÊÃéÒ§â¿Åà´ÍÃì·Ñé§ËÁ´àÁ×èÍÍÂÙèã¹ÁØÁÁÍ§ÃÒÂ¡ÒÃâ¿Åà´ÍÃì"
 
-#: templates/search/main.inc:77 templates/search/main.inc:106
-#: templates/search/main.inc:135
-msgid "February"
-msgstr "¡ØÁÀÒ¾Ñ¹¸ìèè"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "¢ÂÒÂ·Ñé§ËÁ´"
 
-#: templates/filters/manage.inc:7
-msgid "Field"
-msgstr "à¢µ¢éÍ¤ÇÒÁ"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "¨´ËÁÒÂãËÁè"
 
-#: templates/compose/compose.inc:430
-msgid "Filename"
-msgstr "ª×èÍá¿éÁ"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "¨´ËÁÒÂãËÁè"
 
-#: mailbox.php:332
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "¼Å¡ÒÃ¡ÃÍ§: ¨´ËÁÒÂ \"%s\" ¨Ò¡ \"%s\" ä´é¶Ù¡Åºä»áÅéÇ"
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
 
-#: mailbox.php:343
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"¼Å¡ÒÃ¡ÃÍ§: ¨´ËÁÒÂ \"%s\" ¨Ò¡ \"%s\" ä´é¶Ù¡à¤Å×èÍ¹ÂéÒÂä»·Õèâ¿Åà´ÍÃì \"%s\" áÅéÇ"
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "ãªéµÑÇ¡ÃÍ§àÁ×èÍÅ§ºÑ¹·Ö¡à¢éÒ"
 
-#: mailbox.php:330
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Åº¨´ËÁÒÂ·Ñé§ËÁ´¨Ò¡ %s"
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "¢éÍ¤ÇÒÁ·ÕèÊè§µèÍÁÒ¨Ò¡ %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
-"¼Å¡ÒÃ¡ÃÍ§: ¢éÍ¤ÇÒÁ \"%s\" ¨Ò¡ \"%s\" ä´é¶Ù¡ÂéÒÂä»Å§â¿Åà´ÍÃì¶Ñ§¢ÂÐáÅéÇ"
 
-#: templates/filters/list.inc:10
-msgid "Filter Rules"
-msgstr "¡¯¡ÒÃ¡ÃÍ§"
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr " - $nm ¢éÍ¤ÇÒÁãËÁè"
 
-#: config/prefs.php.dist:361
-msgid "Filter message content for profanity."
-msgstr "¡ÃÍ§¢éÍ¤ÇÒÁ·ÕèäÁèàËÁÒÐÊÁ"
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "µÑÇ¡ÃÍ§"
 
-#: config/prefs.php.dist:52
-msgid "Filters"
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
 msgstr "µÑÇ¡ÃÍ§"
 
-#: templates/contacts/contacts.inc:18
-msgid "Find"
-msgstr "¤é¹ËÒ"
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "µÑÇàÅ×Í¡Í×è¹"
 
-#: mailbox.php:488 mailbox.php:489 mailbox.php:495 mailbox.php:496
-msgid "First Page"
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
+msgstr "¡¯¡ÒÃ¡ÃÍ§"
+
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
+msgstr "¡ÃÍ§¢éÍ¤ÇÒÁ·ÕèäÁèàËÁÒÐÊÁ"
+
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
+msgid "Filters"
+msgstr "µÑÇ¡ÃÍ§"
+
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
+msgid "Find"
+msgstr "¤é¹ËÒ"
+
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
 msgstr "Ë¹éÒáÃ¡"
 
-#: folders.php:275 templates/folders/head.inc:5
-#: templates/prefs/initialpageselect.inc:5
-#: templates/prefs/initialpageselect.inc:8
+#: mailbox.php:345
+msgid "First Page"
+msgstr "Ë¹éÒáÃ¡"
+
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Êè§µèÍ"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "µÑÇ¹Ó·Ò§â¿Åà´ÍÃì"
 
-#: templates/login/login.inc:130
-msgid "Folder Prefix"
-msgstr "µÑÇ¹Óâ¿Åà´ÍÃì"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "¡ØÁÀÒ¾Ñ¹¸ìèè"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
 
-#: templates/menu/menu.inc:22
-msgid "Folders"
-msgstr "â¿Åà´ÍÃì"
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
 
-#: compose.php:651 templates/message/navbar.inc:11
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Êè§µèÍ"
 
-#: compose.php:648
+#: compose.php:765
 msgid "Forward:"
 msgstr "Êè§µèÍ:"
 
-#: compose.php:615
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "¨º¡ÒÃÊè§µèÍ¢éÍ¤ÇÒÁ"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "¢éÍ¤ÇÒÁ·ÕèÊè§µèÍÁÒ¨Ò¡ %s"
 
-#: templates/compose/compose.inc:80 templates/mailbox/message_headers.inc:17
-#: templates/message/headers.inc:8 templates/search/main.inc:30
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "¢éÍÁÙÅà¤Ã×èÍ§ºÃÔ¡ÒÃ"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "¨Ò¡"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "¨Ò¡"
 
-#: config/prefs.php.dist:508
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "·ÕèÍÂÙè¼ÙéÊè§"
 
-#: filters.php:139 templates/filters/manage.inc:15
-msgid "From:"
-msgstr "¨Ò¡:"
-
-#: compose.php:647 compose.php:650
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Êè§µèÍ:"
 
-#: templates/menu/menu.inc:41
-msgid "Help"
-msgstr "ªèÇÂàËÅ×Í"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "Êè§µèÍ:"
 
-#: mailbox.php:546
-msgid "Hide Deleted"
-msgstr "«èÍ¹·ÕèÅºáÅéÇ"
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "¨º¡ÒÃÊè§µèÍ¢éÍ¤ÇÒÁ"
 
-#: folders.php:266
-msgid "Hide Unsubscribed"
-msgstr "«èÍ¹·ÕèàÅÔ¡ãªéä»áÅéÇ"
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "µÑÇàÅ×Í¡à¡ÕèÂÇ¡Ñº¼Ùéãªé"
 
-#: config/prefs.php.dist:629
-msgid "How to prefix quoted lines in a reply:"
-msgstr "¡ÒÃàµÔÁ¢éÍ¤ÇÒÁË¹éÒºÃÃ·Ñ´¢éÍ¤ÇÒÁã¹¡ÒÃµÍº¡ÅÑº:"
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
 
-#: templates/index/notconfigured.inc:4
-msgid "IMP is not properly configured"
-msgstr "¡ÒÃµÑé§¤èÒ¢Í§ IMP äÁè¶Ù¡µéÍ§"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
 
-#: folders.php:346 templates/menu/menu.inc:16
-msgid "INBOX"
-msgstr "µÙé¢Òà¢éÒ"
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
 
-#: identities.php:129 templates/identities/manage.inc:5
-msgid "Identities"
-msgstr "àÍ¡ÅÑ¡É³ì"
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "à¾ÔèÁÅ§ã¹·ÕèµÔ´µèÍ (%s)"
 
-#: templates/compose/compose.inc:65
-msgid "Identity"
-msgstr "àÍ¡ÅÑ¡É³ì"
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
 
-#: templates/identities/manage.inc:47
-msgid "Identity's name:"
-msgstr "ª×èÍàÃÕÂ¡àÍ¡ÅÑ¡É³ì"
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
 
-#: templates/compose/spelling.inc:70
-msgid "Ignore"
-msgstr "ÅÐàÇé¹"
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
 
-#: templates/compose/spelling.inc:71
-msgid "Ignore All"
-msgstr "ÅÐàÇé¹·Ñé§ËÁ´"
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
 
-#: templates/mailbox/legend.inc:14 templates/mailbox/navbar.inc:15
-#: templates/mailbox/navbar.inc:32 config/conf.php.dist:134
-msgid "Important"
-msgstr "ÊÓ¤Ñ"
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
 
-#: templates/search/main.inc:194
-msgid "Important messages"
-msgstr "¢éÍ¤ÇÒÁÊÓ¤Ñ"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
 
-#: config/prefs.php.dist:620
-msgid "Include original message in a reply?"
-msgstr "á¹º¢éÍ¤ÇÒÁµé¹©ºÑºä»¡Ñº¡ÒÃµÍº¡ÅÑºËÃ×ÍäÁè?"
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
 
-#: templates/search/main.inc:76 templates/search/main.inc:105
-#: templates/search/main.inc:134
-msgid "January"
-msgstr "Á¡ÃÒ¤Á"
-
-#: templates/search/main.inc:82 templates/search/main.inc:111
-#: templates/search/main.inc:140
-msgid "July"
-msgstr "¡Ã¡®Ò¤Á"
-
-#: templates/search/main.inc:81 templates/search/main.inc:110
-#: templates/search/main.inc:139
-msgid "June"
-msgstr "ÁÔ¶Ø¹ÒÂ¹"
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "ÁØÁÁÍ§à·Ã´"
 
-#: templates/login/login.inc:140 config/prefs.php.dist:38
-msgid "Language"
-msgstr "ÀÒÉÒ"
+#: mailbox.php:367
+msgid "Hide Deleted"
+msgstr "«èÍ¹·ÕèÅºáÅéÇ"
 
-#: mailbox.php:519 mailbox.php:520 mailbox.php:525 mailbox.php:526
-msgid "Last Page"
-msgstr "Ë¹éÒÊØ´·éÒÂ"
+#: folders.php:298
+msgid "Hide Unsubscribed"
+msgstr "«èÍ¹·ÕèàÅÔ¡ãªéä»áÅéÇ"
 
-#: lib/IMP.php:304
-#, c-format
-msgid "Last login: %s"
-msgstr "Å§ºÑ¹·Ö¡à¢éÒ¤ÃÑé§ÅèÒÊØ´: %s"
-
-#: lib/IMP.php:302
-msgid "Last login: Never"
-msgstr "Å§ºÑ¹·Ö¡à¢éÒ¤ÃÑé§ÅèÒÊØ´: äÁèà¤Â"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
 
-#: lib/api.php:72
-#, c-format
-msgid "Log in to %s"
-msgstr "Å§ºÑ¹·Ö¡à¢éÒ %s"
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
 
-#: config/prefs.php.dist:100
-msgid "Login Tasks"
-msgstr "§Ò¹ã¹¢³ÐÅ§ª×èÍà¢éÒ"
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
 
-#: login.php:22
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
 msgstr ""
-"à¡Ô´¤ÇÒÁ¼Ô´¾ÅÒ´ºÒ§»ÃÐ¡ÒÃã¹¡ÒÃÅ§ºÑ¹·Ö¡à¢éÒ ÍÒ¨à»ç¹ä»ä´éÇèÒ"
-"ª×èÍ¼ÙéãªéËÃ×ÍÃËÑÊ¼èÒ¹¢Í§¤Ø³äÁè¶Ù¡µéÍ§"
 
-#: templates/menu/menu.inc:54 templates/menu/menu.inc:56
-msgid "Logout"
-msgstr "Å§ºÑ¹·Ö¡ÍÍ¡" 
-#: filters.php:129
-msgid "Mail Filters"
-msgstr "µÑÇ¡ÃÍ§¨´ËÁÒÂ"
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
+msgstr "¡ÒÃàµÔÁ¢éÍ¤ÇÒÁË¹éÒºÃÃ·Ñ´¢éÍ¤ÇÒÁã¹¡ÒÃµÍº¡ÅÑº:"
 
-#: config/prefs.php.dist:51 config/prefs.php.dist:58 config/prefs.php.dist:65
-#: config/prefs.php.dist:72
-msgid "Mail Management"
-msgstr "¡ÒÃ¨Ñ´¡ÒÃÍÕàÁÅ"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
 
-#: folders.php:348 folders.php:350 folders.php:352
-msgid "Mailbox"
-msgstr "µÙéä»ÃÉ³ÕÂì"
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
 
-#: config/prefs.php.dist:73
-msgid "Maintenance Operations"
-msgstr "¡ÒÃ´Óà¹Ô¹¡ÒÃºÓÃØ§ÃÑ¡ÉÒ"
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
 
-#: templates/search/main.inc:78 templates/search/main.inc:107
-#: templates/search/main.inc:136
-msgid "March"
-msgstr "ÁÕ¹Ò¤Á"
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:29
-msgid "Mark as:"
-msgstr "¡ÓË¹´ãËéà»ç¹"
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
 
-#: config/prefs.php.dist:588
-msgid "Mark different levels of quoting with different colors?"
-msgstr "¡ÓË¹´ÊÕãËéáµ¡µèÒ§¡Ñ¹ÊÓËÃÑºáµèÅÐÃÐ´Ñº¢Í§¡ÒÃÍéÒ§ÍÔ§ËÃ×ÍäÁè"
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
 
-#: templates/search/main.inc:80 templates/search/main.inc:109
-#: templates/search/main.inc:138
-msgid "May"
-msgstr "¾ÄÉÀÒ¤Á"
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
 
-#: status.php:48
-msgid "Message"
-msgstr "¢éÍ¤ÇÒÁ"
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
 
-#: compose.php:422 compose.php:1022 config/prefs.php.dist:92
-msgid "Message Composition"
-msgstr "à¢ÕÂ¹¢éÍ¤ÇÒÁãËÁè"
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
 
-#: config/prefs.php.dist:507
-msgid "Message Date"
-msgstr "ÇÑ¹·Õè¢Í§¢éÍ¤ÇÒÁ"
+#: lib/IMP.php:866
+msgid "INBOX"
+msgstr "µÙé¢Òà¢éÒ"
 
-#: search.php:24
-msgid "Message Search"
-msgstr "¤é¹ËÒ¢éÍ¤ÇÒÁ"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-#: config/prefs.php.dist:510
-msgid "Message Size"
-msgstr "¢¹Ò´¢Í§¢éÍ¤ÇÒÁ"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
 
-#: templates/message/navbar.inc:17
-msgid "Message Source"
-msgstr "µé¹©ºÑº¢éÍ¤ÇÒÁ"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "ÅÐàÇé¹"
 
-#: config/prefs.php.dist:59
-msgid "Message Viewing"
-msgstr "¡ÒÃáÊ´§¢éÍ¤ÇÒÁ"
+#: templates/compose/spelling.inc:83
+msgid "Ignore All"
+msgstr "ÅÐàÇé¹·Ñé§ËÁ´"
 
-#: templates/search/main.inc:26
-msgid "Message fields"
-msgstr "à¢µ¢éÍ¤ÇÒÁ"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-#: templates/search/main.inc:156
-msgid "Message flags"
-msgstr "µÑÇºè§ªÕé¢éÍ¤ÇÒÁ"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "ÊÓ¤Ñ"
 
-#: templates/search/main.inc:224
-msgid "Message folders"
-msgstr "â¿Åà´ÍÃì"
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "ÊÓ¤Ñ"
 
-#: config/prefs.php.dist:532
-msgid "Messages per page in the mailbox view."
-msgstr "¨Ó¹Ç¹¢éÍ¤ÇÒÁµèÍË¹éÒã¹ÁØÁÁÍ§µÙéä»ÃÉ³ÕÂì"
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "ÊÓ¤Ñ"
 
-#: mailbox.php:376
-msgid "Messages to"
-msgstr "¢éÍ¤ÇÒÁä»ÂÑ§"
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "¢éÍ¤ÇÒÁÊÓ¤Ñ"
 
-#: templates/compose/compose.inc:432
-msgid "Mime Type"
-msgstr "ª¹Ô´¢Í§äÁÁì"
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:61 templates/message/navbar_aux_bottom.inc:5
-#: templates/message/navbar_aux_top.inc:18
-msgid "Move"
-msgstr "ÂéÒÂ"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
 
-#: templates/filters/list.inc:40
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "ÂéÒÂ¢éÍ¤ÇÒÁä»ÂÑ§â¿Åà´ÍÃì <b>%s</b>"
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
 
-#: templates/contacts/contacts.inc:67
-msgid "Name"
-msgstr "ª×èÍ"
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
 
-#: config/prefs.php.dist:708
-msgid "Never"
-msgstr "äÁèàÅ×Í¡"
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
 
-#: templates/mailbox/legend.inc:8
-msgid "New"
-msgstr "ãËÁè"
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
 
-#: config/prefs.php.dist:107
-msgid "New Mail"
-msgstr "¨´ËÁÒÂãËÁè"
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
 
-#: templates/search/main.inc:170
-msgid "New messages"
-msgstr "¢éÍ¤ÇÒÁãËÁè"
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
 
-#: templates/message/navbar.inc:38
-msgid "Next Message"
-msgstr "¢éÍ¤ÇÒÁµèÍä»"
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
 
-#: mailbox.php:516 mailbox.php:517 mailbox.php:523 mailbox.php:524
-msgid "Next Page"
-msgstr "Ë¹éÒµèÍä»"
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
 
-#: config/prefs.php.dist:550
-msgid "No"
-msgstr "äÁè"
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
 
-#: mailbox.php:733
-msgid "No Subject"
-msgstr "äÁèÁÕª×èÍàÃ×èÍ§"
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
+msgid "Important"
+msgstr "ÊÓ¤Ñ"
 
-#: folders.php:197 folders.php:207 lib/Folder.php:404 lib/Folder.php:438
-msgid "No folders were specified"
-msgstr "¡ÃØ³ÒÃÐºØâ¿Åà´ÍÃì·ÕèµéÍ§¡ÒÃ"
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "¢éÍ¤ÇÒÁÊÓ¤Ñ"
 
-#: templates/mailbox/empty_mailbox.inc:4
-msgid "No messages matched your search"
-msgstr "äÁèÁÕ¢éÍ¤ÇÒÁã´µÃ§¡Ñº¡ÒÃ¤é¹ËÒ¢Í§¤Ø³"
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Åº¨´ËÁÒÂ·Ñé§ËÁ´¨Ò¡ %s"
 
-#: templates/compose/spelling.inc:28
-msgid "No spelling errors"
-msgstr "äÁè¾º¤Ó·ÕèÊÐ¡´¼Ô´"
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
 
-#: templates/compose/spelling.inc:88
-msgid "No suggestions"
-msgstr "äÁèÁÕ¤Óá¹Ð¹Ó"
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
 
-#: templates/identities/manage.inc:93 templates/mailbox/navbar.inc:11
-#: templates/prefs/sourceselect.inc:26
-msgid "None"
-msgstr "äÁèàÅ×Í¡"
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "á¹º¢éÍ¤ÇÒÁµé¹©ºÑºä»¡Ñº¡ÒÃµÍº¡ÅÑºËÃ×ÍäÁè?"
 
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
-msgid "Not Deleted"
-msgstr "äÁè¶Ù¡Åº"
+#: config/prefs.php.dist:487
+msgid "Include original message in a reply?"
+msgstr "á¹º¢éÍ¤ÇÒÁµé¹©ºÑºä»¡Ñº¡ÒÃµÍº¡ÅÑºËÃ×ÍäÁè?"
 
-#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
-msgid "Not Draft"
-msgstr "äÁèãªèáººÃèÒ§"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "ÅÐàÇé¹"
 
-#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
-msgid "Not Important"
-msgstr "äÁèãªè¢éÍ¤ÇÒÁÊÓ¤Ñ"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:24
-msgid "Not Personal"
-msgstr "äÁèãªè¢éÍ¤ÇÒÁÊèÇ¹µÑÇ"
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
 
-#: templates/search/main.inc:212
-msgid "Not deleted messages"
-msgstr "äÁèãªè¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
 
-#: templates/search/main.inc:198
-msgid "Not important messages"
-msgstr "äÁèãªè¢éÍ¤ÇÒÁÊÓ¤Ñ"
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "äÁèÁÕ"
 
-#: templates/search/main.inc:86 templates/search/main.inc:115
-#: templates/search/main.inc:144
-msgid "November"
-msgstr "¾ÄÈ¨Ô¡ÒÂ¹"
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
 
-#: config/prefs.php.dist:455
-msgid "Number of old sent-mail folders to keep if deleting monthly"
-msgstr "¨Ó¹Ç¹â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·ÕèµéÍ§¡ÒÃà¡çºäÇé ËÒ¡·Ó¡ÒÃÅº·Ôé§à»ç¹ÃÒÂà´×Í¹"
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
 
-#: templates/search/main.inc:85 templates/search/main.inc:114
-#: templates/search/main.inc:143
-msgid "October"
-msgstr "µØÅÒ¤Á"
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
 
-#: templates/search/main.inc:166
-msgid "Old messages"
-msgstr "¢éÍ¤ÇÒÁà¡èÒ"
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:49
-msgid "Old sent-mail folders being purged."
-msgstr "¡ÓÅÑ§¡Ó¨Ñ´â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡¢Í§à´×Í¹¡èÍ¹æ"
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
 
-#: folders.php:357 templates/menu/menu.inc:65
-msgid "Open Folder"
-msgstr "à»Ô´â¿Åà´ÍÃì"
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "·ÕèÍÂÙèÍÕàÁÅ"
 
-#: templates/compose/compose.inc:288 templates/menu/menu.inc:25
-msgid "Options"
-msgstr "µÑÇàÅ×Í¡"
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
 
-#: config/prefs.php.dist:82 config/prefs.php.dist:91 config/prefs.php.dist:99
-#: config/prefs.php.dist:106 config/prefs.php.dist:113
-msgid "Other Options"
-msgstr "µÑÇàÅ×Í¡Í×è¹"
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
 
-#: templates/mailbox/header.inc:26
-#, c-format
-msgid "Page %d of %d"
-msgstr "Ë¹éÒ·Õè %d ¨Ò¡ %d"
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
 
-#: templates/message/headers.inc:32
-msgid "Part(s)"
-msgstr "ÊèÇ¹»ÃÐ¡Íº"
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
 
-#: templates/login/login.inc:76
-msgid "Password"
-msgstr "ÃËÑÊ¼èÒ¹"
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
 
-#: config/prefs.php.dist:428
-msgid "Perform maintenance operations on login"
-msgstr "´Óà¹Ô¹¡ÒÃºÓÃØ§ÃÑ¡ÉÒÃÐººã¹¢³ÐÅ§ª×èÍà¢éÒ"
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:23 config/conf.php.dist:138
-msgid "Personal"
-msgstr "ÊèÇ¹µÑÇ"
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
 
-#: config/prefs.php.dist:24
-msgid "Personal Information"
-msgstr "¢éÍÁÙÅÊèÇ¹µÑÇ"
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
 
-#: templates/identities/manage.inc:82
-msgid "Place your signature before replies and forwards?"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
+msgid "Language"
+msgstr "ÀÒÉÒ"
+
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "Ë¹éÒÊØ´·éÒÂ"
+
+#: mailbox.php:358
+msgid "Last Page"
+msgstr "Ë¹éÒÊØ´·éÒÂ"
+
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "µÙéä»ÃÉ³ÕÂì"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "¡ÒÃ¡ÃÐ·Ó"
+
+#: templates/login/login.inc:225
+#, fuzzy
+msgid "Log in"
+msgstr "Å§ºÑ¹·Ö¡à¢éÒ %s"
+
+#: lib/Block/summary.php:115
+#, php-format
+msgid "Log in to %s"
+msgstr "Å§ºÑ¹·Ö¡à¢éÒ %s"
+
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
+msgstr "§Ò¹ã¹¢³ÐÅ§ª×èÍà¢éÒ"
+
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr "§Ò¹ã¹¢³ÐÅ§ª×èÍà¢éÒ"
+
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr ""
+
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "µÑÇ¡ÃÍ§¨´ËÁÒÂ"
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "µÙéä»ÃÉ³ÕÂì"
+
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "µÑÇ¡ÃÍ§¨´ËÁÒÂ"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
+msgid "Mailbox"
+msgstr "µÙéä»ÃÉ³ÕÂì"
+
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "µÑÇàÅ×Í¡¡ÒÃáÊ´§¼Å"
+
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
+msgid "Mark as:"
+msgstr "¡ÓË¹´ãËéà»ç¹"
+
+#: config/prefs.php.dist:650
+msgid "Mark different levels of quoting with different colors?"
+msgstr "¡ÓË¹´ÊÕãËéáµ¡µèÒ§¡Ñ¹ÊÓËÃÑºáµèÅÐÃÐ´Ñº¢Í§¡ÒÃÍéÒ§ÍÔ§ËÃ×ÍäÁè"
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "¢éÍÁÙÅà¤Ã×èÍ§ºÃÔ¡ÒÃ"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "à»Ô´â¿Åà´ÍÃì"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "¢éÍ¤ÇÒÁ"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr "à¢ÕÂ¹¢éÍ¤ÇÒÁãËÁè"
+
+#: config/prefs.php.dist:917
+msgid "Message Date"
+msgstr "ÇÑ¹·Õè¢Í§¢éÍ¤ÇÒÁ"
+
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "¢éÍ¤ÇÒÁä»ÂÑ§"
+
+#: search.php:312
+msgid "Message Search"
+msgstr "¤é¹ËÒ¢éÍ¤ÇÒÁ"
+
+#: config/prefs.php.dist:921
+msgid "Message Size"
+msgstr "¢¹Ò´¢Í§¢éÍ¤ÇÒÁ"
+
+#: message.php:384
+msgid "Message Source"
+msgstr "µé¹©ºÑº¢éÍ¤ÇÒÁ"
+
+#: config/prefs.php.dist:66
+msgid "Message Viewing"
+msgstr "¡ÒÃáÊ´§¢éÍ¤ÇÒÁ"
+
+#: templates/search/main.inc:6
+msgid "Message flags"
+msgstr "µÑÇºè§ªÕé¢éÍ¤ÇÒÁ"
+
+#: templates/search/main.inc:83
+msgid "Message folders"
+msgstr "â¿Åà´ÍÃì"
+
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "â¿Åà´ÍÃì"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "ÅºàÍ¡ÊÒÃá¹º"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "à¢µ¢éÍ¤ÇÒÁ"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "à¢µ¢éÍ¤ÇÒÁ"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "ÇÑ¹·Õè¢Í§¢éÍ¤ÇÒÁ"
+
+#: compose.php:824 compose.php:838
+msgid "Message redirected successfully."
+msgstr ""
+
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "¤Ø³ä´éàÃÕÂ¡ãªé \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+
+#: compose.php:1143 compose.php:1158
+msgid "Message sent successfully."
+msgstr ""
+
+#: config/prefs.php.dist:941
+msgid "Messages per page in the mailbox view."
+msgstr "¨Ó¹Ç¹¢éÍ¤ÇÒÁµèÍË¹éÒã¹ÁØÁÁÍ§µÙéä»ÃÉ³ÕÂì"
+
+#: mailbox.php:322
+msgid "Messages to"
+msgstr "¢éÍ¤ÇÒÁä»ÂÑ§"
+
+#: templates/acl/acl.inc:29
+#, fuzzy
+msgid "Modify"
+msgstr "à¹×éÍËÒ"
+
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move"
+msgstr "ÂéÒÂ"
+
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "ÂéÒÂÅ§"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "àÅ×Í¡â¿Åà´ÍÃì"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "ÂéÒÂ¢Öé¹"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "¡ÒÃáÊ´§¢éÍ¤ÇÒÁ"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
+msgid "Name"
+msgstr "ª×èÍ"
+
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "¡ÒÃ¡ÃÐ·Ó"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
+msgid "Never"
+msgstr "äÁèàÅ×Í¡"
+
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "ÅºàÍ¡ÊÒÃá¹º"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "ãËÁè"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "à»Ô´â¿Åà´ÍÃì"
+
+#: config/prefs.php.dist:88
+msgid "New Mail"
+msgstr "¨´ËÁÒÂãËÁè"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "¢éÍ¤ÇÒÁãËÁè"
+
+#: templates/search/main.inc:19
+msgid "New messages"
+msgstr "¢éÍ¤ÇÒÁãËÁè"
+
+#: templates/compose/spelling.inc:133
+#, fuzzy
+msgid "Next"
+msgstr "ÁÕ¤ÓÇèÒ"
+
+#: templates/message/navbar_navigate.inc:33
+msgid "Next Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
+
+#: mailbox.php:356
+msgid "Next Page"
+msgstr "Ë¹éÒµèÍä»"
+
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "äÁè"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "¢éÍ¤ÇÒÁãËÁè"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "¢éÍ¤ÇÒÁ·Õèá¡éä¢áÅéÇ"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "äÁèä´éàÅ×Í¡â¿Åà´ÍÃìäÇé"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
+msgid "No folders were specified"
+msgstr "¡ÃØ³ÒÃÐºØâ¿Åà´ÍÃì·ÕèµéÍ§¡ÒÃ"
+
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "äÁèãªè¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "äÁèãªè¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "ÂéÒÂ¢éÍ¤ÇÒÁä»"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
+msgstr "äÁèÁÕ¢éÍ¤ÇÒÁã´µÃ§¡Ñº¡ÒÃ¤é¹ËÒ¢Í§¤Ø³"
+
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
+msgid "No spelling errors"
+msgstr "äÁè¾º¤Ó·ÕèÊÐ¡´¼Ô´"
+
+#: templates/compose/spelling.inc:100
+msgid "No suggestions"
+msgstr "äÁèÁÕ¤Óá¹Ð¹Ó"
+
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "¡ÃØ³ÒÃÐºØâ¿Åà´ÍÃì·ÕèµéÍ§¡ÒÃ"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
+msgid "None"
+msgstr "äÁèàÅ×Í¡"
+
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
+msgid "Not Deleted"
+msgstr "äÁè¶Ù¡Åº"
+
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
+msgid "Not Draft"
+msgstr "äÁèãªèáººÃèÒ§"
+
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
+msgid "Not Important"
+msgstr "äÁèãªè¢éÍ¤ÇÒÁÊÓ¤Ñ"
+
+#: templates/mailbox/navbar.inc:25
+msgid "Not Personal"
+msgstr "äÁèãªè¢éÍ¤ÇÒÁÊèÇ¹µÑÇ"
+
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
+msgid "Not deleted messages"
+msgstr "äÁèãªè¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
+
+#: templates/search/main.inc:51
+msgid "Not important messages"
+msgstr "äÁèãªè¢éÍ¤ÇÒÁÊÓ¤Ñ"
+
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "ÍéÒ§ÍÔ§"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "¨Ó¹Ç¹â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·ÕèµéÍ§¡ÒÃà¡çºäÇé ËÒ¡·Ó¡ÒÃÅº·Ôé§à»ç¹ÃÒÂà´×Í¹"
+
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr "¨Ó¹Ç¹â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·ÕèµéÍ§¡ÒÃà¡çºäÇé ËÒ¡·Ó¡ÒÃÅº·Ôé§à»ç¹ÃÒÂà´×Í¹"
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr ""
+
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "¢éÍ¤ÇÒÁà¡èÒ"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "¡ÓÅÑ§¡Ó¨Ñ´â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡¢Í§à´×Í¹¡èÍ¹æ"
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+msgid "Only one folder should be selected for this action."
+msgstr ""
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "à»Ô´â¿Åà´ÍÃì"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "à»Ô´â¿Åà´ÍÃì"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "µÑÇàÅ×Í¡Í×è¹"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "µÑÇàÅ×Í¡Í×è¹"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr ""
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "¼Ô´¾ÅÒ´"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "µÑÇàÅ×Í¡"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹àÃÕÂºÃéÍÂáÅéÇ"
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "¢éÍ¤ÇÒÁ·ÕèáÅéÇ"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr ""
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
+
+#: templates/mailbox/header.inc:19
+#, php-format
+msgid "Page %d of %d"
+msgstr "Ë¹éÒ·Õè %d ¨Ò¡ %d"
+
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
+msgid "Part(s)"
+msgstr "ÊèÇ¹»ÃÐ¡Íº"
+
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+msgid "Passphrase successfully unloaded."
+msgstr ""
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
+msgid "Password"
+msgstr "ÃËÑÊ¼èÒ¹"
+
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
+msgstr "´Óà¹Ô¹¡ÒÃºÓÃØ§ÃÑ¡ÉÒÃÐººã¹¢³ÐÅ§ª×èÍà¢éÒ"
+
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+msgid "Personal"
+msgstr "ÊèÇ¹µÑÇ"
+
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "¢éÍÁÙÅÊèÇ¹µÑÇ"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
+msgid "Place your signature before replies and forwards?"
 msgstr "àµÔÁÅÒÂà«ç¹¢Í§¤Ø³ã¹¡ÒÃµÍº¡ÅÑºáÅÐÊè§µèÍ?"
 
-#: compose.php:225 compose.php:240
-msgid "Please resolve ambiguous or invalid addresses."
-msgstr "¡ÃØ³ÒµÃÇ¨ÊÍº·ÕèÍÂÙè«éÓËÃ×Í¾ÔÁ¾ì¼Ô´"
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "Please enter a name for the new folder:"
+msgstr ""
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
+msgid "Please enter the name of the new folder:"
+msgstr ""
+
+#: templates/javascript/folders.js:137
+msgid "Please enter the new name:"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+msgid "Please provide your password."
+msgstr ""
+
+#: templates/login/login.inc:67
+msgid "Please provide your username."
+msgstr ""
+
+#: compose.php:106 lib/IMP.php:459
+msgid "Please resolve ambiguous or invalid addresses."
+msgstr "¡ÃØ³ÒµÃÇ¨ÊÍº·ÕèÍÂÙè«éÓËÃ×Í¾ÔÁ¾ì¼Ô´"
+
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
+msgid "Please select a folder before you perform any actions."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:502
+msgid "Please select an action from the menu below."
+msgstr ""
+
+#: templates/search/javascript.inc:41
+msgid "Please select at least one folder to search."
+msgstr ""
+
+#: templates/javascript/folders.js:12
+msgid "Please select only one folder for this operation."
+msgstr ""
+
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
+msgstr "¡ÃØ³ÒàÅ×Í¡ËÃ×Íá¡éä¢µèÍä»:"
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
+msgstr "àµÔÁ¢Õ´ ('--') äÇé¢éÒÇË¹éÒÅÒÂà«ç¹¢Í§¤Ø³"
+
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹àÃÕÂºÃéÍÂáÅéÇ"
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Ë¹éÒ·ÕèáÅéÇ"
+
+#: templates/message/navbar_navigate.inc:28
+msgid "Previous Message"
+msgstr "¢éÍ¤ÇÒÁ·ÕèáÅéÇ"
+
+#: mailbox.php:347
+msgid "Previous Page"
+msgstr "Ë¹éÒ·ÕèáÅéÇ"
+
+#: templates/message/navbar_actions.inc:33
+msgid "Print"
+msgstr "¾ÔÁ¾ì"
+
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "¾ÔÁ¾ì"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Åºâ´Â¶ÒÇÃ"
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+msgid "Purge Deleted"
+msgstr "Åºâ´Â¶ÒÇÃ"
+
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Åºâ¿Åà´ÍÃì"
+
+#: config/prefs.php.dist:396
+msgid "Purge Trash how often:"
+msgstr "¤ÇÒÁ¶Õèã¹¡ÒÃ¡Ó¨Ñ´¶Ñ§¢ÂÐ"
+
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr "¨Ó¹Ç¹ÇÑ¹·Õèà¡çº¢éÍ¤ÇÒÁäÇéã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐ¡èÍ¹¡ÒÃ¡Ó¨Ñ´"
+
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
+msgstr "¡Ó¨Ñ´¢éÍ¤ÇÒÁà¡èÒã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "¡Ó¨Ñ´ %d ¢éÍ¤ÇÒÁÍÍ¡¨Ò¡â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "¡Ó¨Ñ´ %d ¢éÍ¤ÇÒÁÍÍ¡¨Ò¡â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
+msgstr "ÍéÒ§ÍÔ§"
+
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "ä´éÃÑºàÁ×èÍ"
+
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "ä´éÃÑºàÁ×èÍ"
+
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
+msgstr "ä´éÃÑºàÁ×èÍ"
+
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§"
+
+#: templates/compose/redirect.inc:110
+#, fuzzy
+msgid "Redirect Message"
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§¢éÍ¤ÇÒÁ¹Õé"
+
+#: compose.php:787
+msgid "Redirect this message"
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§¢éÍ¤ÇÒÁ¹Õé"
+
+#: compose.php:847
+msgid "Redirecting failed."
+msgstr "¡ÒÃà»ÕèÂ¹àÊé¹·Ò§ÅéÁàËÅÇ"
+
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "ÃÕà¿Ãª"
+
+#: config/prefs.php.dist:784
+msgid "Refresh Folder Views:"
+msgstr "ÃÕà¿ÃªÁØÁÁÍ§â¿Åà´ÍÃì"
+
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "ÃÕâËÅ´ÁØÁÁÍ§"
+
+#: templates/folders/head.inc:3
+msgid "Reload View"
+msgstr "ÃÕâËÅ´ÁØÁÁÍ§"
+
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
+msgid "Remember the last view"
+msgstr "¨´¨ÓÁØÁÁÍ§ÅèÒÊØ´"
+
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "µÙéä»ÃÉ³ÕÂì"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "¹ÓáËÅè§¢éÍÁÙÅÍÍ¡"
+
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
+msgstr "à»ÅÕèÂ¹ª×èÍâ¿Åà´ÍÃì"
+
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
+msgstr "à»ÅÕèÂ¹ª×èÍâ¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·Ø¡æ µé¹à´×Í¹"
+
+#: lib/Folder.php:455
+#, php-format
+msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
+msgstr "¡ÒÃà»ÅÕèÂ¹ª×èÍ¨Ò¡ \"%s\" à»ç¹ \"%s\" ÅéÁàËÅÇ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "µÍº¡ÅÑº·Ñé§ËÁ´"
+
+#: templates/compose/spelling.inc:105
+msgid "Replace with:"
+msgstr "á·¹·Õè´éÇÂ:"
+
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "µÍº¡ÅÑº"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "µÍº¡ÅÑºä»ÂÑ§"
+
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to All"
+msgstr "µÍº¡ÅÑº·Ñé§ËÁ´"
+
+#: compose.php:733
+msgid "Reply to All:"
+msgstr "µÍº¡ÅÑº·Ñé§ËÁ´:"
+
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "µÍº¡ÅÑº·Ñé§ËÁ´"
+
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "µÍº¡ÅÑº·Ñé§ËÁ´:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "µÍº¡ÅÑº·Ñé§ËÁ´"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
+msgstr "µÍº¡ÅÑºä»ÂÑ§:"
+
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "µÍº¡ÅÑºä»ÂÑ§:"
+
+#: compose.php:731
+msgid "Reply:"
+msgstr "µÍº¡ÅÑº"
+
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "ÃÒÂ§Ò¹ÇèÒà»ç¹"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
+msgid "Report as Spam"
+msgstr "ÃÒÂ§Ò¹ÇèÒà»ç¹"
+
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "ÃéÍ§¢ÍãºµÍºÃÑº"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
+msgstr "ÃéÍ§¢ÍãºµÍºÃÑº"
+
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
+#, fuzzy
+msgid "Reset"
+msgstr "·ÓµèÍ"
+
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
+msgid "Resume"
+msgstr "·ÓµèÍ"
+
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "à¢ÕÂ¹¢éÍ¤ÇÒÁãËÁè"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "µÑÇàÅ×Í¡à¡ÕèÂÇ¡Ñº¼Ùéãªé"
+
+#: config/prefs.php.dist:718
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr "µéÍ§¡ÒÃ¡ÅÑºÊÙèÃÒÂ¡ÒÃµÙéä»ÃÉ³ÕÂìËÅÑ§¨Ò¡·Ó¡ÒÃÅº, ÂéÒÂ ËÃ×ÍÊÓà¹Ò¢éÍ¤ÇÒÁËÃ×ÍäÁè?"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "µÑÇàÅ×Í¡"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "ª×èÍàÃ×èÍ§"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "ºÑ¹·Ö¡ÊÓà¹Òã¹"
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "ºÑ¹·Ö¡à»ç¹"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "ºÑ¹·Ö¡à»ç¹"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save Draft"
+msgstr "ºÑ¹·Ö¡à»ç¹"
+
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "ºÑ¹·Ö¡à»ç¹"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "µÑÇàÅ×Í¡à¡ÕèÂÇ¡Ñº¼Ùéãªé"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "ºÑ¹·Ö¡à»ç¹"
+
+#: templates/message/navbar_actions.inc:32
+msgid "Save as"
+msgstr "ºÑ¹·Ö¡à»ç¹"
+
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
+msgstr "ºÑ¹·Ö¡¨´ËÁÒÂ¢ÒÍÍ¡"
+
+#: compose.php:1227
+#, php-format
+msgid "Saving the draft failed. This is what the server said: %s"
+msgstr "¡ÒÃºÑ¹·Ö¡áººÃèÒ§ÅéÁàËÅÇ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ: %s"
+
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
+msgid "Search"
+msgstr "¤é¹ËÒ"
+
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "¤é¹ËÒ"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "µÑÇàÅ×Í¡à¡ÕèÂÇ¡Ñº¼Ùéãªé"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "¼Å¡ÒÃ¤é¹ËÒ"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
+msgid "Seen"
+msgstr "ÍèÒ¹áÅéÇ"
+
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "àÅ×Í¡"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "äÁèàÅ×Í¡àÅÂ"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "àÅ×Í¡àÍ¡ÅÑ¡É³ìèèèèèèèèèèèèèèèèè"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "àÅ×Í¡·Ñé§ËÁ´"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "äÁèàÅ×Í¡àÅÂ"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
+msgstr "àÅ×Í¡áËÅè§·ÕèµÔ´µèÍà¾×èÍ·Ó¡ÒÃà¾ÔèÁáÅÐ¤é¹ËÒÃÒÂª×èÍ"
+
+#: templates/search/main.inc:88
+msgid "Select all"
+msgstr "àÅ×Í¡·Ñé§ËÁ´"
+
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "¡ÓË¹´ÅÓ´Ñº¢Í§·ÕèµÔ´µèÍ·ÕèµéÍ§¡ÒÃãËé¤é¹ËÒã¹¢³Ð·Ó¡ÒÃàµÔÁàµçÁª×èÍ"
+
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "äÁèàÅ×Í¡àÅÂ"
+
+#: templates/search/main.inc:89
+msgid "Select none"
+msgstr "äÁèàÅ×Í¡àÅÂ"
+
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
+msgstr "·ÕèµÔ´µèÍ·ÕèàÅ×Í¡:"
+
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "¢éÍÁÙÅà¤Ã×èÍ§ºÃÔ¡ÒÃ"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "Send Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
+
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡"
+
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡"
+
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "à¤Ã×èÍ§ºÃÔ¡ÒÃ"
+
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
+msgstr "¢éÍÁÙÅà¤Ã×èÍ§ºÃÔ¡ÒÃ"
+
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
+msgstr "à¤Ã×èÍ§ºÃÔ¡ÒÃ"
+
+#: config/prefs.php.dist:80
+msgid "Set preferences for what happens when you move and delete messages."
+msgstr "¡ÓË¹´¤èÒ¡ÒÃ¡ÃÐ·ÓàÁ×èÍ·Ó¡ÒÃÂéÒÂáÅÐÅº¢éÍ¤ÇÒÁ"
+
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "â¿Åà´ÍÃì"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
+
+#: config/prefs.php.dist:513
+msgid "Should the compose window be closed after saving a draft?"
+msgstr "µéÍ§¡ÒÃãËé»Ô´Ë¹éÒµèÒ§à¢ÕÂ¹¨´ËÁÒÂËÅÑ§¨Ò¡ºÑ¹·Ö¡áººÃèÒ§ËÃ×ÍäÁè?"
+
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "ÂØºâ¿Åà´ÍÃì·Ñé§ËÁ´"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
+msgid "Show Deleted"
+msgstr "áÊ´§·Õè¶Ù¡Åº"
+
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "¢éÍÁÙÅÊèÇ¹µÑÇ"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "àÅ×Í¡ãªé§Ò¹â¿Åà´ÍÃì"
+
+#: folders.php:298
+msgid "Show Unsubscribed"
+msgstr "áÊ´§·ÕèàÅÔ¡ãªéä»áÅéÇ"
+
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
+
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
+msgstr "áÊ´§¤ÓÍ¸ÔºÒÂÊÑÅÑ¡É³ìã¹ÁØÁÁÍ§µÙéä»ÃÉ³ÕÂì"
+
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "¢¹Ò´"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "¢¹Ò´"
+
+#: templates/compose/attachments.inc:3
+msgid "Size"
+msgstr "¢¹Ò´"
+
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "·ÕèÍÂÙè¼ÙéÊè§"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "¢¹Ò´¢Í§¢éÍ¤ÇÒÁ"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "äÁèÁÕª×èÍàÃ×èÍ§"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "à·Ã´"
+
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "·ÕèÍÂÙè¼ÙéÊè§"
+
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "â¿Åà´ÍÃì¶Ñ§¢ÂÐ:"
+
+#: templates/compose/compose.inc:346
+msgid "Special Characters"
+msgstr "ÍÑ¡¢ÃÐ¾ÔàÈÉ"
+
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
+msgid "Spell Check"
+msgstr "µÃÇ¨¤ÓÊÐ¡´"
+
+#: templates/compose/spelling.inc:46
+msgid "Spell Checker"
+msgstr "µÑÇµÃÇ¨¤ÓÊÐ¡´"
+
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
+msgid "Spell check complete"
+msgstr "µÃÇ¨¤ÓÊÐ¡´àÃÕÂºÃéÍÂáÅéÇ"
+
+#: config/prefs.php.dist:471
+msgid "Spelling errors per screen when spell checking."
+msgstr "¨Ó¹Ç¹¤ÇÒÁ¼Ô´¾ÅÒ´·ÕèáÊ´§ã¹Ë¹Öè§Ë¹éÒ¨Í¢³Ð·Ó¡ÒÃµÃÇ¨¤ÓÊÐ¡´"
+
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "àÍ¡ÊÒÃá¹º"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "ª×èÍàÃ×èÍ§"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
+msgid "Subject"
+msgstr "ª×èÍàÃ×èÍ§"
+
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "à¢µ¢éÍ¤ÇÒÁª×èÍàÃ×èÍ§"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "ª×èÍàÃ×èÍ§"
+
+#: templates/folders/actions.inc:11
+msgid "Subscribe to Folder(s)"
+msgstr "àÅ×Í¡ãªé§Ò¹â¿Åà´ÍÃì"
+
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
+msgid "Success"
+msgstr "ÊÓàÃç¨"
+
+#: templates/compose/spelling.inc:86
+msgid "Suggestions"
+msgstr "¤Óá¹Ð¹Ó"
+
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "ÁÕ¤ÓÇèÒ"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "ÁÕ¤ÓÇèÒ"
+
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ºÑ¹·Ö¡áÅéÇ"
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
+msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
+msgstr "â¿Åà´ÍÃì»Ñ¨¨ØºÑ¹ \"%s\" ¨Ð¶Ù¡à»ÅÕèÂ¹ª×èÍà»ç¹ \"%s\""
+
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+
+#: lib/Folder.php:337
+#, php-format
+msgid "The folder \"%s\" already exists"
+msgstr "â¿Åà´ÍÃì \"%s\" ÁÕÍÂÙèáÅéÇ"
+
+#: lib/Folder.php:163
+#, php-format
+msgid ""
+"The folder \"%s\" contains illegal characters in its name. It may cause "
+"problems. Please see your system administrator."
+msgstr ""
+"â¿Åà´ÍÃì \"%s\" ÁÕµÑÇÍÑ¡ÉÃ·ÕèäÁè¶Ù¡µéÍ§ÍÂÙèã¹ª×èÍ «Öè§ÍÒ¨·ÓãËéà¡Ô´»ÑËÒä´é "
+"¡ÃØ³ÒµÔ´µèÍ¼Ùé´ÙáÅÐÃÐºº¢Í§¤Ø³"
+
+#: lib/Folder.php:356
+#, php-format
+msgid "The folder \"%s\" was created but you were not subscribed to it."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹áÅéÇ áµèÂÑ§äÁèä´éàÃÕÂ¡ãªé"
+
+#: lib/Folder.php:272
+#, php-format
+msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡Åºä»ÍÍ¡áÅéÇ áµè¤Ø³ÂÑ§äÁèä´éàÅÔ¡ãªé"
+
+#: lib/Folder.php:343
+#, php-format
+msgid "The folder \"%s\" was not created. This is what the server said"
+msgstr "äÁèÊÒÁÒÃ¶ÊÃéÒ§â¿Åà´ÍÃì \"%s\" ä´é à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+
+#: lib/Folder.php:265
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "äÁèÊÒÁÒÃ¶Åºâ¿Åà´ÍÃì \"%s\" ä´é à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+
+#: lib/Folder.php:359
+#, php-format
+msgid "The folder \"%s\" was successfully created."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹àÃÕÂºÃéÍÂáÅéÇ"
+
+#: lib/Folder.php:275
+#, php-format
+msgid "The folder \"%s\" was successfully deleted."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
+
+#: lib/Folder.php:453
+#, php-format
+msgid "The folder \"%s\" was successfully renamed to \"%s\"."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡à»ÅÕèÂ¹ª×èÍà»ç¹ \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "â¿Åà´ÍÃì \"%s\" ÁÕÍÂÙèáÅéÇ"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr ""
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ºÑ¹·Ö¡áÅéÇ"
+
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
+msgstr ""
+
+#: templates/compose/compose.js:102
+#, fuzzy
+msgid "The signature was successfully replaced."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹àÃÕÂºÃéÍÂáÅéÇ"
+
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ºÑ¹·Ö¡áÅéÇ"
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "Åº¢éÍ¤ÇÒÁ"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§¢éÍ¤ÇÒÁ¹Õé"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
+msgid "There are no messages in this mailbox."
+msgstr "äÁèÁÕ¢éÍ¤ÇÒÁã¹µÙéä»ÃÉ³ÕÂì¹Õé"
+
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
+msgid "There was a problem expunging %s. This is what the server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº %s à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅºµÙéä»ÃÉ³ÕÂì à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ: %s"
+
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅºµÙéä»ÃÉ³ÕÂì à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: templates/compose/compose.inc:116 templates/compose/compose.inc:172
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "¡ÃØ³ÒàÅ×Í¡ËÃ×Íá¡éä¢µèÍä»:"
+#: lib/Message.php:90
+#, fuzzy, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊÓà¹Ò¢éÍ¤ÇÒÁä»ÂÑ§ \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃá¨é§ÇèÒ"
 
-#: templates/identities/manage.inc:77
-msgid "Precede your signature with dashes ('-- ')"
-msgstr "àµÔÁ¢Õ´ ('--') äÇé¢éÒÇË¹éÒÅÒÂà«ç¹¢Í§¤Ø³"
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº¢éÍ¤ÇÒÁ¨Ò¡â¿Åà´ÍÃì \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: templates/message/navbar.inc:32
-msgid "Previous Message"
-msgstr "¢éÍ¤ÇÒÁ·ÕèáÅéÇ"
+#: lib/Message.php:275
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
+"server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº¢éÍ¤ÇÒÁã¹â¿Åà´ÍÃì \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: mailbox.php:491 mailbox.php:492 mailbox.php:497 mailbox.php:498
-msgid "Previous Page"
-msgstr "Ë¹éÒ·ÕèáÅéÇ"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº¢éÍ¤ÇÒÁ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: templates/message/navbar.inc:23
-msgid "Print"
-msgstr "¾ÔÁ¾ì"
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§¢éÍ¤ÇÒÁ·ÕèÃÐºØ"
 
-#: mailbox.php:349
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´¡ÑºµÑÇ¡ÃÍ§ %d: äÁè¾ºâ¿Åà´ÍÃì: %s"
-
-#: templates/menu/menu.inc:33
-msgid "Problem?"
-msgstr "á¨é§»ÑËÒ"
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
+msgid "There was an error displaying this message part"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§ÊèÇ¹¹Õé¢Í§¢éÍ¤ÇÒÁ"
 
-#: templates/mailbox/actions.inc:26
-msgid "Purge Deleted"
-msgstr "Åºâ´Â¶ÒÇÃ"
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
+msgid ""
+"There was an error flagging messages in the folder \"%s\". This is what the "
+"server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃºè§ªÕé¢éÍ¤ÇÒÁã¹â¿Åà´ÍÃì \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: config/prefs.php.dist:474
-msgid "Purge Trash how often:"
-msgstr "¤ÇÒÁ¶Õèã¹¡ÒÃ¡Ó¨Ñ´¶Ñ§¢ÂÐ"
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃºÑ¹·Ö¡áººÃèÒ§"
 
-#: config/prefs.php.dist:483
-msgid "Purge messages in Trash folder older than this amount of days"
-msgstr "¨Ó¹Ç¹ÇÑ¹·Õèà¡çº¢éÍ¤ÇÒÁäÇéã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐ¡èÍ¹¡ÒÃ¡Ó¨Ñ´"
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§¢éÍ¤ÇÒÁ·ÕèÃÐºØ"
 
-#: config/prefs.php.dist:464
-msgid "Purge old message in the Trash folder"
-msgstr "¡Ó¨Ñ´¢éÍ¤ÇÒÁà¡èÒã¹â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§¢éÍ¤ÇÒÁ·ÕèÃÐºØ"
 
-#: lib/Maintenance/Task/purge_trash.php:60
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "¡Ó¨Ñ´ %d ¢éÍ¤ÇÒÁÍÍ¡¨Ò¡â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊè§¢éÍ¤ÇÒÁ¢Í§¤Ø³: %s"
 
-#: compose.php:584
-msgid "Quoting"
-msgstr "ÍéÒ§ÍÔ§"
+#: lib/Message.php:85
+#, fuzzy, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÂéÒÂ¢éÍ¤ÇÒÁä» \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: templates/search/main.inc:128
-msgid "Received after"
-msgstr "ä´éÃÑºËÅÑ§"
-
-#: templates/search/main.inc:99
-msgid "Received before"
-msgstr "ä´éÃÑº¡èÍ¹"
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§ÊèÇ¹¹Õé¢Í§¢éÍ¤ÇÒÁ"
 
-#: templates/search/main.inc:70
-msgid "Received on"
-msgstr "ä´éÃÑºàÁ×èÍ"
+#: compose.php:1006
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊè§¢éÍ¤ÇÒÁ¢Í§¤Ø³: %s"
 
-#: templates/message/navbar.inc:12
-msgid "Redirect"
-msgstr "à»ÅÕèÂ¹àÊé¹·Ò§"
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊè§¢éÍ¤ÇÒÁ¢Í§¤Ø³: %s"
 
-#: compose.php:986
-msgid "Redirect this message"
-msgstr "à»ÅÕèÂ¹àÊé¹·Ò§¢éÍ¤ÇÒÁ¹Õé"
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§ÊèÇ¹¹Õé¢Í§¢éÍ¤ÇÒÁ"
 
-#: compose.php:709
-msgid "Redirecting failed."
-msgstr "¡ÒÃà»ÕèÂ¹àÊé¹·Ò§ÅéÁàËÅÇ"
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr ""
 
-#: templates/mailbox/header.inc:19
-msgid "Refresh"
-msgstr "ÃÕà¿Ãª"
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
 
-#: config/prefs.php.dist:714
-msgid "Refresh Folder Views:"
-msgstr "ÃÕà¿ÃªÁØÁÁÍ§â¿Åà´ÍÃì"
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
 
-#: templates/folders/head.inc:6 templates/folders/head.inc:7
-msgid "Reload View"
-msgstr "ÃÕâËÅ´ÁØÁÁÍ§"
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
 
-#: config/prefs.php.dist:552
-msgid "Remember the last view"
-msgstr "¨´¨ÓÁØÁÁÍ§ÅèÒÊØ´"
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
 
-#: templates/compose/compose.inc:455
-msgid "Remove Selected"
-msgstr "Åº·Õè¶Ù¡àÅ×Í¡"
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr ""
 
-#: templates/folders/actions.inc:6
-msgid "Rename Folder"
-msgstr "à»ÅÕèÂ¹ª×èÍâ¿Åà´ÍÃì"
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
 
-#: config/prefs.php.dist:437
-msgid "Rename sent-mail folder at beginning of month"
-msgstr "à»ÅÕèÂ¹ª×èÍâ¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡·Ø¡æ µé¹à´×Í¹"
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
 
-#: lib/Folder.php:371
-#, c-format
-msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "¡ÒÃà»ÅÕèÂ¹ª×èÍ¨Ò¡ \"%s\" à»ç¹ \"%s\" ÅéÁàËÅÇ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
 
-#: templates/compose/spelling.inc:96
-msgid "Replace with:"
-msgstr "á·¹·Õè´éÇÂ:"
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
-#: templates/message/navbar.inc:9
-msgid "Reply"
-msgstr "µÍº¡ÅÑº"
+#: lib/MIME/Viewer/pgp.php:315
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr ""
 
-#: templates/message/navbar.inc:10
-msgid "Reply to All"
-msgstr "µÍº¡ÅÑº·Ñé§ËÁ´"
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
 
-#: compose.php:599
-msgid "Reply to All:"
-msgstr "µÍº¡ÅÑº·Ñé§ËÁ´:"
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
 
-#: compose.php:627
-msgid "Reply-To: "
-msgstr "µÍº¡ÅÑºä»ÂÑ§:"
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr ""
 
-#: templates/message/headers.inc:24
-msgid "Reply-to"
-msgstr "µÍº¡ÅÑºä»ÂÑ§"
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr ""
 
-#: compose.php:597
-msgid "Reply:"
-msgstr "µÍº¡ÅÑº"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
 
-#: templates/message/navbar.inc:25
-msgid "Report as Spam"
-msgstr "ÃÒÂ§Ò¹ÇèÒà»ç¹"
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr ""
 
-#: templates/compose/compose.inc:348
-msgid "Request a Return Receipt"
-msgstr "ÃéÍ§¢ÍãºµÍºÃÑº"
+#: message.php:211
+msgid "This message to"
+msgstr "¢éÍ¤ÇÒÁ¹Õéä»ÂÑ§"
 
-#: templates/message/navbar.inc:20
-msgid "Resume"
-msgstr "·ÓµèÍ"
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
+
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
+
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "áÊ´§¼Å"
+
+#: thread.php:76 config/prefs.php.dist:922
+msgid "Thread View"
+msgstr "ÁØÁÁÍ§à·Ã´"
 
-#: config/prefs.php.dist:376
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
+msgid "To"
+msgstr "¶Ö§"
+
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "·ÕèÍÂÙè¼ÙéÊè§"
+
+#: templates/prefs/sourceselect.inc:326
 msgid ""
-"Return to the mailbox listing after deleting, moving, or copying a message?"
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
 msgstr ""
-"µéÍ§¡ÒÃ¡ÅÑºÊÙèÃÒÂ¡ÒÃµÙéä»ÃÉ³ÕÂìËÅÑ§¨Ò¡·Ó¡ÒÃÅº, ÂéÒÂ ËÃ×ÍÊÓà¹Ò¢éÍ¤ÇÒÁËÃ×ÍäÁè?"
 
-#: templates/filters/manage.inc:4
-msgid "Rule Definition"
-msgstr "¡ÒÃ¡ÓË¹´¡¯à¡³±ì"
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "àÍ¡ÊÒÃá¹º"
 
-#: templates/compose/compose.inc:327
-msgid "Save a copy in "
-msgstr "ºÑ¹·Ö¡ÊÓà¹Òã¹"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "â¿Åà´ÍÃì¶Ñ§¢ÂÐ:"
 
-#: templates/message/navbar.inc:22
-msgid "Save as"
-msgstr "ºÑ¹·Ö¡à»ç¹"
+#: templates/prefs/trashselect.inc:23
+msgid "Trash folder:"
+msgstr "â¿Åà´ÍÃì¶Ñ§¢ÂÐ:"
 
-#: templates/identities/manage.inc:87
-msgid "Save sent mail"
-msgstr "ºÑ¹·Ö¡¨´ËÁÒÂ¢ÒÍÍ¡"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
-#: compose.php:923
-#, c-format
-msgid "Saving the draft failed. This is what the server said: %s"
-msgstr "¡ÒÃºÑ¹·Ö¡áººÃèÒ§ÅéÁàËÅÇ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ: %s"
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
+msgid "Unanswered"
+msgstr "äÁèä´éµÍº¡ÅÑº"
 
-#: templates/menu/menu.inc:27 templates/search/main.inc:8
-msgid "Search"
-msgstr "¤é¹ËÒ"
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "¢éÍ¤ÇÒÁ·ÕèäÁèä´éµÍº¡ÅÑº"
 
-#: lib/IMP.php:441
-msgid "Search Results"
-msgstr "¼Å¡ÒÃ¤é¹ËÒ"
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
+msgid "Undelete"
+msgstr "¡Ùé¤×¹"
 
-#: templates/mailbox/legend.inc:10 templates/mailbox/navbar.inc:13
-#: templates/mailbox/navbar.inc:30
-msgid "Seen"
-msgstr "ÍèÒ¹áÅéÇ"
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
+msgid "Undisclosed Recipients"
+msgstr "¼ÙéÃÑº·ÕèäÁèà»Ô´à¼Â"
 
-#: templates/mailbox/navbar.inc:9
-msgid "Select"
-msgstr "àÅ×Í¡"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
 
-#: config/prefs.php.dist:115
-msgid "Select addressbook sources for adding and searching for addresses."
-msgstr "àÅ×Í¡áËÅè§·ÕèµÔ´µèÍà¾×èÍ·Ó¡ÒÃà¾ÔèÁáÅÐ¤é¹ËÒÃÒÂª×èÍ"
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
 
-#: templates/search/main.inc:229
-msgid "Select all"
-msgstr "àÅ×Í¡·Ñé§ËÁ´"
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
 
-#: templates/identities/manage.inc:12
-msgid "Select an identity"
-msgstr "àÅ×Í¡àÍ¡ÅÑ¡É³ìèèèèèèèèèèèèèèèèè"
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
 
-#: templates/message/navbar.inc:48
-msgid "Select charset:"
-msgstr "àÅ×Í¡ªØ´ÍÑ¡¢ÃÐ:"
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "¼ÙéÃÑº·ÕèäÁèà»Ô´à¼Â"
 
-#: templates/search/main.inc:230
-msgid "Select none"
-msgstr "äÁèàÅ×Í¡àÅÂ"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
 
-#: config/prefs.php.dist:279
-msgid "Select your preferred language:"
-msgstr "àÅ×Í¡ÀÒÉÒ·ÕèµéÍ§¡ÒÃ:"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "äÁèÁÕª×èÍ"
 
-#: templates/prefs/sourceselect.inc:275
-msgid "Selected Addressbooks:"
-msgstr "·ÕèµÔ´µèÍ·ÕèàÅ×Í¡:"
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
+msgid "Unseen"
+msgstr "ÂÑ§äÁèä´éà»Ô´"
 
-#: templates/identities/manage.inc:91
-msgid "Sent mail folder:"
-msgstr "â¿Åà´ÍÃì¨´ËÁÒÂ¢ÒÍÍ¡"
+#: templates/folders/actions.inc:12
+msgid "Unsubscribe from Folder(s)"
+msgstr "àÅÔ¡ãªéâ¿Åà´ÍÃì"
 
-#: templates/search/main.inc:84 templates/search/main.inc:113
-#: templates/search/main.inc:142
-msgid "September"
-msgstr "¡Ñ¹ÂÒÂ¹"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
 
-#: templates/login/login.inc:85 templates/login/login.inc:91
-msgid "Server"
-msgstr "à¤Ã×èÍ§ºÃÔ¡ÒÃ"
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
 
-#: config/prefs.php.dist:31
-msgid "Server Information"
-msgstr "¢éÍÁÙÅà¤Ã×èÍ§ºÃÔ¡ÒÃ"
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
-#: config/prefs.php.dist:60
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "¡ÓË¹´¤èÒÊÓËÃÑº¡ÒÃ¡ÃÍ§¢éÍ¤ÇÒÁ·ÕèÁÕ¤Ó·ÕèäÁèàËÁÒÐÊÁ"
+#: templates/prefs/sentmailselect.inc:41
+msgid "Use Default Value"
+msgstr "ãªé¤èÒâ´Â»ÃÔÂÒÂ"
 
-#: config/prefs.php.dist:67
-msgid "Set preferences for what happens when you move and delete messages."
-msgstr "¡ÓË¹´¤èÒ¡ÒÃ¡ÃÐ·ÓàÁ×èÍ·Ó¡ÒÃÂéÒÂáÅÐÅº¢éÍ¤ÇÒÁ"
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
+msgstr "ãªé¡ÒÃàÃÕÂ¡ãªéâ¿Åà´ÍÃì¢Í§äÍáÁ¾"
 
-#: config/prefs.php.dist:46
-msgid "Set the current time zone."
-msgstr "µÑé§¤èÒà¢µàÇÅÒ"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "ÅéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
 
-#: config/prefs.php.dist:39
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "àÅ×Í¡ÀÒÉÒ·ÕèµéÍ§¡ÒÃãªéã¹¡ÒÃáÊ´§àÁ¹Ù, ¤ÓÍ¸ÔºÒÂ áÅÐ¤ÇÒÁªèÇÂàËÅ×Í"
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "ª×èÍ¼Ùéãªé"
 
-#: config/prefs.php.dist:659
-msgid "Should the compose window be closed after saving a draft?"
-msgstr "µéÍ§¡ÒÃãËé»Ô´Ë¹éÒµèÒ§à¢ÕÂ¹¨´ËÁÒÂËÅÑ§¨Ò¡ºÑ¹·Ö¡áººÃèÒ§ËÃ×ÍäÁè?"
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
 
-#: mailbox.php:544
-msgid "Show Deleted"
-msgstr "áÊ´§·Õè¶Ù¡Åº"
+#: templates/login/login.inc:177
+msgid "Username"
+msgstr "ª×èÍ¼Ùéãªé"
 
-#: folders.php:266
-msgid "Show Unsubscribed"
-msgstr "áÊ´§·ÕèàÅÔ¡ãªéä»áÅéÇ"
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "ª×èÍ¼Ùéãªé"
 
-#: config/prefs.php.dist:674
-msgid "Show last login time when logging in"
-msgstr "áÊ´§àÇÅÒÅ§ºÑ¹·Ö¡à¢éÒ¤ÃÑé§ÅèÒÊØ´¢³Ð¡ÓÅÑ§à¢éÒÊÙèÃÐºº"
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "áÊ´§ %s"
 
-#: config/prefs.php.dist:579
-msgid "Show legend in the mailbox view."
-msgstr "áÊ´§¤ÓÍ¸ÔºÒÂÊÑÅÑ¡É³ìã¹ÁØÁÁÍ§µÙéä»ÃÉ³ÕÂì"
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
+msgid "View %s"
+msgstr "áÊ´§ %s"
 
-#: templates/compose/compose.inc:431 templates/mailbox/message_headers.inc:33
-msgid "Size"
-msgstr "¢¹Ò´"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
 
-#: templates/index/notconfigured.inc:13
-msgid "Some of IMP's configuration files are missing:"
-msgstr "äÁè¾ºá¿éÁâ¤Ã§ÃèÒ§ºÒ§á¿éÁ¢Í§ IMP"
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
 
-#: templates/mailbox/message_headers.inc:8
-#: templates/mailbox/message_headers.inc:12
-#: templates/mailbox/message_headers.inc:16
-#: templates/mailbox/message_headers.inc:22
-#: templates/mailbox/message_headers.inc:26
-#: templates/mailbox/message_headers.inc:32
-msgid "Sort Direction"
-msgstr "·ÔÈ·Ò§¡ÒÃ¨Ñ´àÃÕÂ§"
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "¢éÍ¤ÇÒÁãËÁè"
 
-#: message.php:366
-msgid "Spam Report from"
-msgstr "ÃÒÂ§Ò¹¨´ËÁÒÂ¢ÂÐ¨Ò¡"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
 
-#: templates/compose/compose.inc:305
-msgid "Special Characters"
-msgstr "ÍÑ¡¢ÃÐ¾ÔàÈÉ"
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
 
-#: templates/compose/compose.inc:302
-msgid "Spell Check"
-msgstr "µÃÇ¨¤ÓÊÐ¡´"
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "à·Ã´"
 
-#: templates/compose/spelling.inc:26
-msgid "Spell Checker"
-msgstr "µÑÇµÃÇ¨¤ÓÊÐ¡´"
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
-msgid "Spell check complete"
-msgstr "µÃÇ¨¤ÓÊÐ¡´àÃÕÂºÃéÍÂáÅéÇ"
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
 
-#: config/prefs.php.dist:541
-msgid "Spelling errors per screen when spell checking."
-msgstr "¨Ó¹Ç¹¤ÇÒÁ¼Ô´¾ÅÒ´·ÕèáÊ´§ã¹Ë¹Öè§Ë¹éÒ¨Í¢³Ð·Ó¡ÒÃµÃÇ¨¤ÓÊÐ¡´"
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "ÊÃéÒ§¢éÍ¤ÇÒÁã¹Ë¹éÒµèÒ§ãËÁè"
 
-#: templates/compose/compose.inc:270 templates/mailbox/message_headers.inc:24
-#: templates/mailbox/message_headers.inc:27 templates/message/headers.inc:28
-#: templates/search/main.inc:54
-msgid "Subject"
-msgstr "ª×èÍàÃ×èÍ§"
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
 
-#: config/prefs.php.dist:509
-msgid "Subject Field"
-msgstr "à¢µ¢éÍ¤ÇÒÁª×èÍàÃ×èÍ§"
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
+msgstr "áÊ´§¢éÍ¤ÇÒÁã¹"
 
-#: filters.php:140 templates/filters/manage.inc:16
-msgid "Subject:"
-msgstr "ª×èÍàÃ×èÍ§:"
+#: templates/prefs/initialpageselect.inc:23
+msgid "View or mailbox to display after login:"
+msgstr "ÁØÁÁÍ§ËÃ×ÍµÙéä»ÃÉ³ÕÂì·ÕèµéÍ§¡ÒÃãËéáÊ´§ËÅÑ§¨Ò¡Å§ª×èÍà¢éÒ:"
 
-#: templates/folders/actions.inc:9
-msgid "Subscribe to Folder(s)"
-msgstr "àÅ×Í¡ãªé§Ò¹â¿Åà´ÍÃì"
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "áÊ´§ %s"
 
-#: status.php:39
-msgid "Success"
-msgstr "ÊÓàÃç¨"
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "áÊ´§¢éÍ¤ÇÒÁã¹"
 
-#: templates/compose/spelling.inc:74
-msgid "Suggestions"
-msgstr "¤Óá¹Ð¹Ó"
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
 
-#: templates/filters/manage.inc:30
-msgid "Text"
-msgstr "ÁÕ¤ÓÇèÒ"
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "ÊÃéÒ§â¿Åà´ÍÃì"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:89
-#, c-format
-msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
-msgstr "â¿Åà´ÍÃì»Ñ¨¨ØºÑ¹ \"%s\" ¨Ð¶Ù¡à»ÅÕèÂ¹ª×èÍà»ç¹ \"%s\""
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
 
-#: lib/Folder.php:299
-#, c-format
-msgid "The folder \"%s\" already exists"
-msgstr "â¿Åà´ÍÃì \"%s\" ÁÕÍÂÙèáÅéÇ"
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
 
-#: lib/Folder.php:132
-#, c-format
-msgid ""
-"The folder \"%s\" contains illegal characters in its name. It may cause "
-"problems. Please see your system administrator."
+#: folders.php:416
+msgid "Virtual INBOX Folder"
 msgstr ""
-"â¿Åà´ÍÃì \"%s\" ÁÕµÑÇÍÑ¡ÉÃ·ÕèäÁè¶Ù¡µéÍ§ÍÂÙèã¹ª×èÍ «Öè§ÍÒ¨·ÓãËéà¡Ô´»ÑËÒä´é "
-"¡ÃØ³ÒµÔ´µèÍ¼Ùé´ÙáÅÐÃÐºº¢Í§¤Ø³"
 
-#: lib/Folder.php:312
-#, c-format
-msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹áÅéÇ áµèÂÑ§äÁèä´éàÃÕÂ¡ãªé"
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
 
-#: lib/Folder.php:265
-#, c-format
-msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡Åºä»ÍÍ¡áÅéÇ áµè¤Ø³ÂÑ§äÁèä´éàÅÔ¡ãªé"
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "ÅéÒ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ"
 
-#: lib/Folder.php:305
-#, c-format
-msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "äÁèÊÒÁÒÃ¶ÊÃéÒ§â¿Åà´ÍÃì \"%s\" ä´é à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
 
-#: lib/Folder.php:259
-#, c-format
-msgid "The folder \"%s\" was not deleted. This is what the server said"
-msgstr "äÁèÊÒÁÒÃ¶Åºâ¿Åà´ÍÃì \"%s\" ä´é à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr "¤Óàµ×Í¹"
 
-#: lib/Folder.php:317
-#, c-format
-msgid "The folder \"%s\" was successfully created."
-msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÊÃéÒ§¢Öé¹àÃÕÂºÃéÍÂáÅéÇ"
+#: login.php:138
+#, php-format
+msgid "Welcome to %s"
+msgstr "ÂÔ¹´ÕµéÍ¹ÃÑºÊÙè %s"
 
-#: lib/Folder.php:268
-#, c-format
-msgid "The folder \"%s\" was successfully deleted."
-msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
 
-#: lib/Folder.php:368
-#, c-format
-msgid "The folder \"%s\" was successfully renamed to \"%s\"."
-msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡à»ÅÕèÂ¹ª×èÍà»ç¹ \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+#: config/prefs.php.dist:727
+#, fuzzy
+msgid ""
+"When deleting messages, move them to your Trash folder instead of marking "
+"them as deleted?"
+msgstr ""
+"àÁ×èÍµéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁ ãËéÂéÒÂ¢éÍ¤ÇÒÁ¹Ñé¹æ ä»ÂÑ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ á·¹¡ÒÃ¡ÓË¹´ãËéà»ç¹¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
 
-#: identities.php:121
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ÅºáÅéÇ"
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
 
-#: identities.php:114
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "àÍ¡ÅÑ¡É³ì \"%s\" ä´é¶Ù¡ºÑ¹·Ö¡áÅéÇ"
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
 
-#: templates/mailbox/empty_mailbox.inc:4
-msgid "There are no messages in this mailbox."
-msgstr "äÁèÁÕ¢éÍ¤ÇÒÁã¹µÙéä»ÃÉ³ÕÂì¹Õé"
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
 
-#: mailbox.php:205
-#, c-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº %s à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
-#: mailbox.php:214
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅºµÙéä»ÃÉ³ÕÂì à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
+msgid "Yes"
+msgstr "ãªè"
 
-#: mailbox.php:365
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅºµÙéä»ÃÉ³ÕÂì à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ: %s"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr ""
 
-#: compose.php:946
-#, c-format
+#: templates/folders/folders_confirm.html:10
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
 msgstr ""
-"à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÍÑ¾âËÅ´ á¿éÁ¢éÍÁÙÅÍÒ¨ÁÕ¢¹Ò´ãËèà¡Ô¹¡ÇèÒ¢¹Ò´·Õè¡ÓË¹´äÇé (%d àÁ¡Ðäºµì)"
 
-#: compose.php:958
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
 msgstr ""
-"à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÍÑ¾âËÅ´ á¿éÁ¢éÍÁÙÅÍÒ¨ÁÕ¢¹Ò´ãËèà¡Ô¹¡ÇèÒ¢¹Ò´·Õè¡ÓË¹´äÇé"
 
-#: lib/Message.php:115
-#, c-format
-msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "You are copying/moving to a new folder."
 msgstr ""
-"à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊÓà¹Ò¢éÍ¤ÇÒÁä»ÂÑ§ \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃá¨é§ÇèÒ"
 
-#: lib/Message.php:217
-#, c-format
-msgid ""
-"There was an error deleting messages from the folder \"%s\". This is what "
-"the server said"
+#: templates/javascript/folders.js:102
+msgid "You are creating a sub-folder to "
 msgstr ""
-"à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº¢éÍ¤ÇÒÁ¨Ò¡â¿Åà´ÍÃì \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: lib/Message.php:292
-#, c-format
-msgid ""
-"There was an error deleting messages in the folder \"%s\". This is what the "
-"server said"
+#: templates/javascript/folders.js:104
+msgid "You are creating a top-level folder."
 msgstr ""
-"à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº¢éÍ¤ÇÒÁã¹â¿Åà´ÍÃì \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: lib/Message.php:247 lib/Message.php:255
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÅº¢éÍ¤ÇÒÁ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr ""
 
-#: lib/MIME/Viewer/enriched.php:41 lib/MIME/Viewer/text.php:29
-msgid "There was an error displaying this message part"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§ÊèÇ¹¹Õé¢Í§¢éÍ¤ÇÒÁ"
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
 
-#: lib/Message.php:354 lib/Message.php:369
-#, c-format
-msgid ""
-"There was an error flagging messages in the folder \"%s\". This is what the "
-"server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃºè§ªÕé¢éÍ¤ÇÒÁã¹â¿Åà´ÍÃì \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: templates/javascript/folders.js:135
+msgid "You are renaming the folder: "
+msgstr ""
 
-#: lib/Message.php:377
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃºè§ªÕé¢éÍ¤ÇÒÁ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "¤Ø³ä´éàÅÔ¡ãªé \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
 
-#: lib/Message.php:111
-#, c-format
+#: templates/stationery/prefs.inc:35
+#, php-format
 msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÂéÒÂ¢éÍ¤ÇÒÁä» \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
 
-#: lib/Message.php:211 lib/Message.php:241
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÂéÒÂ¢éÍ¤ÇÒÁä»ÂÑ§¶Ñ§¢ÂÐ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
 
-#: compose.php:939
-msgid "There was an error saving a draft."
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃºÑ¹·Ö¡áººÃèÒ§"
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
 
-#: compose.php:860
-#, c-format
-msgid "There was an error sending your message: %s"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃÊè§¢éÍ¤ÇÒÁ¢Í§¤Ø³: %s"
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
 
-#: lib/Message.php:305
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃ¡Ùé¤×¹¢éÍ¤ÇÒÁ à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: templates/mailbox/alert.inc:3
+#, fuzzy, php-format
+msgid "You have %s new messages."
+msgstr " - $nm ¢éÍ¤ÇÒÁãËÁè"
 
-#: mailbox.php:145
-msgid "There was an error viewing the requested message."
-msgstr "à¡Ô´¢éÍ¼Ô´¾ÅÒ´ã¹¡ÒÃáÊ´§¢éÍ¤ÇÒÁ·ÕèÃÐºØ"
+#: templates/mailbox/alert.inc:3
+#, fuzzy
+msgid "You have 1 new message."
+msgstr " - $nm ¢éÍ¤ÇÒÁãËÁè"
 
-#: templates/index/notconfigured.inc:32
-msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+#: compose.php:494
+msgid "You have already submitted this page."
 msgstr ""
 
-#: templates/index/notconfigured.inc:39
+#: templates/compose/attachments.js:115
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
 msgstr ""
 
-#: templates/index/notconfigured.inc:46
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: lib/IMP.php:1074
+msgid "You have new mail in the following folder:"
+msgstr ""
+
+#: lib/IMP.php:1079
+msgid "You have new mail in the following folders:"
 msgstr ""
 
-#: templates/index/notconfigured.inc:25
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "µéÍ§¡ÓË¹´ãËéÁÕª×èÍ¼ÙéÃÑºÍÂèÒ§¹éÍÂË¹Öè§ª×èÍ"
+
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 
-#: templates/index/notconfigured.inc:18
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
 msgstr ""
 
-#: message.php:377
-msgid "This message has been reported as spam to your system administrator."
-msgstr "¢éÍ¤ÇÒÁ¹Õéä´é¶Ù¡ÃÒÂ§Ò¹ÇèÒà»ç¹¡ÒÃÃº¡Ç¹ä»ÂÑ§¼Ùé´ÙáÅÃÐºº¢Í§¤Ø³áÅéÇ"
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
+#, fuzzy
+msgid "You must select a target mailbox first."
+msgstr "¤Ø³µéÍ§àÅ×Í¡àÍ¡ÅÑ¡É³ì·ÕèµéÍ§¡ÒÃ¨ÐÅºàÊÕÂ¡èÍ¹"
 
-#: message.php:399
-msgid "This message to"
-msgstr "¢éÍ¤ÇÒÁ¹Õéä»ÂÑ§"
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "¤Ø³µéÍ§àÅ×Í¡àÍ¡ÅÑ¡É³ì·ÕèµéÍ§¡ÒÃ¨ÐÅºàÊÕÂ¡èÍ¹"
 
-#: prefs.php:107
-msgid "This number must be at least one."
-msgstr "µÑÇàÅ¢¹ÕéµéÍ§ÁÕ¤èÒÍÂèÒ§¹éÍÂà·èÒ¡ÑºË¹Öè§"
-
-#: prefs.php:105
-msgid "This value must be a number."
-msgstr "¢éÍÁÙÅ¹ÕéµéÍ§ÁÕ¤èÒà»ç¹µÑÇàÅ¢"
-
-#: templates/mailbox/message_headers.inc:23
-#: templates/mailbox/message_headers.inc:28
-msgid "Thread"
-msgstr "à·Ã´"
+#: templates/contacts/contacts.inc:81
+#, fuzzy
+msgid "You must select an address first."
+msgstr "¤Ø³µéÍ§àÅ×Í¡àÍ¡ÅÑ¡É³ì·ÕèµéÍ§¡ÒÃ¨ÐÅºàÊÕÂ¡èÍ¹"
 
-#: config/prefs.php.dist:511
-msgid "Thread View"
-msgstr "ÁØÁÁÍ§à·Ã´"
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
+#, fuzzy
+msgid "You must select at least one message first."
+msgstr "µéÍ§¡ÓË¹´ãËéÁÕª×èÍ¼ÙéÃÑºÍÂèÒ§¹éÍÂË¹Öè§ª×èÍ"
 
-#: config/prefs.php.dist:45
-msgid "Time Zone"
-msgstr "à¢µàÇÅÒ"
-
-#: mailbox.php:701 templates/compose/bounce.inc:28
-#: templates/compose/compose.inc:103 templates/message/headers.inc:12
-#: templates/search/main.inc:38
-msgid "To"
-msgstr "¶Ö§"
+#: templates/compose/redirect.inc:13
+#, fuzzy
+msgid "You must specify a recipient."
+msgstr "µéÍ§¡ÓË¹´ãËéÁÕª×èÍ¼ÙéÃÑºÍÂèÒ§¹éÍÂË¹Öè§ª×èÍ"
 
-#: filters.php:137 templates/filters/manage.inc:13
-msgid "To:"
-msgstr "¶Ö§:"
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "µéÍ§¡ÓË¹´ãËéÁÕª×èÍ¼ÙéÃÑºÍÂèÒ§¹éÍÂË¹Öè§ª×èÍ"
 
-#: templates/compose/compose.inc:456
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "¢¹Ò´â´ÂÃÇÁ: %s ¡ÔâÅäºµì"
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
 
-#: templates/prefs/trashselect.inc:23
-msgid "Trash folder:"
-msgstr "â¿Åà´ÍÃì¶Ñ§¢ÂÐ:"
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§¢éÍ¤ÇÒÁ¹Õé"
 
-#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
-msgid "Unanswered"
-msgstr "äÁèä´éµÍº¡ÅÑº"
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "à»ÅÕèÂ¹àÊé¹·Ò§¢éÍ¤ÇÒÁ¹Õé"
 
-#: templates/search/main.inc:184
-msgid "Unanswered messages"
-msgstr "¢éÍ¤ÇÒÁ·ÕèäÁèä´éµÍº¡ÅÑº"
+#: lib/Folder.php:507
+#, php-format
+msgid "You were not subscribed to \"%s\". Here is what the server said"
+msgstr "¤Ø³ÂÑ§äÁèä´éàÃÕÂ¡ãªé \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: templates/mailbox/actions.inc:13 templates/message/navbar.inc:5
-msgid "Undelete"
-msgstr "¡Ùé¤×¹"
+#: lib/Folder.php:559
+#, php-format
+msgid "You were not unsubscribed from \"%s\". Here is what the server said"
+msgstr "¤Ø³ÂÑ§äÁèä´éàÅÔ¡ãªé \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
 
-#: mailbox.php:699 message.php:69
-msgid "Undisclosed Recipients"
-msgstr "¼ÙéÃÑº·ÕèäÁèà»Ô´à¼Â"
+#: lib/Folder.php:510
+#, php-format
+msgid "You were successfully subscribed to \"%s\""
+msgstr "¤Ø³ä´éàÃÕÂ¡ãªé \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
 
-#: identities.php:71 identities.php:72
-msgid "Unnamed"
-msgstr "äÁèÁÕª×èÍ"
+#: lib/Folder.php:562
+#, php-format
+msgid "You were successfully unsubscribed from \"%s\""
+msgstr "¤Ø³ä´éàÅÔ¡ãªé \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
 
-#: config/conf.php.dist:130
-msgid "Unread"
-msgstr "ÂÑ§äÁèä´éÍèÒ¹"
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "ª×èÍàµçÁ¢Í§¤Ø³"
 
-#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
-msgid "Unseen"
-msgstr "ÂÑ§äÁèä´éà»Ô´"
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-#: templates/folders/actions.inc:32
-msgid "Unseen Messages"
-msgstr "¢éÍ¤ÇÒÁ·ÕèÂÑ§äÁèä´éà»Ô´"
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-#: templates/folders/actions.inc:10
-msgid "Unsubscribe from Folder(s)"
-msgstr "àÅÔ¡ãªéâ¿Åà´ÍÃì"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "ª×èÍàµçÁ¢Í§¤Ø³"
 
-#: templates/prefs/sourceselect.inc:288
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "ãËé¡´»ØèÁ Ctrl ¾ÃéÍÁ¡Ñº¤ÅÔ¡µÑÇàÅ×Í¡ à¾×èÍàÅ×Í¡ËÅÒÂà¢µ¢éÍ¤ÇÒÁ¾ÃéÍÁæ ¡Ñ¹"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "·ÕèÍÂÙè ·ÕèµÔ´µèÍ¡ÅÑº: ¢Í§¤Ø³: <i>(¶éÒµéÍ§¡ÒÃ)</i>"
 
-#: templates/identities/manage.inc:94
-msgid "Use Default Value"
-msgstr "ãªé¤èÒâ´Â»ÃÔÂÒÂ"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
 
-#: config/prefs.php.dist:263
-msgid "Use IMAP folder subscriptions"
-msgstr "ãªé¡ÒÃàÃÕÂ¡ãªéâ¿Åà´ÍÃì¢Í§äÍáÁ¾"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "àÍ¡ÅÑ¡É³ì¢Í§¤Ø³:"
 
-#: prefs.php:286
-msgid "User Options"
-msgstr "µÑÇàÅ×Í¡à¡ÕèÂÇ¡Ñº¼Ùéãªé"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-#: templates/login/login.inc:69
-msgid "Username"
-msgstr "ª×èÍ¼Ùéãªé"
+#: lib/MIME/Viewer/images.php:92
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
 
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
 
-#: lib/IMP.php:936 lib/MIME/Viewer/enriched.php:177
-#: lib/MIME/Viewer/text.php:97
-#, c-format
-msgid "View %s"
-msgstr "áÊ´§ %s"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-#: folders.php:342
-msgid "View messages in "
-msgstr "áÊ´§¢éÍ¤ÇÒÁã¹"
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "â¿Åà´ÍÃì \"%s\" ä´é¶Ù¡ÅºàÃÕÂºÃéÍÂáÅéÇ"
 
-#: templates/prefs/initialpageselect.inc:20
-msgid "View or mailbox to display after login:"
-msgstr "ÁØÁÁÍ§ËÃ×ÍµÙéä»ÃÉ³ÕÂì·ÕèµéÍ§¡ÒÃãËéáÊ´§ËÅÑ§¨Ò¡Å§ª×èÍà¢éÒ:"
+#: config/prefs.php.dist:206
+msgid "Your signature:"
+msgstr "ÅÒÂà«ç¹¢Í§¤Ø³:"
 
-#: status.php:43
-msgid "Warning"
-msgstr "¤Óàµ×Í¹"
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
+msgid "[No Subject]"
+msgstr "[äÁèÁÕª×èÍàÃ×èÍ§]"
 
-#: login.php:157 templates/login/login.inc:63
-#, c-format
-msgid "Welcome to %s"
-msgstr "ÂÔ¹´ÕµéÍ¹ÃÑºÊÙè %s"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "ÊÓà¹Ò«èÍ¹¶Ö§"
 
-#: config/prefs.php.dist:387
-msgid ""
-"When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "ºÑªÕ´Ó"
+
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "ÊÓà¹Ò¶Ö§"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Åº"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "â¿Åà´ÍÃì"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "àÍ¡ÅÑ¡É³ì"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
 msgstr ""
-"àÁ×èÍµéÍ§¡ÒÃÅº¢éÍ¤ÇÒÁ ãËéÂéÒÂ¢éÍ¤ÇÒÁ¹Ñé¹æ ä»ÂÑ§â¿Åà´ÍÃì¶Ñ§¢ÂÐ "
-"á·¹¡ÒÃ¡ÓË¹´ãËéà»ç¹¢éÍ¤ÇÒÁ·Õè¶Ù¡Åº"
 
-#: config/prefs.php.dist:611
-msgid "Wrap text at this many characters."
-msgstr "¨Ó¹Ç¹µÑÇÍÑ¡ÉÃ·ÕèµéÍ§¡ÒÃãËéáÊ´§¼Åã¹Ë¹Öè§ºÃÃ·Ñ´"
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Å§ºÑ¹·Ö¡ÍÍ¡"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "µé¹©ºÑº¢éÍ¤ÇÒÁ"
 
-#: config/prefs.php.dist:551
-msgid "Yes"
-msgstr "ãªè"
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "¢éÍ¤ÇÒÁãËÁè"
 
-#: login.php:21
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "¤Ø³ä´éÅ§ª×èÍÍÍ¡àÃÕÂºÃéÍÂáÅéÇ <br />¢Íº¤Ø³·ÕèãªéºÃÔ¡ÒÃ"
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "¾ÔÁ¾ì"
 
-#: compose.php:721
-msgid "You must have at least one recipient."
-msgstr "µéÍ§¡ÓË¹´ãËéÁÕª×èÍ¼ÙéÃÑºÍÂèÒ§¹éÍÂË¹Öè§ª×èÍ"
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
 
-#: identities.php:123
-msgid "You must select an identity to be deleted."
-msgstr "¤Ø³µéÍ§àÅ×Í¡àÍ¡ÅÑ¡É³ì·ÕèµéÍ§¡ÒÃ¨ÐÅºàÊÕÂ¡èÍ¹"
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "ÃÕà¿Ãª"
 
-#: lib/Folder.php:395
-#, c-format
-msgid "You were not subscribed to \"%s\". Here is what the server said"
-msgstr "¤Ø³ÂÑ§äÁèä´éàÃÕÂ¡ãªé \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "µÍº¡ÅÑº"
 
-#: lib/Folder.php:429
-#, c-format
-msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr "¤Ø³ÂÑ§äÁèä´éàÅÔ¡ãªé \"%s\" à¤Ã×èÍ§ºÃÔ¡ÒÃÃÒÂ§Ò¹ÇèÒ"
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "¤é¹ËÒ"
 
-#: lib/Folder.php:399
-#, c-format
-msgid "You were successfully subscribed to \"%s\""
-msgstr "¤Ø³ä´éàÃÕÂ¡ãªé \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "¢éÍ¤ÇÒÁµèÍä»"
 
-#: lib/Folder.php:433
-#, c-format
-msgid "You were successfully unsubscribed from \"%s\""
-msgstr "¤Ø³ä´éàÅÔ¡ãªé \"%s\" àÃÕÂºÃéÍÂáÅéÇ"
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "à·Ã´"
 
-#: login.php:20
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "ªèÇ§àÇÅÒÊ×èÍÊÒÃ %s ¢Í§¤Ø³ä´éËÁ´àÇÅÒÅ§áÅéÇ ¡ÃØ³ÒÅ§ª×èÍà¢éÒãËÁè"
-
-#: templates/identities/manage.inc:59
-msgid "Your From: address:"
-msgstr "·ÕèÍÂÙè ¼ÙéÊè§: ¢Í§¤Ø³:"
-
-#: config/prefs.php.dist:23 config/prefs.php.dist:30 config/prefs.php.dist:37
-#: config/prefs.php.dist:44
-msgid "Your Information"
-msgstr "¢éÍÁÙÅ¢Í§¤Ø³"
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "¶Ö§"
 
-#: templates/identities/manage.inc:64
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "·ÕèÍÂÙè ·ÕèµÔ´µèÍ¡ÅÑº: ¢Í§¤Ø³: <i>(¶éÒµéÍ§¡ÒÃ)</i>"
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "¡Ùé¤×¹"
 
-#: config/prefs.php.dist:295
-msgid "Your current time zone:"
-msgstr "à¢µàÇÅÒ¢Í§¤Ø³"
-
-#: templates/prefs/identityselect.inc:14
-msgid "Your default identity:"
-msgstr "àÍ¡ÅÑ¡É³ìâ´Â»ÃÔÂÒÂ¢Í§¤Ø³"
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "à·Ã´"
 
-#: templates/identities/manage.inc:54
-msgid "Your full name:"
-msgstr "ª×èÍàµçÁ¢Í§¤Ø³"
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
 
-#: templates/identities/manage.inc:10
-msgid "Your identities:"
-msgstr "àÍ¡ÅÑ¡É³ì¢Í§¤Ø³:"
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
 
-#: prefs.php:254
-msgid "Your options have been updated."
-msgstr "µÑÇàÅ×Í¡¢Í§¤Ø³ä´éÃÑº¡ÒÃ»ÃÑº»ÃØ§áÅéÇ"
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "àÍ¡ÊÒÃá¹º"
 
-#: templates/identities/manage.inc:69
-msgid "Your signature:"
-msgstr "ÅÒÂà«ç¹¢Í§¤Ø³:"
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "àÍ¡ÊÒÃá¹º"
 
-#: mailbox.php:330 mailbox.php:332 mailbox.php:343 message.php:450
-msgid "[No Subject]"
-msgstr "[äÁèÁÕª×èÍàÃ×èÍ§]"
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:269
-msgid "add source"
-msgstr "à¾ÔèÁáËÅè§"
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
 
-#: filters.php:118
-msgid "cannot move past the beginning"
-msgstr "äÁèÊÒÁÒÃ¶à¤Å×èÍ¹ÂéÒÂ¼èÒ¹¨Ø´àÃÔèÁµé¹"
-
-#: filters.php:101
-msgid "cannot move past the end"
-msgstr "äÁèÊÒÁÒÃ¶à¤Å×èÍ¹ÂéÒÂ¼èÒ¹¨Ø´ÊÔé¹ÊØ´"
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
 
-#: templates/filters/manage.inc:56
-msgid "delete message"
-msgstr "Åº¢éÍ¤ÇÒÁ"
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
 
-#: templates/contacts/contacts.inc:21
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "¨Ò¡"
 
-#: templates/prefs/sourceselect.inc:282
-msgid "move down"
-msgstr "ÂéÒÂÅ§"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-#: templates/filters/manage.inc:58
-msgid "move message to"
-msgstr "ÂéÒÂ¢éÍ¤ÇÒÁä»"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:280
-msgid "move up"
-msgstr "ÂéÒÂ¢Öé¹"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-#: filters.php:43 filters.php:66
-msgid "no folder selected"
-msgstr "äÁèä´éàÅ×Í¡â¿Åà´ÍÃìäÇé"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
+
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "µÙéä»ÃÉ³ÕÂì"
 
-#: filters.php:77 filters.php:88 filters.php:105 filters.php:122
-msgid "no rule selected"
-msgstr "äÁèÁÕ¡¯ã´¶Ù¡àÅ×Í¡äÇé"
-
-#: filters.php:73
-msgid "no text specified"
-msgstr "äÁèä´éÃÐºØ¢éÍ¤ÇÒÁäÇé"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "ª×èÍ"
 
-#: templates/compose/spelling.inc:64 templates/filters/list.inc:25
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "äÁèÁÕ"
 
-#: filters.php:149 templates/compose/spelling.inc:94
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ËÃ×Í"
 
-#: filters.php:51
-msgid "please fill in the text and choose a field and an action"
-msgstr "¡ÃØ³ÒàµÔÁ¢éÍ¤ÇÒÁ,àÅ×Í¡à¢µ¢éÍÁÙÅáÅÐàÅ×Í¡¡ÒÃ¡ÃÐ·Ó"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:271
-msgid "remove source"
-msgstr "¹ÓáËÅè§¢éÍÁÙÅÍÍ¡"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-#: filters.php:156
-msgid "select folder"
-msgstr "àÅ×Í¡â¿Åà´ÍÃì"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ÊÐ¡´¤Ó¼Ô´"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ÊÐ¡´¤Ó¼Ô´"
 
-#: templates/filters/list.inc:42
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "àÁ×èÍà¢µ¢éÍ¤ÇÒÁ %s ÁÕ¤ÓÇèÒ <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "ÊÐ¡´¤Ó¼Ô´"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "ºÑªÕ´Ó"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/po/zh_TW.po
+++ mod/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-09-30 17:01+0800\n"
+"POT-Creation-Date: 2006-01-05 15:04+0800\n"
 "PO-Revision-Date: 2003-01-08 10:53+0100\n"
 "Last-Translator: David Chang<david at tmv.gov.tw>\n"
 "Language-Team: Traditional Chinese <i18n at lists.horde.org>\n"
@@ -14,166 +14,164 @@
 "Content-Type: text/plain; charset=BIG5\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "   °Æ¥»: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "   ¦¬¥ó¤H: "
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "   ¤é´Á: "
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "  ±H¥ó¤H: "
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:405 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (§Ö±¶Áä %s)"
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr " ¥D¦®: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
-msgstr " ¦b"
+msgstr " ©óì¤å "
 
 #: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "½s¸¹"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:196
+#: thread.php:150
+#, php-format
+msgid "%d Messages"
+msgstr "%d ¶l¥ó"
+
+#: mailbox.php:174
+#, php-format
 msgid "%d messages have been deleted."
 msgstr "%d «Ê¶l¥ó¤w³Q§R°£."
 
-#: lib/Spam.php:178
+#: lib/Spam.php:195
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "%d «Ê¶l¥ó¤w³Q·í¦¨¼s§i¶l¥ó¨Ã¦V§Aªº¦øªA¾¹ºÞ²zû¦^³ø."
 
-#: lib/Spam.php:158
+#: lib/Spam.php:175
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d «Ê¶l¥ó¤w³Q¦^³ø¤£¬O¼s§i¶l¥ó."
 
-#: lib/Spam.php:170
+#: lib/Spam.php:187
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "³o %d «Ê¶l¥ó¤w³Q·í¦¨©U§£¶l¥ó¨Ã¦V§Aªº¦øªA¾¹ºÞ²zûÁ|µo."
 
-#: lib/Spam.php:150
+#: lib/Spam.php:167
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d «Ê¶l¥ó¤w³Q¦^³ø¬O¼s§i¶l¥ó."
 
-#: mailbox.php:369
+#: mailbox.php:355
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "±q %d ¨ì %d ¦@ %d «Ê"
 
-#: mailbox.php:619
+#: mailbox.php:628
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP ºÞ²z"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME ºÞ²z"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ¤w¦s¦b. §Aªº %s «H¥ó§X¨Ã¥¼³Q§ó¦W."
 
-#: lib/Message.php:612
+#: lib/Message.php:656
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s ¦ü¥G¤£¬O¤@Ó¦Xªkªº¶l½c."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s «H¥ó§X±N©ó¤ëªì®É³Q§ó¦W."
 
-#: lib/MIME/Viewer/itip.php:252
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s ¤w±µ¨ü."
 
-#: lib/MIME/Viewer/itip.php:621
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s ¤w¨ú®ø %s."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s ¤w¨ú®ø \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:258
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s ¤w°û©Ú."
 
-#: lib/MIME/Viewer/itip.php:489
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s ¤w¦^ÂÐ¤@Ó free/busy ¸ê°T½Ð¨D."
 
-#: lib/MIME/Viewer/itip.php:612
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s ¤w¦^ÂÐÁÜ½Ðµ¹ %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s ¤w¦^ÂÐÁÜ½Ðµ¹ \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:478
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s ¤w±N·|Ä³¸ê°T¶Ç°eµ¹§A."
 
-#: lib/MIME/Viewer/itip.php:264
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s ¤w¼È®É±µ¨ü."
 
-#: lib/MIME/Viewer/itip.php:483
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s ¼x¸ß§Aªº·|Ä³¸ê°T."
 
 #: lib/MIME/Viewer/itip.php:580
-#, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s ÁÜ½Ð§A¥X®u %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s ÁÜ½Ð§A¥X®u \"%s\"."
 
-#: lib/Message.php:377
+#: lib/Message.php:424
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s ¤w¦¨¥\ªº·s¼W¦Ü %s."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s ¤w¦¨¥\ªº·s¼W¦Ü \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:593
+#: lib/MIME/Viewer/itip.php:592
 #, fuzzy, php-format
-msgid "%s wishes to ammend %s."
-msgstr "'%s'¨Ã¥¼§ó¦W: %s."
-
-#: lib/MIME/Viewer/itip.php:570
-#, php-format
-msgid "%s wishes to make you aware of %s."
+msgid "%s wishes to ammend \"%s\"."
 msgstr "%s §Æ±æ´£¿ô§Aª`·N %s."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:571
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s §Æ±æ´£¿ô§Aª`·N \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s §Æ±æÅª¨úÃö©ó %s ªº³Ì·s¸ê°T."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s §Æ±æÅª¨úÃö©ó \"%s\" ªº³Ì·s¸ê°T."
 
-#: message.php:269 message.php:274
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -183,74 +181,82 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;of&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(À³¥Î³o¨Ç§ïÅÜ¨Ã²¾°Ê¨ì¤U¤@Óµe±.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "©ñ±ó©Ò¦³§ó§ï¨Ã¦^¨ì¼g¶l¥ó"
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(ºô¶)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(¯Â¤å¦r)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr "(½T©w§ó§ï¨Ã¦^¨ì¶l¥ó¼g§@, §ó§ï¤£·|¦b³oµe±¥Í®Ä.)"
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
 msgstr "(½T©w§ó§ï¨Ã¦^¨ì¶l¥ó¼g§@, §ó§ï¤£·|¦b³oµe±¥Í®Ä.)"
 
-#: templates/contacts/contacts.inc:222
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* «ö½T»{§¹¦¨·s¼W *"
 
-#: templates/contacts/contacts.inc:201
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* ½Ð¿ï¾Ü¦a§}(CTRL ¦h«¡ASHIFT ½d³ò) *"
 
-#: mailbox.php:194
+#: mailbox.php:172
 msgid "1 message has been deleted."
 msgstr "1 «Ê¶l¥ó¤w³Q§R°£."
 
-#: lib/Spam.php:180
+#: lib/Spam.php:197
 msgid "1 message has been reported as not spam to your system administrator."
-msgstr "¤@«Ê¶l¥ó¤w³Q·í¦¨¼s§i¶l¥ó¨Ã¦V§Aªº¦øªA¾¹ºÞ²zû¦^³ø."
+msgstr "1 «Ê¶l¥ó¤w¦V§Aªº¦øªA¾¹ºÞ²zû¦^³ø¤£¬O¼s§i¶l¥ó."
 
-#: lib/Spam.php:160
+#: lib/Spam.php:177
 msgid "1 message has been reported as not spam."
-msgstr "¤@«Ê¶l¥ó¤w³Q¦^³ø¤£¬O¼s§i¶l¥ó."
+msgstr "1 «Ê¶l¥ó¤w¦^³ø¤£¬O¼s§i¶l¥ó."
 
-#: lib/Spam.php:172
+#: lib/Spam.php:189
 msgid "1 message has been reported as spam to your system administrator."
-msgstr "¤@«Ê¶l¥ó¤w³Q·í¦¨©U§£¶l¥ó¨Ã¦V§Aªº¦øªA¾¹ºÞ²zûÁ|µo."
+msgstr "1 «Ê¶l¥ó¤w¦V§Aªº¦øªA¾¹ºÞ²zû¦^³ø¬°¼s§i¶l¥ó."
 
-#: lib/Spam.php:152
+#: lib/Spam.php:169
 msgid "1 message has been reported as spam."
-msgstr "¤@«Ê¶l¥ó¤w³Q¦^³ø¬O¼s§i¶l¥ó."
+msgstr "1 «Ê¶l¥ó¤w¦^³ø¬°¼s§i¶l¥ó."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:807
 msgid "100 characters"
 msgstr "100 Ó¦r¤¸"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:810
 msgid "1000 characters"
 msgstr "1000 Ó¦r¤¸"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:808
 msgid "250 characters"
 msgstr "250 Ó¦r¤¸"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:809
 msgid "500 characters"
 msgstr "500 Ó¦r¤¸"
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
-msgstr "¤@Ó¤j¤Ø¤oªº¼v¹³ÀÉ %s ¤wªþ¥[¨ì¦¹¶l¥ó¤¤."
+msgstr "¤@Ó¤j¤Ø¤oªº¹Ï¤ùÀÉ %s ¤wªþ¥[¨ì¦¹¶l¥ó¤¤."
 
 #: lib/MIME/Viewer/notification.php:50
 msgid ""
@@ -262,19 +268,19 @@
 msgid "AND"
 msgstr "¤Î"
 
-#: lib/MIME/Viewer/itip.php:586
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "±µ¨ü¨Ã¥[¤J¨ì§Úªº¦æ¨Æ¾ä¤¤"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "±µ¨ü½Ð¨D"
 
-#: lib/MIME/Viewer/itip.php:583
-msgid "Accept request and add it to my calendar"
-msgstr "±µ¨ü½Ð¨D¨Ã¥[¤J¨ì§Úªº¦æ¨Æ¾ä¤¤"
-
-#: lib/MIME/Viewer/itip.php:749
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "¤w±µ¨ü"
 
-#: lib/MIME/Viewer/itip.php:253
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "¤w±µ¨ü: "
 
@@ -282,34 +288,38 @@
 msgid "Account's name:"
 msgstr "¬°§Aªº¥~³¡¶l¥ó¨úÓÃÑ§O¦WºÙ:"
 
-#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:726
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "§@¥Î¤è¦¡"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "·s¼W %s ¨ì§Úªº³q°T¿ý"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "·s¼W³q°T¿ý"
 
-#: lib/MIME/Viewer/itip.php:573 lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "¥[¤J¨ì§Úªº¦æ¨Æ¾ä¤¤"
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "¼W¥[¨ì³q°T¿ý (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "¥[¤J¨ì§Úªº¦æ¨Æ¾ä¤¤"
 
-#: compose.php:1191
+#: compose.php:588
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr " ¤w·s¼W \"%s\" ¬°ªþ¥ó."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"¦b¶l¥ó¶}±Òªº¦P®ÉÅã¥ÜÃB¥~ªºªíÀY: <i>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H¤@¦æ¤@µ§¿é¤J)</i>"
+"¦b¶l¥ó¶}±Òªº¦P®ÉÅã¥ÜÃB¥~ªºªíÀY: <em>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H¤@¦æ¤@µ§¿é¤J)</em>"
 
 #: lib/MIME/Viewer/notification.php:62
 #, php-format
@@ -338,42 +348,42 @@
 msgid "Additional message error details can be viewed %s."
 msgstr "¨ä¥Lªº¶l¥ó¿ù»~²Ó¸`½Ð«ö %s ÀËµø."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "³q°T¿ý"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "³q°T¿ý"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"½s¼g«H¥ó®É,¹w³]¤U¦C¶l¥ó¦a§}¬°¯µ¥ó°Æ¥»¦¬¥ó¹ï¶H: <i>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H¤@¦æ¤@"
-"µ§¿é¤J)</i>"
+"½s¼g«H¥ó®É,¹w³]¤U¦C¶l¥ó¦a§}¬°¯µ¥ó°Æ¥»¦¬¥ó¹ï¶H: <em>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H¤@¦æ¤@"
+"µ§¿é¤J)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "¦pªG¦¬¥ó¤¤ªº¦¬¥ó¹ï¶H¥]§t¤U¦C¦a§}¡A«h¦^ÂÐ¡BÂà±H¸Ó«H¥ó®É¥H³oÓ¨¥÷ÃÑ§O¨Ó³B²z: "
-"<i>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H¤@¦æ¤@µ§¿é¤J)</i>"
+"<em>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H¤@¦æ¤@µ§¿é¤J)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:811
 msgid "All"
 msgstr "©Ò¦³"
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "¤U¦C«H¥ó§X¤¤ªº©Ò¦³¶l¥ó±N³Q¤U¸ü¦¨¤@Ó mbox «¬ºAªºÀÉ®×"
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -390,11 +400,16 @@
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "©Ò¦³ %s Ó¤ë¥H¤WªºÂÂ±H¥ó³Æ¥÷§X±N³Q§R°£."
 
-#: acl.php:85
+#: acl.php:84
+#, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "«H¥ó§X \"%s\" ¤¤©Ò¦³Ãö©ó¨Ï¥ÎªÌ \"%s\" ªºÅv¤w¦¨¥\ªº²¾°£"
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "¤¹³\«Ø¥ß«H¥ó§X?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "¤¹³\¹LÂo³W«h®M¥Î¦Ü¥ô¤@Ó«H¥ó§X ?"
 
@@ -402,25 +417,29 @@
 msgid "Alternative parts for this section:"
 msgstr "¦¹¶l¥óªº¨ä¥L®æ¦¡:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "¥Ã»·"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "¥Ã»·Àx¦sªþ¥[ÀÉ®×"
 
-#: lib/Message.php:468
+#: lib/Message.php:515
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr "¹Á¸Õ¦Û¶l¥ó¥h°£ªþ¥ó®Éµo¥Í¤@Ó¿ù»~. IMAP ¶l¥ó¦øªA¾¹¦^À³:"
 
-#: lib/Message.php:364
+#: lib/Message.php:398
+msgid "An unknown error occured while creating the new note."
+msgstr "«Ø¥ß·sºKn®Éµo¥Í¥¼ª¾ªº¿ù»~."
+
+#: lib/Message.php:397
 msgid "An unknown error occured while creating the new task."
 msgstr "«Ø¥ß·s¨Æ¶µ®Éµo¥Í¥¼ª¾ªº¿ù»~."
 
-#: message.php:484 mailbox.php:693 templates/message/navbar_navigate.inc:9
+#: message.php:496 mailbox.php:701 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -439,19 +458,23 @@
 msgid "Apply Filters to %s"
 msgstr "®M¥Î¶l¥ó¹LÂo¨ì %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "·íµn¤Jºô¸ô¶l§½«á,¦Û°Ê®M¥Î¹LÂo³W«h?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "¨C·í¦¬¥ó§X³QÅª¨ú®É¡A®M¥Î¹LÂo³W«h?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "§A½T©wn§R°£³oÓµêÀÀ«H¥ó§Xªº©w¸q¶Ü?"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "§A½T©wn§R°£³oÓ¤½¶}ª÷Æ_¶Ü?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "§A½T©wn§R°£§Aªºª÷Æ_¹ï¶Ü? (¤£«ØÄ³°õ¦æ!)"
@@ -460,11 +483,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "§A½T©wÄ~Äò¶Ü?"
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:401 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "§A½T»{n¥Ã¤[¦a§R°£³o¨Ç¶l¥ó¶Ü¡H"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:222
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "§A½T»{n¥Ã¤[¦a§R°£³oÓªþ¥ó¶Ü¡H"
 
@@ -472,7 +495,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "§A½T»{n²M°£¦¹«H¥ó§X¤¤ªº©Ò¦³¶l¥ó¶Ü¡H"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:956
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "§A½T»{n²M°£¦¹¼s§i½c¤¤ªº©Ò¦³¶l¥ó¶Ü¡H"
+
+#: lib/IMP.php:949
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "§A½T»{n²M°£¦¹©U§£½c¤¤ªº©Ò¦³¶l¥ó¶Ü¡H"
 
@@ -480,64 +507,64 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "§A½T»{n¥Ã¤[¦a§R°£³o¨Ç¶l¥ó¶Ü?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "§A½T»{³o«Ê«H¥ó¨Ã«D¼s§i¶l¥ó¨Ã¥BÁÙ¥H²M¥Õ ?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "§A½T»{n¦^³ø³o¬O¼s§i¶l¥ó ?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:904
 msgid "Arrival Time"
 msgstr "¨ì¹F®É¶¡"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:919
 msgid "Ascending"
 msgstr "¥Ñ¥ý¦Ü«á"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "¸ß°Ý"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "ªþ¥["
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:469
 msgid "Attach Files"
 msgstr "ªþ¥[ÀÉ®×"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:450
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "¦b¶l¥ó¤¤ªþ¤W§Aªº PGP ¤½¶}ª÷Æ_?"
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "ªþ¥[ÀÉ®×:"
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr "ªþ¥ó \"%s\" ¤j¤p¤w¶W¥X¤¹³\¤W.§AªºÀÉ®×¨S¦³³Qªþ¥[."
 
-#: lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "¤wªþ¤W§A©Òn¨D¶Ç°eªº iCalendar ÀÉ®×"
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:497 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "ªþ¥ó"
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "ªþ¥ó%s¤w§R°£."
+
+#: compose.php:1097 lib/Message.php:476
 msgid "Attachment stripped: Original attachment type"
 msgstr "ªþ¥ó¤w¥h°£: ì©lªþ¥ó«¬ºA"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:467
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "ªþ¥ó"
 
@@ -553,7 +580,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: §ä¤£¨ì©Ò»Ýnªº IMAP ©µ¦ù®M¥ó."
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -563,7 +590,7 @@
 msgid "Available Address books:"
 msgstr "¥i¥Îªº³q°T¿ý:"
 
-#: lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "µ¥«Ý¦^À³¤¤"
 
@@ -572,13 +599,26 @@
 msgid "Bac_k to %s"
 msgstr "¦^¨ì_k%s"
 
-#: thread.php:86 templates/message/navbar_navigate.inc:26
+#: thread.php:136 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "¦^¨ì %s"
 
-#: message.php:250 search.php:147 templates/contacts/contacts.inc:217
-#: templates/compose/recompose.inc:20
+#: thread.php:133
+msgid "Back to Multiple Message View Index"
+msgstr "¦^¨ìÀËµø¯Á¤Þ"
+
+#: thread.php:131
+msgid "Back to Thread Display"
+msgstr "¦^¨ìÃöÁpÅã¥Ü"
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "¿ù»~ªº½Ð¨D. ¦øªA¾¹¦^À³: %s"
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "¯µ¥ó°Æ¥»"
 
@@ -586,15 +626,15 @@
 msgid "Below is the raw text of the status information message."
 msgstr "¥H¤U¬Oª¬ºA°T®§¶l¥óªºì©l¸ê®Æ."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "¶Â¦W³æ"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "ÁôÂÃ HTML ¶l¥ó¤¤ªº¹Ï¤ù,°£«D¦b¶l¥ó¤¤¯S§O«ü©ú?"
 
-#: search.php:155
+#: lib/Search.php:42
 msgid "Body"
 msgstr "¥»¤å"
 
@@ -603,11 +643,11 @@
 msgid "Both"
 msgstr "¥þ³¡"
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:675
 msgid "Both Header Listing and Body of Message"
 msgstr "ªíÀY¦Cªí¥H¤Î¶l¥ó¥DÅé"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "½s½X_h"
 
@@ -630,15 +670,16 @@
 "mailbox."
 msgstr "µLªkÅã¥Ü - ¦b¥Ø«eªº«H¥ó§X¤¤¥u§ä¨ì %2$s Ó¤¤ªº %1$s Óªþ¥ó."
 
-#: folders.php:273 templates/contacts/contacts.inc:250
-#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
-#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
-#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
+#: folders.php:263 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:429
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "¨ú®ø¶l¥ó"
 
@@ -646,28 +687,34 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "¨ú®ø½s¼g·s¶l¥ó±N·|¿ò¥¢«H¥ó¤¤ªº©Ò¦³¤º®e."
 
-#: message.php:249 search.php:143 templates/contacts/contacts.inc:216
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "°Æ¥»"
 
-#: lib/MIME/Viewer/itip.php:697
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr "¾ÌÃÒ¶×¤JµL®Ä. ¦øªA¾¹¥¼±Ò¥ÎÀÉ®×¤W¶Ç¥\¯à."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "¥D®u"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "§ó§ï"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "¥þ³¡ÅÜ§ó"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "ÅÜ§ó«H¥ó§X"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -683,23 +730,23 @@
 "reply to your email."
 msgstr "§ó§ï»Õ¤Uªº¥þ¦W,¦^¶l¦a§},±H¥ó³Æ¥÷©MÃ±¦W."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:812
 msgid "Characters to display:"
 msgstr "Åã¥Üªº¦r¤¸¼Æ:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ÀË¬d·s¶l¥ó"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
-msgstr "ÀË¬d ¥þ³¡/µL_A"
+msgstr "¿ï¨ú ¥þ³¡/µL_A"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "¤Ä¿ï§A·QnÅª¨úªº¥~³¡¶l¥ó±b¸¹:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "¦b¶Ç°e¶l¥ó¤§«e,¥ý°õ¦æ«÷¦rÀË¬d?"
 
@@ -707,19 +754,15 @@
 msgid "Choose Action:"
 msgstr "¿ï¾Ü§@¥Î¤è¦¡:"
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:179
 msgid "Choose a mail server:"
 msgstr "½Ð¿ï¾Ü¶l¥ó¦øªA¾¹:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
 msgid "Choose a match or edit the address to the right:"
 msgstr "½Ð¤U©Ô¿ï¾Ü©Î½s¿è¥kÃäªº¸ê®Æ¥HÁr´ú:"
 
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:727
-msgid "Choose an action:"
-msgstr "¿ï¾Ü¤@Ó§@¥Î¤è¦¡:"
-
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "¿ï¾Ü¹w³]ªº³q°T¿ý¡A¥H§Q·s¼W¦a§}."
@@ -728,46 +771,42 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "¿ï¾Ü³q°T¿ý·j´M¶¶§Ç,¥H«K©m¦WÁr´ú."
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
-msgstr "ÂI¿ï %s ¥HÂà´«¼v¹³ÀÉ¨ìÂsÄý¾¹¤W±."
+msgstr "ÂI¿ï %s Âà´«¹Ï¤ùÀÉ¨ìÂsÄý¾¹¤W±."
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "ÂI¿ï %s ¤U¸ü¹Ï¤ù."
 
-#: lib/Filter.php:107
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "ÂI¿ï %s ¶i¤J %s ºÞ²z¶±."
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "ÂI¿ï %s ¦b·sµøµ¡¤¤ÀËµø HTML ¤º®e."
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr "ÂI¿ï %s ÀËµø¦¹¼v¹³ªºÁY¹Ï."
+msgstr "ÂI¿ï %s ÀËµø¦¹¹Ï¤ùªºÁY¹Ï."
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "ÂI¿ï %s ¦b·sµøµ¡¤¤ÀËµøªþ¥ó."
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
-msgstr "ÂI¿ï%s¦b·sµøµ¡¤¤ÀËµømultipart/relatedªþ¥ó."
-
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "ÂI¿ï¦¹³BÁôÂÃ¹Ï¤ù"
+msgstr "ÂI¿ï %s ¦b·sµøµ¡¤¤ÀËµømultipart/relatedªþ¥ó."
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "ÂI¿ï¦¹³BÅã¥Ü¹Ï¤ù"
 
@@ -777,48 +816,48 @@
 "search."
 msgstr "¬°¨C¤@¥»¿ï¾Üªº³q°T¿ý³]©wÁr´úªºÄæ¦ì."
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
-msgstr "ÂI¿ï³o¸ÌÀx¦s¦¹¤Hªº PGP ¤½¶}ª÷Æ_¨ì³q°T¿ý¤¤"
+msgstr "ÂI¿ï³o¸ÌÀx¦s PGP ¤½¶}ª÷Æ_¨ì§Aªº³q°T¿ý¤¤"
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
-msgstr "ÂI¿ï³o¸ÌÀx¦s%sªº S/MIME ¾ÌÃÒ¨ì³q°T¿ý¤¤"
+msgstr "ÂI¿ï³o¸ÌÀx¦s %s ªº S/MIME ¾ÌÃÒ¨ì§Aªº³q°T¿ý¤¤"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:938
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "½s¼g·s¶l¥óµ¹³oÓ±H¥ó¤H"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will open the message to be read"
 msgstr "¶}±Ò¸Ó«Ê¶l¥ó"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Ãö³¬"
 
-#: compose.php:775 compose.php:1082
+#: compose.php:417
 msgid "Close this window"
 msgstr "Ãö³¬¦¹µøµ¡"
 
-#: folders.php:416
+#: folders.php:408
 msgid "Closed Folder"
 msgstr "«H¥ó§X¤wÃö³¬"
 
-#: folders.php:436
+#: folders.php:428
 msgid "Collapse"
 msgstr "§éÅ|"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "§éÅ|"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "§éÅ|©Ò¦³«H¥ó§X"
 
-#: folders.php:436
+#: folders.php:428
 msgid "Collapse Folder"
 msgstr "§éÅ|«H¥ó§X"
 
@@ -826,32 +865,23 @@
 msgid "Color Indicator: "
 msgstr "ÃC¦â¼Ð°O"
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "µù¸Ñ"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "¤w§¹¦¨"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "¼g«H"
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "¼g«Hµ¹(%s)"
-
-#: compose.php:774 compose.php:1081
+#: compose.php:416
 msgid "Compose another message"
 msgstr "Ä~Äò¼g¨ä¥Lªº«H"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "½s¼g¶l¥ó©ó·sµøµ¡¤¤?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -861,31 +891,39 @@
 msgid "Configure how messages are displayed."
 msgstr "³]©w¦p¦óÅã¥Ü¶l¥ó."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "¶l¥ó¹wÄý³]©w."
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "³sµ²³Q IMAP ¦øªA¾¹²×¤î."
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "³sµ²¦Ü¦øªA¾¹¥¢±Ñ"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "±±¨î %s ªº PGP ¤ä´©."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "±±¨î %s ªº S/MIME ¤ä´©."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "¶l¥ó·j´Mªº¬ÛÃö±±¨î¿ï¶µ."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "·í·s¶l¥ó¨ì¹F®É, ¬O§_³qª¾»Õ¤U."
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:684
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Âà´«ªí±¡¤å¦r¬°¹Ï®× ?"
 
@@ -897,25 +935,30 @@
 msgid "Copy to folder"
 msgstr "½Æ»s¨ì«H¥ó§X"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "§ó¥¿"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "ì¤å¤w§ó¥¿"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "µLªk§¹¦¨½Ð¨D. ì¦]: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "µLªk«Ø¥ßµêÀÀÀÉ®×¨t²Î(VFS)ªº¦øªAºÝ: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:647
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "µLªk¦Û %s §R°£¶l¥ó.¦øªA¾¹¦^À³: %s"
 
-#: lib/Session.php:293
+#: lib/Session.php:322
 msgid "Could not execute maintenance operations."
 msgstr "µLªk°õ¦æºûÅ@¾Þ§@"
 
@@ -927,16 +970,25 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "µLªk¦Û Zip Ãþ«¬ªº§¨±aÀÉ®×¸ÑÀ£ÁY."
 
-#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "µLªk¶}±Ò¨ì IMAP ¦øªA¾¹ªº¦w¥þ³sµ². %s : %s."
+
+#: lib/Session.php:272
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "µLªk¦Û IMAP ¦øªA¾¹Åª¨ú©R¦WªÅ¶¡(namespace)¸ê°T."
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "«Ø¥ß"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "«Ø¥ß"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "«Ø¥ßª÷Æ_"
 
@@ -956,7 +1008,7 @@
 msgid "Create a new drafts folder"
 msgstr "«Ø¥ß¤@Ó·sªº¯ó½Z½c"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "«Ø¥ß¤@Ó·sªº±H¥ó½c"
 
@@ -964,18 +1016,26 @@
 msgid "Create a new trash folder"
 msgstr "«Ø¥ß¤@Ó·sªº©U§£½c"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr "«Ø¥ß¹LÂo³W«h¥H°t¸m©Ò¦³¨Ó«H, ±Æ¦C«H¥ó§X¤¤ªº«H¥ó, ¥H¤Î§R°£¼s§i¶l¥ó."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "«Ø¥ß·sªº«Hºà"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "«Ø¥ß«Hºà»PµªÂÐ."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "%s ¥Ø«e©Ò½á¤©ªºÅv"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "³]©w¥~³¡¶l¥óªº±b¸¹,Åª¨ú¥~³¡¶l¥ó."
 
@@ -992,80 +1052,97 @@
 msgid "Dat_e"
 msgstr "¤é´Á_e"
 
-#: message.php:246 thread.php:92
+#: message.php:262 thread.php:147
 msgid "Date"
 msgstr "¤é´Á"
 
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
-msgstr "¤wÁÂµ´"
+msgstr "ÁÂµ´"
 
-#: lib/MIME/Viewer/itip.php:259
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
-msgstr "¤wÁÂµ´: "
+msgstr "ÁÂµ´: "
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "¹w³]"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr "¹w³]·j´MÄæ¦ì"
+
+#: config/prefs.php.dist:911
 msgid "Default sorting criteria:"
 msgstr "¹w³]ªº±Æ¦C³W«h:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:921
 msgid "Default sorting direction:"
 msgstr "¹w³]ªº±Æ¦C¶¶§Ç:"
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "¤w©e°U"
 
-#: folders.php:407 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:239 templates/message/navbar_actions.inc:6
+#: folders.php:398 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "§R°£"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "§R°£ %s ¤½¶}ª÷Æ_"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "§R°£¥Ø«eªºª÷Æ_"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "§R°£"
 
-#: folders.php:274
+#: folders.php:264
 msgid "Delete Selected Folders"
 msgstr "§R°£©Ò¿ïªº«H¥ó¹h"
 
-#: folders.php:407
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "§R°£«Hºà"
+
+#: folders.php:398
 msgid "Delete Virtual Folder"
 msgstr "§R°£µêÀÀ«H¥ó¹h"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "§R°£µêÀÀ«H¥ó§X %s ªº©w¸q"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Åª¨ú«á,¦Û¦øªA¾¹§R°£¶l¥ó"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "±q§Úªº¦æ¨Æ¾ä¤¤§R°£"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "©ó¨C¤ëªì,§R°£¤wÂà¦s¬°ºô§}ªºÂÂªþ¥ó ?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "©ó¨C¤ëªì,§R°£ÂÂªº±H¥ó³Æ¥÷§X ?"
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "¶l¥ó³Q¦^³ø¬°¼s§i¶l¥ó«á¤@¨Ö§R°£?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "§R°£¼s§i¶l¥ó"
 
-#: message.php:487 mailbox.php:719 templates/mailbox/navbar.inc:20
+#: message.php:499 mailbox.php:727 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "¤w§R°£"
@@ -1074,7 +1151,7 @@
 msgid "Deleted messages"
 msgstr "¤w§R°£¶l¥ó"
 
-#: compose.php:280
+#: compose.php:568
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "§R°£¦¹¤@ªþ¥ó \"%s\" ."
@@ -1083,51 +1160,59 @@
 msgid "Deleting and Moving Messages"
 msgstr "§R°£¤Î·h²¾¶l¥ó"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "©Úµ´½Ð¨D"
 
-#: lib/MIME/Viewer/itip.php:536
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "©Úµ´¦^µª·|Ä³¸ê°T"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:920
 msgid "Descending"
 msgstr "¥Ñ«á¦Ü¥ý"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:665
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "´yz"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "²Ó¸`"
 
-#: config/prefs.php.dist:671
+#: compose.php:580
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "¥¼ªþ¥[ªÅ¥ÕÀÉ®× \"%s\""
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "²H¤ÆÃ±¦W?"
 
-#: templates/contacts/contacts.inc:231
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Åã¥Ü¿ï¶µ"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "·í¶Ç°e§¹¶l¥ó«á,Åã¥Ü½T»{°T®§?"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:674
 msgid "Display in Body of Message"
 msgstr "Åã¥Ü©ó¶l¥ó¥DÅé¤W"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:780
 msgid "Display pop-up notification of new mail?"
 msgstr "´£¥Ü·í¦³·s¶l¥ó¨ì¹F®É?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "¦b¥\¯àªí¤¤Åã¥Ü '²MªÅ©U§£½c' ¦¹¤@³sµ²?"
+#: config/prefs.php.dist:746
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "¦b¥\¯àªí¤¤Åã¥Ü\"²MªÅ¼s§i½c\"¦¹¤@³sµ²?"
+
+#: config/prefs.php.dist:738
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "¦b¥\¯àªí¤¤Åã¥Ü\"²MªÅ©U§£½c\"¦¹¤@³sµ²?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
@@ -1137,23 +1222,27 @@
 msgid "Do NOT match"
 msgstr "¤£²Å¦X"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "¤£ÀË¬d·s¶l¥ó"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:940
 msgid "Do not generate a link in the From: column"
 msgstr "¤°»ò¤]¤£µo¥Í"
 
-#: lib/IMP.php:1031
+#: lib/IMP.php:1057
 msgid "Do you want to open that folder?"
 msgstr "¬O§_¶}±Ò¦¹¤å¥ó ?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "ÁÙ¨S¦³¨Ï¥Î±b¸¹¶Ü? ¥Ó½Ð¤@Ó."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "§¹¦¨"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:199
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "±N %s ¤U¸ü¦¨¬° .zip ®æ¦¡ªºÀ£ÁYÀÉ"
@@ -1162,25 +1251,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "±N©Ò¦³ªþ¥ó¤U¸ü¦¨¬°¤@Ó .zip ®æ¦¡ªºÀ£ÁYÀÉ"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "¤U¸ü"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "¤U¸ü [.zip ®æ¦¡]"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:199
 msgid "Download in .zip Format"
 msgstr "¤U¸ü¦¨¬° .zip ®æ¦¡ªºÀ£ÁYÀÉ"
 
-#: message.php:485 mailbox.php:698 templates/message/navbar_navigate.inc:11
+#: message.php:497 mailbox.php:706 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "¯ó½Z"
 
-#: folders.php:387
+#: folders.php:371
 msgid "Draft folder"
 msgstr "¯ó½Z§X"
 
@@ -1188,11 +1277,11 @@
 msgid "Drafts folder:"
 msgstr "¯ó½Z½c:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "¹q¤l¶l¥ó¦a§}"
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:319
 msgid "END"
 msgstr "µ²§ô"
 
@@ -1200,20 +1289,19 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr "¿ù»~: §Aªº¶l¥óµLªk³Q»¼°e."
 
-#: folders.php:408
+#: folders.php:399 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "½s¿è"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "½s¿è¶Â¦W³æ"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "½s¿è¹LÂo"
 
-#: folders.php:408 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:399 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
 msgstr "½s¿èµêÀÀ«H¥ó§X"
 
@@ -1222,40 +1310,40 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "½s¿è %s ªºµêÀÀ«H¥ó§X©w¸q"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "½s¿è¤Íµ½¦W³æ"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "½s¿è§Aªº¶Â¦W³æ"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "½s¿è§Aªº¹LÂo³W«h"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:849
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "¬°§A¨ä¥Lªº¹q¤l¶l¥ó±b¸¹½s¿è°¾¦n³]©w."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "½s¿è§Aªº¤Íµ½¦W³æ"
 
-#: templates/contacts/contacts.inc:234
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "¹q¤l¶l¥ó¦a§}"
 
-#: lib/Message.php:620
+#: lib/Message.php:664
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "¤w²MªÅ©Ò¦³ %s ¤¤ªº¶l¥ó."
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "²MªÅ"
 
-#: folders.php:275
+#: folders.php:265
 msgid "Empty Selected Folders"
 msgstr "²MªÅ©Ò¿ï¾Üªº«H¥ó§X"
 
@@ -1263,44 +1351,53 @@
 msgid "Empty Trash folder"
 msgstr "²M°£©U§£½c¤¤©Ò¦³¶l¥ó"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:956
+msgid "Empty _Spam"
+msgstr "²MªÅ¼s§i½c_S"
+
+#: lib/IMP.php:949
 msgid "Empty _Trash"
 msgstr "²MªÅ©U§£½c_T"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "±Ò¥Î PGP ?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "±Ò¥Î S/MIME ?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:799
 msgid "Enable message previews?"
 msgstr "±Ò¥Î¶l¥ó¹wÄý?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:436
 msgid "Encr_yption Options"
 msgstr "¥[±K¿ï¶µ_y"
 
-#: lib/MIME/Viewer/itip.php:513 lib/MIME/Viewer/itip.php:653
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "¤w¥[±K"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "µ²§À"
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "§¹¦¨Âà±H¶l¥ó"
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "§¹¦¨¶l¥ó"
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "§¹¦¨¶l¥ó¦Û %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "¿é¤J±K½X"
 
@@ -1312,7 +1409,7 @@
 msgid "Enter the name for your new drafts folder"
 msgstr "½Ð¿é¤J·s¯ó½Z½cªº¦WºÙ"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "½Ð¿é¤J·s±H¥ó³Æ¥÷½cªº¦WºÙ"
 
@@ -1320,92 +1417,97 @@
 msgid "Enter the name for your new trash folder"
 msgstr "½Ð¿é¤J©U§£½cªº¦WºÙ"
 
-#: search.php:159
+#: lib/Search.php:46
 msgid "Entire Message"
 msgstr "¾ã«Ê¶l¥ó"
 
-#: message.php:178 compose.php:1068 thread.php:39
+#: message.php:194 compose.php:1164 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "°O¿ý \"%s\" ¤w¦¨¥\¦a·s¼W¦Ü³q°T¿ý"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:387
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "¿ù»~"
 
-#: lib/MIME/Viewer/itip.php:305 lib/MIME/Viewer/itip.php:403
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "³sµ²¨ì IMAP ¦øªA¾¹®Éµo¥Í¿ù»~. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "¶Ç°e¦^ÂÐ®Éµo¥Í¿ù»~: %s."
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "¨Æ¥ó¤w¦¨¥\ªº²¾°£."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:770
 msgid "Every 15 minutes"
 msgstr "¨C 15 ¤ÀÄÁ"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:767
 msgid "Every 30 seconds"
 msgstr "¨C 30 ¬íÄÁ"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:769
 msgid "Every 5 minutes"
 msgstr "¨C 5 ¤ÀÄÁ"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:771
 msgid "Every half hour"
 msgstr "¨C¥b¤p®É"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:768
 msgid "Every minute"
 msgstr "¨C¤ÀÄÁ"
 
-#: folders.php:445
+#: folders.php:436
 msgid "Expand"
 msgstr "®i¶}"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "®i¶}"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "®i¶}©Ò¦³«H¥ó§X"
 
-#: folders.php:445
+#: folders.php:436
 msgid "Expand Folder"
 msgstr "®i¶}«H¥ó§X"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "©m¦WÁr´ú"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1051
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "¦b½s¼g¶l¥óµøµ¡¤¤,¹õ«á°õ¦æ©m¦WÁr´ú?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:968
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "·í¬d¬Ý«H¥ó§X®É,¹w¥ý®i¶}©Ò¦³«H¥ó§X?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Ár´ú¤¤"
 
-#: lib/IMP.php:940 lib/IMP.php:942
+#: lib/IMP.php:967 lib/IMP.php:969
 msgid "F_etch Mail"
 msgstr "¥~³¡¶l¥ó_e"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "¥~³¡¶l¥ó"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:857
 msgid "Fetch Mail in a separate window?"
 msgstr "¦b·sµ¡¤f¤¤¦¬¨ú¥~³¡¶l¥ó?"
 
@@ -1413,68 +1515,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "µn¤Jºô¸ô¶l§½«á¦Û°Ê¦¬¨ú¥~³¡¶l¥ó?"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
+#, php-format
 msgid "Fetched %d messages from %s"
 msgstr "¤w±q%2$sÅª¨ú%1$d«Ê¶l¥ó"
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
+#, php-format
 msgid "Fetched 1 message from %s"
 msgstr "¤w±q%sÅª¨ú 1 «Ê¶l¥ó"
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "¥~³¡¶l¥ó: "
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "¥~³¡¶l¥ó: ¨S¦³·s¶l¥ó."
 
-#: lib/IMP.php:946
+#: lib/IMP.php:973
 msgid "Fi_lters"
 msgstr "¶l¥ó¹LÂo_l"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:493 templates/compose/attachments.js:40
 msgid "File"
 msgstr "ªþ¥ó"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "¹LÂo¾¹¿ï¶µ"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "¹LÂo¾¹³]©w"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "¹LÂo§t¦³¤£¶®¤å¦r¤º®eªº¶l¥ó?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "¹LÂo¾¹¤ä´©¨Ã¥¼¦b¥»¨t²Î¤¤±Ò¥Î."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "¶l¥ó¹LÂo"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "¶l¥ó¹LÂo¥¼±Ò¥Î"
 
-#: lib/Filter.php:106
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
 msgstr "¶l¥ó¹LÂo: %s ºÞ²z¶±"
 
-#: templates/contacts/contacts.inc:181
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "´M§ä"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:893
 msgid "First Mailbox Page"
 msgstr "«H¥ó§Xªº²Ä¤@¶"
 
-#: mailbox.php:341
+#: mailbox.php:327
 msgid "First Page"
 msgstr "²Ä¤@¶"
 
@@ -1482,67 +1586,51 @@
 msgid "Fo_rward"
 msgstr "Âà±H_r"
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:245 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
 msgstr "«H¥ó§X¾Þ§@ - ½T»{"
 
-#: folders.php:292 templates/folders/head.inc:9
+#: folders.php:282 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "«H¥ó§XºÞ²z"
 
-#: templates/login/login.inc:172
-msgid "Folder Prefix"
-msgstr "«H¥ó§X¦rº"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "«H¥ó§XºKn"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "«H¥ó§X¦@¨É¥\¯à¨Ã¥¼±Ò¥Î."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "«H¥ó§X©|¥¼±Ò¥Î."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:957
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "«H¥ó§XÀËµø¤¤¤é´ÁÄæ¦ìªº®æ¦¡"
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:818 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Âà±H"
 
-#: compose.php:712
+#: compose.php:803
 msgid "Forward:"
 msgstr "Âà±H:"
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "¶l¥óÂà±H¤w§¹¦¨"
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "±q %s Âà±Hªº¶l¥ó"
 
-#: lib/MIME/Viewer/itip.php:479
-msgid "Free/Busy Information"
-msgstr "¥i¥Î®É¶¡¸ê°T"
-
-#: lib/MIME/Viewer/itip.php:490
-msgid "Free/Busy Reply"
-msgstr "¥i¥Î®É¶¡¦^ÂÐ"
-
-#: lib/MIME/Viewer/itip.php:484
-msgid "Free/Busy Request"
-msgstr "½Ð¨D¥i¥Î®É¶¡"
-
-#: lib/MIME/Viewer/itip.php:397
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "¦^À³¥i¥Î®É¶¡ªº½Ð¨D"
 
@@ -1550,24 +1638,24 @@
 msgid "Fro_m"
 msgstr "±H¥ó¤H_m"
 
-#: message.php:247 search.php:135 thread.php:93
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:148 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "±H¥ó¤H"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:906
 msgid "From Address"
 msgstr "±H¥ó¤H¦a§}"
 
-#: compose.php:724 compose.php:728
+#: compose.php:815 compose.php:819
 msgid "Fwd:"
 msgstr "Âà±H:"
 
-#: compose.php:1229
+#: compose.php:1296
 msgid "Fwd: "
 msgstr "Âà±H: "
 
-#: compose.php:1231
+#: compose.php:1298
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Âà±H: ¤wÂà±H %u «Ê¶l¥ó"
@@ -1581,33 +1669,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "¥uÅª¨ú¸û·sªº¶l¥ó(¶È¾A¥Î©ó IMAP ¦øªA¾¹)"
 
-#: thread.php:85
+#: templates/folders/actions.inc:31 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "«e©¹"
+
+#: thread.php:135
 msgid "Go to Message"
 msgstr "¦^ì«H¥ó"
 
-#: lib/IMP.php:553
+#: lib/IMP.php:509
+#, php-format
 msgid "Go to address book entry of \"%s\""
 msgstr "¨ì\"%s\"³q°T¿ý°O¿ý."
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "½á¤©Åv"
 
-#: message.php:540 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: message.php:542 lib/Filter.php:105 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
 #: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
-#: lib/MIME/Viewer/related.php:61 lib/MIME/Viewer/pkcs7.php:407
-#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "³o¸Ì"
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:62
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "¶W¤å³sµ²»y¨¥"
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML ®æ¦¡¶l¥ó"
 
@@ -1619,43 +1714,39 @@
 msgid "Here is the message you were composing:"
 msgstr "¥H¤U¬O§Aªº¶l¥ó½s¿è¤º®e:"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "ÁôÂÃ"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "ÁôÂÃ©óÃöÁpÀËµø¤¤"
 
-#: mailbox.php:363
+#: mailbox.php:349
 msgid "Hide Deleted"
 msgstr "ÁôÂÃ¤w§R°£"
 
-#: folders.php:287
+#: folders.php:277
 msgid "Hide Unsubscribed"
 msgstr "ÁôÂÃ¥¼q¾\"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "ÁôÂÃ¹Ï¤ù"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "°ª"
 
-#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:711 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "°ªÀu¥ý"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "³Ì°ª"
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:676
 msgid "How do you want to display attachments?"
 msgstr "§A¥´ºâ¦p¦óÅã¥Üªþ¥[ÀÉ®×©O?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "¦p¦ó©w¸q¦^ÂÐ¤å¥óªº¤Þz¦C"
 
@@ -1667,7 +1758,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Auto Detect Protocols)"
 
-#: templates/login/login.inc:160 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP ¦øªA¾¹Ãö³¬³sµ². ¦øªA¾¹¦^À³: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
 
@@ -1675,11 +1771,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP over SSL (self-signed certificate)"
 
-#: templates/login/login.inc:161
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP over SSL (self-signed)"
 
-#: templates/login/login.inc:159 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP ¦øªA¾¹Ãö³¬³sµ²."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, no TLS"
 
@@ -1687,44 +1787,52 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 ¶l¥ó¦øªA¾¹"
 
-#: lib/IMP.php:886
+#: lib/IMP.php:837
 msgid "INBOX"
 msgstr "¦¬¥ó§X"
 
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr "¦p±ý¨Ï¥Î SSL ©Î TLS ¥[±K³sµ². PHP ¥²¶·¥ý¸ü¤J openssl ©µ¦ù."
+
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr "¦pªGÄ~Äò,«H¥ó§X¤¤ªº©Ò¦³¶l¥ó±N¿ò¥¢!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "©¿²¤"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "©¿²¤©Ò¦³"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "¹Ï¤ù"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "¶×¤J"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "¶×¤Jª÷Æ_"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "¶×¤Jª÷Æ_¹ï"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "¶×¤J¶l¥ó"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "¶×¤J PGP ª÷Æ_"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr "¶×¤JÓ¤H¾ÌÃÒ."
 
 #: templates/pgp/import_key.inc:14
@@ -1739,7 +1847,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "¶×¤JÓ¤H S/MIME ¾ÌÃÒ."
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "¶×¤J¤½¶}ª÷Æ_"
 
@@ -1760,11 +1868,10 @@
 msgstr "¶×¤J mbox ÀÉ®×"
 
 #: templates/folders/import.inc:16
-#, php-format
 msgid "Import mbox file %s into folder %s."
-msgstr "¶×¤J mbox ÀÉ®× %s ¨ì«H¥ó§X %s."
+msgstr "¶×¤J mbox ÀÉ®× %s ¨ì«H¥ó§X %s ¤¤."
 
-#: message.php:486 mailbox.php:713 templates/message/navbar_navigate.inc:7
+#: message.php:498 mailbox.php:721 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1774,25 +1881,25 @@
 msgid "Important messages"
 msgstr "«n¶l¥ó"
 
-#: folders.php:157
+#: folders.php:147
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "¤w¶×¤J %d «Ê¶l¥ó¦Û %s ."
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "¶i¦æ¤¤"
 
-#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:363 lib/Folder.php:86 lib/Folder.php:212 lib/IMP.php:313
+#: lib/IMAP/Tree.php:109 lib/IMAP/Tree.php:214
 msgid "Inbox"
 msgstr "¦¬¥ó§X"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "¦^ÂÐ®É¥]¬A¼ÐÀYºKn?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "¦^ÂÐ®É¥]¬Aì©l¤å¥ó?"
 
@@ -1800,21 +1907,21 @@
 msgid "Info"
 msgstr "¸ê°T"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "¤½¶}ª÷Æ_ %s ªº¸ê°T"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Ó¤H¨p±Kª÷Æ_¸ê°T."
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Ó¤H¤½¶}ª÷Æ_¸ê°T."
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:498
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "ª½±µÅã¥Ü©ó¥»¤å°Ï"
 
@@ -1834,11 +1941,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr "¦b¦¹´¡¤J PGP ¤½¶}ª÷Æ_"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "©Ò¿ï¾Üªº§@¥Î¤è¦¡¹ï¦¹¤¸¥óµL®Ä."
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:572 mailbox.php:614
 msgid "Invalid Address"
 msgstr "¤£¦Xªkªº¦í§}"
 
@@ -1846,20 +1953,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr "µL®Äªº»·ºÝ¶l½c"
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "¹q¤l¶l¥ó¦í§}: %s §t¦³µL®Äªº¦r¤¸."
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "µL®Äªºª÷Æ_"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "µL®Äªº PGP Ó¤H¨p±Kª÷Æ_."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "µL®Äªº PGP Ó¤H¤½¶}ª÷Æ_."
 
@@ -1867,44 +1974,60 @@
 msgid "Invert"
 msgstr "¤Ï¿ï¾Ü"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:588
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "ª÷Æ_ªø«×"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "ª÷Æ_ªº»s§@¥i¯à»Ýnªá¤@¨Ç®É¶¡¨Ó§¹¦¨. ¬O§_Ä~Äò ?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr "ª÷Æ_¶×¤JµL®Ä. ¦øªA¾¹¥¼±Ò¥ÎÀÉ®×¤W¶Ç¥\¯à."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr "ª÷Æ_¶×¤JµL®Ä. ·s¼WÁpµ¸¤H¥¼«ü©w¹w³]³q°T¿ý."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "ª÷Æ_¤w¦¨¥\ªº¶Ç°e¦Ü¤½¶}ª÷Æ_¦øªA¾¹."
 
-#: templates/login/login.inc:196
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "»y¨¥"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:894
 msgid "Last Mailbox Page"
 msgstr "«H¥ó§Xªº³Ì«á¤@¶"
 
-#: mailbox.php:354
+#: mailbox.php:340
 msgid "Last Page"
 msgstr "³Ì«á¤@¶"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "±Nªþ¥óÂà¦s¬°ºô§}_n"
+#: templates/compose/compose.inc:546
+msgid "Link Attachments?"
+msgstr "ªþ¥óÂà¦sºô§}?"
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1083
 msgid "Linked attachments are forbidden."
 msgstr "µLªk¦s¨ú¤wÂà¦s¬°ºô§}ªºªþ¥ó."
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr "¦³®Ä¤é¦Ü%s¬°¤î"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1070
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1912,7 +2035,7 @@
 "½s¼g¶l¥ó®É,¦b³q°T¿ýµe±¤¤Åã¥Ü©Ò¦³Ápµ¸¤H? (¦pªG¤£¤Ä¿ï¦¹¶µ,³q°T¿ýµe±¶ÈÅã¥Ü»P·j"
 "´M¬Û²Åªº¸ê®Æ)"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:673
 msgid "Listing in the Header"
 msgstr "¦bªíÀY¤¤¦Cªí"
 
@@ -1920,20 +2043,20 @@
 msgid "Local Mailbox:"
 msgstr "±NÅª¨úªº¥~³¡¶l¥ó,©ñ¸m©ó¤U¦Cªº¥»¦a¶l½c:"
 
-#: lib/MIME/Viewer/itip.php:670
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "¦ì¸m"
 
-#: templates/login/login.inc:204
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "µn¤J"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:118
 #, php-format
 msgid "Log in to %s"
 msgstr "µn¤J¨ì %s"
 
-#: templates/login/login.inc:133
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "µn¤J"
 
@@ -1941,15 +2064,15 @@
 msgid "Login Tasks"
 msgstr "µn¤J¤u§@"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "§C"
 
-#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:714 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "§CÀu¥ý"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "³Ì§C"
 
@@ -1957,11 +2080,11 @@
 msgid "Macintosh File"
 msgstr "³Áª÷¶ðÀÉ®×"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "ºô¸ô¶l§½"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "¶l¥ó¹wÄý"
 
@@ -1969,19 +2092,19 @@
 msgid "Mail server type to connect to:"
 msgstr "±ý³s±µªº¶l¥ó¦øªA¾¹«¬ºA:"
 
-#: folders.php:397
+#: folders.php:367 folders.php:381
 msgid "Mailbox"
 msgstr "¶l½c"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "¶l½c¤Î«H¥ó§XÅã¥Ü¿ï¶µ"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "¼Ð°O©Ò¦³«H¥ó¬°¬Ý¹L"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "¼Ð°O©Ò¦³«H¥ó¬°¥¼¬Ý¹L"
 
@@ -1989,7 +2112,7 @@
 msgid "Mark as:"
 msgstr "¼Ð°O¦¨:"
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "¥H¤£¦PªºÃC¦â°Ï¹j¦^ÂÐ¤å³¹?"
 
@@ -1997,7 +2120,7 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "±N¶l¥ó¼Ð°O¦¨¤w¬Ý¹L(¶È¾A¥Î©ó IMAP ¦øªA¾¹)"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "¼Ð°OÂ²³æ¸Ë¹¢ ?"
 
@@ -2009,72 +2132,52 @@
 msgid "Match Any Query"
 msgstr "¤Ç°t¥ô¤@¬d¸ß"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:504
 msgid "Maximum Attachment Size"
-msgstr "ªþ¥ó¤¹³\¤W:"
+msgstr "ªþ¥ó¤¹³\¤W"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "«H¥ó§X¤W¼Æ¥Ø"
 
-#: templates/compose/compose.inc:484
+#: templates/compose/compose.inc:486
 msgid "Maximum number of attachments reached."
 msgstr "ªþ¥ó¼Æ¥Ø¤w¹F¤W."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:482
 msgid "Maximum total attachment size reached."
 msgstr "ªþ¥ó¤j¤p¤w¹F¤W."
 
-#: lib/MIME/Viewer/itip.php:622
-msgid "Meeting Cancellation"
-msgstr "·|Ä³¨ú®ø"
-
-#: lib/MIME/Viewer/itip.php:571
-msgid "Meeting Information"
-msgstr "·|Ä³¸ê°T"
-
-#: lib/MIME/Viewer/itip.php:581
-msgid "Meeting Proposal"
-msgstr "·|Ä³µo°_¤H"
-
-#: lib/MIME/Viewer/itip.php:613
-msgid "Meeting Reply"
-msgstr "¦^ÂÐ·|Ä³"
-
-#: lib/MIME/Viewer/itip.php:594
-msgid "Meeting Update"
-msgstr "·|Ä³§ó·s"
-
-#: lib/MIME/Viewer/itip.php:599
-msgid "Meeting Update Request"
-msgstr "·|Ä³§ó·s½Ð¨D"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "«H¥ó§X¦Cªí"
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "¶l¥ó"
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:596 compose.php:623 compose.php:677 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "¶l¥ó¼g§@"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:905
 msgid "Message Date"
 msgstr "¶l¥ó¤é´Á"
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "¶l¥ó¿ï¶µ"
 
-#: search.php:359
+#: search.php:312
 msgid "Message Search"
 msgstr "¶l¥ó·j´M"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:909
 msgid "Message Size"
 msgstr "¶l¥ó¤j¤p"
 
-#: message.php:368
+#: message.php:384
 msgid "Message Source"
 msgstr "ÀËµøì©lÀÉ"
 
@@ -2082,10 +2185,6 @@
 msgid "Message Viewing"
 msgstr "¶l¥óÀËµø"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "¶l¥óÄæ¦ì"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "¶l¥ó¼ÐÃÑ"
@@ -2094,20 +2193,20 @@
 msgid "Message folders"
 msgstr "«H¥ó§X"
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "¶l¥ó¦Û %s"
 
-#: mailbox.php:646
+#: mailbox.php:655
 msgid "Message has attachments"
 msgstr "¶l¥ó¤º§tªþ¥[ÀÉ®×"
 
-#: mailbox.php:637
+#: mailbox.php:646
 msgid "Message is encrypted"
 msgstr "¶l¥ó¤w¥[±K"
 
-#: mailbox.php:632
+#: mailbox.php:641
 msgid "Message is signed"
 msgstr "¶l¥ó¤wÃ±³¹"
 
@@ -2115,24 +2214,24 @@
 msgid "Message matches"
 msgstr "¤Ç°t±ø¥ó"
 
-#: compose.php:771 compose.php:785
+#: compose.php:862 compose.php:869
 msgid "Message redirected successfully."
 msgstr "¶l¥óÂà§}»¼°e¦¨¥\."
 
-#: compose.php:1018
+#: compose.php:1114
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "¶l¥ó»¼°e¦¨¥\,¦ý©|¥¼Àx¦s¦Ü %s"
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1173 compose.php:1181
 msgid "Message sent successfully."
 msgstr "¶l¥ó»¼°e¦¨¥\."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:929
 msgid "Messages per page in the mailbox view."
 msgstr "¨C¶Åã¥Üªº¶l¥ó¼Æ¥Ø."
 
-#: mailbox.php:318
+#: mailbox.php:308
 msgid "Messages to"
 msgstr "¶l¥ó¨ì"
 
@@ -2141,6 +2240,7 @@
 msgstr "ÅÜ§ó"
 
 #: templates/compose/expand.inc:12
+#, php-format
 msgid "More than one address found for field \"%s\"."
 msgstr "¦b¶W¹L¤@µ§ªº¦a§}¤¤§ä¨ìÄæ¦ì \"%s\"."
 
@@ -2152,6 +2252,10 @@
 msgid "Move down"
 msgstr "¤U²¾"
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "·h²¾¼s§i¶l¥ó¨ì¼s§i½c©Î±N¤£¬O¼s§iªº¶l¥ó·h²¾¨ì¦¬¥ó½c¤¤"
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "·h²¾¨ì«H¥ó§X"
@@ -2164,65 +2268,83 @@
 msgid "Multipart/alternative"
 msgstr "¦h«²Õ¦¨/¥i´À¥N"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:151
+msgid "Multiple Message View"
+msgstr "¶l¥óÀËµø"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr "µL"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "³Æµù"
 
-#: templates/contacts/contacts.inc:233 lib/MIME/Viewer/itip.php:684
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "¦WºÙ"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "¦WºÙ ¤Î/©Î ¹q¤l¶l¥ó¦ì§}¤£¥i¬°ªÅ¥Õ"
 
-#: lib/MIME/Viewer/itip.php:774
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "»Ýn§@¥Î¤è¦¡"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:766
 msgid "Never"
 msgstr "¥Ã¤£"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "¥Ã¤£Àx¦sªþ¥[ÀÉ®×"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "·sªº"
 
-#: lib/IMP.php:615
+#: lib/IMP.php:574
 msgid "New Folder"
 msgstr "·sªº«H¥ó§X"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "·s¶l¥ó"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:37
+msgid "New Message"
+msgstr "¼g«H"
+
+#: mailbox.php:763 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "¼g«Hµ¹ %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "·s¶l¥ó"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "¤U¤@¨B"
 
 #: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
-msgstr "¤U¤@«Ê¶l¥ó"
+msgstr "¤U¤@«Ê"
 
-#: mailbox.php:352
+#: mailbox.php:338
 msgid "Next Page"
 msgstr "¤U¤@¶"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:965
 msgid "No"
 msgstr "§_"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "§ä¤£¨ì¾ÌÃÒ¸ê®Æ"
 
@@ -2230,106 +2352,120 @@
 msgid "No Encryption"
 msgstr "¶l¥ó¤£¥[±K"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Æ_°ÍÀô¤W¨S¦³¥ô¦óª÷Æ_"
 
-#: mailbox.php:371
+#: mailbox.php:357
 #, php-format
 msgid "No Messages"
 msgstr "¨S¦³¶l¥ó"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "µL PGP ¤½¶}ª÷Æ_³Q¶×¤J."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Ó¤H¾ÌÃÒ¤£¦s¦b."
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:336
 msgid "No Preview Text"
 msgstr "µL¹wÄý¤º®e"
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "§ä¤£¨ì¤½¶}ª÷Æ_"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "S/MIME ¤½¶}ª÷Æ_¨S¦³¶×¤J."
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "¨S¦³ªþ¥[ÀÉ®×."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "¤½¶}ª÷Æ_¤¤¥¼¥]§t¹q¤l¶l¥ó¬ÛÃö¸ê°T"
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "©|¥¼¿ï¾Ü«H¥ó§X."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:146
 msgid "No folders are being checked for new mail."
 msgstr "©Ò¦³ÀË¬d¹Lªº«H¥ó§X¤¤³£¨S¦³·s¶l¥ó."
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:197 lib/Folder.php:508 lib/Folder.php:558
 msgid "No folders were specified"
 msgstr "½Ð¿ï¾Ü«ü©wªº«H¥ó§X"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:152
 msgid "No folders with new messages"
 msgstr "¨S¦³¥]§t·s¶l¥óªº«H¥ó§X"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:149
 msgid "No folders with unseen messages"
 msgstr "¨S¦³¥]§t¥¼¬Ý¹L¶l¥óªº«H¥ó§X"
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "¨S¦³¶l¥ó¤º®e"
 
-#: lib/Mailbox.php:365
+#: lib/Mailbox.php:380
 msgid "No messages matched your search."
 msgstr "¨S¦³¶l¥ó²Å¦X·j´M±ø¥ó."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "PGP Ó¤H¨p±Kª÷Æ_¨S¦³³Q¶×¤J."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "PGP Ó¤H¤½¶}ª÷Æ_¨S¦³³Q¶×¤J."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "S/MIME Ó¤H¾ÌÃÒ¨S¦³³Q¶×¤J."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr "¯Ê¤ÖÓ¤H¨p±Kª÷Æ_¦]¦¹¶l¥óµLªk³Q¸Ñ±K."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "«÷¦rÀË¬dµ{¦¡¥¼³]©w."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
-msgstr "¨S¦³¿ù»~«÷¦r"
+msgstr "«÷¦r¥¿½T"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "«ØÄ³"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:570
+msgid "No supported IMAP authentication method could be found."
+msgstr "§ä¤£¨ì¤ä´©ªº IMAP »{ÃÒ¤è¦¡."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "©|¥¼«ü©w¨Ï¥ÎªÌ."
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "«D¥X®uªÌ"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
-#: lib/MIME/Viewer/itip.php:660
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "¤£¿ï¾Ü"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "¤@¯ë"
 
@@ -2351,8 +2487,7 @@
 msgid "Not Personal"
 msgstr "«DÓ¤H"
 
-#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:140
-#: lib/Crypt/SMIME.php:149
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "µL®Äªº¤½¶}ª÷Æ_."
 
@@ -2368,20 +2503,27 @@
 msgid "Note that this can take some time"
 msgstr "ª`·N,³oÓ°Ê§@¥i¯à»Ýn¦hªá¤@¨Ç®É¶¡"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "¤°»ò¤]¤£°µ"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "³qª¾: Âà¦s¬°ºô§}ªºªþ¥ó¤w³Q¤U¸ü"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr "¦pªG¨C¤ë§R°£¤@¦¸,¦h¤Ö¤ë¥÷¤wÂà¦s¬°ºô§}ªºÂÂªþ¥ó±N³Q«O¦s."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "¦pªG¨C¤ë§R°£¤@¦¸,¦h¤Ö¤ë¥÷ªºÂÂ±H¥ó³Æ¥÷§X±N³Q«O¦s."
 
-#: templates/contacts/contacts.inc:249 lib/MIME/Viewer/itip.php:548
-#: lib/MIME/Viewer/itip.php:729
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "½T»{"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "©Î"
@@ -2394,43 +2536,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr "ÂÂªº±H¥ó³Æ¥÷§X±N³Q²MªÅ."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "¥uÅã¥Ü¥]§t¥¼Åª¨ú¶l¥óªº«H¥ó§X ?"
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
 msgstr "¦A¦¹§@¥Î¤è¦¡¤¤§A¶È¯à¿ï¾Ü¤@Ó«H¥ó§X."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "¶}±Ò«H¥ó§X_n"
-
-#: templates/menu.inc:23
-msgid "Open Folder"
-msgstr "¶}±Ò«H¥ó§X"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "¶}±Ò«H¥ó§X_l"
 
-#: folders.php:414
+#: folders.php:406
 msgid "Opened Folder"
 msgstr "«H¥ó§X¤w¶}±Ò"
 
-#: lib/MIME/Viewer/itip.php:701
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "¥X®uªÌ(«D¥²¶·)"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "¨ä¥L¿ï¶µ"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "¨ä¥L¿ï¶µ"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:291
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "¶l¥ó¥~»¼¦øªA¾¹"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2438,19 +2580,15 @@
 msgid "PGP Encrypt Message"
 msgstr "PGP ¶l¥ó¥[±K"
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP ¿ù»~: "
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP ¿ù»~:Ó¤H¨p±Kª÷Æ_»Ýn¦³¤@²Õ±K½X."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP ¥¼±Ò¥Î"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP ¿ï¶µ"
 
@@ -2458,25 +2596,25 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP ±K½X¿é¤J"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "PGP Ó¤Hª÷Æ_¹ï¥²¶·¦³¦w¥þ©Êºô¸ô³sµ²ªº¤ä´©."
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "PGP ¤½¶}ª÷Æ_¤º®e"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "\"%s (%s)\" ªºPGP ¤½¶}ª÷Æ_¤w·s¼W§¹¦¨."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "PGP ¤½¶}ª÷Æ_ \"%s\" ¤w§R°£§¹¦¨."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP ¤½¶}ª÷Æ_Àô"
 
@@ -2488,34 +2626,34 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "PGP ¶l¥óÃ±³¹/¶l¥ó¥[±K"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "PGP ¨p±Kª÷Æ_¤w·s¼W§¹¦¨."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "PGP ¤½¶}ª÷Æ_¤w·s¼W§¹¦¨."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP ¤ä´©¨Ã¥¼¦b¥»¨t²Î¤¤±Ò¥Î."
 
-#: lib/MIME/Viewer/pgp.php:209
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr "PGP ¤ä´©¨Ã¥¼³Q±Ò¥Î,©Ò¥H¼Æ¦ìÃ±³¹µLªk³QÅçÃÒ."
 
-#: lib/MIME/Viewer/pgp.php:296
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr "PGP ¤ä´©¨Ã¥¼±Ò¥Î,¶l¥óµLªk³Q¸Ñ±K."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "PGP ªº¤ä´©»Ýn¨Ï¥ÎÂÛ¼uµøµ¡(popup windows). °²¦p§AªºÂsÄý¾¹¥Ø«e¨Ã¥¼±Ò¥Î¸Ó¶µÂÛ¼u"
 "µøµ¡¥\¯à,½Ð±Ò¥Î¥¦§_«h PGP ±NµLªk§@¥Î."
@@ -2536,7 +2674,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 over SSL (self-signed certificate)"
 
-#: templates/login/login.inc:163
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 over SSL (self-signed)"
 
@@ -2544,16 +2682,16 @@
 msgid "POP3, no TLS"
 msgstr "POP3, no TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:20
 #, php-format
 msgid "Page %d of %d"
 msgstr "²Ä %d ¶¦@ %d ¶"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:891
 msgid "Page with the First Unseen Message"
 msgstr "²Ä¤@«Ê¥¼¬Ý¹L«H¥óªº¶±"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:892
 msgid "Page with the Last Unseen Message"
 msgstr "³Ì«á¤@«Ê¥¼¬Ý¹L«H¥óªº¶±"
 
@@ -2561,32 +2699,32 @@
 msgid "Part(s)"
 msgstr "ªþ¥ó"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "±K½X"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "±K½X(¦A½T»{)"
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "±K½X¤w¦¨¥\¨ø¸ü."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "±K½X:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr "±K½X¤£¥iªÅ¥Õ"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "±K½X¤£§k¦X"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:190
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "±K½X"
 
@@ -2594,11 +2732,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "©óµn¤J«á°õ¦æºûÅ@¾Þ§@?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "¦¹¨Ï¥ÎªÌªºÅvµLªkÅÜ§ó."
 
-#: message.php:477 mailbox.php:682 templates/mailbox/navbar.inc:24
+#: message.php:486 mailbox.php:690 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Ó¤H"
@@ -2607,39 +2745,48 @@
 msgid "Personal Information"
 msgstr "Ó¤H¸ê°T"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Ó¤H PGP ª÷Æ_¹ï¤w²£¥Í§¹¦¨."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Ó¤H PGP ª÷Æ_¤w§R°£§¹¦¨."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
-msgstr "Ó¤H S/MIME ¾ÌÃÒ¨S¦³³Q¶×¤J: "
+msgstr "Ó¤H S/MIME ¾ÌÃÒ¨S¦³³Q¶×¤J:  "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Ó¤H S/MIME ª÷Æ_¤w§R°£§¹¦¨."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "·í¦^ÂÐ¤ÎÂàµo¶l¥ó®É±NÃ±¦W©ñ¦b«H¥ó¤º®eªº¶}©l³B?"
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "¯Â¤å¦r®æ¦¡ªº¶l¥ó"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:787
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"·í·s¶l¥ó¨ì¹F®É¼·©ñµ¼Ö? §AªºÂsÄý¾¹»Ýn¤ä´©µ¼Ö¤º®rÀÉ®×. µ´¤j³¡¤À¦b·L³n»P³Áª÷"
+"¶ðªºÂsÄý¾¹³£¨S¦³°ÝÃD, ¦ý¨ä¥L§@·~¨t²ÎªºÂsÄý¾¹¥i¯à»Ýn¦w¸Ë´¡¥ó(plugin)."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "½Ð¿é¤J¤@Ó·s«H¥ó§Xªº¦WºÙ:"
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "½Ð¿é¤J·s«H¥ó§Xªº¦WºÙ:"
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "½Ð¿é¤J·sªº¦WºÙ:"
 
@@ -2657,7 +2804,7 @@
 "to enter this passphrase once per %s session."
 msgstr "½Ð¿é¤J§Aªº S/MIME Ó¤Hª÷Æ_±K½X.¨C¦¸µn¤J´Á¶¡ %s ³£»Ý¿é¤J¤@¦¸."
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2668,41 +2815,31 @@
 "½s¿è¶l¥ó,¨º½Ð§A¥²¶·n¦Aì¥ýµn¤Jªºµøµ¡µe±¦A¤@¦¸µn¤J.¤§©Ò¥H³o»ò°µ¬O¬°¤FÁ×§KÀb"
 "«ÈÂê©w§Aªº·|´ÁÃÑ§O¸¹½X(session ID). ¤£«K¤§³BÁÙ½Ð¨£½Ì."
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "½Ð¿é¤J§Aªº±K½X."
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "½Ð¿é¤J§Aªº¨Ï¥ÎªÌ¦WºÙ."
 
-#: compose.php:79 lib/IMP.php:509
+#: compose.php:106 lib/IMP.php:470
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "½Ð«·s¿é¤J¥¿½Tªº¹q¶l¦a§}."
 
-#: lib/MIME/Viewer/itip.php:638
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr "½Ð¾\Åª¥H¤U¸ê°T,µM«á±q¤U¤è¥\¯àªí¤¤¿ï¾Ü¤@Ó§@¥Î¤è¦¡."
-
-#: templates/folders/javascript.inc:53
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "½Ð¿ï¾Ü¤@Ó«H¥ó§X"
 
-#: lib/MIME/Viewer/itip.php:498
-msgid "Please select an action from the menu below."
-msgstr "½Ð¥Ñ¤U¦Cªí³æ¤¤¿ï¾Ü¤@Ó§@¥Î¤è¦¡."
-
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "½Ð¿ï¾Ü¦Ü¤Ö¤@Ó«H¥ó§X¨Ó·j´M"
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "½Ð¿ï¾Ü¶È¤@Ó«H¥ó§X"
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "½Ð¤U©Ô¿ï¾Ü©Î½s¿è¥kÃäªº¸ê®Æ¥HÁr´ú:"
 
@@ -2710,11 +2847,11 @@
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "¦b§AªºÃ±¦W«e¥[¤J ('-- ')?"
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "¿ï¶µ¤w§¹¦¨§ó·s."
 
@@ -2726,11 +2863,11 @@
 msgid "Previous Message"
 msgstr "¤W¤@«Ê¶l¥ó"
 
-#: mailbox.php:343
+#: mailbox.php:329
 msgid "Previous Page"
 msgstr "¤W¤@¶"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "¤Íµ½¦C¦L"
 
@@ -2738,15 +2875,15 @@
 msgid "Priority"
 msgstr "Àu¥ý"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "¨p±Kª÷Æ_±K½X"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "´£¥Ü§Ú,¨C¤@«Ê¥]§tªþ¥[ÀÉ®×ªº«H¥ó±H¥X«á; ¹w³]¬°¤£n"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "´£¥Ü§Ú,¨C¤@«Ê¥]§tªþ¥[ÀÉ®×ªº«H¥ó±H¥X«á; ¹w³]¬°n"
 
@@ -2754,39 +2891,40 @@
 msgid "Protocol:"
 msgstr "³q«H¨ó©w:"
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "¤½¶}ª÷Æ_¦øªA¾¹ªº¤ä´©¤w³Q¨ú®ø."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "²M°£¤w§R°£_g"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "²M°£¤w§R°£"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "²MªÅ«H¥ó§X"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "©U§£½c¦h¤[²M°£¤@¦¸:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "¨C¦¸¾ã²z©U§£½c®É,²M°£¦h¤Ö¤Ñ¼Æ¥H«eªº¶l¥ó."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "²M°£©U§£½c¤¤ªºÂÂ¶l¥ó?"
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
+#, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr "¦Û©U§£½c¤¤²M°£ %d «Ê¶l¥ó."
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr "¦Û©U§£½c¤¤²M°£ 1 «Ê¶l¥ó."
 
@@ -2805,24 +2943,20 @@
 msgid "Quota status: NO LIMIT"
 msgstr "ºÏºÐªÅ¶¡: ¥¼³]"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "¤Þz %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "½Ð¦¬¥ó¦øªA¾¹¶Ç»¼°e¹F½T»{_q"
-
-#: search.php:163
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "¦b¦¬¥ó¤é´Á"
 
-#: search.php:171
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "±q¦¬¥ó¤é´Á«á"
 
-#: search.php:167
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "¨ì¦¬¥ó¤é´Á«e"
 
@@ -2834,23 +2968,19 @@
 msgid "Redirect"
 msgstr "Âà§}»¼°e"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Âà§}»¼°e"
 
-#: compose.php:734
+#: compose.php:825
 msgid "Redirect this message"
 msgstr "Âà§}»¼°e¦¹¶l¥ó"
 
-#: compose.php:794
+#: compose.php:878
 msgid "Redirecting failed."
 msgstr "Âà§}»¼°e¥¢±Ñ."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "«·s¾ã²z"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:772
 msgid "Refresh Folder Views:"
 msgstr "§ó·s«H¥ó§XÀËµø:"
 
@@ -2862,11 +2992,11 @@
 msgid "Reload View"
 msgstr "§ó·sÀËµø"
 
-#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "°O¦í³oÓ·|Ä³¸ê°T."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:967
 msgid "Remember the last view"
 msgstr "°O¾Ð³ÌªñªºÅã¥Ü¤è¦¡"
 
@@ -2882,15 +3012,15 @@
 msgid "Remove source"
 msgstr "²¾°£³q°T¿ý"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "§ó§ï¦WºÙ"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "©ó¨C¤ëªì§ó§ï±H¥ó³Æ¥÷§Xªº¦WºÙ?"
 
-#: lib/Folder.php:440
+#: lib/Folder.php:463
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "±N¦WºÙ \"%s\" §ó¦W¬° \"%s\" ¥¢±Ñ.¦øªA¾¹¦^À³"
@@ -2899,7 +3029,7 @@
 msgid "Repl_y to List"
 msgstr "¦^ÂÐµ¹°Q½×¸s²Õ_y"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "¨ú¥N¬°:"
 
@@ -2907,7 +3037,7 @@
 msgid "Reply"
 msgstr "¦^ÂÐ"
 
-#: lib/MIME/Viewer/itip.php:307 lib/MIME/Viewer/itip.php:405
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "¦^ÂÐ¤w¶Ç°e"
 
@@ -2915,7 +3045,7 @@
 msgid "Reply to All"
 msgstr "¦^ÂÐ©Ò¦³"
 
-#: compose.php:680
+#: compose.php:769
 msgid "Reply to All:"
 msgstr "¦^ÂÐ©Ò¦³:"
 
@@ -2923,7 +3053,7 @@
 msgid "Reply to List"
 msgstr "¦^ÂÐµ¹°Q½×¸s²Õ"
 
-#: compose.php:682
+#: compose.php:771
 msgid "Reply to List:"
 msgstr "¦^ÂÐµ¹°Q½×¸s²Õ:"
 
@@ -2931,105 +3061,99 @@
 msgid "Reply to _All"
 msgstr "¦^ÂÐ©Ò¦³_A"
 
-#: lib/MIME/Viewer/itip.php:524 lib/MIME/Viewer/itip.php:533
-#: lib/MIME/Viewer/itip.php:543
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "¥H¥¼¤ä´©ªº¶l¥ó¦^ÂÐ"
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "¦^ÂÐ¥¼¨Ó¤GÓ¤ëªº free/busy ¸ê°T."
 
-#: lib/MIME/Viewer/itip.php:530
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "¥H©Ò½Ð¨Dªº free/busy ¸ê°T¦^ÂÐ."
 
-#: message.php:251
+#: message.php:267
 msgid "Reply-To"
 msgstr "¦^ÂÐ¨ì"
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "¦^ÂÐ¨ì: "
 
-#: compose.php:678
+#: compose.php:767
 msgid "Reply:"
 msgstr "¦^ÂÐ:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "³o¤£¬O¼s§i¶l¥ó"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "³o¬O¼s§i¶l¥ó"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "½Ð¦¬¥ó¤H¶Ç°eÅª¨ú¦^±ø_R"
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr "½Ð¦¬¥ó¦øªA¾¹¶Ç»¼°e¹F½T»{ ?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "½Ð¦¬¥ó¤H¶Ç°eÅª¨ú¦^±ø"
 
-#: mailbox.php:204
+#: mailbox.php:187
 msgid "Requested message not found."
 msgstr "§ä¤£¨ì¶l¥ó."
 
-#: lib/MIME/Viewer/itip.php:693
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "¥²¶·n¦³¥X®uªÌ"
 
 #: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "«³]"
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "¦^À³ª¬ºA¤w§ó·s"
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Ä~Äò½s¿è"
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "«·sµn¤J"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "¦^\"¶l¥ó¼g§@¿ï¶µ\""
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 #: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "¦^¨ì¥~³¡¶l¥ó"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "¦^¨ì¥D¿ï¶µ³]©wµe±"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "¦^¨ì¿ï¶µ"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "¦^¤W¤@Óµe±"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:706
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "·í§R°£, ·h²¾©Î½Æ»s¶l¥ó®É, ¦^¨ì¶l¥óÀË¥Ü¦C"
 
-#: lib/MIME/Viewer/itip.php:684
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "¨¤¦â"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3037,44 +3161,40 @@
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME ¶l¥ó¥[±K"
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME ¿ù»~: "
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME ¿ù»~:Ó¤H¨p±Kª÷Æ_»Ýn¦³¤@²Õ±K½X."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME ¥¼±Ò¥Î"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME ¿ï¶µ"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "S/MIME ±K½X¿é¤J"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "S/MIME Ó¤Hª÷Æ_¹ï¥²¶·¦³¦w¥þ©Êºô¸ô³sµ²ªº¤ä´©."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "\"%s\"ªº S/MIME ¤½¶}ª÷Æ_¤w§R°£§¹¦¨."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "S/MIME ¤½¶}ª÷Æ_¤w·s¼W§¹¦¨."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "S/MIME ¤½¶}ª÷Æ_Àô"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "S/MIME ¤½¶}/¨p±Kª÷Æ_¹ï,¤w·s¼W§¹¦¨."
 
@@ -3086,80 +3206,96 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME ¶l¥óÃ±³¹/¶l¥ó¥[±K"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "S/MIME ¤ä´©¨Ã¥¼¦b¥»¨t²Î¤¤±Ò¥Î."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr "S/MIME ¤ä´©¨Ã¥¼±Ò¥Î,¶l¥óµLªk³Q¸Ñ±K."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr "S/MIME ¤ä´©¨Ã¥¼±Ò¥Î,¬I¥H¼Æ¦ìÃ±³¹ªº«H¥óµLªkÅã¥Ü."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr "S/MIME ¤ä´©¨Ã¥¼±Ò¥Î,¼Æ¦ìÃ±³¹µLªk³QÅçÃÒ."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME ªº¤ä´©»Ýn¨Ï¥ÎÂÛ¼uµøµ¡(popup windows). °²¦p§AªºÂsÄý¾¹¥Ø«e¨Ã¥¼±Ò¥Î¸Ó¶µ"
 "ÂÛ¼uµøµ¡¥\¯à,½Ð±Ò¥Î¥¦§_«h S/MIME ±NµLªk§@¥Î."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "¥D¦®_u"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "±H¥ó³Æ¥÷©ó_v"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "¥t¦s·sÀÉ_v"
 
-#: search.php:363 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Àx¦s"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:533
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "ªþ¥ó¬O§_ÀHµÛ±H¥ó¤@°_³Æ¥÷ ?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:427
 msgid "Save Draft"
 msgstr "¦s¬°¯ó½Z"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Àx¦s¹Ï¤ù"
+
+#: lib/MIME/Contents.php:211
+msgid "Save Image in Gallery"
+msgstr "Àx¦s¨ìÃÀ´Y¤¤"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Àx¦s¿ï¶µ"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Àx¦s«Hºà"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:427
 msgid "Save _Draft"
 msgstr "¦s¬°¯ó½Z_D"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "¥t¦s·sÀÉ"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "±NÀx¦sªº¯ó½Z¼Ð°O¦¨¥¼¬Ý¹L."
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1060
 msgid "Save recipients automatically to the default address book?"
 msgstr "±H§¹«H¥ó«á,¦Û°Ê±N¸Ó±H¥ó¤¤©Ò¦³¦¬¥ó¹ï¶Hªº¦a§},Àx¦s¨ì¹w³]ªº³q°T¿ý¤¤ ?"
 
@@ -3167,17 +3303,17 @@
 msgid "Save search as a virtual folder?"
 msgstr "Àx¦s·j´M«H¥ó¦¨¤@ÓµêÀÀ«H¥ó§X ?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Àx¦s±H¥ó?"
 
-#: compose.php:1162
+#: compose.php:1251
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Àx¦s¯ó½Z¥¢±Ñ. ¦øªA¾¹¦^À³: %s"
 
-#: templates/contacts/contacts.inc:194 templates/mailbox/header.inc:11
-#: lib/Block/tree_folders.php:50
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:45
 msgid "Search"
 msgstr "·j´M"
 
@@ -3186,7 +3322,11 @@
 msgid "Search %s"
 msgstr "·j´M %s"
 
-#: search.php:316
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "·j´M¿ï¶µ"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "·j´Mµ²ªG"
 
@@ -3210,7 +3350,11 @@
 msgid "Select a field"
 msgstr "¿ï¾Ü¤@ÓÄæ¦ì"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "¿ï¾Ü¤@Ó«Hºà:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "¿ï¾Ü³q°T¿ý¥H·j´M¤Î·s¼W¦a§}."
 
@@ -3230,6 +3374,10 @@
 msgid "Select none"
 msgstr "¤£¿ï¾Ü"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "¿ï¾ÜÃÀ´Y¥HÀx¦s¹Ï¤ù"
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "¿ï¾Ü¦øªA¾¹ªº«¬ºA"
@@ -3238,32 +3386,32 @@
 msgid "Selected Address books:"
 msgstr "¤w¿ï¾Üªº³q°T¿ý:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "¶Ç°eª÷Æ_¦Ü¤½¶}ª÷Æ_¦øªA¾¹"
 
-#: lib/MIME/Viewer/itip.php:600
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "¶Ç°e³Ì·sªº¸ê°T"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:425
 msgid "Send Message"
 msgstr "¶Ç°e¶l¥ó"
 
-#: config/prefs.php.dist:698
+#: config/prefs.php.dist:691
 msgid "Send read receipt when requested by the sender?"
 msgstr "·í±H¥óªÌn¨D¶Ç°e¦^±ø®ÉÅã¥Ü´£¥Ü ?"
 
-#: folders.php:392
+#: folders.php:376
 msgid "Sent mail folder"
 msgstr "±H¥ó³Æ¥÷§X"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "±H¥ó³Æ¥÷§X:"
 
-#: templates/login/login.inc:129 templates/login/login.inc:142
-#: templates/login/login.inc:149
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "¦øªA¾¹"
 
@@ -3279,7 +3427,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "³]©w¨C·í»Õ¤U·h²¾©M§R°£¶l¥ó®Éªº°¾¦n."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "½s¼g·s¶l¥ó®É,¬O§_¤¹³\³]©w¨äÀu¥ý ?"
 
@@ -3295,22 +3443,22 @@
 msgid "Share your mail folders with other users."
 msgstr "¶}©ñ§Aªº«H¥ó§XÅý¨ä¥L¤H¥i¥H¨Ï¥Î."
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
 "¦pªG«H¥ó¤º®e§t¦³¤j½g´Tªº¤Þz¤å¦r,·í¶}±Ò¸Ó«H¥ó®É¹w³]¬°Åã¥Ü©ÎªÌÁôÂÃ¤Þz ?"
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "¬O§_±½ºË¶l¥ó¤º®e(text/plain)¤¤ªº PGP ¸ê®Æ?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "·í·s¶l¥ó¦s¤J¯ó½Z§¨«á¬O§_Ãö³¬½s¼g¶l¥óµøµ¡?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "¨C«Ê¥~±H¶l¥ó§¡ªþ¤W PGP ¤½¶}ª÷Æ_?"
 
@@ -3322,7 +3470,7 @@
 msgid "Show All Headers"
 msgstr "Åã¥Ü¶l¥óªíÀY"
 
-#: mailbox.php:361
+#: mailbox.php:347
 msgid "Show Deleted"
 msgstr "Åã¥Ü¤w§R°£"
 
@@ -3338,43 +3486,43 @@
 msgid "Show Only Subscribed Folders"
 msgstr "¥uÅã¥Ü¤wq¾\ªº«H¥ó§X"
 
-#: folders.php:287
+#: folders.php:277
 msgid "Show Unsubscribed"
 msgstr "Åã¥Ü¥¼q¾\"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "¬O§_¦b¶l¥ó¤¤Åã¥Ü¤@Ó¥Î¨Ó¥h°£ªþ¥óªº¹Ï¥Ü?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:990
 msgid "Show legend in the mailbox view?"
 msgstr "¦b¶l½cÀËµø¤¤Åã¥Ü¦UÃþ¶l¥ó¹Ï¥Üªº»¡©ú?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:828
 msgid "Show previews for unread messages only?"
 msgstr "¥u¦³¥¼¬Ý¹Lªº¶l¥ó¤~¹wÄýÅã¥Ü?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:836
 msgid "Show previews in tooltips?"
 msgstr "·í·Æ¹««ü¼Ð²¾¦Ü¥D¦®Äæ¦ì®É¹wÄýÅã¥Ü?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:865
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "¦b¥\¯àªí¤¤Åã¥Ü '¥~³¡¶l¥ó' ¦¹¤@³sµ²?"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Åã¥Ü¹Ï¤ù"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "¦b¥\¯àªí¤¤Åã¥Ü¹LÂo¾¹¹Ï¦¡?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Åã¥Ü«H¥ó§X¤¤ªº«H¥óÁ`¼Æ ?"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Åã¥Ü"
 
@@ -3382,10 +3530,6 @@
 msgid "Si_ze"
 msgstr "¤j¤p_z"
 
-#: templates/login/login.inc:210
-msgid "Sign up if not registered"
-msgstr "¦pªGÁÙ¤£¬O¥Î¤á½Ðµù¥U"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "¤wÃ±³¹"
@@ -3394,10 +3538,6 @@
 msgid "Size"
 msgstr "¤j¤p"
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr "±Æ¦C¤è¦¡"
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "¨ì¹F¤é´Á±Æ¦C"
@@ -3430,39 +3570,60 @@
 msgid "Spam folder:"
 msgstr "¼s§i½c:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "¯S®í¦r¤¸"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders cannot be edited."
+msgstr "µêÀÀ«H¥ó§XÄÝ¯S®í¥Î³~µLªk³Q½s¿è."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "«÷¼gÀË¬d"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "«÷¦rÀË¬d"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "«÷¦rÀË¬d§¹¦¨"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "°õ¦æ«÷¦rÀË¬d®É¨C¤@¶©ÒÅã¥Üªº¿ù»~¼Æ."
 
-#: lib/MIME/Viewer/itip.php:508 lib/MIME/Viewer/itip.php:648
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "±Ò°Ê"
 
-#: lib/MIME/Viewer/itip.php:684
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "«Hºà"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "«Hºà¦WºÙ:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "«Hºà«¬ºA:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "«Hºà:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "ª¬ºA"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:222
 msgid "Strip Attachment"
 msgstr "¥h°£ªþ¥ó"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:820
 msgid "Strip linebreaks?"
 msgstr "¥h°£Â_¦æ?"
 
@@ -3470,61 +3631,62 @@
 msgid "Sub_ject"
 msgstr "¥D¦®_j"
 
-#: message.php:252 search.php:151 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:149 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "¥D¦®"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:908
 msgid "Subject Field"
 msgstr "¥D¦®Äæ¦ì"
 
-#: search.php:365 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "´£¥æ"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "q¾\"
 
-#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "¦¨¥\"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "«ØÄ³"
 
-#: lib/MIME/Viewer/itip.php:658 lib/MIME/Viewer/itip.php:660
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "ºKn"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:394 templates/compose/compose.inc:397
 msgid "Switch Composition Method"
 msgstr "¤Á´«¶l¥ó½s¼g¤è¦¡"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:398
 msgid "Switch to HTML composition"
 msgstr "¤Á´«¬°ºô¶½s¼g¼Ò¦¡"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:398
 msgid "Switch to plain text composition"
 msgstr "¤Á´«¬°¯Â¤å¦r½s¼g¼Ò¦¡"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:413
 msgid "Te_xt"
 msgstr "¤º®e_x"
 
-#: lib/MIME/Viewer/itip.php:265
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
 msgstr "¼È®É: "
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "¼È®É±µ¨ü½Ð¨D"
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "¼È®É±µ¨ü"
 
@@ -3533,10 +3695,20 @@
 msgid "Terms of Service file not specified in conf.php"
 msgstr "ªA°È¶µ¥ØÀÉ¨Ã¥¼¦b conf.php ¤¤«ü©w"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "¤º®e"
+
+#: config/prefs.php.dist:942
 msgid "The From: column of the message should be linked:"
 msgstr "·íÂI¿ï¶l½cÀËµø¤¤ªº±H¥ó¤HÄæ¦ì®É,À³¸Ó:"
 
+#: lib/IMAP/Client.php:533
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr "IMAP ¦øªA¾¹¤£¤ä´©©Ò«ü©wªºÅçÃÒ¤è¦¡. ½ÐÁpµ¸§Aªº¨t²ÎºÞ²zû."
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "³Áª÷¶ð¸ê·½¤À¤ä"
@@ -3544,7 +3716,7 @@
 #: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
-msgstr "³Áª÷¶ð¸ê·½¤À¤ä¥i³Q¤U¸ü%s."
+msgstr "³Áª÷¶ð¸ê·½¤À¤ä¥i³Q¤U¸ü%s"
 
 #: fetchmailprefs.php:81
 #, php-format
@@ -3556,16 +3728,11 @@
 msgid "The account \"%s\" has been saved."
 msgstr "³oÓ±b¸¹ \"%s\" ¤w³QÀx¦s."
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "¹q¤l¶l¥ó¦í§} \"%s\" ¤w¥[¤J¨ì %s ¤¤."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "§ä¤£¨ìªþ¥[ÀÉ®×."
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "¤£¥¿½Tªº¦æ¨Æ¾ä¸ê®Æ"
 
@@ -3579,82 +3746,89 @@
 msgid "The contents of the Macintosh file are below."
 msgstr "³Áª÷¶ðÀÉ®×ªº¤º®e¦p¤U."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "¥Ø«eªº³o¨Ç«H¥ó§X \"%s\" ±N³Q§ó¦W¬° \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr "µLªkÅª¨ú©Ò¦³Ãö©ó³oÓ«H¥ó§Xªº¦s¨úÅv³]©w"
 
-#: compose.php:1171
+#: compose.php:1260
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
-msgstr "¦¹«Ê¯ó½Z¤w³Q¦s©ñ¨ì«H¥ó§X \"%s\"."
+msgstr "¦¹«Ê¯ó½Z¤wÀx¦s¨ì«H¥ó§X\"%s\"¤¤."
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "¦¹¨Æ¥ó¤w¦¨¥\ªº¼W¥[¨ì§Aªº¦æ¨Æ¾ä¤¤"
 
 #: templates/compose/expand.inc:9
+#, php-format
 msgid "The field \"%s\" can't be expanded."
 msgstr "Äæ¦ì \"%s\" µLªk³QÁr´ú."
 
-#: lib/Folder.php:328
+#: lib/Folder.php:335
 #, php-format
 msgid "The folder \"%s\" already exists"
-msgstr "«H¥ó§X  \"%s\" ¤w¦s¦b"
+msgstr "«H¥ó§X\"%s\"¤w¦s¦b"
 
-#: lib/Folder.php:171
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
-"«H¥ó§X \"%s\" ¦WºÙ§t¦³¤£¦Xªkªº¦r¤¸,³o±N³y¦¨¤@¨Ç°ÝÃD.½Ð³sµ¸§Aªº¨t²ÎºÞ²zû."
+"«H¥ó§X\"%s\"¦WºÙ§t¦³¤£¦Xªkªº¦r¤¸,³o±N³y¦¨¤@¨Ç°ÝÃD.½Ð³sµ¸§Aªº¨t²ÎºÞ²zû."
 
-#: lib/Folder.php:347
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr "«H¥ó§X  \"%s\" ¤w«Ø§´¦ý©|¥¼q¾\."
+msgstr "«H¥ó§X\"%s\"¤w«Ø§´¦ý©|¥¼q¾\."
 
-#: lib/Folder.php:285
+#: lib/Folder.php:270
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "«H¥ó§X  \"%s\" ¤w§R°£¦ý©|¥¼¨ú®øq¾\."
+msgstr "«H¥ó§X\"%s\"¤w§R°£¦ý©|¥¼¨ú®øq¾\."
 
-#: lib/Folder.php:334
+#: lib/Folder.php:341
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "«H¥ó§X  \"%s\" ¨Ã¥¼«Ø¥ß.¦øªA¾¹¦^À³"
+msgstr "«H¥ó§X\"%s\"¨Ã¥¼«Ø¥ß.¦øªA¾¹¦^À³"
 
-#: lib/Folder.php:278
+#: lib/Folder.php:263
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
-msgstr "«H¥ó§X  \"%s\" ¨Ã¥¼§R°£.¦øªA¾¹¦^À³"
+msgstr "«H¥ó§X\"%s\"¨Ã¥¼§R°£.¦øªA¾¹¦^À³"
 
-#: lib/Folder.php:350
+#: lib/Folder.php:357
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "«H¥ó§X  \"%s\" ¤w¦¨¥\«Ø¥ß."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:273
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "«H¥ó§X  \"%s\" ¤w¦¨¥\§R°£."
 
-#: lib/Folder.php:438
+#: lib/Folder.php:461
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "«H¥ó§X  \"%s\" ¤w¦¨¥\³Q§ó¦W¬° \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "¦¹ªþ¥ó¥]§t¤U¦CÀÉ®×:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr "µLªk¶}±Ò¹Ï¤ùÀx¦sµøµ¡. ¦³¥i¯à§A¤w±NÂsÄý¾¹ªºÂÛ¼uµøµ¡¥\¯àÂê©w ?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3672,12 +3846,12 @@
 msgid "The mail server generated the following message:"
 msgstr "¶l¥ó¦øªA¾¹²£¥Í¥H¤Uªº°T®§:"
 
-#: lib/Message.php:614
+#: lib/Message.php:658
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "¶l½c  \"%s\" ¥Ø«e¤w¸g²MªÅ."
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3687,15 +3861,15 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "¶l¥ó¼g§@ªºµøµ¡¤w³QÃö³¬. µ²§ô¤¤."
 
-#: message.php:142
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "¦¹¶l¥ó¤w³Q§R°£."
 
-#: lib/MIME/Viewer/pgp.php:394
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "¦¹¶l¥ó¤w³QÅçÃÒ."
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:389
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "¦¹¶l¥ó¤w³QÅçÃÒ. ¶l¥ó±H¥óªÌ: %s."
@@ -3706,7 +3880,7 @@
 "block popup windows?"
 msgstr "µLªk¶}±Ò±K½Xµøµ¡. ¦³¥i¯à§A¤w±NÂsÄý¾¹ªºÂÛ¼uµøµ¡¥\¯àÂê©w ?"
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "ÂI¿ï %s ÀËµø PGP ¤½¶}ª÷Æ_ªºì©l¤º®e."
@@ -3719,7 +3893,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "¦b Zip ªþ¥ó¤¤§ä¤£¨ì©Ò¶·nªºÀÉ®×."
 
-#: message.php:541
+#: message.php:543
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3727,15 +3901,15 @@
 "notification message."
 msgstr "¶l¥ó±H¥óªÌn¨D¦^À³ªí¥Ü§A¤wÅª¨ú¶l¥ó,½ÐÂI¿ï%s¶Ç°e¦^±ø."
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
-msgstr "¦øªA¾¹µLªk¬°¦¹¼v¹³«Ø¥ßÁY¹Ï."
+msgstr "¦øªA¾¹µLªk¬°³oÓ¹Ï¤ù«Ø¥ßÁY¹Ï."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:107
 msgid "The signature could not be replaced."
 msgstr "¦¹Ã±¦WµLªk³Q¸m´«."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:105
 msgid "The signature was successfully replaced."
 msgstr "Ã±¦W¤w¸m´«§¹¦¨."
 
@@ -3743,7 +3917,22 @@
 msgid "The specified file does not exist."
 msgstr "«ü©wªºÀÉ®×¨Ã¤£¦s¦b."
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "«Hºà\"%s\"·s¼W§¹¦¨."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "«Hºà\"%s\"§R°£§¹¦¨."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "«Hºà\"%s\"§ó·s§¹¦¨."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "¦¹«Ý¿ì¨Æ¶µ¤w¦¨¥\¥[¤J¨ì§Aªº«Ý¿ìÃ¯¤¤."
 
@@ -3774,7 +3963,7 @@
 msgid "The text of the sent message can be viewed %s."
 msgstr "°e¥ó¤º®e½Ð°Ñ¦Ò %s ."
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "¨Ï¥ÎªÌªº free/busy ¸ê°T¤wÀx¦s§¹¦¨."
 
@@ -3786,52 +3975,41 @@
 msgid "There are no messages in this mailbox."
 msgstr "¥Ø«e³oÓ¶l½c¤¤¨S¦³¥ô¦ó«H¥ó."
 
-#: thread.php:69
-#, fuzzy
+#: thread.php:109
 msgid "There is no text that can be displayed inline."
-msgstr "µLªþ¥ó¥iª½±µ¶}±Ò."
+msgstr "¨S¦³¤º®e¥iÅã¥Ü©ó¥»¤å°Ï."
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "¾P·´ %s ®Éµo¥Í°ÝÃD.¦øªA¾¹¦^À³"
-
-#: lib/Message.php:616
+#: lib/Message.php:660
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "¾P·´¶l½c®Éµo¥Í°ÝÃD.¦øªA¾¹¦^À³: %s"
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "¾P·´¶l½c®Éµo¥Í°ÝÃD.¦øªA¾¹¦^À³"
-
-#: lib/Message.php:92
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "¥Ñ \"%s\" ½Æ»s¶l¥ó¨ì«H¥ó§X \"%s\" ®Éµo¥Í¿ù»~.¦øªA¾¹¦^À³"
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:201 lib/Message.php:219
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "±q«H¥ó§X \"%s\" §R°£¶l¥ó®Éµo¥Í¿ù»~.¦øªA¾¹¦^À³"
 
-#: lib/Message.php:277
+#: lib/Message.php:281
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "¦b«H¥ó§X \"%s\" ¤¤§R°£¶l¥ó®Éµo¥Í¿ù»~.¦øªA¾¹¦^À³"
 
-#: lib/Message.php:213
-#, php-format
+#: lib/Message.php:217
 msgid "There was an error deleting messages. This is what the server said: %s"
-msgstr "§R°£¶l¥ó®Éµo¥Í¿ù»~.¦øªA¾¹¦^À³: %s"
+msgstr "§R°£«H¥ó®Éµo¥Í¤@Ó¿ù»~. ¦øªA¾¹¦^À³: %s"
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "§R°£¨Æ¥ó: %s ®Éµo¥Í¤@Ó¿ù»~."
@@ -3840,50 +4018,50 @@
 msgid "There was an error displaying this message part"
 msgstr "ÀËµø¶l¥ó®Éµo¥Í¤@Ó¿ù»~."
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:555
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "¦b«H¥ó§X \"%s\" ¤¤¼ÐÃÑ¶l¥ó®Éµo¥Í¿ù»~.¦øªA¾¹¦^À³"
 
-#: folders.php:155
+#: folders.php:145
 #, php-format
 msgid "There was an error importing %s."
 msgstr "¶×¤J %s ®Éµo¥Í¤@Ó¿ù»~."
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "¶×¤J¨Æ¥ó: %s ®Éµo¥Í¤@Ó¿ù»~."
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "¶×¤J«Ý¿ì¨Æ¶µ: %s ®Éµo¥Í¤@Ó¿ù»~."
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "¶×¤J¨Ï¥ÎªÌªº·|Ä³¸ê°T: %s ®Éµo¥Í¤@Ó¿ù»~."
 
-#: lib/Message.php:87
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "¥Ñ \"%s\" ·h²¾¶l¥ó¨ì«H¥ó§X \"%s\" ®Éµo¥Í¿ù»~.¦øªA¾¹¦^À³"
 
-#: compose.php:1179
+#: compose.php:1268
 msgid "There was an error saving this message as a draft."
-msgstr "Àx¦s¦¹¶l¥ó¬°¯ó½Z®Éµo¥Í¤@Ó¿ù»~."
+msgstr "±N«H¥ó¦s¬°¯ó½Z®Éµo¥Í¤@Ó¿ù»~."
 
-#: compose.php:940
+#: compose.php:1033
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "¶Ç°e¶l¥ó®Éµo¥Í¤@Ó¿ù»~: %s"
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "§ó·s¨Æ¥ó: %s ®Éµo¥Í¤@Ó¿ù»~."
@@ -3892,31 +4070,31 @@
 msgid "There was no text in this message part"
 msgstr "¦¹¶l¥ó¨S¦³¤å¦r¤º®e"
 
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "¦¹«Ê HTML ¶l¥ó¤º´O¹Ï¤ù."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr "¦¹«Ê HTML ¶l¥ó¤º´O¹Ï¤ù.¬Ý°_¨Ó¹³³o¼Ë: "
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "PGP ¤½¶}ª÷Æ_¤wªþ¥[¨ì¦¹¶l¥ó."
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:310
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "³oÓ§@¥Î¤è¦¡¤£³Q¤ä´©."
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:415
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "³oÓ§@¥Î¤è¦¡©|¥¼³Q¹ê§@."
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "³oÓ°Ê§@±N¯Ó¶O¤@¨Ç®É¶¡.Ä~Äò¶Ü?"
 
@@ -3924,13 +4102,13 @@
 msgid "This message contains a Macintosh file."
 msgstr "³o«Ê¶l¥ó¥]§t¤@Ó³Áª÷¶ðÀÉ®×."
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:415
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr "¦¹¶l¥ó©Ò§¨±aªº¤@Óªþ¥ó¤w¸g³z¹L S/MIME ¬I¥H¼Æ¦ìÃ±³¹."
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "¦¹¶l¥ó©Ò§¨±aªº¤@Óªþ¥ó¤w¸g³z¹L S/MIME ¬I¥H¥[±K."
 
@@ -3940,42 +4118,42 @@
 "this message is unknown."
 msgstr "³o«Ê«H¥]§t¶l¥ó»¼°eª¬ºAªº¸ê°T,¦ý¬O«H¥ó®æ¦¡¥¼ª¾."
 
-#: lib/MIME/Viewer/pgp.php:316
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "¦¹¶l¥ó¦ü¥G¤£¬O¬O¥¿½Tªº PGP ¥[±K®æ¦¡.¿ù»~:"
 
-#: lib/MIME/Viewer/pgp.php:241 lib/MIME/Viewer/pgp.php:351
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "¦¹¶l¥ó¦ü¥G¤£¬O¬O¥¿½Tªº PGP ®æ¦¡ (¨Ì¾Ú RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "¦¹¶l¥ó¦ü¥G¤£¬O¬O¥¿½Tªº S/MIME ®æ¦¡."
 
-#: lib/MIME/Viewer/pgp.php:206 lib/MIME/Viewer/pgp.php:417
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "¦¹¶l¥ó¤w¸g³z¹L PGP ¼Æ¦ìÃ±³¹."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "¦¹¶l¥ó¤w¸g³z¹L S/MIME ¼Æ¦ìÃ±³¹."
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "¦¹¶l¥ó¤w¨Ï¥Î S/MIME ¥[±K."
 
-#: lib/MIME/Viewer/pgp.php:202 lib/MIME/Viewer/pgp.php:292
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "¦¹¶l¥ó¤w¨Ï¥Î PGP ¥[±K."
 
-#: message.php:195
+#: message.php:211
 msgid "This message to"
 msgstr "¸Ó¶l¥ó¨ì"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "³o³¡¦øªA¾¹¨Ã¥¼¤ä´©«H¥ó§X¤À¨É¥\¯à."
 
@@ -3983,18 +4161,21 @@
 msgid "This window must be called from a compose window."
 msgstr "³oÓµøµ¡¥²¶·¸g¥Ñ¶l¥ó¼g§@µøµ¡¨Ó©I¥s"
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:151
+msgid "Thread Display"
+msgstr "ÃöÁpÅã¥Ü"
+
+#: thread.php:76 config/prefs.php.dist:910
 msgid "Thread View"
 msgstr "¶l¥óÃöÁpÀËµø"
 
-#: message.php:248 mailbox.php:585 search.php:139
-#: templates/contacts/contacts.inc:214
-#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:594 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "¦¬¥ó¤H"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:907
 msgid "To Address"
 msgstr "¦¬¥ó¤H¦a§}"
 
@@ -4006,11 +4187,17 @@
 "¦pªGn½Æ¿ïÄæ¦ì,½Ð¦bÂI¿ï·Æ¹«ªº®É¦P®É«ö ControlÁä(Ó¤H¹q¸£) ©Î CommandÁä(Ä«ªG¹q"
 "¸£)."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr "±ý¨Ï¥Î TLS ºô¸ô³sµ², §A¥²¶·¨Ï¥Î PHP 5.0.6 ¥H¤W(§t)ªºª©¥»."
+
+#: templates/compose/compose.inc:588
 msgid "Total Attachments Size:"
 msgstr "©Ò¦³ªºªþ¥óÁ`p¤j¤p:"
 
-#: folders.php:383
+#: folders.php:367
 msgid "Trash folder"
 msgstr "©U§£§X"
 
@@ -4018,7 +4205,7 @@
 msgid "Trash folder:"
 msgstr "©U§£½c:"
 
-#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
 #: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "µLªkÅª¨úºÏºÐ°t¸m¸ê®Æ"
@@ -4036,28 +4223,33 @@
 msgid "Undelete"
 msgstr "´_ì¤w§R°£"
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:577 mailbox.php:590 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "ÁôÂÃ¦¬¥ó¤H"
 
-#: lib/MIME/Viewer/itip.php:443
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "µLªk´x±±ªº¤¸¥ó«¬ºA: %s"
 
-#: mailbox.php:544
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "¥¼ª¾ªº¤é´Á"
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "¥¼ª¾ªº IMAP ¦^À³. ¦øªA¾¹¦^À³: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "¥¼ª¾ªº·|Ä³"
 
-#: mailbox.php:597
+#: mailbox.php:606
 msgid "Unknown Recipient"
 msgstr "¥¼ª¾ªº¦¬¥ó¹ï¶H"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "¨ø¸ü±K½X"
 
@@ -4065,46 +4257,51 @@
 msgid "Unnamed"
 msgstr "¥¼©R¦W"
 
-#: message.php:483 mailbox.php:687 templates/message/navbar_navigate.inc:6
+#: message.php:495 mailbox.php:695 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "¥¼¬Ý¹L"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "¨ú®øq¾\"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "ÅÜ§óªþ¥ó¸ê°T"
+#: templates/compose/compose.inc:512
+msgid "Update"
+msgstr "ÅÜ§ó"
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "§ó·s¦^À³ª¬ºA"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "¤W¶Ç"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "¨Ï¥Î¹w³]È"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "¨Ï¥Î IMAP «H¥ó§Xq¾\?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:723
+msgid "Use Virtual Trash Folder?"
+msgstr "¨Ï¥ÎµêÀÀ©U§£½c?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "¨Ï¥ÎªÌ"
 
-#: acl.php:87
+#: acl.php:86
+#, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr "¨Ï¥ÎªÌ \"%s\" ¤w¦¨¥\ªº³Q½á¤©¤U¦CÅv¨ì«H¥ó§X \"%s\"."
 
-#: templates/login/login.inc:178
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "¨Ï¥ÎªÌ¦WºÙ"
 
@@ -4112,128 +4309,161 @@
 msgid "Username:"
 msgstr "¨Ï¥ÎªÌ¦WºÙ:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "ÀËµø"
 
-#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "ÀËµø %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "ÀËµø %s ¤½¶}ª÷Æ_"
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "¦b·sµøµ¡ÀËµø HTML ¤º®e"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "ÀËµø"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "ÀËµøÓ¤H¨p±Kª÷Æ_."
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "ÀËµøÓ¤H¤½¶}ª÷Æ_."
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "ÃöÁpÀËµø"
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "ÁY¹ÏÀËµø"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 msgid "View attachment in a separate window"
 msgstr "¦b·sµøµ¡ÀËµøªþ¥ó"
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "¦b·sµøµ¡ÀËµø"
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "ÀËµø¨Æ¥ó"
 
-#: folders.php:375 mailbox.php:513
+#: folders.php:359 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "ÀËµø %s ¤¤ªº¶l¥ó"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "µn¤J«áÅã¥Ü«H¥ó§X:"
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "ÀËµø«Ý¿ì¨Æ¶µ"
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "ÀËµø¹Ï¤ù"
 
-#: search.php:314
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
-msgstr "µêÀÀ«H¥ó§X \"%s\" ¤w«Ø¥ß§¹¦¨."
+msgstr "µêÀÀ«H¥ó§X\"%s\"¤w«Ø¥ß§¹¦¨."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: lib/Auth/imp.php:175
+msgid "Virtual Folder does not exist."
+msgstr "µêÀÀ«H¥ó§X¤£¦s¦b."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:133 lib/IMAP/Tree.php:146
+#: lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:152 lib/IMAP/Tree.php:153
+#: lib/IMAP/Tree.php:363 lib/IMAP/Tree.php:387 lib/IMAP/Tree.php:425
 msgid "Virtual Folders"
 msgstr "µêÀÀ«H¥ó§X"
 
-#: search.php:296
+#: search.php:245
 msgid "Virtual Folders require a label."
 msgstr "µêÀÀ«H¥ó§X»Ýn¤@Ó¦WºÙ."
 
+#: lib/VFolder.php:176 lib/VFolder.php:186
+msgid "Virtual INBOX"
+msgstr "µêÀÀ¦¬¥ó§X"
+
+#: folders.php:395
+msgid "Virtual INBOX Folder"
+msgstr "µêÀÀ¦¬¥ó§X"
+
+#: mailbox.php:435 lib/Mailbox.php:170 lib/VFolder.php:111 lib/VFolder.php:123
+msgid "Virtual Trash"
+msgstr "µêÀÀ©U§£½c"
+
+#: folders.php:392
+msgid "Virtual Trash Folder"
+msgstr "µêÀÀ©U§£½c"
+
+#: lib/Message.php:639
+msgid "Virtual Trash Folder does not exist."
+msgstr "µêÀÀ©U§£½c¤£¦s¦b"
+
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "µêÀÀ«H¥ó§X¦WºÙ"
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr "Äµ§i"
 
-#: login.php:130
+#: login.php:148
 #, php-format
 msgid "Welcome to %s"
 msgstr "Åwªï¨ì %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "·í¶l¥ó³Q¦^³ø¬°¼s§i©Î¤£¬O¼s§i®ÉÀ³¸Ó?"
+
+#: config/prefs.php.dist:715
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr "·í§R°£¶l¥ó®É, ¤£¼Ð»x¦¨¤w§R°£¦Óª½±µ²¾¨ì©U§£½c?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:895
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "¶}±Ò«H¥ó§X®É,§A§Æ±æ±qþ¤@¶¶}©l?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Àx¦s±H¥ó³Æ¥÷®É,¬O§_¤]n¤@¨ÖÀx¦sªþ¥[ÀÉ®× ?"
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
 msgstr ""
+"¶Ç°e¶l¥ó©Î©m¦WÁr´ú®É¡A¦pªG¨S¦³¿é¤J¦¬¥ó¹ï¶Hªººô°ì¦WºÙ(¹q¤l¶l¥ó¦í§}¨S¦³\"@"
+"\")?¡A¥H¦¹°µ¬°¹w³]ªººô°ì¦WºÙ?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "¤Íµ½¦W³æ"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "¤å¥óÄæ¼e."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:536 templates/compose/compose.inc:549
+#: config/prefs.php.dist:966
 msgid "Yes"
 msgstr "¬O"
 
@@ -4251,25 +4481,42 @@
 msgid "You are attempting to delete the following folder(s)."
 msgstr "§A¥¿¦bÀ|¸Õ§R°£¤U¦C«H¥ó§X."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "§A¥¿¦b½Æ»s/·h²¾¨ì¤@Ó·s«H¥ó§X."
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "§A¥¿¦b«Ø¥ß·sªº¦¸«H¥ó§X¨ì "
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "§A¥¿¦b«Ø¥ß¤@Ó³Ì¤W¼hªº«H¥ó§X."
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:318
+msgid "You are not allowed to create folders."
+msgstr "§A¨S¦³«Ø¥ß«H¥ó§XªºÅv."
+
+#: lib/Folder.php:325
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "¤£¤¹³\§A«Ø¥ß%dÓ¥H¤Wªº«H¥ó§X."
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "§A¥¿¦b¬°«H¥ó§X§ó·s¦WºÙ: "
 
-#: lib/Folder.php:537
-msgid "You can not unsubscribe from \"%s\"."
-msgstr "§AµLªk¨ú®øq¾\\"%s\"."
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr "§A¥i¥H¦b«Hºà¤¤¨Ï¥Î¤U¦C«e¸m¦r¤¸: %c ªí¥Ü¥Ø«e«H¥ó¤¤ªº¤º®e; %s ªí¥ÜÃ±¦W."
+
+#: lib/Folder.php:565
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "§AµLªk¨ú®øq¾\ \"%s\"."
 
 #: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
@@ -4277,11 +4524,11 @@
 "to login."
 msgstr "§A©|¥¼¦P·N¨Ï¥Î±ø´Ú,µLªkÅý§Aµn¤J."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "§A¨S¦³ÅÜ§ó¦¹«H¥ó§X¦s¨ú±±¨îªºÅv"
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "§A´¿¸g©ó %%s Âà±H³o«Ê«H¥óµ¹³o¨Ç¤H: %s."
@@ -4295,38 +4542,34 @@
 msgid "You have 1 new message."
 msgstr "§A¦³¤@«Ê·s¶l¥ó"
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"§A¤w¸g¿ï¾Ü(ÂsÄý)¦Ü¤Ö¤@ÓÀÉ®×¦ý©|¥¼ªþ¥[¨ì¶l¥ó¤¤. §A½T©wn©ñ±ó³o¨Ç¥¼ªþ¥[ªºÀÉ®×"
-"¨Ã¶}©l±H°e¶l¥ó ?"
+#: compose.php:480
+msgid "You have already submitted this page."
+msgstr "§A¤w°e¥X¦¹¶±."
 
-#: lib/IMP.php:1030
+#: lib/IMP.php:1056
 msgid "You have new mail in the following folder:"
 msgstr "§A¦b¤U¦C«H¥ó§X¤¤¦³·s¶l¥ó:"
 
-#: lib/IMP.php:1035
+#: lib/IMP.php:1061
 msgid "You have new mail in the following folders:"
 msgstr "§A¦b¤U¦C¶l½c¤¤¦³·s¶l¥ó:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "§A¥²¶·¦Ü¤Ö¿é¤J¤@¦ì¦¬¥ó¹ï¶H."
 
-#: lib/MIME/Viewer/pgp.php:303
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr "nÀËµø¦¹¶l¥ó¥²¶·¥ý¿é¤J§Aªº PGP Ó¤Hª÷Æ_±K½X."
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr "nÀËµø¦¹¶l¥ó¥²¶·¥ý¿é¤J§Aªº S/MIME Ó¤Hª÷Æ_±K½X."
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "º¥ý¡A§A¥²¶·¥ý¿ï¾Ü¤@Ó¥Øªº«H¥ó§X."
 
@@ -4338,8 +4581,8 @@
 msgid "You must select an address first."
 msgstr "º¥ý¡A§A¥²¶·¥ý¿ï¾Ü¤@Ó¦a§}."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "º¥ý¡A§A¥²¶·¥ý¿ï¾Ü¦Ü¤Ö¤@«Ê¶l¥ó."
 
@@ -4347,65 +4590,62 @@
 msgid "You must specify a recipient."
 msgstr "§A¥²¶·«ü©w¤@Ó¦¬¥ó¤H."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "§A³Ì¤Ö¥²¶·ªþ¥[¤@ÓÀÉ®×."
-
 #: templates/fetchmail/manage.inc:48
+#, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "§A¥²¶·n¦bºûÅ@¾Þ§@ªº¿ï¶µ¤¤¤Ä¿ï \"%s\"."
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "§A¤w©ó %%2$s Âà§}»¼°e¦¹«H¥óµ¹ %1$s."
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "§A¤w©ó %s ¦^ÂÐ¦¹«H¥ó."
 
-#: lib/Folder.php:487
+#: lib/Folder.php:515
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "§A¨Ã¥¼q¾\ \"%s\".¦øªA¾¹¦^À³"
 
-#: lib/Folder.php:539
+#: lib/Folder.php:567
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "§A¨Ã¥¼¨ú®øq¾\ \"%s\".¦øªA¾¹¦^À³"
 
-#: lib/Folder.php:490
+#: lib/Folder.php:518
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "§A¤w¦¨¥\q¾\ \"%s\""
 
-#: lib/Folder.php:542
+#: lib/Folder.php:570
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "§A¤w¦¨¥\¨ú®øq¾\ \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "§Aªº¦WºÙ"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "§Aªº PGP ¤½¶}/¨p±Kª÷Æ_"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "§Aªº¨p±Kª÷Æ_"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "§Aªº¤½¶}ª÷Æ_"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "»Õ¤Uªº¦^¶l¦a§} <i>(«D¥²¶·ªº)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "»Õ¤Uªº¦^¶l¦a§} <em>(«D¥²¶·ªº)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "§Aªº S/MIME ¤½¶}/¨p±K¾ÌÃÒ"
 
@@ -4413,16 +4653,16 @@
 msgid "Your accounts:"
 msgstr "¥~³¡¶l¥óÃÑ§O¦WºÙ:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
-msgstr "»Õ¤Uªº§O¦W¹q¤l¶l¥ó¦a§}: <i>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H·s¦æ¿é¤J)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr "»Õ¤Uªº§O¦W¹q¤l¶l¥ó¦a§}: <em>(«D¥²¶·,¦p¦³¦hµ§½Ð¥H·s¦æ¿é¤J)</em>"
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
-msgstr "§AªºÂsÄý¾¹¨Ã¥¼¤ä´©¦¹ºØ¼v¹³®æ¦¡ªºª½±µÅã¥Ü."
+msgstr "§AªºÂsÄý¾¹¨Ã¥¼¤ä´©¦¹ºØ¹Ï¤ù®æ¦¡ªºª½±µÅã¥Ü."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "¶Ç°e¶l¥óªº¹w³]½s½X¤è¦¡:"
 
@@ -4430,68 +4670,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "¶Ç°e¶l¥óªº¹w³]¥[±K¤è¦¡:"
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Âà¦s¬°ºô§}ªºªþ¥ó¤w³Q¤@Ó¥H¤Wªº¦¬¥ó¹ï¶H¤U¸ü.\n"
+"\n"
+"ªþ¥ó¦WºÙ: %s\n"
+"ªþ¥ó¤é´Á: %s\n"
+"\n"
+"ÂI¿ï¤U¦C³sµ²¥H²¾°£¸Óªþ¥ó:\n"
+"%s"
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "§Aªº¶l¥ó¤w»¼°e§¹¦¨."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "§AªºÃ±¦W:"
 
-#: message.php:272 compose.php:1219 mailbox.php:528 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[ÁôÂÃ¦í§}]"
+
+#: message.php:288 compose.php:1286 mailbox.php:535 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[µL¥D¦®]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Åã¥Ü¦í§} -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Åã¥Ü¦í§} - %s ¦¬¥ó¤H]"
+
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "¯µ¥ó°Æ¥»_B"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "¶Â¦W³æ_B"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "°Æ¥»_C"
 
-#: lib/IMP.php:933
-msgid "_Compose"
-msgstr "¼g«H_C"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "§R°£_D"
 
-#: lib/IMP.php:935
+#: lib/IMP.php:962
 msgid "_Folders"
 msgstr "«H¥ó§X_F"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "¨¥÷ÃÑ§O_I"
 
-#: lib/IMP.php:926
+#: lib/IMP.php:931
 msgid "_Inbox"
 msgstr "¦¬¥ó§X_I"
 
-#: lib/IMP.php:976
+#: lib/IMP.php:1003
 msgid "_Log out"
 msgstr "µn¥X_L"
 
-#: message.php:368
+#: message.php:384
 msgid "_Message Source"
 msgstr "ÀËµøì©lÀÉ_M"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:959
+msgid "_New Message"
+msgstr "¼g«H_N"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "¤Íµ½¦C¦L_P"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "Àu¥ý_P"
 
-#: mailbox.php:402
+#: mailbox.php:401
 #, php-format
 msgid "_Refresh %s"
 msgstr "«·s¾ã²z_R %s"
@@ -4500,11 +4772,11 @@
 msgid "_Reply"
 msgstr "¦^ÂÐ_R"
 
-#: lib/IMP.php:937
+#: lib/IMP.php:964
 msgid "_Search"
 msgstr "·j´M_S"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:425
 msgid "_Send Message"
 msgstr "¶Ç°e¶l¥ó_S"
 
@@ -4512,7 +4784,7 @@
 msgid "_Thread"
 msgstr "ÃöÁp_T"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "¦¬¥ó¤H_T"
 
@@ -4520,58 +4792,126 @@
 msgid "_Undelete"
 msgstr "´_ì¤w§R°£_U"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "ÃöÁpÀËµø_V"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "¤Íµ½¦W³æ_W"
 
-#: lib/Compose.php:351
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "¥¼ª¾ªº¶l¥ó¦í§}"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "ªþ¥ó"
 
-#: view.php:98
+#: view.php:97
 msgid "attachments.zip"
 msgstr "attachments.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:504
 msgid "bytes"
 msgstr "bytes"
 
-#: templates/contacts/contacts.inc:185
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "µLªk«Ø¥ß¿é¥XÀÉ®×."
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "µLªk¶}±Ò¿é¤J"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "±K¥O¦C»yªk¿ù»~"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "³]©w¿ù»~"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "¿ò¥¢«nªº¨t²ÎÀÉ®×"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "¸ê®Æ®æ¦¡¿ù»~"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "§ä¤£¨ì°O¿ý"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "±q"
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "¥¼ª¾ªº¶l¥ó¥D¾÷¦WºÙ"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "¿é¤J/¿é¥X¿ù»~"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "¤º³¡³nÅé¿ù»~"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "ª÷Æ_"
 
-#: folders.php:151
+#: folders.php:141
 msgid "mailbox file"
 msgstr "¶l½cÀÉ®×"
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1097 lib/Message.php:476
 msgid "name"
 msgstr "¦WºÙ"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "¨S¦³"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "©ÎªÌ"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "¦s¨ú¾D©Ú"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "¦¬¥ó¤H]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "³q«H¨ó©w»·ºÝ¿ù»~"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "µL¥i¥ÎªºªA°È"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "Ó«÷¦r¿ù»~"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "Ó«÷¦r¿ù»~"
 
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "¨t²Î¿ù»~"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "¼È®É©Êªº¥¢±Ñ"
+
 #: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "§Aªº¶Â¦W³æ"


--- orig/lib/prefs.php
+++ mod/lib/prefs.php
@@ -1,9 +1,12 @@
 <?php
+
+define('IMP_PREF_NO_FOLDER', '**nofolder');
+
 /**
- * $Horde: imp/lib/prefs.php,v 1.3.10.5 2005/08/13 17:15:55 slusarz Exp $
+ * $Horde: imp/lib/prefs.php,v 1.3.10.16 2006/04/11 17:59:10 slusarz Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -19,19 +22,18 @@
         $sent_mail_new = String::convertCharset(Util::getFormData('sent_mail_new'), NLS::getCharset(), 'UTF7-IMAP');
         $sent_mail_default = $prefs->getValue('sent_mail_folder');
         if (empty($sent_mail_folder) && !empty($sent_mail_new)) {
-            $sent_mail_folder = $sent_mail_new;
+            $sent_mail_folder = IMP::appendNamespace($sent_mail_new);
         } elseif (($sent_mail_folder == '-1') && !empty($sent_mail_default)) {
             $sent_mail_folder = $sent_mail_default;
         }
-        $sent_mail_folder = IMP::stripPreambleString($sent_mail_folder);
         if (!empty($sent_mail_folder)) {
             include_once IMP_BASE . '/lib/Folder.php';
             $imp_folder = &IMP_Folder::singleton();
-            if (!$imp_folder->exists(IMP::addPreambleString($sent_mail_folder))) {
-                $imp_folder->create(IMP::addPreambleString($sent_mail_folder), $prefs->getValue('subscribe'));
+            if (!$imp_folder->exists($sent_mail_folder)) {
+                $imp_folder->create($sent_mail_folder, $prefs->getValue('subscribe'));
             }
         }
-        $identity->setValue('sent_mail_folder', $sent_mail_folder);
+        $identity->setValue('sent_mail_folder', IMP::folderPref($sent_mail_folder, false));
         $updated = true;
     }
 
@@ -44,21 +46,23 @@
 
     if ($conf['user']['allow_folders']) {
         $folder = Util::getFormData($folder);
-        $new = String::convertCharset(Util::getFormData($new), NLS::getCharset(), 'UTF7-IMAP');
         if (isset($folder) && !$prefs->isLocked($pref)) {
-            if (empty($folder) && !empty($new)) {
-                $folder = $new;
-                include_once IMP_BASE . '/lib/Folder.php';
-                $imp_folder = &IMP_Folder::singleton();
-                if (!$imp_folder->create(IMP::addPreambleString($folder), $prefs->getValue('subscribe'))) {
-                    $folder = null;
-                }
+            $new = String::convertCharset(Util::getFormData($new), NLS::getCharset(), 'UTF7-IMAP');
+            if ($folder == IMP_PREF_NO_FOLDER) {
+                $prefs->setValue($pref, '');
             } else {
-                $folder = IMP::stripPreambleString($folder);
-            }
-            if (!empty($folder)) {
-                $prefs->setValue($pref, $folder);
-                $updated = true;
+                if (empty($folder) && !empty($new)) {
+                    $folder = IMP::appendNamespace($new);
+                    include_once IMP_BASE . '/lib/Folder.php';
+                    $imp_folder = &IMP_Folder::singleton();
+                    if (!$imp_folder->create($folder, $prefs->getValue('subscribe'))) {
+                        $folder = null;
+                    }
+                }
+                if (!empty($folder)) {
+                    $prefs->setValue($pref, IMP::folderPref($folder, false));
+                    $updated = true;
+                }
             }
         }
     }
@@ -104,10 +108,6 @@
 function handle_initialpageselect($updated)
 {
     $initial_page = Util::getFormData('initial_page');
-    if ($initial_page != 'folders.php' &&
-        substr($initial_page, 0, strlen(IMP::preambleString())) == IMP::preambleString()) {
-        $initial_page = substr($initial_page, strlen(IMP::preambleString()));
-    }
     $GLOBALS['prefs']->setValue('initial_page', $initial_page);
     return true;
 }
@@ -124,10 +124,37 @@
     return $updated | handlefolders($updated, 'spam_folder', 'spam', 'spam_new');
 }
 
+function handle_defaultsearchselect($updated)
+{
+    $default_search = Util::getFormData('default_search');
+    $GLOBALS['prefs']->setValue('default_search', $default_search);
+    return true;
+}
+
 function prefs_callback()
 {
+    if ($GLOBALS['prefs']->isDirty('use_vtrash')) {
+        require_once IMP_BASE . '/lib/Search.php';
+        $imp_search = new IMP_Search();
+        $imp_search->sessionSetup();
+    }
+
     if ($GLOBALS['prefs']->isDirty('subscribe')) {
-        unset($GLOBALS['imp']['imptree']);
+        require_once IMP_BASE . '/lib/IMAP/Tree.php';
+        $imptree = &IMP_Tree::singleton();
+        $imptree->init();
+    }
+
+    /* If a maintenance option has been activated, we need to make sure the
+     * global Horde 'do_maintenance' pref is also active. */
+    if (!$GLOBALS['prefs']->isLocked('do_maintenance') &&
+        !$GLOBALS['prefs']->getValue('do_maintenance')) {
+        foreach (array('rename_sentmail_monthly', 'delete_sentmail_monthly', 'purge_sentmail', 'delete_attachments_monthly', 'purge_trash') as $val) {
+            if ($GLOBALS['prefs']->getValue($val)) {
+                $GLOBALS['prefs']->setValue('do_maintenance', true);
+                break;
+            }
+        }
     }
 }
 
@@ -138,4 +165,7 @@
 }
 
 /* Make sure we have an active IMAP stream. */
-$GLOBALS['registry']->call('mail/getStream');
+if (!$GLOBALS['registry']->call('mail/getStream')) {
+    header('Location: ' . Util::addParameter(Horde::applicationUrl('redirect.php'), 'url', Horde::selfUrl(true)));
+    exit;
+}


--- orig/po/gl_ES.po
+++ mod/po/gl_ES.po
@@ -16,7 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP 3.1\n"
-"POT-Creation-Date: 2003-03-25 10:00+01500\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-11-03 13:33GMT+1\n"
 "Last-Translator: guille <guille at usc.es>\n"
 "Language-Team: Galego\n"
@@ -25,59 +26,193 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "    Para: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "    Para: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "   Data: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "      De: "
 
-msgid " - $nm new message"
-msgstr " - $nm mensaxe nova"
-
-msgid " - $nm new messages"
-msgstr " - $nm mensaxes novas"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Asunto: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " en "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr "%A, %B %e, %Y, %I:%M:%S %p %Z"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d de %d mensaxes"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Visualizar a mensaxe cando se apliquen os filtros."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d o %d de %d mensaxes"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s xa existe. Non lle cambiou o nome o cartafol %s."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "O nome do cartafol %s vai mudar a comezos de mes."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "O cartafol \"%s\" cambióuselle o nome correctamente a \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aplica os cambios e pasa á seguinte pantalla.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Desfacer tódolos cambios e regresar á pantalla de redacción.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -85,41 +220,189 @@
 "(Regresar á pantalla de redacción despois de aplicar tódolos cambios feitos "
 "ata agora. Os cambios na pantalla actual NON se aplicarán.)"
 
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Regresar á pantalla de redacción despois de aplicar tódolos cambios feitos "
+"ata agora. Os cambios na pantalla actual NON se aplicarán.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Engadir estes premendo en OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Seleccione o(s) enderezo(s) *"
 
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Eliminouse a identidade \"%s\""
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Caracteres especiais"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Caracteres especiais"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Caracteres especiais"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Caracteres especiais"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
 msgstr ""
-"<p><i>Esta mensaxe escribiuse utilizando un xogo de caracteres diferente ó "
-"seu. Se non mostra correctamente,  %sprema aquí</a> para abrila nunha nova "
-"xanela.</i></p>\n"
 
-msgid "Action"
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "Xestor da conta"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Acción"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Engadir á axenda de enderezos (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "engadir unha fonte"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "Engadiuse un arquivo anexo."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Información persoal"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-msgid "Addressbooks"
-msgstr "Axendas de enderezos"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "Axenda de enderezos"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "¡Eliminaranse tódalas mensaxes do(s) cartafol(es)!"
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
 
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Todos"
+
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -127,7 +410,8 @@
 "Tódalas mensaxes do(s) seguinte(s) cartafol(es) descargaranse nun arquivo de "
 "tipo MBOX: "
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
@@ -135,111 +419,348 @@
 "Vanse borrar de vez as mensaxes do cartafol \"%s\" con máis de %s días serán "
 "eliminadas permanentemente."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Vanse eliminar os cartafoles de mensaxes enviadas hai máis de  %s meses ."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Vanse eliminar os cartafoles de mensaxes enviadas hai máis de  %s meses ."
 
-msgid "All"
-msgstr "Todos"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "O cartafol \"%s\" cambióuselle o nome correctamente a \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
 
-msgid "An illegal value was specified."
-msgstr "Especificou un valor non válido."
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "Engadiuse un arquivo anexo."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Produciuse un problema descoñecido ó engadir o novo rexistro."
 
-msgid "Answered messages"
-msgstr "Mensaxes respondidas"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "Produciuse un problema descoñecido ó engadir o novo rexistro."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Respondida"
 
-msgid "Apply All Rules"
-msgstr "Aplicar tódalas regras"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Mensaxes respondidas"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Aplicar os filtros"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Aplicar os filtros"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "Aplicar as regras de filtraxe ó inicio da sesión."
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Aplicar as regras de filtraxe ó descargar o correo."
 
-msgid "April"
-msgstr "Abril"
-
-msgid "Are you SURE you want to continue?"
-msgstr "¿Está SEGURO de que desexa continuar?"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "¿Está seguro de que desexa facer isto?"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "¿Está completamente seguro de que desexa continuar?"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "¿Está seguro de que desexa facer isto?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "¿Está seguro de que desexa eliminar DE VEZ estas mensaxes?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "¿Está seguro de que desexa eliminar DE VEZ estas mensaxes?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "¿Está seguro que desexa baleirar este cartafol?"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "¿Está seguro que desexa baleirar este cartafol?"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "¿Está seguro que desexa baleirar este cartafol?"
+
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "¿Está seguro de que desexa eliminar DE VEZ estas mensaxes?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "¿Está seguro que desexa baleirar este cartafol?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "¿Está seguro que desexa baleirar este cartafol?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Por hora de chegada"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Ascendente"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Acompañar"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Anexos"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "Acompañar"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Acompañar un arquivo"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Anexos"
 
-msgid "August"
-msgstr "Agosto"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Anexos"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Acción"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "Axendas de enderezos dispoñibles:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Regresar a %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Regresar a %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "CCO"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Lista negra"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Texto"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Ambos"
 
-msgid "Cancel Message"
-msgstr "Cancelar a mensaxe"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Cancelar a mensaxe"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Se cancela esta mensaxe perderá o contido."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
-msgstr "Cc:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Persoal"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Cambiar"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Cambialas todas"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Crear un cartafol"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -247,9 +768,12 @@
 "Cambiar opcións de visualización tales como cántas mensaxes verá por páxina "
 "e como se ordenan."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Cambiar as opcións do servidor de correo."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -257,102 +781,312 @@
 "Cambiar o nome, o enderezo electrónico e a sinatura que se ve cando len e "
 "responden ás súas mensaxes."
 
-msgid "Change"
-msgstr "Cambiar"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Buscar correo novo bis cartafoles"
 
-msgid "Checkbox"
-msgstr "Selección"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "Houbo un erro ó enviar a súa mensaxe: %s"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Elixir unha acción:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "Cambiar as opcións do servidor de correo."
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Elixir unha acción:"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
 msgstr "Elixa unha axenda para engadir enderezos."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr ""
 "Elixa a orde de busca nas axendas de enderezos cando expanda enderezos."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Elimináronse tódalas mensaxes de %s."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
 msgstr ""
-"Prema nunha das axendas de enderezos seleccionadas e logo seleccione os "
-"campos polos que desexa buscar."
 
-msgid "Closed Folder"
-msgstr "Cartafol pechado"
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
 
-msgid "Collapse All Folders"
-msgstr "Comprimir tódolos cartafoles"
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr ""
 
-msgid "Collapse All"
-msgstr "Comprimilos todos"
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
 
-msgid "Collapse Folder"
-msgstr "Comprimir o cartafol"
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Redactar mensaxes nunha xanela á parte."
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Redacción da mensaxe (%s)"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
 
-msgid "Compose a message"
-msgstr "Redactar unha nova mensaxe"
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"Prema nunha das axendas de enderezos seleccionadas e logo seleccione os "
+"campos polos que desexa buscar."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Nova"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "Cartafol pechado"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Comprimilos todos"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All"
+msgstr "Comprimilos todos"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Comprimir tódolos cartafoles"
+
+#: folders.php:449
+msgid "Collapse Folder"
+msgstr "Comprimir o cartafol"
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "Nova"
+
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
+msgstr "Redactar unha nova mensaxe"
 
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Redactar mensaxes nunha xanela á parte."
 
+#: config/prefs.php.dist:443
 msgid ""
-"Display confirmation after sending a message? (only when not using a pop-up "
-"compose window)"
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
 msgstr ""
-"¿Amosar confirmación despois de enviar unha mensaxe? (só cando non se use "
-"unha xanela de composición pop-up)"
 
-msgid "Compose"
-msgstr "Nova"
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Cambiar as opcións do servidor de correo."
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
 
-msgid "Contact List"
-msgstr "Lista de contactos"
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
 
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
 "Controla a comprobación do correo novo e a súa notificación polo sistema."
 
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Copiar"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Baleirar a papeleira do lixo"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corrixir"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Texto corrixido"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Non puido eliminar as mensaxes de %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Non puido eliminar as mensaxes de %s: %s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Operacións de mantemento"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Crear"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Crear un cartafol"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "Crear"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Crear un cartafol"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Crear un novo cartafol para o lixo"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Crear un novo cartafol"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Crear un novo cartafol do correo enviado"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Crear un novo cartafol para o lixo"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -360,834 +1094,2976 @@
 "Crear regras de filtraxe para organizar o correo que entra, clasificalo en "
 "cartafoles e eliminar o correo non desexado."
 
-msgid "Create"
-msgstr "Crear"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Crear un novo cartafol do correo enviado"
 
-msgid "Customize how you send mail and where drafts are saved."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
-"Personalizar o envío de correo e o lugar onde se van gardar os borradores."
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
 msgstr ""
-"Personalizar a execución das operacións de mantemento ó iniciar a sesión en %"
-"s."
+"Personalizar o envío de correo e o lugar onde se van gardar os borradores."
 
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Personalizar as tarefas que se executen ó iniciar a sesión en %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Data"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Data"
 
-msgid "December"
-msgstr "Decembro"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Eliminada"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Criterio de clasificación predeterminado:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Orde de clasificación predeterminado:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Eliminada"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Eliminar"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Eliminar cartafol(es)"
 
-msgid "Delete messages"
-msgstr "Eliminar as mensaxes"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Eliminar cartafol(es)"
 
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Eliminar cartafol(es)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Eliminar cartafol(es)"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Eliminar os cartafoles de mensaxes enviadas a principios do mes"
+
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Eliminar os cartafoles de mensaxes enviadas a principios do mes"
 
-msgid "Delete"
-msgstr "Eliminar"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Eliminar as mensaxes"
 
-msgid "Deleted an attachment."
-msgstr "Eliminou un arquivo."
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Eliminada"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Mensaxes eliminadas"
 
-msgid "Deleted"
-msgstr "Eliminada"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Eliminou un arquivo."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Eliminando e movendo mensaxes"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Descendente"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Opcións do usuario"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "¿Atenuar a sinatura?"
 
-msgid "Display Options"
-msgstr "Opcións de visualización"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Visualizar"
 
-msgid "Display message when filters have been applied."
-msgstr "Visualizar a mensaxe cando se apliquen os filtros."
+#: config/prefs.php.dist:479
+#, fuzzy
+msgid "Display confirmation after sending a message?"
+msgstr ""
+"¿Amosar confirmación despois de enviar unha mensaxe? (só cando non se use "
+"unha xanela de composición pop-up)"
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Mostrar a xanela de notificación de correo novo."
 
-msgid "Display"
-msgstr "Visualizar"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "Opcións de visualización"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
 
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Non examinar cartafoles para buscar o correo novo"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "¿Desexa abrir ese cartafol?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Feito"
 
-#, c-format
-msgid "Download %s"
-msgstr "Descargar %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Descargar cartafol(es)"
 
-msgid "Download"
-msgstr "Descargar"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Descargar cartafol(es)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Borrador"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "Cartafol dos borradores:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Cartafol dos borradores:"
 
-msgid "Edit your filter rules"
-msgstr "Editar as regras de filtraxe"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "Enderezo de correo electrónico"
 
-msgid "Edit your identities"
-msgstr "Editar as súas identidades"
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Editar"
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "Lista negra"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Filtros de correo"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Editar as regras de filtraxe"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Editar as regras de filtraxe"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Editar as regras de filtraxe"
+
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Enderezo de correo electrónico"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Elimináronse tódalas mensaxes de %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Baleirar os cartafol(es)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Baleirar os cartafol(es)"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Baleirar a papeleira do lixo"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Baleirar o lixo"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Baleirar o lixo"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Fin da mensaxe reenviada"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "Mensaxes vellas"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "Mensaxe reenviada dende %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Introduza o nome do novo cartafol do lixo"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Introduza o nome do novo cartafol dos borradores"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Introduza o nome do novo cartafol do correo enviado"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Introduza o nome do novo cartafol do lixo"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Redireccionar a mensaxe"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "O rexistro \"%s\" engadiuse correctamente á axenda dos enderezos"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Erro"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "O cartafol \"%s\" foi eliminado correctamente."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Cada 30 segundos"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Cada 5 minutos"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Cada media hora"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Cada minuto"
 
-msgid "Expand All Folders"
-msgstr "Expandir todos os cartafoles"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Expandir "
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Expandir "
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Expandir todos os cartafoles"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Expandir o cartafol"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Expandir os nomes"
 
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr ""
 "¿Expandir por defecto toda a árbore dos cartafoles na vista de cartafoles?"
 
-msgid "February"
-msgstr "Febreiro"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Expandir "
 
-msgid "Field"
-msgstr "Campo"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Correo novo"
 
-msgid "Filename"
-msgstr "Nome do arquivo"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "Correo novo"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Actividade dos filtros: Eliminouse a mensaxe \"%s\" de \"%s\"."
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "Redactar mensaxes nunha xanela á parte."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Aplicar as regras de filtraxe ó inicio da sesión."
+
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Elimináronse tódalas mensaxes de %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Mensaxe reenviada dende %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
-"Actividade dos filtros: A mensaxe \"%s\" de \"%s\" moveuse para o cartafol "
-"\"%s\"."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr "Actividade dos filtros: A mensaxe \"%s\" de \"%s\" botouse ó lixo."
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Ten %s mensaxes novas."
 
-msgid "Filter Rules"
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Filtros"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Filtros"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Outras opcións"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Regras de filtraxe"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
 msgstr "Filtrar os contidos obscenos das mensaxes."
 
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtros"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Atopar"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Primeira páxina"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Primeira páxina"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Reenviar"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Navegador dos cartafoles"
 
-msgid "Folder Prefix"
-msgstr "Prefixo para os cartafoles"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Febreiro"
 
-msgid "Folders"
-msgstr "Cartafoles"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
 
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Reenviar"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Reenviar:"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Fin da mensaxe reenviada"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Mensaxe reenviada dende %s"
 
-msgid "From Address"
-msgstr "Enderezo do remitente"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Información do servidor"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "De"
 
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "De"
 
-msgid "From:"
-msgstr "De:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "Enderezo do remitente"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Reenv:"
 
-msgid "Help"
-msgstr "Axuda"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "Reenv:"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Fin da mensaxe reenviada"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Opcións do usuario"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "Seguinte mensaxe"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Engadir á axenda de enderezos (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "Vei polo fío"
 
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Ocultar as eliminadas"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Ocultar as non subscritas"
 
-msgid "How to prefix quoted lines in a reply:"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Prefixo para citar as liñas da mensaxe de resposta::"
 
-msgid "IMP is not properly configured"
-msgstr "O IMP non se configurou correctamente"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
 
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-msgid "Identities"
-msgstr "Identidades"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity"
-msgstr "Identidade"
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "¡Eliminaranse tódalas mensaxes do(s) cartafol(es)!"
 
-msgid "Identity's name:"
-msgstr "Nome da identidade:"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignorar"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignoralas todas"
 
-msgid "Ignore"
-msgstr "Ignorar"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Important messages"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Importante"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "Importante"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "Importante"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
 msgstr "Mensaxes importantes"
 
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Importante"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Mensaxes importantes"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Elimináronse tódalas mensaxes de %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "¿Incluír a mensaxe orixinal na resposta?"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "¿Incluír a mensaxe orixinal na resposta?"
 
-msgid "January"
-msgstr "Xaneiro"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Ignorar"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "ningún"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Enderezo de correo electrónico"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
 
-msgid "July"
-msgstr "Xullo"
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
 
-msgid "June"
-msgstr "Xuño"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
 
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Lingua"
 
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "Última páxina"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Última páxina"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Última sesión: %s"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Anexos"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "Caixa de correo"
 
-msgid "Last login: Never"
-msgstr "Última sesión: Nunca"
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Acción"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Entrar"
 
-#, c-format
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Entrar a %s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Entrar"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Tarefas de inicio de sesión"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: templates/compose/compose.inc:296
+msgid "Low"
 msgstr ""
-"O inicio de sesión fallou por algunha razón. O máis probable é que escribira "
-"mal o nome de usuario ou chave de acceso."
 
-msgid "Logout"
-msgstr "Pechar a sesión"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
 
-msgid "Mail Filters"
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
 msgstr "Filtros de correo"
 
-msgid "Mail Management"
-msgstr "Xestión do correo"
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "Caixa de correo"
+
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "Filtros de correo"
 
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Caixa de correo"
 
-msgid "Maintenance Operations"
-msgstr "Operacións de mantemento"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Opcións de visualización"
 
-msgid "March"
-msgstr "Marzo"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Marcar como:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "¿Marcar os niveis diferentes da cita con cores distintas?"
 
-msgid "May"
-msgstr "Maio"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Acompañar un arquivo"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Información do servidor"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Abrir o cartafol"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "Mensaxe"
 
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Redactar unha mensaxe"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Data da mensaxe"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "Mensaxes a"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Busca de mensaxes"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Por tamaño da mensaxe"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Código fonte da mensaxe"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Visualización de mensaxes"
 
-msgid "Message fields"
-msgstr "Campos da mensaxe"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Marcas da mensaxe"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Cartafoles de mensaxes"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "Cartafoles de mensaxes"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Eliminou un arquivo."
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Campos da mensaxe"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Campos da mensaxe"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Data da mensaxe"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
 msgstr "A mensaxe enviouse, pero non se gardou en"
 
-msgid "Message"
-msgstr "Mensaxe"
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "A mensaxe enviouse, pero non se gardou en"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "A mensaxe enviouse, pero non se gardou en"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Mensaxes por páxina na lista da caixa do correo."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Mensaxes a"
 
-msgid "Mime Type"
-msgstr "Tipo MIME"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Modificar"
 
-msgid "Move Down"
-msgstr "Mover para abaixo"
-
-msgid "Move Up"
-msgstr "Mover para arriba"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Mover as mensaxes para o cartafol <b>%s</b>"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Mover"
 
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "mover para abaixo"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "seleccionar un cartafol"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "mover para arriba"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Visualización de mensaxes"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nome"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Acción"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Nunca"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "Eliminou un arquivo."
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Nova"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "Abrir o cartafol"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Correo novo"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Seguinte mensaxe"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Mensaxes novas"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Mensaxes novas"
 
-msgid "New"
-msgstr "Nova"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Seguinte"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Seguinte mensaxe"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Seguinte páxina"
 
-msgid "Next"
-msgstr "Seguinte"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "Non"
 
-msgid "No Subject"
-msgstr "Sen asunto"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "Mensaxes novas"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Texto corrixido"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "Anexos"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "non seleccionou ningún cartafol"
 
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Non especificou ningún cartafol"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Mensaxes non eliminadas"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Mensaxes non eliminadas"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "mover a mensaxe para"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "Non hai mensaxes que cumpran o criterio da busca"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Non hai erros de ortografía"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Non hai suxestións"
 
-msgid "No"
-msgstr "Non"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "Non especificou ningún cartafol"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Ningunha"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Non eliminada"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Non é un borrador"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Non é importante"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Non é persoal"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Mensaxes non eliminadas"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Mensaxes non importantes"
 
-msgid "November"
-msgstr "Novembro"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Citando"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Número de cartafoles de correo enviado que se van manter ó eliminalos "
+"mensualmente"
 
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Número de cartafoles de correo enviado que se van manter ó eliminalos "
 "mensualmente"
 
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "Correcto"
 
-msgid "October"
-msgstr "Outubro"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "Mensaxes vellas"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Eliminando os cartafoles de correo enviado vellos"
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "Seleccione un só cartafol para esta operación"
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Abrir o cartafol"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Abrir o cartafol"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "Outras opcións"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "Outras opcións"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "Cancelar a mensaxe"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "Erro"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "Opcións"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "O cartafol \"%s\" foi creado correctamente."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "O cartafol \"%s\" foi eliminado correctamente."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "Enviar a mensaxe"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "A sinatura substituíuse correctamente."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
 
-msgid "Old messages"
-msgstr "Mensaxes vellas"
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
 
-msgid "Old sent-mail folders being purged."
-msgstr "Eliminando os cartafoles de correo enviado vellos"
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
 
-msgid "Open Folder"
-msgstr "Abrir o cartafol"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "Options"
-msgstr "Opcións"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-msgid "Other Options"
-msgstr "Outras opcións"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Páxina %d de %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Parte(s)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "A mensaxe enviouse, pero non se gardou en"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Chave de acceso"
 
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "Realizar as operacións de mantemento ó inicio de sesión"
 
-msgid "Personal Information"
-msgstr "Información persoal"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
 
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Persoal"
 
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "Información persoal"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "¿Quere colocar a súa sinatura na mensaxe de resposta e nos reenvíos?"
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "Introduza o nome do novo cartafol:"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Introduza o nome do novo cartafol:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Introduza o novo nome:"
 
-msgid "Please enter valid search criteria."
-msgstr "Introduza un criterio de busca válido."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "Indique o seu nome de usuario e a chave de acceso"
 
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "Indique o seu nome de usuario e a chave de acceso"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Corrixa os enderezos ambiguos ou incorrectos."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Seleccione un cartafol antes de realizar calquera acción."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "Seleccione polo menos un cartafol no que realizar a busca."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Seleccione polo menos un cartafol no que realizar a busca."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Seleccione un só cartafol para esta operación"
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "Seleccione a caixa de edición a carón de:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Antepoñer a súa sinatura con guións ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "O cartafol \"%s\" foi creado correctamente."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Páxina anterior"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Mensaxe anterior"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Páxina anterior"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Imprimir"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problema coa regra de filtraxe %d: o cartafol non existe: %s"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "Imprimir"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
 
-msgid "Problem?"
-msgstr "¿Problemas?"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Reciclar o lixo"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Reciclar o lixo"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Eliminar cartafol(es)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Reciclar o lixo con esta frecuencia:"
 
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Reciclar do lixo as mensaxes que teñan máis destes días"
 
-msgid "Purge old message in the Trash folder?"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Reciclar as mensaxes vellas do lixo"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Reciclando %d mensaxe(s) do lixo"
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "Reciclando %d mensaxe(s) do lixo"
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Citando"
 
-msgid "Received after"
-msgstr "Recibida despois de"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Recibida o"
 
-msgid "Received before"
-msgstr "Recibida antes de"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Recibida o"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Recibida o"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Redirecciona"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Redirecciona"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Redireccionar a mensaxe"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Redireccionar esta mensaxe"
 
-msgid "Redirect"
-msgstr "Redirecciona"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Fallou o redireccionamento."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Actualizar a vista dos cartafoles"
 
-msgid "Refresh"
-msgstr "Actualizar"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Recargar a vista"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Recargar a vista"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Lembrar a última vista"
 
-msgid "Remove Selected"
-msgstr "Eliminar as seleccionadas"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "Caixa de correo"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "quitar a fonte"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "Cambiarlle o nome ó cartafol"
 
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Cambiarlle o nome ó cartafol do correo enviado ó inicio do mes"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
 "Fallou ó cambiarlle o nome \"%s\" a \"%s\". Esta foi a resposta do servidor"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Responderlles a todos"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Substituír con:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Responder"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Responderlle"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Responderlles a todos"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Responderlles a todos:"
 
-msgid "Reply"
-msgstr "Responder"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "Responderlles a todos"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "Responderlles a todos:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Responderlles a todos"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "Responderlle: "
 
-msgid "Reply-to"
-msgstr "Responderlle"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "Responderlle: "
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Responder:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Denunciar esta mensaxe como correo-lixo (spam)"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Denunciar esta mensaxe como correo-lixo (spam)"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
 msgstr "Solicitar un aviso de recepción"
 
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
+msgstr "Solicitar un aviso de recepción"
+
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Reiniciar"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Reanudar"
 
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Redactar unha mensaxe"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Opcións do usuario"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "¿Regresar á lista da caixa de correo despois de eliminar, mover ou copiar "
 "unha mensaxe?"
 
-msgid "Rule Definition"
-msgstr "Definición da regra"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "Opcións"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "O cartafol \"%s\" foi eliminado correctamente."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "Enviar a mensaxe"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Asunto"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "Gardar a copia en "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Gardar como"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Gardar como"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Gardar o borrador"
 
-msgid "Save a copy in "
-msgstr "Gardar a copia en "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Gardar como"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "Opcións do usuario"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Gardar o borrador"
 
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Gardar como"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Gardar as mensaxes enviadas"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Fallou ó gardar o borrador. Esta foi a resposta do servidor: %s"
 
-msgid "Search Results"
-msgstr "Resultados da busca"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Buscar"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Buscar"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Opcións do usuario"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "Resultados da busca"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Visto"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Seleccionar"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Quitar a selección"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Seleccione unha identidade"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Seleccionalas todas"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Quitar a selección"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 "Seleccionar as fontes de datos das axendas de enderezos para engadir e "
 "buscar enderezos de correo."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Seleccionalas todas"
 
-msgid "Select an identity"
-msgstr "Seleccione unha identidade"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"Elixa a orde de busca nas axendas de enderezos cando expanda enderezos."
 
-msgid "Select charset:"
-msgstr "Seleccione o xogo de caracteres:"
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "Quitar a selección"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Quitar a selección"
 
-msgid "Select your preferred language:"
-msgstr "Seleccione a lingua:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Seleccionar"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Axendas de enderezos seleccionadas:"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Información do servidor"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Enviar a mensaxe"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "Cartafol das mensaxes enviadas:"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Cartafol das mensaxes enviadas:"
 
-msgid "September"
-msgstr "Setembro"
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "Servidor"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "Información do servidor"
 
-msgid "Server"
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
 msgstr "Servidor"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr ""
-"Establece as preferencias para filtrar mensaxes con contido non desexado."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 "Establece as preferencias para as accións que ocorren cando mova ou elimine "
 "mensaxes."
 
-msgid "Set the current time zone."
-msgstr "Establece a zona horaria."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Cartafoles"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Cartafol das mensaxes enviadas:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
-"Establece a lingua para os elementos do menú, das explicacións e da axuda."
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "¿Debe pecharse a xanela de redacción despois de gardar un borrador?"
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Comprimir tódolos cartafoles"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Mostrar as eliminadas"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "Información persoal"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Subscribirse ós cartafol(es)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Mostrar as subscricións canceladas"
 
-msgid "Show last login time when logging in?"
-msgstr "Mostrar a hora da última sesión"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Mostrar unha lenda na lista da caixa de correo."
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "Tamaño"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Tamaño"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Tamaño"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Faltan algúns arquivos de configuración de IMP:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "Enderezo do remitente"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "Por tamaño da mensaxe"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "Sen asunto"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "Fío"
 
-msgid "Sort Direction"
-msgstr "Orde ascendente ou descendente"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "Enderezo do remitente"
 
-msgid "Spam Report from"
-msgstr "Informe sobre o Spam de"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Lixo:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Caracteres especiais"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Comprobar a ortografía"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Corrector ortográfico"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Revisión de ortografía completa"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Erros ortográficos por pantalla durante a revisión."
 
-msgid "Subject Field"
-msgstr "Campo do asunto"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
 
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Acompañar un arquivo"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Asunto"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Asunto"
 
-msgid "Subject:"
-msgstr "Asunto:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Campo do asunto"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "Asunto"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Subscribirse ós cartafol(es)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Correctamente"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Suxestións"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Texto"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Texto"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Eliminouse a identidade \"%s\""
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Gardouse a identidade \"%s\"."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Os cartafol(es) \"%s\" cambiaráselles o nome a \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Eliminouse a identidade \"%s\""
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "O cartafol \"%s\" xa existe"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1195,85 +4071,239 @@
 "O nome do cartafol \"%s\" contén caracteres non válidos. Isto pode causar "
 "problemas. Contacte co administrador do sistema."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Creouse o cartafol \"%s\" pero vostede non está subscrito a el."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Eliminouse o cartafol \"%s\" pero non se cancelou a súa subscrición."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Non se creou o cartafol \"%s\". Esta foi a resposta do servidor"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "A carpeta \"%s\" non foi eliminada. Ista foi a resposta do servidor"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "O cartafol \"%s\" foi creado correctamente."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "O cartafol \"%s\" foi eliminado correctamente."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "O cartafol \"%s\" cambióuselle o nome correctamente a \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "O cartafol \"%s\" xa existe"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
+msgstr "A mensaxe que estaba redactando pechouse. Saíndo."
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "Eliminouse a identidade \"%s\""
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "Gardouse a identidade \"%s\"."
 
-msgid "The message being composed has been closed.  Exiting."
-msgstr "A mensaxe que estaba redactando pechouse. Saíndo."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
 
-msgid "The signature couldn't be replaced."
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "Non se puido substituír a sinatura."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "A sinatura substituíuse correctamente."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Gardouse a identidade \"%s\"."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Eliminouse a identidade \"%s\""
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Eliminouse a identidade \"%s\""
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "borrar a mensaxe"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Redireccionar esta mensaxe"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "A sinatura substituíuse correctamente."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Non hai mensaxes nesta caixa de correo."
 
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr ""
 "Houbo un problema ó baleirar a caixa do correo %s. Esta foi a resposta do "
 "servidor"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 "Houbo un problema ó baleirar a caixa do correo. Esta foi a resposta do "
 "servidor"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
-"Houbo un problema ó subir o arquivo. Se cadra é maior do permitido (%d MB)."
-
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr "Houbo un problema subindo o arquivo. Se cadra e maior do permitido."
+"Houbo un problema ó baleirar a caixa do correo. Esta foi a resposta do "
+"servidor"
 
-#, c-format
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
 "Houbo un erro ó copiar as mensaxes para \"%s\". Esta foi a resposta do "
 "servidor"
 
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
@@ -1281,7 +4311,8 @@
 "Houbo un erro ó eliminar as mensaxes do cartafol \"%s\". Esta foi a resposta "
 "do servidor"
 
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
@@ -1289,13 +4320,22 @@
 "Houbo un erro ó eliminar as mensaxes do cartafol \"%s\". Esta foi a resposta "
 "do servidor"
 
-msgid "There was an error deleting messages. This is what the server said"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Houbo un error ó eliminar as mensaxes. Esta foi a resposta do servidor"
 
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Houbo un erro ó visualizar a mensaxe solicitada."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Houbo un erro ó visualizar esta parte da mensaxe"
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
@@ -1303,167 +4343,431 @@
 "Houbo un erro ó marcar as mensaxes no cartafol \"%s\". Esta foi a resposta "
 "do servidor"
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Houbo un erro marcando mensaxes. Esta foi a resposta do servidor"
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "Houbo un erro ó gardar o borrador."
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr ""
-"Houbo un erro ó mover mensaxes a \"%s\". Ista foi a resposta do servidor"
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Houbo un erro ó visualizar a mensaxe solicitada."
 
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Houbo un erro ó visualizar a mensaxe solicitada."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Houbo un erro ó enviar a súa mensaxe: %s"
+
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Houbo un erro ó botar as mensaxes ó lixo. Esta foi a resposta do servidor"
+"Houbo un erro ó mover mensaxes a \"%s\". Ista foi a resposta do servidor"
 
-msgid "There was an error saving a draft."
-msgstr "Houbo un erro ó gardar o borrador."
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "Houbo un erro ó visualizar esta parte da mensaxe"
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Houbo un erro ó enviar a súa mensaxe: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "Houbo un erro ó recuperar as mensaxes. Esta foi a resposta do servidor"
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Houbo un erro ó enviar a súa mensaxe: %s"
 
-msgid "There was an error viewing the requested message."
-msgstr "Houbo un erro ó visualizar a mensaxe solicitada."
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Houbo un erro ó visualizar esta parte da mensaxe"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr ""
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Isto pode levar algún tempo. ¿Esta seguro de que desexa continuar?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
 msgstr ""
-"Este arquivo xestiona os controladores locais de MIME para IMP, "
-"especíiicamente qué arquivos anexos se poden ver ou descargar."
 
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
 msgstr ""
-"Este arquivo controla as preferencias por defecto para IMP, e tamén controla "
-"as que os usuarios poden cambiar."
 
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"Este arquivo controla a configuración por defecto para IMP, e tamén define a "
-"lista de servidores dispoñibles se vostede emprega a lista de servidores."
 
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
-"Este arquivo controla a folla de estilo que fixa as cores e tipos de letra, "
-"e complementa ou substitúe as predeterminadas de Horde."
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
-"Este é o arquivo principal de configuración de IMP. Contén as rutas ós "
-"arquivos e as opcións para os programas de IMP."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Isto pode levar algún tempo. ¿Esta seguro de que desexa continuar?"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Esta mensaxe foi denunciada como spam ó administrador do sistema."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr ""
 
+#: message.php:211
 msgid "This message to"
 msgstr "A mensaxe para"
 
-msgid "This number must be at least one."
-msgstr "O número debe ser polo menos un 1."
-
-msgid "This value must be a number."
-msgstr "O valor debe ser un número."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "A xanela debe chamarse dende a xanela de redacción"
 
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Visualizar"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Vei polo fío"
 
-msgid "Thread"
-msgstr "Fío"
-
-msgid "Time Zone"
-msgstr "Zona horaria"
-
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Para"
 
-msgid "To:"
-msgstr "Para:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "Enderezo do remitente"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Anexos"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Tamaño total: %s KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Lixo:"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Lixo:"
 
-msgid "Unanswered messages"
-msgstr "Mensaxes sen responder"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Sen responder"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Mensaxes sen responder"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Recuperar"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Non se especificou ningún destinatario"
 
-msgid "Unnamed"
-msgstr "Sen nome"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "Non se especificou ningún destinatario"
 
-msgid "Unread"
-msgstr "Non lida"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
 
-msgid "Unseen Messages"
-msgstr "Mensaxes non vistas"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "Sen nome"
 
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Non vista"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Cancelar a subscrición do(s) cartafol(es)"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Use Ctrl/Option+Click para seleccionar varios campos"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Empregar un valor predeterminado"
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
 msgstr "Usar as subscricións ós cartafoles"
 
-msgid "User Options"
-msgstr "Opcións do usuario"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Baleirar a papeleira do lixo"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Usuario"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
 
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Usuario"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "Usuario"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "Ver %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Ver %s"
 
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Redactar mensaxes nunha xanela á parte."
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Mensaxes novas"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Fío"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Redactar mensaxes nunha xanela á parte."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Redactar mensaxes nunha xanela á parte."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "Ver as mensaxes en"
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Vista ou caixa do correo a mostrar despois de iniciar a sesión:"
 
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "Ver %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Ver as mensaxes en"
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "O cartafol \"%s\" foi eliminado correctamente."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Crear un cartafol"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Baleirar a papeleira do lixo"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "Aviso"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Benvidos/as a %s"
 
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -1471,183 +4775,493 @@
 "Cando se eliminen mensaxes, ¿botalas ó lixo en troques de marcalas como "
 "eliminadas?."
 
-msgid "Wrap text at this many characters."
-msgstr "Axustar ancho da mensaxe a este número de caracteres."
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Si"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Está intentando eliminar os seguintes cartafoles:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Está intentando eliminar os seguintes cartafoles:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Está intentando eliminar os seguintes cartafoles:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "Estalle cambiando o nome ó cartafol:"
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Está creando un subcartafol en "
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Está creando un subcartafol de nível superior."
 
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Está creando un subcartafol de nível superior."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Estalle cambiando o nome ó cartafol:"
 
-#, c-format
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Foi dado de baixa correctamente de \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Ten %s mensaxes novas."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Ten 1 mensaxe nova."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Rematou a sesión.<br />"
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Ten 1 mensaxe nova."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Ten correo novo no seguinte cartafol:"
 
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Ten correo novo nos seguintes cartafoles:"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Primeiro seleccione o arquivo anexo que desexa eliminar."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Debe poñer polo menos un destinatario no campo Para:"
 
-msgid "You must first specify the file to attach."
-msgstr "Primeiro especifique o arquivo que vai achegar."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-msgid "You must have at least one recipient."
-msgstr "Debe poñer polo menos un destinatario no campo Para:"
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Primeiro seleccione un correo de destino."
 
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "Seleccione unha identidade para eliminar."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Primeiro seleccione un enderezo."
 
-msgid "You must select an identity to be deleted."
-msgstr "Seleccione unha identidade para eliminar."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Primeiro seleccione unha mensaxe, polo menos."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Especifique un destinatario no campo Para:"
 
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Primeiro especifique o arquivo que vai achegar."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Redireccionar esta mensaxe"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Redireccionar esta mensaxe"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Non foi subscrito a \"%s\". Esta foi a resposta do servidor"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Non foi dado de baixa de \"%s\". Esta foi a resposta do servidor"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Foi subscrito correctamente a \"%s\""
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Foi dado de baixa correctamente de \"%s\""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "A sesión en %s caducou. Inicie unha nova sesión."
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "Nome completo:"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-msgid "Your From: address:"
-msgstr "O seu enderezo no remite das mensaxes:"
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-msgid "Your Information"
-msgstr "Información"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "Nome completo:"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr ""
 "O enderezo que vai empregar no campo \"Responder -a\" (\"Reply-To\"): <i>"
 "(opcional)</i>"
 
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
+
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "As súas identidades:"
+
+#: config/prefs.php.dist:173
 msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "O seu navegador non admite a opción de impresión. Presione Control/Opción + "
 "P para imprimir."
 
-msgid "Your current time zone:"
-msgstr "Zona horaria:"
-
-msgid "Your default identity:"
-msgstr "Identidade por defecto:"
-
-msgid "Your full name:"
-msgstr "Nome completo:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
 
-msgid "Your identities:"
-msgstr "As súas identidades:"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "As súas opcións actualizáronse."
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "O cartafol \"%s\" foi eliminado correctamente."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Sinatura:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Sen asunto]"
 
-msgid "add source"
-msgstr "engadir unha fonte"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "CCO"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "Lista negra"
 
-msgid "cannot move past the beginning"
-msgstr "non se pode avanzar alén do comezo"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Cc"
 
-msgid "cannot move past the end"
-msgstr "non se pode avanzar alén do final"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Eliminar"
 
-msgid "delete message"
-msgstr "borrar a mensaxe"
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Cartafoles"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Identidade"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Pechar a sesión"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "Código fonte da mensaxe"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Mensaxes novas"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Imprimir"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Actualizar"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Responder"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Buscar"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Enviar a mensaxe"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Fío"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Para"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Recuperar"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Fío"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Acompañar un arquivo"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Anexos"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
 
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "de"
 
-msgid "move down"
-msgstr "mover para abaixo"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-msgid "move message to"
-msgstr "mover a mensaxe para"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-msgid "move up"
-msgstr "mover para arriba"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-msgid "no folder selected"
-msgstr "non seleccionou ningún cartafol"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "non seleccionou ningunha regra"
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Caixa de correo"
 
-msgid "no text specified"
-msgstr "non especificou o texto"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Nome"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ningún"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ou"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "Introduza o texto e escolla un campo e unha acción"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "quitar a fonte"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "seleccionar un cartafol"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "erro de ortografía"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "erros de ortografía"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "onde o campo %s contén <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "erro de ortografía"
 
-msgid "Account Manager"
-msgstr "Xestor da conta"
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "Lista negra"
 
-msgid "Set/install a forward to:"
-msgstr "Establecer a dirección de correo a reenviar:"
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/lib/MIME/Viewer/enriched.php
+++ mod/lib/MIME/Viewer/enriched.php
@@ -6,9 +6,9 @@
  * The IMP_MIME_Viewer_enriched class renders out plain text from
  * enriched content tags, ala RFC 1896
  *
- * $Horde: imp/lib/MIME/Viewer/enriched.php,v 1.33.10.4 2005/09/30 03:22:37 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/enriched.php,v 1.33.10.6 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2001-2005 Eric Rostetter <eric.rostetter at physics.utexas.edu>
+ * Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/templates/mailbox/mailbox.html
+++ mod/templates/mailbox/mailbox.html
@@ -1,9 +1,9 @@
 <loop:messages>
  <tr id="row<tag:messages.uid />" class="<tag:messages.bg />">
   <td>
-   <tag:overflow_begin /><input id="check<tag:messages.uid />" type="checkbox" class="checkbox" name="indices[]" onclick="selectRow(<tag:messages.uid />);" value="<tag:messages.uid /><if:search_mbox><tag:idx_separator /><tag:messages.mbox /></if:search_mbox>" /><label for="check<tag:messages.uid />"><tag:messages.status /></label><tag:overflow_end />
+   <tag:overflow_begin /><input id="check<tag:messages.uid />" type="checkbox" class="checkbox" name="indices[]" onclick="selectRow(<tag:messages.uid />);" value="<tag:messages.uid /><if:search_mbox><tag:idx_separator /><tag:messages.mbox /></if:search_mbox>" /><if:messages.status><label for="check<tag:messages.uid />"><tag:messages.status /></label></if:messages.status><tag:overflow_end />
   </td>
-  <td<if:messages.color> style="background-color:<tag:messages.color />;"</if:messages.color>>
+  <td<if:messages.color> style="background:<tag:messages.color />"</if:messages.color>>
    <tag:overflow_begin /><tag:messages.number /><tag:overflow_end />
   </td>
   <td><tag:overflow_begin /><tag:messages.date />&nbsp;<tag:overflow_end /></td>


--- orig/config/mime_drivers.php.dist
+++ mod/config/mime_drivers.php.dist
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/config/mime_drivers.php.dist,v 1.35.10.1 2005/08/05 14:39:11 jan Exp $
+ * $Horde: imp/config/mime_drivers.php.dist,v 1.35.10.2 2005/10/18 12:13:29 jan Exp $
  *
  * Decide which output drivers you want to activate for the IMP application.
  * Settings in this file override settings in horde/config/mime_drivers.php.


--- orig/locale/zh_CN/help.xml
+++ mod/locale/zh_CN/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/zh_CN/help.xml,v 1.16.6.1 2005/01/25 22:05:50 jan Exp $ -->
+<!-- $Horde: imp/locale/zh_CN/help.xml,v 1.16.6.5 2006/03/23 00:24:06 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/po/nl_NL.po
+++ mod/po/nl_NL.po
@@ -1,198 +1,205 @@
 # IMP Dutch translation.
-# Copyright (C) 2001 Jan Kuipers.
-# Jan Kuipers <jrkuipers at lauwerscollege.nl>, 2001.
+# Copyright (C) 2001-2006 Jan Kuipers.
+# Jan Kuipers <jrkuipers at lauwerscollege.nl>, 2001-2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0.3-cvs\n"
+"Project-Id-Version: IMP 4.1.1-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-23 19:49+0100\n"
-"PO-Revision-Date: 2005-03-23 21:24+0100\n"
+"POT-Creation-Date: 2006-03-12 00:31+0100\n"
+"PO-Revision-Date: 2006-03-13 22:41+0100\n"
 "Last-Translator: Jan Kuipers <jrkuipers at lauwerscollege.nl>\n"
 "Language-Team: Dutch <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "      Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "      Aan: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "    Datum: "
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "      Van: "
 
-#: mailbox.php:399
+#: mailbox.php:408 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Sneltoets %s)"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr " Onderwerp: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " in "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB (%.2f%%)"
 
-#: mailbox.php:190
+#: thread.php:156
 #, php-format
-msgid "%d message(s) have been deleted."
+msgid "%d Messages"
+msgstr "%d berichten"
+
+#: mailbox.php:175
+#, php-format
+msgid "%d messages have been deleted."
 msgstr "%d berichten zijn verwijderd."
 
-#: lib/Spam.php:182
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "%d berichten zijn aan uw systeembeheerder gerapporteerd als geen spam."
 
-#: lib/Spam.php:162
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d berichten zijn gerapporteerd als geen spam."
 
-#: lib/Spam.php:174
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d berichten zijn aan uw systeembeheerder gerapporteerd als spam."
 
-#: lib/Spam.php:154
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d berichten zijn gerapporteerd als spam."
 
-#: mailbox.php:362
+#: mailbox.php:358
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d to %d van %d berichten"
 
-#: mailbox.php:607
+#: mailbox.php:635
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP beheer"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME beheer"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s bestaat reeds. Uw %s map is niet hernoemd."
 
-#: lib/Message.php:633
+#: lib/Message.php:685
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s lijkt niet een geldige mailbox te zijn."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s map zal worden hernoemd aan het begin van de maand."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s heeft geaccepteerd."
 
-#: lib/MIME/Viewer/itip.php:603
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s heeft %s afgezegd."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s heeft \"%s\" afgezegd."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s is afgenomen."
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s heeft geantwoord op een vrij/bezet verzoek."
 
-#: lib/MIME/Viewer/itip.php:583
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s heeft geantwoord op de uitnodiging voor %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s heeft geantwoord op de uitnodiging voor \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s heeft u vrij/bezet informatie toegezonden."
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s is voorlopig geaccepteerd."
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s vraagt uw vrij/bezet informatie."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s vraagt uw aanwezigheid bij %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s vraagt uw aanwezigheid bij \"%s\"."
 
-#: lib/Message.php:388
+#: lib/Message.php:461
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s met succes toegevoegd aan %s."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s met succes toegevoegd aan \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s wenst %s in te brengen."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s wenst \"%s\" in te brengen."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s wenst u op de hoogte te brengen van %s."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s wenst u op de hoogte te brengen van \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s wenst de laatste informatie te ontvangen over %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s wenst de laatste informatie te ontvangen over \"%s\"."
 
-#: message.php:276 message.php:281
+#: message.php:292 message.php:297
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;van&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Bevestig deze wijzigingen en ga naar het volgende scherm.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Maak alle wijzigingen ongedaan en ga terug naar \"Nieuw bericht\".)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Platte tekst)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -201,7 +208,7 @@
 "aangebrachte wijzigingen. Veranderingen op het huidige scherm worden NIET "
 "doorgevoerd.)"
 
-#: spelling.php:274
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -209,56 +216,56 @@
 "(Verzend bericht na uitvoering van alle wijzigingen tot nu toe. "
 "Veranderingen op het huidige scherm worden NIET doorgevoerd.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Toevoegen, klik op OK *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Selecteer adres(sen), a.u.b. *"
 
-#: lib/Spam.php:184
+#: mailbox.php:173
+msgid "1 message has been deleted."
+msgstr "1 bericht is verwijderd."
+
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "1 bericht is aan uw systeembeheerder gerapporteerd als geen spam."
 
-#: lib/Spam.php:164
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "1 bericht is gerapporteerd als geen spam."
 
-#: lib/Spam.php:176
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 bericht is aan uw systeembeheerder gerapporteerd als spam."
 
-#: lib/Spam.php:156
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "1 bericht is gerapporteerd als spam."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 karakters"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 karakters"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 karakters"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 karakters"
 
-#: lib/MIME/Viewer/itip.php:61
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>De agendadata is ongeldig</b>"
-
-#: lib/MIME/Viewer/images.php:159
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Een grote afbeelding %s is gekoppeld met dit bericht."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -270,113 +277,117 @@
 msgid "AND"
 msgstr "EN"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Accepteren en aan mijn agenda toegevoegen"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Verzoek accepteren"
 
-#: lib/MIME/Viewer/itip.php:738
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: lib/IMP.php:911 lib/IMP.php:913
-msgid "Acco_unts"
-msgstr "Acco_unts"
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr "Geaccepteerd: "
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Accountnaam:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Bewerkingen"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Voeg %s toe aan mijn adresboek"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Bron toevoegen"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Dit aan mijn agenda toevoegen"
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Voeg toe aan adresboek (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Aan mijn agenda toevoegen"
 
-#: compose.php:1167
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" als bijlage toegevoegd."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Extra koppen tonen bij weergave: <i>(optioneel, elke kop op een nieuwe regel "
-"invoeren)</i>"
+"Extra koppen tonen bij weergave: <em>(optioneel, elke kop op een nieuwe "
+"regel invoeren)</em>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Extra informatie kan worden bekeken %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Extra informatiedetails"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Extra berichtdetails"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Extra berichtdetails kunnen bekeken worden %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Extra berichtfoutdetails"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Extra berichtfoutdetails kunnen bekeken worden %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adresboeken"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Adressen naar BCC alle berichten: <i>(optioneel, elk adres op een nieuwe "
-"regel invoeren)</i>"
+"Adressen naar BCC alle berichten: <em>(optioneel, elk adres op een nieuwe "
+"regel invoeren)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Adressen welke expliciet aan deze identiteit gekoppeld worden: <i>"
-"(optioneel, elk adres op een nieuwe regel invoeren)</i>"
+"Adressen welke expliciet aan deze identiteit gekoppeld worden: <em>"
+"(optioneel, elk adres op een nieuwe regel invoeren)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "Alle"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Alle berichten in de map(pen) zullen verloren gaan!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -384,7 +395,7 @@
 "Alle berichten in de volgende map(pen) worden gedownload naar één MBOX "
 "bestand:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -393,53 +404,62 @@
 "Alle berichten in uw \"%s\" map, ouder dan %s dagen, zullen definitief "
 "worden verwijderd."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:63
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr ""
 "Alle oude gekoppelde bijlagen, ouder dan %s maanden, zullen worden "
 "verwijderd."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Alle oude \"OUTBOX\" mappen, ouder dan %s maanden, zullen worden verwijderd."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
-"Alle rechten op map '%s' voor gebruiker '%s' werden met succes verwijderd."
+"Alle rechten op map \"%s\" voor gebruiker \"%s\" werden met succes "
+"verwijderd."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Maken van mappen toestaan?"
 
-#: templates/filters/prefs.inc:55
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Toepassen van filterregels op elke mailbox toestaan?"
 
-#: lib/MIME/Viewer/alternative.php:113
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Alternatieve onderdelen voor deze sectie:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "Altijd"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Altijd bijlagen opslaan"
 
-#: lib/Message.php:481
+#: lib/Message.php:551
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
 "Een fout bij de poging om de bijlage te strippen. De IMAP server meldt:"
 
-#: lib/Message.php:375
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
+msgstr "Een onbekende fout opgetreden bij het maken van de nieuwe notitie."
+
+#: lib/Message.php:434
 msgid "An unknown error occured while creating the new task."
 msgstr "Een onbekende fout opgetreden bij het maken van de nieuwe taak."
 
-#: mailbox.php:677 message.php:490 templates/message/navbar_navigate.inc:9
+#: mailbox.php:708 message.php:503 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/legend.inc:6 templates/mailbox/navbar.inc:18
 #: templates/mailbox/navbar.inc:35
 msgid "Answered"
@@ -458,27 +478,23 @@
 msgid "Apply Filters to %s"
 msgstr "Filters toepassen op %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Filterregels toepassen bij aanmelding?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Filterregels toepassen wanneer INBOX wordt weergegeven?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Weet u ZEKER dat u verder wilt gaan?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Weet u heel ZEKER dat u verder wilt gaan?"
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Weet u zeker dat u deze virtuele map definitie wilt verwijderen?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Weet u zeker dat u deze openbare sleutel wilt verwijderen?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:83
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -489,12 +505,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Weet u zeker dat u dit wilt doen?"
 
-#: message.php:398 templates/mailbox/javascript.inc:68
-#: templates/folders/javascript.inc:73
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Weet u zeker dat u deze berichten DEFINITIEF wilt verwijderen?"
 
-#: lib/MIME/Contents.php:215
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Weet u zeker dat u deze bijlage DEFINITIEF wilt verwijderen?"
 
@@ -502,7 +517,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Weet u zeker dat u deze map wilt leegmaken?"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:951
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Weet u zeker dat u uw spam map wilt leegmaken?"
+
+#: lib/IMP.php:944
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Weet u zeker dat u uw prullenbak wilt leegmaken?"
 
@@ -510,43 +529,39 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Weet u zeker dat u deze berichten DEFINITIEF wilt verwijderen?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Weet u zeker dat u dit bericht als onschuldig wilt rapporteren?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Weet u zeker dat u dit bericht als spam wilt rapporteren?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Aankomsttijd"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Toenemend"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Vragen"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Toevoegen"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:470
 msgid "Attach Files"
 msgstr "Toegevoegde bestanden:"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:451
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Een kopie van uw openbare PGP sleutel aan uw bericht toevoegen?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Toegevoegd bestand:"
 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -554,38 +569,46 @@
 "Toegevoegd bestand \"%s\" overschrijdt de maximum bijlagegrootte. Bestand is "
 "NIET toegevoegd."
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Een antwoord op een, door u gezonden agendaverzoek, is toegevoegd."
 
-#: mailbox.php:711 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/attachments.js:98
-#: templates/compose/compose.inc:496
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/attachments.js:55 templates/compose/compose.inc:498
 msgid "Attachment"
 msgstr "Bijlage"
 
-#: compose.php:977 lib/Message.php:442
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Bijlage %s is verwijderd."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Bijlageinformatie"
+
+#: compose.php:1105 lib/Message.php:513
 msgid "Attachment stripped: Original attachment type"
 msgstr "Bijlage gestript: origineel bijlagetype"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:998
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Bijlagen"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "Aanwezigen"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Aandacht"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Vereiste IMAP extentie niet gevonden."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -597,7 +620,7 @@
 msgid "Available Address books:"
 msgstr "Beschikbare adresboeken:"
 
-#: lib/MIME/Viewer/itip.php:704
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "In afwachting van antwoord"
 
@@ -606,31 +629,53 @@
 msgid "Bac_k to %s"
 msgstr "_Terug naar %s"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Terug naar %s"
 
-#: message.php:257 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Terug naar Meerdere Berichten Weergave index"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Terug naar Threadweergave"
+
+#: lib/IMAP/Client.php:572
+msgid "Bad login name or password."
+msgstr "Foutieve gebruikersnaam of wachtwoord."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Foutieve of misvormde aanvraag. De server meldt: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Foutieve aanvraag: %s."
+
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Hieronder staat de ruwe tekst van het statusinformatiebericht."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Zwarte lijst"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Blokkeer afbeeldingen in HTML berichten, tenzij deze specifiek aangevraagd "
 "worden?"
 
-#: search.php:161
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Body"
 
@@ -639,27 +684,31 @@
 msgid "Both"
 msgstr "Beide"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Zowel in header als in body van bericht weergeven"
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr "CRAM-MD5 of DIGEST-MD5 vereist dat Auth_SASL is geinstalleerd."
+
+#: templates/compose/compose.inc:270
 msgid "C_harset"
 msgstr "Karak_terset"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Agenda"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "Kan niet verbinden met de mailserver op afstand."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "Kan niet verbinden met de mailserver op afstand: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -668,15 +717,16 @@
 "Kan niet weergeven - alleen %s van %s onderdelen van dit bericht in de "
 "huidige mailbox gevonden."
 
-#: templates/smime/import_key.inc:85 templates/smime/passphrase.inc:22
+#: folders.php:270 templates/saveimage/saveimage.inc:19
+#: templates/smime/import_key.inc:86 templates/smime/passphrase.inc:21
 #: templates/pgp/import_key.inc:66 templates/pgp/passphrase.inc:32
-#: templates/folders/import.inc:21 templates/contacts/contacts.inc:253
-#: templates/compose/spelling.inc:106
+#: templates/folders/import.inc:21 templates/contacts/contacts.inc:255
+#: templates/compose/spelling.inc:120
 msgid "Cancel"
 msgstr "Afbreken"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Bericht afbreken"
 
@@ -684,28 +734,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Bij afbreken van dit bericht, gaat de inhoud definitief verloren."
 
-#: message.php:256 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:686
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Certificaatimport is niet beschikbaar. Bestand upload is uitgeschakeld op "
+"deze server."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Voorzitter"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Wijzigen"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Wijzig alles"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Wijzig map"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -725,23 +783,23 @@
 "Wijzig de naam, adres en ondertekening die men ziet bij het lezen en "
 "beantwoorden van uw e-mail."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Weer te geven karakters:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Controleer map(pen) op nieuwe mail"
 
-#: templates/mailbox/message_headers.inc:65 templates/folders/actions.inc:2
+#: templates/mailbox/message_headers.inc:75 templates/folders/actions.inc:2
 msgid "Check _All/None"
 msgstr "Controleer _Alles/Geen"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Controleer alle mailservers, waarvan u mail wilt ophalen:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Spellingscontrole voor versturen van een bericht?"
 
@@ -749,13 +807,14 @@
 msgid "Choose Action:"
 msgstr "Kies bewerking:"
 
-#: config/servers.php.dist:184
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Kies een mailserver:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:716
-msgid "Choose an action:"
-msgstr "Kies een bewerking:"
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
+msgid "Choose a match or edit the address to the right:"
+msgstr "Kies een overeenkomst of bewerk het adres aan de rechterkant:"
 
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
@@ -766,49 +825,45 @@
 msgstr ""
 "Kies de volgorde van adresboeken om te doorzoeken t.b.v. naamsuitbreiding."
 
-#: lib/MIME/Viewer/images.php:109
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Klik op %s om de afbeelding te converteren naar een formaat wat uw browser "
 "kan weergeven."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Klik %s om de afbeelding te downloaden."
 
-#: lib/Filter.php:114
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Klik %s om naar de %s beheerpagina te gaan."
 
-#: lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Klik %s om HTML inhoud in een apart scherm te bekijken."
 
-#: lib/MIME/Viewer/images.php:160
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Klik op %s om een thumbnail van deze afbeelding weer te geven."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:424
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Klik %s om de bijlage in een apart scherm te bekijken."
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 "Klik %s om dit multipart/related onderdeel in een apart scherm te bekijken."
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Click here to HIDE the Images"
-msgstr "Klik hier om de afbeeldingen te verbergen"
-
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Klik hier om de afbeeldingen weer te geven"
 
@@ -820,48 +875,48 @@
 "Klik op één van uw geselecteerde adresboeken en selecteer daarna alle velden "
 "welke doorzocht dienen te worden."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Klik om de openbare PGP sleutel in uw adresboek op te slaan"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "Klik om het S/MIME certificaat van %s in uw adresboek op te slaan"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Klikken op het adres zal een nieuw bericht maken voor de afzender"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Klikken op het adres zal het bericht openen om te lezen"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Sluiten"
 
-#: compose.php:751 compose.php:1058
+#: compose.php:418
 msgid "Close this window"
 msgstr "Sluit dit venster"
 
-#: folders.php:383
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Gesloten map"
 
-#: folders.php:403
+#: folders.php:430
 msgid "Collapse"
 msgstr "Inklappen"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Alles inklappen"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Alle mappen inklappen"
 
-#: folders.php:403
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Map inklappen"
 
@@ -869,32 +924,23 @@
 msgid "Color Indicator: "
 msgstr "Kleurindicator: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:101
 msgid "Comment"
 msgstr "Opmerking"
 
-#: lib/MIME/Viewer/itip.php:754
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Afgerond"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Nieuw bericht"
-
-#: mailbox.php:741 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Nieuw bericht (%s)"
-
-#: compose.php:750 compose.php:1057
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Maak een ander bericht"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Maak een nieuw bericht in een apart scherm?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -902,29 +948,37 @@
 "Maak berichten m.b.v. een HTML gebruikersinterface (wanneer de browser dit "
 "ondersteunt)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Instellen hoe berichten worden weergegeven."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Mailpreviewopties instellen."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Verbinding verbroken door IMAP server."
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Verbinding met de server mislukt"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Beheer PGP ondersteuning van %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Beheer S/MIME ondersteuning van %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Besturingsopties voor zoeken van berichten."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -932,7 +986,7 @@
 "Bepaal wanneer gecontroleerd wordt op nieuwe mail en of u van de aankomst "
 "hiervan, wel of niet van op de hoogte gebracht wil worden."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Converteer tekst emoticons naar grafische emoticons?"
 
@@ -940,63 +994,80 @@
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Kopieer naar map"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corrigeren"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Gecorrigeerde tekst"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Kon aanvraag niet afronden. Opgegeven reden: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Kon het VFS backend %s niet maken"
 
-#: lib/Message.php:624
+#: lib/Message.php:676
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Kon berichten in %s niet verwijderen. De server meldt: %s"
 
-#: lib/Session.php:294
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Kon onderhoudswerkzaamheden niet uitvoeren."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Kon het gewenste bestand niet uit de MS-TNEF bijlage halen."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Kon het gewenste bestand niet uit het zip-bestand halen."
 
-#: search.php:356 templates/fetchmail/account_select.inc:26
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Kon geen beveiligde verbinding met de IMAP server openen. %s : %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Kon geen namespace informatie van de IMAP server ophalen."
+
 #: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Maken"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Maak map"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:135
 msgid "Create Keys"
 msgstr "Sleutels maken"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Maak virtuele map"
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Een nieuw account maken"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Maak een nieuwe spam map"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Maak een nieuwe kladmap"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Maak een nieuwe OUTBOX"
 
@@ -1004,7 +1075,7 @@
 msgid "Create a new trash folder"
 msgstr "Maak een nieuwe prullenbak"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1012,12 +1083,24 @@
 "Maak filterregels om uw inkomende mail te organiseren, b.v. sorteren naar "
 "mappen, of het verwijderen van spam."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Maak nieuw postpapier"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Maak postpapier en formulierantwoorden."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Huidige toegang tot %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:979
+msgid "Current expanded status in the folders view"
+msgstr "Huidige uitgeklapte status in de mappenweergave"
+
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Instellen van accounts voor het ophalen van mail van andere accounts."
 
@@ -1030,75 +1113,100 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Aanpassen van taken tijdens aanmelding bij %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "_Datum"
 
-#: message.php:253 thread.php:75
+#: message.php:269 thread.php:153
 msgid "Date"
 msgstr "Datum"
 
-#: lib/MIME/Viewer/itip.php:742
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "Afgenomen"
 
-#: config/prefs.php.dist:894
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr "Afgenomen:"
+
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Standaard"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Standaard zoekveld"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Standaard sorteercriteria:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Standaard sorteervolgorde:"
 
-#: lib/MIME/Viewer/itip.php:750
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Overgedragen"
 
-#: folders.php:374 templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: folders.php:400 templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/compose/attachments.inc:28
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Openbare sleutel %s verwijderen"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:83
 msgid "Delete Current Keys"
 msgstr "Huidige sleutels verwijderen"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Verwijder map(pen)"
 
-#: folders.php:374
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "Verwijder geselecteerde mappen"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Verwijder postpapier"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Verwijder virtuele map"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Verwijder virtuele map definitie voor %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Verwijder opgehaalde berichten van de server op afstand?"
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Verwijder uit mijn agenda"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Verwijder oude gekoppelde bijlagen aan het begin van de maand?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Verwijder oude \"OUTBOX\" mappen aan het begin van de maand?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Verwijder spamberichten nadat deze als spam zijn gerapporteerd?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Verwijder spamberichten"
 
-#: mailbox.php:701 message.php:493 templates/mailbox/legend.inc:8
+#: mailbox.php:734 message.php:506 templates/mailbox/legend.inc:8
 #: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
 msgid "Deleted"
 msgstr "Verwijderd"
@@ -1107,7 +1215,7 @@
 msgid "Deleted messages"
 msgstr "Verwijderde berichten"
 
-#: compose.php:292
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Bijlage \"%s\" is verwijderd."
@@ -1116,77 +1224,89 @@
 msgid "Deleting and Moving Messages"
 msgstr "Verwijderen en verplaatsen van berichten"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Weiger verzoek"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Weiger verzoek voor vrij/bezet informatie"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Afnemend"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:656
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Beschrijving"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:70 templates/pgp/pgp.inc:75
 msgid "Details"
 msgstr "Details"
 
-#: config/prefs.php.dist:680
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "\"%s\" is niet gekoppeld omdat het bestand leeg was."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Dim ondertekeningen?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Weergeven"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Bevestiging weergeven na versturen van een bericht?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Weergeven in body van bericht"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Weergeven van pop-up notificatie van nieuwe mail?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Weergeven van 'Prullenbak legen' in de menubalk?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Weergeven van \"Spam legen\" in de menubalk?"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Weergeven van \"Prullenbak legen\" in de menubalk?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Voorbereiding"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "Komt NIET overeen"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Controleer map(pen) niet op nieuwe mail"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "Maak geen link in Van: kolom"
 
-#: lib/IMP.php:1004
+#: lib/IMP.php:1055
 msgid "Do you want to open that folder?"
 msgstr "Wilt u deze map openen?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Geen account? Schrijf u in."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Uitgevoerd"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Download %s in .zip formaat"
@@ -1195,25 +1315,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Download alle bijlagen (in .zip bestand)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Download map(pen)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Download map(pen) [.zip formaat]"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Download in .zip formaat"
 
-#: mailbox.php:682 message.php:491 templates/message/navbar_navigate.inc:11
+#: mailbox.php:713 message.php:504 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/legend.inc:9 templates/mailbox/navbar.inc:22
 #: templates/mailbox/navbar.inc:41
 msgid "Draft"
 msgstr "Klad"
 
-#: folders.php:354
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Kladmap"
 
@@ -1221,28 +1341,35 @@
 msgid "Drafts folder:"
 msgstr "Kladmap:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:106
 msgid "E-mail Address"
 msgstr "E-mailadres"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:316
+msgid "END"
+msgstr "EINDE"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "FOUT: Uw bericht kon niet worden afgeleverd."
 
-#: folders.php:375
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Bewerken"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Zwarte lijst bewerken"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Mailfilters bewerken"
 
-#: folders.php:375 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Zoekquery bewerken"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Bewerk virtuele map"
 
@@ -1251,89 +1378,110 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Bewerkt virtuele map definitie voor %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Witte lijst bewerken"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Uw zwarte lijst bewerken"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Uw filterregels bewerken"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Uw voorkeursinstellingen voor andere mailaccounts instellen."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Uw witte lijst bewerken"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "E-mailadres"
 
-#: lib/Message.php:641
+#: lib/Message.php:693
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Alle berichten uit %s zijn verwijderd."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Alle berichten uit de virtuele prullenbak zijn verwijderd."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Map(pen) leegmaken"
 
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "Geselecteerde mappen leegmaken"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Prullenbak leegmaken"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:951
+msgid "Empty _Spam"
+msgstr "_Spam leegmaken"
+
+#: lib/IMP.php:944
 msgid "Empty _Trash"
 msgstr "Prullen_bak leegmaken"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/notactive.inc:6 templates/pgp/pgp.inc:1
 msgid "Enable PGP functionality?"
 msgstr "PGP functionaliteit inschakelen?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/notactive.inc:6 templates/smime/smime.inc:1
 msgid "Enable S/MIME functionality?"
 msgstr "S/MIME functionaliteit inschakelen?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Berichtpreviews activeren?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:437
 msgid "Encr_yption Options"
 msgstr "Coder_ingsopties"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Gecodeerd"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Einde"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Einde doorgestuurd bericht"
 
-#: lib/Compose.php:262
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Einde bericht"
 
-#: lib/Compose.php:260
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Einde bericht van %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:75
 msgid "Enter Passphrase"
 msgstr "Wachtwoordregel invoeren"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Geef de naam van uw nieuwe spam map"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Geef de naam van uw nieuwe kladmap"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Geef de naam van uw nieuwe OUTBOX"
 
@@ -1341,152 +1489,175 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Geef de naam van uw nieuwe prullenbak"
 
-#: compose.php:1044 message.php:185
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "Gehele bericht"
+
+#: compose.php:1172 message.php:194 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Invoer \"%s\" met succes aan het adresboek toegevoegd"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pgp.php:392 lib/MIME/Viewer/pkcs7.php:367
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pgp.php:390 lib/MIME/Viewer/pkcs7.php:381
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Fout"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Fout bij verbinden met de IMAP server. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Fout bij verzenden van antwoord: %s."
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Gebeurtenis met succes verwijderd."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Elke 15 minuten"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Elke 30 seconden"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Elke 5 minuten"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Elk half uur"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Elke minuut"
 
-#: folders.php:412
+#: folders.php:438
 msgid "Expand"
 msgstr "Uitklappen"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Alles uitklappen"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Alle mappen uitklappen"
 
-#: folders.php:412
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Map uitklappen"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Naamsuitbreiding"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 "Naamsuitbreiding in het \"Nieuw bericht\" scherm automatisch, op de "
 "achtergrond, uitvoeren?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Standaard de complete tree uitklappen in de mapweergave?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: config/prefs.php.dist:980
+msgid "Expand the entire folder tree by default in the sidebar?"
+msgstr "Standaard de complete tree uitklappen in de zijbalk?"
+
+#: templates/compose/compose.inc:142 templates/compose/compose.inc:192
+#: templates/compose/compose.inc:243 templates/compose/compose_expand.js:49
+#: templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Uitklappen ..."
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:962 lib/IMP.php:964
+msgid "F_etch Mail"
+msgstr "Mail _ophalen"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
-msgstr "Mail ophalen"
+msgstr "Mail Ophalen"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
-msgstr "Mail ophalen in een apart scherm?"
+msgstr "Mail Ophalen in een apart scherm?"
 
 #: templates/fetchmail/manage.inc:46
 msgid "Fetch messages upon logging on?"
 msgstr "Berichten ophalen bij aanmelding?"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:291
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "%d berichten van %s opgehaald."
+
+#: lib/Fetchmail.php:289
 #, php-format
-msgid "Fetched %d message(s) from %s"
-msgstr "%d bericht(en) van %s opgehaald."
+msgid "Fetched 1 message from %s"
+msgstr "1 bericht van %s opgehaald."
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
-msgstr "Andere POP3/IMAP accounts: "
+msgstr "Mail ophalen: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
-msgstr "Fetchmail: geen nieuwe berichten."
+msgstr "Mail ophalen: geen nieuwe berichten."
 
-#: lib/IMP.php:917
+#: lib/IMP.php:968
 msgid "Fi_lters"
 msgstr "Fi_lters"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:492
+#: templates/compose/attachments.js:40 templates/compose/compose.inc:494
 msgid "File"
 msgstr "Bestand"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Filteropties"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Filterinstellingen"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Bericht filteren op aanstootgevende inhoud?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Filter ondersteuning is uitgeschakeld op dit systeem."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filters"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filters NIET actief"
 
-#: lib/Filter.php:113
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filters: %s beheerpagina"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Vinden"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Eerste mailboxpagina"
 
-#: mailbox.php:334
+#: mailbox.php:330
 msgid "First Page"
 msgstr "Eerste pagina"
 
@@ -1494,89 +1665,77 @@
 msgid "Fo_rward"
 msgstr "Door_sturen"
 
-#: folders.php:259 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:2
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Mappen bewerkingen - bevestiging"
+
+#: folders.php:289 templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:9
 msgid "Folder Navigator"
 msgstr "Mapnavigator"
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Mapvoorvoegsel"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Mappensamenvatting"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "Delen van mappen is niet ingeschakeld."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "Gebruik van mappen is niet ingeschakeld."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr ""
 "Formaat van berichtdata in de mailboxweergave voor berichten met de datum "
 "van vandaag"
 
-#: compose.php:703 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: compose.php:688
+#: compose.php:805
 msgid "Forward:"
 msgstr "Doorsturen:"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: lib/Compose.php:288
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Doorgestuurd bericht van %s"
 
-#: lib/MIME/Viewer/itip.php:442
-msgid "Free/Busy Information"
-msgstr "Vrij/Bezet informatie"
-
-#: lib/MIME/Viewer/itip.php:453
-msgid "Free/Busy Reply"
-msgstr "Vrij/Bezet antwoord"
-
-#: lib/MIME/Viewer/itip.php:447
-msgid "Free/Busy Request"
-msgstr "Vrij/Bezet verzoek"
-
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Vrij/Bezet verzoek antwoord"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "_Van"
 
-#: message.php:254 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
 msgstr "Van"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "Afzender"
 
-#: compose.php:700 compose.php:704
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1205
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#: compose.php:1207
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u doorgestuurde berichten"
@@ -1590,29 +1749,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Alleen nieuwe berichten ophalen? (alleen IMAP)"
 
-#: thread.php:68
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Ga"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Ga naar bericht"
 
-#: templates/acl/acl.inc:135
+#: lib/IMP.php:502
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Ga naar adresboekinvoer van \"%s\""
+
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Toegang toekennen"
 
-#: message.php:546 lib/Filter.php:113 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/html.php:116 lib/MIME/Viewer/images.php:98
-#: lib/MIME/Viewer/images.php:105 lib/MIME/Viewer/images.php:107
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/notification.php:65
-#: lib/MIME/Viewer/notification.php:71 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/pkcs7.php:410 lib/MIME/Viewer/related.php:64
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/appledouble.php:41
+#: lib/MIME/Viewer/html.php:119 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/notification.php:62
+#: lib/MIME/Viewer/notification.php:68 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/pkcs7.php:424 lib/MIME/Viewer/related.php:79
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "HIER"
 
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:243
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML versie van bericht"
 
@@ -1624,108 +1794,124 @@
 msgid "Here is the message you were composing:"
 msgstr "Hier is het bericht dat u aan het maken was:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Verborgen in threadweergave"
 
-#: mailbox.php:356
+#: mailbox.php:352
 msgid "Hide Deleted"
 msgstr "Verberg verwijderd"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Verberg uitgeschreven"
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Hide the Images"
-msgstr "Verberg de afbeeldingen"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr "Hoog"
 
-#: mailbox.php:687 message.php:288 templates/mailbox/legend.inc:12
+#: mailbox.php:718 message.php:304 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Hoge prioriteit"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:291
 msgid "Highest"
 msgstr "Hoogste"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Hoe wilt u bijlagen weergeven?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Attribuut voor citaten in een antwoord"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Auto Detect Protocols)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP server verbrak de verbinding. De server meldt: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP via SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP via SSL (zelf ondertekend)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP via SSL (zelf ondertekend)"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP server verbrak de verbinding."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, geen TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 mailservers"
 
-#: folders.php:346
-msgid "INBOX"
-msgstr "INBOX"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Bij gebruik van SSL of TLS, dient u de PHP openssl extensie geladen te "
+"hebben."
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
+"Wanneer u verder gaat, zullen alle berichten in de map(pen) verloren gaan!"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Negeren"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Negeer alles"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Afbeelding"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importeren"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Sleutel importeren"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:137
 msgid "Import Keypair"
 msgstr "Sleutelpaar importeren"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Berichten importeren"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "PGP sleutel importeren"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr "Persoonlijk certificaat importeren"
 
 #: templates/pgp/import_key.inc:14
@@ -1740,7 +1926,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Persoonlijk S/MIME certificaat importeren"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:41
 msgid "Import Public Key"
 msgstr "Openbare sleutel importeren"
 
@@ -1765,7 +1951,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Mbox bestand %s in map %s importeren."
 
-#: mailbox.php:695 message.php:492 templates/message/navbar_navigate.inc:7
+#: mailbox.php:728 message.php:505 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/legend.inc:7 templates/mailbox/navbar.inc:16
 #: templates/mailbox/navbar.inc:33
 msgid "Important"
@@ -1775,46 +1961,47 @@
 msgid "Important messages"
 msgstr "Belangrijke berichten"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d berichten uit %s geimporteerd."
 
-#: lib/MIME/Viewer/itip.php:758
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "In behandeling"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:85
+#: lib/IMP.php:832 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Inbox"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Korte samenvatting van de header bijvoegen in een antwoord?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Origineel bericht bijvoegen in een antwoord?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Info"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Informatie over openbare sleutel %s"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:75
 msgid "Information on Personal Private Key"
 msgstr "Informatie over persoonlijke prive sleutel"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:70
 msgid "Information on Personal Public Key"
 msgstr "Informatie over persoonlijke openbare sleutel"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:497
+#: templates/compose/attachments.inc:15 templates/compose/attachments.js:56
+#: templates/compose/compose.inc:499
 msgid "Inline"
 msgstr "Inline"
 
@@ -1834,32 +2021,32 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Openbare PGP sleutel toevoegen"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Ongeldige bewerking geselecteerd voor dit onderdeel."
 
-#: mailbox.php:555 mailbox.php:596
+#: mailbox.php:574 mailbox.php:621
 msgid "Invalid Address"
 msgstr "Ongeldig adres"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Ongeldige mailbox op afstand"
 
-#: compose.php:132
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Ongeldig karakter in e-mailadres: %s."
 
-#: pgp.php:16 smime.php:82
+#: pgp.php:16 smime.php:78
 msgid "Invalid key"
 msgstr "Ongeldige sleutel"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Ongeldige persoonlijke prive PGP sleutel."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Ongeldige persoonlijke openbare PGP sleutel."
 
@@ -1867,43 +2054,66 @@
 msgid "Invert"
 msgstr "Inverteren"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:111
 msgid "Key Length"
 msgstr "Sleutellengte"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:135
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+"Het genereren van een sleutel kan een lange tijd duren. Doorgaan met het "
+"genereren van een sleutel?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:36
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Sleutelimport is niet beschikbaar. Bestand upload is uitgeschakeld op deze "
+"server."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:38
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Sleutelimport is niet beschikbaar. U heeft geen adresboek gedefinieerd om uw "
+"adressen toe te voegen."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Sleutel met succes naar de openbare sleutelseerver verstuurd."
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Taal"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Laatste mailboxpagina"
 
-#: mailbox.php:347
+#: mailbox.php:343
 msgid "Last Page"
 msgstr "Laatste pagina"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "Koppe_l bijlagen"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "Koppe_l bijlagen?"
 
-#: attachment.php:34 lib/Compose.php:988
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "Gekoppelde bijlagen zijn niet toegestaan."
 
-#: lib/Compose.php:1005
-msgid "Links will expire on "
-msgstr "Links vervallen op "
+#: lib/Compose.php:1100
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Koppelingen zullen verlopen op %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1911,7 +2121,7 @@
 "Alle adressen weergeven bij het laden van het adresscherm? (Wanneer dit is "
 "uitgeschakeld, zie u alleen het adres waar u speciaal naar zoekt)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Weergeven in de header"
 
@@ -1919,20 +2129,20 @@
 msgid "Local Mailbox:"
 msgstr "Lokale mailbox:"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Locatie"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Aanmelden bij %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Aanmelden"
 
@@ -1940,27 +2150,27 @@
 msgid "Login Tasks"
 msgstr "Aanmeldtaken"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr "Laag"
 
-#: mailbox.php:690 message.php:290 templates/mailbox/legend.inc:13
+#: mailbox.php:721 message.php:306 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Lage prioriteit"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:295
 msgid "Lowest"
 msgstr "Laagste"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Macintoshbestand"
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "E-mail"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Mailpreviews"
 
@@ -1968,19 +2178,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Mailservertype waarmee verbinding gemaakt wordt:"
 
-#: folders.php:364
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Mailbox- mapweergaveopties"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Markeer alle berichten in map als Gezien"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Markeer alle berichten in map als Ongezien"
 
@@ -1988,7 +2198,7 @@
 msgid "Mark as:"
 msgstr "Markeer als:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Markeer verschillende citaatniveaus met verschillende kleuren?"
 
@@ -1996,95 +2206,71 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Markeer berichten als gezien? (alleen IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Eenvoudige opmaak markeren?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Overeenkomend met alle queries"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Overeenkomend met elke query"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "Maximum Attachment Size"
 msgstr "Maximum bijlagegrootte"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Maximum aantal mappen"
+
+#: templates/compose/compose.inc:487
 msgid "Maximum number of attachments reached."
 msgstr "Maximum aantal bijlagen bereikt."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:483
 msgid "Maximum total attachment size reached."
 msgstr "Maximum totale bijlagegrootte bereikt."
 
-#: lib/MIME/Viewer/itip.php:604
-msgid "Meeting Cancellation"
-msgstr "Vergaderingsafzegging"
-
-#: lib/MIME/Viewer/itip.php:532
-msgid "Meeting Information"
-msgstr "Vergaderingsinformatie"
-
-#: lib/MIME/Viewer/itip.php:542
-msgid "Meeting Proposal"
-msgstr "Vergaderingsvoorstel"
-
-#: lib/MIME/Viewer/itip.php:584
-msgid "Meeting Reply"
-msgstr "Vergaderingsantwoord"
-
-#: lib/MIME/Viewer/itip.php:554
-msgid "Meeting Update"
-msgstr "Vergaderingsupdate"
-
-#: lib/MIME/Viewer/itip.php:559
-msgid "Meeting Update Request"
-msgstr "Vergaderingsupdateverzoek"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Menu mappenlijst"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Bericht"
 
-#: compose.php:508 compose.php:535 compose.php:567 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Berichtsamenstelling"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Berichtdatum"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Berichtopties"
 
-#: search.php:354
+#: search.php:302
 msgid "Message Search"
 msgstr "Bericht zoeken"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Berichtgrootte"
 
-#: message.php:375
+#: message.php:391
 msgid "Message Source"
 msgstr "Berichtsource"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Bericht bekijken"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Berichtvelden"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Berichtmarkeringen"
@@ -2093,33 +2279,45 @@
 msgid "Message folders"
 msgstr "Berichtmappen"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Bericht van %s"
 
-#: templates/search/header.inc:33
+#: mailbox.php:662
+msgid "Message has attachments"
+msgstr "Bericht heeft bijlagen"
+
+#: mailbox.php:653
+msgid "Message is encrypted"
+msgstr "Bericht is gecodeerd"
+
+#: mailbox.php:648
+msgid "Message is signed"
+msgstr "Bericht is ondertekend"
+
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Bericht komt overeen met"
 
-#: compose.php:747 compose.php:761
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Bericht met succes omgeleid."
 
-#: compose.php:994
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Bericht met succes verstuurd, maar niet opgeslagen in %s"
 
-#: compose.php:1053 compose.php:1068
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Bericht met succes verstuurd."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Berichten per pagina in de mailboxweergave."
 
-#: mailbox.php:311
+#: mailbox.php:310
 msgid "Messages to"
 msgstr "Berichten naar"
 
@@ -2127,10 +2325,10 @@
 msgid "Modify"
 msgstr "Wijzigen"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
-msgid "More than one address found for field '%s'."
-msgstr "Meer dan één adres gevonden voor veld '%s'."
+msgid "More than one address found for field \"%s\"."
+msgstr "Meer dan één adres gevonden voor veld \"%s\"."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
@@ -2140,7 +2338,12 @@
 msgid "Move down"
 msgstr "Naar beneden"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"Verplaats spam berichten naar spam map en onschuldige berichten naar INBOX"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Verplaats naar map"
 
@@ -2148,53 +2351,70 @@
 msgid "Move up"
 msgstr "Naar boven"
 
-#: lib/MIME/Viewer/alternative.php:130
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/smime/smime.inc:24 templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Meerdere Berichten Weergave"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "GEEN"
+
+#: templates/smime/smime.inc:2 templates/pgp/pgp.inc:2
 #: templates/fetchmail/manage.inc:48
 msgid "NOTE"
 msgstr "OPMERKING"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:673
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Naam"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "Naam en/of emailadres kan niet leeg zijn"
 
-#: lib/MIME/Viewer/itip.php:763
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Handeling nodig"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Nooit"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Nooit bijlagen opslaan"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Nieuw"
 
-#: lib/IMP.php:579
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Nieuwe map"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nieuwe mail"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Nieuw bericht"
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Nieuw bericht aan %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nieuwe berichten"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Volgende"
 
@@ -2202,15 +2422,16 @@
 msgid "Next Message"
 msgstr "Volgend bericht"
 
-#: mailbox.php:345
+#: mailbox.php:341
 msgid "Next Page"
 msgstr "Volgende pagina"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966 config/prefs.php.dist:977
 msgid "No"
 msgstr "Nee"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Geen certificaat gevonden"
 
@@ -2218,101 +2439,125 @@
 msgid "No Encryption"
 msgstr "Geen codering"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Geen sleutels in sleutelring"
 
-#: mailbox.php:364
+#: mailbox.php:360
 msgid "No Messages"
 msgstr "Geen berichten"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Geen openbare sleutels geimporteerd."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Geen persoonlijk certificaat aanwezig"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:333
+msgid "No Preview Text"
+msgstr "Geen preview tekst"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Geen openbare sleutel gevonden"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Geen openbare S/MIME sleutel geimporteerd."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Geen bijlagen gevonden."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Geen e-mailinformatie in de openbare sleutel."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Geen map geselecteerd."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "Er worden geen mappen gecontroleerd op nieuwe mail."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
 msgid "No folders were specified"
 msgstr "Geen mappen opgegeven"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "Geen mappen met nieuwe berichten"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "Geen mappen met ongeziene berichten"
 
-#: lib/Compose.php:231
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "Geen berichtbodytekst"
 
-#: lib/Mailbox.php:368
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Geen bericht teruggestuurd."
+
+#: lib/Mailbox.php:375
 msgid "No messages matched your search."
 msgstr "Geen berichten die aan uw zoekcriteria voldoen."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Geen persoonlijke prive PGP sleutel geimporteerd."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Geen persoonlijke openbare PGP sleutel geimporteerd."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Geen persoonlijk S/MIME certificaat geimporteerd."
 
+#: lib/MIME/Viewer/pgp.php:299 lib/MIME/Viewer/pkcs7.php:246
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Er bestaat geen persoonlijke prive sleutel, het bericht kan dus niet "
+"gedecodeerd worden."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Geen spellingscontroleprogramma geconfigureerd."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Geen spelfouten"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Geen suggesties"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr "Geen ondersteunde IMAP authenticatie methode gevonden."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Geen gebruiker opgegeven"
 
-#: lib/MIME/Viewer/itip.php:694
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Geen deelnemer"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/prefs/spamselect.inc:5 templates/mailbox/navbar.inc:11
-#: lib/MIME/Viewer/itip.php:651
+#: templates/prefs/folderselect.inc:24 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: templates/prefs/trashselect.inc:24 templates/mailbox/navbar.inc:11
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Geen"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:293
 msgid "Normal"
 msgstr "Normaal"
 
@@ -2334,8 +2579,7 @@
 msgid "Not Personal"
 msgstr "Niet persoonlijk"
 
-#: lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157 lib/Crypt/SMIME.php:166
-#: lib/Crypt/PGP.php:154
+#: lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149 lib/Crypt/PGP.php:139
 msgid "Not a valid public key."
 msgstr "Ongeldige openbare sleutel."
 
@@ -2347,28 +2591,35 @@
 msgid "Not important messages"
 msgstr "Niet belangrijke berichten"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Merk op dat dit enige tijd kan duren"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Geen"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Notificatie: Gekoppelde bijlage gedownload"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Aantal maanden, welke oude gekoppelde bijlagen bewaard moeten worden bij "
 "maandelijkse opruiming."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Aantal oude \"OUTBOX\" mappen, welke bewaard worden bij maandelijkse "
 "opruiming."
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:718
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/smime/import_key.inc:47 templates/search/fields.inc:5
+#: templates/smime/import_key.inc:49 templates/search/fields.inc:5
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "OF"
@@ -2377,47 +2628,47 @@
 msgid "Old messages"
 msgstr "Oude berichten"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Oude \"OUTBOX\" mappen worden verwijderd."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Alleen mappen met ongelezen berichten weergeven?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Voor deze bewerking mag slechts één map geselecteerd worden."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "Map _openen"
-
-#: templates/menu.inc:24
-msgid "Open Folder"
-msgstr "Map openen"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "_Map openen"
 
-#: folders.php:381
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Geopende map"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Extra deelnemer"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/fetchmail.inc:6
+#: templates/fetchmail/top.inc:3
 msgid "Other Mail Accounts"
 msgstr "Andere mailaccounts"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Andere opties"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Verzendende server"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2425,19 +2676,15 @@
 msgid "PGP Encrypt Message"
 msgstr "Bericht PGP coderen"
 
-#: compose.php:343
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP fout: "
 
-#: compose.php:322
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP fout: wachtwoordregel vereist voor persoonlijke prive sleutel."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP niet actief"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP opties"
 
@@ -2445,27 +2692,27 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP wachtwoordregel invoer"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:53
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 "Persoonlijke PGP sleutelpaar ondersteuning vereist een beveiligde "
 "webverbinding."
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Openbare PGP sleuteltekst"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Openbare PGP sleutel voor \"%s (%s)\" werd met succes toegevoegd."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Openbare PGP sleutel voor \"%s\" werd met succes verwijderd."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Openbare PGP sleutelring"
 
@@ -2477,19 +2724,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Bericht PGP ondertekenen/coderen"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Prive PGP sleutel met succes toegevoegd."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Openbare PGP sleutel met succes toegevoegd."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP ondersteuning is niet ingeschakeld op dit systeem."
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2497,57 +2744,57 @@
 "PGP ondersteuning is momenteel niet actief, de digitale handtekening kan dus "
 "niet geverifieerd worden."
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "PGP ondersteuning is momenteel niet actief, het bericht kan dus niet "
 "gedecodeerd worden."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "PGP ondersteuning vereist het gebruik van popup schermen. Wanneer uw browser "
 "momenteel is ingesteld op het niet toestaan van popup schermen, dient u dit "
 "te wijzigen, omdat anders de PGP mogelijkheden niet goed zullen werken."
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Auto Detect Protocols)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 via SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 via SSL (zelf ondertekend certificaat)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 via SSL (zelf ondertekend)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, geen TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Pagina met eerste ongezien bericht"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Pagina met laatste ongezien bericht"
 
@@ -2555,31 +2802,31 @@
 msgid "Part(s)"
 msgstr "Onderdelen"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:121
 msgid "Passphrase"
 msgstr "Wachtwoordregel"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:126
 msgid "Passphrase (Again)"
 msgstr "Wachtwoordregel (opnieuw)"
 
-#: pgp.php:310 smime.php:235
+#: pgp.php:306 smime.php:231
 msgid "Passphrase successfully unloaded."
 msgstr "Wachtwoordregel met succes gelost."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Wachtwoordregel:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr "Wachtwoordregels kunnen niet leeg zijn"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Wachtwoordregels komen niet overeen"
 
-#: templates/smime/import_key.inc:69 templates/login/login.inc:221
+#: templates/smime/import_key.inc:71 templates/login/login.inc:191
 #: templates/fetchmail/manage.inc:20
 msgid "Password"
 msgstr "Wachtwoord"
@@ -2588,11 +2835,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Onderhoudswerkzaamheden uitvoeren bij aanmelding?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "Rechten voor deze gebruiker kunnen niet worden gewijzigd."
 
-#: mailbox.php:666 message.php:483 templates/mailbox/legend.inc:10
+#: mailbox.php:697 message.php:493 templates/mailbox/legend.inc:10
 #: templates/mailbox/navbar.inc:24
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -2601,39 +2848,49 @@
 msgid "Personal Information"
 msgstr "Persoonlijke informatie"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Persoonlijk PGP sleutelpaar met succes gegenereerd."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Persoonlijke PGP sleutels met succes verwijderd."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Persoonlijk S/MIME certificaat NIET geimporteerd: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Persoonlijke S/MIME sleutels met succes verwijderd."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Plaats uw ondertekening voor antwoorden en doorgestuurde berichten?"
 
-#: compose.php:241
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Platte-tekstversie van bericht"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Geluid afspelen bij nieuwe mail? Dit vereist dat uw browser ingesloten "
+"geluidsbestanden ondersteunt. Bijna alle browsers doen dit op Windows en "
+"Mac, maar andere platformen vereisen een plugin."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Geef een naam voor de nieuwe map, a.u.b.:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Geef de naam van de nieuwe map, a.u.b.:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Geef de nieuwe naam, a.u.b.:"
 
@@ -2655,7 +2912,7 @@
 "Geef de wachtwoordregel van uw prive S/MIME sleutel, a.u.b. U hoeft dit "
 "slecht eenmaal per %s sessie op te geven."
 
-#: recompose.php:88
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2667,60 +2924,43 @@
 "tevens aan te melden in uw hoofdscherm. Dit is om te voorkomen dat "
 "aanvallers uw sessie ID overnemen. Onze excuses voor het ongemak."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Geef uw wachtwoord, a.u.b."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Geef uw gebruikersnaam, a.u.b."
 
-#: compose.php:80 lib/IMP.php:520
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Herstel dubbelzinnige of ongeldige adressen, a.u.b."
 
-#: lib/MIME/Viewer/itip.php:631
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Bekijk de volgende informatie a.u.b. en selecteer daarna een bewerking uit "
-"het onderstaande menu."
-
-#: templates/folders/javascript.inc:56
-msgid "Please select a folder before you perform any actions."
-msgstr "Selecteer een map voordat u een bewerking uitvoert, a.u.b."
-
-#: lib/MIME/Viewer/itip.php:461
-msgid "Please select an action from the menu below."
-msgstr "Selecteer een bewerking uit het onderstaande menu, a.u.b."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Selecteer een map voordat u deze bewerking uitvoert, a.u.b."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Selecteer tenminste één map om te doorzoeken, a.u.b."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Selecteer slechts één map voor deze bewerking, a.u.b."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Selecteer of bewerk in het vak aan de rechterkant:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Selecteer of bewerk hier naast:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Ondertekening voorafgaan met streepjes ('-- ')?"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: filterprefs.php:39 pgp.php:253 smime.php:237
 msgid "Preferences successfully updated."
 msgstr "Voorkeursinstellingen met succes bijgewerkt."
 
@@ -2732,11 +2972,11 @@
 msgid "Previous Message"
 msgstr "Vorig bericht"
 
-#: mailbox.php:336
+#: mailbox.php:332
 msgid "Previous Page"
 msgstr "Vorige pagina"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Afdrukken"
 
@@ -2744,15 +2984,15 @@
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Prive sleutel wachtwoord"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Elke keer vragen wanneer een bijlage wordt verzonden; standaard op NEE"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Elke keer vragen wanneer een bijlage wordt verzonden; standaard op JA"
 
@@ -2760,42 +3000,42 @@
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Openbare PGP sleutelserver is uitgeschakeld."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "_Wis verwijderd"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Wis verwijderd"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
-msgstr "Map(pen) opschonen"
+msgstr "Map(pen) legen"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Hoe vaak prullenbak legen:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Verwijder berichten in de prullenbak ouder dan dit aantal dagen."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Verwijder oude berichten uit de prullenbak?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Verwijder %d berichten uit de prullenbak."
+msgid "Purging %d messages from Trash folder."
+msgstr "%d berichten uit de prullenbak verwijderen."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "Plaats dit na @ bij verzenden van mail en standaard adresuitbreiding:"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "1 bericht uit de prullenbak verwijderen."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2811,24 +3051,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Quota status: GEEN LIMIET"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Citeren %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "Ver_zoek afleveringsbevestiging"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Mappenboom opnieuw opbouwen"
 
-#: search.php:165
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Ontvangen op"
 
-#: search.php:173
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Ontvangen sinds"
 
-#: search.php:169
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Ontvangen tot"
 
@@ -2840,27 +3080,23 @@
 msgid "Redirect"
 msgstr "Omleiden"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Bericht omleiden"
 
-#: compose.php:710
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Dit bericht omleiden"
 
-#: compose.php:770
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Omleiden mislukt."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Verversen"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Ververs mapweergaves:"
 
-#: templates/mailbox/header.inc:4 templates/folders/head.inc:3
+#: templates/mailbox/header.inc:4 templates/folders/head.inc:9
 msgid "Reload"
 msgstr "Vernieuwen"
 
@@ -2868,11 +3104,11 @@
 msgid "Reload View"
 msgstr "Weergave vernieuwen"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Onthoudt de vrij/bezet informatie."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Onthoudt de laatste weergave"
 
@@ -2880,7 +3116,7 @@
 msgid "Remote Mailbox:"
 msgstr "Mailbox op afstand:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Verwijder veld uit zoeken"
 
@@ -2888,15 +3124,15 @@
 msgid "Remove source"
 msgstr "Bron verwijderen"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Hernoem map(pen)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Hernoem OUTBOX map aan het begin van de maand?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:425
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Hernoemen van \"%s\" tot \"%s\" mislukt. Dit is wat de server meldt"
@@ -2905,7 +3141,7 @@
 msgid "Repl_y to List"
 msgstr "Beant_woord mailinglist"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Vervang door:"
 
@@ -2913,7 +3149,7 @@
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Antwoord verzonden."
 
@@ -2921,7 +3157,7 @@
 msgid "Reply to All"
 msgstr "Beantwoord allen"
 
-#: compose.php:659
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Beantwoord allen:"
 
@@ -2929,7 +3165,7 @@
 msgid "Reply to List"
 msgstr "Beantwoord mailinglist"
 
-#: compose.php:661
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Beantwoord mailinglist:"
 
@@ -2937,107 +3173,101 @@
 msgid "Reply to _All"
 msgstr "Beantwoord _allen"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Antwoord met Niet Ondersteund Bericht"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Antwoord met vrij/bezet voor de volgende 2 maanden."
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Antwoord met gevraagde vrij/bezet informatie."
 
-#: message.php:258
+#: message.php:274
 msgid "Reply-To"
 msgstr "Antwoorden aan"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Antwoorden aan:"
 
-#: compose.php:657
+#: compose.php:769
 msgid "Reply:"
 msgstr "Beantwoorden:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Rapporteer als onschuldig"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Rapporteer als spam"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:384
 msgid "Request a _Read Receipt"
 msgstr "Verzoek een lees _ontvangstbevestiging"
 
-#: config/prefs.php.dist:587
-msgid "Request delivery confirmation?"
-msgstr "Verzoek afleveringsbevestiging?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Verzoek lees ontvangstbevestingen?"
 
-#: mailbox.php:197
+#: mailbox.php:188
 msgid "Requested message not found."
 msgstr "Gevraagde bericht niet gevonden."
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Vereiste deelnemer"
 
-#: templates/search/header.inc:26 templates/search/main.inc:143
-#: templates/acl/acl.inc:158
+#: templates/search/header.inc:29 templates/search/main.inc:140
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Herstellen"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Status van beantwoorder geupdate."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Vervolgen"
 
-#: recompose.php:89
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Vervolg uw sessie"
 
-#: templates/fetchmail/account_select.inc:32
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Terug naar \"Berichtsamenstelling\""
+
+#: templates/fetchmail/account_select.inc:31
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 msgid "Return to Fetch Mail"
-msgstr "Terug naar andere POP3/IMAP accounts"
+msgstr "Terug naar andere Mail Ophalen"
 
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
-msgid "Return to Main Preferences Screen"
-msgstr "Terug naar hoofdvoorkeursinstellingenscherm"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/smime/notactive.inc:15 templates/smime/smime.inc:101
+#: templates/pgp/notactive.inc:15 templates/pgp/pgp.inc:147
+#: templates/filters/notactive.inc:22 templates/filters/prefs.inc:60
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Terug naar opties"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Terug naar vorige scherm"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Terug naar de mailboxlijst na verwijderen, verplaatsen of kopiëren van een "
 "bericht?"
 
-#: lib/MIME/Viewer/itip.php:673
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Rol"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:411
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:425
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3045,46 +3275,42 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Bericht S/MIME coderen"
 
-#: compose.php:379
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME Fout: "
 
-#: compose.php:358
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME fout: wachtwoordregel vereist voor persoonlijke prive sleutel."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME niet actief"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME opties"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "S/MIME wachtwoordregel invoer"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "Persoonlijke S/MIME sleutelpaar ondersteuning vereist een beveiligde "
 "webverbinding."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Openbare S/MIME sleutel voor \"%s\" werd met succes verwijderd."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Openbare S/MIME sleutel met succes toegevoegd."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Openbare S/MIME sleutelring"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Openbaar/prive S/MIME sleutelpaar met succes toegevoegd."
 
@@ -3096,11 +3322,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Bericht S/MIME ondertekenen/coderen"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "S/MIME ondersteuning is niet ingeschakeld op dit systeem."
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3108,15 +3334,15 @@
 "S/MIME ondersteuning is momenteel niet actief, het bericht kan dus niet "
 "gedecodeerd worden."
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
-"S/MIME ondersteuning is niet actief, de inhoud van dit ondertekende bericht "
-"kan dus niet weergegeven worden."
+"S/MIME ondersteuning is uitgeschakeld, de inhoud van dit ondertekende "
+"bericht kan dus niet weergegeven worden."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3124,90 +3350,107 @@
 "S/MIME ondersteuning is niet actief, de digitale handtekening kan dus niet "
 "geverifieerd worden."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME ondersteuning vereist het gebruik van popup schermen. Wanneer uw "
 "browser momenteel is ingesteld op het niet toestaan van popup schermen, "
 "dient u dit te wijzigen, omdat anders de S/MIME mogelijkheden niet goed "
 "zullen werken."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
+
+#: templates/compose/compose.inc:253
 msgid "S_ubject"
 msgstr "Onderwe_rp"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:361
 msgid "Sa_ve a copy in "
 msgstr "Be_waar een kopie in "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Op_slaan als"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:304 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Opslaan"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:534
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Bijlagen samen met bericht opslaan in outbox map?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save Draft"
 msgstr "Opslaan als klad"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:37
-#: templates/pgp/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/filters/prefs.inc:69
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Afbeelding Opslaan"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Afbeelding opslaan in album"
+
+#: templates/smime/notactive.inc:13 templates/smime/smime.inc:100
+#: templates/pgp/notactive.inc:13 templates/pgp/pgp.inc:146
+#: templates/filters/prefs.inc:59
 msgid "Save Options"
 msgstr "Opties opslaan"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Postpapier opslaan"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save _Draft"
 msgstr "Opslaan als _klad"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Opslaan als"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Klad opslaan als ongezien?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "Ontvangers automatisch in standaard adresboek opslaan?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:123
 msgid "Save search as a virtual folder?"
 msgstr "Zoekopdracht bewaren als virtuele map?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Bewaar verzonden mail?"
 
-#: compose.php:1138
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Bewaren van klad mislukt. De server meldt: %s"
 
-#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:197
+#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:199
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Zoeken"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "%s doorzoeken"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Zoek in mail"
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Zoekopties"
 
-#: search.php:311
+#: search.php:258
 msgid "Search Results"
 msgstr "Zoekresultaten"
 
@@ -3223,7 +3466,7 @@
 msgid "Select Another Account"
 msgstr "Selecteer een andere account"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Selecteer een datum"
 
@@ -3231,7 +3474,11 @@
 msgid "Select a field"
 msgstr "Selecteer een veld"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr "Selecteer een postpapier:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Selecteer adresboekbronnen voor toevoegen en zoeken van adressen."
 
@@ -3251,6 +3498,10 @@
 msgid "Select none"
 msgstr "Selecteer niets"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Selecteer album om afbeeldingen in op te slaan."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Selecteer het mailservertype"
@@ -3259,32 +3510,36 @@
 msgid "Selected Address books:"
 msgstr "Geselecteerde adresboeken:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:70
 msgid "Send Key to Public Keyserver"
 msgstr "Verzend sleutel naar openbare sleutelserver"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Verzend laatste informatie"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Verzend ontvangstbevestiging wanneer gevraagd door de afzender?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "Send Message"
 msgstr "Verzend bericht"
 
-#: folders.php:359
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Verzend bericht zonder een onderwerp?"
+
+#: config/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "Verzend leesbevestiging wanneer gevraagd door de afzender?"
+
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "OUTBOX"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "OUTBOX:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Server"
 
@@ -3301,7 +3556,7 @@
 msgstr ""
 "Voorkeursinstellingen voor het verplaatsen en verwijderen van berichten."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Instellen van de X-Priority header bij het maken van berichten?"
 
@@ -3317,7 +3572,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Deel uw mailmappen met andere gebruikers."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3325,16 +3580,16 @@
 "Dienen grote blokken aangehaalde tekst standaard weergegeven of verborgen te "
 "worden? Het kan eenvoudig omgeschakeld worden, welke u ook kiest."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Wilt u de body van text/plain berichten scannen op PGP data?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 "Dient het \"Nieuw bericht\" scherm gesloten te worden na opslaan van klad?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 "Dient uw openbare PGP sleutel standaard aan uw berichten toegevoegd te "
@@ -3348,7 +3603,7 @@
 msgid "Show All Headers"
 msgstr "Alle headers weergeven"
 
-#: mailbox.php:354
+#: mailbox.php:350
 msgid "Show Deleted"
 msgstr "Toon verwijderd"
 
@@ -3364,54 +3619,50 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Alleen ingeschreven mappen weergeven"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Toon uitgeschreven"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Pictogram voor het verwijderen van berichtbijlagen weergeven?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Legenda weergeven in de mailboxweergave?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Alleen previews weergeven van ongelezen berichten?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr "Previews in tooltips weergeven?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
-msgstr "Mail ophalen pictogram weergeven op de menubalk?"
+msgstr "Mail Ophalen pictogram weergeven op de menubalk?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "De afbeeldingen weergeven"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Filter pictogram weergeven op de menubalk?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Totaal aantal mails in map weergeven?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Weergegeven"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "_Grootte"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr "Inschrijven wanneer niet geregistreerd"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Ondertekend"
@@ -3420,149 +3671,183 @@
 msgid "Size"
 msgstr "Grootte"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Sorteervolgorde"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Sorteren op aankomsttijd"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Sorteren op datum"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Sorteren op afzender"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Sorteren op berichtgrootte"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Sorteren op onderwerp"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Sorteren op thread"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Sorteren op geadresseerde"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Spam map:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:344
 msgid "Special Characters"
 msgstr "Speciale karakters"
 
-#: templates/compose/compose.inc:334
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Speciale virtuele mappen kunnen niet worden bewerkt."
+
+#: templates/compose/compose.inc:341
 msgid "Spell Check"
 msgstr "Spellingscontrole"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Spellingscontrole"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Spellingscontrole compleet"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Spelfouten per pagina tijdens spellingscontrole."
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Start"
 
-#: lib/MIME/Viewer/itip.php:673
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr "Postpapier"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Postpapier naam:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Postpapier type:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Postpapier:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Status"
 
-#: lib/MIME/Contents.php:215
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Bijlage strippen"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Regeleinden verwijderen?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Onde_rwerp"
 
-#: message.php:259 search.php:157 templates/compose/recompose.inc:25
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Onderwerpveld"
 
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:306 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Bevestigen"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Inschrijven van map(pen)"
 
-#: lib/MIME/Viewer/pgp.php:395 lib/MIME/Viewer/pkcs7.php:370
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pgp.php:393 lib/MIME/Viewer/pkcs7.php:385
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Succes"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Suggesties"
 
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
 msgid "Switch Composition Method"
 msgstr "Omschakelen van compositiemethode"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to HTML composition"
 msgstr "Omschakelen naar HTML compositie"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to plain text composition"
 msgstr "Omschakelen naar platte tekst compositie"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:414
 msgid "Te_xt"
 msgstr "T_ekst"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr "Voorlopig geaccepteerd: "
+
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Verzoek voorlopig accepteren"
 
-#: lib/MIME/Viewer/itip.php:746
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Voorlopig geaccepteerd"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Gebruikersovereenkomst niet opgegeven in conf.php"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Tekst"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "De Van: kolom van het bericht dient gelinkt te worden:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"De IMAP server schijnt de geselecteerde authenticatie methode niet te "
+"ondersteunen. Neem contact op met uw systeembeheerder, a.u.b."
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Het Macintosh bronproces"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Het Macintosh bronproces kan worden gedownload %s."
@@ -3577,59 +3862,50 @@
 msgid "The account \"%s\" has been saved."
 msgstr "De account \"%s\" is opgeslagen."
 
-#: lib/Filter.php:104
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Het adres \"%s\" is toegevoegd aan %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "De bijlage is niet gevonden."
 
-#: templates/javascript/open_compose_win.js:37
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Het \"Nieuw bericht\" scherm kan niet worden geopend. Misschien heeft u uw "
-"browser ingesteld om popup schermen te blokkeren?"
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr "De agendadata is ongeldig"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "De inhoud van het Macintoshbestand staat hieronder."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "De huidige map(pen) \"%s\" zullen worden hernoemd tot \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "De huidige lijst met gebruikers met toegang op deze map kon niet worden "
 "opgehaald"
 
-#: compose.php:1147
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Het klad is opgeslagen in de \"%s\" map."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "De gebeurtenis is aan uw agenda toegevoegd."
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
-msgstr "Het veld '%s' kan niet worden uitgeklapt."
+msgid "The field \"%s\" can't be expanded."
+msgstr "Het veld \"%s\" kan niet worden uitgeklapt."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "De map \"%s\" bestaat al"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:150
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3638,46 +3914,54 @@
 "De mapnaam \"%s\" bevat ongeldige karakters. Dit zou problemen kunnen "
 "veroorzaken. Neem contact op met de systeembeheerder, a.u.b."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:312
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "De map \"%s\" werd aangemaakt maar u heeft deze niet ingeschreven."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:229
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "De map \"%s\" werd verwijderd, maar u heeft deze niet uitgeschreven."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:299
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "De map \"%s\" werd niet aangemaakt. De server meldt"
 
-#: lib/Folder.php:373
+#: lib/Folder.php:222
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "De map \"%s\" werd niet verwijderd. De server meldt"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:315
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "De map \"%s\" werd met succes aangemaakt."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:232
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "De map \"%s\" werd met succes verwijderd."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:421
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "De map \"%s\" werd met succes hernoemd tot \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "De volgende bestanden waren gekoppeld aan dit onderdeel:"
 
-#: lib/MIME/Viewer/html.php:95
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Het afbeelding opslaan scherm kan niet worden geopend. Misschien heeft u uw "
+"browser ingesteld om popup schermen te blokkeren?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3685,24 +3969,24 @@
 "De afbeeldingen worden weergeven, omdat de afzender zich in uw adresboek "
 "bevindt."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "De mailserver genereerde het volgende foutbericht:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "De mailserver genereerde het volgende informatiebericht:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "De mailserver genereerde het volgende bericht:"
 
-#: lib/Message.php:635
+#: lib/Message.php:687
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "De mailbox %s is al leeg."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3713,41 +3997,37 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Het bewerkte bericht is afgesloten. Afsluiten."
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Het bericht heeft geen onderwerp."
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Het bericht is verwijderd."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Het bericht is geverifieerd."
 
-#: lib/MIME/Viewer/pkcs7.php:374
+#: lib/MIME/Viewer/pkcs7.php:390
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Het bericht is geverifieerd. Afzender: %s."
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Het wachtwoord scherm kan niet worden geopend. Misschien heeft u uw browser "
-"ingesteld om popup schermen te blokkeren?"
-
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "De ruwe tekst van de openbare PGP sleutel kan worden bekeken %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Het gevraagde bestand bestaat niet in de MS-TNEF bijlage."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Het gevraagde bestand bestaat niet in de Zip bijlage."
 
-#: message.php:547
+#: message.php:550
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3758,16 +4038,16 @@
 "dit bericht heeft gelezen. Klik op %s om de ontvangstbevestiging te "
 "verzenden."
 
-#: lib/MIME/Viewer/images.php:72
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
 msgstr ""
-"De server was niet in staat een thumbnail van deze afbeelding te maken."
+"De server was niet in staat om een thumbnail van deze afbeelding te maken."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "De ondertekening kon niet worden vervangen."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "De ondertekening is met succes vervangen."
 
@@ -3775,42 +4055,57 @@
 msgid "The specified file does not exist."
 msgstr "Het opgegeven bestand bestaat niet."
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:85
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Het postpapier \"%s\" is toegevoegd."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Het postpapier \"%s\" is verwijderd."
+
+#: stationery.php:88
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Het postpapier \"%s\" is bijgewerkt."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "De taak is aan uw taaklijst toegevoegd."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "De tekst van het bericht"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "De tekst van het bericht kan worden bekeken %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "De tekst van het geretourneerd bericht"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "De tekst van het geretourneerd bericht kan worden bekeken %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "De tekst van het verzonden bericht"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "De tekst van het verzonden bericht kan worden bekeken %s."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "De vrij/bezet informatie van de gebruiker is met succes opgeslagen."
 
-#: lib/MIME/Viewer/alternative.php:89
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr ""
 "Er zijn geen alternatieve onderdelen die inline weergegeven kunnen worden."
@@ -3819,21 +4114,16 @@
 msgid "There are no messages in this mailbox."
 msgstr "Er zijn geen berichten in deze mailbox."
 
-#: lib/Message.php:594
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Een fout bij het schrappen van %s. De server meldt"
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr "Er is geen tekst die inline weergegeven kan worden."
 
-#: lib/Message.php:637
+#: lib/Message.php:689
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Een fout bij het uitwissen van de mailbox. De server meldt: %s"
 
-#: lib/Message.php:603
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Een fout bij het uitwissen van de mailbox. De server meldt"
-
-#: lib/Message.php:97
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3842,7 +4132,7 @@
 "Een fout bij het kopiëren van berichten van \"%s\" naar \"%s\". De server "
 "meldt"
 
-#: lib/Message.php:207 lib/Message.php:222
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3850,7 +4140,7 @@
 msgstr ""
 "Een fout bij het verwijderen van berichten uit de map \"%s\". De server meldt"
 
-#: lib/Message.php:286
+#: lib/Message.php:318
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3858,21 +4148,21 @@
 msgstr ""
 "Een fout bij het verwijderen van berichten in de map \"%s\". De server meldt"
 
-#: lib/Message.php:220
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Een fout bij het verwijderen van berichten. De server meldt: %s"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Een fout bij het verwijderen van de gebeurtenis: %s."
 
-#: lib/MIME/Viewer/enriched.php:40 lib/MIME/Viewer/plain.php:55
+#: lib/MIME/Viewer/enriched.php:37 lib/MIME/Viewer/plain.php:52
 msgid "There was an error displaying this message part"
 msgstr "Een fout bij het bekijken van dit berichtonderdeel"
 
-#: lib/Message.php:523 lib/Message.php:565
+#: lib/Message.php:591
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3880,28 +4170,28 @@
 msgstr ""
 "Een fout bij het markeren van berichten in de map \"%s\". De server meldt"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Een fout bij het importeren van %s."
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Een fout bij het importeren van de gebeurtenis: %s."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Een fout bij het importeren van de taak: %s."
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Een fout bij het importeren van vrij/bezet informatie van de gebruiker: %s."
 
-#: lib/Message.php:92
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3910,29 +4200,25 @@
 "Een fout bij het verplaatsen van berichten van \"%s\" naar \"%s\". De server "
 "meldt"
 
-#: compose.php:1155
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "Een fout bij het opslaan van dit bericht als klad."
 
-#: compose.php:916
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Een fout bij het verzenden van uw bericht: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Een fout met het bijwerken van de gebeurtenis: %s."
 
-#: lib/MIME/Viewer/plain.php:62
-msgid "There was no text in this message part"
-msgstr "Er stond geen tekst in dit berichtonderdeel"
-
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "Dit HTML bericht bevat afbeeldingen."
 
-#: lib/MIME/Viewer/html.php:89
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -3940,39 +4226,39 @@
 "Dit HTML bericht bevat afbeeldingen. Geblokkeerde afbeeldingen verschijnen "
 "als volgt: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Deze openbare PGP sleutel is gekoppeld met het bericht."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Deze bewerking wordt niet ondersteund."
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Deze bewerking is nog niet van toepassing."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Dit kan enige tijd duren. Weet u zeker dat u verder wilt gaan?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Dit bericht bevat een Macintoshbestand."
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:416
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr "Dit bericht bevat een bijlage die digitaal via S/MIME is ondertekend."
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:420
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Dit bericht bevat een bijlage die via S/MIME is gecodeerd."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -3980,44 +4266,44 @@
 "Dit bericht bevat afleveringsstatusinformatie, maar het formaat van dit "
 "bericht is onbekend."
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 "Dit bericht lijkt niet het een geldig PGP gecodeerd bericht te zijn. Fout: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 "Dit bericht lijkt niet het juiste PGP formaat te hebben (volgens RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Dit bericht lijkt niet het juiste S/MIME formaat te hebben."
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Het volgende bericht is digitaal ondertekend via PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Het volgende bericht is digitaal ondertekend via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Dit bericht is gecodeerd met S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Dit bericht is gecodeerd met PGP."
 
-#: message.php:202
+#: message.php:210
 msgid "This message to"
 msgstr "Dit bericht naar"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Deze server ondersteunt geen deling van mappen."
 
@@ -4026,18 +4312,21 @@
 msgstr ""
 "Dit scherm dient aangeroepen te worden vanuit het nieuw bericht scherm."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Threadweergave"
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Threadweergave"
 
-#: mailbox.php:576 message.php:255 search.php:145
-#: templates/mailbox/message_headers.inc:17
-#: templates/contacts/contacts.inc:221 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: mailbox.php:601 message.php:271 templates/mailbox/message_headers.inc:22
+#: templates/contacts/contacts.inc:219 templates/compose/recompose.inc:10
+#: templates/compose/redirect.inc:61 lib/Search.php:593
 msgid "To"
 msgstr "Aan"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "Geadresseerde"
 
@@ -4049,11 +4338,19 @@
 "Om meerdere velden te selecteren, houd de Control (PC) of Command (Mac) "
 "toets ingedrukt tijdens klikken."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"Om een TLS verbinding te kunnen gebruiken, dient u een werkende versie van "
+"PHP 5.1.0 of hoger te hebben."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Totale bijlagegrootte:"
 
-#: folders.php:350
+#: folders.php:369
 msgid "Trash folder"
 msgstr "Prullenbak"
 
@@ -4061,9 +4358,9 @@
 msgid "Trash folder:"
 msgstr "Prullenbak:"
 
-#: lib/Quota/command.php:77 lib/Quota/courier.php:54 lib/Quota/cyrus.php:70
-#: lib/Quota/logfile.php:93 lib/Quota/mdaemon.php:51
-#: lib/Quota/mercury32.php:84
+#: lib/Quota/command.php:71 lib/Quota/courier.php:53 lib/Quota/cyrus.php:64
+#: lib/Quota/logfile.php:88 lib/Quota/mdaemon.php:48
+#: lib/Quota/mercury32.php:79
 msgid "Unable to retrieve quota"
 msgstr "Niet in staat om quota op te halen"
 
@@ -4080,28 +4377,45 @@
 msgid "Undelete"
 msgstr "Terughalen"
 
-#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:218
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Onbekende ontvangers"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Onverwacht antwoord van server aan AUTHENTICATE commando."
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Onverwacht antwoord van server aan Digest-MD5 antwoord."
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Onverwacht antwoord van server aan LOGIN commando."
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Niet verwerkt onderdeel van type: %s"
 
-#: mailbox.php:537
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "Onbekende datum"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Onbekend IMAP antwoord van de server. De server meldt: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Onbekende vergadering"
 
-#: mailbox.php:588
+#: mailbox.php:613
 msgid "Unknown Recipient"
 msgstr "Onbekende ontvanger"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:75
 msgid "Unload Passphrase"
 msgstr "Wachtwoordregel lossen"
 
@@ -4109,47 +4423,53 @@
 msgid "Unnamed"
 msgstr "Onbenoemd"
 
-#: mailbox.php:671 message.php:489 templates/message/navbar_navigate.inc:6
+#: mailbox.php:702 message.php:502 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/legend.inc:5 templates/mailbox/navbar.inc:15
 #: templates/mailbox/navbar.inc:32
 msgid "Unseen"
 msgstr "Ongezien"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Uitschrijven van map(pen)"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Bijlageinformatie bijwerken"
+#: templates/compose/compose.inc:513
+msgid "Update"
+msgstr "Bijwerken"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Beantwoorderstatus bijwerken"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Gebruik standaardwaarde"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "IMAP mapinschrijvingen gebruiken?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Gebruik virtuele prullenbak?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Gebruiker"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
-"Gebruiker '%s' met succes de opgegeven rechten toegekend voor de map '%s'."
+"Gebruiker \"%s\" met succes de opgegeven rechten toegekend voor de map \"%s"
+"\"."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -4157,96 +4477,128 @@
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:70 templates/pgp/pgp.inc:75
 msgid "View"
 msgstr "Bekijken"
 
-#: lib/MIME/Viewer/tnef.php:112 lib/MIME/Viewer/zip.php:95
+#: lib/MIME/Viewer/tnef.php:110 lib/MIME/Viewer/zip.php:92
 #, php-format
 msgid "View %s"
 msgstr "%s bekijken"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "%s openbare sleutel bekijken"
 
-#: lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "HTML inhoud in een apart scherm bekijken"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Berichten bekijken"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:75
 msgid "View Personal Private Key"
 msgstr "Persoonlijke prive sleutel bekijken"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:70
 msgid "View Personal Public Key"
 msgstr "Persoonlijke openbare sleutel bekijken"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Thread bekijken"
 
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Bekijk thumbnail"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "View attachment in a separate window"
 msgstr "Bijlage in een apart scherm bekijken"
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "Inhoud in een apart scherm bekijken"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Bekijk gebeurtenis"
 
-#: folders.php:342 mailbox.php:506
+#: folders.php:361 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "Bekijk berichten in %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Weergave van mailbox na aanmelding:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Bekijk taak"
 
-#: lib/MIME/Viewer/html.php:110
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Bekijk de berichten"
 
-#: search.php:309
+#: search.php:255
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "De virtuele map \"%s\" werd met succes aangemaakt."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:125 lib/IMAP/Tree.php:138
-#: lib/IMAP/Tree.php:140 lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:145
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:353 lib/IMAP/Tree.php:395
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtuele mappen"
 
-#: search.php:291
+#: search.php:247
 msgid "Virtual Folders require a label."
 msgstr "Virtuele mappen vereisen een label."
 
-#: templates/search/main.inc:133
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Virtuele INBOX"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Virtuele INBOX map"
+
+#: lib/Mailbox.php:171 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Virtuele prullenbak"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Virtuele prullenbak"
+
+#: templates/search/main.inc:129
 msgid "Virtual folder label"
-msgstr "Naam voor virtuele map"
+msgstr "Virtuele map label"
+
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "Waarschuwing"
 
-#: login.php:131
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Welkom bij %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Wat dient te gebeuren met spamberichten nadat deze zijn gerapporteerd als "
+"spam of onschuldig?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4254,52 +4606,87 @@
 "Verplaats verwijderde berichten naar de prullenbak, i.p.v. deze als "
 "verwijderd te markeren?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Op welke pagina, bij openen van een nieuwe mailbox, wilt u beginnen?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr ""
 "Dient bij opslaan van verzonden mail, bijlagedata opgeslagen te worden?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"Welk domein moet, bij verzenden van mail of uitbreiden van adressen, "
+"toegevoegd worden aan ongekwalificeerde adressen (e-mailadressen zonder \"@"
+"\")?"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Witte lijst"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Regelomslag na dit aantal karakters."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "U gaat e-mail van de volgende account(s) ophalen:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "U probeert de volgende mappen te verwijderen:"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "U probeert alle berichten in de volgende map(pen) te verwijderen."
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "U probeert de volgende map(pen) te verwijderen."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "U kopieert/verplaatst naar een nieuwe map."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "U maakt een submap in "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "U maakt een hoofdmap."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr "Het is u niet toegestaan om mappen te maken."
+
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Het is u niet toegestaan om meer dan %d mappen te maken."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "U hernoemt de map: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"U kunt de volgende placeholders gebruiken in de postpapiertekst: %c voor de "
+"inhoud van het huidige bericht; %s voor de handtekening."
+
+#: lib/Folder.php:524
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "U kunt zich niet uitschrijven voor \"%s\"."
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
@@ -4307,11 +4694,11 @@
 "U bent niet akkoord gegaan met de gebruikersovereenkomst, dus is het u niet "
 "toegestaan om aan te melden."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "U heeft geen rechten om de toegang op deze map te wijzigen"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
@@ -4326,34 +4713,30 @@
 msgid "You have 1 new message."
 msgstr "U heeft 1 nieuw bericht."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"U heeft tenminste één bijlage geselecteerd dat u nog niet heeft geupload. "
-"Weet u zeker dat u dit bericht wilt verzenden zonder deze bijlagen?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "U heeft deze pagina al verzonden."
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1054
 msgid "You have new mail in the following folder:"
 msgstr "U heeft nieuwe mail in de volgende map:"
 
-#: lib/IMP.php:1008
+#: lib/IMP.php:1059
 msgid "You have new mail in the following folders:"
 msgstr "U heeft nieuwe mail in de volgende mappen:"
 
-#: compose.php:127
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "U dient tenminste één ontvanger op te geven."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "U dient de wachtwoordregel van uw prive PGP sleutel in te voeren, om dit "
 "bericht te kunnen bekijken"
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4361,7 +4744,7 @@
 "U dient de wachtwoordregel van uw prive S/MIME sleutel in te voeren, om dit "
 "bericht te kunnen bekijken"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "U dient eerst een doelmailbox op te geven."
 
@@ -4373,8 +4756,8 @@
 msgid "You must select an address first."
 msgstr "U dient eerst een adres te selecteren."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "U dient eerst tenminste één bericht te selecteren."
 
@@ -4382,66 +4765,62 @@
 msgid "You must specify a recipient."
 msgstr "U dient een ontvanger op te geven."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Specificeer tenminste één bestand om te koppelen, a.u.b."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "U dient '%s' ingeschakeld te hebben in uw onderhoudsopties."
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "U dient \"%s\" ingeschakeld te hebben in uw onderhoudsopties."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "U heeft dit bericht doorgestuurd naar %s op %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "U heeft dit bericht beantwoord op %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:474
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "U heeft \"%s\" niet ingeschreven. De server meldt"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:526
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "U heeft \"%s\" niet uitgeschreven. De server meldt"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:477
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "U heeft \"%s\" met succes ingeschreven"
 
-#: lib/Folder.php:644
+#: lib/Folder.php:529
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "U heeft \"%s\" met succes uitgeschreven"
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:96
 msgid "Your Name"
 msgstr "Uw naam:"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:48
 msgid "Your PGP Public/Private Keys"
 msgstr "Uw openbare/prive PGP sleutels"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:74
 msgid "Your Private Key"
 msgstr "Uw prive sleutel"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:69
 msgid "Your Public Key"
 msgstr "Uw openbare sleutel"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Uw Antwoord aan: adres: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Uw Antwoord aan: adres: <em>(optional)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Uw openbare/prive S/MIME certificaten"
 
@@ -4449,25 +4828,18 @@
 msgid "Your accounts:"
 msgstr "Uw accounts:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Uw alias adressen: <i>(optioneel, elk adres op een nieuwe regel invoeren)</i>"
+"Uw alias adressen: <em>(optioneel, elk adres op een nieuwe regel invoeren)</"
+"em>"
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr "Uw browser ondersteunt geen inline weergave van dit afbeeldingstype."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Uw browser ondersteunt deze printoptie niet. Druk op Control/Option + P om "
-"af te drukken."
-
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Uw standaard karakterset voor het verzenden van berichten:"
 
@@ -4475,68 +4847,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Uw standaard versleutelingsmethode voor het verzenden van berichten:"
 
-#: lib/MIME/Viewer/status.php:92
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Uw gekoppelde bijlage is door minstens één gebruiker gedownload.\n"
+"\n"
+"Bijlagenaam: %s\n"
+"Bijlagedatum: %s\n"
+"\n"
+"Klik op de volgende link om de bijlage definitief te verwijderen:\n"
+"%s"
+
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Uw bericht werd met succes afgeleverd."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Uw ondertekening:"
 
-#: compose.php:1195 mailbox.php:521 message.php:279 lib/Compose.php:731
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Adressen verbergen]"
+
+#: compose.php:1301 mailbox.php:535 message.php:295 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Geen onderwerp]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Adressen tonen -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Adressen tonen - %s ontvangers]"
+
+#: templates/compose/compose.inc:203
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Z_warte lijst"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:152
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:904
-msgid "_Compose"
-msgstr "_Nieuw bericht"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "Ver_wijderen"
 
-#: lib/IMP.php:906
+#: lib/IMP.php:957
 msgid "_Folders"
 msgstr "_Mappen"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:79
 msgid "_Identity"
 msgstr "_Identiteit"
 
-#: lib/IMP.php:897
+#: lib/IMP.php:926
 msgid "_Inbox"
 msgstr "_Inbox"
 
-#: lib/IMP.php:947
+#: lib/IMP.php:998
 msgid "_Log out"
 msgstr "_Afmelden"
 
-#: message.php:375
+#: message.php:391
 msgid "_Message Source"
 msgstr "_Berichtsource"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr "_Nieuw bericht"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "A_fdrukken"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
 msgid "_Priority"
 msgstr "_Prioriteit"
 
-#: mailbox.php:395
+#: mailbox.php:404
 #, php-format
 msgid "_Refresh %s"
 msgstr "_Ververs %s"
@@ -4545,19 +4949,19 @@
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: lib/IMP.php:908
+#: lib/IMP.php:959
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "_Send Message"
 msgstr "_Verzend bericht"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_Thread"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:114
 msgid "_To"
 msgstr "_Aan"
 
@@ -4565,62 +4969,131 @@
 msgid "_Undelete"
 msgstr "_Terughalen"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Thread bekijken"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Witte li_jst"
 
-#: lib/Compose.php:344
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "Geadresseerde onbekend"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "bijlage"
 
-#: view.php:102
+#: view.php:97
 msgid "attachments.zip"
 msgstr "bijlagen.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "bytes"
 msgstr "bytes"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "Kan geen outputbestand maken"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "Kan input niet openen"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "Commandoregel gebruiksfout"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "Configuratiefout"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "Kritisch systeembestand ontbreekt"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "Dataformaatfout"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "invoer niet gevonden"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "van"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "hostnaam onbekend"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "input/output fout"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "interne softwarefout"
+
+#: pgp.php:68 smime.php:29
 msgid "key"
 msgstr "sleutel"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "Mailboxbestand"
 
-#: compose.php:977 lib/Message.php:442
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr "naam"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "geen"
 
-#: templates/compose/spelling.inc:90
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "of"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "Recht geweigerd"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "ontvangers]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "remote fout in protocol"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "service niet beschikbaar"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "spelfout"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "spelfouten"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "systeemfout"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "tijdelijke mislukking"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "uw zwarte lijst"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "uw witte lijst"


--- orig/lib/Maintenance/Task/fetchmail_login.php
+++ mod/lib/Maintenance/Task/fetchmail_login.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/lib/Maintenance/Task/fetchmail_login.php,v 1.5.12.4 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/Maintenance/Task/fetchmail_login.php,v 1.5.12.7 2006/01/01 21:28:59 jan Exp $
  *
- * Copyright 2003-2005 Nuno Loureiro <nuno at co.sapo.pt>
- * Copyright 2004-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Nuno Loureiro <nuno at co.sapo.pt>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -22,7 +22,7 @@
      *
      * @var integer
      */
-    var $_display_type = MAINTENANCE_OUTPUT_NOTICE;
+    var $_display_type = MAINTENANCE_OUTPUT_CONFIRM;
 
     /**
      * Fetch email from other accounts.
@@ -68,7 +68,7 @@
             }
         }
 
-        $str .= "\n</blockquote>\n<b>" . _("Note that this can take some time") . ".</b>\n";
+        $str .= "\n</blockquote>\n<strong>" . _("Note that this can take some time") . ".</strong>\n";
 
         return $str;
     }


--- orig/lib/Maintenance/Task/tos_agreement.php
+++ mod/lib/Maintenance/Task/tos_agreement.php
@@ -3,9 +3,9 @@
  * Maintenance module that presents a TOS Agreement page to user.
  * If user does not accept terms, user is not allowed to login.
  *
- * $Horde: imp/lib/Maintenance/Task/tos_agreement.php,v 1.11.10.4 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/Maintenance/Task/tos_agreement.php,v 1.11.10.7 2006/01/01 21:28:59 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -49,10 +49,7 @@
             Horde::fatal(PEAR::raiseError(sprintf(_("Terms of Service file not specified in conf.php"))), __FILE__, __LINE__);
         }
 
-        $fp = @fopen($conf['tos']['file'], 'r');
-        $contents = @fread($fp, filesize($conf['tos']['file']));
-        @fclose($fp);
-        return $contents;
+        return file_get_contents($conf['tos']['file']);
     }
 
 }


--- orig/locale/sv_SE/help.xml
+++ mod/locale/sv_SE/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/sv_SE/help.xml,v 1.16.6.1 2005/01/25 22:05:51 jan Exp $ -->
+<!-- $Horde: imp/locale/sv_SE/help.xml,v 1.16.6.5 2006/03/23 00:24:08 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/lib/MIME/Viewer/tnef.php
+++ mod/lib/MIME/Viewer/tnef.php
@@ -5,9 +5,9 @@
 /**
  * The IMP_MIME_Viewer_tnef class allows MS-TNEF attachments to be displayed.
  *
- * $Horde: imp/lib/MIME/Viewer/tnef.php,v 1.25.10.5 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/tnef.php,v 1.25.10.8 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -81,7 +81,9 @@
         $text = '';
 
         /* Make sure the contents are in the MIME_Part object. */
-        $this->mime_part->setContents($contents->getBodyPart($this->mime_part->getMIMEId()));
+        if (!$this->mime_part->getContents()) {
+            $this->mime_part->setContents($contents->getBodyPart($this->mime_part->getMIMEId()));
+        }
 
         /* Get the data from the attachment. */
         $tnefData = $this->_getSubparts();
@@ -94,7 +96,7 @@
                 $temp_part = $this->mime_part;
                 $temp_part->setName($data['name']);
                 $temp_part->setDescription($data['name']);
- 
+
                 /* Short-circuit MIME-type guessing for winmail.dat parts;
                    we're showing enough entries for them already. */
                 require_once 'Horde/MIME/Magic.php';


--- orig/expand.php
+++ mod/expand.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: imp/expand.php,v 1.16.10.2 2005/03/18 23:13:00 chuck Exp $
+ * $Horde: imp/expand.php,v 1.16.10.4 2006/01/01 21:28:50 jan Exp $
  *
- * Copyright 2002-2005 Jan Schneider <jan at horde.org>
+ * Copyright 2002-2006 Jan Schneider <jan at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/locale/cs_CZ/help.xml
+++ mod/locale/cs_CZ/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- $Horde: imp/locale/cs_CZ/help.xml,v 1.18.6.1 2005/01/25 22:05:55 jan Exp $ -->
+<!-- $Horde: imp/locale/cs_CZ/help.xml,v 1.18.6.5 2006/03/23 00:24:13 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Vytvoøení Zprávy: Úkony</title>
@@ -198,6 +198,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Vyhledávání Zprávy</title>
     <heading>Vyhledávací Kritéria</heading>
@@ -858,6 +864,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -876,6 +888,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -905,4 +932,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/themes/lucblue/screen.css
+++ mod/themes/lucblue/screen.css
@@ -1,5 +1,5 @@
 /**
- * $Horde: imp/themes/lucblue/screen.css,v 1.1.2.1 2005/07/06 17:51:00 jan Exp $
+ * $Horde: imp/themes/lucblue/screen.css,v 1.1.2.2 2005/10/18 12:14:16 jan Exp $
  */
 
 .folders {


--- orig/config/motd.php.dist
+++ mod/config/motd.php.dist
@@ -3,7 +3,7 @@
 
 <?php
 /**
- * $Horde: imp/config/motd.php.dist,v 1.8.6.1 2005/09/28 22:56:03 selsky Exp $
+ * $Horde: imp/config/motd.php.dist,v 1.8.6.2 2005/10/18 12:13:29 jan Exp $
  *
  * Example code for switching between HTTP and HTTPS.
  * Contributed by: James <james at james-web.net>


--- orig/po/lv_LV.po
+++ mod/po/lv_LV.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP 3.1\n"
-"POT-Creation-Date: 2002-11-28 18:09+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-11-28 18:10+0200\n"
 "Last-Translator: Kaspars Kapenieks <kaspars at rcc.lv>\n"
 "Language-Team: Latvian <i18n at lists.horde.org>\n"
@@ -12,1578 +13,5219 @@
 "Content-Type: text/plain; charset=CP1257\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "Saòçmçjs: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "Saòçmçjs: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "  Datums: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "Sûtîtâjs: "
 
-msgid " - $nm new message"
-msgstr " - $nm jauna vçstule"
-
-msgid " - $nm new messages"
-msgstr " - $nm jaunas vçstules"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "  Temats: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " - "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#, c-format
-msgid "%c"
-msgstr "%c"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d no %d vçstulçm"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Parâdît vçstuli, kad ir izmantoti filtri."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d lîdz %d no %d vçstulçm"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s jau eksistç. Mapi %s pârsaukt neizdevâs."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mape %s tiek pârsaukta mçneða sâkumâ."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Mape \"%s\" veiksmîgi pârsaukta par \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;no&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Saglabât ðîs izmaiòas un pârvietoties uz nâkamo ekrânu.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Atcelt visas izmaiòas un atgriezties pie vçstules rediìçðanas.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Atgriezties pie vçstules rediìçðanas pçc izmaiòu saglabâðanas.  "
-"Ðajâ ekrânâ veiktâs izmaiòas NETIKS saglabâtas.)"
+"(Atgriezties pie vçstules rediìçðanas pçc izmaiòu saglabâðanas.  Ðajâ ekrânâ "
+"veiktâs izmaiòas NETIKS saglabâtas.)"
 
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Atgriezties pie vçstules rediìçðanas pçc izmaiòu saglabâðanas.  Ðajâ ekrânâ "
+"veiktâs izmaiòas NETIKS saglabâtas.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Pievienot ðos nospieþot OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Lûdzu izvçlieties adresi(-es) *"
 
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Identitâte \"%s\" veiksmîgi izdzçsta."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Ðî vçstule ir atzîmçta kâ spams."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Îpaðie simboli"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Îpaðie simboli"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Îpaðie simboli"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Îpaðie simboli"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new "
-"window.</i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
 msgstr ""
-"<p><i>Ðî vçstule ir rakstîta citâ kodçjumâ. Ja tâ "
-"nav redzama korekti, %sspieþiet ðeit</a>, lai to atvçrtu "
-"jaunâ logâ.</i></p>\n"
 
-msgid "Action"
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "Identitâtes nosaukums:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Darbîba"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Pievienot kontaktiem (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "pievienot avotu"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "Pielikums pievienots."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Personîgâ informâcija"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Kontakti"
 
-msgid "Addressbooks"
-msgstr "Adresu grâmatas"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "Kontakti"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Visas vçstules no ðîs mapes tiks izdzçstas!"
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Visi"
 
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Visas vçstules no sekojoðajâm mapçm tiks ielâdçtas vienâ MBOX failâ:"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
-msgstr "Visas vçstules jûsu \"%s\" mapç, kas ir vecâkas par %s dienâm tiks neatgriezeniski "
-"izdzçstas."
-#, c-format
+msgstr ""
+"Visas vçstules jûsu \"%s\" mapç, kas ir vecâkas par %s dienâm tiks "
+"neatgriezeniski izdzçstas."
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Visas nosûtîto pastu mapes, kas ir vecâkas par %s mçneðiem tiks izdzçstas."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "Visas nosûtîto pastu mapes, kas ir vecâkas par %s mçneðiem tiks izdzçstas."
+msgstr ""
+"Visas nosûtîto pastu mapes, kas ir vecâkas par %s mçneðiem tiks izdzçstas."
 
-msgid "All"
-msgstr "Visi"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Mape \"%s\" veiksmîgi pârsaukta par \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
 
-msgid "An illegal value was specified."
-msgstr "Norâdîta nederîga vçrtîba."
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "Pielikums pievienots."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Kïûda pievienojot jaunu ierakstu."
 
-msgid "Answered messages"
-msgstr "Atbildçtâs vçstules"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "Kïûda pievienojot jaunu ierakstu."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Atbildçts"
 
-msgid "Apply All Rules"
-msgstr "Izpildît visus likumus"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Atbildçtâs vçstules"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Pielietot filtrus uz"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Pielietot filtrus uz"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "Pieslçdzoties pielietot filtrçðanas likumus."
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Atjaunojot pastkasti pielietot filtrçðanas likumus."
 
-msgid "April"
-msgstr "Aprîlis"
-
-msgid "Are you SURE you want to continue?"
-msgstr "Vai jûs esat PÂRLIECINÂTS, ka vçlaties turpinât?"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "Vai jûs esat pârliecinâts, ka vçlaties to darît?"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "Vai jûs esat pilnîgi pârliecinâts, ka vçlaties turpinât?"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Vai jûs esat pârliecinâts, ka vçlaties to darît?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
-msgstr "Vai jûs esat pârliecinâts, ka vçlaties NEATGRIEZENISKI izdzçst ðîs vçstules?"
+msgstr ""
+"Vai jûs esat pârliecinâts, ka vçlaties NEATGRIEZENISKI izdzçst ðîs vçstules?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr ""
+"Vai jûs esat pârliecinâts, ka vçlaties NEATGRIEZENISKI izdzçst ðîs vçstules?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Vai jûs tieðâm vçlaties iztukðot ðo mapi?"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Vai jûs tieðâm vçlaties iztukðot atkritumu mapi?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Vai jûs tieðâm vçlaties iztukðot atkritumu mapi?"
 
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr ""
+"Vai jûs esat pârliecinâts, ka vçlaties NEATGRIEZENISKI izdzçst ðîs vçstules?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Vai jûs tieðâm vçlaties iztukðot ðo mapi?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Vai jûs tieðâm vçlaties iztukðot ðo mapi?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Saòemðanas laiks"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Augoði"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Pievienot"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Pielikumi"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "Pievienot"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Pielikums"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Pielikumi"
 
-msgid "August"
-msgstr "Augusts"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Pielikumi"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Darbîba"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "Pieejamâs adresu grâmatas:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Atpakaï uz %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Atpakaï uz %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Melnais saraksts"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Íermenis"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Abi"
 
-msgid "Cancel Message"
-msgstr "Atcelt vçstuli"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Atcelt"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Atcelt vçstuli"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Atceïot vçstuli, tiks neatgriezeniski izdzçsts tâs saturs."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
-msgstr "Cc:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Personîgais"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Mainît"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Izmainît visus"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Izveidot mapi"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
-"Izmainît ekrâna parametrus, piemçram, vçstuïu skaitu katrâ lapâ un "
-"kâ vçstules tiks kârtotas."
+"Izmainît ekrâna parametrus, piemçram, vçstuïu skaitu katrâ lapâ un kâ "
+"vçstules tiks kârtotas."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Izmainît pasta servera parametrus."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
-msgstr "Izmainît vârdu, adresi un parakstu, kas bûs redzami vçstuïu saòçmçjiem."
+msgstr ""
+"Izmainît vârdu, adresi un parakstu, kas bûs redzami vçstuïu saòçmçjiem."
 
-msgid "Change"
-msgstr "Mainît"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Pârbaudît mapç(s) jauno pastu"
 
-msgid "Checkbox"
-msgstr "Íeksis"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "Radâs kïûda sûtot vçstuli: %s"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Izvçlieties darbîbu:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "Izmainît pasta servera parametrus."
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Izvçlieties darbîbu:"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
 msgstr "Izvçlieties adresu grâmatu, kurai pievienot jaunâs adreses."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Izvçlaties kârtîbu, kâdâ pârbaudît adresu grâmatas."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Iztîrîtas visas vçstules no %s."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
 msgstr ""
-"Nospieþat uz vienas no izvçlçtajâm adresu grâmatâm un tad izvçlaties visus laukus, "
-"kuros meklçt."
 
-msgid "Closed Folder"
-msgstr "Mape aizvçrta"
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
 
-msgid "Collapse All Folders"
-msgstr "Aizvçrt visas mapes"
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Rakstît vçstules atseviðíâ logâ."
 
-msgid "Collapse All"
-msgstr "Aizvçrt visu"
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
 
-msgid "Collapse Folder"
-msgstr "Aizvçrt mapi"
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Rakstît vçstules atseviðíâ logâ."
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Rakstît vçstuli (%s)"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
 
-msgid "Compose a message"
-msgstr "Rakstît vçstuli"
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
 
-msgid "Compose messages in a separate window."
-msgstr "Rakstît vçstules atseviðíâ logâ."
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"Nospieþat uz vienas no izvçlçtajâm adresu grâmatâm un tad izvçlaties visus "
+"laukus, kuros meklçt."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
 
-msgid "Compose"
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
 msgstr "Rakstît"
 
-msgid "Contact List"
-msgstr "Kontakti"
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "Mape aizvçrta"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Aizvçrt visu"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All"
+msgstr "Aizvçrt visu"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Aizvçrt visas mapes"
+
+#: folders.php:449
+msgid "Collapse Folder"
+msgstr "Aizvçrt mapi"
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "Rakstît"
+
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
+msgstr "Rakstît vçstuli"
+
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
+msgstr "Rakstît vçstules atseviðíâ logâ."
+
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Izmainît pasta servera parametrus."
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
 
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
+msgstr "Iestâdît, kad pârbaudît pastu un brîdinât par jauna pasta pienâkðanu."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
 msgstr ""
-"Iestâdît, kad pârbaudît pastu un brîdinât par jauna pasta pienâkðanu."
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Kopçt"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Iztukðot atkritumu mapi"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Pareizi"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Izlabots teksts"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Neizdevâs izdzçst vçstules no %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Neizdevâs izdzçst vçstules no %s: %s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Uzturçðanas operâcijas"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Izveidot"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Izveidot mapi"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "Izveidot"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Izveidot mapi"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Izveidot jaunu mapi atkritumiem"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Izveidot jaunu mapi melnrakstiem"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Izveidot jaunu mapi nosûtîtajâm vçstulçm"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Izveidot jaunu mapi atkritumiem"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"Izveidot filtrçðanas likumus ienâkoðâ pasta organizçðanai. Kârtoðana pa mapçm "
-"un dzçðana."
+"Izveidot filtrçðanas likumus ienâkoðâ pasta organizçðanai. Kârtoðana pa "
+"mapçm un dzçðana."
 
-msgid "Create"
-msgstr "Izveidot"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Izveidot jaunu mapi nosûtîtajâm vçstulçm"
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "Pielâgot pasta sûtîðanu un melnrakstu saglabâðanu."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Pielâgot uzturçðanas operâcijas, kas tiek veiktas pieslçdzoties %s."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "Pielâgot pasta sûtîðanu un melnrakstu saglabâðanu."
 
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Pielâgot uzdevumus, kas tiek veikti pieslçdzoties %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Datums"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Datums"
 
-msgid "December"
-msgstr "Decembris"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Izdzçsts"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Dzçst"
 
-msgid "Default Identity"
-msgstr "Parastâ identitâte"
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Noklusçtie kârtoðanas nosacîjumi:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Noklusçtais kârtoðanas virziens:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Izdzçsts"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Dzçst"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Dzçst mapi(-es)"
 
-msgid "Delete messages"
-msgstr "Dzçst vçstules"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Dzçst mapi(-es)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Dzçst mapi(-es)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Dzçst mapi(-es)"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "Mçneða sâkumâ izdzçst vecâs nosûtîtâ pasta mapes"
 
-msgid "Delete"
-msgstr "Dzçst"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "Mçneða sâkumâ izdzçst vecâs nosûtîtâ pasta mapes"
 
-msgid "Deleted an attachment."
-msgstr "Pielikums izdzçsts"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Dzçst vçstules"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Izdzçsts"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Izdzçstâs vçstules"
 
-msgid "Deleted"
-msgstr "Izdzçsts"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Pielikums izdzçsts"
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Dzçst un pârvietot vçstules"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Dilstoði"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Lietotâja opcijas"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Matçt parakstus?"
 
-msgid "Display Options"
-msgstr "Ekrâna opcijas"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Parâdît"
 
-msgid "Display message when filters have been applied."
-msgstr "Parâdît vçstuli, kad ir izmantoti filtri."
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "Brîdinât par jaunu vçstuïu pienâkðanu."
 
-msgid "Display"
-msgstr "Parâdît"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "Ekrâna opcijas"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
 
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Nepârbaudît jauno pastu mapçs"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Vai jûs vçlaties atvçrt ðo mapi?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Izpildîts"
 
-#, c-format
-msgid "Download %s"
-msgstr "Ielâdçt %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Ielâdçt mapi(-es)"
 
-msgid "Download"
-msgstr "Ielâdçt"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Ielâdçt mapi(-es)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Melnraksts"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "Melnrakstu mape:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Melnrakstu mape:"
 
-msgid "Edit your filter rules"
-msgstr "Rediìçt filtrçðanas likumus"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "E-pasta adrese"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
 
-msgid "Edit your identities"
-msgstr "Rediìçt identitâtes"
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Rediìçt"
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "Melnais saraksts"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Pasta filtri"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Rediìçt filtrçðanas likumus"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Rediìçt filtrçðanas likumus"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Rediìçt filtrçðanas likumus"
+
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "E-pasta adrese"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Iztîrîtas visas vçstules no %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Iztukðot mapi(-es)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Iztukðot mapi(-es)"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Iztukðot atkritumu mapi"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Iztukðot atkritumus"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Iztukðot atkritumus"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Pârsûtîtâs vçstules beigas"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "Vecâs vçstules"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "Pârsûtîta vçstule no %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Ievadiet jaunâs atkritumu mapes nosaukumu"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Ievadiet jaunâs melnrakstu mapes nosaukumu"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Ievadiet jâunâs nosûtîto pastu mapes nosaukumu"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Ievadiet jaunâs atkritumu mapes nosaukumu"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Pâradresçt vçstuli"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Ieraksts \"%s\" veiksmîgi pievienots adresu grâmatai"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Kïûda"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Mape \"%s\" veiksmîgi izdzçsta."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Katras 15 minûtes"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Katras 30 sekundes"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Katras 5 minûtes"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Katru pusstundu"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Katru minûti"
 
-msgid "Expand All Folders"
-msgstr "Atvçrt visas mapes"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Atvçrt visus"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Atvçrt visus"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Atvçrt visas mapes"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Atvçrt mapi"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Parâdît vârdus"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Noklusçti atvçrt visu mapju koku mapju skatîjumâ."
 
-msgid "February"
-msgstr "Februâris"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Atvçrt visus"
+
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Jauna vçstule"
 
-msgid "Field"
-msgstr "Lauks"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "Jauna vçstule"
 
-msgid "Filename"
-msgstr "Faila nosaukums"
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "Rakstît vçstules atseviðíâ logâ."
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Filtrçðana: Vçstule \"%s\" no \"%s\" izdzçsta."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Pieslçdzoties pielietot filtrçðanas likumus."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr "Filtrçðana: Vçstule \"%s\" no \"%s\" pârvietota uz mapi \"%s\"."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Iztîrîtas visas vçstules no %s."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr "Filtrçðana: vçstule \"%s\" no \"%s\" pârvietota uz atkritumu mapi."
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Pârsûtîta vçstule no %s"
 
-msgid "Filter Rules"
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr ""
+
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Jums ir %s jaunas vçstules."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Filtri"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Filtri"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Citas opcijas"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Filtrçðanas likumi"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
 msgstr "Filtrçt vçstules saturu pçc profanâcijas."
 
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtri"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Meklçt"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Pirmâ lapa"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Pirmâ lapa"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Pârsûtît"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Mapju ceïvedis"
 
-msgid "Folder Prefix"
-msgstr "Mapju priedçklis"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Februâris"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
 
-msgid "Folders"
-msgstr "Mapes"
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
 
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Pârsûtît"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Pârsûtît:"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Pârsûtîtâs vçstules beigas"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Pârsûtîta vçstule no %s"
 
-msgid "From Address"
-msgstr "Sûtîtâja adrese"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Servera informâcija"
 
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "Sûtîtâjs"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Sûtîtâjs"
 
-msgid "From:"
-msgstr "Sûtîtâjs:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "Sûtîtâja adrese"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fw:"
 
-msgid "Help"
-msgstr "Palîdzîba"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "Fw:"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Pârsûtîtâs vçstules beigas"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Lietotâja opcijas"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "Nâkamâ vçstule"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Pievienot kontaktiem (%s)"
 
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "Pavedienu skatîjums"
+
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Paslçpt izdzçstos"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Paslçpt neparakstîtos"
 
-msgid "How to prefix quoted lines in a reply:"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Kâ prefiksçt sâkotnçjo vçstuli, rakstot atbildi:"
 
-msgid "IMP is not properly configured"
-msgstr "IMP nav korekti nokonfigurçts"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
 
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-msgid "Identities"
-msgstr "Identitâtes"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity"
-msgstr "Identitâte"
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Visas vçstules no ðîs mapes tiks izdzçstas!"
 
-msgid "Identity's name:"
-msgstr "Identitâtes nosaukums:"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignorçt"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorçt visus"
 
-msgid "Ignore"
-msgstr "Ignorçt"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Important messages"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Svarîgi"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "Svarîgi"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "Svarîgi"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
 msgstr "Svarîgas vçstules"
 
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Svarîgi"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Svarîgas vçstules"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Iztîrîtas visas vçstules no %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Iekïaut sâkotnçjo vçstuli atbildç?"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Iekïaut sâkotnçjo vçstuli atbildç?"
 
-msgid "January"
-msgstr "Janvâris"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Ignorçt"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "neviens"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
 
-msgid "July"
-msgstr "Jûlijs"
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
 
-msgid "June"
-msgstr "Jûnijs"
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
 
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "E-pasta adrese"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Valoda"
 
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "Pçdçja lapa"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Pçdçja lapa"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Pçdçjâ pieslçgðanâs: %s"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Pielikumi"
 
-msgid "Last login: Never"
-msgstr "Pçdçjâ pieslçgðanâs: nekad"
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-#, c-format
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "Pastkaste"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Darbîba"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Pieslçgties"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Pieslçgties %s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Pieslçgties"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Pieslçgðanâs uzdevumi"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr "Pieslçgties neizdevâs. Nepareizs lietotâja vârds vai parole."
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr ""
 
-msgid "Logout"
-msgstr "Iziet"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
 
-msgid "Mail Filters"
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
 msgstr "Pasta filtri"
 
-msgid "Mail Management"
-msgstr "Pasta vadîba"
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "Pastkaste"
+
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "Pasta filtri"
 
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Pastkaste"
 
-msgid "Maintenance Operations"
-msgstr "Uzturçðanas operâcijas"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Ekrâna opcijas"
 
-msgid "March"
-msgstr "Marts"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Atzîmçt kâ:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Atzîmçt daþâdus citçðanas lîmeòus atðíirîgâs krâsâs?"
 
-msgid "May"
-msgstr "Maijs"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Pielikums"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Servera informâcija"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Atvçrt mapi"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "Vçstule"
 
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Vçstules rakstîðana"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Vçstules datums"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "Vçstules uz"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Vçstuïu meklçðana"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Vçstules izmçrs"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Vçstules pirmteksts"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Vçstules apskate"
 
-msgid "Message fields"
-msgstr "Vçstules lauki"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Vçstules karodziòi"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Vçstuïu mapes"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "Vçstuïu mapes"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Pielikums izdzçsts"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Vçstules lauki"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Vçstules lauki"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Vçstules datums"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
 msgstr "Vçstule nosûtîta veiksmîgi, bet nav saglabâta"
 
-msgid "Message"
-msgstr "Vçstule"
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Vçstule nosûtîta veiksmîgi, bet nav saglabâta"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "Vçstule nosûtîta veiksmîgi, bet nav saglabâta"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Vçstuïu skaits vienâ lapâ pastkastes skatîjumâ."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Vçstules uz"
 
-msgid "Mime Type"
-msgstr "Mime tips"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Mainît"
 
-msgid "Move Down"
-msgstr "Pârvietot lejup"
-
-msgid "Move Up"
-msgstr "Pârvietot augðup"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Pârvietot vçstules uz <b>%s</b> mapi"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Pârvietot"
 
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "pârvietoties lejup"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "izvçlçties mapi"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "pârvietoties augðup"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Vçstules apskate"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Vârds"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Darbîba"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Nekad"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "Pielikums izdzçsts"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Jauns"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "Atvçrt mapi"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Jauna vçstule"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Nâkamâ vçstule"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Jaunas vçstules"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Jaunas vçstules"
 
-msgid "New"
-msgstr "Jauns"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Nâkamais"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Nâkamâ vçstule"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Nâkamâ lapa"
 
-msgid "Next"
-msgstr "Nâkamais"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "Nç"
 
-msgid "No Subject"
-msgstr "Bez virsraksta"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "Jaunas vçstules"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Izlabots teksts"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
 
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "Pielikumi"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "nav izvçlçta mape"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Nav norâdîtas mapes"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Nav izdzçstas vçstules"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Nav izdzçstas vçstules"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "pârvietot vçstuli uz"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "Neviena vçstule neatbilst meklçðanas nosacîjumiem"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Kïûdu nav"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Ieteikumu nav"
 
-msgid "No"
-msgstr "Nç"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
 
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "Nav norâdîtas mapes"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Neviens"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Nav izdzçsts"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Nav melnraksts"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Nav svarîgs"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Nav personisks"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Nav izdzçstas vçstules"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Nav svarîgas vçstules"
 
-msgid "November"
-msgstr "Novembris"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Citçju"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
-msgstr "Saglabâjamo nosûtîto vçstuïu mapju skaits, ja tâs ik mçnesi tiek dzçstas"
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Saglabâjamo nosûtîto vçstuïu mapju skaits, ja tâs ik mçnesi tiek dzçstas"
+
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"Saglabâjamo nosûtîto vçstuïu mapju skaits, ja tâs ik mçnesi tiek dzçstas"
 
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-msgid "October"
-msgstr "Oktobris"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Vecâs vçstules"
 
-msgid "Old sent-mail folders being purged."
-msgstr "Tiek tîrîtas vecâs nosûtîto vçstuïu mapes."
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Tiek tîrîtas vecâs nosûtîto vçstuïu mapes."
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "Lûdzu izvçlieties tikai vienu mapi ðai operâcijai."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Atvçrt mapi"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Atvçrt mapi"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "Citas opcijas"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "Citas opcijas"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "Atcelt vçstuli"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "Kïûda"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "Opcijas"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Mape \"%s\" veiksmîgi izveidota."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Mape \"%s\" veiksmîgi izdzçsta."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "Sûtît vçstuli"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "Paraksts veiksmîgi aizvietots."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
 
-msgid "Open Folder"
-msgstr "Atvçrt mapi"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "Options"
-msgstr "Opcijas"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-msgid "Other Options"
-msgstr "Citas opcijas"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Lapa %d no %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Daïa(s)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "Vçstule nosûtîta veiksmîgi, bet nav saglabâta"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Parole"
 
-msgid "Perform maintenance operations on login"
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
 msgstr "Pieslçdzoties izpildît uzturçðanas operâcijas"
 
-msgid "Personal Information"
-msgstr "Personîgâ informâcija"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
 
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Personîgais"
 
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "Personîgâ informâcija"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Ievietot parakstu pirms atbildçm un pârsûtîðanâm?"
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "Lûdzu ievadiet jaunâs mapes nosaukumu:"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Lûdzu ievadiet jaunâs mapes nosaukumu:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Lûdzu ievadiet jauno nosaukumu:"
 
-msgid "Please enter valid search criteria."
-msgstr "Lûdzu ievadiet korektus meklçðanas nosacîjumus."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "Lûdzu ievadiet lietotâja vârdu un paroli"
 
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "Lûdzu ievadiet lietotâja vârdu un paroli"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Lûdzu izlabojiet neviennozîmîgas vai nederîgas adreses."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Lûdzu izvçlieties kâdu mapi pirms veikt darbîbas ar to."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "Lûdzu izvçlieties meklçðanai vismaz vienu mapi."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Lûdzu izvçlieties meklçðanai vismaz vienu mapi."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Lûdzu izvçlieties tikai vienu mapi ðai operâcijai."
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "Lûdzu iezîmçjiet vai rediìçjiet nâkamo:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Sâkt jûsu parakstu ar ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "Mape \"%s\" veiksmîgi izveidota."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Iepriekðçjâ lapa"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Iepriekðçjâ vçstule"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Iepriekðçjâ lapa"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Drukât"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problçma ar filtru: %d mape neeksistç: %s"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "Drukât"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
 
-msgid "Problem?"
-msgstr "Problçma?"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Iztîrît izdzçstos"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Iztîrît izdzçstos"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Dzçst mapi(-es)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Cik bieþi tîrît atkritumus:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Tîrît vçstules no atkritumu mapes, ja tâs vecâkas par ðo dienu skaitu"
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Iztîrît vecâs vçstules no atkritumu mapes"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Tîra %d vçstules no atkritumu mapes."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "Tîra %d vçstules no atkritumu mapes."
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Citçju"
 
-msgid "Received after"
-msgstr "Saòemts pçc"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Saòemts"
 
-msgid "Received before"
-msgstr "Saòemts pirms"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Saòemts"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Saòemts"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Pâradresçt"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Pâradresçt"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Pâradresçt vçstuli"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Pâradresçt ðo vçstuli"
 
-msgid "Redirect"
-msgstr "Pâradresçt"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Pâradresçt neizdevâs."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Atjaunot"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Atjaunot mapju skatîjumus:"
 
-msgid "Refresh"
-msgstr "Atjaunot"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Pârlâdçt skatîjumu"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Pârlâdçt skatîjumu"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Atcerçties pçdçjo skatîjumu"
 
-msgid "Remove Selected"
-msgstr "Izdzçst iezîmçto"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "Pastkaste"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "izdzçst avotu"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "Pârsaukt mapi"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Pârsaukt sent-mail mapi mçneða sâkumâ"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Neizdevâs pârsaukt no \"%s\" uz \"%s\". Ðâda bija servera atbilde."
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Atbildçt visiem"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Aizstât ar:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Atbildçt"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Reply-to"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Atbildçt visiem"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Atbildçt visiem:"
 
-msgid "Reply"
-msgstr "Atbildçt"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "Atbildçt visiem"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "Atbildçt visiem:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Atbildçt visiem"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "Reply-To: "
 
-msgid "Reply-to"
-msgstr "Reply-to"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "Reply-To: "
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Atbildçt:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Pieteikt kâ spamu"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Pieteikt kâ spamu"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "Pieprasît atskaiti par saòemðanu"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "Pieprasît atskaiti par saòemðanu"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Dzçst visus"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Turpinât"
 
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Vçstules rakstîðana"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Lietotâja opcijas"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
-"Atgriezties pie vçstuïu saraksta pçc vçstules izdzçðanas, pârvietoðanas vai nokopçðanas?"
+"Atgriezties pie vçstuïu saraksta pçc vçstules izdzçðanas, pârvietoðanas vai "
+"nokopçðanas?"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "Opcijas"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Mape \"%s\" veiksmîgi izdzçsta."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "Sûtît vçstuli"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
 
-msgid "Rule Definition"
-msgstr "Likuma definçðana"
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Temats"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "Saglabât kopiju "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Saglabât kâ"
 
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Saglabât kâ"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Saglabât melnrakstu"
 
-msgid "Save a copy in "
-msgstr "Saglabât kopiju "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Saglabât kâ"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
 
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "Lietotâja opcijas"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Saglabât melnrakstu"
+
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Saglabât kâ"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Saglabât nosûtîto pastu"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Neizdevâs saglabât melnrakstu. Ðâda bija servera atbilde: %s"
 
-msgid "Search Results"
-msgstr "Meklçðanas rezultâti"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Meklçðana"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Meklçðana"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Lietotâja opcijas"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "Meklçðanas rezultâti"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Redzçts"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Izvçlies"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Neizvçlçties neko"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Izvçlies identitâti"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Iezîmçt visus"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Neizvçlçties neko"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Izvçlies adresu grâmatu avotus adresu pievienoðanai un meklçðanai."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Iezîmçt visus"
 
-msgid "Select an identity"
-msgstr "Izvçlies identitâti"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "Izvçlaties kârtîbu, kâdâ pârbaudît adresu grâmatas."
 
-msgid "Select charset:"
-msgstr "Izvçlies kodçjumu:"
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "Neizvçlçties neko"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Neizvçlçties neko"
 
-msgid "Select your preferred language:"
-msgstr "Izvçlies valodu:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Izvçlies"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Izvçlçtâs adresu grâmatas:"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Servera informâcija"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Sûtît vçstuli"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "Nosûtîto vçstuïu mape:"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Nosûtîto vçstuïu mape:"
 
-msgid "September"
-msgstr "Septembris"
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "Serveris"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "Servera informâcija"
 
-msgid "Server"
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
 msgstr "Serveris"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Iestatîjumi vçstuïu filtrçðanai pçc nevçlama satura."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Iestâdît ko darît kad izdzçð vai pârvieto vçstuli."
 
-msgid "Set the current time zone."
-msgstr "Iestâdît paðreizçjo laika zonu."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Mapes"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Nosûtîto vçstuïu mape:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Norâdît valodu, kâdâ bûs redzmas izvçlnes, paskaidrojumi un palîdzîba."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Vai vçstules rediìçðanas logs jâaizver pçc melnraksta saglabâðanas?"
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Aizvçrt visas mapes"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Parâdît izdzçstos"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "Personîgâ informâcija"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Parakstîties uz mapi(-çm)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Parâdît neparakstîtos"
 
-msgid "Show last login time when logging in"
-msgstr "Pieslçdzoties parâdît iepriekðçjâs pieslçgðanâs laiku"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-msgid "Show legend in the mailbox view."
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
 msgstr "Râdît paskaidrojumus pastkastes skatîjumâ."
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "Izmçrs"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Izmçrs"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Izmçrs"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Trûkst IMP konfigurâcijas faili:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "Sûtîtâja adrese"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "Vçstules izmçrs"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "Bez virsraksta"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "Pavediens"
 
-msgid "Sort Direction"
-msgstr "Kârtoðanas virziens"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "Sûtîtâja adrese"
 
-msgid "Spam Report from"
-msgstr "Spama pieteikums no"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Atkritumu mape:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Îpaðie simboli"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Pareizrakstîbas pârbaude"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Pareizrakstîbas pârbaudîtâjs"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Pareizrakstîbas pârbaude pabeigta"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
-msgstr "Pareizrakstîbas kïûdu skaits vienâ ekrânâ, veicot pareizrakstîbas pârbaudi."
+msgstr ""
+"Pareizrakstîbas kïûdu skaits vienâ ekrânâ, veicot pareizrakstîbas pârbaudi."
 
-msgid "Subject Field"
-msgstr "Temata lauks"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Pielikums"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Temats"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Temats"
 
-msgid "Subject:"
-msgstr "Temats:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Temata lauks"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "Temats"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Parakstîties uz mapi(-çm)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Veiksme"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Ieteikumi"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Teksts"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Teksts"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Identitâte \"%s\" veiksmîgi izdzçsta."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Identitâte \"%s\" saglabâta."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Tekoðâ mape(s) \"%s\" tiks pârsaukta par \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Identitâte \"%s\" veiksmîgi izdzçsta."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Mape \"%s\" jau eksistç"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
-"Mapes \"%s\" nosaukums satur neatïautus simbolus. Lûdzu sazinieties ar administratoru."
-#, c-format
+"Mapes \"%s\" nosaukums satur neatïautus simbolus. Lûdzu sazinieties ar "
+"administratoru."
+
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Mape \"%s\" tika izveidota bet jûs uz to neesat parakstîjies."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Mape \"%s\" tika izdzçsta, bet jûs neesat no tâs atrakstîjies."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Mapi \"%s\" neizdevâs izveidot. Servera atbilde bija ðâda."
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Mapi \"%s\" neizdevâs izdzçst. Servera atbilde bijâ ðâda"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mape \"%s\" veiksmîgi izveidota."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Mape \"%s\" veiksmîgi izdzçsta."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mape \"%s\" veiksmîgi pârsaukta par \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "Mape \"%s\" jau eksistç"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
+msgstr "Rediìçjamâ vçstule tika aizvçrta. Beidzu."
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "Identitâte \"%s\" veiksmîgi izdzçsta."
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "Identitâte \"%s\" saglabâta."
 
-msgid "The message being composed has been closed.  Exiting."
-msgstr "Rediìçjamâ vçstule tika aizvçrta. Beidzu."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
 
-msgid "The signature couldn't be replaced."
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "Parakstu neizdzvâs aizvietot."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Paraksts veiksmîgi aizvietots."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Identitâte \"%s\" saglabâta."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Identitâte \"%s\" veiksmîgi izdzçsta."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Identitâte \"%s\" veiksmîgi izdzçsta."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "izdçst vçstuli"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Pâradresçt ðo vçstuli"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Paraksts veiksmîgi aizvietots."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Ðajâ pastkastç nav vçstuïu."
 
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Radâs problçma dzçðot %s. Ðâda bija servera atbilde"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Radâs problçma tîrot pastkasti. Ðâda bija servera atbilde"
-
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Radâs problçma tîrot pastkasti. Ðâda bija servera atbilde: %s"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"Radâs problçma ar faila ielâdi. Fails varçtu bût lielâks par "
-"maksimâli pieïaujamo izmçru (%d MB)."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Radâs problçma tîrot pastkasti. Ðâda bija servera atbilde"
 
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"Radâs problçma ar faila ielâdi. Fails varçtu bût lielâks par "
-"maksimâli pieïaujamo izmçru."
-#, c-format
-msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr "Radâs kïûda kopçjot vçstules uz \"%s\". Ðâda bija servera atbilde"
 
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "Radâs kïûda dzçðot vçstules no mapes \"%s\". Ðâda bija servera atbilde"
 
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Radâs kïûda dzçðot vçstules mapç \"%s\". Ðâda bija servera atbilde"
 
-msgid "There was an error deleting messages. This is what the server said"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Radâs kïûda dzçðot vçstules. Ðâda bija servera atbilde"
 
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Radâs kïûda apskatot pieprasîto vçstuli."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Radâs kïûda parâdot ðo vçstules daïu"
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Radâs kïûda karogojot vçstules mapç \"%s\". Ðâda bija servera atbilde."
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Radâs kïûda karogojot vçstules. Ðâda bija servera atbilde."
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "Radâs kïûda saglabâjot melnrakstu."
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr "Radâs kïûda pârvietojot vçstules uz \"%s\". Ðâda bija servera atbilde"
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Radâs kïûda apskatot pieprasîto vçstuli."
 
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Radâs kïûda apskatot pieprasîto vçstuli."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Radâs kïûda sûtot vçstuli: %s"
+
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
-msgstr "Radâs kïûda pârvietojot vçstules uz atkritumiem. Ðâda bija servera atbilde."
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "Radâs kïûda pârvietojot vçstules uz \"%s\". Ðâda bija servera atbilde"
 
-msgid "There was an error saving a draft."
-msgstr "Radâs kïûda saglabâjot melnrakstu."
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "Radâs kïûda parâdot ðo vçstules daïu"
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Radâs kïûda sûtot vçstuli: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "Radâs kïûda atjaunojot vçstules. Ðâda bija servera atbilde"
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Radâs kïûda sûtot vçstuli: %s"
 
-msgid "There was an error viewing the requested message."
-msgstr "Radâs kïûda apskatot pieprasîto vçstuli."
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Radâs kïûda parâdot ðo vçstules daïu"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr ""
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Tas var prasît daudz laika. Vai vçlaties turpinât?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
 msgstr ""
-"ðis fails kontrolç IMP MIME draiverus"
 
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
 msgstr ""
-"Ðis fails kontrolç noklusçtos parametrus"
 
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"Ðis fails kontrolç noklusçtos iestatîjumus"
 
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
-"Ðis fails kontrolç stilus"
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
-"Ðis ir galvenais konfigurâcijas fails"
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Tas var prasît daudz laika. Vai vçlaties turpinât?"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Ðî vçstule ir atzîmçta kâ spams."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr ""
 
+#: message.php:211
 msgid "This message to"
 msgstr "Ðo vçstuli uz"
 
-msgid "This number must be at least one."
-msgstr "Ðim skaitlim jâbût lielâkam par nulli."
-
-msgid "This value must be a number."
-msgstr "Ðai vçrtîbai jâbût skaitlim."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "Ðis logs jâizsauc no vçstules rediìçðanas loga"
 
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Parâdît"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Pavedienu skatîjums"
 
-msgid "Thread"
-msgstr "Pavediens"
-
-msgid "Time Zone"
-msgstr "Laika zona"
-
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Saòçmçjs"
 
-msgid "To:"
-msgstr "Saòçmçjs:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "Sûtîtâja adrese"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Pielikumi"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Kopçjais izmçrs: %s KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Atkritumu mape:"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Atkritumu mape:"
 
-msgid "Unanswered messages"
-msgstr "Neatbildçtâs vçstules"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Neatbildçts"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Neatbildçtâs vçstules"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Atjaunot"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Neatklâtie saòçmçji"
 
-msgid "Unnamed"
-msgstr "Nenosaukts"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "Neatklâtie saòçmçji"
 
-msgid "Unread"
-msgstr "Neizlasîts"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
 
-msgid "Unseen Messages"
-msgstr "Neredzçtas vçstules"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "Nenosaukts"
 
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Neredzçts"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Atrakstîtîes no mapes(-çm)"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Lietojiet Ctrl/Option+klikðíis lai izvçlçtos vairâkus saòçmçjus"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Lietot noklusçto vçrtîbu"
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
 msgstr "Lietot parakstîðanos uz IMAP mapçm"
 
-msgid "User Options"
-msgstr "Lietotâja opcijas"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Iztukðot atkritumu mapi"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Lietotâja vârds"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
 
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Lietotâja vârds"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "Lietotâja vârds"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "Skatît %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Skatît %s"
 
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Rakstît vçstules atseviðíâ logâ."
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Jaunas vçstules"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Pavediens"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Rakstît vçstules atseviðíâ logâ."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Rakstît vçstules atseviðíâ logâ."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "Apskatît vçstules "
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Skats vai pastkaste ko parâdît pçc pieslçgðanâs:"
 
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "Skatît %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Apskatît vçstules "
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Mape \"%s\" veiksmîgi izdzçsta."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Izveidot mapi"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Iztukðot atkritumu mapi"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "Brîdinâjums"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Laipni lûdzam %s"
 
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
+#, fuzzy
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
 msgstr ""
 "Dzçðot vçstules pârvietot tâs uz atkritumu mapi, nevis atzîmçt kâ izdzçstas."
 
-msgid "Wrap text at this many characters."
-msgstr "Lauzt rindas pçc ðâda simbolu skaita."
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Jâ"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Jûs mçìinat izdzçst sekojoðas mapes:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Jûs mçìinat izdzçst sekojoðas mapes:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Jûs mçìinat izdzçst sekojoðas mapes:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "Jûs pârsaucat mapi: "
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Jûs veidojat apakðmapi "
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Jûs veidojat augðçjâ lîmeòa mapi."
 
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Jûs veidojat augðçjâ lîmeòa mapi."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Jûs pârsaucat mapi: "
 
-#, c-format
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Jûs esat veiksmîgi atrakstîjies no \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Jums ir %s jaunas vçstules."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Jums ir viena jauna vçstule."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Jûs esat izgâjis no sistçmas.<br /> Paldies par lietoðanu."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Jums ir viena jauna vçstule."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Jums ir jauns pasts sekojoðâ mapç:"
 
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Jums ir jauns pasts sekojoðâs mapçs:"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Jums vispirms jâizvçlas pielikumi, ko izdzçst."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Jânorâda vismaz viens saòçmçjs."
 
-msgid "You must first specify the file to attach."
-msgstr "Jums vispirms jânorâda fails ko pievienot."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-msgid "You must have at least one recipient."
-msgstr "Jânorâda vismaz viens saòçmçjs."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Jums vispirms jânorâda mçría pastkaste."
 
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "Jâizvçlas identitâte, ko izdzçst."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Vispirms jâizvçlas adrese."
 
-msgid "You must select an identity to be deleted."
-msgstr "Jâizvçlas identitâte, ko izdzçst."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Vispirms jâizvçlas vismaz viena vçstule."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Jânorâda saòçmçjs"
-#, c-format
+
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Jums vispirms jânorâda fails ko pievienot."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Pâradresçt ðo vçstuli"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Pâradresçt ðo vçstuli"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Neizdevâs parakstîties uz mapi \"%s\". Ðâda bija servera atbilde"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Neizdevâs atrakstîties no \"%s\". Ðâda bija servera atbilde"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Jûs esat veiksmîgi parakstîjies uz \"%s\""
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Jûs esat veiksmîgi atrakstîjies no \"%s\""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Jûsu %s sesija ir beigusies. Lûdzu pieslçdzieties atkârtoti."
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "Jûsu pilnais vârds:"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-msgid "Your From: address:"
-msgstr "Jûsu From: adrese:"
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-msgid "Your Information"
-msgstr "Jûsu informâcija"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "Jûsu pilnais vârds:"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Jûsu Reply-to: adrese: <i>(neobligâta)</i>"
 
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
-"Jûsu pârlûkprogramma neuztur ðo drukâðanas iespçju. Nospieþiet Ctrl/Option + P lai izdrukâtu"
 
-msgid "Your current time zone:"
-msgstr "Jûsu paðreizçjâ laika zona:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "Jûsu identitâtes:"
 
-msgid "Your default identity:"
-msgstr "Jûsu parastâ identitâte:"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-msgid "Your full name:"
-msgstr "Jûsu pilnais vârds:"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+"Jûsu pârlûkprogramma neuztur ðo drukâðanas iespçju. Nospieþiet Ctrl/Option + "
+"P lai izdrukâtu"
 
-msgid "Your identities:"
-msgstr "Jûsu identitâtes:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Jûsu opcijas ir saglabâtas."
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Mape \"%s\" veiksmîgi izdzçsta."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Jûsu paraksts:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Bez virsraksta]"
 
-msgid "add source"
-msgstr "pievienot avotu"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Bcc"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "Melnais saraksts"
 
-msgid "cannot move past the beginning"
-msgstr "nevar pârvietoties pâri sâkumam"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Cc"
 
-msgid "cannot move past the end"
-msgstr "nevar pârvietoties pâri beigâm"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Dzçst"
 
-msgid "delete message"
-msgstr "izdçst vçstuli"
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Mapes"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitâte"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Iziet"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "Vçstules pirmteksts"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Jaunas vçstules"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Drukât"
 
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Atjaunot"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Atbildçt"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Meklçðana"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Sûtît vçstuli"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Pavediens"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Saòçmçjs"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Atjaunot"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Pavediens"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Pielikums"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Pielikumi"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "no"
 
-msgid "move down"
-msgstr "pârvietoties lejup"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-msgid "move message to"
-msgstr "pârvietot vçstuli uz"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-msgid "move up"
-msgstr "pârvietoties augðup"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-msgid "no folder selected"
-msgstr "nav izvçlçta mape"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "nav izvçlçts likums"
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Pastkaste"
 
-msgid "no text specified"
-msgstr "nav norâdîts teksts"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Vârds"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "neviens"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "vai"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "lûdzu aizpildiet tekstu un izvçlieties lauku un darbîbu"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "izdzçst avotu"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "izvçlçties mapi"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "pareizrakstîbas kïûda"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "pareizrakstîbas kïûdas"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "kur %s lauks satur <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "pareizrakstîbas kïûda"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "Melnais saraksts"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/lib/Fetchmail.php
+++ mod/lib/Fetchmail.php
@@ -3,10 +3,10 @@
  * The IMP_Fetchmail:: class provides an interface to download mail from
  * remote mail servers.
  *
- * $Horde: imp/lib/Fetchmail.php,v 1.41.8.5 2005/07/03 03:42:42 selsky Exp $
+ * $Horde: imp/lib/Fetchmail.php,v 1.41.8.9 2006/01/01 21:28:54 jan Exp $
  *
- * Copyright 2002-2005 Nuno Loureiro <nuno at co.sapo.pt>
- * Copyright 2004-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Nuno Loureiro <nuno at co.sapo.pt>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -71,10 +71,12 @@
         require_once dirname(__FILE__) . '/Fetchmail/' . $driver . '.php';
         $class = 'IMP_Fetchmail_' . $driver;
         if (class_exists($class)) {
-            return $ret = &new $class($params);
+            $fetchmail = &new $class($params);
         } else {
-            return false;
+            $fetchmail = false;
         }
+
+        return $fetchmail;
     }
 
     /**
@@ -90,7 +92,7 @@
         $drivers = array();
 
         if (($dir = opendir(dirname(__FILE__) . '/Fetchmail'))) {
-            while (false !== ($file = readdir($dir))) { 
+            while (false !== ($file = readdir($dir))) {
                 if (!is_dir($file)) {
                     $driver = basename($file, '.php');
                     $class = 'IMP_Fetchmail_' . $driver;
@@ -99,16 +101,16 @@
                         $drivers[$driver] = $descrip;
                     }
                 }
-            } 
+            }
 
-            closedir($dir); 
+            closedir($dir);
         }
 
         return $drivers;
     }
 
     /**
-     * List the colors available for coloring fetched messages. 
+     * List the colors available for coloring fetched messages.
      * This function can be called statically:
      *   $list = IMP_Fetchmail::listColors();
      *
@@ -121,7 +123,7 @@
             'aqua'
         );
     }
- 
+
     /**
      * Returns a description of the driver.
      * This function can be called statically:
@@ -270,7 +272,7 @@
      * This function can be called statically.
      *
      * @param array $accounts  The list of account identifiers to fetch mail
-     *                         for. 
+     *                         for.
      */
     function fetchMail($accounts)
     {
@@ -295,7 +297,6 @@
 
 }
 
-
 /**
  * The IMP_Fetchmail_Account:: class provides an interface to accessing
  * fetchmail preferences for all mail accounts a user might have.


--- orig/po/is_IS.po
+++ mod/po/is_IS.po
@@ -1,1591 +1,4634 @@
-# Íslenska fyrir IMP 3.1
+# Íslenska fyrir IMP 4.0.4
 # Copyright (C) 2002 Horde Project.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 3.1\n"
-"POT-Creation-Date: 2002-08-23 10:59+0000\n"
-"PO-Revision-Date: 2002-01-010 19:00+0100\n"
+"Project-Id-Version: IMP 4.0.4\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2002-01-10 19:00+0100\n"
+"PO-Revision-Date: 2005-11-19 20:33+0000\n"
 "Last-Translator: Bjorn Davidsson <bjossi at snerpa.is>\n"
 "Language-Team: Icelandic <support at snerpa.is>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:265 lib/Compose.php:317
 msgid "      To: "
 msgstr "      Til: "
 
+#: lib/Compose.php:253 lib/Compose.php:305
 msgid "    Date: "
 msgstr "   Dags.: "
 
+#: lib/Compose.php:256 lib/Compose.php:308
 msgid "    From: "
 msgstr "     Frá: "
 
-msgid " - $nm new message"
-msgstr " - $nm nýtt skeyti"
-
-msgid " - $nm new messages"
-msgstr " - $nm ný skeyti"
+#: mailbox.php:406 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:262 lib/Compose.php:314
 msgid " Subject: "
 msgstr " Efnislína: "
 
+#: templates/compose/spelling.inc:74
 msgid " in "
 msgstr " í "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr ""
 
-#, c-format
-msgid "%c"
+#: lib/Block/summary.php:71
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: mailbox.php:196
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "%d skeytum hefur verið eytt."
+
+#: lib/Spam.php:178
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+"Tilkynning um %d skeyti merkt sem ekki ruslpóstur hefur verið send "
+"kerfisumsjón."
+
+#: lib/Spam.php:158
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Tilkynning um %d skeyti merkt sem ekki ruslpóstur hefur verið send."
+
+#: lib/Spam.php:170
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
+"Tilkynning um %d skeyti merkt sem ruslpóstur hefur verið send kerfisumsjón."
 
-#, c-format
-msgid "%d of %d Messages"
-msgstr "%d af %d skeytum"
+#: lib/Spam.php:150
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Tilkynning um %d skeyti merkt sem ruslpóstur hefur verið send."
 
-#, c-format
+#: mailbox.php:369
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d til %d af %d skeytum"
 
-#, c-format
+#: mailbox.php:619
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: pgp.php:332
+#, php-format
+msgid "%s PGP Administration"
+msgstr ""
+
+#: smime.php:254
+#, php-format
+msgid "%s S/MIME Administration"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s er nú þegar til. Mappan %s var ekki endurnefnd."
 
-#, c-format
+#: lib/Message.php:612
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mappan %s verður umnefnd í upphafi hvers mánaðar."
 
-#, c-format
-msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr "%s hefur ihætt við %s."
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr "%s hefur hafnað."
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr "%s hefur svarað boðinu til %s."
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s óskar eftir upplýsingum um hvort þú ert viðlátinn."
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:377
+#, php-format
+msgid "%s was successfully added to %s."
+msgstr "%s var bætt í %s."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:269 message.php:274
+#, php-format
+msgid "%s: %s"
 msgstr ""
 
+#: templates/message/navbar_top.inc:13
+#, php-format
+msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
+msgstr "%s: %s (%d&nbsp;af&nbsp;%d)"
+
+#: templates/compose/spelling.inc:140
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Samþykkja breytingar og fara í næsta glugga.)"
 
+#: templates/compose/spelling.inc:127
 msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Hundsa allar breytingar og fara til baka &iacute; a&eth; skrifa skeyti.)"
+msgstr "(Hundsa allar breytingar og fara til baka í að skrifa skeyti.)"
 
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
-msgstr "(Fara til baka í að skrifa skeyti eftir að; hafa vistað breytingar sem gerðar hafa verið hingað til. Breytingar sem ekki hafa verið skráðar verða ekki geymdar.)"
+msgstr ""
+"(Fara til baka í að skrifa skeyti eftir að hafa vistað breytingar sem gerðar "
+"hafa verið hingað til. Breytingar sem ekki hafa verið skráðar verða ekki "
+"geymdar.)"
 
+#: spelling.php:277
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Bættu þessum við með því að smella á OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Veldu netföng *"
 
-#, c-format
+#: mailbox.php:194
+msgid "1 message has been deleted."
+msgstr "Einu skeyti var eytt."
+
+#: lib/Spam.php:180
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+"Tilkynning um eitt skeyti sem ekki ruslpóstur hefur verið send kerfisumsjón."
+
+#: lib/Spam.php:160
+msgid "1 message has been reported as not spam."
+msgstr "Tilkynning um eitt skeyti sem ruslpóstur hefur verið send."
+
+#: lib/Spam.php:172
+msgid "1 message has been reported as spam to your system administrator."
+msgstr ""
+"Tilkynning um eitt skeyti sem ruslpóstur hefur verið send kerfisumsjón."
+
+#: lib/Spam.php:152
+msgid "1 message has been reported as spam."
+msgstr "Tilkynning um eitt skeyti sem ruslpóstur hefur verið send."
+
+#: config/prefs.php.dist:788
+msgid "100 characters"
+msgstr ""
+
+#: config/prefs.php.dist:791
+msgid "1000 characters"
+msgstr ""
+
+#: config/prefs.php.dist:789
+msgid "250 characters"
+msgstr ""
+
+#: config/prefs.php.dist:790
+msgid "500 characters"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr "Stór mynd nefnd %s er hengd við þetta skeyti."
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
-msgstr "<p><i>Þetta skeyti var ekki samið í sama stafasetti og því sem þú notar nú. Ef þú átt í vanda með lestur þess, %ssmelltu hér</a> til að opna skeytið í nýjum glugga.</i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
 
-msgid "Action"
-msgstr "Aðgerð"
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr "OG"
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr "Samþykkja beiðni"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr "Samþykkt"
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr "Samþykkt: "
+
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr "Notandanafn:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+msgid "Actions"
+msgstr "Aðgerðir"
+
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "bæta við handriti"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, php-format
+msgid "Add to Address book (%s)"
 msgstr "Bæta í netfangabók (%s)"
 
-msgid "Added an attachment."
-msgstr "Viðhengi bætt við."
+#: compose.php:1191
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr "Viðhenginu \"%s\" bætt við."
+
+#: config/prefs.php.dist:190
+msgid ""
+"Additional headers to display when viewing: <i>(optional, enter each header "
+"on a new line)</i>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+msgid "Additional information details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
 
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:90 templates/contacts/contacts.inc:180
+#: templates/compose/redirect.inc:55 templates/compose/compose.inc:330
 msgid "Address Book"
 msgstr "Netfangabók"
 
-msgid "Addressbooks"
+#: config/prefs.php.dist:126
+msgid "Address Books"
 msgstr "Netfangabækur"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Öllum skeytum í möppunni/möppunum verður eytt!"
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to BCC all messages: <i>(optional, enter each address on a new "
+"line)</i>"
+msgstr ""
+
+#: config/prefs.php.dist:173
+msgid ""
+"Addresses to explicitly tie to this identity: <i>(optional, enter each "
+"address on a new line)</i>"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+msgid "All"
+msgstr "Öll skeyti"
+
+#: templates/folders/javascript.inc:5
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
-msgstr "Öll skeyti í þessari möppu / þessum möppunum verða geymd í stakri MBOX skrá:"
+msgstr ""
+"Öll skeyti í þessari möppu / þessum möppunum verða geymd í stakri MBOX skrá:"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:81
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr "Öllum skeytum í möppunni \"%s\" sem eru eldri en %s daga verður eytt."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Öllum eldri skeytum sem þú hefur sent frá þér, og eru eldri en %s mánaða "
+"verður eytt."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "Öllum eldri skeytum sem þú hefur sent frá þér, og eru eldri en %s mánaða verður eytt."
+msgstr "Öllum sent-mail möppum sem eru eldri en %s mánaða verður eytt."
 
-msgid "All"
-msgstr "Öll skeyti"
+#: acl.php:85
+#, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr ""
 
-msgid "An illegal value was specified."
-msgstr "Ótækt gildi tilgreint."
+#: templates/filters/prefs.inc:55
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
-msgstr "Óþekkt villa kom upp þegar reynt var að framkvæma skráninguna."
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
 
-msgid "Answered messages"
-msgstr "Skeyti sem búið er að svara"
+#: config/prefs.php.dist:565 config/prefs.php.dist:577
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:550
+msgid "Always save attachments"
+msgstr "Altaf geyma viðhengi."
+
+#: lib/Message.php:468
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
+
+#: lib/Message.php:364
+msgid "An unknown error occured while creating the new task."
+msgstr "Óþekkt villa kom upp þegar reynt var að framkvæma skráninguna."
 
+#: message.php:484 mailbox.php:693 templates/mailbox/legend.inc:6
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/message/navbar_navigate.inc:9
 msgid "Answered"
 msgstr "Svarað"
 
-msgid "Apply All Rules"
-msgstr "Virkja allar reglur"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Skeyti sem búið er að svara"
 
-msgid "Apply Filters on"
-msgstr "Virkja síur fyrir"
+#: templates/mailbox/header.inc:7
+msgid "Apply Filters"
+msgstr "Virkja síur"
+
+#: templates/mailbox/header.inc:7
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "Virkja síur fyrir %s"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:43
+msgid "Apply filter rules upon logging on?"
 msgstr "Virkja síur þegar þú tengist."
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:49
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Virkja síur þegar INBOX er uppfært."
 
-msgid "April"
-msgstr "apríl"
-
-msgid "Are you SURE you want to continue?"
-msgstr "Ert þú VISS, um að þú viljir halda áfram?"
+#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+msgid "Are you sure you want to delete this public key?"
+msgstr "Ert þú viss um að þú viljir gera þetta?"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "Ert þú ALVEG VISS, um að þú viljir halda áfram?"
+#: templates/pgp/pgp.inc:169 templates/smime/smime.inc:128
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr "Ert þú viss um að þú viljir gera þetta?"
 
+#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
 msgid "Are you sure you want to do this?"
 msgstr "Ert þú viss um að þú viljir gera þetta?"
 
+#: message.php:391 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Ert þú viss um að þú viljir ENDANLEGA eyða þessum skeytum?"
 
+#: lib/MIME/Contents.php:202
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Ert þú viss um að þú viljir ENDANLEGA eyða þessum viðhengjum?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Ert þú viss um að þú viljir tæma þessa möppu?"
 
+#: lib/IMP.php:931
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Ert þú viss um að þú viljir tæma ruslakörfuna?"
 
+#: templates/mailbox/actions.inc:8
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Ert þú viss um að þú viljir ENDANLEGA eyða þessum skeytum?"
+
+#: templates/mailbox/javascript.inc:79 templates/message/javascript.inc:80
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Ert þú viss um að þú viljir tilkynna þetta skeyti sem ekki ruslpóst?"
+
+#: templates/mailbox/javascript.inc:74 templates/message/javascript.inc:75
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Ert þú viss um að þú viljir tilkynna þetta skeyti sem ruslpóst?"
+
+#: config/prefs.php.dist:887
 msgid "Arrival Time"
 msgstr "Komutími"
 
+#: config/prefs.php.dist:902
 msgid "Ascending"
 msgstr "Hækkandi"
 
+#: config/prefs.php.dist:564 config/prefs.php.dist:576
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:509
 msgid "Attach"
 msgstr "Hengja skrá við"
 
+#: templates/compose/compose.inc:466
+msgid "Attach Files"
+msgstr "Bæta við viðhengjum"
+
+#: templates/compose/compose.inc:447
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+msgid "Attached File:"
+msgstr "Viðhengi:"
+
+#: lib/Compose.php:362 lib/Compose.php:447
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr "Viðhengið \"%s\" er of stórt. Skráin var EKKI viðhengd."
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: mailbox.php:729 templates/mailbox/legend.inc:16
+#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
+#: templates/compose/attachments.js:98
 msgid "Attachment"
 msgstr "Viðhengi"
 
+#: compose.php:1001 lib/Message.php:429
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
+#: lib/Compose.php:984
 msgid "Attachments"
 msgstr "Viðhengi"
 
-msgid "August"
-msgstr "ágúst"
+#: lib/MIME/Viewer/itip.php:682
+msgid "Attendees"
+msgstr "Viðstaddir"
+
+#: lib/MIME/Viewer/notification.php:53
+msgid "Attention"
+msgstr "Athugaðu"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:634
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
 msgstr "Tiltækar netfangabækur:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, php-format
+msgid "Bac_k to %s"
+msgstr "Tilbaka í %s"
+
+#: thread.php:86 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Tilbaka í %s"
 
+#: search.php:147 message.php:250 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20
 msgid "Bcc"
 msgstr ""
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr "Hér að neðan er hrár texti af stöðuuplýsingaskeytinu."
+
+#: templates/mailbox/actions.inc:16 templates/message/navbar_actions.inc:19
 msgid "Blacklist"
 msgstr "Svartlisti"
 
+#: config/prefs.php.dist:622
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: search.php:155
 msgid "Body"
 msgstr "Meginmál"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Bæði"
 
-msgid "Cancel Message"
-msgstr "Hætta við skeyti"
+#: config/prefs.php.dist:681
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:283
+msgid "C_harset"
+msgstr "Stafasett"
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr "Dagatal"
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr "Get ekki tengst póstþjóni."
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr "Gat ekki tengst póstþjóni á fjarenda: "
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:273 templates/pgp/import_key.inc:66
+#: templates/pgp/passphrase.inc:32 templates/folders/import.inc:21
+#: templates/smime/import_key.inc:85 templates/smime/passphrase.inc:22
+#: templates/contacts/contacts.inc:255 templates/compose/spelling.inc:127
 msgid "Cancel"
 msgstr "Hætta við"
 
+#: templates/compose/redirect.inc:116 templates/compose/compose.inc:70
+#: templates/compose/compose.inc:426
+msgid "Cancel Message"
+msgstr "Hætta við skeyti"
+
+#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Ef þú hættir við þá er öllu efni skeytisins fargað."
 
+#: search.php:143 message.php:249 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15
 msgid "Cc"
 msgstr ""
 
-msgid "Cc:"
+#: lib/MIME/Viewer/itip.php:701
+msgid "Chair Person"
 msgstr ""
 
+#: templates/compose/spelling.inc:86
+msgid "Change"
+msgstr "Breyta"
+
+#: templates/compose/spelling.inc:87
 msgid "Change All"
 msgstr "Breyta öllum"
 
+#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+msgid "Change Folder"
+msgstr "Skipta um möppu"
+
+#: config/prefs.php.dist:111
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
-msgstr "Hér getur þú breytt því á hvaða hátt skeytum er raðað upp og hversu margar skeytalínur sjást í hverjum glugga."
+msgstr ""
+"Hér getur þú breytt því á hvaða hátt skeytum er raðað upp og hversu margar "
+"skeytalínur sjást í hverjum glugga."
 
-msgid "Change mail server settings."
-msgstr "Breyta póstþjónsstillingum."
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr "Breyta póstþjóns og möppustillingum."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
-msgstr "Hér getur þú breytt því hvaða nafn, netfang og skeytisbotn kemur fram í skeytum þínum."
+msgstr ""
+"Hér getur þú breytt því hvaða nafn, netfang og skeytisbotn kemur fram í "
+"skeytum þínum."
 
-msgid "Change"
-msgstr "Breyta"
+#: config/prefs.php.dist:793
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:13
 msgid "Check Folder(s) for New Mail"
 msgstr "Hvaða möppur á að athuga með nýjan póst í"
 
-msgid "Checkbox"
-msgstr "Hakreitur"
+#: templates/mailbox/message_headers.inc:71 templates/folders/actions.inc:2
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:14
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:454
+msgid "Check spelling before sending a message?"
+msgstr "Athuga stafsetningu fyrir sendingu?"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Veldu aðgerð:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:195
+msgid "Choose a mail server:"
+msgstr "Veldu póstþjón:"
+
+#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
+#: templates/compose/compose.inc:228
+msgid "Choose a match or edit the address to the right:"
+msgstr "Veldu eða breyttu til hægri:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+msgid "Choose an action:"
+msgstr "Veldu aðgerð:"
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
 msgstr "Veldu netfangabók sem á að nota þegar nýjum netföngum er bætt við."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
-msgstr "Veldu uppröðun netfangabóka sem á að leita í, þegar leitað er að netföngum."
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+"Veldu uppröðun netfangabóka sem á að leita í, þegar leitað er að netföngum."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Öll skeyti frá %s hreinsuð út."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:107
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:128
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Smellu á %s til að skoða HTML innihald í sér glugga."
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr "Smelltu %s til að skoða hana sem smámynd."
+
+#: lib/MIME/Viewer/pkcs7.php:407
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Smelltu á %s til að skoða viðhengi í sér glugga."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Smelltu á %s til að skoða þennan hluta í sér glugga."
+
+#: lib/MIME/Viewer/html.php:104
+msgid "Click here to HIDE the Images"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:108
+msgid "Click here to SHOW the Images"
+msgstr ""
 
+#: templates/prefs/sourceselect.inc:321
 msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
+"Click on one of your selected address books and then select all fields to "
 "search."
-msgstr "Smelltu á eina af völdum netfangabókum og veldu þá reiti sem á að leita í."
+msgstr ""
+"Smelltu á eina af völdum netfangabókum og veldu þá reiti sem á að leita í."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:191
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:921
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
 
+#: config/prefs.php.dist:922
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:30
+msgid "Close"
+msgstr "Loka"
+
+#: compose.php:775 compose.php:1082
+msgid "Close this window"
+msgstr "Loka þessum glugga"
+
+#: folders.php:416
 msgid "Closed Folder"
 msgstr "Lokuð mappa"
 
-msgid "Collapse All Folders"
-msgstr "Loka öllum möppum"
+#: folders.php:436
+msgid "Collapse"
+msgstr "Loka"
 
+#: templates/folders/actions.inc:34
 msgid "Collapse All"
 msgstr "Loka öllum"
 
+#: templates/folders/actions.inc:34
+msgid "Collapse All Folders"
+msgstr "Loka öllum möppum"
+
+#: folders.php:436
 msgid "Collapse Folder"
 msgstr "Loka möppu"
 
-#, c-format
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:191
+msgid "Comment"
+msgstr "Athugasemd"
+
+#: lib/MIME/Viewer/itip.php:769
+msgid "Completed"
+msgstr "Lokið"
+
+#: lib/Block/tree_folders.php:42 lib/Block/summary.php:19
+msgid "Compose"
+msgstr "Semja"
+
+#: mailbox.php:756 lib/MIME/Headers.php:192
+#, php-format
 msgid "Compose Message (%s)"
 msgstr "Semja skeyti (%s)"
 
-msgid "Compose a message"
+#: compose.php:774 compose.php:1081
+msgid "Compose another message"
 msgstr "Semja nýtt skeyti"
 
-msgid "Compose messages in a separate window."
-msgstr "Semja skeyti í sér glugga."
+#: config/prefs.php.dist:429
+msgid "Compose messages in a separate window?"
+msgstr "Semja skeyti í sér glugga?"
 
-msgid "Compose"
-msgstr "Semja"
+#: config/prefs.php.dist:446
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:96
+msgid "Configure mail preview options."
+msgstr ""
 
-msgid "Contact List"
-msgstr "Tengiliðalisti"
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:135
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:144
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
 
+#: config/prefs.php.dist:88
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
-msgstr "Stjórna hvenær athugað er um póst, og hvernig á að gera viðvart um nýjan póst."
+msgstr ""
+"Stjórna hvenær athugað er um póst, og hvernig á að gera viðvart um nýjan "
+"póst."
+
+#: config/prefs.php.dist:691
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:51 templates/message/navbar_navigate.inc:19
 msgid "Copy"
 msgstr "Afrit"
 
+#: templates/mailbox/navbar.inc:51 templates/message/navbar_navigate.inc:19
+msgid "Copy to folder"
+msgstr "Afrita í möppu"
+
+#: templates/compose/spelling.inc:66
 msgid "Correct"
 msgstr "Leiðrétta"
 
+#: templates/compose/spelling.inc:145
 msgid "Corrected Text"
 msgstr "Leiðréttur texti"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:603
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Gat ekki eytt skeytum frá %s: %s"
 
+#: lib/Session.php:293
+msgid "Could not execute maintenance operations."
+msgstr "Gat ekki framkvæmt viðhaldsaðgerðir"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: search.php:361 templates/acl/acl.inc:39 templates/acl/acl.inc:157
+#: templates/fetchmail/manage.inc:67
+msgid "Create"
+msgstr "Búa til"
+
+#: templates/folders/actions.inc:5
 msgid "Create Folder"
 msgstr "Búa til möppu"
 
+#: templates/pgp/pgp.inc:252
+msgid "Create Keys"
+msgstr "Búa til lykla"
+
+#: templates/search/header.inc:14
+msgid "Create Virtual Folder"
+msgstr "Búa til sýndarmöppu"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Búa til nýja möppu undir ruslpóst"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Búa til nýja möppu undir uppköst"
 
+#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
 msgid "Create a new sent mail folder"
 msgstr "Búa til nýja möppu undur send skeyti"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Búa til nýja möppu (ruslakörfu) undir eydd skeyti"
 
+#: config/prefs.php.dist:120
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
-msgstr "Búa til síureglur sem stjórna meðferð innkomandi pósts, færa hann í tilteknar möppur eða eyða ruslpósti."
+msgstr ""
+"Búa til síureglur sem stjórna meðferð innkomandi pósts, færa hann í "
+"tilteknar möppur eða eyða ruslpósti."
 
-msgid "Create"
-msgstr "Búa til"
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "Stilla hvernig póstur er sendur og hvar uppköst eru geymd."
+#: config/prefs.php.dist:104
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Stilla viðhaldsaðgerðir sem eru framkvæmdar þegar þú tengist %s."
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr "Stilla hvernig póstur er sendur."
 
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Stilla aðgerðir sem eru framkvæmdar þegar þú tengist %s."
 
-msgid "Date"
+#: templates/mailbox/message_headers.inc:17
+msgid "Dat_e"
 msgstr "Dags"
 
-msgid "December"
-msgstr "desember"
+#: message.php:246 thread.php:92
+msgid "Date"
+msgstr "Dags"
 
-msgid "Default Identity"
-msgstr "Sjálfgefið kennimark"
+#: lib/MIME/Viewer/itip.php:757
+msgid "Declined"
+msgstr "Hafnað"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr "Hafnað: "
+
+#: config/prefs.php.dist:530
+msgid "Default"
+msgstr "Sjálfgefið"
 
+#: config/prefs.php.dist:894
 msgid "Default sorting criteria:"
 msgstr "Sjálfgefin röðunaraðferð:"
 
+#: config/prefs.php.dist:904
 msgid "Default sorting direction:"
 msgstr "Sjálfgefin uppröðun:"
 
+#: lib/MIME/Viewer/itip.php:765
+msgid "Delegated"
+msgstr "Ráðstafað"
+
+#: folders.php:407 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10 templates/pgp/pgp.inc:93
+#: templates/message/navbar_actions.inc:6 templates/smime/smime.inc:65
+#: templates/contacts/contacts.inc:244 templates/fetchmail/manage.inc:68
+#: templates/compose/attachments.inc:28
+msgid "Delete"
+msgstr "Eyða"
+
+#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#, php-format
+msgid "Delete %s Public Key"
+msgstr "Eyða opinbera lyklinum %s"
+
+#: templates/pgp/pgp.inc:169 templates/smime/smime.inc:128
+msgid "Delete Current Keys"
+msgstr "Eyða virkum lyklum"
+
+#: templates/folders/actions.inc:7
 msgid "Delete Folder(s)"
 msgstr "Eyða möppu(m)"
 
-msgid "Delete messages"
-msgstr "Eyða skeytum"
+#: folders.php:274
+msgid "Delete Selected Folders"
+msgstr "Eyða völdum möppum"
+
+#: folders.php:407
+msgid "Delete Virtual Folder"
+msgstr "Eyða sýndarmöppu"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr "Hreinsa út sótt skeyti á póstþjóni á fjarenda?"
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:362
+msgid "Delete old linked attachments at beginning of month?"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:344
+msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Eyða gömlum möppum með sendum pósti í upphafi hvers mánaðar"
 
-msgid "Delete"
-msgstr "Eyða"
+#: config/prefs.php.dist:612
+msgid "Delete spam messages after they have been reported as spam?"
+msgstr ""
 
-msgid "Deleted an attachment."
-msgstr "Eyða viðhengi."
+#: message.php:487 mailbox.php:719 templates/mailbox/legend.inc:8
+#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+msgid "Deleted"
+msgstr "Eytt"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Eydd skeyti"
 
-msgid "Deleted"
-msgstr "Eytt"
+#: compose.php:280
+#, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Eyddi viðhenginu \"%s\"."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Eyðing og flutningur skeyta"
 
-msgid "Descending"
-msgstr "Lækkandi"
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:903
+msgid "Descending"
+msgstr "Lækkandi"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+msgid "Description"
+msgstr "Lýsing"
+
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:113
+msgid "Details"
+msgstr "Atriði"
+
+#: config/prefs.php.dist:671
 msgid "Dim signatures?"
 msgstr "Hafa undirskriftir með daufum lit?"
 
-msgid "Display Options"
-msgstr "Útlitsstillingar"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Útlit"
 
-msgid "Display message when filters have been applied."
-msgstr "Sýna skeyti eftir að síur hafa verið notaðar."
+#: config/prefs.php.dist:470
+msgid "Display confirmation after sending a message?"
+msgstr "Sýna staðfestingu að sendingu lokinni?"
+
+#: config/prefs.php.dist:680
+msgid "Display in Body of Message"
+msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:768
+msgid "Display pop-up notification of new mail?"
 msgstr "Sýna PopUp glugga þegar nýr póstur berst."
 
-msgid "Display"
-msgstr "Útlit"
+#: config/prefs.php.dist:733
+msgid "Display the 'Empty Trash' link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+msgid "Disposition"
+msgstr ""
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr "Sem passar ekki við"
 
+#: templates/folders/actions.inc:14
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Ekki athuga um nýjan póst í möppu(m)"
 
+#: config/prefs.php.dist:923
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1031
 msgid "Do you want to open that folder?"
 msgstr "Viltu opna þessa möppu?"
 
+#: templates/compose/spelling.inc:133
 msgid "Done"
 msgstr "Lokið"
 
-#, c-format
-msgid "Download %s"
-msgstr "Sækja %s yfir á vinnustöð"
+#: lib/MIME/Contents.php:191
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr "Sækja %s sem .zip skrá"
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr "Sækja öll viðhengi (í .zip skrá)"
 
+#: templates/folders/actions.inc:18
 msgid "Download Folder(s)"
 msgstr "Sækja möppu(r) yfir á vinnustöð"
 
-msgid "Download"
-msgstr "Sækja yfir á vinnustöð"
-
+#: templates/folders/actions.inc:19
+msgid "Download Folder(s) [.zip format]"
+msgstr "Sækja möppu(r) [.zip skrá]"
+
+#: lib/MIME/Contents.php:191
+msgid "Download in .zip Format"
+msgstr "Sækja sem .zip skrá"
+
+#: message.php:485 mailbox.php:698 templates/mailbox/legend.inc:9
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/message/navbar_navigate.inc:11
 msgid "Draft"
 msgstr "Uppkast"
 
+#: folders.php:387
+msgid "Draft folder"
+msgstr "Mappa fyrir uppköst:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Mappa fyrir uppköst:"
 
-msgid "Edit your filter rules"
-msgstr "Breyta síureglum"
+#: templates/pgp/pgp.inc:196
+msgid "E-mail Address"
+msgstr "Netfang"
+
+#: lib/Mailbox.php:303
+msgid "END"
+msgstr ""
 
-msgid "Edit your identities"
-msgstr "Breyta kennimörkum"
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr "VILLA: Það tókst ekki a senda skeytið."
 
+#: folders.php:408
 msgid "Edit"
 msgstr "Breyta"
 
+#: templates/filters/prefs.inc:21
+msgid "Edit Blacklist"
+msgstr "Vinna í svartlista"
+
+#: templates/filters/prefs.inc:16
+msgid "Edit Filters"
+msgstr "Vinna í síum fyrir póst"
+
+#: folders.php:408 templates/search/header.inc:16
+#: templates/mailbox/header.inc:13
+msgid "Edit Virtual Folder"
+msgstr "Breyta sýndarmöppu"
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:26
+msgid "Edit Whitelist"
+msgstr "Vinna í hvítlista"
+
+#: templates/filters/prefs.inc:21
+msgid "Edit your blacklist"
+msgstr "Vinna í þínum svartlista"
+
+#: templates/filters/prefs.inc:16
+msgid "Edit your filter rules"
+msgstr "Breyta þínum síureglum"
+
+#: config/prefs.php.dist:830
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:26
+msgid "Edit your whitelist"
+msgstr "Vinna í þínum hvítlista"
+
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Netfang"
 
+#: lib/Message.php:620
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "Öll skeyti frá %s hreinsuð út."
+
+#: templates/folders/actions.inc:20
 msgid "Empty Folder(s)"
 msgstr "Tæma möppu(r)"
 
+#: folders.php:275
+msgid "Empty Selected Folders"
+msgstr "Tæma valdar möppur"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Tæma ruslakörfumöppu"
 
-msgid "Empty Trash"
-msgstr "Tæma ruslakörfu"
+#: lib/IMP.php:931
+msgid "Empty _Trash"
+msgstr "Tæma ruslmöppu"
+
+#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:780
+msgid "Enable message previews?"
+msgstr "Virkja forskoðun skeyta?"
+
+#: templates/compose/compose.inc:433
+msgid "Encr_yption Options"
+msgstr "Dulkóðunarvalkostir"
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
 
+#: lib/Compose.php:330
 msgid "End forwarded message"
-msgstr "Áframsendu skeyti lýkur hér"
+msgstr "Ljúka framsendu skeyti"
+
+#: lib/Compose.php:271
+msgid "End message"
+msgstr "Ljúka skeyti"
+
+#: lib/Compose.php:269
+#, php-format
+msgid "End message from %s"
+msgstr "Enda framsent skeyti frá %s"
+
+#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+msgid "Enter Passphrase"
+msgstr "Skráðu inn lykilkóða"
+
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Sláðu inn nafn á nýju möppunni fyrir ruslpóst"
 
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Sláðu inn nafn á nýju möppunni fyrir uppköst"
 
+#: templates/prefs/sentmailselect.inc:24
 msgid "Enter the name for your new sent mail folder"
 msgstr "Sláðu inn nafn á nýju möppunni fyrir send skeyti"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Sláðu inn nafn á nýju möppunni (ruslakörfu) fyrir eydd skeyti"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
-msgstr "Netfangið \"%s\" var bætt í netfangabókina"
-
+#: search.php:159
+msgid "Entire Message"
+msgstr "Skeyti í heild sinni"
+
+#: message.php:178 compose.php:1068 thread.php:39
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
+msgstr "Netfangið \"%s\" var skráð í netfangabókina"
+
+#: templates/pgp/pgp.inc:84 templates/smime/smime.inc:58
+#: lib/MIME/Viewer/pgp.php:386 lib/MIME/Viewer/status.php:72
+#: lib/MIME/Viewer/status.php:163 lib/MIME/Viewer/pkcs7.php:365
 msgid "Error"
 msgstr "Villa"
 
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+msgid "Event successfully deleted."
+msgstr "Viðburðinum var eytt."
+
+#: config/prefs.php.dist:758
 msgid "Every 15 minutes"
 msgstr "Á korters fresti"
 
+#: config/prefs.php.dist:755
 msgid "Every 30 seconds"
 msgstr "Á 30 sek. fresti"
 
+#: config/prefs.php.dist:757
 msgid "Every 5 minutes"
 msgstr "Á fimm mínútna fresti"
 
+#: config/prefs.php.dist:759
 msgid "Every half hour"
 msgstr "Á hálftíma fresti"
 
+#: config/prefs.php.dist:756
 msgid "Every minute"
 msgstr "Á mínútu fresti"
 
-msgid "Expand All Folders"
-msgstr "Opna allar möppur"
+#: folders.php:445
+msgid "Expand"
+msgstr "Opna allar"
 
+#: templates/folders/actions.inc:33
 msgid "Expand All"
 msgstr "Opna allar"
 
+#: templates/folders/actions.inc:33
+msgid "Expand All Folders"
+msgstr "Opna allar möppur"
+
+#: folders.php:445
 msgid "Expand Folder"
 msgstr "Opna möppu"
 
+#: templates/compose/redirect.inc:56 templates/compose/compose.inc:331
 msgid "Expand Names"
 msgstr "Opna nafnaskrá"
 
-msgid "Expand the entire folder tree by default in the folders view."
-msgstr "Opna allt möpputréð sjálfgefið í möppuham."
+#: config/prefs.php.dist:1021
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
 
-msgid "February"
-msgstr "febrúar"
+#: config/prefs.php.dist:951
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr "Opna allt möpputréð sjálfgefið í möppuham."
 
-msgid "Field"
-msgstr "Reitur"
+#: templates/compose/redirect.inc:104 templates/compose/compose.inc:155
+#: templates/compose/compose.inc:205 templates/compose/compose.inc:256
+msgid "Expanding"
+msgstr "Opna allar"
 
-msgid "Filename"
-msgstr "Skrárnafn"
+#: lib/IMP.php:940 lib/IMP.php:942
+msgid "F_etch Mail"
+msgstr "Sækja póst"
+
+#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+msgid "Fetch Mail"
+msgstr "Sækja póst"
+
+#: config/prefs.php.dist:839
+msgid "Fetch Mail in a separate window?"
+msgstr "Sækja skeyti í sér glugga?"
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "Sækja skeyti þegar þú tengist?"
+
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Sótti %d skeyti frá %s"
+
+#: lib/Fetchmail.php:287
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Sótti eitt skeyti frá %s"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Síuvinnsla: Skeytinu \"%s\" frá \"%s\" hefur verið fleygt."
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr ""
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr "Síuvinnsla: Skeytið \"%s\" frá \"%s\" hefur verið fært í möppuna \"%s\"."
+#: lib/Fetchmail.php:291
+msgid "Fetchmail: no new messages."
+msgstr "Þú átt engin ný skeyti."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr "Síuvinnsla: Skeytið \"%s\" frá \"%s\" hefur verið fært í ruslakörfuna."
+#: lib/IMP.php:946
+msgid "Fi_lters"
+msgstr "Síur"
 
-msgid "Filter Rules"
-msgstr "Síureglur"
+#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+msgid "File"
+msgstr "Skrá"
+
+#: templates/filters/prefs.inc:35
+msgid "Filter Options"
+msgstr "Síuvalkostir"
+
+#: templates/filters/prefs.inc:8
+msgid "Filter Settings"
+msgstr "Síustillingar"
+
+#: config/prefs.php.dist:594
+msgid "Filter message content for profanity?"
+msgstr "Sía skeyti gagnvart ruddalegu orðalagi?"
 
-msgid "Filter message content for profanity."
-msgstr "Sía skeyti gagnvart ruddalegu orðalagi."
+#: templates/filters/notactive.inc:8
+msgid "Filter support is disabled on this system."
+msgstr ""
 
+#: config/prefs.php.dist:119
 msgid "Filters"
 msgstr "Síur"
 
+#: templates/filters/notactive.inc:2
+msgid "Filters NOT Active"
+msgstr "Síur EKKI virkar"
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Finna"
 
+#: config/prefs.php.dist:876
+msgid "First Mailbox Page"
+msgstr "Fyrsta síða"
+
+#: mailbox.php:341
 msgid "First Page"
 msgstr "Fyrsta síða"
 
+#: templates/mailbox/actions.inc:21 templates/message/navbar_actions.inc:15
+msgid "Fo_rward"
+msgstr "Áframsenda"
+
+#: folders.php:255 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:292 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Möppuvísir"
 
+#: templates/login/login.inc:175
 msgid "Folder Prefix"
 msgstr "Forskeyti fyrir möppur"
 
-msgid "Folders"
-msgstr "Möppur"
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "Möppuyfirlit"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:52
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:940
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
+#: compose.php:727 templates/mailbox/actions.inc:21
+#: templates/message/navbar_actions.inc:15
 msgid "Forward"
 msgstr "Áframsenda"
 
+#: compose.php:712
 msgid "Forward:"
 msgstr "Áframsenda:"
 
-#, c-format
+#: lib/Compose.php:299
+msgid "Forwarded message"
+msgstr "Áframsent skeyti"
+
+#: lib/Compose.php:297
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Áframsent skeyti frá %s"
 
-msgid "From Address"
-msgstr "Sendandanetfang"
+#: lib/MIME/Viewer/itip.php:483
+msgid "Free/Busy Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+msgid "Fro_m"
+msgstr "Frá"
+
+#: search.php:135 message.php:247 thread.php:93
+#: templates/compose/compose.inc:98
 msgid "From"
 msgstr "Frá"
 
-msgid "From:"
-msgstr "Frá:"
+#: config/prefs.php.dist:889
+msgid "From Address"
+msgstr "Sendandanetfang"
 
+#: compose.php:724 compose.php:728
 msgid "Fwd:"
 msgstr "Áframs.:"
 
-msgid "Help"
-msgstr "Hjálp"
+#: compose.php:1229
+msgid "Fwd: "
+msgstr "Áframs.:"
+
+#: compose.php:1231
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Frams.: %u framsend skeyti"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "Valkostir notanda"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "Sækja bara ný skeyti? (IMAP)"
+
+#: thread.php:85
+msgid "Go to Message"
+msgstr "Opna skeyti"
+
+#: lib/IMP.php:553
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Fara í netfangabókarskráningu fyrir \"%s\""
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:530 lib/Filter.php:106 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/status.php:120
+#: lib/MIME/Viewer/status.php:127 lib/MIME/Viewer/pkcs7.php:407
+msgid "HERE"
+msgstr "hér"
+
+#: lib/MIME/Viewer/related.php:80 lib/MIME/Viewer/html.php:129
+msgid "HTML"
+msgstr ""
+
+#: compose.php:229
+msgid "HTML Version of Message"
+msgstr "HTML útgáfa skeytis"
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr "Hausar"
 
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:662
+msgid "Hidden"
+msgstr "Falið"
+
+#: config/prefs.php.dist:661
+msgid "Hidden in Thread View"
+msgstr "Falið í efnisþráðsham"
+
+#: mailbox.php:363
 msgid "Hide Deleted"
 msgstr "Fela eydd skeyti"
 
+#: folders.php:287
 msgid "Hide Unsubscribed"
 msgstr "Fela óvirka(r) línu(r)"
 
-msgid "How to prefix quoted lines in a reply:"
+#: lib/MIME/Viewer/html.php:104
+msgid "Hide the Images"
+msgstr "Fela myndirnar"
+
+#: templates/compose/compose.inc:305
+msgid "High"
+msgstr "Hár"
+
+#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr "Hár forgangur"
+
+#: templates/compose/compose.inc:304
+msgid "Highest"
+msgstr "Hæsti"
+
+#: config/prefs.php.dist:682
+msgid "How do you want to display attachments?"
+msgstr "Hvrnig viltu sýna viðhengi?"
+
+#: config/prefs.php.dist:496
+msgid "How to attribute quoted lines in a reply"
 msgstr "Hvernig á að merkja texta sem er verið að vísa í í svari:"
 
-msgid "IMP is not properly configured"
-msgstr "IMP er ekki rétt stillt"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: templates/login/login.inc:163 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:164
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: templates/login/login.inc:162 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
 
+#: lib/IMP.php:886
 msgid "INBOX"
 msgstr "Innbox"
 
-msgid "Identities"
-msgstr "Kenni"
-
-msgid "Identity"
-msgstr "Kenni"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Öllum skeytum í möppunni/möppunum verður eytt!"
 
-msgid "Identity's name:"
-msgstr "Kenninafn:"
+#: templates/compose/spelling.inc:88
+msgid "Ignore"
+msgstr "Hundsa"
 
+#: templates/compose/spelling.inc:89
 msgid "Ignore All"
 msgstr "Hundsa allt"
 
-msgid "Ignore"
-msgstr "Hundsa"
+#: templates/folders/import.inc:20
+msgid "Import"
+msgstr "Flytja inn"
 
-msgid "Important messages"
-msgstr "Áríðandi skeyti"
+#: templates/pgp/import_key.inc:65 templates/smime/import_key.inc:84
+msgid "Import Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:254
+msgid "Import Keypair"
+msgstr ""
+
+#: templates/folders/actions.inc:25
+msgid "Import Messages"
+msgstr "Flytja inn skeyti"
+
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:148
+msgid "Import Personal Certificates"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/pgp/pgp.inc:107 templates/smime/smime.inc:79
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
 
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr "Flytja inn mbox skrá"
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr "Flytja inn mbox skrána %s í möppuna %s."
+
+#: message.php:486 mailbox.php:713 templates/mailbox/legend.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/message/navbar_navigate.inc:7
 msgid "Important"
 msgstr "Áríðandi"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Áríðandi skeyti"
+
+#: folders.php:157
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr "%d skeyti frá %s innsett."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
+#: lib/IMAP/Tree.php:204
+msgid "Inbox"
+msgstr "Innbox"
+
+#: config/prefs.php.dist:484
+msgid "Include a brief summary of the header in a reply?"
+msgstr ""
+
+#: config/prefs.php.dist:478
 msgid "Include original message in a reply?"
 msgstr "Á að sýna efni upprunalega bréfsins í svari?"
 
-msgid "January"
-msgstr "janúar"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+msgid "Info"
+msgstr "Uppl."
+
+#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:151
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:147 templates/smime/smime.inc:113
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
+#: templates/compose/attachments.js:99
+msgid "Inline"
+msgstr "Skeytt inn"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:563 mailbox.php:605
+msgid "Invalid Address"
+msgstr "Ógilt netfang"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:131
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: pgp.php:16 smime.php:82
+msgid "Invalid key"
+msgstr "Ógildur lykill"
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr "Viðsnúið"
+
+#: templates/compose/compose.inc:567
+msgid "KB"
+msgstr "KB"
 
-msgid "July"
-msgstr "júlí"
+#: templates/pgp/pgp.inc:201
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:252
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
 
-msgid "June"
-msgstr "júní"
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
 
+#: templates/login/login.inc:199
 msgid "Language"
 msgstr "Tungumál"
 
+#: config/prefs.php.dist:877
+msgid "Last Mailbox Page"
+msgstr "síðasta bls."
+
+#: mailbox.php:354
 msgid "Last Page"
 msgstr "síðasta bls."
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Síðast tengst: %s"
+#: templates/compose/compose.inc:380
+msgid "Li_nk Attachments"
+msgstr "Tengja viðhengi með vefslóð"
+
+#: attachment.php:34 lib/Compose.php:974
+msgid "Linked attachments are forbidden."
+msgstr "Ekki er hægt að tengja viðhengi með vefslóð"
+
+#: lib/Compose.php:991
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Tenglar ógildir þann %s"
+
+#: config/prefs.php.dist:1040
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:679
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "Póstmappa"
+
+#: lib/MIME/Viewer/itip.php:674
+msgid "Location"
+msgstr "Staðsetning"
 
-msgid "Last login: Never"
-msgstr "Síðast tengst: Aldrei"
+#: templates/login/login.inc:207
+msgid "Log in"
+msgstr "Tengjast"
 
-#, c-format
+#: lib/Block/summary.php:117
+#, php-format
 msgid "Log in to %s"
 msgstr "Tengjast %s"
 
-msgid "Log in"
+#: templates/login/login.inc:136
+msgid "Login"
 msgstr "Tengjast"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Verkefni við tengingu"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr "Tenging mistókst. Líklega er notandanafn þitt eða lykilorð "
-"rangt innslegið."
-
-msgid "Logout"
-msgstr "Aftengjast"
+#: templates/compose/compose.inc:307
+msgid "Low"
+msgstr "Lágur"
+
+#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr "Lágur forgangur"
+
+#: templates/compose/compose.inc:308
+msgid "Lowest"
+msgstr "Lægsti"
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr "Macintosh skrá"
+
+#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "Póstur"
+
+#: config/prefs.php.dist:95
+msgid "Mail Previews"
+msgstr "Forskoðun pósts"
 
-msgid "Mail Filters"
-msgstr "Síur fyrir póst"
-
-msgid "Mail Management"
-msgstr "Póstsumsjón"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
+#: folders.php:397
 msgid "Mailbox"
 msgstr "Póstmappa"
 
-msgid "Maintenance Operations"
-msgstr "Viðhaldsaðgerðir"
+#: config/prefs.php.dist:110
+msgid "Mailbox and Folder Display Options"
+msgstr "Útlitsstillingar"
 
-msgid "March"
-msgstr "mars"
+#: templates/folders/actions.inc:16
+msgid "Mark All Messages in Folder as Seen"
+msgstr "Merkja öll skeyti í möppu sem lesin"
+
+#: templates/folders/actions.inc:17
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "Merkja öll skeyti í möppu sem ólesin"
 
+#: templates/mailbox/navbar.inc:30 templates/message/navbar_navigate.inc:5
 msgid "Mark as:"
 msgstr "merkja sem:"
 
+#: config/prefs.php.dist:644
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Á að merkja eldri tilvitnanir í texta með mismunandi litum?"
 
-msgid "May"
-msgstr "maí"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:652
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr "Allt þarf að passa"
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr "Eitthvað þarf að passa"
+
+#: templates/compose/compose.inc:503
+msgid "Maximum Attachment Size"
+msgstr "Hámarksstærð viðhengis"
+
+#: templates/compose/compose.inc:484
+msgid "Maximum number of attachments reached."
+msgstr "Hámarksfjölda viðhengja náð."
+
+#: templates/compose/compose.inc:479
+msgid "Maximum total attachment size reached."
+msgstr "Viðhengi er of stórt"
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+msgid "Meeting Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr ""
+
+#: lib/Compose.php:246
+msgid "Message"
+msgstr "Skeyti"
 
+#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Semja nýtt skeyti"
 
+#: config/prefs.php.dist:888
 msgid "Message Date"
 msgstr "Dags."
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+msgid "Message Options"
+msgstr "Valkostir skeyta"
+
+#: search.php:359
 msgid "Message Search"
 msgstr "Leita í skeytum"
 
+#: config/prefs.php.dist:892
 msgid "Message Size"
 msgstr "Stærð skeytis"
 
+#: message.php:368
 msgid "Message Source"
 msgstr "Handrit"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Skoða skeyti"
 
+#: templates/search/header.inc:55
 msgid "Message fields"
 msgstr "Svæði"
 
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Flögg"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Möppur"
 
-msgid "Message sent successfully, but not saved to"
-msgstr "Skeytið var sent, en ekki var hægt að geyma það í"
+#: lib/Compose.php:244
+#, php-format
+msgid "Message from %s"
+msgstr "Skeyti frá %s"
+
+#: mailbox.php:646
+msgid "Message has attachments"
+msgstr "Skeytið er með viðhengjum"
+
+#: mailbox.php:637
+msgid "Message is encrypted"
+msgstr "Skeytið er dulritað"
+
+#: mailbox.php:632
+msgid "Message is signed"
+msgstr "Skeytið er undirritað"
+
+#: templates/search/header.inc:33
+msgid "Message matches"
+msgstr "Leitarskilyrði"
 
-msgid "Message"
-msgstr "Skeyti"
+#: compose.php:771 compose.php:785
+msgid "Message redirected successfully."
+msgstr ""
 
+#: compose.php:1018
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Skeytið var sent, en ekki var hægt að geyma það í %s"
+
+#: compose.php:1077 compose.php:1092
+msgid "Message sent successfully."
+msgstr "Skeytið var sent."
+
+#: config/prefs.php.dist:912
 msgid "Messages per page in the mailbox view."
 msgstr "Fjöldi skeytalína á bls. í skoðun pósthólfs."
 
+#: mailbox.php:318
 msgid "Messages to"
 msgstr "Skeyti til"
 
-msgid "Mime Type"
-msgstr ""
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Breyta"
 
-msgid "Move Down"
-msgstr "Flytja niður"
-
-msgid "Move Up"
-msgstr "Flytja upp"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Færa skeyti yfir í <b>%s</b> möppuna"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "Fleiri en eitt netfang fannst fyrir svæðið \"%s\""
 
+#: templates/mailbox/navbar.inc:50 templates/message/navbar_navigate.inc:18
 msgid "Move"
 msgstr "Flytja"
 
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr "færa niður"
+
+#: templates/mailbox/navbar.inc:50 templates/message/navbar_navigate.inc:18
+msgid "Move to folder"
+msgstr "færa í möppu"
+
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr "færa upp"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: templates/pgp/pgp.inc:24 templates/smime/smime.inc:24
+#: templates/fetchmail/manage.inc:48
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nafn"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr "Nafn og/eða netfang má ekki vanta"
+
+#: lib/MIME/Viewer/itip.php:778
+msgid "Needs Action"
+msgstr ""
+
+#: config/prefs.php.dist:563 config/prefs.php.dist:575
+#: config/prefs.php.dist:754
 msgid "Never"
 msgstr "Aldrei"
 
-msgid "New Mail"
-msgstr "Nýr póstur"
-
-msgid "New messages"
-msgstr "Ný skeyti"
+#: config/prefs.php.dist:553
+msgid "Never save attachments"
+msgstr "Aldrei geyma viðhengi."
 
+#: templates/acl/acl.inc:126
 msgid "New"
 msgstr "Nýtt"
 
+#: lib/IMP.php:615
+msgid "New Folder"
+msgstr "Ný mappa"
+
+#: config/prefs.php.dist:87
+msgid "New Mail"
+msgstr "Nýr póstur"
+
+#: templates/search/main.inc:19
+msgid "New messages"
+msgstr "Ný skeyti"
+
+#: templates/compose/spelling.inc:140
+msgid "Next"
+msgstr "Næsta"
+
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Næsta skeyti"
 
+#: mailbox.php:352
 msgid "Next Page"
 msgstr "Næsta síða"
 
-msgid "Next"
-msgstr "Næsta"
+#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+msgid "No"
+msgstr "Nei"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr "Engin dulkóðun"
+
+#: templates/pgp/pgp.inc:80
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:371
+#, php-format
+msgid "No Messages"
+msgstr "Engin skeyti"
 
-msgid "No Subject"
-msgstr "Engin efnislína tilgreind"
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:140
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:323
+msgid "No Preview Text"
+msgstr "Enginn forskoðunartexti"
+
+#: templates/smime/smime.inc:54
+msgid "No Public Keys Found"
+msgstr "Engir opinberir dulritunarlyklar fundust"
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+msgid "No attachments found."
+msgstr "Engin viðhengi fundust."
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+msgid "No folder selected."
+msgstr "engin mappa valin"
 
+#: lib/Block/summary.php:130
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
 msgid "No folders were specified"
 msgstr "Engin mappa var tilgreind"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:136
+msgid "No folders with new messages"
+msgstr "Engar möppur með nýjum skeytum"
+
+#: lib/Block/summary.php:133
+msgid "No folders with unseen messages"
+msgstr "Engar möppur með ólesnum skeytum"
+
+#: lib/Compose.php:240
+msgid "No message body text"
+msgstr "Enginn texti skeyti"
+
+#: lib/Mailbox.php:365
+msgid "No messages matched your search."
 msgstr "Leitin bar ekki árangur"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:50
 msgid "No spelling errors"
 msgstr "Engar stafsetningarvillur"
 
+#: templates/compose/spelling.inc:106
 msgid "No suggestions"
 msgstr "Engar tillögur"
 
-msgid "No"
-msgstr "Nei"
+#: acl.php:68 acl.php:94
+msgid "No user specified."
+msgstr "Enginn notandi tilgreindur."
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/sentmailselect.inc:41
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Engin"
 
+#: templates/compose/compose.inc:306
+msgid "Normal"
+msgstr "Venjulegt"
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Ekki eytt"
 
+#: templates/mailbox/navbar.inc:23 templates/mailbox/navbar.inc:42
+#: templates/message/navbar_navigate.inc:12
 msgid "Not Draft"
 msgstr "Ekki uppkast"
 
+#: templates/mailbox/navbar.inc:17 templates/mailbox/navbar.inc:34
+#: templates/message/navbar_navigate.inc:8
 msgid "Not Important"
 msgstr "Ekki áríðandi"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Ekki persónulegt"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Ekki eydd skeyti"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Ekki áríðandi skeyti"
 
-msgid "November"
-msgstr "nóvember"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
-msgstr "Fjöldi af möppum fyrir send skeyti, sem skulu geymast, þegar mánaðarleg tiltekt er gerð"
+#: config/prefs.php.dist:371
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Aldur í mánuðum fyrir viðtengdar vefslóðir, sem skulu geymast, þegar "
+"mánaðarleg tiltekt er gerð"
+
+#: config/prefs.php.dist:353
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"Fjöldi af möppum fyrir send skeyti, sem skulu geymast, þegar mánaðarleg "
+"tiltekt er gerð"
 
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "Í lagi"
 
-msgid "October"
-msgstr "október"
+#: templates/search/fields.inc:5 templates/pgp/import_key.inc:48
+#: templates/smime/import_key.inc:47
+msgid "OR"
+msgstr "EÐA"
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Gömul skeyti"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Gömlum skeytum eytt..."
 
+#: lib/Block/summary.php:27
+msgid "Only display folders with unread messages in them?"
+msgstr "Einungis sýna möppur sem innihalda ólesin skeyti?"
+
+#: templates/folders/javascript.inc:71
+msgid "Only one folder should be selected for this action."
+msgstr "Það er einungis hægt að veja eina möppu fyrir þessa aðgerð."
+
+#: templates/menu.inc:7 templates/menu.inc:27
+msgid "Ope_n Folder"
+msgstr "Opna möppu"
+
+#: templates/menu.inc:23
 msgid "Open Folder"
 msgstr "Opna möppu"
 
-msgid "Options"
-msgstr "Valstillingar"
+#: folders.php:414
+msgid "Opened Folder"
+msgstr "Opin mappa"
 
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr ""
+
+#: config/prefs.php.dist:109 config/prefs.php.dist:118
+#: config/prefs.php.dist:125 config/prefs.php.dist:133
+#: config/prefs.php.dist:142
 msgid "Other Options"
 msgstr "Aðrar stillingar"
 
-#, c-format
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr "PGP"
+
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr "Dulkóða skeyti með PGP"
+
+#: compose.php:331
+msgid "PGP Error: "
+msgstr "PGP villa"
+
+#: compose.php:310
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr "PGP villa: Vantar lykilkóða fyrir persónulegan lykil."
+
+#: templates/pgp/notactive.inc:6
+msgid "PGP NOT Active"
+msgstr "PGP er ekki virkt"
+
+#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+msgid "PGP Options"
+msgstr "PGP valkostir"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr "PGP lykilkóði"
+
+#: templates/pgp/pgp.inc:128
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr ""
+
+#: pgp.php:245
+#, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Opinbera PGP lyklinum fyrir \"%s\" var eytt."
+
+#: templates/pgp/pgp.inc:72
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+msgid "PGP Sign Message"
+msgstr "Undirrita með PGP"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr "Undirrita/dulrita með PGP"
+
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr ""
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:11
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:24
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:166
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
+
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Bls. %d af %d"
 
+#: config/prefs.php.dist:874
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:875
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
-msgstr "Hlut(i/ir)"
+msgstr "Hlutar"
 
+#: templates/pgp/pgp.inc:211
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:216
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: pgp.php:310 smime.php:235
+msgid "Passphrase successfully unloaded."
+msgstr ""
+
+#: templates/pgp/passphrase.inc:29 templates/smime/passphrase.inc:19
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/login/login.inc:193 templates/smime/import_key.inc:69
+#: templates/fetchmail/manage.inc:20
 msgid "Password"
 msgstr "Lykilorð"
 
-msgid "Perform maintenance operations on login"
+#: templates/fetchmail/manage.inc:48
+msgid "Perform maintenance operations on login?"
 msgstr "Framkvæma viðhaldsaðgerðir við tengingu"
 
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:477 mailbox.php:682 templates/mailbox/legend.inc:10
+#: templates/mailbox/navbar.inc:24
+msgid "Personal"
+msgstr "Til mín"
+
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Upplýsingar um notanda"
 
-msgid "Personal"
-msgstr "Persónulegt"
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
 
+#: config/prefs.php.dist:214
 msgid "Place your signature before replies and forwards?"
 msgstr "Setja undirskrift undir svar og áframsendingar?"
 
+#: compose.php:227
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: templates/mailbox/javascript.inc:192 templates/message/javascript.inc:55
+msgid "Please enter a name for the new folder:"
+msgstr "Sláðu inn nýtt möppunafn:"
+
+#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
 msgid "Please enter the name of the new folder:"
 msgstr "Sláðu inn nýtt möppunafn:"
 
+#: templates/folders/javascript.inc:129
 msgid "Please enter the new name:"
 msgstr "Sláðu inn nýja nafnið:"
 
-msgid "Please enter valid search criteria."
-msgstr "Sláðu inn gildar leitarforsendur."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
 
-msgid "Please provide your username and password"
-msgstr "Sláðu inn notandanafn og lykliorð"
+#: templates/login/login.inc:72
+msgid "Please provide your password."
+msgstr "Sláðu inn lykilorð þitt."
+
+#: templates/login/login.inc:68
+msgid "Please provide your username."
+msgstr "Sláðu inn notandanafn þitt."
 
+#: compose.php:79 lib/IMP.php:509
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Leiðréttu hugsanlegar vitleysur í netfangi eða netföngum."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/folders/javascript.inc:53
 msgid "Please select a folder before you perform any actions."
 msgstr "Þú þarft að velja möppu áður en þú getur hafið aðrar aðgerðir."
 
+#: lib/MIME/Viewer/itip.php:502
+msgid "Please select an action from the menu below."
+msgstr "Veldu aðgerð af valmyndinni hér að neðan."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Veldu a.m.k eina möppu til að leita í."
 
+#: templates/folders/javascript.inc:4
 msgid "Please select only one folder for this operation."
 msgstr "Það er einungis hægt að veja eina möppu fyrir þessa aðgerð."
 
-msgid "Please select or edit right next:"
-msgstr "Veldu eða breyttu til hægri, næst:"
+#: templates/compose/redirect.inc:76
+msgid "Please select or edit in the box to the right:"
+msgstr "Veldu eða breyttu til hægri:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:206
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Setja skilmerki ('-- ') ofan við undirskrift"
 
+#: pgp.php:257 filterprefs.php:40 smime.php:241
+msgid "Preferences successfully updated."
+msgstr ""
+
+#: templates/compose/attachments.inc:3
+msgid "Preview"
+msgstr "Forskoða"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Fyrra skeyti"
 
+#: mailbox.php:343
 msgid "Previous Page"
 msgstr "Fyrri blaðsíða"
 
+#: templates/message/navbar_actions.inc:31
 msgid "Print"
 msgstr "Prenta"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Síuregla %d: Vandamál - Mappan %s er ekki til! "
+#: templates/message/headers.inc:38
+msgid "Priority"
+msgstr "Forgangur"
 
-msgid "Problem?"
-msgstr "Vandamál?"
+#: templates/smime/import_key.inc:74
+msgid "Private Key Password"
+msgstr ""
 
+#: config/prefs.php.dist:552
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:551
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: templates/mailbox/actions_deleted.inc:8 templates/mailbox/actions.inc:36
+msgid "Pur_ge Deleted"
+msgstr "Fjarlægja eydd"
+
+#: templates/mailbox/actions_deleted.inc:8 templates/mailbox/actions.inc:36
 msgid "Purge Deleted"
 msgstr "Fjarlægja eydd"
 
+#: templates/folders/actions.inc:22
+msgid "Purge Folder(s)"
+msgstr "Eyða möppu(m)"
+
+#: config/prefs.php.dist:390
 msgid "Purge Trash how often:"
 msgstr "Hversu oft á að tæma ruslafötuna:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:399
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Eyða skeytum í ruslakörfu sem eru eldri í dögum en"
 
-msgid "Purge old message in the Trash folder"
-msgstr "Fjarlægja gamalt skeyti í ruslakörfu"
-
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: config/prefs.php.dist:380
+msgid "Purge old messages in the Trash folder?"
+msgstr "Fjarlægja gömul skeyti í ruslakörfu?"
+
+#: lib/Maintenance/Task/purge_trash.php:66
+#, php-format
+msgid "Purging %d messages from Trash folder."
 msgstr "Fjarlægi %d skeyti úr ruslakörfunni."
 
-msgid "Quoting"
-msgstr "Vísa til"
+#: lib/Maintenance/Task/purge_trash.php:64
+msgid "Purging 1 message from Trash folder."
+msgstr "Fjarlægi eitt skeyti úr ruslakörfunni."
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-msgid "Received after"
-msgstr "Móttekið eftir:"
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
 
-msgid "Received before"
-msgstr "Móttekið fyrir:"
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr "Kvóti: Ótakmarkaður"
+
+#: config/prefs.php.dist:492
+#, php-format
+msgid "Quoting %f:"
+msgstr "Vísa til %f:"
+
+#: templates/compose/compose.inc:377
+msgid "Re_quest Delivery Confirmation"
+msgstr "Óska eftir staðfestingu á afhendingu"
 
-msgid "Received on"
+#: search.php:163
+msgid "Received On"
 msgstr "Móttekið þann:"
 
+#: search.php:171
+msgid "Received Since"
+msgstr "Móttekið síðan:"
+
+#: search.php:167
+msgid "Received Until"
+msgstr "Móttekið þangað til:"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirec_t"
+msgstr "Endurvísa"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Endurvísa"
+
+#: templates/compose/redirect.inc:115
 msgid "Redirect Message"
 msgstr "Endurvísa skeyti"
 
+#: compose.php:734
 msgid "Redirect this message"
 msgstr "Endurvísa þessu skeyti"
 
-msgid "Redirect"
-msgstr "Endurvísa"
-
+#: compose.php:794
 msgid "Redirecting failed."
 msgstr "Endurvísun misheppaðist."
 
+#: templates/compose/compose.inc:573
+msgid "Refresh"
+msgstr "Endurhlaða"
+
+#: config/prefs.php.dist:760
 msgid "Refresh Folder Views:"
 msgstr "Endurhlaða möppuham:"
 
-msgid "Refresh"
+#: templates/mailbox/header.inc:4 templates/folders/head.inc:9
+msgid "Reload"
 msgstr "Endurhlaða"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Endurhlaða ham"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:950
 msgid "Remember the last view"
 msgstr "Muna síðasta ham"
 
-msgid "Remove Selected"
-msgstr "Fjarlægja valin"
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr "Pósthólf á fjarenda:"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr "Ekki nota svæði í leit"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "fjarlægja handrit"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:6
+msgid "Rename Folder(s)"
 msgstr "Endurnefna möppu"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:335
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Endurnefna möppu með sendum skeytum í byrjun hvers mánaðar"
 
-#, c-format
+#: lib/Folder.php:440
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "Endurnefning úr nafninu \"%s\" í \"%s\" misheppnaðist. Netþjónninn kom með eftirfarandi villu"
+msgstr ""
+"Endurnefning úr nafninu \"%s\" í \"%s\" misheppnaðist. Netþjónninn kom með "
+"eftirfarandi villu"
+
+#: templates/message/navbar_actions.inc:10
+msgid "Repl_y to List"
+msgstr "Svara öllum"
 
+#: templates/compose/spelling.inc:111
 msgid "Replace with:"
 msgstr "Skipta út fyrir:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Svara"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+msgid "Reply Sent."
+msgstr "Svar sent."
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Svara öllum"
 
+#: compose.php:680
 msgid "Reply to All:"
 msgstr "Svara öllum:"
 
-msgid "Reply"
-msgstr "Svara"
+#: templates/message/navbar_actions.inc:10
+msgid "Reply to List"
+msgstr "Svara á lista"
+
+#: compose.php:682
+msgid "Reply to List:"
+msgstr "Svara á lista:"
 
-msgid "Reply-To: "
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to _All"
+msgstr "Svara öllum"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
 msgstr ""
 
-msgid "Reply-to"
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
 msgstr ""
 
+#: message.php:251
+msgid "Reply-To"
+msgstr "Svara-Til"
+
+#: lib/Compose.php:259 lib/Compose.php:311
+msgid "Reply-To: "
+msgstr "Svara-Til: "
+
+#: compose.php:678
 msgid "Reply:"
 msgstr "Svar:"
 
+#: templates/mailbox/actions.inc:26 templates/message/navbar_actions.inc:36
+msgid "Report as Innocent"
+msgstr "Tilkynna sem ekki ruslpóst"
+
+#: templates/mailbox/actions.inc:24 templates/message/navbar_actions.inc:33
 msgid "Report as Spam"
 msgstr "Tilkynna sem ruslpóst (SPAM)"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:374
+msgid "Request a _Read Receipt"
+msgstr "Óska eftir kvittun fyrir móttöku"
+
+#: config/prefs.php.dist:578
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:566
+msgid "Request read receipts?"
 msgstr "Óska eftir kvittun fyrir móttöku"
 
+#: mailbox.php:204
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/acl/acl.inc:158 templates/search/header.inc:26
+#: templates/search/main.inc:143
 msgid "Reset"
 msgstr "Endursetja"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:28
 msgid "Resume"
 msgstr "Halda áfram"
 
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:31
+#: templates/fetchmail/account_select.inc:32 templates/fetchmail/manage.inc:69
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/pgp/pgp.inc:268 templates/pgp/notactive.inc:33
+#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
+#: templates/smime/notactive.inc:33 templates/smime/smime.inc:158
+msgid "Return to Options"
+msgstr "Valkostir notanda"
+
+#: config/prefs.php.dist:714
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
-msgstr "Á að fara til baka í pósthólfalista eftir að skeytum er eytt, þau flutt eða afrituð?"
+msgstr ""
+"Á að fara til baka í pósthólfalista eftir að skeytum er eytt, þau flutt eða "
+"afrituð?"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
+#: lib/MIME/Viewer/pkcs7.php:408
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr "S/MIME dulkóða skeyti"
+
+#: compose.php:367
+msgid "S/MIME Error: "
+msgstr "S/MIME villa: "
+
+#: compose.php:346
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: templates/smime/notactive.inc:6
+msgid "S/MIME NOT Active"
+msgstr "S/MIME er ekki virkt"
+
+#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+msgid "S/MIME Options"
+msgstr "S/MIME valstillingar"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr "S/MIME lykilkóði"
 
-msgid "Rule Definition"
-msgstr "Skilgreining á síureglu"
+#: templates/smime/smime.inc:100
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr ""
 
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:45
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr "S/MIME undirrita skeyti"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "S/MIME dulrita skeyti"
+
+#: templates/smime/notactive.inc:11
+msgid "S/MIME support is disabled on this system."
+msgstr "S/MIME stuðmingur er óvirkur á þessu kerfi."
+
+#: lib/MIME/Viewer/pkcs7.php:230
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:162
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:135
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:24
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly"
+msgstr ""
+
+#: templates/compose/compose.inc:266
+msgid "S_ubject"
+msgstr "Efni"
+
+#: templates/compose/compose.inc:354
+msgid "Sa_ve a copy in "
+msgstr "Vista afrit í "
+
+#: templates/message/navbar_actions.inc:30
+msgid "Sa_ve as"
+msgstr "Vista sem"
+
+#: search.php:363 templates/fetchmail/manage.inc:67
+msgid "Save"
+msgstr "Vista"
+
+#: templates/compose/compose.inc:528
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
 msgid "Save Draft"
 msgstr "Vista uppkast"
 
-msgid "Save a copy in "
-msgstr "Vista afrit í "
+#: templates/pgp/pgp.inc:64 templates/pgp/notactive.inc:23
+#: templates/filters/prefs.inc:69 templates/smime/notactive.inc:23
+#: templates/smime/smime.inc:37
+msgid "Save Options"
+msgstr "Valkostir við vistun"
 
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+msgid "Save _Draft"
+msgstr "Vista uppkast"
+
+#: templates/message/navbar_actions.inc:30
 msgid "Save as"
 msgstr "Vista sem"
 
-msgid "Save sent mail"
-msgstr "Vista send skeyti"
+#: config/prefs.php.dist:513
+msgid "Save drafts as unseen?"
+msgstr ""
 
-#, c-format
-msgid "Saving the draft failed. This is what the server said: %s"
-msgstr "Vistun uppkastsins mistókst. Netþjónninn kom með eftirfarandi villu: %s"
+#: config/prefs.php.dist:1030
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
 
-msgid "Search Results"
-msgstr "Niðurstaða leitar"
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr "Geyma leit sem sýndarmöppu?"
+
+#: config/prefs.php.dist:223
+msgid "Save sent mail?"
+msgstr "Vista send skeyti?"
 
+#: compose.php:1162
+#, php-format
+msgid "Saving the draft failed. This is what the server said: %s"
+msgstr ""
+"Vistun uppkastsins mistókst. Netþjónninn kom með eftirfarandi villu: %s"
+
+#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:199
+#: lib/Block/tree_folders.php:50
 msgid "Search"
 msgstr "Leita"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+msgid "Search %s"
+msgstr "Leita í %s"
+
+#: search.php:316
+msgid "Search Results"
+msgstr "Niðurstaða leitar"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Lesið"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Velja"
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "Veldu annan aðgang"
+
+#: templates/search/fields.inc:36
+msgid "Select a date"
+msgstr "Veldu degsetningu"
+
+#: templates/search/fields.inc:10
+msgid "Select a field"
+msgstr "Veldu reit"
+
+#: config/prefs.php.dist:127
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Veldu netfangabók(bækur) fyrir viðbætur og leitarmöguleika."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Velja allt"
 
-msgid "Select an identity"
-msgstr "Veldu kenni"
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"Veldu reiti í netfangabók sem á að leita í, þegar leitað er að netföngum."
 
-msgid "Select charset:"
-msgstr "Veldu stafasett:"
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "Veldu aðgang"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Velja ekkert"
 
-msgid "Select your preferred language:"
-msgstr "Veldu sjálfgefið tungumál:"
-
-msgid "Select"
-msgstr "Velja"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
 msgstr "Valdar netfangabækur:"
 
+#: templates/pgp/pgp.inc:147
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+msgid "Send Latest Information"
+msgstr ""
+
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
 msgid "Send Message"
 msgstr "Senda skeyti"
 
-msgid "Sent mail folder:"
-msgstr "Mappa fyrir send skeyti:"
+#: config/prefs.php.dist:698
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
 
-msgid "September"
-msgstr "september"
+#: folders.php:392
+msgid "Sent mail folder"
+msgstr "Mappa fyrir send skeyti:"
 
-msgid "Server Information"
-msgstr "Upplýsingar netþjóns"
+#: templates/prefs/sentmailselect.inc:39
+msgid "Sent mail folder:"
+msgstr "Mappa fyrir send skeyti:"
 
+#: templates/login/login.inc:132 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Netþjónn"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Stilla forskrift fyrir síureglur sem lýsa óvelkomnu innihaldi."
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:23
+msgid "Server:"
+msgstr "Póstþjónn:"
 
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Stilla forskrift um hvað gerist, þegar skeyti er eytt eða það flutt."
 
-msgid "Set the current time zone."
-msgstr "Stilla núverandi tímabelti."
+#: config/prefs.php.dist:522
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr ""
+
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr ""
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:663
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Velja tungumál fyrir valblaðsliði, skýringar og hjálp."
+#: templates/pgp/pgp.inc:52
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
 
+#: config/prefs.php.dist:505
 msgid "Should the compose window be closed after saving a draft?"
-msgstr "Á að loka glugganum sem ný skeyti eru samin í eftir að uppkast er vistað?"
+msgstr ""
+"Á að loka glugganum sem ný skeyti eru samin í eftir að uppkast er vistað?"
+
+#: templates/pgp/pgp.inc:40
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
 
+#: templates/search/main.inc:92
+msgid "Show All Folders"
+msgstr "Sýna allar möppur"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr "Sýna alla hausa"
+
+#: mailbox.php:361
 msgid "Show Deleted"
 msgstr "Sýna eydd skeyti"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr "Sýna einungis helstu hausa"
+
+#: templates/message/headers.inc:70
+msgid "Show Mailing List Information"
+msgstr "Sýna uppl. um póstlista"
+
+#: templates/search/main.inc:92
+msgid "Show Only Subscribed Folders"
+msgstr ""
+
+#: folders.php:287
 msgid "Show Unsubscribed"
 msgstr "Sýna óvirka"
 
-msgid "Show last login time when logging in"
-msgstr "Sýna hvenær þú tengdist síðast"
+#: config/prefs.php.dist:603
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
+
+#: config/prefs.php.dist:974
+msgid "Show legend in the mailbox view?"
+msgstr "Sýna tákn í póstmöppuham?"
 
-msgid "Show legend in the mailbox view."
-msgstr "Sýna tákn í póstmöppuham."
+#: config/prefs.php.dist:809
+msgid "Show previews for unread messages only?"
+msgstr ""
 
-msgid "Size"
+#: config/prefs.php.dist:817
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:108
+msgid "Show the Images"
+msgstr "Sýna myndirnar"
+
+#: templates/filters/prefs.inc:61
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:30
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:660
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+msgid "Si_ze"
 msgstr "Stærð"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Það vantar einhverjar stilliskrár fyrir IMP:"
+#: templates/login/login.inc:213
+msgid "Sign up if not registered"
+msgstr ""
+
+#: templates/mailbox/legend.inc:17
+msgid "Signed"
+msgstr "Undirritað"
 
+#: templates/compose/attachments.inc:3
+msgid "Size"
+msgstr "Stærð"
+
+#: templates/mailbox/message_headers.inc:81
 msgid "Sort Direction"
 msgstr "Röðunarátt"
 
-msgid "Spam Report from"
-msgstr ""
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr "Flokka eftir komutíma"
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr "Flokka eftir dags."
+
+#: templates/mailbox/message_headers.inc:26
+msgid "Sort by From Address"
+msgstr "Flokka eftir sendandanetfangi"
+
+#: templates/mailbox/message_headers.inc:41
+msgid "Sort by Message Size"
+msgstr "Flokka eftir stærð skeytis"
+
+#: templates/mailbox/message_headers.inc:36
+msgid "Sort by Subject"
+msgstr "Flokka eftir efnislínu"
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr "Flokka eftir efnisþræði"
+
+#: templates/mailbox/message_headers.inc:21
+msgid "Sort by To Address"
+msgstr "Flokka eftir viðtakandanetfangi"
+
+#: templates/prefs/spamselect.inc:23
+msgid "Spam folder:"
+msgstr "Ruslpóstmappa:"
 
+#: templates/compose/compose.inc:337
 msgid "Special Characters"
 msgstr "Sértákn"
 
+#: templates/compose/compose.inc:334
 msgid "Spell Check"
 msgstr "Prófarkarlestur"
 
+#: templates/compose/spelling.inc:48
 msgid "Spell Checker"
 msgstr "Prófarkalesari"
 
+#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
 msgid "Spell check complete"
 msgstr "Prófarkarlestri lokið"
 
+#: config/prefs.php.dist:462
 msgid "Spelling errors per screen when spell checking."
 msgstr "Fjöldi villna pr. glugga þegar prófarkalestur er keyrður."
 
-msgid "Subject Field"
-msgstr "Efnislína"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:202
+msgid "Strip Attachment"
+msgstr "Eyða viðhengi"
+
+#: config/prefs.php.dist:801
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+msgid "Sub_ject"
+msgstr "Efni"
 
+#: search.php:151 message.php:252 templates/compose/recompose.inc:25
 msgid "Subject"
 msgstr "Efni"
 
-msgid "Subject:"
-msgstr "Efni:"
+#: config/prefs.php.dist:891
+msgid "Subject Field"
+msgstr "Efnislína"
+
+#: search.php:365 templates/pgp/passphrase.inc:31
+#: templates/smime/passphrase.inc:21
+msgid "Submit"
+msgstr "Áfram"
 
+#: templates/folders/actions.inc:9
 msgid "Subscribe to Folder(s)"
 msgstr "Virkja möppu(r)"
 
+#: lib/MIME/Viewer/pgp.php:389 lib/MIME/Viewer/status.php:87
+#: lib/MIME/Viewer/pkcs7.php:369
 msgid "Success"
 msgstr "Framkvæmt"
 
+#: templates/compose/spelling.inc:92
 msgid "Suggestions"
 msgstr "Tillögur"
 
-msgid "Text"
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr "Samantekt"
+
+#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:395
+msgid "Switch to HTML composition"
+msgstr "Skipta í HTML ritil"
+
+#: templates/compose/compose.inc:395
+msgid "Switch to plain text composition"
+msgstr "Skipta í textaritil"
+
+#: templates/compose/compose.inc:410
+msgid "Te_xt"
 msgstr "Texti"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: config/prefs.php.dist:925
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+msgid "The account \"%s\" has been deleted."
+msgstr "Aðganginum \"%s\" hefur verið eytt."
+
+#: fetchmailprefs.php:74
+#, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Aðgangurinn  \"%s\" hefur verið vistaður."
+
+#: lib/Filter.php:97
+#, php-format
+msgid "The address \"%s\" has been added to %s."
+msgstr "Netfanginu  \"%s\" hefur verið bætt í %s."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "Viðhengið fannst ekki."
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "The current folder(s) \"%s\" will be renamed to \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:112
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1171
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "Uppkastið hefur verið vistað í \"%s\" möppunni."
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Ekki tókst að fylla sjálfvirkt í svæðið \"%s\"."
+
+#: lib/Folder.php:328
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Mappan \"%s\" er nú þegar til"
 
-#, c-format
+#: lib/Folder.php:171
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
-msgstr "Mappan \"%s\" er með sértákn eða íslenska stafi í nafninu. "
-"Þetta getur leitt til vandamála sem þarf að leysa með aðstoð þjónustuaðila."
+msgstr ""
+"Mappan \"%s\" er með sértákn eða íslenska stafi í nafninu. Þetta getur leitt "
+"til vandamála sem þarf að leysa með aðstoð þjónustuaðila."
 
-#, c-format
+#: lib/Folder.php:347
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Mappan \"%s\" var búin til en er ekki virk."
 
-#, c-format
+#: lib/Folder.php:285
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Möppunni \"%s\" var eytt, en hún var virk."
 
-#, c-format
+#: lib/Folder.php:334
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "Mappan \"%s\" var ekki búin til. Villutilkynning netþjónsins fylgir hér á eftir"
+msgstr ""
+"Mappan \"%s\" var ekki búin til. Villutilkynning netþjónsins fylgir hér á "
+"eftir"
 
-#, c-format
+#: lib/Folder.php:278
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
-msgstr "Möppunni \"%s\" var ekki eytt. Villutilkynning netþjónsins fylgir hér á eftir"
+msgstr ""
+"Möppunni \"%s\" var ekki eytt. Villutilkynning netþjónsins fylgir hér á eftir"
 
-#, c-format
+#: lib/Folder.php:350
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mappan \"%s\" var búin til."
 
-#, c-format
+#: lib/Folder.php:288
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Möppunni \"%s\" var eytt."
 
-#, c-format
+#: lib/Folder.php:438
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mappan \"%s\" var endurnefnd \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "Kenninu \"%s\" hefur verið eytt."
-
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "Kennið  \"%s\" hefur verið vistað."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:96
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:614
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "Mappan \"%s\" er nú þegar tóm"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
 
-msgid "The message being composed has been closed.  Exiting."
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
 msgstr "Skeytinu sem verið var að semja hefur verið lokað."
 
-msgid "The signature couldn't be replaced."
+#: message.php:142
+msgid "The message has been deleted."
+msgstr "Skeytinu hefur verið eytt."
+
+#: lib/MIME/Viewer/pgp.php:393
+msgid "The message has been verified."
+msgstr "Skeytið hefur verið sannprófað."
+
+#: lib/MIME/Viewer/pkcs7.php:373
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Skeytið hefur verið sannprófað. Sendandi: %s."
+
+#: templates/pgp/open_pgp_win.js:10 templates/smime/open_smime_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:531
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
 msgstr "Ekki var hægt að skipta um undirskrift."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Undirskrift hefur verið breytt."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr "Verkefninu \"%s\" hefur verið bætt við verkefnalistann."
+
+#: lib/MIME/Viewer/status.php:95
+msgid "The text of the message"
+msgstr "Texti skeytisins"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+msgid "The text of the sent message"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Það eru engin skeyti í þessu pósthólfi."
 
-#, c-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Vandamál kom upp við tæmingu á %s. Villutilkynning netþjónsins fylgir hér á eftir"
-
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Vandamál kom upp við tæmingu pósthólfs. Villutilkynning netþjónsins fylgir hér á eftir"
+#: thread.php:69
+msgid "There is no text that can be displayed inline."
+msgstr ""
 
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:575
+#, php-format
+msgid "There was a problem expunging %s. This is what the server said"
 msgstr ""
-"Vandamál kom upp við tæmingu pósthólfs. Villutilkynning netþjónsins fylgir hér á eftir: %s"
+"Vandamál kom upp við tæmingu á %s. Villutilkynning netþjónsins fylgir hér á "
+"eftir"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+#: lib/Message.php:616
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
-"Vandamál kom upp við upphleðslu skrár. Skráin er e.t.v. stærri en leyfilegt er (%d MB)."
+"Vandamál kom upp við tæmingu pósthólfs. Villutilkynning netþjónsins fylgir "
+"hér á eftir: %s"
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: lib/Message.php:584
+msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
-"Vandamál kom upp við upphleðslu skrár. Skráin er e.t.v. stærri en leyfilegt er."
+"Vandamál kom upp við tæmingu pósthólfs. Villutilkynning netþjónsins fylgir "
+"hér á eftir"
 
-#, c-format
+#: lib/Message.php:92
+#, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Vandamál kom upp við afritun í \"%s\". "
-"Villutilkynning netþjónsins fylgir hér á eftir"
+"Vandamál kom upp við afritun frá \"%s\" til  \"%s\". Villutilkynning "
+"netþjónsins fylgir hér á eftir"
 
-#, c-format
+#: lib/Message.php:200 lib/Message.php:215
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Villa kom upp þegar átti að eyða skeytum úr möppunni \"%s\". "
-"Villutilkynning netþjónsins fylgir hér á eftir"
+"Villa kom upp þegar átti að eyða skeytum úr möppunni \"%s\". Villutilkynning "
+"netþjónsins fylgir hér á eftir"
 
-#, c-format
+#: lib/Message.php:277
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Villa kom upp þegar átti að eyða skeytum í möppunni \"%s\". "
-"Villutilkynning netþjónsins fylgir hér á eftir"
+"Villa kom upp þegar átti að eyða skeytum í möppunni \"%s\". Villutilkynning "
+"netþjónsins fylgir hér á eftir"
+
+#: lib/Message.php:213
+#, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr ""
+"Villa kom upp þegar átti að eyða skeytum. Villutilkynning netþjónsins fylgir "
+"hér á eftir: %s"
 
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "Villa kom upp þegar átti að eyða skeytum. Villutilkynning netþjónsins fylgir hér á eftir"
+#: lib/MIME/Viewer/itip.php:99
+#, php-format
+msgid "There was an error deleting the event: %s."
+msgstr ""
 
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Villa kom upp við birtingu þessa hluta skeytisins"
 
-#, c-format
+#: lib/Message.php:508 lib/Message.php:548
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Villa kom upp þegar átti að merkja skeyti í möppunni \"%s\". "
-"Villutilkynning netþjónsins fylgir hér á eftir"
+"Villa kom upp þegar átti að merkja skeyti í möppunni \"%s\". Villutilkynning "
+"netþjónsins fylgir hér á eftir"
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Villa kom upp þegar átti að merkja skeyti. Villutilkynning netþjónsins fylgir hér á eftir"
+#: folders.php:155
+#, php-format
+msgid "There was an error importing %s."
+msgstr "Villa kom upp við að flytja inn %s."
+
+#: lib/MIME/Viewer/itip.php:136
+#, php-format
+msgid "There was an error importing the event: %s."
+msgstr ""
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
+#: lib/MIME/Viewer/itip.php:166
+#, php-format
+msgid "There was an error importing the task: %s."
 msgstr ""
-"Villa kom upp þegar átti að færa skeyti í möppuna \"%s\". "
-"Villutilkynning netþjónsins fylgir hér á eftir"
 
+#: lib/MIME/Viewer/itip.php:152
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr ""
+
+#: lib/Message.php:87
+#, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Villa kom upp þegar átti að færa skeyti í ruslakörfuna. Villutilkynning netþjónsins fylgir hér á eftir"
+"Villa kom upp þegar átti að færa skeyti frá \"%s\" til \"%s\". "
+"Villutilkynning netþjónsins fylgir hér á eftir"
 
-msgid "There was an error saving a draft."
-msgstr "Villa kom upp þegar átti að vista uppkastið."
+#: compose.php:1179
+msgid "There was an error saving this message as a draft."
+msgstr "Villa kom upp við vistun þessa skeytis sem uppkasts."
 
-#, c-format
+#: compose.php:940
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Ekki tókst að senda skeytið: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
+#: lib/MIME/Viewer/itip.php:113
+#, php-format
+msgid "There was an error updating the event: %s."
 msgstr ""
-"Villa kom upp þegar átti að hætta við að eyða skeyti. "
-"Villutilkynning netþjónsins fylgir hér á eftir"
 
-msgid "There was an error viewing the requested message."
-msgstr "Villa kom upp þegar átti að sýna umbeðið skeyti."
+#: lib/MIME/Viewer/plain.php:59
+msgid "There was no text in this message part"
+msgstr "Það var engin texti í þessum hluta skeytisins"
+
+#: lib/MIME/Viewer/html.php:94
+msgid "This HTML message has images embedded in it."
+msgstr "Þetta HTML skeyti er iniheldur myndir.."
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr "Þessi skrá stjórnar MIME merkingum fyrir IMP. "
-"Merkingarnar stjórna því hvaða skrár eru skoðanlegar eða hægt að hlaða niður."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
 
+#: templates/folders/javascript.inc:6
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr ""
+"Þetta gæti tekið nokkurn tíma. Ert þú viss um að þú viljir halda áfram?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:399
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
-msgstr "Þessi skrá stjórnar því hvað er sjálfgefið í IMP, og heldur einnig utan "
-"um stillingar sem notendur geta breytt."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:403
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
 
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
-msgstr "Þessi skrá stjórnar því hvað er sjálfgefið í IMP, og skilgreinir lista fyrir þá netþjóna sem eru tiltækir."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
-msgstr "Þessi skrá stjórnar því hvaða útlitsstýring (stylesheet) er notuð til viðbótar eða breytinga á innbyggðum stýringum."
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
-msgstr "Þessi skrá er aðal stilliskrá IMP-vefpóstsins. Skráin inniheldur slóðir og valmöguleika fyrir skipanaskrár."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Þetta gæti tekið nokkurn tíma. Ert þú viss um að þú viljir halda áfram?"
+#: lib/MIME/Viewer/pkcs7.php:159
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Þetta skeyti hefur verið sent til kerfisumsjónar sem tilkynning um ruslpóst (SPAM)."
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr "Þetta skeyti er með PGP rafræna undirskrift."
+
+#: lib/MIME/Viewer/pkcs7.php:132
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Þetta skeyti er með S/MIME rafræna undirskrift."
+
+#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+msgid "This message has been encrypted via S/MIME."
+msgstr "Þetta skeyti er dulritað með S/MIME."
+
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr "Þetta skeyti er dulritað með PGP."
 
+#: message.php:195
 msgid "This message to"
 msgstr "Þetta skeyti til"
 
-msgid "This number must be at least one."
-msgstr "Talan verður að vera að lágmarki 1."
-
-msgid "This value must be a number."
-msgstr "Þetta gildi verður að vera tala."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-msgid "This window must be called from compose window"
-msgstr "Þessi gluggi þarf að vera vísun frá glugganum þar sem ný skeyti eru samin."
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
+"Þessi gluggi þarf að vera vísun frá glugganum þar sem ný skeyti eru samin."
 
+#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
 msgid "Thread View"
 msgstr "Efnisþráðshamur"
 
-msgid "Thread"
-msgstr "Efnisþráður"
-
-msgid "Time Zone"
-msgstr "Tímabelti"
-
+#: search.php:139 message.php:248 mailbox.php:585
+#: templates/mailbox/message_headers.inc:22
+#: templates/contacts/contacts.inc:219 templates/compose/recompose.inc:10
+#: templates/compose/redirect.inc:64
 msgid "To"
 msgstr "Til"
 
-msgid "To:"
-msgstr "Til:"
+#: config/prefs.php.dist:890
+msgid "To Address"
+msgstr "Móttökunetfang"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Heildarstærð: %s KB"
+#: templates/compose/compose.inc:567
+msgid "Total Attachments Size:"
+msgstr "Heildarstærð viðhengja:"
+
+#: folders.php:383
+msgid "Trash folder"
+msgstr "Ruslakarfa"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Ruslakarfa:"
 
-msgid "Unanswered messages"
-msgstr "Ósvöruð skeyti"
+#: lib/Quota/courier.php:53 lib/Quota/cyrus.php:65 lib/Quota/logfile.php:88
+#: lib/Quota/command.php:72 lib/Quota/mdaemon.php:48
+#: lib/Quota/mercury32.php:79
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:19 templates/mailbox/navbar.inc:36
+#: templates/message/navbar_navigate.inc:10
 msgid "Unanswered"
 msgstr "Ósvarað"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Ósvöruð skeyti"
+
+#: templates/mailbox/actions.inc:13 templates/message/navbar_actions.inc:4
 msgid "Undelete"
 msgstr "Endurvekja"
 
+#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Móttakendur sem ekki sjást"
 
-msgid "Unnamed"
-msgstr "Ónefnt"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
 
-msgid "Unread"
-msgstr "Ólesið"
+#: mailbox.php:544
+msgid "Unknown Date"
+msgstr "Óþekkt dags."
 
-msgid "Unseen Messages"
-msgstr "Óséð skeyti"
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:597
+msgid "Unknown Recipient"
+msgstr "Óþekktur móttakandi"
+
+#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+msgid "Unload Passphrase"
+msgstr ""
 
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "Ónefnt"
+
+#: message.php:483 mailbox.php:687 templates/mailbox/legend.inc:5
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/message/navbar_navigate.inc:6
 msgid "Unseen"
-msgstr "Óséð"
+msgstr "Ólesið"
 
+#: templates/folders/actions.inc:10
 msgid "Unsubscribe from Folder(s)"
 msgstr "Afvirkja möppu(r)"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Haltu CTRL/Option lyklinum niðri og smelltu til að velja fleiri svæði"
+#: templates/compose/compose.inc:574
+msgid "Update Attachment Information"
+msgstr "Uppfæra uppl. um viðhengi"
 
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/pgp/import_key.inc:56 templates/smime/import_key.inc:56
+msgid "Upload"
+msgstr "Innsenda"
+
+#: templates/prefs/sentmailselect.inc:42
 msgid "Use Default Value"
 msgstr "Nota sjálfgefið gildi"
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:250
+msgid "Use IMAP folder subscriptions?"
 msgstr "Nota virkar IMAP möppur"
 
-msgid "User Options"
-msgstr "Valkostir notanda"
+#: templates/acl/acl.inc:140
+msgid "User"
+msgstr "Notandi"
 
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.inc:181
 msgid "Username"
 msgstr "Notandanafn"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+msgid "Username:"
+msgstr "Notandanafn:"
+
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:113 templates/smime/smime.inc:117
+msgid "View"
+msgstr "Skoða"
+
+#: lib/MIME/Viewer/tnef.php:108 lib/MIME/Viewer/zip.php:92
+#, php-format
 msgid "View %s"
 msgstr "Sýna %s"
 
-msgid "View messages in "
-msgstr "Sýna skeyti í "
+#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#, php-format
+msgid "View %s Public Key"
+msgstr "iSkoða opinberan lykil fyrir %s"
+
+#: lib/MIME/Viewer/html.php:128
+msgid "View HTML content in a separate window"
+msgstr "Skoða HTML-efni í sér glugga."
 
+#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:147 templates/smime/smime.inc:113
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:17
+msgid "View Thread"
+msgstr "Skoða efnisþráð"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr "Skoða smámynd"
+
+#: lib/MIME/Viewer/pkcs7.php:407
+msgid "View attachment in a separate window"
+msgstr "koða viðhengi í sér glugga."
+
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Skoða innihald í sér glugga."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr "Sýna atburð"
+
+#: mailbox.php:513 folders.php:375
+#, php-format
+msgid "View messages in %s"
+msgstr "Sýna skeyti í %s"
+
+#: templates/prefs/initialpageselect.inc:26
 msgid "View or mailbox to display after login:"
 msgstr "Mappa eða hamur sem á að sýna í upphafi:"
 
+#: lib/MIME/Viewer/itip.php:170
+msgid "View task"
+msgstr "Sýna verkefni"
+
+#: lib/MIME/Viewer/html.php:113
+msgid "View the Images"
+msgstr "Skoða myndirnar"
+
+#: search.php:314
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Sýndarmappan \"%s\" var stofnuð."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
+#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
+#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+msgid "Virtual Folders"
+msgstr "Sýndarmöppur"
+
+#: search.php:296
+msgid "Virtual Folders require a label."
+msgstr "Sýndarmöppur þurfa auðkenni."
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr "Auðkenni sýndarmöppu"
+
+#: lib/MIME/Viewer/pkcs7.php:363
 msgid "Warning"
 msgstr "Aðvörun"
 
-#, c-format
+#: login.php:130
+#, php-format
 msgid "Welcome to %s"
 msgstr "Velkomin(n) í %s"
 
+#: config/prefs.php.dist:724
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
+msgstr ""
+
+#: config/prefs.php.dist:878
+msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
-"Þegar þú eyðir skeytum, byrjaðu þá á að færa þau í ruslakörfu, frekar en að eyða þeim strax."
 
+#: config/prefs.php.dist:554
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:421
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/mailbox/actions.inc:19 templates/message/navbar_actions.inc:22
+msgid "Whitelist"
+msgstr ""
+
+#: config/prefs.php.dist:437
 msgid "Wrap text at this many characters."
 msgstr "Færa bendil sjáfkrafa í næstu línu þegar þessum stafafjölda er náð."
 
+#: templates/compose/compose.inc:531 config/prefs.php.dist:949
 msgid "Yes"
 msgstr "Já"
 
-msgid "You are attempting to delete the following folders:"
-msgstr "Þú ert um það bil að eyða eftirfarandi möpppum:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Þú ert um það bil að sækja póst fyrir eftirfarandi aðganga:"
+
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Þú ert um það bil að eyða öllum skeytum í eftirfarandi möppu(m):"
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Þú ert um það bil að eyða eftirfarandi möpppu(m):"
+
+#: templates/mailbox/javascript.inc:192 templates/message/javascript.inc:55
+msgid "You are copying/moving to a new folder."
+msgstr "Þú ert að afrita/færa í nýja möppu."
 
+#: templates/folders/javascript.inc:94
 msgid "You are creating a sub-folder to "
 msgstr "Þú ert um það bil að búa til undirmöppu í "
 
+#: templates/folders/javascript.inc:96
 msgid "You are creating a top-level folder."
-msgstr ""
-"Þú ert að búa til nýja aðalmöppu.\\nSláðu inn nafn möppunnar:\\n"
+msgstr "Þú ert að búa til nýja aðalmöppu.\\nSláðu inn nafn möppunnar:\\n"
 
+#: templates/folders/javascript.inc:127
 msgid "You are renaming the folder: "
 msgstr "Þú ert að endurnefna möppuna: "
 
-#, c-format
+#: lib/Folder.php:537
+#, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Þú getur ekki aftengt frá \"%s\""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:165
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Þú átt %s ný skeyti."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Þú átt 1 nýtt skeyti."
 
-msgid "You have been logged out.<br />Thank you for using the system."
+#: templates/compose/attachments.js:116
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
 msgstr ""
-"Þú hefur nú aftengst %s. Takk fyrir notkunina. "
-"Þegar þú vilt tengjast aftur, notaðu þá reitina hér að neðan."
 
+#: lib/IMP.php:1030
 msgid "You have new mail in the following folder:"
 msgstr "Þú átt nýjan póst í möppunni:\\n"
 
+#: lib/IMP.php:1035
 msgid "You have new mail in the following folders:"
 msgstr "Þú átt nýjan póst í þessum möppum:\\n"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Þú þarft fyrst að velja þau viðhengi sem þú vilt eyða."
+#: compose.php:126
+msgid "You must enter at least one recipient."
+msgstr "Það þarf að tilgreina a.m.k. einn viðtakanda."
 
-msgid "You must first specify the file to attach."
-msgstr "Þú þarft fyrst að velja þau viðhengi sem þú vilt senda með skeytinu."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-msgid "You must have at least one recipient."
-msgstr "Það þarf að tilgreina a.m.k. einn viðtakanda."
+#: lib/MIME/Viewer/pkcs7.php:238
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
+#: templates/mailbox/javascript.inc:201 templates/message/javascript.inc:64
 msgid "You must select a target mailbox first."
 msgstr "Þú þarft að velja í hvaða möppu pósturinn á að fara fyrst."
 
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr "Veldu hvaða aðgangi þú vilt eyða."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Þú þarft að velja netfang fyrst."
 
-msgid "You must select an identity to be deleted."
-msgstr "Veldu hvaða kenni þú vilt eyða."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Veldu a.m.k. eitt skeyti fyrst."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Tilgreindu viðtakanda."
 
-#, c-format
+#: templates/compose/attachments.js:29
+msgid "You must specify at least one file to attach."
+msgstr "Þú þarft fyrst að velja viðhengið."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Þú endurvísaðir þessu skeyti til %s þann %%s."
+
+#: lib/Maillog.php:141
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "Þú svaraðir þessu skeyti þann %s."
+
+#: lib/Folder.php:487
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "\"%s\" var ekki gerð virk. Hér er tilkynningin sem kom frá netþjóninum"
 
-#, c-format
+#: lib/Folder.php:539
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr "\"%s\" var ekki gerð óvirk. Hér er tilkynningin sem kom frá netþjóninum"
+msgstr ""
+"\"%s\" var ekki gerð óvirk. Hér er tilkynningin sem kom frá netþjóninum"
 
-#, c-format
+#: lib/Folder.php:490
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "\"%s\" var gerð virk"
 
-#, c-format
+#: lib/Folder.php:542
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "\"%s\" var gerð óvirk"
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Lotan %s er runnin út á tíma. Tengdu þig aftur."
-
-msgid "Your From: address:"
-msgstr "Fullt netfang þitt (Frá:) :"
+#: templates/pgp/pgp.inc:186
+msgid "Your Name"
+msgstr "Fullt nafn þitt:"
 
-msgid "Your Information"
-msgstr "Upplýsingar"
+#: templates/pgp/pgp.inc:119
+msgid "Your PGP Public/Private Keys"
+msgstr "PGP opinberir/einka lyklar"
+
+#: templates/pgp/pgp.inc:150 templates/smime/smime.inc:116
+msgid "Your Private Key"
+msgstr "Einka dulritunarlykill þinn"
+
+#: templates/pgp/pgp.inc:146 templates/smime/smime.inc:112
+msgid "Your Public Key"
+msgstr "Opinber dulritunarlykill þinn"
 
+#: config/prefs.php.dist:157
 msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Svarnetfang þitt ef annað en fullt netfang (Reply-to:) <i>(valfrjálst)</i>"
-
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr "Vefskoðari þinn styður ekki þessa prentaðgerð. Notaðu CTRL/Option og P til að prenta."
-
-msgid "Your current time zone:"
-msgstr "Núverandi tímabelti:"
+msgstr ""
+"Svarnetfang þitt ef annað en fullt netfang (Reply-to:) <i>(valfrjálst)</i>"
 
-msgid "Your default identity:"
-msgstr "Sjálfgefið kenni þitt:"
+#: templates/smime/smime.inc:91
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
 
-msgid "Your full name:"
-msgstr "Fullt nafn þitt:"
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr "Aðgangar þínir:"
 
-msgid "Your identities:"
-msgstr "Kenni þín:"
+#: config/prefs.php.dist:165
+msgid ""
+"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Stillingar þínar hafa verið uppfærðar."
+#: lib/MIME/Viewer/images.php:92
+msgid "Your browser does not support inline display of this image type."
+msgstr "Vefskoari þinn styður ekki birtingu á þessarri gerð myndar."
+
+#: config/prefs.php.dist:532
+msgid "Your default charset for sending messages:"
+msgstr "Sjálfgefið stafasett í sendum skeytum:"
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr "Sjálfvalin dulkóðunaraðferð fyrir send skeyti:"
+
+#: lib/MIME/Viewer/status.php:89
+msgid "Your message was successfully delivered."
+msgstr "Skeytið var sent."
 
+#: config/prefs.php.dist:198
 msgid "Your signature:"
 msgstr "Undirskrift þín:"
 
+#: message.php:272 mailbox.php:528 compose.php:1219 lib/Compose.php:729
 msgid "[No Subject]"
 msgstr "[Ekkert efni]"
 
-msgid "add source"
-msgstr "bæta við handriti"
+#: templates/compose/compose.inc:216
+msgid "_Bcc"
+msgstr ""
 
-msgid "cannot move past the beginning"
-msgstr "get ekki fært fram fyrir byrjun"
+#: templates/mailbox/actions.inc:16 templates/message/navbar_actions.inc:19
+msgid "_Blacklist"
+msgstr "Svartlisti"
 
-msgid "cannot move past the end"
-msgstr "get ekki fært aftur fyrir enda"
+#: templates/compose/compose.inc:165
+msgid "_Cc"
+msgstr ""
 
-msgid "delete message"
-msgstr "eyða skeyti"
+#: lib/IMP.php:933
+msgid "_Compose"
+msgstr "Semja"
 
-msgid "from"
-msgstr "frá"
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/message/navbar_actions.inc:6
+msgid "_Delete"
+msgstr "Eyða"
 
-msgid "move down"
-msgstr "færa niður"
+#: lib/IMP.php:935
+msgid "_Folders"
+msgstr "Möppur"
 
-msgid "move message to"
-msgstr "færa skeyti í"
+#: templates/compose/compose.inc:80
+msgid "_Identity"
+msgstr "Auðkenni"
 
-msgid "move up"
-msgstr "færa upp"
+#: lib/IMP.php:926
+msgid "_Inbox"
+msgstr "Innbox"
 
-msgid "no folder selected"
-msgstr "engin mappa valin"
+#: lib/IMP.php:976
+msgid "_Log out"
+msgstr "Útskrá"
+
+#: message.php:368
+msgid "_Message Source"
+msgstr "Handrit"
 
-msgid "no rule selected"
-msgstr "engin regla valin"
+#: templates/message/navbar_actions.inc:31
+msgid "_Print"
+msgstr "Prenta"
+
+#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+msgid "_Priority"
+msgstr "Forgangur"
+
+#: mailbox.php:402
+#, php-format
+msgid "_Refresh %s"
+msgstr "Endurhlaða %s"
+
+#: templates/message/navbar_actions.inc:8
+msgid "_Reply"
+msgstr "Svara"
+
+#: lib/IMP.php:937
+msgid "_Search"
+msgstr "Leita"
+
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+msgid "_Send Message"
+msgstr "Senda skeyti"
+
+#: templates/mailbox/message_headers.inc:32
+msgid "_Thread"
+msgstr "Efnisþráður"
+
+#: templates/compose/compose.inc:115
+msgid "_To"
+msgstr "Til"
+
+#: templates/mailbox/actions.inc:13
+msgid "_Undelete"
+msgstr "Endurvekja"
+
+#: templates/message/navbar_actions.inc:17
+msgid "_View Thread"
+msgstr "Skoða efnisþráð"
+
+#: templates/mailbox/actions.inc:19 templates/message/navbar_actions.inc:22
+msgid "_Whitelist"
+msgstr "Hvítlisti"
+
+#: lib/Compose.php:351
+msgid "attachment"
+msgstr "Viðhengi"
+
+#: view.php:99
+msgid "attachments.zip"
+msgstr ""
+
+#: templates/compose/compose.inc:503
+msgid "bytes"
+msgstr "bæti"
+
+#: templates/contacts/contacts.inc:190
+msgid "from"
+msgstr "frá"
+
+#: pgp.php:69 smime.php:29
+msgid "key"
+msgstr ""
+
+#: folders.php:151
+msgid "mailbox file"
+msgstr "Póstmappa"
 
-msgid "no text specified"
-msgstr "enginn texti tilgreindur"
+#: compose.php:1001 lib/Message.php:429
+msgid "name"
+msgstr "Nafn"
 
+#: templates/compose/spelling.inc:80
 msgid "none"
 msgstr "enginn"
 
+#: templates/compose/spelling.inc:111
 msgid "or"
 msgstr "eða"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "sláðu inn textann, veldu reit og aðgerð"
-
-msgid "remove source"
-msgstr "fjarlægja handrit"
-
-msgid "select folder"
-msgstr "veldu möppu"
-
+#: templates/compose/spelling.inc:48
 msgid "spelling error"
 msgstr "stafsetningarvilla"
 
+#: templates/compose/spelling.inc:48
 msgid "spelling errors"
 msgstr "stafsetningarvillur"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "þar sem reiturinn %s inniheldur <b>%s</b>"
+#: lib/Filter.php:51
+msgid "your blacklist"
+msgstr "Svartlisti þinn"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr "Hvítlisti þinn"


--- orig/locale/de_DE/help.xml
+++ mod/locale/de_DE/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Horde: imp/locale/de_DE/help.xml,v 1.24.4.2 2005/03/01 16:27:49 jan Exp $ -->
+<!-- $Horde: imp/locale/de_DE/help.xml,v 1.24.4.7 2006/03/23 00:22:53 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="uptodate" md5="3259ba00a198559c7faa76e7867600d9">
     <title>Neue Nachricht: Aktionen</title>
@@ -142,7 +142,7 @@
       keine weiteren Nachrichten mehr empfangen können.
     </warn>
   </entry>
-  <entry id="compose-attach" state="uptodate" md5="98dd30f32af1fa86a9f0fea3124c4ee1">
+  <entry id="compose-attach" state="uptodate" md5="e806e5e1641fb2531cc95d2df277851f">
     <title>Neue Nachricht: Anhänge</title>
     <heading>Anhänge</heading>
     <para>
@@ -164,8 +164,9 @@
       Anhang dargestellt.
     </para>
     <para>
-      Schritt 3: Klicken Sie auf "Anhängen". Der Name und die Größe der Datei
-      erscheint anschließend in der Liste unterhalb der Eingabefelder.
+      Schritt 3: Klicken Sie auf "Anhängen". Der Name und die Größe
+      der Datei erscheint anschließend in der Liste unterhalb der
+      Eingabefelder.
     </para>
     <tip>
       Je nachdem, wie groß der Anhang und wie schnell Ihre Internetverbindung
@@ -213,6 +214,20 @@
       gespeichert werden.
     </para>
   </entry>
+  <entry id="compose-link-attachments" state="uptodate" md5="a7bb0412b033abdbba2f55b8b84d6c76">
+    <title>Neue Nachricht: Anhänge Verlinken</title>
+    <para>
+      Legt fest, ob Anhänge, die Sie beim Schreiben Ihrer Nachricht angeben,
+      als Teil der Nachricht verschickt werden oder auf dem Server
+      verbleiben. Wenn Sie die Anhäge nur verlinkt verschicken, erhält der
+      Empfänger der Nachricht ein oder mehrere Links, über die Ihre Anhänge
+      heruntergeladen werden können. Der Vorteil von verlinkten Anhängen
+      besteht darin, dass die Größe der versendeten Nachrichten deutlich
+      reduziert wird. Der Nachteil ist, dass nicht garantiert werden kann,
+      dass der Anhang auf alle Zeit verfügbar sein wird, weil die Anhänge
+      nicht in die Nachricht eingebettet sind.
+    </para>
+  </entry>
   <entry id="search" state="uptodate" md5="86b2ef57b1194890833d9dd49ebc9b32">
     <title>Nachrichtensuche</title>
     <heading>Suchkriterien</heading>
@@ -840,6 +855,20 @@
      <para> %n : Ein Zeilenumbruch</para>
      <para> %% : Das "%" Zeichen</para>
   </entry>
+  <entry id="prefs-default_msg_charset" state="uptodate" md5="4ef4fb2090e703f6f8e03f39ab96e717">
+    <title>Einstellungen: Standardzeichensatz für Nachrichten</title>
+    <para>
+      Hiermit können Sie den Standardzeichensatz angeben, der für Nachrichten
+      verwendet werden soll, die keine Zeichensatzinformationen
+      enthalten. Nach RFC 2045 müssen Nachrichten, die keinen Zeichensatz
+      angeben, eigentlich als "US-ASCII"-Nachrichten behandelt
+      werden. Allerdings gibt es einige ziemlich defekte Emailprogramme und
+      Newslettersysteme, die Nachrichten in anderen Zeichensätzen verschicken,
+      ohne diese anzugeben. Setzen Sie diese Einstellung auf den Zeichensatz,
+      der bei Ihnen am meisten verwendet wird, oder lassen Sie diese auf
+      "Standard", um die Zeichensätze nicht anzupassen.
+    </para>
+  </entry>
   <entry id="prefs-disposition_request_read" state="uptodate" md5="89e92c4d68224b2345b59959878a7174">
     <title>Einstellungen: Lesebestätigungen anfordern</title>
     <para>
@@ -850,15 +879,15 @@
     </para>
   </entry>
   <entry id="prefs-disposition_send_mdn" state="uptodate" md5="1fe04e5dc3de68d172da284895973ea9">
-    <title>Einstellungen: MDN schicken</title>
+    <title>Einstellungen: Lesebestätigung schicken</title>
     <para>
-      Mit "MDN schicken" wird eine Message Disposition Notification (eine
-      Lesebestätigung) an den Absender einer Nachricht geschickt, falls er
-      diese angefordet hat und Sie die Nachricht gelesen haben. In den meisten
-      Fällen geschieht das automatisch, ohne dass Sie eingreifen müssen. In
-      bestimmten Fällen kann es jedoch vorkommen, dass Sie eine Nachfrage
-      erhalten und selber entscheiden müssen, ob Sie diese Bestätigung
-      verschicken möchten, indem Sie auf einen Link klicken.
+      Mit "Lesebestätigung schicken" wird eine Message Disposition
+      Notification (eine Lesebestätigung) an den Absender einer Nachricht
+      geschickt, falls er diese angefordet hat und Sie die Nachricht gelesen
+      haben. In den meisten Fällen geschieht das automatisch, ohne dass Sie
+      eingreifen müssen. In bestimmten Fällen kann es jedoch vorkommen, dass
+      Sie eine Nachfrage erhalten und selber entscheiden müssen, ob Sie diese
+      Bestätigung verschicken möchten, indem Sie auf einen Link klicken.
     </para>
 </entry>
   <entry id="prefs-disposition_request_delivery" state="uptodate" md5="26598e29af05a07de5e13644669be712">
@@ -872,6 +901,28 @@
       Emailserver unterstützen diese Aufforderungen.
     </para>
   </entry>
+  <entry id="prefs-delete_spam_after_report" state="uptodate" md5="cefa8b52e09b0ada90e0889a3959efea">
+    <title>Einstellungen: Behandlung von Spam</title>
+    <para>
+      Sie können aus einer von drei Aktionen wählen, die ausgeführt werden
+      soll, wenn Sie eine Nachricht als Spam oder kein Spam gemeldet haben.
+    </para>
+    <para>
+      Erstens, nicht geschieht - die Nachricht wird als Spam oder kein Spam
+      gemeldet, aber bleibt unverändert in Ihrem Ordner.
+    </para>
+    <para>
+      Zweitens kann die Nachricht, die Sie gerade als Spam gemeldet haben,
+      sofort gelöscht werden. Diese Einstellung hat keinen Einfluß auf
+      Nachrichten die als kein Spam gemeldet wurden.
+    </para>
+    <para>
+      Zweitens kann die Nachricht, die Sie gerade als Spam gemeldet haben, in
+      Ihren Spam-Ordner verschoben werden. Falls Sie eine Nachricht als kein
+      Spam gemeldet haben, wird diese vom aktuellen Ordner in Ihren
+      Posteingang verschoben.
+    </para>
+  </entry>
   <entry id="prefs-html_image_replacement" state="uptodate" md5="28e1cf08e328345a8e7274c853492d4f">
     <title>Einstellungen: Ersetzen von Bildern in HTML</title>
     <para>
@@ -920,4 +971,28 @@
      nachfragen, ob die Anhänge mitgespeichert werden sollen; Die Anhänge
      werden NIE mitgespeichert.</para>
   </entry>
+  <entry id="virtual_inbox" state="uptodate" md5="4d1969e640f6e0bed4f8958f018c2d07">
+    <title>Virtuelle Ordner: Virtueller Posteingang</title>
+    <para>
+      Der Virtuelle Posteingang ist eine gespeicherte Suchabfrage, die es
+      Ihnen abnimmt, in allen Ordnern nach neuen Nachrichten zu
+      schauen. Stattdessen werden alle Ordner, die Sie für diesen Zweck in der
+      <ref module="imp" entry="folder-options">Ordner Navigation</ref>
+      ausgewählt haben, automatisch nach neuen Nachrichten durchsucht und in
+      einer einzigen Übersicht angezeigt.
+    </para>
+  </entry>
+  <entry id="virtual_trash" state="uptodate" md5="11f91811b9b2af90fe68740f6a86cef6">
+    <title>Virtuelle Ordner: Virtueller Papierkorb</title>
+    <para>
+      Der Virtuelle Papierkorb ist eine gespeicherte Suchabfrage, die einen
+      separaten Papierkorb-Ordner unnötig macht. Anstatt gelöschte Nachrichten
+      in einen speziellen Ordner zu verschieben, werden sie nur als gelöscht
+      markiert und in den jeweiligen Ordnern, in denen sie sich befinden,
+      ausgeblendet. 
+      Wenn Sie den Virtuellen Papierkorb öffnen, werden alle Ihre Ordner nach
+      gelöschten Nachrichten durchsucht und in einer einzigen Übersicht
+      angezeigt. 
+    </para>
+  </entry>
 </help>


--- orig/locale/da_DK/help.xml
+++ mod/locale/da_DK/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Horde: imp/locale/da_DK/help.xml,v 1.16.6.1 2005/01/25 22:05:55 jan Exp $ -->
+<!-- $Horde: imp/locale/da_DK/help.xml,v 1.16.6.5 2006/03/23 00:24:14 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Ny meddelelse: Handlinger</title>
@@ -198,6 +198,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Søgning</title>
     <heading>Søgekriterier</heading>
@@ -651,6 +657,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -669,6 +681,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -698,4 +725,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/po/tr_TR.po
+++ mod/po/tr_TR.po
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Imp-4.0.3\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-06-28 14:48+0300\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2005-06-28 14:48+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: i18n at lists.horde.org\n"
@@ -19,168 +19,168 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/Compose.php:266 lib/Compose.php:318
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "   Kime: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "   Kime: "
 
-#: lib/Compose.php:254 lib/Compose.php:306
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "  Tarih: "
 
-#: lib/Compose.php:257 lib/Compose.php:309
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr " Kimden:  "
 
-#: mailbox.php:399
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr "(Eriþim Anahtarý %s)"
 
-#: lib/Compose.php:263 lib/Compose.php:315
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "   Konu: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " -> "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:190
-#, php-format
-msgid "%d message(s) have been deleted."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "Ýleti Yok"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
 msgstr "%d ileti silindi."
 
-#: lib/Spam.php:182
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "%d iletinin istenmeyen ileti olmadýðý sistem yöneticisine rapor edildi."
 
-#: lib/Spam.php:162
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d iletinin istenmeyen ileti olmadýðý rapor edildi."
 
-#: lib/Spam.php:174
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d iletinin istenmeyen ileti olduðu sistem yöneticisine rapor edildi."
 
-#: lib/Spam.php:154
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d iletinin istenmeyen ileti olduðu rapor edildi."
 
-#: mailbox.php:362
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d - %d / %d ileti"
 
-#: mailbox.php:607
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP Yönetimi"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME Yönetimi"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s zaten var. Dizininiz %s yeniden adlandýrýlamadý."
 
-#: lib/Message.php:633
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s geçerli bir posta kutusu deðil."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s dizin ay baþýnda yeniden adlandýrýldý."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr "%s onaylandý"
 
-#: lib/MIME/Viewer/itip.php:581
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
 msgstr "%s vazgeçti: %s."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
 msgstr "%s reddedildi."
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s serbest/meþgul isteði yanýtladý."
 
-#: lib/MIME/Viewer/itip.php:572
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s %s davetini yanýtladý."
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s size serbest/meþgul bilgi gönderdi. "
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s geçici olarak onaylandi"
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s serbest/meþgul bilginizi istedi."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s %s de bulunmanýzý istedi."
 
-#: lib/Message.php:388
-#, php-format
-msgid "%s was successfully added to %s."
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
 msgstr "%s baþarýyla eklendi:%s."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr "%s %s deðiþimini istemektedir."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr "%s %s konusunda haberdar olmanýzý istemektedir."
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr "%s %s hakkýnda son haberleri almanýzý istemektedir."
 
-#: message.php:276 message.php:281
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -190,15 +190,24 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;/&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Deðiþiklikleri uygulayýn ve bir sonraki ekrana geçin.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Deðiþiklikleri yoksay ve Oluþturma ekranýna geri dön.)"
 
-#: spelling.php:273
+#: templates/stationery/prefs.inc:16
+#, fuzzy
+msgid "(HTML)"
+msgstr "HTML"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -206,7 +215,7 @@
 "(Þu ana kadar yapýlan deðiþiklikleri uygula ve Oluþturma ekranýna geri dön. "
 "Bu ekrandaki deðiþikliler UYGULANMAYACAK.)"
 
-#: spelling.php:270
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -214,54 +223,59 @@
 "(Þu ana kadar yapýlan deðiþikleri uygula ve iletiyi gönder. Bu ekranda olan "
 "deðiþiklikler UYGULANMAYACAK.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Evete basarak ekleyin *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Lütfen adres seçin *"
 
-#: lib/Spam.php:184
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Ýleti silindi."
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 "1 iletinin istenmeyen ileti olmadýðý sistem yöneticinize rapor edilmiþtir."
 
-#: lib/Spam.php:164
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
 msgstr "1 iletinin istenmeyen ileti olmadýðý rapor edilmiþtir."
 
-#: lib/Spam.php:176
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr ""
 "1 iletinin istenmeyen ileti olduðu sistem yöneticinize rapor edilmiþtir."
 
-#: lib/Spam.php:156
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
 msgstr "1 iletinin istenmeyen ileti olduðu rapor edilmiþtir."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100 karakter"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000 karakter"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250 karakter"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500 karakter"
 
-#: lib/MIME/Viewer/images.php:159
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "%s adýnda büyük görüntü dosyasý bu iletiye eklendi."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -271,123 +285,123 @@
 msgid "AND"
 msgstr "VE"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr "Ýsteði onayla"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "Olay takviminize eklendi."
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr "Onaylandý"
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:257
 msgid "Accepted: "
 msgstr "Onaylandý:"
 
-#: lib/IMP.php:910 lib/IMP.php:912
-msgid "Acco_unts"
-msgstr "_Hesaplar"
-
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Hesap Ýsmi:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
 msgstr "Eylemler"
 
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Adres defterine (%s) ekle"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Kaynak Ekle"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr "Bunu takvimime Ekle"
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Adres defterine (%s) ekle"
-
-#: compose.php:1177
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" ek olarak eklendi."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "Görüntülenecek ilave baþlýklar: <i> (seçimli, herbir baþlýðý yeni bir "
 "satýrda girin.)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Ýlave bilgi %s görülebilir."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Ýlave bilgi ayrýntýlarý"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Ýlave ileti ayrýntýlarý"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Ýlave ileti ayrýntýlarý %s görülebilir."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Ýlave ileti hata ayrýntýlarý"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Ýlave ileti hata ayrýntýlarý %s görüntülenebilir."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adres Defterleri"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "Bütün iletilerin Gizli K.K. gönderileceði adresler: <i>(seçimli, herbir "
 "adresi yeni satýrda girin.)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Adresler açýkca bu kimliðe baðlanacak: <i>(seçimli,herbir adresi yeni "
 "satýrda girin.)</i>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "Tümü"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Dizin(ler)deki bütün iletiler kaybolacaktýr!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Dizin(ler)deki bütün iletiler bir tane MBOX dosyasina indirilecektir:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -396,49 +410,58 @@
 "\"%s\" dizinindeki %s günden daha eski olan bütün iletiler kalýcý olarak "
 "silinecektir."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:63
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "%s aydan daha eski olan bütün eski baðlý ekler silinecektir. "
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "%s aydan daha eski olan bütün gönderilmiþ posta dizinleri silinecek."
 
 #: acl.php:85
-#, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
 "'%s' dizinindeki bütün haklar %s kullanýcýsý için baþarýyla kaldýrýlmýþtýr."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Süzgeç kurallarý herhangi bir posta kutusuna uygulansýn mý? "
 
-#: lib/MIME/Viewer/alternative.php:113
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Bu bölüm için öteki ekler:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "Her zaman"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Her zaman ekleri sakla"
 
-#: lib/Message.php:481
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr "Ek çýkartýlmaya çalýþýlýrken bir hata meydana geldi. IMAP sunucu: "
 
-#: lib/Message.php:375
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Yeni görev yaratýlýrken bilinmeyen bir hata meydana geldi."
+
+#: lib/Message.php:387
 msgid "An unknown error occured while creating the new task."
 msgstr "Yeni görev yaratýlýrken bilinmeyen bir hata meydana geldi."
 
-#: message.php:490 mailbox.php:677 templates/message/navbar_navigate.inc:9
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -457,27 +480,19 @@
 msgid "Apply Filters to %s"
 msgstr "%s için Süzgeçleri Uygula"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Günlük kayýtlar sýrasýnda süzgeç kurallarý uygulansýn mý?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Süzgeç kurallarý GELEN KUTUSU her görüntülendiðinde uygunlansýn mý?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Devam etmek istediðinize EMÝN misiniz?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Devam etmek istediðinize kesinlikle emin misiniz?"
-
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Bu açýk anahtarý silmek istediðinize emin misiniz?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -488,8 +503,7 @@
 msgid "Are you sure you want to do this?"
 msgstr "Bunu yapmak istediðinizden emin misiniz?"
 
-#: message.php:398 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:68
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Bu iletileri KALICI olarak silmek istediðizden emin misiniz?"
 
@@ -501,7 +515,12 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Bu dizini boþaltmak istediðinizden emin misiniz?"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Çöp kutunuzu boþaltmak istediðinizden emin misiniz?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Çöp kutunuzu boþaltmak istediðinizden emin misiniz?"
 
@@ -509,82 +528,81 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Bu iletileri kalýcý olarak silmek istediðinizden emin misiniz?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Bu iletiyi temiz olarak rapor etmek istediðinizden emin misiniz?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr ""
 "Bu iletiyi istenmeyen ileti olarak rapor etmek istediðinizden emin misiniz?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Geliþ Zamaný"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Artan"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Sor"
 
-#: templates/compose/compose.inc:509
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Ekle"
 
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:475
 msgid "Attach Files"
 msgstr "Dosya Ekle"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "PGP açýk anahtarýnýz iletinize eklensin mi?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "Dosya Ekle:"
 
-#: lib/Compose.php:366 lib/Compose.php:453
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 "Eklenmek istenen dosya \"%s\" ek boyut limitini aþýyor.Dosya EKLENMEYECEK "
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Ekteki sizin takvim isteðinize yanýttýr."
 
-#: mailbox.php:711 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Ek Olarak"
 
-#: compose.php:987 lib/Message.php:442
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
 msgstr "Ek bölündü: Özgün ek türü"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:1009
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Ekler"
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Katýlýmcýlar"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Uyarý"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Gerekli IMAP uzantýsý bulunamadý."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -596,7 +614,7 @@
 msgid "Available Address books:"
 msgstr "Mevcut Adres Defteri:"
 
-#: lib/MIME/Viewer/itip.php:671
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr "Yanýt Bekliyor"
 
@@ -605,30 +623,43 @@
 msgid "Bac_k to %s"
 msgstr "_Geri dön %s"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Geri dön %s"
 
-#: message.php:257 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Gizli K. K."
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Durum bilgi iletisinin ham metin hali aþaðýdadýr."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Kara Liste"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Özellikle istenmemiþse HTML iletilerinin içindeki görüntüler engellensin mi?"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Ýçerik"
 
@@ -637,27 +668,27 @@
 msgid "Both"
 msgstr "Her Ýkisi"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
 msgstr "Baþlýk Bilgileri ve Ýleti Ýçeriðinin her ikiside"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "Karakter _Seti"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Takvim"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "Uzaktaki elektronik posta sunucusuna baðlanýlamýyor."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "Uzaktaki elektronik posta sunucusuna baðlanýlamýyor: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -666,15 +697,16 @@
 "Görüntülenemiyor - Þu andaki posta kutusunda iletinin sadece %s/%s parçasý "
 "bulundu."
 
-#: templates/contacts/contacts.inc:253 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:127 templates/pgp/passphrase.inc:32
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Ýptal"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Ýletiden Vazgeç"
 
@@ -683,28 +715,34 @@
 msgstr ""
 "Bu iletiyi iptal etmek,içeriðinin kalýcý olarak yok olmasina yol açacaktýr."
 
-#: message.php:256 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Karbon Kopya"
 
-#: lib/MIME/Viewer/itip.php:653
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
 msgstr "Baþkan"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Deðiþtir"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Tümünü Deðiþtir"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Dizini Deðiþtir"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -724,23 +762,23 @@
 "Ýnsanlarýn gönderdiðiniz elektronik postalarý okurken ve cevaplarken "
 "görecekleri adýnýzý,adresinizi ve imzanýzý deðiþtirin."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
 msgstr "Görüntülenecek Karakterler:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Dizini Yeni Posta için Denetle"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Hepsini _Denetle/Hiçbirini Denetleme"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Posta almak istediðiniz elektronik posta sunucularýný seçin"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Ýleti göndermeden önce yazým denetimi uygulansýn mý?"
 
@@ -748,11 +786,17 @@
 msgid "Choose Action:"
 msgstr "Ýþlem Seç"
 
-#: config/servers.php.dist:194
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Elektronik posta sunucu seçin:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:683
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Lütfen kutunun içinden saða doðru seçim yada düzenleme yapýn:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
 msgstr "Eylem seçin:"
 
@@ -764,18 +808,18 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Adresleri açarken aranacak adres defterini seçin."
 
-#: lib/MIME/Viewer/images.php:109
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Tarayýcýnýzýn gösterebileceði bir biçime çevirmek için %s üzerine týklayýn."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Görüntü dosyasýný indirmek için %s üzerine týklayýn."
 
-#: lib/Filter.php:113
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "%s yönetim sayfasýna gitmek için %s üzerine týklayýn."
@@ -785,27 +829,23 @@
 msgid "Click %s to view HTML content in a separate window."
 msgstr "HTML içeriðini ayrý bir pencerede görmek için %s üzerine týklayýn."
 
-#: lib/MIME/Viewer/images.php:160
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Bu görüntünün minyatür halini görmek için %s üzerine týklayýn."
 
-#: lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/pkcs7.php:418
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Eki ayrý bir pencerede görmek için %s üzerine týklayýn."
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 "Bu çoklu/ilgili parçayý ayrý bir pencerede görmek için %s üzerine týklayýn."
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Click here to HIDE the Images"
-msgstr "Görüntüleri SAKLAMAK için buraya týklayýn"
-
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
 msgstr "Resimleri GÖSTERMEK için buraya týklayýn"
 
@@ -817,48 +857,48 @@
 "Seçilmiþ adres defterlerinizden birine týklayýn ve bütün alanlarý aramak "
 "için seçin."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "PGP Açýk Anahtarýnýzý adres defterine saklamak için týklayýn"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "%s S/MIME onay belgesini adres defterinize saklamak için týklayýn."
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Adreslere týklamak, gönderene kiþiye yeni bir ileti oluþturacaktýr"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
 msgstr "Adreslere týklamak,iletinin okunmak için açýlmasýný saðlayacaktýr."
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Kapat"
 
-#: compose.php:762 compose.php:1068
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Pencereyi kapat"
 
-#: folders.php:383
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Dizini Kapat."
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse"
 msgstr "Daralt"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Hepsini Daralt"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Bütün Dizinleri Daralt"
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Dizini Daralt"
 
@@ -866,32 +906,23 @@
 msgid "Color Indicator: "
 msgstr "Renk Göstergesi: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Açýklama"
 
-#: lib/MIME/Viewer/itip.php:721
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
 msgstr "Tamamlandý"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Oluþtur"
-
-#: mailbox.php:741 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Ýleti Oluþtur (%s)"
-
-#: compose.php:761 compose.php:1067
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Baþka bir ileti oluþtur"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Ýletiyi yeni pencerede oluþturmak ister misiniz?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -899,29 +930,38 @@
 "Varsayýlan olarak iletileri HTML kullanýcý arabirimiyle oluþturmak ister "
 "misiniz?(Eðer tarayýcýnýz bu özelliði destekliyorsa)"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Ýletilerin nasýl görüntüleneceðini yapýlandýrýn"
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Postalarýn önizleme seçeneklerini yapýlandýrýn."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Sunucuya baðlantý baþarýsýz"
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Sunucuya baðlantý baþarýsýz"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "%s için PGP desteðini denetle."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "%s için S/MIME desteðini denetle."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -929,7 +969,7 @@
 "Yeni postanýn ,ne zaman denetleneceðini ve yeni postlalarýn size bildirilip "
 "bildirilmeyeceðinikontol edin"
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
 msgstr ""
 "Metin duygu simgelerini görüntüsel duygu simgelerine dönüþtürmek ister "
@@ -939,51 +979,59 @@
 msgid "Copy"
 msgstr "Kopyala"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Dizini Kopyala"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Düzelt"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Düzeltilmiþ metin"
 
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "VFS son aþamasý yaratýlamadý: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "VFS son aþamasý yaratýlamadý: %s"
 
-#: lib/Message.php:624
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "%s içindeki iletiler silinemedi. Sunucu: %s"
 
-#: lib/Session.php:294
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
 msgstr "Bakým iþlemleri yürütülemedi."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Ýstenen dosya MS-TNEF ekinden seçip çýkartýlamadý."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Istenen dosya Zip arþivinden seçip çýkartýlamadý."
 
-#: search.php:356 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "Yarat"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Dizin Yarat"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Anahtar Yarat"
 
@@ -991,11 +1039,21 @@
 msgid "Create Virtual Folder"
 msgstr "Sanal Dizin Yarat"
 
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Diðer Posta Hesaplarý"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Yeni çöp kutusu yarat"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Yeni taslak dizini yarat"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Yeni gönderilmiþ posta dizini yarat"
 
@@ -1003,7 +1061,7 @@
 msgid "Create a new trash folder"
 msgstr "Yeni çöp kutusu yarat"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1011,12 +1069,21 @@
 "Gelen postalarýnýzý düzenlemek, dizinlerin içine atmak ve istenmeyen "
 "iletileri silmek için süzgeç kurallari yaratýn."
 
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Yeni gönderilmiþ posta dizini yarat"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "%s için yürürlükteki eriþim"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
 "Diðer elektronik posta hesaplarýnýzdan postalarýn getirilmesini "
@@ -1031,56 +1098,75 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "%s giriþinde çalýþacak görevleri kiþiselleþtirin"
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Tari_h"
 
-#: message.php:253 thread.php:75
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Tarih"
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:263
 msgid "Declined: "
 msgstr "Reddedildi"
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Sil"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Varsayilan sýralama ölçütü:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Varsayýlan sýralama yönü:"
 
-#: lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
 msgstr "Yetkili"
 
-#: folders.php:374 templates/fetchmail/manage.inc:68
+#: folders.php:419 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "%s Açýk Anahtarýný Sil"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Yürürlükteki Anahtarlarý Sil"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Dizini Sil"
 
-#: folders.php:374
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Dizini Sil"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Sanal Dizini Sil"
+
+#: folders.php:419
 msgid "Delete Virtual Folder"
 msgstr "Sanal Dizini Sil"
 
@@ -1088,25 +1174,24 @@
 msgid "Delete fetched messages from remote server?"
 msgstr "Uzaktaki sunucudan getirilen iletileri sil"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
 msgstr "Takvimimden sil"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Eski baðlý ekler ay baþýnda silinsin mi?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Eski gönderilmiþ posta dizinleri ay baþýnda silinsin mi?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr ""
-"Ýstenmeyen iletiler, istenmeyen ileti olarak rapor edildikten sonra silinsin "
-"mi?"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Silinecek Ýletiler"
 
-#: message.php:493 mailbox.php:701 templates/mailbox/navbar.inc:20
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Silinecek"
@@ -1115,7 +1200,7 @@
 msgid "Deleted messages"
 msgstr "Silinecek Ýletiler"
 
-#: compose.php:292
+#: compose.php:307
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Ek \"%s\" silindi."
@@ -1124,77 +1209,86 @@
 msgid "Deleting and Moving Messages"
 msgstr "Ýletilerin Silinmesi ve Taþýnmasý"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Ýsteði reddet"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
 msgstr "Serbest/meþgul bilgi isteklerini reddet"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Azalan"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:623
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Açýklama"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Ayrýntýlar"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Ýmzalar gizlesin mi?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Göster"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Ýleti gönderdikten sonra doðrulama görüntülensin mi?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Ýletinin içinde görüntülensin"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Yeni ileti bilgisi beliren hatýrlatma olarak görüntülensin mi?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "'Boþ Çöp Kutusu' baðlantýsý menü çubuðunda görüntülensin mi?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "'Boþ Çöp Kutusu' baðlantýsý menü çubuðunda görüntülensin mi?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Düzen"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "Eþleþmeyen"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Dizini Yeni Posta için Denetleme"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
 msgstr "Gelen: kolonunda baðlantý yaratma"
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Dizini açmak istiyor musunuz?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Bitti"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr ".Zip Biçiminde indir:%s"
@@ -1203,25 +1297,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Bütün Ekleri (.zip dosyasý olarak) indir"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Dizini Ýndir"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Dizini Ýndir [.zip Biçiminde]"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
 msgstr ".Zip biçiminde indir"
 
-#: message.php:491 mailbox.php:682 templates/message/navbar_navigate.inc:11
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Taslak"
 
-#: folders.php:354
+#: folders.php:392
 msgid "Draft folder"
 msgstr "Taslak Dizini"
 
@@ -1229,28 +1323,32 @@
 msgid "Drafts folder:"
 msgstr "Taslaklar Dizini:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Elektronik Posta Adresi"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "VE"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "HATA: Ýletininiz teslim edilemedi."
 
-#: folders.php:375
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Düzenle"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Kara Listeyi Düzenle"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Süzgeçleri Düzenle"
 
-#: folders.php:375 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:420 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
 msgstr "Sanal Dizinleri Düzenle"
 
@@ -1259,89 +1357,104 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "%s için Sanal Dizin Tanýmýný Düzenle"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Beyaz Listeyi Düzenle"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Kara Listenizi Düzenleyin"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Süzgeç Kurallarýnýzý Düzenleyin"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Diðer posta hesaplarýna eriþim için tercihlerinizi düzenleyin."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Beyaz Listenizi Düzenleyin"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Elektronik Posta Adresi"
 
-#: lib/Message.php:641
+#: lib/Message.php:657
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "%s içindeki tüm iletiler boþaltýldý."
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Boþ Dizin(ler)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Boþ Dizin(ler)"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Çöp Kutusunu Boþalt"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Çöp Kutusunu _Boþalt"
+
+#: lib/IMP.php:966
 msgid "Empty _Trash"
 msgstr "Çöp Kutusunu _Boþalt"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "PGP iþlevi etkinleþtirilsin mi?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "S/MIME iþlevi etkinleþtirilsin mi?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
 msgstr "Ýleti önizleme etkinleþtirilsin mi?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
 msgstr "Þi_freleme Seçenekleri"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:611
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Son"
 
-#: lib/Compose.php:331
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Ýletilen iletinin sonu"
 
-#: lib/Compose.php:272
+#: lib/Compose.php:341
 msgid "End message"
 msgstr "Ýletiyi bitir"
 
-#: lib/Compose.php:270
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
 msgstr "%s den iletiyi bitir"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Geçiþ Tümcesini Girin"
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Yeni çöp kutusunun adýný girin"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Yeni taslak dizinin adýný girin"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Yeni gönderilmiþ posta dizininin adýný girin"
 
@@ -1349,85 +1462,100 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Yeni çöp kutusunun adýný girin"
 
-#: message.php:185 compose.php:1054
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Iletiyi Yönlerdir"
+
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" kayýtý baþarýyla adres defterine eklendi"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:392
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Hata"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Yanýtý göndermede hata: %s."
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
 msgid "Event successfully deleted."
 msgstr "Olay baþarýyla silindi."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Her 15 dakika"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Her 30 saniye"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Her 5 dakika"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Her yarým saat"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Her dakika"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand"
 msgstr "Geniþlet"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Hepsini Geniþlet"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Bütün Dizinleri Geniþlet"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Dizini Geniþlet"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Ýsimleri Göster"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 "Ýleti oluþturma penceresinde isimler özdevinimli olarak artalanda açýlsýn mý?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Bütün dizin aðacýný varsayýlan olarak geniþlet"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Geniþletiliyor"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Posta Getir"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Posta Getir"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "Posta Ayrý Bir Pencerede Getirilsin mi?"
 
@@ -1435,64 +1563,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Giriþ sýrasýnda iletiler getirilsin mi?"
 
-#: lib/Fetchmail.php:306 php-format
-msgid "Fetched %d message(s) from %s"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "%s konumundan %d ileti getirildi"
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
 msgstr "%s konumundan %d ileti getirildi"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
 msgstr "Posta Getir:"
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
 msgstr "Posta Getir: Yeni ileti yok."
 
-#: lib/IMP.php:916
+#: lib/IMP.php:990
 msgid "Fi_lters"
 msgstr "Sü_zgeçler"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "Dosya"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Süzgeç Seçenekleri"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Süzgeç Ayarlarý"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "Ýletiler küfür için süzülsün mü?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Süzgeç destegi bu sistemde seçilir kýlýnmamýþtýr."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Süzgeçler"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Süzgeçler etkin DEÐÝL"
 
-#: lib/Filter.php:112
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Süzgeçler: %s yönetim sayfasý"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Bul"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
 msgstr "Ýlk Posta Kutusu Sayfasý"
 
-#: mailbox.php:334
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Ýlk Sayfa"
 
@@ -1500,16 +1634,16 @@
 msgid "Fo_rward"
 msgstr "Ýle_t"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Dizin Dolaþýmý"
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Dizin Ön eki"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Dizin Özeti"
@@ -1518,70 +1652,70 @@
 msgid "Folder sharing is not enabled."
 msgstr "Dizin paylaþýmý seçilir kýlýnmamýþ."
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
 msgstr "Dizin kullanýmý seçilir kýlýnmamýþ."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Posta kutusundaki ileti tarihlerinin biçimi bugüne tarihlenmiþ"
 
-#: compose.php:714 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Ýlet"
 
-#: compose.php:699
+#: compose.php:765
 msgid "Forward:"
 msgstr "Ýlet:"
 
-#: lib/Compose.php:300
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Ýletilen Ýleti"
 
-#: lib/Compose.php:298
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "%s tarafýndan iletilen ileti"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
 msgstr "Serbest/Meþgul Bilgi"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr "Serbest/Meþgul Yanýt"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
 msgstr "Serbest/Meþgul Ýstek"
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
 msgstr "Serbest/Meþgul Ýstek Yanýtý"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "Kim_den"
 
-#: message.php:254 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Kimden"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "Gelen Adres"
 
-#: compose.php:711 compose.php:715
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Ýlet:"
 
-#: compose.php:1215
+#: compose.php:1294
 msgid "Fwd: "
 msgstr "Ýlet:"
 
-#: compose.php:1217
+#: compose.php:1296
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Ýlet: %u Ýletilen Ýleti"
@@ -1595,29 +1729,39 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Sadece yeni ileti al (Sadece IMAP)"
 
-#: thread.php:68
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Ýletiye git"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Adres defterine (%s) ekle"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr "Eriþim ver"
 
-#: message.php:546 lib/Filter.php:112 lib/MIME/Viewer/images.php:98
-#: lib/MIME/Viewer/images.php:105 lib/MIME/Viewer/images.php:107
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/html.php:116
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/related.php:64 lib/MIME/Viewer/pkcs7.php:414
-#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "BURAYA"
 
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:243
+#: compose.php:256
 msgid "HTML Version of Message"
 msgstr "Ýletinin HTML Sürümü"
 
@@ -1629,99 +1773,118 @@
 msgid "Here is the message you were composing:"
 msgstr "Oluþturuyor olduðunuz ileti:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Gizli"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
 msgstr "Haber Öbeði Görüntüsünün içinde Gizle"
 
-#: mailbox.php:356
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Silinecekleri Gi_zle"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Üye Olunmayanlarý Gizle"
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Hide the Images"
-msgstr "Görüntüleri Gizle"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Yüksek"
 
-#: message.php:288 mailbox.php:687 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Yüksek Öncelik"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "En yüksek"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Ekleri nasýl görüntülemek istiyorsunuz?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Yanýtlarda alýntý yapýlan satýrlarýn niteliði"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Ýletiþim Kurallarýný Özdevinimli olarak Bul)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "SSL üzerinden IMAP"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "SSL üzerinden IMAP (kendinden imzalý onay belgesi)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
 msgstr "SSL üzerinden IMAP (kendinden imzalý)"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Baðlanýlacak elektronik posta sunucu türü:"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, TLS yok"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 Elektronik Posta Sunucularý"
 
-#: folders.php:346
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "GELEN KUTUSU"
 
-#: templates/compose/spelling.inc:88
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Dizin(ler)deki bütün iletiler kaybolacaktýr!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Yoksay"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Tümünü yoksay"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "(Ýçeri) Aktar"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "(Ýçeri) Aktarma Anahtarý"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "(Ýçeri) Aktarma Anahtar Ýkilisi"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Ýletileri (Ýçeri) Aktar"
 
@@ -1729,8 +1892,9 @@
 msgid "Import PGP Key"
 msgstr "PGP Anahtarýný (Ýçeri) Aktar"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
 msgstr "Kiþisel Onay belgelerini (Ýçeri) Aktar"
 
 #: templates/pgp/import_key.inc:14
@@ -1745,7 +1909,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Kiþisel S/MIME Onay Belgelerini (Ýçeri) Aktar"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Açýk Anahtarý (Ýçeri) Aktar"
 
@@ -1770,7 +1934,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "%s mbox dosyasýný %s dizinine (içeri) aktar"
 
-#: message.php:492 mailbox.php:695 templates/message/navbar_navigate.inc:7
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1780,46 +1944,47 @@
 msgid "Important messages"
 msgstr "Önemli Ýletiler"
 
-#: folders.php:157
+#: folders.php:167
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d ileti %s konumundan (içeri) aktarýldý."
 
-#: lib/MIME/Viewer/itip.php:725
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr "Sürüyor"
 
-#: lib/Folder.php:248 lib/IMP.php:368
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
 msgstr "Gelen Kutusu"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Baþlýk bilgilerinin kýsa bir özeti yanýta eklensin mi?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Özgün ileti yanýta eklensin mi?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Bilgi"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "%s Açýk Anahtarý Hakkýnda Bilgisi"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Kiþisel Özel Anahtar Hakkýnda Bilgi"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Kiþisel Açýk Anahtar Hakkýnda Bilgi"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "Metine Gömülü"
 
@@ -1839,19 +2004,19 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Açýk PGP Anahtarýný Buraya Yerleþtir"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
 msgstr "Bu bileþen için geçersiz bir eylem seçildi."
 
-#: mailbox.php:555 mailbox.php:596
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
 msgstr "Geçersiz Adres"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Geçersiz Uzak Elektronik Posta Kutusu"
 
-#: compose.php:132
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Elektronik Posta adresinde geçersiz karakter: %s."
@@ -1872,44 +2037,60 @@
 msgid "Invert"
 msgstr "Ters Çevir"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Anahtar Uzunluðu"
 
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr "Anahtar baþarýyla açýk anahtar sunucusuna gönderildi."
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Dil"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
 msgstr "Son Posta Kutusu Sayfasý"
 
-#: mailbox.php:347
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Son Sayfa"
 
-#: templates/compose/compose.inc:380
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
 msgstr "Ekleri _Baðla"
 
-#: attachment.php:34 lib/Compose.php:999
+#: attachment.php:34 lib/Compose.php:1063
 msgid "Linked attachments are forbidden."
 msgstr "Baðlanmýþ ekler yasaklanmýþtýr."
 
-#: lib/Compose.php:1016
+#: lib/Compose.php:1080
 #, php-format
 msgid "Links will expire on %s"
 msgstr "%s tarihinde baðlarýn süresi dolacak"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1918,7 +2099,7 @@
 "mi? (Eðer  seçilmez kýlýnmýþsa, sadece açýkça aradýðýnýz iletiþim "
 "noktalarýný göreceksiniz. "
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Baþlýkta Listeleme"
 
@@ -1926,20 +2107,20 @@
 msgid "Local Mailbox:"
 msgstr "Yerel Posta Kutusu:"
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
 msgstr "Yer"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "Giriþ"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "%s Giriþi"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "Giriþ"
 
@@ -1947,27 +2128,27 @@
 msgid "Login Tasks"
 msgstr "Giriþ Görevleri"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Düþük"
 
-#: message.php:290 mailbox.php:690 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Düþük Öncelik"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "En düþük"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Macintosh Dosyasý"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Posta"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Posta Önizleme"
 
@@ -1975,19 +2156,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Baðlanýlacak elektronik posta sunucu türü:"
 
-#: folders.php:364
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Posta Kutusu"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Posta Kutusu ve Dizin Görüntüleme Seçenekleri"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Dizindeki Bütün Ýletileri Okunmuþ Olarak Ýþaretle "
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Dizindeki Bütün Ýletileri Okunmamýþ Olarak Ýþaretle"
 
@@ -1995,7 +2176,7 @@
 msgid "Mark as:"
 msgstr "Ýþaretle:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Farklý düzeydeki alýntýlar farklý renklerle iþaretlensin mi?"
 
@@ -2003,7 +2184,7 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Ýletiler görülmüþ olarak iþaretlensin mi?(Sadece IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
 msgstr "Basit biçimleme iþaretlensin mi?"
 
@@ -2015,39 +2196,44 @@
 msgid "Match Any Query"
 msgstr "Herhangi Bir Sorguyla Eþleþ"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
 msgstr "En Büyük Ek Boyutu"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+#, fuzzy
+msgid "Maximum Number of Folders"
+msgstr "En fazla ek sayýsýna ulaþýldý."
+
+#: templates/compose/compose.inc:494
 msgid "Maximum number of attachments reached."
 msgstr "En fazla ek sayýsýna ulaþýldý."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:489
 msgid "Maximum total attachment size reached."
 msgstr "En büyük ek boyutuna ulaþýldý."
 
-#: lib/MIME/Viewer/itip.php:582
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
 msgstr "Toplantý Ýptali"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
 msgstr "Toplantý Bilgisi"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
 msgstr "Toplantý Önerisi"
 
-#: lib/MIME/Viewer/itip.php:573
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Toplantý Yanýtý"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
 msgstr "Toplantý Güncellemesi"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
 msgstr "Toplantý Güncelleme Ýsteði"
 
@@ -2055,43 +2241,39 @@
 msgid "Menu Folder List"
 msgstr "Dizin Liste Menüsü"
 
-#: lib/Compose.php:247
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Ýleti"
 
-#: compose.php:519 compose.php:546 compose.php:578 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Ýleti Oluþturma"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Ýleti Tarihi"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Ýleti Seçenekleri"
 
-#: search.php:354
+#: search.php:312
 msgid "Message Search"
 msgstr "Ýleti Arama"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Ýleti Boyutu"
 
-#: message.php:375
+#: message.php:384
 msgid "Message Source"
 msgstr "Ýleti Kaynaðý"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Ýleti Görünümü"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Ýleti alanlarý"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Ýleti iþaretleri"
@@ -2100,33 +2282,48 @@
 msgid "Message folders"
 msgstr "Ýleti dizinleri"
 
-#: lib/Compose.php:245
+#: lib/Compose.php:329
 #, php-format
 msgid "Message from %s"
 msgstr "%s den ileti"
 
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Eþleþen iletiler"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Ýleti alanlarý"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Ýleti alanlarý"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Eþleþen iletiler"
 
-#: compose.php:758 compose.php:772
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
 msgstr "Ýleti baþarýyla yönlendirilmiþtir."
 
-#: compose.php:1004
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Ýleti baþarýyla gönderildi, fakat %s içine kaydedilemedi."
 
-#: compose.php:1063 compose.php:1078
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "Ýleti baþarýyla gönderildi."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Posta kutusu görüntüsünde sayfa baþýna ileti"
 
-#: mailbox.php:311
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Ýletileri"
 
@@ -2135,8 +2332,8 @@
 msgstr "Deðiþtir"
 
 #: templates/compose/expand.inc:12
-#, php-format
-msgid "More than one address found for field '%s'."
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
 msgstr "Alan '%s' için birden fazla adres bulundu."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2147,7 +2344,11 @@
 msgid "Move down"
 msgstr "Aþagý Taþý"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Dizine taþý"
 
@@ -2155,16 +2356,26 @@
 msgid "Move up"
 msgstr "Yukarý taþý"
 
-#: lib/MIME/Viewer/alternative.php:130
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Çok Parçalý/Seçenekli"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Ýleti Görünümü"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "NOT"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "NOT"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:640
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Ad"
 
@@ -2172,36 +2383,46 @@
 msgid "Name and/or email can not be empty"
 msgstr "Ad ve/veya elektronik posta boþ olamaz"
 
-#: lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
 msgstr "Eylem Gerekiyor"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Asla"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Ekleri asla saklama"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Yeni"
 
-#: lib/IMP.php:578
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Yeni Dizin"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Yeni Posta"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Sonraki Ýleti"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Yeni iletiler"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Yeni iletiler"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Sonraki"
 
@@ -2209,11 +2430,11 @@
 msgid "Next Message"
 msgstr "Sonraki Ýleti"
 
-#: mailbox.php:345
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Sonraki Sayfa"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "Hayýr"
 
@@ -2225,11 +2446,11 @@
 msgid "No Encryption"
 msgstr "Þifreleme Yok"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Anahtar zincirinde anahtar yok"
 
-#: mailbox.php:364
+#: mailbox.php:375
 #, php-format
 msgid "No Messages"
 msgstr "Ýleti Yok"
@@ -2238,11 +2459,16 @@
 msgid "No PGP public key imported."
 msgstr "Hiçbir PGP Açýk Anahtarý (içeri) aktarýlamadý"
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Kiþisel Onay Belgesi Bulunmamaktadýr"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Önizleme"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Açýk Anahtar Bulunamadý"
 
@@ -2250,35 +2476,40 @@
 msgid "No S/MIME public key imported."
 msgstr "Hiçbir S/MIME açýk anahtarý (içeri) aktarýlamadý."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Hiçbir ek bulunamadý."
 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "%s Açýk Anahtarý Hakkýnda Bilgisi"
+
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
 msgstr "Hiçbir dizin seçili deðil."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
 msgstr "Hiçbir dizin yeni posta için denetlenemedi."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Hiçbir dizin belirtilmedi"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
 msgstr "Hiçbir dizinde yeni ileti yok"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
 msgstr "Hiçbir dizinde görülmemiþ ileti yok"
 
-#: lib/Compose.php:241
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "Ýleti gövdesinde metin yok"
 
-#: lib/Mailbox.php:368
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
 msgstr "Hiçbir ileti aramanýzla eþleþmedi."
 
@@ -2294,33 +2525,37 @@
 msgid "No personal S/MIME certificates imported."
 msgstr "Hiçbir kiþisel S/MIME onay belgesi (içeri) aktarýlamadý."
 
-#: spelling.php:213
+#: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Hiçbir yazým denetim programý yapýlandýrýlmamýþ."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Yazým hatasý yok"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Öneri yok"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 msgid "No user specified."
 msgstr "Kullanýcý belirtilmedi."
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr "Katýlýmcý Deðil"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:5
-#: lib/MIME/Viewer/itip.php:618
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Hiçbiri"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Olaðan"
 
@@ -2342,8 +2577,7 @@
 msgid "Not Personal"
 msgstr "Kiþisel Deðil"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:152 lib/Crypt/SMIME.php:158
-#: lib/Crypt/SMIME.php:167
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Geçerli bir açýk anahtar deðil."
 
@@ -2355,27 +2589,31 @@
 msgid "Not important messages"
 msgstr "Önemsiz iletiler"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Bu biraz zaman alabilir"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr ""
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Eðer aylýk olarak siliniyorsa, eski baðlý eklerin saklanacaðý ay sayýsý."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Eðer aylýk olarak siliniyorsa, eski gönderilmiþ posta dizinlerinin "
 "saklanacaðý ay sayýsý."
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:685
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "Evet"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "VEYA"
@@ -2384,47 +2622,48 @@
 msgid "Old messages"
 msgstr "Eski Ýletiler"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Eksi gönderilmiþ posta dizinleri silinecek."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
 msgid "Only display folders with unread messages in them?"
 msgstr "Sadece okunmamýþ ileti içeren dizinler görüntülensin mi?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
 msgstr "Bu eylem için sadece bir dizin seçilmelidir."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "Dizi_n Aç"
-
-#: templates/menu.inc:24
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Dizin Aç"
 
-#: folders.php:381
+#: folders.php:427
 msgid "Opened Folder"
 msgstr "Görüntülenen Dizin"
 
-#: lib/MIME/Viewer/itip.php:657
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
 msgstr "Seçimli Katýlýmcý"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Diðer Posta Hesaplarý"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Diðer Seçenekler"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
@@ -2432,19 +2671,15 @@
 msgid "PGP Encrypt Message"
 msgstr "PGP ile Þifrelenmiþ Ýleti"
 
-#: compose.php:343
+#: compose.php:358
 msgid "PGP Error: "
 msgstr "PGP Hatasý: "
 
-#: compose.php:322
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP Hatasý: Kiþisel özel anahtar için geçiþ tümceciði gerekmektedir."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP Etkin DEÐIL"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP Seçenekleri"
 
@@ -2452,13 +2687,13 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP Geçiþ Tümceciði Giriþi"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 "PGP Kiþisel Anahtar Ýkilisi desteði güvenli bir web baðlantýsý "
 "gerektirmektedir. "
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
 msgstr "PGP Açýk Anahtar Metni"
 
@@ -2472,7 +2707,7 @@
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "\"%s\" PGP Açýk Anahtarý baþarýyla silindi."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP Açýk Anahtar Zinciri"
 
@@ -2492,54 +2727,55 @@
 msgid "PGP public key successfully added."
 msgstr "PGP açýk anahtarý baþarýyla eklendi."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP desteði bu sistemde seçilemez kýlýnmýþtýr."
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 "PGP desteði yürürlükte deðil bu nedenle sayýsal imza doðrulanamaktadýr."
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "PGP desteði yürürlükte deðil bu nedenle iletinin þifresi çözülememektedir"
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
+#, fuzzy
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "PGP desteði beliren pencereleri kullanmak istemektedir. Eðer tarayýcýnýz "
 "beliren pencereleri seçimsiz kýldýysa, bu ayarý deðiþtirmelisiniz, aksi "
 "taktirde PGP özellikleridoðru çalýþmayacaktýr"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Ýletiþim Kurallarýný Özdevinimli Algýla)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "SSL üzerinden POP3"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "SSL üzerinden SSL (kendinden imzalý onay belgesi)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr "SSL üzerinden POP3 (kendinden imzalý)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3,TLS yok"
 
@@ -2548,11 +2784,11 @@
 msgid "Page %d of %d"
 msgstr "Sayfa %d - %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
 msgstr "Ýlk Okunmamýþ Ýletinin Bulunduðu Sayfa"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
 msgstr "Son Okunmamýþ Ýletinin Bulunduðu Sayfa"
 
@@ -2560,11 +2796,11 @@
 msgid "Part(s)"
 msgstr "Bölüm(ler)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Geçiþ Tümceciði"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Geçiþ Tümceciði (Tekrar)"
 
@@ -2572,7 +2808,7 @@
 msgid "Passphrase successfully unloaded."
 msgstr "Geçiþ Tümceciði baþarýyla çýkartýldý."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Geçiþ Tümceciði:"
 
@@ -2584,8 +2820,8 @@
 msgid "Passphrases do not match"
 msgstr "Geçiþ Tümcecikleri eþleþmemektedir"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Parola"
 
@@ -2597,7 +2833,7 @@
 msgid "Permissions for this user can not be changed."
 msgstr "Bu kullanýcýnýn izinleri deðiþtirilemez."
 
-#: message.php:483 mailbox.php:666 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Kiþisel"
@@ -2622,23 +2858,30 @@
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Kiþisel S/MIME anahtarlarý baþarýyla silindi."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Ýmzanýz yanýtlardan ve iletileceklerden önce yerleþtirilsin mi?"
 
-#: compose.php:241
+#: compose.php:254
 msgid "Plaintext Version of Message"
 msgstr "Ýletinin Düz Metin Sürümü"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Lütfen yeni posta kutusu için bir ad girin:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Lütfen yeni dizin için bir ad girin:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Lütfen yeni adý girin:"
 
@@ -2660,7 +2903,7 @@
 "Lütfen S/MIME özel anahtarýnýz için geçiþ tümceciðini girin.Bu geçiþ "
 "tümceciðini her %s oturum için girmeniz gerekecektir."
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2673,19 +2916,19 @@
 "oturum kimlik numaranýzý ele geçirmesini önlemek içindir.Rahatsýzlýk için "
 "özür dileriz."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Lütfen parolanýzý girin."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Lütfen kullanýcý adýnýzý girin."
 
-#: compose.php:80 lib/IMP.php:519
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Lütfen geçersiz yada belirsiz adresleri çözün."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -2693,11 +2936,11 @@
 "Lütfen takip eden bilgiyi gözden geçirin, ardýndan aþaðýdaki menüden bir "
 "eylem seçin."
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Lütfen herhangi bir eylem gerçekleþtirmeden önce bir dizin seçin. "
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
 msgstr "Lütfen aþaðýdaki menüden bir eylem seçin."
 
@@ -2705,24 +2948,19 @@
 msgid "Please select at least one folder to search."
 msgstr "Lütfen arama için en az bir dizin seçin."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Lütfen bu iþlem için sadece bir dizin seçin."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Lütfen kutunun içinden saða doðru seçim yada düzenleme yapýn:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Lütfen saðdakini seçin yada düzenleyin:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Horde Desktekli"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Ýmzanýz öncesinde kesikli çizgi ('--') bulunsun mu?"
 
@@ -2738,11 +2976,11 @@
 msgid "Previous Message"
 msgstr "Önceki Ýleti"
 
-#: mailbox.php:336
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Önceki Sayfa"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Yazdýr"
 
@@ -2750,15 +2988,15 @@
 msgid "Priority"
 msgstr "Öncelik"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Özel Anahtar Parolasý"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Her ek gönderilirken sor; öntanýmlý deðer HAYIR"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Her ek gönderilirken sor; öntanýmlý deðer EVET"
 
@@ -2766,7 +3004,7 @@
 msgid "Protocol:"
 msgstr "Ýletiþim Kurallarý:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Açýk PGP anahtar sunucusu desteði seçilemez kýlýndý."
 
@@ -2778,32 +3016,31 @@
 msgid "Purge Deleted"
 msgstr "Silinecekleri Temizle"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Dizin(ler)i Temizle"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Çöp Kutusu temizleme sýklýðý:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Bu kadar günden daha eski çöp kutusundaki iletileri temizle."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Çöp kutusundaki eski iletiler temizlensin mi?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
-#, php-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
 msgstr "%d ileti Çöp Kutusundan temizleniyor."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Posta gönderirken varsayýlan adres uzantýsý olarak @ iþaretinin ardýndan "
-"ekle:"
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "%d ileti Çöp Kutusundan temizleniyor."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2820,24 +3057,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Kota Durumu: SINIRSIZ"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Kota %f"
 
-#: templates/compose/compose.inc:377
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
 msgstr "Te_slim Onayi Ýste"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "Tarihinde Gelen"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Tarihinden Sonra Gelen"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Tarihine Kadar Gelen"
 
@@ -2849,27 +3086,27 @@
 msgid "Redirect"
 msgstr "Yönlendir"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Iletiyi Yönlerdir"
 
-#: compose.php:721
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Bu iletiyi yönlendir"
 
-#: compose.php:781
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Yönlendirme baþarýsýz oldu."
 
-#: templates/compose/compose.inc:573
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "Yenile"
 
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Dizini Görünümlerini Yenile:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "Yeniden Yükle"
 
@@ -2877,11 +3114,11 @@
 msgid "Reload View"
 msgstr "Görünümü Yeniden Yükle"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
 msgstr "Serbest/Meþgul bilgiyi hatýrla."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Son görünümü hatýrla"
 
@@ -2889,7 +3126,7 @@
 msgid "Remote Mailbox:"
 msgstr "Uzaktaki Posta Kutusu:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Alaný Aramadan Çýkar"
 
@@ -2897,15 +3134,15 @@
 msgid "Remove source"
 msgstr "Kaynaðý çýkar"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Dizini Yeniden Adlandýr"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Gönderilmiþ-posta dizini ayýn baþýnda yeniden adlandýrýlsýn mý?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -2916,7 +3153,7 @@
 msgid "Repl_y to List"
 msgstr "_Listeyi Yanýtla"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Yerine Koy:"
 
@@ -2924,7 +3161,7 @@
 msgid "Reply"
 msgstr "Yanýtla"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
 msgstr "Yanýt Gönderildi."
 
@@ -2932,7 +3169,7 @@
 msgid "Reply to All"
 msgstr "Herkese Yanýtla"
 
-#: compose.php:670
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Herkese Yanýtla:"
 
@@ -2940,7 +3177,7 @@
 msgid "Reply to List"
 msgstr "Listeye Yanýtla"
 
-#: compose.php:672
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "Listeye Yanýtla:"
 
@@ -2948,107 +3185,106 @@
 msgid "Reply to _All"
 msgstr "He_rkese Yanýtla"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
 msgstr "Desteklenmeyen Ýleti ile Yanýtla"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Gelecek 2 ay için serbest/meþgul ile yanýtla."
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Ýstenen serbest/meþgul bilgisi ile yanýtla."
 
-#: message.php:258
+#: message.php:267
 msgid "Reply-To"
 msgstr "Yanýt-Adresi"
 
-#: lib/Compose.php:260 lib/Compose.php:312
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Yanýt Adresi:"
 
-#: compose.php:668
+#: compose.php:731
 msgid "Reply:"
 msgstr "Yanýtla:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Temiz Olarak Rapor Et"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Ýstenmeyen Ýleti Olarak Rapor Et"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "Okunma _Bilgisi Ýste"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
 msgstr "Teslim Bi_lgisi Ýste"
 
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Okundu alýndýsý istensin mi?"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr "Ýstenen ileti bulunamadý."
 
-#: lib/MIME/Viewer/itip.php:649
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
 msgstr "Gereken Katýlýmcý"
 
 #: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Temizle"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
 msgstr "Karþýlýk Gelen Durum Güncellendi."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Devam Et"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Oturumunuza devam edin"
 
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Ýleti Oluþturma"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 #: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "Posta Getirmeye Dönün"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Posta Tercihleri Ekranýna Dönün"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
 msgstr "Seçeneklere Dönün"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Önceki Ekrana Dönün"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Ýletinin silinmesinden,taþýnmasýndan veya kopyalanmasýndan sonra posta "
 "kutusu listesine dönülsün mü?"
 
-#: lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Görev"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:415
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3056,19 +3292,15 @@
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME Þifrelenmiþ Ýleti"
 
-#: compose.php:379
+#: compose.php:394
 msgid "S/MIME Error: "
 msgstr "S/MIME Hatasý:"
 
-#: compose.php:358
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME Hatasý: Kiþisel özel anahtar için geçiþ tümceciði gerekiyor."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME etkin DEÐÝL"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME Seçenekleri"
 
@@ -3076,7 +3308,7 @@
 msgid "S/MIME Passphrase Input"
 msgstr "S/MIME Geçiþ Tümceciði Giriþi"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "S/MIME Kiþisel Anahtar Ýkilisi desteði güvenli bir web baðlantýsý "
@@ -3091,7 +3323,7 @@
 msgid "S/MIME Public Key successfully added."
 msgstr "S/MIME Açýk Anahtarý baþarýyla eklendi."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "S/MIME Açýk Anahtar Zinciri"
 
@@ -3107,11 +3339,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME Imza/Þifre Mesajý"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "S/MIME desteði bu sistemde seçilemez kýlýnmýþtýr."
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3119,7 +3351,7 @@
 "S/MIME desteði yürürlükte deðil bu nedenle iletinin þifresinin çözülmesi "
 "olanaksýz."
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message can not "
 "be displayed."
@@ -3127,7 +3359,7 @@
 "S/MIME desteði yürürlükte deðil bu nedenle imzalanmýþ ileti "
 "görüntülenemeycektir."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3135,59 +3367,78 @@
 "S/MIME desteði yürürlükte deðil bu nedenle sayýsal imzanýn doðrulanmasý "
 "olanaksýz."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
+#, fuzzy
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME desteði beliren pencereleri kullanmak istemektedir. Eðer tarayýcýnýz "
 "beliren pencereleri seçimsiz kýldýysa, bu ayarý deðiþtirmelisiniz, aksi "
 "takdirde S/MIME özellikleridoðru çalýþmayacaktýr"
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "Ko_nu"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Kopyasini ka_ydet"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "_Farklý Kaydet"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Ekler, ileti ile birlikte gönderilmiþ posta dizinine kaydedilsin mi?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Taslak Kaydet"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Farklý Kaydet"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Seçenekleri Kaydet"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Seçenekleri Kaydet"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
 msgstr "_Taslak Kaydet"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Farklý Kaydet"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Taslaklar görülmemiþ olarak kaydedilsin mi? "
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "Alýcýlar özdevinimli olarak varsayýlan adres defterine kaydedilsin mi?"
 
@@ -3195,16 +3446,17 @@
 msgid "Save search as a virtual folder?"
 msgstr "Aramayý sanal dizin olarak sakla"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Gönderilmiþ posta kaydedilsin mi?"
 
-#: compose.php:1148
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Taslaðýn kaydedilmesi baþarýsýz oldu. Sunucu: %s"
 
-#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Arama"
 
@@ -3213,11 +3465,12 @@
 msgid "Search %s"
 msgstr "Ara: %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Posta Ara"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Seçenekleri Kaydet"
 
-#: search.php:311
+#: search.php:265
 msgid "Search Results"
 msgstr "Arama Sonuçlarý"
 
@@ -3233,7 +3486,7 @@
 msgid "Select Another Account"
 msgstr "Baþka Bir Hesap Seç"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Bir Tarih Seçin"
 
@@ -3241,7 +3494,12 @@
 msgid "Select a field"
 msgstr "Bir Alan Seçin"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Bir Tarih Seçin"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Adres ekleme ve arama için adres defteri kaynaklarýný seçin."
 
@@ -3261,6 +3519,10 @@
 msgid "Select none"
 msgstr "Hiçbiri"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Posta sunucusu türünü seçin"
@@ -3269,32 +3531,33 @@
 msgid "Selected Address books:"
 msgstr "Seçilmiþ Adres Defterleri:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Anahtarý Açýk Anahtar Sunucusuna Gönder"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
 msgstr "Son Bilgileri Gönder"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Gönderen tarafýndan istendiðinde MDN gönderilsin mi?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Ýleti Gönder"
 
-#: folders.php:359
+#: config/prefs.php.dist:703
+#, fuzzy
+msgid "Send read receipt when requested by the sender?"
+msgstr "Gönderen tarafýndan istendiðinde MDN gönderilsin mi?"
+
+#: folders.php:397
 msgid "Sent mail folder"
 msgstr "Gönderilmiþ posta dizini"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Gönderilmiþ posta dizini:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Sunucu"
 
@@ -3311,7 +3574,7 @@
 msgstr ""
 "Ýletileri taþýmanýz yada silmeniz durumundaki tercihlerinizi belirleyin"
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Ýleti oluþtururken X-Priority baþlýðý konsun mu?"
 
@@ -3327,7 +3590,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Diðer kullanýcýlarla posta dizinlerini paylaþ."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3335,15 +3598,15 @@
 "Büyük öbekli alýntý yapýlmýþ satýrlar öntanýmlý olarak gösterilsin yada "
 "gizlensin mi?.Hangisi seçilirse seçilsin diðerine kolaylýkla geçilebilir."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Düz metin iletilerin içeriði PGP verisi için taransýn mý?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Bir taslak kaydedildikten sonra oluþturma penceresi kapansýn mý?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Varsayýlan olarak PGP açýk anahtarý iletinize eklensin mi?"
 
@@ -3355,7 +3618,7 @@
 msgid "Show All Headers"
 msgstr "Bütün Baþlýk Bilgisini Göster"
 
-#: mailbox.php:354
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Silinecekleri Göster"
 
@@ -3371,54 +3634,50 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Sadece Üye Olunmuþ Dizinleri Göster"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Üye Olunmamýþlarý Göster"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Ýletilerden ekleri almaya izin vermek için bir simge gösterilsin mi?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Posta kutusu görüntüsünde gösterge bulunsun mu?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
 msgstr "Sadece okunmamýþ iletiler için mi önizleme gösterilsin?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
 msgstr "Araç ipuçlarýnda önizleme gösterilsin mi?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Menü çubuðunda Posta Getir simgesi gösterilsin mi?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:95
 msgid "Show the Images"
 msgstr "Görüntüleri Göster"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Menü çubuðunda süzgeç simgesi gösterilsin mi?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
 msgstr "Dizindeki toplam posta sayýsý gösterilsin mi?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "Gösterilen"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Bo_yut"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr "Kayýtlý deðilseniz lütfen üye olun."
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Üye oldunuz."
@@ -3427,67 +3686,83 @@
 msgid "Size"
 msgstr "Boyut"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Sýralama Yönü"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Geliþ Zamanýna Göre Sýrala"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Tarihe Göre Sýrala"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Gelen Adrese Göre Sýrala"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Ileti Boyutuna Göre Sýrala"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Konuya Göre Sýrala"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Konu Öbeðine Göre Sýrala"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Adrese Göre Sýrala"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Ýstenmeyen ileti dizini:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Özel Karakterler"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Yazým Denetimi"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Yazým Denetçisi"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Yazým denetimi tamamlandý"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Yazým denetimisi sýrasýndaki ekran baþýna düþen yazým hatalarý"
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr "Baþlat"
 
-#: lib/MIME/Viewer/itip.php:640
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Durum"
 
@@ -3495,86 +3770,98 @@
 msgid "Strip Attachment"
 msgstr "Ekleri Çýkart"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
 msgstr "Satýr Sonlarýný Çýkart"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Kon_u"
 
-#: message.php:259 search.php:157 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Konu"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "Konu Alaný"
 
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Gönder"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Dizine üye ol"
 
-#: lib/MIME/Viewer/pkcs7.php:374 lib/MIME/Viewer/pgp.php:395
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Baþarý"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Öneriler"
 
-#: lib/MIME/Viewer/itip.php:616 lib/MIME/Viewer/itip.php:618
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Özet"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
 msgstr "Oluþturma Yöntemini Deðiþtir"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
 msgstr "HTML Olarak Oluþturmaya Geç"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
 msgstr "Sade Metin Olarak Oluþturmaya Geç"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "M_etin"
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:269
 msgid "Tentative: "
 msgstr "Geçici:"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
 msgstr "Ýsteði geçici olarak kabul et"
 
-#: lib/MIME/Viewer/itip.php:713
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
 msgstr "Geçici olarak kabul edildi"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Hizmet Koþullarý dosyasý conf.php dosyasýnda belirtilmemiþ"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "M_etin"
+
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
 msgstr "Ýletinin Kimden: kolonu baðlanmalý:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintosh dosyasýnýn kaynak kýsmý"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Macintosh dosyasýnýn kaynak kýsmý yüklenebilir: %s"
@@ -3589,16 +3876,11 @@
 msgid "The account \"%s\" has been saved."
 msgstr "\"%s\" hesabý kaydedildi."
 
-#: lib/Filter.php:103
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "\"%s\" adresi %s içine kaydedildi."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Ek bulunamadý."
 
-#: lib/MIME/Viewer/itip.php:61
+#: lib/MIME/Viewer/itip.php:69
 msgid "The calendar data is invalid"
 msgstr "Takvim verisi geçersiz."
 
@@ -3610,40 +3892,40 @@
 "Oluþturma penceresi açýlamadý.Tarayýcýnýz beliren pencereleriengellemeye "
 "ayarlanmýþ olabilir."
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Macintosh dosyasýnýn içeriði aþaðýdadýr."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Yürülükteki \"%s\" dizini \"%s\" olarak yeniden adlandýrýlacak."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr "Bu dizine eriþimi olan kullanýcý listesi getirilemedi"
 
-#: compose.php:1157
+#: compose.php:1236
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Taslak \"%s\" dizinine kaydedildi."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr "Olay takviminize eklendi."
 
 #: templates/compose/expand.inc:9
-#, php-format
-msgid "The field '%s' can't be expanded."
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
 msgstr "'%s' alaný geniþletilemiyor."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "\"%s\" dizini zaten var."
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3652,70 +3934,79 @@
 "\"%s\" dizini adýnda geçersiz karakterler içermektedir.Bu problemlere yol "
 "açabilir.Lütfen sistem yöneticinizle görüþün."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "\"%s\" dizini yaratýldý ama dizine üye deðilsiniz."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "\"%s\" dizini silindi ama dizin için üyeliðe devam ediyorsunuz."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "\"%s\" dizini yaratýlamadý. Sunucu bunu belirtmektedir."
 
-#: lib/Folder.php:373
+#: lib/Folder.php:265
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "\"%s\" dizini silinemedi.Sunucu bunu belirtmektedir"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "\"%s\" dizini baþarýyla yaratýldý."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "\"%s\" dizini baþarýyla silindi."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "\"%s\" dizini \"%s\" olarak baþarýyla yeniden adlandýrýldý."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
 msgstr "Takip eden dosyalar bu kýsma eklendi:"
 
-#: lib/MIME/Viewer/html.php:95
+#: templates/javascript/open_saveimage_win.js:12
+#, fuzzy
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Oluþturma penceresi açýlamadý.Tarayýcýnýz beliren pencereleriengellemeye "
+"ayarlanmýþ olabilir."
+
+#: lib/MIME/Viewer/html.php:97
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr ""
 "Gönderen adres defterinizde kayýtlý olduðu için görüntüler gösterilecektir."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "Elektronik posta sunucusu takip eden hata mesajýný üretti:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "Elektronik posta sunucu takip eden bilgi mesajýný üretti:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "Elektronik posta sunucusu takip eden mesajý üretti:"
 
-#: lib/Message.php:635
+#: lib/Message.php:651
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "%s posta kutusu zaten boþ."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3725,15 +4016,15 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Oluþturulan ileti kapatýldý.Çýkýþ yapýlýyor."
 
-#: message.php:142
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Ýleti silindi."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
 msgstr "Ýleti doðrulandý."
 
-#: lib/MIME/Viewer/pkcs7.php:378
+#: lib/MIME/Viewer/pkcs7.php:384
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Ýleti doðrulandý. Gönderen: %s."
@@ -3746,16 +4037,16 @@
 "Geçiþ tümceciði penceresi açýlamadý.Tarayýcýnýz beliren pencereleri "
 "engellemeye ayarlanmýþ olabilir."
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "PGP Açýk Anahtarýnýn ham metin hali görülebilir:%s"
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Ýstenen dosya MS-TNEF ekinde bulunmamaktadýr."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Ýstenen dosya Zip ekinde bulunmamaktadýr."
 
@@ -3770,7 +4061,7 @@
 "bildiren bir uyarý göndermenizi istemektedir.Lütfen göndermek için %s "
 "üzerine týklayýn."
 
-#: lib/MIME/Viewer/images.php:72
+#: lib/MIME/Viewer/images.php:69
 msgid "The server was not able to create a thumbnail of this image."
 msgstr "Sunucu bu görüntünün minyatür boyutunu yaratamadý."
 
@@ -3786,42 +4077,57 @@
 msgid "The specified file does not exist."
 msgstr "Belirtilen dosya bulunmamaktadýr."
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "\"%s\" hesabý kaydedildi."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "\"%s\" hesabý silindi."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "\"%s\" hesabý silindi."
+
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
 msgstr "Bu görev görev listenize eklendi."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Ýletinin metni"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Ýletinin metni görülebilir: %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Dönen iletinin metni"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Dönen iletinin metni  görülebilir: %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Gönderilmiþ iletinin metni"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Gönderilmiþ iletinin metni görülebilir: %s."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Kullanýcýnýn serbest/meþgul bilgisi baþarýyla depolandý."
 
-#: lib/MIME/Viewer/alternative.php:89
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "Metne gömülü olarak gösterilebilecek olasý kýsým(lar) bulunmamaktadýr."
 
@@ -3829,21 +4135,26 @@
 msgid "There are no messages in this mailbox."
 msgstr "Bu posta kutusunda ileti bulunmamaktadýr."
 
-#: lib/Message.php:594
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Metne gömülü olarak gösterilebilecek olasý kýsým(lar) bulunmamaktadýr."
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "%s  silinirken sorun oluþtu.Sunucu bunu bildirmektedir."
 
-#: lib/Message.php:637
+#: lib/Message.php:653
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Posta kutusunun silinmesinde sorun oluþtu.Sunucu: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr "Posta kutusunun silinmesinde sorun oluþtu.Sunucu bunu bildirmektedir."
 
-#: lib/Message.php:97
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3852,7 +4163,7 @@
 "Ýletileri \"%s\" konumundan \"%s\" konumuna kopyalarken hata oluþtu.Sunucu "
 "bunu bildirmektedir."
 
-#: lib/Message.php:207 lib/Message.php:222
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3860,7 +4171,7 @@
 msgstr ""
 "Ýletiler \"%s\" dizinden silinirken hata oluþtu.Sunucu bunu bildirmektedir."
 
-#: lib/Message.php:286
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3868,21 +4179,21 @@
 msgstr ""
 "Ýletiler \"%s\" dizininden silinirken hata oluþtu.Sunucu bunu bildirmektedir."
 
-#: lib/Message.php:220
+#: lib/Message.php:211
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Ýletilerin silinmesinde hata oluþtu.Sunucu: %s"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:99
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Olayýn silinmesinde hata oluþtu: %s."
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Ýletinin bu kýsmýný görüntülenmesinde hata oluþtu."
 
-#: lib/Message.php:523 lib/Message.php:565
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3891,29 +4202,29 @@
 "\"%s\" dizinindeki iletileri iþaretlerken hata oluþtu.Sunucu bunu "
 "bildirmektedir."
 
-#: folders.php:155
+#: folders.php:165
 #, php-format
 msgid "There was an error importing %s."
 msgstr "%s (içeri) aktarýlýrken hata oluþtu"
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Olayýn (içeri) aktarýmý sýrasýnda hata oluþtu: %s"
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Görevin (içeri) aktarýmý sýrasýnda hata oluþtu:%s"
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Kullanýcýnýn serbest/meþgul bilgilerinin (içeri) aktarýmý sýrasýnda hata "
 "oluþtu: %s"
 
-#: lib/Message.php:92
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3922,29 +4233,29 @@
 "Ýletileri \"%s\" konumundan \"%s\" konumuna taþýrken hata oluþtu.Sunucu bunu "
 "bildirmektedir."
 
-#: compose.php:1165
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
 msgstr "Ýleti taslak olarak kaydedilirken hata oluþtu."
 
-#: compose.php:927
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Ýleti gönderilerken hata oluþtu: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Olay güncellenirken hata oluþtu: %s"
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "Ýletinin bu kýsmýnda metin bulunmamaktadýr."
 
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
 msgstr "Bu HTML iletisinin içine gömülmüþ görüntüler bulunmaktadýr."
 
-#: lib/MIME/Viewer/html.php:89
+#: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -3952,39 +4263,39 @@
 "Bu HTML iletisinin içine gömülmüþ görüntüler bulunmaktadýr. Görüntüler þöyle "
 "görünecektir: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Bu PGP Açýk Anahtarý iletiye eklenmiþtir."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr "Bu eylem desteklenmemektedir."
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr "Bu eylem henüz gerçekleþtirilmemiþtir."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Bu iþlem zaman alabilir.Devam etmek istediðinize emin misiniz?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Bu ileti Macintosh dosyasý içermektedir."
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr "Bu ileti sayýsal olarak S/MIME yoluyla imzalanmýþ bir ek içermektedir."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:414
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Bu ileti S/MIME yoluyla þifrelenmiþ bir ek içermektedir."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -3992,39 +4303,39 @@
 "Bu ileti teslim durum bilgisi içermektedir ama iletinin biçimi "
 "bilinmemektedir."
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 "Bu ileti geçerli bir PGP þifrelenmiþ ileti olarak görünmemektedir. Hata: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Bu ileti doðru PGP biçiminde deðildir. (RFC 2015 e göre)"
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Bu ileti doðru  S/MIME biçiminde deðildir."
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Bu ileti sayýsal olarak PGP yoluyla imzalanmýþtýr."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Bu ileti sayýsal olarak S/MIME yoluyla imzalanmýþtýr."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Bu ileti S/MIME yoluyla þifrelenmiþtir."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
 msgstr "Bu ileti PGP ile þifrelenmiþtir."
 
-#: message.php:202
+#: message.php:211
 msgid "This message to"
 msgstr "Bu iletiyi"
 
@@ -4036,18 +4347,22 @@
 msgid "This window must be called from a compose window."
 msgstr "Bu pencere bir oluþturma penceresi tarafýndan açýlmalýdýr."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Göster"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Haber Öbeði Görüntüsü"
 
-#: message.php:255 mailbox.php:576 search.php:145
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Kime"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:919
 msgid "To Address"
 msgstr "Adres"
 
@@ -4059,11 +4374,17 @@
 "Birden fazla alan seçebilmek için, týklarken Control(PC) yada Command(Mac) "
 "tuþlarýný basýlý tutun."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
 msgstr "Toplam Ek Boyutu:"
 
-#: folders.php:350
+#: folders.php:388
 msgid "Trash folder"
 msgstr "Çöp Kutusu"
 
@@ -4071,8 +4392,8 @@
 msgid "Trash folder:"
 msgstr "Çöp Kutusu:"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Kota belirlenemedi"
 
@@ -4089,28 +4410,33 @@
 msgid "Undelete"
 msgstr "Silme"
 
-#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:218
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Gösterilmeyen Alýcýlar"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Bilinmeyen bileþen tipi: %s"
 
-#: mailbox.php:537
+#: mailbox.php:565
 msgid "Unknown Date"
 msgstr "Bilinmeyen Tarih"
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
 msgstr "Bilinmeyen Toplantý"
 
-#: mailbox.php:588
+#: mailbox.php:618
 msgid "Unknown Recipient"
 msgstr "Bilinmeyen Alýcý"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Geçiþ Tümceciðini Kaldýr"
 
@@ -4118,47 +4444,53 @@
 msgid "Unnamed"
 msgstr "Ýsimsiz"
 
-#: message.php:489 mailbox.php:671 templates/message/navbar_navigate.inc:6
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Okunmamýþ"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Dizinin üyeliðinden çýk."
 
-#: templates/compose/compose.inc:574
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
 msgstr "Ek Bilgisini Güncelle"
 
-#: lib/MIME/Viewer/itip.php:576
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr "Cevaplayýcý durumunu güncelle"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Yükle"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Ön tanýmlý Deðeri Kullan"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "IMAP dizininin üyelikleri kullanýlsýn mý?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Sanal Dizinler"
+
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "Kullanýcý"
 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 "'%s' kullanýcýsýna '%s' dizini için belirtilmiþ haklar baþarýyla verildi."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Kullanýcý Adý"
 
@@ -4166,18 +4498,18 @@
 msgid "Username:"
 msgstr "Kullanýcý Adý:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Görüntüle"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
 msgstr "Görüntüle %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "%s Açýk Anahtarýný Görüntüle"
@@ -4186,80 +4518,113 @@
 msgid "View HTML content in a separate window"
 msgstr "HTML içeriðini ayrý bir pencerede görüntüle."
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Yeni iletiler"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Kiþisel Özel Anahtarý Görüntüle"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Kiþisel Açýk Anahtarý Görüntüle"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Haber Öbeðini Görüntüle"
 
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
 msgstr "Minyatür Boyutta Görüntüle"
 
-#: lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/pkcs7.php:418
 msgid "View attachment in a separate window"
 msgstr "Eki ayrý bir pencerede görüntüle"
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "Ýçeriði ayrý bir pencerede görüntüle"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
 msgstr "Olayý Görüntüle"
 
-#: folders.php:342 mailbox.php:506
+#: folders.php:380 mailbox.php:534
 #, php-format
 msgid "View messages in %s"
 msgstr "%s içindeki iletileri görüntüle"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Giriþten sonra gösterilecek görünüm yada posta kutusu:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
 msgstr "Görevi Görüntüle"
 
-#: lib/MIME/Viewer/html.php:110
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
 msgstr "Görüntüleri Görüntüle"
 
-#: search.php:309
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Sanal Dizin \"%s\" baþarýyla yaratýldý."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:125 lib/IMAP/Tree.php:138
-#: lib/IMAP/Tree.php:140 lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:145
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:353 lib/IMAP/Tree.php:395
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Sanal Dizinler"
 
-#: search.php:291
+#: search.php:245
 msgid "Virtual Folders require a label."
 msgstr "Sanal Dizinler bir etiket gerektirmektedir."
 
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "Sanal Dizinler"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Sanal Dizinler"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Sanal Dizinler"
+
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "Sanal dizin etiketi"
 
-#: lib/MIME/Viewer/pkcs7.php:368
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "Uyarý"
 
-#: login.php:131
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
 msgstr "%s Hoþgeldiniz"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:619
+#, fuzzy
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Ýstenmeyen iletiler, istenmeyen ileti olarak rapor edildikten sonra silinsin "
+"mi?"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4267,51 +4632,83 @@
 "Ýletileri silerken, silinecek olarak iþaretlemek yerine Çöp Kutusuna "
 "taþýnsýn mý?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Yeni bir posta kutusu açýlýrken, hangi sayfadan baþlamak istersiniz?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Gönderilmiþ postalarý kaydederken, eklerde kaydedilsin mi?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Beyaz Liste"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Bu miktar karakter metni kaydýr."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Evet"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Takip eden hesaplardan posta getirmek üzeresiniz."
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
 msgstr "Takip eden dizinler silinecek:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Takip eden dizinler silinecek:"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Yeni bir dizine kopyalýyorsunuz/taþýyosunuz."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Altdizin yaratýlacak dizin "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Üstdüzey bir dizin yaratýyorsunuz."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Üstdüzey bir dizin yaratýyorsunuz."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Dizin yeniden adlandýrýlýcak: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "\"%s\" üyeliðinden baþarýyla çýktýnýz."
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
@@ -4319,11 +4716,11 @@
 "Hizmet Koþullarý anlaþmasýný onaylamadýnýz, bu sebeble giriþ yapmanýza izin "
 "verilmemektedir."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
 msgstr "Bu dizinin eriþim haklarýný deðiþtirmek için izniniz yok"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Bu iletiyi takip eden alýcýlara %%s de ilettiniz: %s."
@@ -4337,7 +4734,12 @@
 msgid "You have 1 new message."
 msgstr "1 yeni iletiniz var."
 
-#: templates/compose/attachments.js:116
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "1 yeni iletiniz var."
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
@@ -4345,26 +4747,26 @@
 "Henüz yüklemediðiniz en azýndan bir tane ek seçtiniz. Bu iletiyi eksiz "
 "göndermek istediðinizden emin misiniz?"
 
-#: lib/IMP.php:1002
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Dizinlerde yeni posta var:"
 
-#: lib/IMP.php:1007
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Dizinlerde yeni posta var:"
 
-#: compose.php:127
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "En az bir tane alýcý girmelisiniz."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Bu iletiyi görüntüleyebilmek için PGP özel anahtarýnýzýn geçiþ tümceciðini "
 "girmelisiniz."
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4372,7 +4774,7 @@
 "Bu iletiyi görüntüleyebilmek için S/MIME özel anahtarýnýzýn geçiþ "
 "tümceciðini girmelisiniz."
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Önce bir hedef posta kutusu seçmelisiniz."
 
@@ -4384,8 +4786,8 @@
 msgid "You must select an address first."
 msgstr "Önce bir adres seçmelisiniz."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Önce en az bir ileti seçmelisiniz."
 
@@ -4398,61 +4800,62 @@
 msgstr "Eklenecek en az bir dosya belirtmelisiniz."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "%s bakým seçeneklerinde seçilir kýlýnmalýdýr."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Bu iletiyi %s e %%s de yönlendirdiniz."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Bu iletiye %s de cevap verdiniz."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "\"%s\" dizinine üye deðilsiniz.Sunucu bunu belirtmektedir"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "\"%s\" üyeliðiniz devam ediyor.Sunucu bunu belirtmektedir"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "\"%s\" dizinine baþarýyla üye oldunuz."
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "\"%s\" üyeliðinden baþarýyla çýktýnýz."
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Adýnýz"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "PGP Açýk/Özel Anahtarlarýnýz"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Özel Anahtarýnýz"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Açýk Anahtarýnýz"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Yanýt: adres: <i>(seçimli)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "S/MIME Açýk/Özel Onay Belgeniz"
 
@@ -4460,25 +4863,18 @@
 msgid "Your accounts:"
 msgstr "Hesaplarýnýz:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr "Öteki ad adresleri: <i>(seçimli, her adres için bir satýr girin)</i>"
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "Tarayýcýnýz bu görüntü türünü metne gömülü gösterimini desteklememektedir."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Tarayýcýnýz bu yazdýrma tercihini desteklememektedir.Yazdýrmak için Control/"
-"Option + P tuþlarýna basýn."
-
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Ön tanýmlý karakter kümeniz:"
 
@@ -4486,68 +4882,69 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Ýleti göndermek için ön tanýmlý þifreleme yönteminiz:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Ýletiniz baþarýyla teslim edilmiþtir."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Ýmzanýz:"
 
-#: message.php:279 compose.php:1205 mailbox.php:521 lib/Compose.php:742
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Konu Yok]"
 
-#: templates/compose/compose.inc:216
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "Giz_li K.K."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "_Kara Liste"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "K. Ko_pya"
 
-#: lib/IMP.php:903
-msgid "_Compose"
-msgstr "_Oluþtur"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Sil"
 
-#: lib/IMP.php:905
+#: lib/IMP.php:979
 msgid "_Folders"
 msgstr "_Dizinler"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "Ki_mlik"
 
-#: lib/IMP.php:896
+#: lib/IMP.php:961
 msgid "_Inbox"
 msgstr "_Gelen Kutusu"
 
-#: lib/IMP.php:946
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "Çý_kýþ"
 
-#: message.php:375
+#: message.php:384
 msgid "_Message Source"
 msgstr "Ý_leti Kaynaðý"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Yeni iletiler"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Yazdýr"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "Ön_celik"
 
-#: mailbox.php:395
+#: mailbox.php:418
 #, php-format
 msgid "_Refresh %s"
 msgstr "_Yenile %s"
@@ -4556,19 +4953,19 @@
 msgid "_Reply"
 msgstr "_Cevap Yaz"
 
-#: lib/IMP.php:907
+#: lib/IMP.php:981
 msgid "_Search"
 msgstr "_Ara"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
 msgstr "Ýleti _Gönder"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "Konu Öbeði"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Kime"
 
@@ -4576,62 +4973,127 @@
 msgid "_Undelete"
 msgstr "Sil_me"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Haber Öbeðini Gör"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "_Beyaz Liste"
 
-#: lib/Compose.php:355
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
 msgid "attachment"
 msgstr "Ek"
 
-#: view.php:102
+#: view.php:99
 msgid "attachments.zip"
 msgstr "Ek.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "bytes"
 msgstr "byte"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "kimden"
 
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
 #: smime.php:29 pgp.php:69
 msgid "key"
 msgstr "anahtar"
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
 msgstr "posta kutusu dosyasý"
 
-#: compose.php:987 lib/Message.php:442
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "ad"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "hiçbiri"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "veya"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "yazým hatasý"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "yazým hatalarý"
 
-#: lib/Filter.php:55
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "yazým hatasý"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "kara listeniz"
 
-#: lib/Filter.php:67
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "beyaz listeniz"


--- orig/lib/Quota/courier.php
+++ mod/lib/Quota/courier.php
@@ -2,9 +2,9 @@
 /**
  * Implementation of the Quota API for Courier IMAP servers.
  *
- * $Horde: imp/lib/Quota/courier.php,v 1.21.10.4 2005/07/03 03:42:46 selsky Exp $
+ * $Horde: imp/lib/Quota/courier.php,v 1.21.10.6 2006/01/01 21:28:59 jan Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/templates/search/main.inc
+++ mod/templates/search/main.inc
@@ -3,72 +3,72 @@
  </tr>
 
  <tr>
-  <td class="smallheader" colspan="2" align="left"><b><?php echo _("Message flags") ?></b></td>
+  <td class="smallheader leftAlign" colspan="2"><?php echo _("Message flags") ?></td>
  </tr>
 
  <tr>
   <td class="item" colspan="2">
    <table cellspacing="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_seen_0" name="search_flag[<?php echo IMP_SEARCH_FLAG_SEEN ?>]" value="0" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_SEEN] == 0) echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_seen_0', _("Old messages")) ?></i>
+      <em><?php echo Horde::label('flag_seen_0', _("Old messages")) ?></em>
      </td>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_seen_1" name="search_flag[<?php echo IMP_SEARCH_FLAG_SEEN ?>]" value="1" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_SEEN] == 1) echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_seen_1', _("New messages")) ?></i>
+      <em><?php echo Horde::label('flag_seen_1', _("New messages")) ?></em>
      </td>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_seen_2" name="search_flag[<?php echo IMP_SEARCH_FLAG_SEEN ?>]" value="2" <?php if (empty($search['flag']) || $search['flag'][IMP_SEARCH_FLAG_SEEN] == 2) echo 'checked="checked" '; ?> />
-      <i><?php echo _("Both") ?></i>
+      <em><?php echo _("Both") ?></em>
      </td>
      <td class="item1" width="100%">&nbsp;</td>
     </tr>
 
     <tr>
-     <td class="item0" align="left" nowrap="nowrap">
+     <td class="item0 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_answered_0" name="search_flag[<?php echo IMP_SEARCH_FLAG_ANSWERED ?>]" value="0" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_ANSWERED] == 0) echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_answered_0', _("Answered messages")) ?></i>
+      <em><?php echo Horde::label('flag_answered_0', _("Answered messages")) ?></em>
      </td>
-     <td class="item0" align="left" nowrap="nowrap">
+     <td class="item0 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_answered_1" name="search_flag[<?php echo IMP_SEARCH_FLAG_ANSWERED ?>]" value="1" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_ANSWERED] == 1) echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_answered_1', _("Unanswered messages")) ?></i>
+      <em><?php echo Horde::label('flag_answered_1', _("Unanswered messages")) ?></em>
      </td>
-     <td class="item0" align="left" nowrap="nowrap">
+     <td class="item0 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_answered_2" name="search_flag[<?php echo IMP_SEARCH_FLAG_ANSWERED ?>]" value="2" <?php if (empty($search['flag']) || $search['flag'][IMP_SEARCH_FLAG_ANSWERED] == 2) echo 'checked="checked" '; ?>/>
-      <i><?php echo _("Both") ?></i>
+      <em><?php echo _("Both") ?></em>
      </td>
      <td class="item0" width="100%">&nbsp;</td>
     </tr>
 
     <tr>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_flagged_0" name="search_flag[<?php echo IMP_SEARCH_FLAG_FLAGGED ?>]" value="0" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_FLAGGED] == 0) echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_flagged_0', _("Important messages")) ?></i>
+      <em><?php echo Horde::label('flag_flagged_0', _("Important messages")) ?></em>
      </td>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_flagged_1" name="search_flag[<?php echo IMP_SEARCH_FLAG_FLAGGED ?>]" value="1" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_FLAGGED] == 1) echo 'checked="checked" '; ?>/>
-            <i><?php echo Horde::label('flag_flagged_1', _("Not important messages")) ?></i>
+            <em><?php echo Horde::label('flag_flagged_1', _("Not important messages")) ?></em>
       </td>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_flagged_2" name="search_flag[<?php echo IMP_SEARCH_FLAG_FLAGGED ?>]" value="2" <?php if (empty($search['flag']) || $search['flag'][IMP_SEARCH_FLAG_FLAGGED] == 2) echo 'checked="checked" '; ?>/>
-      <i><?php echo _("Both") ?></i>
+      <em><?php echo _("Both") ?></em>
      </td>
      <td class="item1" width="100%">&nbsp;</td>
     </tr>
 
     <tr>
-     <td class="item0" align="left" nowrap="nowrap">
+     <td class="item0 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_deleted_0" name="search_flag[<?php echo IMP_SEARCH_FLAG_DELETED ?>]" value="0" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_DELETED] == 0)echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_deleted_0', _("Deleted messages")) ?></i>
+      <em><?php echo Horde::label('flag_deleted_0', _("Deleted messages")) ?></em>
      </td>
-     <td class="item0" align="left" nowrap="nowrap">
+     <td class="item0 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_deleted_1" name="search_flag[<?php echo IMP_SEARCH_FLAG_DELETED ?>]" value="1" <?php if (!empty($search['flag']) && $search['flag'][IMP_SEARCH_FLAG_DELETED] == 1) echo 'checked="checked" '; ?>/>
-      <i><?php echo Horde::label('flag_deleted_1', _("Not deleted messages")) ?></i>
+      <em><?php echo Horde::label('flag_deleted_1', _("Not deleted messages")) ?></em>
      </td>
-     <td class="item0" align="left" nowrap="nowrap">
+     <td class="item0 leftAlign" nowrap="nowrap">
       <input type="radio" id="flag_deleted_2" name="search_flag[<?php echo IMP_SEARCH_FLAG_DELETED ?>]" value="2" <?php if (empty($search['flag']) || $search['flag'][IMP_SEARCH_FLAG_DELETED] == 2) echo 'checked="checked" '; ?>/>
-      <i><?php echo _("Both") ?></i>
+      <em><?php echo _("Both") ?></em>
      </td>
      <td class="item0" width="100%">&nbsp;</td>
     </tr>
@@ -80,7 +80,7 @@
  <input id="preselected_folders" type="hidden" name="search_folders[]" value="<?php echo $search['mbox'] ?>" />
 <?php else: ?>
  <tr>
-  <td class="smallheader" colspan="2" align="left"><b><?php echo _("Message folders") ?></b></td>
+  <td class="smallheader leftAlign" colspan="2"><?php echo _("Message folders") ?></td>
  </tr>
 
  <tr>
@@ -98,7 +98,7 @@
   <td class="control" valign="top" align="center" colspan="2">
    <table cellspacing="0" cellpadding="2" width="100%">
     <tr>
-     <td class="item" valign="top" align="left">
+     <td class="item leftAlign" valign="top">
       <?php echo $folderlist ?>
      </td>
     </tr>
@@ -107,35 +107,32 @@
  </tr>
 <?php endif; ?>
 
+<?php if ($_SESSION['imp']['base_protocol'] != 'pop3'): ?>
  <tr>
-  <td class="smallheader" colspan="2" align="left"><b><?php echo _("Virtual Folders") ?></b></td>
+  <td class="smallheader leftAlign" colspan="2"><?php echo _("Virtual Folders") ?></td>
  </tr>
 
  <tr>
   <td class="item" colspan="2">
    <table cellspacing="0" cellpadding="0" width="100%">
-<?php if ($create_vfolder): ?>
-    <input type="hidden" name="create_vfolder" value="1" />
-    <input type="hidden" name="save_vfolder" value="1" />
-<?php elseif ($edit_vfolder): ?>
-    <input type="hidden" name="edit_vfolder" value="1" />
-    <input type="hidden" name="edit_vfolder_id" value="<?php echo $edit_vfolder_id ?>" />
+<?php if ($edit_query_vfolder): ?>
     <input type="hidden" name="save_vfolder" value="1" />
 <?php else: ?>
     <tr>
-     <td class="item0" align="left" nowrap="nowrap">
-      <i><?php echo _("Save search as a virtual folder?") ?></i>&nbsp;<input type="checkbox" id="save_vfolder" name="save_vfolder" <?php if (!empty($search['save_vfolder'])) echo 'checked="checked" '; ?>/>
+     <td class="item0 leftAlign" nowrap="nowrap">
+      <em><?php echo _("Save search as a virtual folder?") ?></em>&nbsp;<input type="checkbox" id="save_vfolder" name="save_vfolder" <?php if (!empty($search['save_vfolder'])) echo 'checked="checked" '; ?>/>
      </td>
     </tr>
 <?php endif; ?>
     <tr>
-     <td class="item1" align="left" nowrap="nowrap">
-      <i><?php echo _("Virtual folder label") ?>:</i>&nbsp;<input type="text" id="vfolder_label" name="vfolder_label" <?php if (!empty($search['vfolder_label'])) echo 'value="' . $search['vfolder_label'] . '" '; ?>/>
+     <td class="item1 leftAlign" nowrap="nowrap">
+      <em><?php echo _("Virtual folder label") ?>:</em>&nbsp;<input type="text" id="vfolder_label" name="vfolder_label" <?php if (!empty($search['vfolder_label'])) echo 'value="' . $search['vfolder_label'] . '" '; ?>/>
      </td>
     </tr>
    </table>
   </td>
  </tr>
+<?php endif; ?>
 
  <tr>
   <td valign="top" colspan="2">


--- orig/templates/mailbox/javascript.inc
+++ mod/templates/mailbox/javascript.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 // Set up left (37) and right (39) arrows to go to the previous/next page.
@@ -63,7 +63,7 @@
         return;
     }
 
-<?php if ($imp['base_protocol'] == 'pop3'): ?>
+<?php if ($_SESSION['imp']['base_protocol'] == 'pop3'): ?>
     if (actID == 'delete_messages') {
         if (!window.confirm('<?php echo addslashes(_("Are you sure you wish to PERMANENTLY delete these messages?")) ?>')) {
             return;
@@ -163,7 +163,7 @@
 
 document.onclick = onClickHandler;
 
-<?php if ($conf['user']['allow_folders']): ?>
+<?php if (!empty($GLOBALS['conf']['user']['allow_folders'])): ?>
 function updateFolders(whichForm)
 {
     if (document.copymove2) {
@@ -240,7 +240,7 @@
     }
 }
 
-<?php if (!strstr($imp['protocol'], 'pop3')): ?>
+<?php if ($_SESSION['imp']['base_protocol'] != 'pop3'): ?>
 function flagMessages(whichForm)
 {
     if ((whichForm == 1 && document.select1.flag.options[document.select1.flag.selectedIndex].value != "") ||
@@ -266,7 +266,7 @@
 }
 <?php endif; ?>
 
-<?php if ($browser->hasFeature('dom')): ?>
+<?php if ($GLOBALS['browser']->hasFeature('dom')): ?>
 function getMessage(id, offset, index)
 {
     for (i = 0; i < messagelist.length; i++) {
@@ -404,7 +404,7 @@
     }
 
     e.returnValue = false;
-<?php if ($browser->isBrowser('mozilla')): ?>
+<?php if ($GLOBALS['browser']->isBrowser('mozilla')): ?>
     e.preventDefault();
 <?php endif; ?>
 }


--- orig/templates/prefs/sentmailselect.inc
+++ mod/templates/prefs/sentmailselect.inc
@@ -1,5 +1,5 @@
 <?php if (!$prefs->isLocked('sent_mail_folder')): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function newChoice_sent_mail_folder(val)
@@ -8,7 +8,6 @@
         document.prefs.sent_mail.selectedIndex = 0;
         return;
     }
-    val = "<?php echo IMP::preambleString() ?>" + val;
     var field = document.prefs.sent_mail;
     for (var i = 0; i < field.options.length; i++) {
         if (field.options[i].value == val) {


--- orig/search.php
+++ mod/search.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * $Horde: imp/search.php,v 2.128.2.6 2005/09/02 04:49:04 slusarz Exp $
+ * $Horde: imp/search.php,v 2.128.2.19 2006/02/15 01:29:23 slusarz Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  *
  * URL Parameters:
  * ---------------
- * 'mailbox'  --  If exists, don't show the folder selection list; use the
- *                passed in mailbox value instead.
+ * 'search_mailbox'  --  If exists, don't show the folder selection list; use
+ *                       the passed in mailbox value instead.
+ * 'edit_query'      --  If exists, the search query to edit.
  */
 
-/* Utility functions. */
 /**
  * Generates the HTML for a day selection widget.
  *
@@ -112,91 +112,45 @@
     return $html . "</select>\n";
 }
 
-/* Defines used to determine what kind of field query we are dealing
- * with. */
-define('IMP_SEARCH_HEADER', 1);
-define('IMP_SEARCH_BODY', 2);
-define('IMP_SEARCH_DATE', 3);
-define('IMP_SEARCH_TEXT', 4);
-
-/* Defines used to identify the flag input. */
-define('IMP_SEARCH_FLAG_SEEN', 1);
-define('IMP_SEARCH_FLAG_ANSWERED', 2);
-define('IMP_SEARCH_FLAG_FLAGGED', 3);
-define('IMP_SEARCH_FLAG_DELETED', 4);
-
-/* Defines used to identify whether to show unsubscribed folders. */
-define('IMP_SEARCH_SHOW_UNSUBSCRIBED', 0);
-define('IMP_SEARCH_SHOW_SUBSCRIBED_ONLY', 1);
-
-/* The base search fields. */
-$fields = array(
-    'from' => array(
-        'label' => _("From"),
-        'type' => IMP_SEARCH_HEADER
-    ),
-    'to' => array(
-        'label' => _("To"),
-        'type' => IMP_SEARCH_HEADER
-    ),
-    'cc' => array(
-        'label' => _("Cc"),
-        'type' => IMP_SEARCH_HEADER
-    ),
-    'bcc' => array(
-        'label' => _("Bcc"),
-        'type' => IMP_SEARCH_HEADER
-    ),
-    'subject' => array(
-        'label' => _("Subject"),
-        'type' => IMP_SEARCH_HEADER
-    ),
-    'body' => array(
-       'label' => _("Body"),
-       'type' => IMP_SEARCH_BODY
-    ),
-    'text' => array(
-       'label' => _("Entire Message"),
-       'type' => IMP_SEARCH_TEXT
-    ),
-    'received_on' => array(
-        'label' => _("Received On"),
-        'type' => IMP_SEARCH_DATE
-    ),
-    'received_until' => array(
-        'label' => _("Received Until"),
-        'type' => IMP_SEARCH_DATE
-    ),
-    'received_since' => array(
-        'label' => _("Received Since"),
-        'type' => IMP_SEARCH_DATE
-    )
-);
-
 define('IMP_BASE', dirname(__FILE__));
 $authentication = OP_HALFOPEN;
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Folder.php';
+require_once IMP_BASE . '/lib/Search.php';
+
+$actionID = Util::getFormData('actionID');
+$edit_query = Util::getFormData('edit_query');
+$edit_query_id = Util::getFormData('edit_query_id', $edit_query);
+$edit_query_vfolder = Util::getFormData('edit_query_vfolder');
+$search_mailbox = Util::getFormData('search_mailbox');
 
-/* Determine if we are running in the non-standard search mode. */
-$create_vfolder = Util::getFormData('create_vfolder');
-$edit_vfolder = Util::getFormData('edit_vfolder');
-$edit_vfolder_id = Util::getFormData('vfolder');
+$imp_search_fields = $imp_search->searchFields();
 
 /* Get URL parameter data. */
 $search = array();
 if (Util::getFormData('no_match')) {
-    require_once IMP_BASE . '/lib/Search.php';
-    $search = IMP_Search::retrieveUIQuery();
-} elseif ($edit_vfolder_id) {
-    $search = IMP_VFolder::retrieveUIQuery($edit_vfolder_id);
+    $search = $imp_search->retrieveUIQuery();
+} elseif (!is_null($edit_query) && $imp_search->isSearchMbox($edit_query)) {
+    if ($imp_search->isVFolder($edit_query)) {
+        $edit_query_vfolder = true;
+        if (!$imp_search->isEditableVFolder($edit_query)) {
+            $notification->push(_("Special Virtual Folders cannot be edited."), 'horde.error');
+            header('Location: ' . Horde::applicationUrl('mailbox.php', true));
+            exit;
+        }
+    }
+    $search = $imp_search->retrieveUIQuery($edit_query);
 } else {
-    $search['field'] = Util::getFormData('field', array());
-    if (!empty($search['field']) && !end($search['field'])) {
-        array_pop($search['field']);
+    if (empty($actionID) &&
+        ($def_search = $prefs->getValue('default_search'))) {
+        $search['field'] = array($def_search);
+    } else {
+        $search['field'] = Util::getFormData('field', array());
+        if (!empty($search['field']) && !end($search['field'])) {
+            array_pop($search['field']);
+        }
     }
     $search['field_end'] = count($search['field']);
-    $search['mbox'] = Util::getFormData('mailbox');
     $search['match'] = Util::getFormData('search_match');
     $search['text'] = Util::getFormData('search_text');
     $search['text_not'] = Util::getFormData('search_text_not');
@@ -205,20 +159,17 @@
     $search['folders'] = Util::getFormData('search_folders', array());
     $search['save_vfolder'] = Util::getFormData('save_vfolder');
     $search['vfolder_label'] = Util::getFormData('vfolder_label');
-    if ($edit_vfolder) {
-        $edit_vfolder_id = Util::getFormData('edit_vfolder_id');
-    }
+    $search['mbox'] = Util::getFormData('mbox', $search_mailbox);
 }
 
 $curr_date = getdate();
 
 /* Run through the action handlers. */
-$actionID = Util::getFormData('actionID');
 switch ($actionID) {
 case 'do_search':
     /* Create the search query. */
-    require_once 'Horde/IMAP/Search.php';
-    $query = &new IMAP_Search_Query();
+    require_once IMP_BASE . '/lib/IMAP/Search.php';
+    $query = &new IMP_IMAP_Search_Query();
 
     /* Flag searches. */
     $flag_names = array(
@@ -227,6 +178,7 @@
         IMP_SEARCH_FLAG_FLAGGED => 'flagged',
         IMP_SEARCH_FLAG_DELETED => 'deleted'
     );
+
     foreach ($search['flag'] as $key => $val) {
         $flag = $flag_names[$key];
         switch ($val) {
@@ -242,8 +194,8 @@
     /* Field searches. */
     $search_array = array();
     foreach ($search['field'] as $key => $val) {
-        $ob = &new IMAP_Search_Query();
-        switch ($fields[$val]['type']) {
+        $ob = &new IMP_IMAP_Search_Query();
+        switch ($imp_search_fields[$val]['type']) {
         case IMP_SEARCH_HEADER:
             if (!empty($search['text'][$key])) {
                 $ob->header($val, $search['text'][$key], $search['text_not'][$key]);
@@ -291,43 +243,33 @@
 
     /* Save the search as a virtual folder if requested. */
     if (!empty($search['save_vfolder'])) {
-        $label = $search['vfolder_label'];
-        if (empty($label)) {
+        if (empty($search['vfolder_label'])) {
             $notification->push(_("Virtual Folders require a label."), 'horde.error');
             break;
         }
 
-        require_once IMP_BASE . '/lib/IMAP/Tree.php';
-        require_once IMP_BASE . '/lib/VFolder.php';
-        $imptree = &IMP_Tree::singleton();
-        if ($edit_vfolder && $edit_vfolder_id) {
-            IMP_VFolder::deleteVFolder($edit_vfolder_id);
-            if ($imptree) {
-                $imptree->delete($edit_vfolder_id);
-            }
-        }
-        $vfolder_id = IMP_VFolder::addVFolder($query, $search);
-        if ($imptree) {
-            $imptree->insertVFolders(array($vfolder_id => $label));
+        if ($edit_query_id) {
+            $imp_search->deleteSearchQuery($edit_query_id);
         }
-
-        $notification->push(sprintf(_("Virtual Folder \"%s\" created succesfully."), $label), 'horde.success');
+        $id = $imp_search->addVFolder($query, $search['folders'], $search, $search['vfolder_label']);
+        $notification->push(sprintf(_("Virtual Folder \"%s\" created succesfully."), $search['vfolder_label']), 'horde.success');
     } else {
-        $label = _("Search Results");
-        $vfolder_id = null;
+        /* Set the search in the IMP session. */
+        $id = $imp_search->createSearchQuery($query, $search['folders'], $search, _("Search Results"));
     }
 
-    /* Set the search in the IMP session. */
-    require_once IMP_BASE . '/lib/Search.php';
-    IMP_Search::createSearchQuery($query, $search['folders'], $search, $label, $vfolder_id);
-
     /* Redirect to the Mailbox Screen. */
-    header('Location: ' . Util::addParameter(Horde::applicationUrl('mailbox.php', true), 'mailbox', IMP_SEARCH_MBOX, false));
+    header('Location: ' . Util::addParameter(Horde::applicationUrl('mailbox.php', true), 'mailbox', IMP_SEARCH_MBOX . $id, false));
     exit;
 
 case 'reset_search':
-    $search['field'] = array();
-    $search['field_end'] = 0;
+    if ($def_search = $prefs->getValue('default_search')) {
+        $search['field'] = array($def_search);
+        $search['field_end'] = 1;
+    } else {
+        $search['field'] = array();
+        $search['field_end'] = 0;
+    }
     $search['match'] = null;
     $search['date'] = $search['text'] = $search['text_not'] = $search['flag'] = array();
     $search['folders'] = array();
@@ -352,14 +294,13 @@
 if (!$conf['user']['allow_folders']) {
     $search['mbox'] = 'INBOX';
     $search['folders'][] = 'INBOX';
+    $subscribe = false;
 } elseif ($subscribe = $prefs->getValue('subscribe')) {
     $shown = Util::getFormData('show_subscribed_only', $subscribe);
 }
 
 $title = _("Message Search");
-if ($create_vfolder) {
-    $submit_label = _("Create");
-} elseif ($edit_vfolder) {
+if ($edit_query_id) {
     $submit_label = _("Save");
 } else {
     $submit_label = _("Submit");
@@ -382,22 +323,13 @@
 $folderlist = '';
 $imp_folder = &IMP_Folder::singleton();
 
-if (!$search['mbox']) {
+if (empty($search['mbox'])) {
     $mailboxes = $imp_folder->flist_IMP(array(), (isset($shown)) ? (bool) $shown : null);
     $total = ceil(count($mailboxes) / 3);
 
-    if (empty($search['folders'])) {
-        /* Try to guess what folder the user wants to search */
-        if (!empty($imp['mailbox']) && $imp['mailbox'] != IMP_SEARCH_MBOX) {
-            $search['folders'][] = $imp['mailbox'];
-        } elseif (!empty($imp['thismailbox']) && $imp['mailbox'] != IMP_SEARCH_MBOX) {
-            $search['folders'][] = $imp['thismailbox'];
-        } elseif (($initial_page = $prefs->getValue('initial_page')) &&
-                  ($initial_page != 'folders.php')) {
-            $search['folders'][] = IMP::addPreambleString($initial_page);
-        } else {
-            $search['folders'][] = 'INBOX';
-        }
+    if (empty($search['folders']) && ($actionID != 'update_search')) {
+        /* Default to Inbox search. */
+        $search['folders'][] = 'INBOX';
     }
 
     $count = 0;
@@ -409,7 +341,7 @@
                 $folderlist .= ' checked="checked"';
             }
         } else {
-            $folderlist .= '<input id="folder' . $count . '" type="checkbox" disabled="disabled"'; 
+            $folderlist .= '<input id="folder' . $count . '" type="checkbox" disabled="disabled"';
         }
 
         $folderlist .= " />\n" . Horde::label('folder' . $count++, str_replace(' ', '&nbsp;', $mbox['label']), '') . "<br />\n";
@@ -417,7 +349,7 @@
         if (($newcol > $total) && ($numcolumns != 3)) {
             $newcol = 1;
             $numcolumns++;
-            $folderlist .= "</td>\n" . '<td class="item" valign="top" align="left">';
+            $folderlist .= "</td>\n" . '<td class="item leftAlign" valign="top">';
         }
     }
 }


--- orig/lib/IMAP.php
+++ mod/lib/IMAP.php
@@ -3,9 +3,9 @@
  * The IMP_IMAP:: class facilitates connections to the IMAP/POP3 server
  * via the c-client PHP extensions.
  *
- * $Horde: imp/lib/IMAP.php,v 1.11.10.6 2005/07/03 03:42:42 selsky Exp $
+ * $Horde: imp/lib/IMAP.php,v 1.11.10.13 2006/04/10 05:03:44 slusarz Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -96,7 +96,21 @@
      */
     function openIMAPStream($mbox = null, $flags = 0)
     {
-        return @imap_open($this->_serverString . $mbox, $this->_user, $this->_pass, $flags);
+        $i = -1;
+        $ret = false;
+        if (empty($mbox)) {
+            $flags |= OP_HALFOPEN;
+        }
+
+        while (($ret === false) &&
+               !strstr(strtolower(imap_last_error()), 'login failure') &&
+               (++$i < 3)) {
+            if ($i != 0) {
+                sleep(1);
+            }
+            $ret = @imap_open($this->_serverString . $mbox, $this->_user, $this->_pass, $flags);
+        }
+        return $ret;
     }
 
     /**
@@ -116,6 +130,15 @@
             if (($_SESSION['imp']['stream'] = $this->openIMAPStream($mbox, $flags))) {
                 $this->_openMbox = $mbox;
                 $this->_mboxFlags = $flags;
+                if (empty($mbox)) {
+                    $this->_mboxFlags |= OP_HALFOPEN;
+                }
+
+                if (!empty($_SESSION['imp']['imap_server']['timeout'])) {
+                    foreach ($_SESSION['imp']['imap_server']['timeout'] as $key => $val) {
+                        imap_timeout($key, $val);
+                    }
+                }
                 return true;
             } else {
                 return false;
@@ -142,24 +165,4 @@
         return true;
     }
 
-    /**
-     * Reopen an IMAP stream.
-     *
-     * @param boolean $expunge  Expunge before closing?
-     *
-     * @return boolean  See Auth_imp::authenticate().
-     */
-    function reopenIMAPStream($expunge = false)
-    {
-        $flags = 0;
-        if ($expunge) {
-            $flags = CL_EXPUNGE;
-        }
-
-        @imap_close($_SESSION['imp']['stream'], $flags);
-        unset($_SESSION['imp']['stream']);
-
-        return IMP::checkAuthentication(null, true);
-    }
-
 }


--- orig/lib/IMAP/Tree.php
+++ mod/lib/IMAP/Tree.php
@@ -10,12 +10,12 @@
  * repository.  It provides access functions to iterate through this tree and
  * query information about individual mailboxes.
  *
- * $Horde: imp/lib/IMAP/Tree.php,v 1.25.2.15 2005/08/12 03:43:55 slusarz Exp $
+ * $Horde: imp/lib/IMAP/Tree.php,v 1.25.2.36 2006/04/11 03:22:51 slusarz Exp $
  *
- * Copyright 2000-2005 Chuck Hagenbuch <chuck at horde.org>
- * Copyright 2000-2005 Jon Parise <jon at horde.org>
- * Copyright 2000-2005 Anil Madhavapeddy <avsm at horde.org>
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2000-2006 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Jon Parise <jon at horde.org>
+ * Copyright 2000-2006 Anil Madhavapeddy <avsm at horde.org>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you did not
  * receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -23,7 +23,7 @@
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @author  Jon Parise <jon at horde.org>
  * @author  Anil Madhavapeddy <avsm at horde.org>
- * @author  Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * @author  Michael Slusarz <slusarz at horde.org>
  * @since   IMP 2.3
  * @package IMP
  */
@@ -37,25 +37,28 @@
     var $_vfolders = array();
 
     /**
-     * The default IMP initialization mask to use.
-     *
-     * @var integer
-     */
-    var $_initmask;
-
-    /**
-     * Have we already added additional hierarchy subscription info?
+     * Are we inheriting from the new (i.e. Horde 3.1+) version of IMAP_Tree?
      *
      * @var boolean
      */
-    var $_hsub = false;
+    var $_newimaptree = false;
 
     /**
      * Singleton method.
+     * By default, the tree will contain only currently viewable items and
+     * will be stored in the session under 'imp'.  However, if you would
+     * rather pass different parameters to IMAP_Tree, you may declare a
+     * global variable named $imp_tree_singleton with the array of parameters
+     * you want to pass to IMAP_Tree::singleton().
      */
     function &singleton()
     {
-        return IMAP_Tree::singleton('imp', 'IMP_Tree', true);
+        if (empty($GLOBALS['imp_tree_singleton'])) {
+            return IMAP_Tree::singleton('imp', 'IMP_Tree', true);
+        } else {
+            $ret = call_user_func_array(array('IMAP_Tree', 'singleton'), $GLOBALS['imp_tree_singleton']);
+            return $ret;
+        }
     }
 
     /**
@@ -68,25 +71,24 @@
         global $imp;
 
         $this->_app = 'imp';
-        if ($imp['base_protocol'] != 'pop3') {
-            $this->_delimiter = $imp['delimiter'];
-        }
-        $this->_dotfiles = $imp['dotfiles'];
         $this->_mode = IMAPTREE_MODE_MAIL;
-        $this->_prefix = $imp['folders'];
-        $this->_namespace = $imp['namespace'];
         $this->_server = IMP::serverString();
 
-        /* We just override the init parameter with the following. */
-        $this->_initmask = ($imp['base_protocol'] == 'pop3' ||
-                            !$GLOBALS['prefs']->getValue('subscribe') ||
-                            $imp['showunsub'])
-            ? IMAPTREE_INIT_UNSUB : IMAPTREE_INIT_SUB;
-        if ($GLOBALS['prefs']->getValue('show_sidebar')) {
-            $this->_initmask |= IMAPTREE_INIT_FETCHALL;
+        if ($imp['base_protocol'] != 'pop3') {
+            $ptr = reset($_SESSION['imp']['namespace']);
+            $this->_delimiter = $ptr['delimiter'];
+            if (method_exists($this, 'extendedNamespaceSupport')) {
+                $this->_newimaptree = true;
+                $this->IMAPchildrenSupport($_SESSION['imp']['imap_server']['children']);
+                $this->_namespaces = (empty($GLOBALS['conf']['user']['allow_folders'])) ? array() : $_SESSION['imp']['namespace'];
+            } else {
+                // BC for Horde < 3.1.0
+                $this->_delimiter = $ptr['delimiter'];
+                $this->_prefix = $ptr['name'];
+            }
         }
 
-        parent::IMAP_Tree($this->_initmask);
+        parent::IMAP_Tree(null);
     }
 
     /**
@@ -96,19 +98,29 @@
      */
     function init($init = null)
     {
-        if (is_null($init)) {
-            $init = $this->_initmask;
+        static $already_init = null;
+
+        $initmask = (($GLOBALS['imp']['base_protocol'] == 'pop3') ||
+                     !$GLOBALS['prefs']->getValue('subscribe') ||
+                     $GLOBALS['imp']['showunsub'])
+            ? IMAPTREE_INIT_UNSUB : IMAPTREE_INIT_SUB;
+        if ($GLOBALS['prefs']->getValue('show_sidebar')) {
+            $initmask |= IMAPTREE_INIT_FETCHALL;
         }
-        parent::init($init);
+
+        if ($already_init == $initmask) {
+            return;
+        } else {
+            $already_init = $initmask;
+        }
+        parent::init($initmask);
 
         /* Convert 'INBOX' to localized name. */
         $this->_tree['INBOX']['l'] = _("Inbox");
 
         /* Add virtual folders to the tree. */
-        if (!empty($_SESSION['imp']['vfolder'])) {
-            $this->_vfolders = array();
-            $this->insertVFolders(IMP_VFolder::listVFolders());
-        }
+        $this->_vfolders = array();
+        $this->insertVFolders($GLOBALS['imp_search']->listQueries(true));
     }
 
     /**
@@ -121,7 +133,7 @@
     {
         $id = array();
         foreach ($id_list as $key => $val) {
-            $id[IMP_VFOLDER_PREFIX . $key] = $val;
+            $id[IMP_SEARCH_MBOX . $key] = $val;
         }
 
         if (empty($this->_vfolders)) {
@@ -144,7 +156,7 @@
             foreach ($this->_parent[_("Virtual Folders")] as $val) {
                 $vsort[$val] = $this->_tree[$val]['l'];
             }
-            asort($vsort);
+            natcasesort($vsort);
             $this->_parent[_("Virtual Folders")] = array_keys($vsort);
             $this->_setNeedSort($this->_tree[_("Virtual Folders")], false);
             $this->_changed = true;
@@ -160,8 +172,41 @@
     {
         $boxes = array();
 
-        if (empty($this->_prefix)) {
-            $boxes = $this->_getList('%');
+        if (empty($GLOBALS['conf']['user']['allow_folders'])) {
+            $boxes['INBOX'] = $this->_getMailbox('INBOX');
+            return $boxes;
+        }
+
+        foreach ($_SESSION['imp']['namespace'] as $val) {
+            /* We only need to provide the list of folders in the base
+             * personal namespace.  Else, just use the base namespace entry. */
+            if (($val['type'] == 'personal') || empty($val['name'])) {
+                $query = $val['name'] . '%';
+            } else {
+                if (empty($val['delimiter'])) {
+                    $query = $val['name'];
+                } else {
+                    $query = rtrim($val['name'], $val['delimiter']);
+                }
+                if (isset($tmp[$query])) {
+                    continue;
+                }
+            }
+            $tmp = $this->_getList($query);
+            if (!empty($tmp)) {
+                if ($val['type'] == 'personal') {
+                    /* IMAP servers put the INBOX in the personal namespace -
+                     * simply rename to 'INBOX' since that is where we
+                     * always access the mailbox. */
+                    $inbox_str = $val['name'] . 'INBOX';
+                    if (!empty($val['name']) && isset($tmp[$inbox_str])) {
+                        $tmp = array('INBOX' => $tmp[$inbox_str]) + $tmp;
+                        $tmp['INBOX']->name = 'INBOX';
+                        unset($tmp[$inbox_str]);
+                    }
+                }
+                $boxes = array_merge($boxes, $tmp);
+            }
         }
 
         if (!isset($boxes['INBOX'])) {
@@ -175,16 +220,6 @@
             $this->_sortList($boxes, true);
         }
 
-        /* If we have any additional hierarchies, such as UW's '#shared/', add
-         * them in. */
-        foreach ($GLOBALS['imp']['hierarchies'] as $val) {
-            $tmp = $this->_getMailbox($val);
-            if ($tmp) {
-                $tmp->name = $this->noTrailingDelimiter($tmp->name);
-                $boxes[$tmp->name] = $tmp;
-            }
-        }
-
         return $boxes;
     }
 
@@ -214,7 +249,7 @@
      */
     function &_getStream()
     {
-        return $GLOBALS['imp']['stream'];
+        return $_SESSION['imp']['stream'];
     }
 
     /**
@@ -290,12 +325,16 @@
         }
 
         if (!empty($id) && !$GLOBALS['prefs']->isLocked('nav_poll')) {
+            require_once IMP_BASE . '/lib/Folder.php';
+            $imp_folder = &IMP_Folder::singleton();
             $this->getPollList();
             foreach ($id as $val) {
+                if (!$this->isSubscribed($this->_tree[$val])) {
+                    $imp_folder->subscribe(array($val));
+                }
                 $this->_poll[$val] = true;
                 $this->_setPolled($this->_tree[$val], true);
             }
-            $this->_sortList($this->_poll, true);
             $GLOBALS['prefs']->setValue('nav_poll', serialize($this->_poll));
             $this->_changed = true;
         }
@@ -355,7 +394,7 @@
 
         $ob = &new stdClass;
         $ob->delimiter = $this->_delimiter;
-        $ob->attributes = LATT_NOSELECT | LATT_HASCHILDREN | IMAPTREE_ELT_HAS_CHILDREN | IMAPTREE_ELT_IS_DISCOVERED | IMAPTREE_ELT_IS_SUBSCRIBED | IMPTREE_ELT_VFOLDER;
+        $ob->attributes = LATT_NOSELECT | LATT_HASCHILDREN | IMAPTREE_ELT_IS_DISCOVERED | IMAPTREE_ELT_IS_SUBSCRIBED | IMPTREE_ELT_VFOLDER;
         $ob->fullServerPath = $ob->name = $base;
 
         $elt = $this->_makeMailboxTreeElt($ob);
@@ -405,8 +444,6 @@
     /**
      * Returns a non-IMAP mailbox element given an element identifier.
      *
-     * @abstract
-     *
      * @access private
      *
      * @param string $id  The element identifier.
@@ -429,33 +466,136 @@
      */
     function delete($id)
     {
-        if (!is_array($id) && (strpos($id, IMP_VFOLDER_PREFIX) === 0)) {
+        if (!is_array($id) &&
+            isset($this->_tree[IMP_SEARCH_MBOX . $id]) &&
+            $this->isVFolder($this->_tree[IMP_SEARCH_MBOX . $id])) {
+            $id = IMP_SEARCH_MBOX . $id;
+            $parent = $this->_tree[$id]['p'];
             unset($this->_vfolders[$id]);
+            unset($this->_tree[$id]);
+
+            /* Delete the entry from the parent tree. */
+            $key = array_search($id, $this->_parent[$parent]);
+            unset($this->_parent[$parent][$key]);
+
+            /* Rebuild the parent tree. */
+            $this->_parent[$parent] = array_values($this->_parent[$parent]);
+            $this->_changed = true;
+
+            return true;
         }
         return parent::delete($id);
     }
 
     /**
+     * Rename a current folder.
+     *
+     * @since IMP 4.1
+     *
+     * @param array $old  The old folder names.
+     * @param array $new  The new folder names.
+     */
+    function rename($old, $new)
+    {
+        foreach ($old as $key => $val) {
+            $polled = (isset($this->_tree[$val])) ? $this->isPolled($this->_tree[$val]) : false;
+            if ($this->delete($val)) {
+                $this->insert($new[$key]);
+                if ($polled) {
+                    $this->addPollList($new[$key]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Does the element have any children?
+     *
+     * @see IMAP_Tree::hasChildren()
+     */
+    function hasChildren($elt, $viewable = false)
+    {
+        if ($this->isVFolder($elt) && $this->isContainer($elt)) {
+            return true;
+        }
+        return parent::hasChildren($elt, $viewable);
+    }
+
+    /**
      * Initializes the list of subscribed mailboxes.
      *
-     * @see IMAP_Tree::delete()
+     * @deprecated since Horde 3.1
+     *
+     * @see IMAP_Tree::_initSubscribed()
      */
     function _initSubscribed()
     {
+        $hsub = (is_null($this->_subscribed));
         parent::_initSubscribed();
 
         /* Add in other hierarchy subscription information. */
-        if (!$this->_hsub) {
-            foreach ($GLOBALS['imp']['hierarchies'] as $val) {
-                $sublist = @imap_lsub($this->_getStream(), $this->_server, $this->_prefix . $val . '*');
+        if (!$this->_newimaptree && $hsub) {
+            foreach ($_SESSION['imp']['namespace'] as $val) {
+                $sublist = @imap_lsub($this->_getStream(), $this->_server, $val['name'] . '*');
                 if (!empty($sublist)) {
                     foreach ($sublist as $val2) {
                         $this->_subscribed[substr($val2, strpos($val2, '}') + 1)] = 1;
                     }
                 }
             }
-            $this->_hsub = true;
         }
-     }
+    }
+
+    /**
+     * Returns a list of all IMAP folders in the tree (i.e. not containers or
+     * non-imap elements).
+     *
+     * @todo Move core code to framework.
+     * @since IMP 4.1
+     *
+     * @return array  An array of IMAP mailbox names.
+     */
+    function folderList()
+    {
+        $ret_array = array();
+
+        $mailbox = $this->reset();
+        do {
+            if (!$this->isContainer($mailbox) &&
+                !$this->isVFolder($mailbox)) {
+                $ret_array[] = $mailbox['v'];
+            }
+        } while (($mailbox = $this->next(IMAPTREE_NEXT_SHOWCLOSED)));
+
+        return $ret_array;
+    }
+
+    /**
+     * Is the mailbox open in the sidebar?
+     *
+     * @since IMP 4.1.1
+     *
+     * @param array $mbox  A mailbox name.
+     *
+     * @return integer  True if the mailbox is open in the sidebar.
+     */
+    function isOpenSidebar($mbox)
+    {
+        switch ($GLOBALS['prefs']->getValue('nav_expanded_sidebar')) {
+        case IMAPTREE_OPEN_USER:
+            $this->_initExpandedList();
+            return !empty($this->_expanded[$mbox]);
+            break;
+
+        case IMAPTREE_OPEN_ALL:
+            return true;
+            break;
+
+        case IMAPTREE_OPEN_NONE:
+        default:
+            return false;
+            break;
+        }
+    }
 
 }


--- orig/templates/folders/actions.inc
+++ mod/templates/folders/actions.inc
@@ -1,8 +1,10 @@
 <div class="control">
- &nbsp;<input type="checkbox" class="checkbox" name="checkAll" onclick="toggleSelection()" <?php echo Horde::getAccessKeyAndTitle(_("Check _All/None")) ?> />
+ <?php if ($GLOBALS['browser']->hasFeature('javascript')): ?>&nbsp;<input type="checkbox" class="checkbox" name="checkAll" onclick="toggleSelection()" <?php echo Horde::getAccessKeyAndTitle(_("Check _All/None")) ?> /><?php endif; ?>
  <select name="action_choose<?php echo ($i > 0) ? 1 : 0 ?>" onchange="chooseAction(<?php echo ($i > 0) ? 1 : 0 ?>); document.fmanager.action_choose<?php echo ($i > 0) ? 1 : 0 ?>.selectedIndex = 0;">
    <option selected="selected"><?php echo _("Choose Action:") ?></option>
+<?php if (!empty($GLOBALS['conf']['hooks']['permsdenied']) || (IMP::hasPermission('create_folders') && IMP::hasPermission('max_folders'))): ?>
    <option value="create_folder"><?php echo _("Create Folder") ?></option>
+<?php endif; ?>
    <option value="rename_folder"><?php echo _("Rename Folder(s)") ?></option>
    <option value="delete_folder_confirm"><?php echo _("Delete Folder(s)") ?></option>
    <?php if ($prefs->getValue('subscribe')): ?>
@@ -24,13 +26,17 @@
    <?php if ($imp['file_upload']): ?>
    <option value="import_mbox"><?php echo _("Import Messages") ?></option>
    <?php endif; ?>
+   <option value="rebuild_tree"><?php echo _("Rebuild Folder Tree") ?></option>
  </select>
+ <?php if (!$GLOBALS['browser']->hasFeature('javascript')): ?>
+ <input name="btn_action" type="submit" class="button" value="<?php echo _("Go"); ?>" />
+ <?php endif; ?>
  <?php echo Help::link('imp', 'folder-options') ?>
  &nbsp;
  <?php if ($prefs->getValue('subscribe')): ?>
- <?php echo Horde::widget("javascript:submitAction('toggle_subscribed_view')", $subToggleText, 'widget', '', '', $subToggleText, true); ?>&nbsp;|
+ <?php echo Horde::widget(Util::addParameter($folders_url, 'actionID', 'toggle_subscribed_view'), $subToggleText, 'widget', '', '', $subToggleText, true); ?>&nbsp;|
  <?php endif; ?>
- <?php echo Horde::widget("javascript:submitAction('expand_all_folders')", _("Expand All Folders"), 'widget', '', '', _("Expand All"), true); ?>&nbsp;|
- <?php echo Horde::widget("javascript:submitAction('collapse_all_folders')", _("Collapse All Folders"), 'widget', '', '', _("Collapse All"), true); ?>&nbsp;
+ <?php echo Horde::widget(Util::addParameter($folders_url, 'actionID', 'expand_all_folders'), _("Expand All Folders"), 'widget', '', '', _("Expand All"), true); ?>&nbsp;|
+ <?php echo Horde::widget(Util::addParameter($folders_url, 'actionID', 'collapse_all_folders'), _("Collapse All Folders"), 'widget', '', '', _("Collapse All"), true); ?>&nbsp;
  <?php echo Help::link('imp', 'folder-widgets') ?>
 </div>


--- orig/index.php
+++ mod/index.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/index.php,v 2.73.10.1 2005/01/03 12:25:31 jan Exp $
+ * $Horde: imp/index.php,v 2.73.10.3 2006/01/01 21:28:50 jan Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/po/et_EE.po
+++ mod/po/et_EE.po
@@ -1,74 +1,204 @@
 # IMP ESTONIAN TRANSLATION
-# Toomas Aas <toomas.aas at mail.ee>, 2002 
+# Toomas Aas <toomas.aas at mail.ee>, 2002 - 2006 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0-cvs\n"
-"POT-Creation-Date: 2002-03-30 21:05+0200\n"
-"PO-Revision-Date: 2004-06-02 10:49+0200\n"
+"Project-Id-Version: IMP 4.1-cvs\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2006-03-29 23:15+0300\n"
 "Last-Translator: Toomas Aas <toomas.aas at mail.ee>\n"
 "Language-Team: Estonian <dev at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: lib/Compose.php:418
+msgid "      Cc: "
+msgstr "  Koopia: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr " Kellele: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr " Kuupäev: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr " Kellelt: "
 
-msgid " - $nm new message"
-msgstr " - $nm uus kiri"
-
-msgid " - $nm new messages"
-msgstr " - $nm uut kirja"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr " (Kiirklahv %s)"
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "   Teema: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
-msgstr ""
+msgstr " "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
-msgstr ""
+msgstr "Nr"
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr ""
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr "%.2fMB / %.2fMB (%.2f%%)"
+
+#: thread.php:151
+#, php-format
+msgid "%d Messages"
+msgstr "%d kirja"
+
+#: mailbox.php:176
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "%d kirja kustutati."
+
+#: lib/Spam.php:178
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "%d ekslikult rämpspostiks arvatud kirja edastati süsteemihaldurile."
 
-#, c-format
-msgid "%d of %d Messages"
-msgstr "%d kiri %d-st"
+#: lib/Spam.php:158
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "%d ekslikult rämpspostiks arvatud kirja edastatud."
+
+#: lib/Spam.php:170
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "%d rämpskirja edastati süsteemihaldurile."
+
+#: lib/Spam.php:150
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "%d rämpskirja edastatud."
 
-#, c-format
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "Kirjad %d kuni %d, kokku %d"
 
-#, c-format
-msgid "%s Standard"
-msgstr ""
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s on juba olemas. Sinu %s kausta ei nimetatud ümber."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr "%s ei näi olevat korrektne kirjakast."
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s kaust nimetatakse ümber kuu alguses."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr "%s nõustus."
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr "%s tühistas %s."
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr "%s ei nõustunud."
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr "%s vastas vaba/hõivatud päringule."
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr "%s vastas %s kutsele."
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr "%s saatis sulle vaba/hõivatud info."
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr "%s nõustus esialgselt."
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s soovib sinu vaba/hõivatud infot."
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr "%s palub sul osaleda %s-l."
+
+#: lib/Message.php:414
+#, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s lisati \"%s\"-sse."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr "%s soovib parandadad %s."
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr "%s soovib teavitada sind %s-st."
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr "%s soovib värskeimat teavet %s kohta."
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;/&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Salvesta need muutused ja mine järgmisele ekraanile.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(ära salvesta muutusi ja mine tagasi kirja juurde.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Tekst)"
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -76,46 +206,186 @@
 "(Mine tagasi kirja juurde säilitades kõik seni salvestatud muudatused. "
 "Sellel ekraanil tehtud muudatusi EI SALVESTATA.)"
 
+#: spelling.php:277
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Saada kiri ära, säilitades kõik seni salvestatud muudatused. Sellel "
+"ekraanil tehtud muudatusi EI SALVESTATA.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Lisa need vajutades OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Palun vali aadress(id) *"
 
-#, c-format
-msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
-msgstr ""
-"<p><i>See kiri on kirjutatud sinu omast erinevas märgistikus. Kui seda "
-"korralikult ei näidata, %svajuta siia</a> ja see avaneb uues aknas.</i></p>\n"
+#: mailbox.php:174
+msgid "1 message has been deleted."
+msgstr "1 kiri kustutati."
+
+#: lib/Spam.php:180
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "1 ekslikult rämpspostiks arvatud kiri edastati süsteemihaldurile."
+
+#: lib/Spam.php:160
+msgid "1 message has been reported as not spam."
+msgstr "1 ekslikult rämpspostiks arvatud kiri edastatud."
+
+#: lib/Spam.php:172
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "1 rämpskiri edastati süsteemihaldurile."
+
+#: lib/Spam.php:152
+msgid "1 message has been reported as spam."
+msgstr "1 rämpskiri edastatud."
+
+#: config/prefs.php.dist:819
+msgid "100 characters"
+msgstr "100 märki"
+
+#: config/prefs.php.dist:822
+msgid "1000 characters"
+msgstr "1000 märki"
+
+#: config/prefs.php.dist:820
+msgid "250 characters"
+msgstr "250 märki"
+
+#: config/prefs.php.dist:821
+msgid "500 characters"
+msgstr "500 märki"
+
+#: lib/MIME/Viewer/images.php:162
+msgid "A large image named %s is attached to this message."
+msgstr "Selle kirjaga on kaasas suur pilt nimega %s."
 
-msgid "Action"
-msgstr "Tegevus"
+#: lib/MIME/Viewer/notification.php:50
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr "Sinu saadetud kiri põhjustas saaja poolse vastuteate."
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr "JA"
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr "Nõustu"
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr "Nõustu ja lisa kalendrisse"
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr "Nõus"
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr "Nõus: "
+
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr "Konto nimi:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+msgid "Actions"
+msgstr "Tegevused"
+
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Lisa %s minu aadressiraamatusse"
+
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "Lisa allikas"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr "Lisa see minu kalendrisse"
+
+#: compose.php:1256
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr "Lisasin lisandi \"%s\"."
 
-#, c-format
-msgid "Add to Addressbook (%s)"
-msgstr "Lisa aadressiraamatusse (%s)"
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+"Täiendavad päised mida näidata kirja vaatamisel: <em>(pole kohustuslik, "
+"kirjuta iga päis omaette reale)</em>"
 
-msgid "Added an attachment."
-msgstr "Lisasin lisandi."
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr "Lisateavet võid vaadata %s."
+
+#: lib/MIME/Viewer/notification.php:62
+msgid "Additional information details"
+msgstr "Lisateave"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr "Täiendav teave kirja kohta"
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr "Lisateavet kirja kohta võid vaadata %s."
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr "Veateate üksikasjad"
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr "Veateate üksikasju võid vaadata %s."
 
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-msgid "Addressbooks"
+#: config/prefs.php.dist:134
+msgid "Address Books"
 msgstr "Aadressiraamatud"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Kõik kirjad kaustades lähevad kaotsi!"
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+"Aadressid kuhu saata pimekoopia kõigist kirjadest: <em>(pole kohustuslik, "
+"kirjuta iga aadress omaette reale)</em>"
 
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+"Aadressid, mis seostada kindlalt selle identiteediga: <em>(pole kohustuslik, "
+"kirjuta iga aadress omaette reale)</em>"
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Kõik"
+
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Kõik kirjad järgmistes kaustades salvestatakse ühte MBOX faili:"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
@@ -123,130 +393,344 @@
 "Kõik kirjad sinu \"%s\" kaustas mis on vanemad kui %s päeva kustutatakse "
 "jäädavalt."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "Kõik lingitud lisandid, mis on rohkem kui %s kuud vanad, kustutatakse."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Kõik saadetud kirjade kaustad, mis on rohkem kui %s kuud vanad, kustutatakse."
 
-msgid "All"
-msgstr "Kõik"
-
-msgid "An unknown error occured adding the new entry."
-msgstr "Uue sissekande lisamisel tekkis tundmatu viga."
-
-msgid "Answered messages"
-msgstr "Vastatud kirjad"
+#: acl.php:85
+#, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Kõik õigused kaustale \"%s\" võeti kasutajalt \"%s\" ära."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Luba luua kaustu"
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr "Luba rakendada filtreid mistahes kirjakastile"
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr "Selle kirja osa teistsugsed kujud:"
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr "Alati"
+
+#: config/prefs.php.dist:557
+msgid "Always save attachments"
+msgstr "Salvesta alati lisandid"
 
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr "Lisandi eemaldamisel tekkis viga. IMAP server ütles: "
+
+#: lib/Message.php:388
+msgid "An unknown error occured while creating the new note."
+msgstr "Uue sissekande lisamisel tekkis ennenägematu viga."
+
+#: lib/Message.php:387
+msgid "An unknown error occured while creating the new task."
+msgstr "Uue ülesande lisamisel tekkis ennenägematu viga."
+
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Vastatud"
 
-msgid "Apply All Rules"
-msgstr "Rakenda kõiki reegleid"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Vastatud kirjad"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+msgid "Apply Filters"
 msgstr "Rakenda filtreid"
 
-msgid "Apply filter rules upon logging on."
-msgstr "Rakenda filtrit sisselogimisel."
-
-msgid "Apply filter rules when mailbox is refreshed."
-msgstr "Rakenda filtrit kirjakasti värskendamisel"
-
-msgid "April"
-msgstr "Aprill"
+#: templates/mailbox/header.inc:7
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "Rakenda filtreid %s-le"
+
+#: templates/filters/prefs.inc:36
+msgid "Apply filter rules upon logging on?"
+msgstr "Rakenda filtreid sisselogimisel"
+
+#: templates/filters/prefs.inc:42
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr "Rakenda filtreid alati kui avatakse INBOX"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+msgid "Are you sure you want to delete this public key?"
+msgstr "Kas oled kindel et soovid selle avaliku võtme kustutada?"
 
-msgid "Are you SURE you want to continue?"
-msgstr "Kas oled KINDEL et soovid jätkata?"
-
-msgid "Are you completely sure you wish to continue?"
-msgstr "Kas oled täiesti kindel et soovid jätkata?"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+"Kas soovid kindlasti kustutada oma võtmepaari? (See EI OLE soovitatav!)"
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Kas oled kindel et soovid seda?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Kas oled kindel et soovid need kirjad JÄÄDAVALT kustutada?"
 
+#: lib/MIME/Contents.php:215
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Kas oled kindel et soovid selle lisandi JÄÄDAVALT kustutada?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Kas oled kindel et soovid selle kausta tühjendada?"
 
+#: lib/IMP.php:973
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Kas oled kindel et soovid rämpsposti kausta tühjendada?"
+
+#: lib/IMP.php:966
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "Kas oled kindel et soovid prügikasti tühjendada?"
+
+#: templates/mailbox/actions.inc:8
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Kas oled kindel et soovid need kirjad jäädavalt kustutada?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Kas oled kindel et soovid selle kirja õigeks mõista?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Kas oled kindel et soovid selle kirja rämpspostiks mõista?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Saabumise aeg"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Kasvav"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr "Küsi"
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Lisa"
 
+#: templates/compose/compose.inc:475
+msgid "Attach Files"
+msgstr "Lisa failid"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "Lisa kirjale oma PGP avalik võti?"
+
+#: lib/MIME/Viewer/tnef.php:109
+msgid "Attached File:"
+msgstr "Lisatud fail:"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+"Lisatav fail \"%s\" ületab lisandi suuruse piirmäära. Faili EI lisatud."
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "Lisas on vastus sinu kalendrikandele."
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Lisand"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr "Lisand eemaldatud: Algne lisandi tüüp"
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Lisandid"
 
-msgid "August"
+#: lib/MIME/Viewer/itip.php:682
+msgid "Attendees"
+msgstr "Osalejad"
+
+#: lib/MIME/Viewer/notification.php:53
+msgid "Attention"
+msgstr "Tähelepanu"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr "Auth_imp: Vajalikku IMAP laiendust ei leitud."
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
 msgstr ""
+"Näita automaatselt pilte HTML kirjades kui saatja on minu aadressiraamatus"
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
 msgstr "Kasutatavad aadressiraamatud:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr "Pole vastanud"
+
+#: templates/message/navbar_navigate.inc:26
+#, php-format
+msgid "Bac_k to %s"
+msgstr "Ta_gasi kausta %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
-msgstr "Tagasi %s'i"
+msgstr "Tagasi kausta %s"
 
-msgid "Barbie"
-msgstr ""
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Tagasi kirjade loetelu vaatesse"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Tagasi jutulõnga vaatesse"
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Vigane või valesti esitatud päring. Server vastas: %s"
 
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr "Järgneb kättetoimetamisteate algtekst."
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Must nimekiri"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr "Tõkesta vaikimisi pildid HTML kirjades"
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Keha"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Mõlemad"
 
-msgid "Brown"
-msgstr "Pruun"
-
-msgid "Camouflage"
-msgstr "Maskeering"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr "Nii päistes kui kirja sees"
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr "_Märgistik"
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr "Kalender"
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr "Ei saa ühendust välise postiserveriga."
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr "Ei saa ühendust välise postiserveriga: "
 
-msgid "Cancel Message"
-msgstr "Loobu kirjast"
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+"Ei saa näidata - kirjakastist leiti ainult selle kirja %s osa, aga olema "
+"peaks %s."
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Loobu"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Loobu kirjast"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Sellest kirjast loobumisega läheb tema sisu igaveseks kaotsi."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Koopia"
 
-msgid "Cc:"
-msgstr "Koopia:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr "Sertifikaati ei saa importida. Serverisse pole võimalik faile laadida."
+
+#: lib/MIME/Viewer/itip.php:701
+msgid "Chair Person"
+msgstr "Juhataja"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Muuda"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Muuda kõik"
 
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Muuda kausta"
 
+#: config/prefs.php.dist:112
 msgid ""
-"Change display options such as the color scheme, how many messages you see "
-"on each page and how messages are sorted."
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
 msgstr ""
-"Muuda ekraani seadeid, näiteks värviskeemi, mitut kirja näed korraga "
-"ekraanil ja kuidas on kirjad sorteeritud."
+"Muuda ekraani seadeid, näiteks seda, mitut kirja näed korraga ekraanil ja "
+"kuidas on kirjad järjestatud."
 
-msgid "Change mail server settings."
-msgstr "Muuda postiserveri seadeid."
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr "Muuda postiserveri ja kaustade seadeid."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -254,95 +738,297 @@
 "Muuda nime, aadressi ja allkirja mida inimesed näevad kui nad sinu kirja "
 "loevad ja sellele vastavad."
 
-msgid "Change"
-msgstr "Muuda"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr "Näidatavad märgid:"
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
-msgstr "Kontrolli kas kausta(de)s on uusi kirju"
+msgstr "Kontrolli kausta(de)s värsket posti"
 
-msgid "Checkbox"
-msgstr ""
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr "Märgi/tühjenda _kõik"
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr "Märgi kõik postiserverid, kust soovid kirju tirida:"
 
+#: config/prefs.php.dist:463
+msgid "Check spelling before sending a message?"
+msgstr "Kontrolli enne saatmist õigekirja"
+
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Vali tegevus:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:182
+msgid "Choose a mail server:"
+msgstr "Vali postiserver:"
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr "Vali sobiv või sisesta aadress siia:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+msgid "Choose an action:"
+msgstr "Vali tegevus:"
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
 msgstr "Vali aadressiraamat kuhu aadresse lisada."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Vali aadressiraamatute järjekord mida kasutada aadresside leidmiseks."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Kõik kirjad %s-st said kustutatud."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+"Klõpsa %s, teisendamaks pilt kujule mida su veebilehitseja mõistab näidata."
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr "Klõpsa %s pildi salvestamiseks."
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr "Klõpsa %s et minna %s halduse lehele."
+
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Klõpsa %s et vaadata HTMLi eraldi aknas."
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr "Klõpsa %s, nägemaks selle pildi eelvaadet."
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Klõpsa %s, nägemaks lisandit eraldi aknas."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Klõpsa %s, nägemaks seda multipart/related osa eraldi aknas."
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr "Klõpsa siia et NÄHA pilte"
 
+#: templates/prefs/sourceselect.inc:321
 msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
+"Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
 "Klõpsa ühe oma valitud aadressiraamatu peal ja siis vali kõik väljad millest "
 "otsida."
 
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr "Klõpsa et salvestada PGP avalik võti aadressiraamatusse"
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr "Klõpsa et salvestada %s S/MIME sertifikaat oma aadressiraamatusse"
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr "Aadressil klõpsates alustad uut kirja saatjale"
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr "Aadressil klõpsates avad kirja lugemiseks"
+
+#: templates/fetchmail/fetchmail.inc:28
+msgid "Close"
+msgstr "Sule"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr "Sule aken"
+
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Kaust suletud"
 
-msgid "Collapse All Folders"
-msgstr "Sule kõik kaustad"
+#: folders.php:449
+msgid "Collapse"
+msgstr "Sule"
 
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Sule kõik"
 
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Sule kõik kaustad"
+
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Sule kaust"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Uus kiri (%s)"
-
-msgid "Compose a message"
-msgstr "Kirja koostamine"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr "Värv:"
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: lib/MIME/Viewer/itip.php:769
+msgid "Completed"
+msgstr "Lõpetatud"
+
+#: compose.php:827 compose.php:1147
+msgid "Compose another message"
+msgstr "Kirjuta veel üks kiri"
 
-msgid "Compose messages in a separate window."
+#: config/prefs.php.dist:434
+msgid "Compose messages in a separate window?"
 msgstr "Kirjuta kirjad eraldi aknas."
 
-msgid "Compose"
-msgstr "Kirjuta"
-
-msgid "Contact List"
-msgstr "Aadresside nimekiri"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr "Kirjuta kirjad HTML kujul (kui veebilehitseja seda võimaldab)"
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr "Määra, kuidas kirju näidatakse."
+
+#: config/prefs.php.dist:97
+msgid "Configure mail preview options."
+msgstr "Muuda kirja eelvaate määranguid."
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "IMAP server katkestas ühenduse."
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr "Ühendus serveriga nurjus"
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr "Kontrolli %s PGP toetust."
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr "Kontrolli %s S/MIME toetust."
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Kirjade otsimise seaded"
 
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"Määra millal kontrollida uute kirjade saabumist ja kas anda sulle märku kui "
+"Määra, millal kontrollida uute kirjade saabumist ja kas anda sulle märku kui "
 "nad saabuvad."
 
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "Teisenda tekstikujul emotikonid graafilisteks"
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Kopeeri"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+msgid "Copy to folder"
+msgstr "Kopeeri kausta"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
-msgstr "Õige"
+msgstr "Paranda"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Parandatud tekst"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
-msgstr "Ei õnnestunud kustutada kirju %s-st: %s"
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Päring nurjus. Põhjus: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr "Ei saanud luua VFS süsteemi: %s"
+
+#: lib/Message.php:640
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "Ei õnnestunud kustutada kirju %s-st. Server ütles: %s"
+
+#: lib/Session.php:318
+msgid "Could not execute maintenance operations."
+msgstr "Hooldustööde käivitamine nurjus."
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr "Soovitud faili ei saanud MS-TNEF lisandist kätte."
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "Soovitud faili ei saanud Zip arhiivist kätte."
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Ei saanud kätte IMAP serveri nimeinfot."
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Salvesta"
 
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Loo kaust"
 
+#: templates/pgp/pgp.inc:137
+msgid "Create Keys"
+msgstr "Loo võtmed"
+
+#: templates/search/header.inc:14
+msgid "Create Virtual Folder"
+msgstr "Loo virtuaalkaust"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Loo uus konto"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Loo uus rämpsposti kaust"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Loo uus mustandite kaust"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Loo uus saadetud kirjade kaust"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Loo uus prügikaust"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -350,830 +1036,2818 @@
 "Loo filtreerimisreeglid et korrastada oma saabuvat posti, sorteerida see "
 "kaustadesse ja kustutada rämpspost."
 
-msgid "Create"
-msgstr "Uus"
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Loo uus kirjamall"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Kirjamallide loomine"
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr "Praegune juurdepääs %s-le"
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr "Määra kontod mujalt posti tirimiseks."
+
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr "Määra, kuidas saata kirju."
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "Määra kuidas saata kirju ja kuhu salvestada mustandeid."
-
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Korralda hooldustöid mida tehakse %s-i sisselogimisel automaatselt."
-
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Korralda töid mida tehakse %s-i sisselogimisel automaatselt."
 
+#: templates/mailbox/message_headers.inc:17
+msgid "Dat_e"
+msgstr "_Kuupäev"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Kuupäev"
 
-msgid "December"
-msgstr "Detsember"
+#: lib/MIME/Viewer/itip.php:757
+msgid "Declined"
+msgstr "Tagasi lükatud"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr "Tagasi lükatud: "
+
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr "Vaikimisi otsinguväli"
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
-msgstr "Vaikimisi sorteerimine:"
+msgstr "Vaikimisi otsingutingimus:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
-msgstr "Vaikimisi sorteerimise suund:"
+msgstr "Vaikimisi järjestuse suund:"
+
+#: lib/MIME/Viewer/itip.php:765
+msgid "Delegated"
+msgstr "Delegeeritud"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Kustuta"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr "Kustuta %s avalik võti"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr "Kustuta võtmed"
 
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Kustuta kaust(ad)"
 
-msgid "Delete messages"
-msgstr "Kustuta kirjad"
+#: folders.php:285
+msgid "Delete Selected Folders"
+msgstr "Kustuta valitud kaustad"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Kustuta kirjamall"
+
+#: folders.php:419
+msgid "Delete Virtual Folder"
+msgstr "Kustuta virtuaalkaust"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr "Kustuta tiritud kirjad välisest serverist"
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr "Kustuta minu kalendrist"
+
+#: config/prefs.php.dist:368
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Kustuta vanad lingitud lisandid kuu alguses"
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:350
+msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Kustuta vanad saadetud kirjade kaustad kuu alguses"
 
-msgid "Delete"
-msgstr "Kustuta"
+#: config/prefs.php.dist:617
+msgid "Delete spam messages"
+msgstr "Kustuta rämpskirjad"
 
-msgid "Deleted an attachment."
-msgstr "Lisand kustutatud."
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Kustutatud"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Kustutatud kirjad"
 
-msgid "Deleted"
-msgstr "Kustutatud"
+#: compose.php:307
+#, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Lisand \"%s\" kustutatud."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Kirjade kustutamine ja ümbertõstmine"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr "Keeldu"
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr "Lükka tagasi vaba/hõivatud info päring"
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Kahanev"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr "Üksikasjad"
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Näita allkirja tuhmilt"
 
-msgid "Display Options"
-msgstr "Ekraani seaded"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Näita"
 
-msgid "Display message when filters have been applied."
-msgstr "Näita kirja pärast filtrite rakendamist."
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr "Näita pärast kirja saatmist kinnitust"
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr "Kirja sees"
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+msgid "Display pop-up notification of new mail?"
 msgstr "Anna märku uute kirjade saabumisest."
 
-msgid "Display"
-msgstr "Ekraani seaded"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Näita menüüribal \"Eemalda rämpspost\" linki"
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Näita menüüribal \"Tühjenda prügikast\" linki"
+
+#: templates/compose/attachments.inc:11
+msgid "Disposition"
+msgstr "Paigutus"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr "EI sisalda"
 
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
-msgstr "Ära kontrolli kausta(de)s uute kirjade olemasolu"
+msgstr "Ära kontrolli kausta(de)s värsket posti"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr "Ära tekita Kellelt: veerus linki"
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Kas tahad avada selle kausta?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr "Sul pole kasutajakontot? Registreeru."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Valmis"
 
-#, c-format
-msgid "Download %s"
-msgstr "Kopeeri %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr "Salvesta %s .zip vormingus"
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr "Salvesta kõik lisandid (.zip failina)"
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
-msgstr "Kopeeri kaust(ad)"
-
-msgid "Download"
-msgstr "Kopeeri"
+msgstr "Salvesta kaust(ad)"
 
+#: templates/folders/actions.inc:21
+msgid "Download Folder(s) [.zip format]"
+msgstr "Salvesta kaust(ad) [.zip vormingus]"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr "Salvesta .zip vormingus"
+
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Mustand"
 
+#: folders.php:392
+msgid "Draft folder"
+msgstr "Mustandite kaust"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Mustandite kaust:"
 
-msgid "Edit your filter rules"
-msgstr "Paranda filtreerimisreegleid"
-
-msgid "Edit your identities"
-msgstr "Paranda oma identiteete"
+#: templates/pgp/pgp.inc:108
+msgid "E-mail Address"
+msgstr "E-posti aadress"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr "LÕPP"
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr "VIGA: kirja ei õnnestunud kätte toimetada."
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
-msgstr "Paranda"
+msgstr "Muuda"
 
-msgid "Email"
-msgstr "E-mail"
+#: templates/filters/prefs.inc:18
+msgid "Edit Blacklist"
+msgstr "Muuda musta nimekirja"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit Filters"
+msgstr "Muuda filtreid"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr "Muuda virtuaalset kausta"
+
+#: templates/mailbox/header.inc:13
+msgid "Edit Virtual Folder Definition for %s"
+msgstr "Muuda %s virtuaalse kausta määratlust"
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr "Muuda valget nimekirja"
+
+#: templates/filters/prefs.inc:18
+msgid "Edit your blacklist"
+msgstr "Muuda oma musta nimekirja"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Muuda filtreerimisreegleid"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr "Muuda välistele e-posti kontodele juurdepääsu seadeid."
+
+#: templates/filters/prefs.inc:23
+msgid "Edit your whitelist"
+msgstr "Muuda oma valget nimekirja"
+
+#: templates/contacts/contacts.inc:239
+msgid "Email Address"
+msgstr "E-posti aadress"
+
+#: lib/Message.php:657
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "Kõik kirjad %s-st said kustutatud."
 
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
-msgstr "Kustuta kaust(ad)"
+msgstr "Tühjenda kaust(ad)"
+
+#: folders.php:286
+msgid "Empty Selected Folders"
+msgstr "Tühjenda märgitud kaustad"
 
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
-msgstr "Tühjenda prügikaust"
+msgstr "Tühjenda prügikast"
+
+#: lib/IMP.php:973
+msgid "Empty _Spam"
+msgstr "Tühjenda _Rämpspost"
+
+#: lib/IMP.php:966
+msgid "Empty _Trash"
+msgstr "Tühjenda _prügikast"
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr "Võimalda PGP kasutamine"
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr "Võimalda S/MIME kasutamine"
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr "Luba näidata kirja eelvaadet"
 
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr "_Krüptimise seaded"
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr "Lõpp"
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Edastatud kirja lõpp"
 
+#: lib/Compose.php:341
+msgid "End message"
+msgstr "Kirja lõpp"
+
+#: lib/Compose.php:339
+#, php-format
+msgid "End message from %s"
+msgstr "%s kirja lõpp"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr "Sisesta salasõna"
+
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Sisesta uue rämpsposti kausta nimi"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Sisesta uue mustandite kausta nimi"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Sisesta uue saadetud kirjade kausta nimi"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Sisesta uue prügikausta nimi"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+msgid "Entire Message"
+msgstr "Kogu kiri"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" lisati aadressiraamatusse"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
+msgid "Error"
+msgstr "Viga"
+
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Viga IMAP serveriga ühendumisel. %s: %s."
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr "Viga vastuse saatmisel: %s."
+
+#: lib/MIME/Viewer/itip.php:101
+msgid "Event successfully deleted."
+msgstr "Sündmus õnnestus kustutada."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Iga 15 minuti tagant"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Iga 30 sekundi tagant"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Iga 5 minuti tagant"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Iga poole tunni tagant"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Kord minutis"
 
-msgid "Expand All Folders"
-msgstr "Ava kõik kaustad"
+#: folders.php:457
+msgid "Expand"
+msgstr "Ava"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Ava kõik"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Ava kõik kaustad"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Ava kaust"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Lahenda nimed"
 
-msgid "Expand the entire folder tree by default in the folders view."
-msgstr "Kaustade vaates ava vaikimisi terve kaustapuu"
-
-msgid "February"
-msgstr "Veebruar"
-
-msgid "Field"
-msgstr "Väli"
-
-msgid "Filename"
-msgstr "Faili nimi"
-
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Filtri rakendamine: Kiri \"%s\" \"%s\"-st kustutati."
-
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr "Filtri rakendamine: Kiri \"%s\" \"%s\"-st tõsteti kausta \"%s\"."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr "Lahenda nimed uue kirja aknas automaatselt"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr "Filtri rakendamine: Kiri \"%s\" \"%s\"-st tõsteti sinu prügikausta."
+#: config/prefs.php.dist:980
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr "Kaustade vaates ava vaikimisi terve kaustapuu"
 
-msgid "Filter Rules"
-msgstr "Filtreerimisreeglid"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+msgid "Expanding"
+msgstr "Lahendan nimesid"
+
+#: lib/IMP.php:984 lib/IMP.php:986
+msgid "F_etch Mail"
+msgstr "_Tiri kirju"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+msgid "Fetch Mail"
+msgstr "Kirjade tirimine"
+
+#: config/prefs.php.dist:869
+msgid "Fetch Mail in a separate window?"
+msgstr "Tiri kirju eraldi aknas."
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "Tiri kirjad sisselogimisel"
+
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Tirisin %d kirja kontolt %s"
+
+#: lib/Fetchmail.php:287
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Tirisin 1 kirja kontolt %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr "Fetchmail:"
+
+#: lib/Fetchmail.php:291
+msgid "Fetchmail: no new messages."
+msgstr "Fetchmail: uusi kirju pole."
+
+#: lib/IMP.php:990
+msgid "Fi_lters"
+msgstr "_Filtrid"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+msgid "File"
+msgstr "Fail"
+
+#: templates/filters/prefs.inc:31
+msgid "Filter Options"
+msgstr "Filtreerimise seaded"
+
+#: templates/filters/prefs.inc:9
+msgid "Filter Settings"
+msgstr "Filtri seaded"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+msgid "Filter message content for profanity?"
 msgstr "Filtreeri kirjade sisu."
 
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr "Filtrite kasutamise võimalus selles süsteemis puudub."
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtrid"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr "Filtrid EI OLE aktiivsed."
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr "Filtrid: %s halduse leht"
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Leia"
 
+#: config/prefs.php.dist:905
+msgid "First Mailbox Page"
+msgstr "Postkasti esimene lehekülg"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Esimene lehekülg"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+msgid "Fo_rward"
+msgstr "_Edasta"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Kaustatoimingud - kinnitus"
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
-msgstr "Kaustapuu"
+msgstr "Kaustasirvija"
 
-msgid "Folder Prefix"
-msgstr "Kaustade prefiks"
-
-msgid "Folders"
-msgstr "Kaustad"
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "Kaustade ülevaade"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr "Kaustade jagamine pole võimalik."
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr "Kaustade kasutamine pole võimalik."
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr "Tänaste kirjade kuupäeva esitus postkasti vaates"
 
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Edasta"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Edasta:"
 
-#, c-format
+#: lib/Compose.php:369
+msgid "Forwarded message"
+msgstr "Edastatud kiri"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Edastatud kiri %s'lt"
 
-msgid "From Address"
-msgstr "Saatja aadress"
+#: lib/MIME/Viewer/itip.php:483
+msgid "Free/Busy Information"
+msgstr "Vaba/hõivatud info"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr "Vaba/hõivatud vastus"
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr "Vaba/hõivatud päring"
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr "Vastus vaba/hõivatud päringule"
+
+#: templates/mailbox/message_headers.inc:27
+msgid "Fro_m"
+msgstr "Kellel_t"
 
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Kellelt"
 
-msgid "From:"
-msgstr "Kellelt:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "Saatja aadress"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
-msgstr ""
-
-msgid "Green"
-msgstr "Roheline"
+msgstr "Fwd:"
 
-msgid "Grey"
-msgstr "Hall"
+#: compose.php:1294
+msgid "Fwd: "
+msgstr "Fwd:"
+
+#: compose.php:1296
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Fwd: %u edastatud kirja"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "Muud seaded"
 
-msgid "Help"
-msgstr "Abi"
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "Tiri ainult uued kirjad (ainult IMAP)"
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr "Mine"
+
+#: thread.php:136
+msgid "Go to Message"
+msgstr "Kirja juurde"
+
+#: lib/IMP.php:498
+msgid "Go to address book entry of \"%s\""
+msgstr "Ava \"%s\" kanne aadressiraamatus"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr "Anna juurdepääs"
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr "SIIN"
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr "HTML"
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr "Kirja HTML variant"
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr "Päised"
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr "Siin on kiri mis sul pooleli jäi:"
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr "Peidetud"
+
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr "Jutulõnga vaates peidetud"
 
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Peida kustutatud"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Peida tellimata"
 
-msgid "How to prefix quoted lines in a reply:"
-msgstr "Kuidas eristada tsiteeritud teksti vastuses:"
-
-msgid "IMP is not properly configured"
-msgstr "IMP ei ole korralikult häälestatud"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr "Kõrge"
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr "Kõrge prioriteet"
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr "Kõrgeim"
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr "Kuidas soovid lisandeid näidata?"
+
+#: config/prefs.php.dist:504
+msgid "How to attribute quoted lines in a reply"
+msgstr "Kuidas alustada tsiteeritud teksti vastuses"
+
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr "IMAP"
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr "IMAP (protokolli automaattuvastus)"
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP server katkestas ühenduse. Server vastas: %s"
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr "IMAP üle SSLi"
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP üle SSLi (iseallkirjastatud sertifikaat)"
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr "IMAP üle SSLi (iseallkirjastatud)"
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP server katkestas ühenduse."
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr "IMAP ilma TLSita"
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr "IMAP/POP3 postiserverid"
 
+#: lib/IMP.php:866
 msgid "INBOX"
-msgstr ""
+msgstr "INBOX"
 
-msgid "Identities"
-msgstr "Identiteedid"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr "SSL või TLS kasutamiseks peab olema laetud PHP openssl laiendus."
 
-msgid "Identity"
-msgstr "Identiteet"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Kui jätkad, hävivad kõik kirjad kausta(de)s!"
 
-msgid "Identity's name:"
-msgstr "Identiteedi nimi:"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignoreeri"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignoreeri kõiki"
 
-msgid "Ignore"
-msgstr "Ignoreeri"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Pilt"
+
+#: templates/folders/import.inc:20
+msgid "Import"
+msgstr "Import"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+msgid "Import Key"
+msgstr "Impordi võti"
+
+#: templates/pgp/pgp.inc:139
+msgid "Import Keypair"
+msgstr "Impordi võtmepaar"
+
+#: templates/folders/actions.inc:27
+msgid "Import Messages"
+msgstr "Impordi kirjad"
+
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr "Impordi PGP võti"
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Impordi isiklik sertifikaat"
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr "Impordi isiklik salajane PGP võti"
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr "Impordi isiklik avalik PGP võti"
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr "Impordi isiklikud S/MIME sertifikaadid"
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr "Impordi avalik võti"
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr "Impordi avalik PGP võti"
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr "Impordi avalik S/MIME võti"
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr "Impordi S/MIME võti"
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr "Impordi mbox fail"
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr "Impordi mbox fail %s kausta %s."
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
+msgid "Important"
+msgstr "Tähtis"
 
+#: templates/search/main.inc:47
 msgid "Important messages"
 msgstr "Tähtsad kirjad"
 
-msgid "Important"
-msgstr "Tähtis"
+#: folders.php:167
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr "Importisin %d kirja %s-st."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr "Käimas"
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr "Inbox"
+
+#: config/prefs.php.dist:492
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Kaasa vastusesse päiste lühikokkuvõte"
 
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
-msgstr "Võta vastusesse algne kiri"
+msgstr "Kaasa vastusesse algne kiri"
+
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+msgid "Info"
+msgstr "Teave"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+msgid "Information on %s Public Key"
+msgstr "Teave %s avaliku võtme kohta"
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr "Teave isikliku salajase võtme kohta"
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr "Teave isikliku avaliku võtme kohta"
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+msgid "Inline"
+msgstr "Kirja sees"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr "Sisesta siia sertifikaat"
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Sisesta siia isiklik salajane PGP võti"
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Sisesta siia isiklik avalik PGP võti"
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr "Sisesta siia avalik PGP võti"
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr "Valiti selle komponendi jaoks sobimatu tegevus."
+
+#: mailbox.php:584 mailbox.php:626
+msgid "Invalid Address"
+msgstr "Vigane aadress"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr "Vigane väline postkast"
+
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr "Lubamatu märk e-posti aadressis: %s."
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr "Vigane võti"
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr "Vigane isiklik salajane PGP võti."
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr "Vigane isiklik avalik PGP võti."
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr "Vastand"
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr "KB"
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr "Võtme pikkus"
 
-msgid "January"
-msgstr "Jaanuar"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "Võtme loomine võib võtta tükk aega. Kas jätkata võtme loomisega?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Võtit ei saa importida. Sellesse serverisse pole võimalik faile laadida."
 
-msgid "July"
-msgstr "Juuli"
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Võtit ei saa importida. Sa pole määranud aadressiraamatut, kuhu soovid "
+"aadresse lisada."
 
-msgid "June"
-msgstr "Juuni"
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr "Võti saadeti avalikku võtmeserverisse."
 
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Keel"
 
+#: config/prefs.php.dist:906
+msgid "Last Mailbox Page"
+msgstr "Postkasti viimane lehekülg"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Viimane lehekülg"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Viimane login: %s"
+#: templates/compose/compose.inc:389
+msgid "Li_nk Attachments"
+msgstr "Li_ngi lisandid"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr "Lisandite linkimine on keelatud."
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Lingid aeguvad %s"
+
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+"Aadresside ekraani avamisel näita aadresside loendit (kui välja lülitatud, "
+"näed ainult neid aadresse mida otsid)"
 
-msgid "Last login: Never"
-msgstr "See on esimene login"
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr "Ainult päistes"
+
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "Kohalik kaust:"
+
+#: lib/MIME/Viewer/itip.php:674
+msgid "Location"
+msgstr "Koht"
 
-msgid "Light Blue"
-msgstr "Helesinine"
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Logi sisse"
 
-#, c-format
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Logi sisse %s'i"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+msgid "Login"
 msgstr "Logi sisse"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Tööd sisselogimisel"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr ""
-"Millegipärast sisselogimine ebaõnnestus. Kõige tõenäolisemalt sisestasid "
-"vale kasutajanime või parooli."
-
-msgid "Logout"
-msgstr "Logi välja"
-
-msgid "Mail Filters"
-msgstr "Filtrid"
-
-msgid "Mail Management"
-msgstr "Kirjade haldus"
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr "Madal"
+
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr "Väheoluline"
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr "Madalaim"
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr "Macintoshi fail"
+
+#: templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "E-post"
+
+#: config/prefs.php.dist:96
+msgid "Mail Previews"
+msgstr "Kirjade eelvaated"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr "Välise postiserveri tüüp:"
 
+#: folders.php:402
 msgid "Mailbox"
-msgstr "Kirjakast"
+msgstr "Postkast"
 
-msgid "Maintenance Operations"
-msgstr "Hooldustööd"
+#: config/prefs.php.dist:111
+msgid "Mailbox and Folder Display Options"
+msgstr "Postkasti ja kaustade esituse seaded"
 
-msgid "March"
-msgstr "Märts"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr "Märgi kõik kirjad kaustas loetuks"
 
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "Märgi kõik kirjad kaustas uuteks"
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Atribuudid:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Tähista erinevad tsiteerimistasemed erineva värviga"
 
-msgid "May"
-msgstr "Mai"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "Märgi kirjad loetuks (ainult IMAP)"
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr "Näita HTML märgendeid"
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr "kõigile tingimustele"
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr "mõnele tingimusele"
+
+#: templates/compose/compose.inc:513
+msgid "Maximum Attachment Size"
+msgstr "Lisandi suuruse piirmäär"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Kaustade arvu piirmäär"
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr "Lisandite piirarv on täis."
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr "Lisandite suuruse piirmäär on täis."
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr "Koosoleku tühistamine"
+
+#: lib/MIME/Viewer/itip.php:575
+msgid "Meeting Information"
+msgstr "Koosoleku teave"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr "Koosoleku ettepanek"
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr "Koosoleku vastus"
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr "Koosoleku muudatus"
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr "Palve koosoleku muudatuseks"
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr "Kaustade loendi menüü"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "Kiri"
 
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Kirja koostamine"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Kirja kuupäev"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+msgid "Message Options"
+msgstr "Kirja seaded"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Otsi kirja"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Kirja suurus"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Kirja algtekst"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Kirja vaatamine"
 
-msgid "Message fields"
-msgstr "Väljad"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Kirja atribuudid"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Kaustad"
 
-msgid "Message sent successfully, but not saved to"
-msgstr "Kiri saadeti teele kuid ei salvestatud"
+#: lib/Compose.php:329
+#, php-format
+msgid "Message from %s"
+msgstr "Kiri %s-lt"
+
+#: mailbox.php:667
+msgid "Message has attachments"
+msgstr "Kirjal on lisandeid"
+
+#: mailbox.php:658
+msgid "Message is encrypted"
+msgstr "Kiri on krüptitud"
+
+#: mailbox.php:653
+msgid "Message is signed"
+msgstr "Kiri on allkirjastatud"
+
+#: templates/search/header.inc:33
+msgid "Message matches"
+msgstr "Kiri vastab"
+
+#: compose.php:824 compose.php:838
+msgid "Message redirected successfully."
+msgstr "Kiri suunati edasi."
+
+#: compose.php:1084
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Kiri saadeti teele kuid ei salvestatud %s-i"
+
+#: compose.php:1143 compose.php:1158
+msgid "Message sent successfully."
+msgstr "Kiri saadeti teele."
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Korraga nähtavate kirjade arv leheküljel."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "märgitud kirjad kausta:"
 
-msgid "Mime Type"
-msgstr "MIME tüüp"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Muuda"
 
-msgid "Move Down"
-msgstr "Allapoole"
-
-msgid "Move Up"
-msgstr "Ülespoole"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Tõsta kirjad kausta <b>%s</b>"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "Väljale \"%s\" vastab rohkem kui üks aadress."
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Tõsta"
 
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr "Nihuta alla"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "Tõsta rämpskirjad rämpskirjade kausta ja korralikud kirjad INBOXi"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move to folder"
+msgstr "Tõsta kausta"
+
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr "Nihuta üles"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr "Multipart/alternative"
+
+#: thread.php:76 thread.php:152
+msgid "Multiple Message View"
+msgstr "Mitme kirja vaade"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr "PUUDUB"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr "TÄHELEPANU"
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nimi"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr "Nimi ja/või e-posti aadress peab olema täidetud"
+
+#: lib/MIME/Viewer/itip.php:778
+msgid "Needs Action"
+msgstr "Vajab tähelepanu"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Mitte kunagi"
 
+#: config/prefs.php.dist:560
+msgid "Never save attachments"
+msgstr "Ära salvesta kunagi"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Uus"
+
+#: lib/IMP.php:563
+msgid "New Folder"
+msgstr "Uus kaust"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Värske post"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+msgid "New Message"
+msgstr "Uus kiri"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, php-format
+msgid "New Message to %s"
+msgstr "Uus kiri %s-le"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Uued kirjad"
 
-msgid "New"
-msgstr "Uus"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Järgmine"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Järgmine kiri"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Järgmine lehekülg"
 
-msgid "Next"
-msgstr "Järgmine"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "Ei"
 
-msgid "No Subject"
-msgstr "Teema puudub"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr "Sertifikaati ei leitud"
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr "Krüptimata"
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr "Võtmerõngas pole võtmeid"
+
+#: mailbox.php:375
+#, php-format
+msgid "No Messages"
+msgstr "Kirju ei ole"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr "PGP avalikku võtit pole imporditud."
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr "Isiklikku sertifikaati ei ole."
+
+#: lib/Mailbox.php:329
+msgid "No Preview Text"
+msgstr "Eelvaates pole teksti"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr "Avalikke võtmeid ei leitud"
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr "Avalikku S/MIME võtit pole imporditud."
+
+#: lib/MIME/Viewer/tnef.php:90
+msgid "No attachments found."
+msgstr "Lisandeid ei leitud."
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Avalikus võtmes ei leitud e-posti infot."
+
+#: acl.php:72 acl.php:98
+msgid "No folder selected."
+msgstr "Kaust pole valitud"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr "Uusi kirju ei jälgita üheski kaustas."
 
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Ühtki kausta ei määratud"
 
-msgid "No messages matched your search"
-msgstr "Pole ühtki sobivat kirja"
+#: lib/Block/summary.php:147
+msgid "No folders with new messages"
+msgstr "Üheski kaustas pole uusi kirju"
+
+#: lib/Block/summary.php:144
+msgid "No folders with unseen messages"
+msgstr "Üheski kaustas pole lugemata kirju"
+
+#: lib/Compose.php:325
+msgid "No message body text"
+msgstr "Kirjal puudub tekst"
+
+#: lib/Mailbox.php:371
+msgid "No messages matched your search."
+msgstr "Otsingutingimustele ei vasta ükski kiri."
+
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr "Isiklikku salajast PGP võtit pole imporditud."
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr "Isiklikku avalikku PGP võtit pole imporditud."
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr "Isiklikke S/MIME sertifikaate pole imporditud."
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr "Õigekirja kontrolli programm pole seadistatud."
 
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Kirjavigu ei ole"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Soovitusi ei ole"
 
-msgid "No"
-msgstr "Ei"
-
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr "Ei leitud ühtki sobivat IMAP autentimise meetodit."
+
+#: acl.php:68 acl.php:94
+msgid "No user specified."
+msgstr "Kasutajat pole määratud."
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr "Mitteosaleja"
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Mitte midagi"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr "Tavaline"
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Mitte kustutatud"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Mitte mustand"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Mitte tähtis"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Mitte isiklik"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr "Avalik võti pole korrektne."
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Mitte kustutatud kirjad"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Mitte tähtsad kirjad"
 
-msgid "November"
-msgstr ""
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr "Arvesta et see võib võtta veidi aega"
+
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr "Mitte midagi"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
+#: config/prefs.php.dist:377
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "Mitu kuud säilitada vanu lingitud lisandeid igakuisel kustutamisel"
+
+#: config/prefs.php.dist:359
+msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Säilitatavate vanade saadetud kirjade kaustade arv igakuisel kustutamisel"
 
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
-msgid "October"
-msgstr "Oktoober"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr "VÕI"
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Vanad kirjad"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Vanad saadetud kirjade kaustad tühjendatakse."
 
-msgid "Open Folder"
-msgstr "Ava kaust"
-
-msgid "Options"
-msgstr "Häälestus"
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr "Näita ainult kaustu mis sisaldavad lugemata kirju"
 
-msgid "Orange"
-msgstr "Oranz"
+#: templates/javascript/folders.js:79
+msgid "Only one folder should be selected for this action."
+msgstr "Palun vali selleks operatsiooniks ainult üks kaust."
 
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "A_va kaust"
+
+#: folders.php:427
+msgid "Opened Folder"
+msgstr "Avatud kaust"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr "Vabatahtlik osaleja"
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr "Teised e-posti kontod"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Muud seaded"
 
-msgid "Other"
-msgstr "Muu"
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr "Väljuva posti server"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr "PGP"
+
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr "Krüpti kiri PGP-ga"
+
+#: compose.php:358
+msgid "PGP Error: "
+msgstr "PGP viga: "
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr "PGP viga: vaja on isikliku salajase võtme salasõna."
+
+#: config/prefs.php.dist:142
+msgid "PGP Options"
+msgstr "PGP seaded"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr "PGP salasõna sisestus"
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr "PGP võtmete kasutamiseks on vaja turvalist veebiühendust."
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr "PGP avaliku võtme tekst"
+
+#: pgp.php:149
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "\"%s (%s)\" avalik võti on lisatud."
+
+#: pgp.php:245
+#, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "\"%s\" PGP avalik võti on kustutatud."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr "PGP avalike võtmete võtmerõngas"
+
+#: templates/compose/encrypt_list.inc:8
+msgid "PGP Sign Message"
+msgstr "Allkirjasta kiri PGP-ga"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr "Allkirjasta ja krüpti kiri PGP-ga"
+
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr "PGP salajane võti on lisatud."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr "PGP avalik võti on lisatud."
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr "PGP on selles serveris välja lülitatud."
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr "PGP toetust ei ole, seega ei saa digitaalallkirja kontrollida."
 
-#, c-format
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr "PGP toetust ei ole, seega ei saa kirja dekrüpteerida."
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+"PGP kasutamiseks on vaja hüpikaknaid. Kui sinu veebilehitsejas on hüpikaknad "
+"keelatud, pead need lubama, muidu PGP korralikult ei tööta."
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr "POP3"
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr "POP3 (protokolli automaattuvastus)"
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr "POP3 üle SSLi"
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 üle SSLi (iseallkirjastatud sertifikaat)"
+
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr "POP3 üle SSLi (iseallkirjastatud)"
+
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr "POP3 ilma TLSita"
+
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr "Esimese lugemata kirjaga lehekülg"
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr "Viimase lugemata kirjaga lehekülg"
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Osa(d)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr "Salasõna"
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr "Salasõna (veel kord)"
+
+#: smime.php:235 pgp.php:310
+msgid "Passphrase successfully unloaded."
+msgstr "Salasõna edukalt eemaldatud."
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr "Salasõna:"
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr "Salasõnad ei või olla tühjad"
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr "Salasõnad ei lange kokku"
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Salasõna"
 
-msgid "Perform maintenance operations on login"
-msgstr "Tee sisselogimisel hooldustöid."
+#: templates/fetchmail/manage.inc:48
+msgid "Perform maintenance operations on login?"
+msgstr "Tee sisselogimisel hooldustöid"
+
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr "Selle kasutaja õigusi ei saa muuta."
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+msgid "Personal"
+msgstr "Isiklik"
 
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Isiklik info"
 
-msgid "Personal"
-msgstr "Isiklik"
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr "Isiklik PGP võtmepaar loodud."
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr "Isiklikud PGP võtmed kustutatud."
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Isiklikku S/MIME sertifikaati EI imporditud: "
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "Isiklikud S/MIME võtmed kustutatud."
 
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Paiguta allkiri enne vastust"
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr "Kirja tekstikuju"
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Tee uute kirjade saabumisel häält. Selleks peab su veebilehitseja mõistma "
+"siseseid helifaile. Windowsi ja Maci peal oskavad seda peaaegu kõik, ent "
+"teistel platvormidel on vaja pluginat."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "Please enter a name for the new folder:"
+msgstr "Palun sisesta uue kausta nimi:"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Palun sisesta uue kausta nimi:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Palun sisesta uus nimi:"
 
-msgid "Please enter valid search criteria."
-msgstr "Palun sisesta korralik otsingukriteerium."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+"Palun sisesta oma PGP salajase võtme salasõna. Seda salasõna pead sisestama "
+"kõigest üks kord %s sessiooni jooksul."
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+"Palun sisesta oma S/MIME salajase võtme salasõna. Seda salasõna pead "
+"sisestama kõigest üks kord %s sessiooni jooksul."
 
-msgid "Please provide your username and password"
-msgstr "Palun sisesta oma kasutajanimi ja salasõna"
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+"Kirja koostamise jätkamiseks logi palun uuesti sisse. Kui sa EI kasuta "
+"präänikuid JA kirjutad kirju eraldi aknas, siis pead uuesti sisse logima ka "
+"põhiaknas. Selle otstarve on takistada kurjamitel sinu sessiooni ID "
+"ärandamist. Vabandame ebamugavuse pärast."
+
+#: templates/login/login.inc:71
+msgid "Please provide your password."
+msgstr "Palun sisesta oma salasõna."
+
+#: templates/login/login.inc:67
+msgid "Please provide your username."
+msgstr "Palun sisesta oma kasutajanimi."
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Palun paranda vigased või mitmetähenduslikud aadressid."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr "Palun tutvu alltoodud teabega ja siis vali menüüst sobilik tegevus."
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Enne kui midagi teed vali kaust."
 
+#: lib/MIME/Viewer/itip.php:502
+msgid "Please select an action from the menu below."
+msgstr "Palun vali järgnevast menüüst tegevus."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Palun vali otsimiseks vähemalt üks kaust."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Palun vali selleks operatsiooniks ainult üks kaust."
 
-msgid "Please select or edit right next:"
-msgstr ""
+#: templates/compose/redirect.inc:73
+msgid "Please select or edit in the box to the right:"
+msgstr "Tee valik või sisesta parempoolsesse välja:"
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr "Kasutame Horde tarkvara"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/prefs.php.dist:214
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Paiguta allkirja ette kriipsud ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+msgid "Preferences successfully updated."
+msgstr "Seadistused salvestatud."
+
+#: templates/compose/attachments.inc:3
+msgid "Preview"
+msgstr "Eelvaade"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Eelmine kiri"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Eelmine lehekülg"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Prindi"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Probleem filtreerimisreegliga %d: kausta %s ei ole olemas"
-
-msgid "Problem?"
-msgstr "Probleem?"
+#: templates/message/headers.inc:38
+msgid "Priority"
+msgstr "Prioriteet"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr "Salajase võtme salasõna"
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr "Küsi iga kord lisandi saatmisel; vaikimisi EI"
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr "Küsi iga kord lisandi saatmisel; vaikimisi JAH"
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr "Avaliku PGP võtmeserveri tugi on välja lülitatud."
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+msgid "Pur_ge Deleted"
+msgstr "Eemal_da kustutatud"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
-msgstr "Kustuta lõplikult"
+msgstr "Eemalda kustutatud"
+
+#: templates/folders/actions.inc:24
+msgid "Purge Folder(s)"
+msgstr "Eemalda kausta(de)st kustutatud kirjad"
 
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
-msgstr "Kui tihti tühjendada prügikausta:"
+msgstr "Kui tihti tühjendada prügikasti:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
-msgstr "Kustuta prügikaustast kirjad mis on vanemad kui märgitud arv päevi"
+#: config/prefs.php.dist:405
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr "Kustuta prügikastist kirjad mis on vanemad kui märgitud arv päevi"
+
+#: config/prefs.php.dist:386
+msgid "Purge old messages in the Trash folder?"
+msgstr "Kustuta vanad kirjad prügikastist"
+
+#: lib/Maintenance/Task/purge_trash.php:65
+#, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Kustutan %d kirja prügikastist"
 
-msgid "Purge old message in the Trash folder"
-msgstr "Kustuta vana kiri prügikaustast"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "Kustutan 1 kirja prügikastist"
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Ressursikasutus: %.2fMB / %.2fMB (%.2f%%)"
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "Ressursikasutus: %.2fMB / PIIRAMATU"
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr "Ressursikasutus: PIIRAMATU"
+
+#: config/prefs.php.dist:500
+#, php-format
+msgid "Quoting %f:"
+msgstr "%f kirjutas:"
+
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr "Kü_si laekumiskinnitust"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Kustutan %d kirja prügikastist"
+msgid "Rebuild Folder Tree"
+msgstr "Värskenda kaustapuu"
 
-msgid "Quoting"
-msgstr "Tsiteerin"
+#: lib/Search.php:50
+msgid "Received On"
+msgstr "Saabunud"
 
-msgid "Received after"
+#: lib/Search.php:58
+msgid "Received Since"
 msgstr "Saabunud pärast"
 
-msgid "Received before"
+#: lib/Search.php:54
+msgid "Received Until"
 msgstr "Saabunud enne"
 
-msgid "Received on"
-msgstr "Saabunud"
+#: templates/message/navbar_actions.inc:16
+msgid "Redirec_t"
+msgstr "Suuna edasi"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Suuna edasi"
 
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Suuna kiri edasi"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Suuna see kiri edasi"
 
-msgid "Redirect"
-msgstr "Suuna edasi"
-
+#: compose.php:847
 msgid "Redirecting failed."
-msgstr "Edasisuunamine ebaõnnestus"
+msgstr "Edasisuunamine ebaõnnestus."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Värskenda"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Värskenda kaustade sisu:"
 
-msgid "Refresh"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+msgid "Reload"
 msgstr "Värskenda"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Värskenda vaade"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr "Pea vaba/hõivatud info meeles."
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Pea viimane vaade meeles"
 
-msgid "Remove Selected"
-msgstr "Eemalda valitud"
-
-msgid "Rename Folder"
-msgstr "Nimeta kaust ümber"
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr "Väline postkast:"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr "Eemalda väli otsingust"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "Eemalda allikas"
+
+#: templates/folders/actions.inc:8
+msgid "Rename Folder(s)"
+msgstr "Nimeta kaust(ad) ümber"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Nimeta saadetud kirjade kaust kuu alguses ümber"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "\"%s\" ümbernimetamine \"%s\"-ks ebaõnnestus. Server ütles"
 
+#: templates/message/navbar_actions.inc:10
+msgid "Repl_y to List"
+msgstr "Vasta _listile"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
-msgstr "Asenda"
+msgstr "Asenda:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Vasta"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+msgid "Reply Sent."
+msgstr "Vastus saadetud."
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Vasta kõigile:"
 
-msgid "Reply"
+#: templates/message/navbar_actions.inc:10
+msgid "Reply to List"
+msgstr "Vasta listile"
+
+#: compose.php:735
+msgid "Reply to List:"
+msgstr "Vasta listile:"
+
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to _All"
+msgstr "Vasta _kõigile"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr "Saada vastuseks teade Pole Võimalik"
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr "Saada vastuseks järgmise kahe kuu vaba/hõivatud info."
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr "Saada vastuseks soovitud vaba/hõivatud info."
+
+#: message.php:267
+msgid "Reply-To"
 msgstr "Vasta"
 
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Vasta:"
 
-msgid "Reply-to"
-msgstr "Vasta"
-
+#: compose.php:731
 msgid "Reply:"
 msgstr "Vasta:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+msgid "Report as Innocent"
+msgstr "Tunnista kiri õigeks"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "Kurda rämpsposti üle"
+msgstr "Tunnista kiri rämpspostiks"
+
+#: templates/compose/compose.inc:383
+msgid "Request a _Read Receipt"
+msgstr "Küsi lu_gemiskinnitust"
 
-msgid "Request a Return Receipt"
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
 msgstr "Küsi laekumiskinnitust"
 
+#: config/prefs.php.dist:573
+msgid "Request read receipts?"
+msgstr "Küsi lugemiskinnitusi"
+
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr "Soovitud kirja ei leitud."
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr "Nõutav osaleja"
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
-msgstr ""
+msgstr "Algväärtused"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr "Vastaja olek uuendatud."
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Jätka"
 
+#: recompose.php:98
+msgid "Resume your session"
+msgstr "Jätka sessiooni"
+
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Tagasi \"Kirja koostamise\" seadetesse"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr "Tagasi kirjade tirimise juurde"
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+msgid "Return to Options"
+msgstr "Tagasi seadistusse"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Pärast kirja kustutamist, ümbertõstmist või kopeerimist pöördu tagasi "
 "postkasti nimekirja"
 
-msgid "Rule Definition"
-msgstr "Reegli kirjeldus"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr "Roll"
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr "Krüpti kiri S/MIME abil"
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr "S/MIME viga: "
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "S/MIME viga: vaja on isikliku salajase võtme salasõna."
+
+#: config/prefs.php.dist:151
+msgid "S/MIME Options"
+msgstr "S/MIME seadistus"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr "S/MIME salasõna sisestus"
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+"S/MIME isikliku võtmepaari kasutamiseks on vaja turvalist veebiühendust."
+
+#: smime.php:140
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "\"%s\" S/MIME avalik võti on kustutatud."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr "S/MIME avalik võti on lisatud."
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr "S/MIME avalik võtmerõngas"
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "S/MIME võtmepaari lisamine õnnestus."
+
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr "Allkirjasta kiri S/MIME abil"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "Allkirjasta ja krüpti kiri S/MIME abil"
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr "S/MIME võimalused on selles süsteemis välja lülitatud."
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+"S/MIME võimalused ei ole sisse lülitatud, seega ei saa kirja krüpteeringut "
+"avada."
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+"S/MIME võimalused ei ole sisse lülitatud, seega ei saa seda allkirjastatud "
+"kirja näidata."
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"S/MIME võimalused ei ole sisse lülitatud, seega ei saa digitaalallkirja "
+"kontrollida."
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+"S/MIME kasutamiseks on vaja hüpikaknaid. Kui su veebilehitsejas on "
+"hüpikaknad praegu keelatud, pead selle ära muutma, sest muidu ei tööta S/"
+"MIME õieti."
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr "SMTP"
+
+#: templates/compose/compose.inc:255
+msgid "S_ubject"
+msgstr "_Teema"
+
+#: templates/compose/compose.inc:363
+msgid "Sa_ve a copy in "
+msgstr "_Salvesta koopia kausta"
+
+#: templates/message/navbar_actions.inc:32
+msgid "Sa_ve as"
+msgstr "_Salvesta"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+msgid "Save"
+msgstr "Salvesta"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr "Säilita saadetud kirjaga koos ka lisand"
 
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Salvesta mustand"
 
-msgid "Save a copy in "
-msgstr "Salvesta koopia kausta"
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Salvesta pilt"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr "Salvesta pilt galeriisse"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+msgid "Save Options"
+msgstr "Salvesta seadistus"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Salvesta kirjamall"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+msgid "Save _Draft"
+msgstr "Salvesta _mustand"
 
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Salvesta"
 
-msgid "Save sent mail"
-msgstr "Salvesta saadetud kiri"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr "Salvesta mustandid lugemata kirjana"
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr "Salvesta adressaadid automaatselt aadressiraamatusse"
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr "Säilita otsingutulemus virtuaalkaustana"
+
+#: config/prefs.php.dist:230
+msgid "Save sent mail?"
+msgstr "Säilita saadetud kirjad"
 
-#, c-format
+#: compose.php:1227
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Mustandi salvestamine ebaõnnestus. Server ütles: %s"
 
-msgid "Search Results"
-msgstr "Otsingu tulemus"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Otsing"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, php-format
+msgid "Search %s"
+msgstr "Otsi %s"
+
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Otsingu seadistus"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "Otsingu tulemus"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Loetud"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Vali"
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "Vali teine konto"
+
+#: templates/search/fields.inc:36
+msgid "Select a date"
+msgstr "Vali kuupäev"
+
+#: templates/search/fields.inc:10
+msgid "Select a field"
+msgstr "Vali väli"
+
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Vali kirjamall:"
+
+#: config/prefs.php.dist:135
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Vali aadressiraamatud aadresside otsimiseks ja lisamiseks."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Märgi kõik"
 
-msgid "Select an identity"
-msgstr "Vali identiteet"
-
-msgid "Select charset:"
-msgstr "Vali märgistik:"
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr "Vali kõik väljad mida kasutada aadresside lahendamisel."
+
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "Vali konto"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Ära märgi midagi"
 
-msgid "Select your color scheme."
-msgstr "Vali oma värviskeem."
-
-msgid "Select your preferred language:"
-msgstr "Vali oma lemmikkeel:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Vali galerii kuhu pilt salvestada."
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr "Vali postiserveri tüüp"
 
-msgid "Select"
-msgstr "Vali"
-
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
 msgstr "Valitud aadressiraamatud:"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr "Saada võti avalikku võtmeserverisse"
+
+#: lib/MIME/Viewer/itip.php:604
+msgid "Send Latest Information"
+msgstr "Saada värskeim info"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Saada kiri"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr "Saatja soovi korral saada lugemiskinnitus"
+
+#: folders.php:397
+msgid "Sent mail folder"
+msgstr "Saadetud kirjade kaust"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Saadetud kirjade kaust:"
 
-msgid "September"
-msgstr ""
-
-msgid "Server Information"
-msgstr "Serveri info"
-
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
-msgstr ""
+msgstr "Server"
+
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr "Serveri ja kaustade info"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Võimalused kirjade filtreerimiseks soovimatu sisu suhtes."
+#: templates/fetchmail/manage.inc:23
+msgid "Server:"
+msgstr "Server:"
 
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
-msgstr "Määra mis juhtub kui sa kirju kustutad ja ümber tõstad."
+msgstr "Määra, mis juhtub kui sa kirju kustutad ja ümber tõstad."
+
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr "Lisa uutele kirjadele X-Priority päis"
+
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr "Kaustade ühiskasutus"
 
-msgid "Set the current time zone."
-msgstr "Määra oma ajavöönd."
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr "Kirjakaustade ühiskasutus"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr "Jaga oma kirjakaustu teiste kasutajatega."
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+"Kas pikad tsiteeritud lõigud peaks vaikimisi olema nähtaval või peidetud? "
+"Kuidas sa ka ei määraks, on seda lihtne muuta."
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Vali keel milles esitatakse menüüd, selgitused ja abiinfo."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr "Otsi text/plain tüüpi kirjade kehast PGP andmeid"
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Sule kirja aken pärast mustandi salvestamist"
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr "Lisa oma kirjadele vaikimisi oma PGP avalik võti"
+
+#: templates/search/main.inc:92
+msgid "Show All Folders"
+msgstr "Näita kõiki kaustu"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr "Näita kõiki päiseid"
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Näita kustutatud"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr "Näita põhilisi päiseid"
+
+#: templates/message/headers.inc:70
+msgid "Show Mailing List Information"
+msgstr "Näita listi infot"
+
+#: templates/search/main.inc:92
+msgid "Show Only Subscribed Folders"
+msgstr "Näita ainult tellitud kaustu"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Näita tellimata"
 
-msgid "Show last login time when logging in"
-msgstr "Näita sisselogimisel eelmise sisselogimise aega"
-
-msgid "Show legend in the mailbox view."
-msgstr "Näita kirjakasti aknas legendi."
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr "Näita ikooni lisandite kirjast väljarookimiseks"
+
+#: config/prefs.php.dist:1002
+msgid "Show legend in the mailbox view?"
+msgstr "Näita kausta aknas legendi."
+
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr "Näita eelvaadet ainult lugemata kirja korral"
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr "Näita eelvaadet kohtspikrina"
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr "Näita menüüribal kirjade tirimise ikooni"
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr "Näita pilte"
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr "Näita menüüribal filtrite ikooni"
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr "Näita kirjade koguarvu kaustas"
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr "Nähtav"
+
+#: templates/mailbox/message_headers.inc:42
+msgid "Si_ze"
+msgstr "_Suurus"
+
+#: templates/mailbox/legend.inc:17
+msgid "Signed"
+msgstr "Allkirjastatud"
 
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Suurus"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Mõned IMPi konfiguratsioonifailid on puudu:"
-
-msgid "Sort Direction"
-msgstr "Sorteerimise suund"
-
-msgid "Spam Report from"
-msgstr "Rämpsposti kaebus aadressilt"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr "Järjesta saabumise järjekorras"
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr "Järjesta kuupäeva järgi"
+
+#: templates/mailbox/message_headers.inc:26
+msgid "Sort by From Address"
+msgstr "Järjesta saatja aadressi järgi"
+
+#: templates/mailbox/message_headers.inc:41
+msgid "Sort by Message Size"
+msgstr "Järjesta kirja suuruse järgi"
+
+#: templates/mailbox/message_headers.inc:36
+msgid "Sort by Subject"
+msgstr "Järjesta teema järgi"
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr "Järjesta jutulõnga järgi"
+
+#: templates/mailbox/message_headers.inc:21
+msgid "Sort by To Address"
+msgstr "Järjesta adressaadi järgi"
+
+#: templates/prefs/spamselect.inc:23
+msgid "Spam folder:"
+msgstr "Rämpsposti kaust:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Erimärgid"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr "Erilisi virtuaalkaustu pole võimalik muuta."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Õigekirja kontroll"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Õigekirja kontrollija"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Õigekirja kontroll lõpetatud"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Kirjavigade arv ekraanil."
 
-msgid "Subject Field"
-msgstr "Teema väli"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr "Algus"
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Kirjamall"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Kirjamalli nimi:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Kirjamalli tüüp:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Kirjamall:"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr "Olek"
+
+#: lib/MIME/Contents.php:215
+msgid "Strip Attachment"
+msgstr "Eemalda lisand"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr "Eemalda reavahetused"
+
+#: templates/mailbox/message_headers.inc:37
+msgid "Sub_ject"
+msgstr "_Teema"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Teema"
 
-msgid "Subject:"
-msgstr "Teema:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Teema väli"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+msgid "Submit"
+msgstr "Kinnita"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Telli kaust(ad)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
+msgid "Success"
+msgstr "Õnnestus"
+
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Soovitused"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr "Vaheta kirjutusreziimi"
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr "Lülitu HTML reziimile"
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr "Lülitu tekstireziimile"
+
+#: templates/compose/compose.inc:419
+msgid "Te_xt"
+msgstr "_Tekst"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr "Esialgne: "
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr "Nõustu esialgselt"
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr "Esialgselt nõus"
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr "Kasutustingimuste fail pole conf.php failis määratud"
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Tekst"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr "Kirja Kellelt: väli tuleks linkida:"
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"IMAP server ei näi tunnistavat valitud autentimismoodust. Võta ühendust "
+"süsteemi administraatoriga."
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr "Macintoshi ressursiharu"
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr "Macintoshi ressursiharu võid alla laadida %s."
+
+#: fetchmailprefs.php:81
+#, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Konto \"%s\" on kustutatud."
+
+#: fetchmailprefs.php:74
+#, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Konto \"%s\" on salvestatud."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "Lisandit ei leitud."
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr "Kalendriandmed on vigased"
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"Uue kirja akent ei saa avada. Äkki oled oma veebilehitsejas keelanud "
+"hüpikaknad?"
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr "Macintoshi faili sisu järgneb."
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
-msgstr "Käesolev kaust \"%s\" nimetatakse ümber \"%s\"-ks"
+msgstr "Käesolev(ad) kaust(ad) \"%s\" nimetatakse ümber \"%s\"-ks"
 
-#, c-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "Kausta '%s' ei kustutatud. Server ütles"
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+"Sellele kaustale juurdepääsu omavate kasutajate loetelu ei saanud kätte"
 
-#, c-format
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "Mustand salvestati kausta \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr "Sündmus lisati sinu kalendrisse."
+
+#: templates/compose/expand.inc:9
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Välja \"%s\" pole võimalik lahendada."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Kaust \"%s\" on juba olemas"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1181,425 +3855,1133 @@
 "Kausta \"%s\" nimes on lubamatuid märke. See võib tekitada probleeme. Pea "
 "nõu süsteemi administraatoriga."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Kaust \"%s\" loodi aga sa ei ole seda tellinud."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Kaust \"%s\" kustutati aga sul on see jätkuvalt tellitud."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Kausta \"%s\" ei loodud. Server ütles"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "Kausta \"%s\" ei kustutatud. Server ütles"
+
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Kaust \"%s\" on edukalt loodud."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Kaust \"%s\" on jäädavalt kustutatud."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Kaust \"%s\" nimetati ümber \"%s\"-ks"
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "Identiteet \"%s\" on kustutatud."
-
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "Identiteet \"%s\" on salvestatud."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr "See kirja osa sisaldab järgnevaid faile:"
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Pildi salvestamise akent ei saa avada. Äkki oled oma veebilehitsejas "
+"keelanud hüpikaknad?"
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr "Pilte näidatakse, kuna saatja on sinu aadressiraamatus."
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr "Postiserver tagastas järgmise veateate:"
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr "Postiserver tagastas järgmise informatsioonilise teadaande:"
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr "Postiserver tagastas järgmise teate:"
+
+#: lib/Message.php:651
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "Kaust %s on juba tühi."
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+"Kiri \"%s\" \"%s\"-lt (%d baiti) ületab tiritava kirja suuruse piirangu."
 
-msgid "The message being composed has been closed.  Exiting."
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
 msgstr "Käsilolev kiri suleti. Väljun."
 
-msgid "The signature couldn't be replaced."
+#: message.php:148
+msgid "The message has been deleted."
+msgstr "Kiri on kustutatud."
+
+#: lib/MIME/Viewer/pgp.php:393
+msgid "The message has been verified."
+msgstr "Kiri on kontrollitud."
+
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Kiri on kontrollitud. Saatja: %s."
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"Salasõna akent ei saa avada. Äkki oled oma veebilehitsejas keelanud "
+"hüpikaknad?"
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr "PGP avaliku võtme algteksti saad vaadata %s."
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "MS-TNEF lisand ei sisalda soovitud faili."
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "Zip lisand ei sisalda soovitud faili."
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+"Selle kirja saatja soovib sinult kinnitust, et oled kirja lugenud. Klõpsa %s "
+"kinnituse saatmiseks."
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "Server ei suutnud luua sellest pildist pisipilti."
+
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
 msgstr "Allkirja ei õnnestunud asendada."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Allkiri on asendatud."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr "Sihukest faili pole olemas."
+
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Kirjamall \"%s\" on lisatud."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Kirjamall \"%s\" on kustutatud."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Kirjamall \"%s\" on salvestatud."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr "Ülesanne lisati sinu ülesannete nimekirja."
+
+#: lib/MIME/Viewer/status.php:95
+msgid "The text of the message"
+msgstr "Kirja tekst"
+
+#: lib/MIME/Viewer/status.php:94
+msgid "The text of the message can be viewed %s."
+msgstr "Kirja teksti saad vaadata %s."
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr "Tagastatud kirja tekst"
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr "Tagastatud kirja teksti saad vaadata %s."
+
+#: lib/MIME/Viewer/notification.php:68
+msgid "The text of the sent message"
+msgstr "Saadetud kirja tekst"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr "Saadetud kirja teksti saad vaadata %s."
+
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Kasutaja vaba/hõivatud info salvestati."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Vahetult näidatavaid alternatiivseid osi ei ole."
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
-msgstr "Selles kirjakastis ei ole kirju."
+msgstr "Selles kaustas ei ole kirju."
+
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr "Vahetult näidatavat teksti ei ole."
 
-#, c-format
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "%s tühjendamisel tekkis viga. Server ütles"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Kirjakasti tühjendamisel tekkis viga. Server ütles"
-
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"Faili serverisse laadimisel tekkis probleem. Võib-olla on fail suurem kui "
-"maksimaalne lubatud suurus (%d MB)."
+#: lib/Message.php:653
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "Kausta tühjendamisel tekkis viga. Server ütles: %s"
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"Faili serverisse laadimisel tekkis probleem. Võib-olla on fail suurem kui "
-"maksimaalne lubatud suurus."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Kausta tühjendamisel tekkis viga. Server ütles"
 
-#, c-format
+#: lib/Message.php:90
+#, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
-msgstr "Kirjade kopeerimisel \"%s\"-i tekkis viga. Server ütles"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "Kirjade kopeerimisel \"%s\"-st \"%s\"-i tekkis viga. Server ütles"
 
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "Kirjade kustutamisel kaustast \"%s\" tekkis viga. Server ütles"
 
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Kirjade kustutamisel kaustas \"%s\" tekkis viga. Server ütles"
 
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "Kirjade kustutamisel tekkis viga. Server ütles"
+#: lib/Message.php:211
+#, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "Kirjade kustutamisel tekkis viga. Server ütles: %s"
+
+#: lib/MIME/Viewer/itip.php:99
+#, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Sündmuse kustutamisel tekkis viga: %s."
 
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Kirja osa esitamisel tekkis viga"
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Kirjade märkimisel kaustas \"%s\" tekkis viga. Server ütles"
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Kirjade märkimisel tekkis viga. Server ütles"
+#: folders.php:165
+#, php-format
+msgid "There was an error importing %s."
+msgstr "%s impordil tekkis viga."
+
+#: lib/MIME/Viewer/itip.php:136
+#, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Sündmuse impordil tekkis viga: %s."
+
+#: lib/MIME/Viewer/itip.php:166
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Ülesande impordil tekkis viga: %s."
+
+#: lib/MIME/Viewer/itip.php:152
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Kasutaja vaba/hõivatud info impordil tekkis viga: %s."
 
-#, c-format
+#: lib/Message.php:85
+#, php-format
 msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr "Kirjade tõstmisel kausta \"%s\" tekkis viga. Server ütles"
-
-msgid ""
-"There was an error moving messages to the trash. This is what the server said"
-msgstr "Kirjade tõstmisel prügikausta tekkis viga. Server ütles"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"Kirjade tõstmisel kaustast \"%s\" kausta \"%s\" tekkis viga. Server ütles"
 
-msgid "There was an error saving a draft."
+#: compose.php:1244
+msgid "There was an error saving this message as a draft."
 msgstr "Mustandi salvestamisel tekkis viga."
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Kirja saatmisel tekkis viga: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "Kirjade taastamisel tekkis viga. Server ütles"
-
-msgid "There was an error viewing the requested message."
-msgstr "Soovitud kirja vaatamisel tekkis viga."
+#: lib/MIME/Viewer/itip.php:113
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Sündmuse muutmisel tekkis viga: %s"
+
+#: lib/MIME/Viewer/plain.php:59
+msgid "There was no text in this message part"
+msgstr "Selles kirja osas polnudki teksti"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr "See HTML kiri sisaldab pilte."
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr ""
-"See fali defineerib IMPi jaoks MIME draiverid, määrates kindlaks milliseid "
-"lisandeid saab vaadata ja salvestada."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr "See HTML kiri sisaldab pilte. Tõkestatud pildid paistavad nii: "
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr "See PGP avalik võti lisati kirjale."
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr "Selline tegevus pole võimalik."
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr "Seda tegevust programm veel ei võimalda."
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
-msgstr ""
-"See fail paneb paika IMPi häälestuse, samuti kontrollib milliseid "
-"parameetreid kasutajad saavad muuta."
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "See võib võtta natuke aega. Kas oled kindel et soovid jätkata?"
 
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
-msgstr ""
-"See fail sisaldab vaikimisi kasutatavaid IMPi seadeid ja kasutatavate "
-"serverite nimekirja kui kasutusel on mitu serverit."
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr "See kiri sisaldab Macintoshi faili."
 
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
 msgstr ""
-"See fail paneb paika kasutatavad värvid ja kirjastiilid, lisades need Horde "
-"kasutatavatele vaikeväärtustele."
+"See kiri sisaldab lisandit mis on digitaalselt allkirjastatud S/MIME abil."
 
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "See kiri sisaldab lisandit mis on krüptitud S/MIME abil."
+
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"See on IMPi peamine konfiguratsioonifail. See sisaldab kataloogiteid ja "
-"parameetreid IMPi skriptide jaoks."
+"See kiri sisaldab kättetoimetamisteavet, aga kirja vorming on tundmatu."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "See võib võtta natuke aega. Kas oled kindel et soovid jätkata?"
+#: lib/MIME/Viewer/pgp.php:315
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "See ei näi olevat korrektne PGP krüptitud kiri. Viga: "
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Selle kirja kohta on saadetud kaebus süsteemi administraatorile."
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr "See kiri ei näi olevat korrektses PGP vormingus (RFC 2015 kohaselt)."
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr "See kiri ei näi olevat korrektses S/MIME vormingus."
+
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr "See kiri on digitaalselt allkirjastatud PGP abil."
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr "See kiri on digitaalselt allkirjastatud S/MIME abil."
+
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr "See kiri on krüptitud S/MIME abil."
+
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr "See kiri on krüptitud PGP abil."
 
+#: message.php:211
 msgid "This message to"
 msgstr "kiri kausta"
 
-msgid "This window must be called from compose window"
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr "See server ei võimalda ühiskaustu."
+
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
 msgstr "See aken tuleb avada uue kirja aknast"
 
-msgid "Thread View"
+#: thread.php:152
+msgid "Thread Display"
 msgstr "Jutulõnga vaade"
 
-msgid "Thread"
-msgstr "Jutulõng"
-
-msgid "Time Zone"
-msgstr "Ajavöönd"
+#: thread.php:76 config/prefs.php.dist:922
+msgid "Thread View"
+msgstr "Jutulõnga vaade"
 
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Kellele"
 
-msgid "To:"
-msgstr "Kellele:"
+#: config/prefs.php.dist:919
+msgid "To Address"
+msgstr "Saaja aadress"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+"Mitme välja valimiseks hoia klõpsamise ajal all Control (PC) või Command "
+"(Mac) klahvi."
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Kogusuurus: %s KB"
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr "TLS kasutamiseks on vaja PHP versioon 5.0.6 või uuemat."
+
+#: templates/compose/compose.inc:577
+msgid "Total Attachments Size:"
+msgstr "Lisandite kogusuurus:"
+
+#: folders.php:388
+msgid "Trash folder"
+msgstr "Prügikaust"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Prügikaust:"
 
-msgid "Unanswered messages"
-msgstr "Vastamata kirjad"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr "Piiranguinfo hankimine nurjus"
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Vastamata"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Vastamata kirjad"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Taasta"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Nähtamatud adressaadid"
 
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr "Arusaamatu komponent tüüpi: %s"
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr "Tundmatu kuupäev"
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Arusaamatu IMAP vastus serverilt. Server vastas: %s"
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr "Tundmatu koosolek"
+
+#: mailbox.php:618
+msgid "Unknown Recipient"
+msgstr "Tundmatu adressaat"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr "Eemalda salasõna"
+
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Nimetu"
 
-msgid "Unread"
-msgstr "Lugemata"
-
-msgid "Unseen Messages"
-msgstr "Lugemata kirjad"
-
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Lugemata"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Loobu kausta(de) tellimisest"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Mitme välja valimiseks klõpsa neil hiirega, hoides all Ctrl klahvi"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr "Värskenda lisandi info"
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr "Värskenda vastaja olek"
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr "Saada"
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Kasuta vaikeväärtust"
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+msgid "Use IMAP folder subscriptions?"
 msgstr "Kasuta IMAP kaustade tellimusi"
 
-msgid "User Options"
-msgstr "Muud häälestused"
+#: config/prefs.php.dist:735
+msgid "Use Virtual Trash Folder?"
+msgstr "Kasuta virtuaalset prügikausta"
+
+#: templates/acl/acl.inc:142
+msgid "User"
+msgstr "Kasutaja"
 
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "Kasutajale \"%s\" anti soovitud õigused kaustale \"%s\"."
+
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+msgid "Username:"
+msgstr "Kasutajanimi:"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "View"
+msgstr "Vaata"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Vaata %s"
 
-msgid "View messages in "
-msgstr "Vaata kirju kaustas "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr "Vaata %s avalikku võtit"
+
+#: lib/MIME/Viewer/html.php:116
+msgid "View HTML content in a separate window"
+msgstr "Vaata HTML sisu eraldi aknas"
+
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Vaata kirju"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr "Vaata oma salajast võtit"
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr "Vaata oma avalikku võtit"
+
+#: templates/message/navbar_actions.inc:18
+msgid "View Thread"
+msgstr "Vaata jutulõnga"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr "Vaata pisipilti"
+
+#: lib/MIME/Viewer/pkcs7.php:418
+msgid "View attachment in a separate window"
+msgstr "Vaata lisandit eraldi aknas."
+
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Vaata sisu eraldi aknas."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr "Vaata sündmust"
+
+#: folders.php:380 mailbox.php:534
+#, php-format
+msgid "View messages in %s"
+msgstr "Vaata kirju kaustas %s"
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
-msgstr "Vaade või kirjakast mida näidata pärast sisselogimist:"
+msgstr "Vaade või kaust mida näidata pärast sisselogimist:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:170
+msgid "View task"
+msgstr "Vaata ülesannet"
+
+#: lib/MIME/Viewer/html.php:101
+msgid "View the Images"
+msgstr "Vaata pilte"
+
+#: search.php:263
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Virtuaalne kaust \"%s\" loodud."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+msgid "Virtual Folders"
+msgstr "Virtuaalsed kaustad"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr "Virtuaalsed kaustad vajavad märgendit."
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr "Virtuaalne INBOX"
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr "Virtuaalne INBOX kaust"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr "Virtuaalne prügikast"
+
+#: folders.php:413
+msgid "Virtual Trash Folder"
+msgstr "Virtuaalne prügikast"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr "Virtuaalse kausta märgend"
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Tere tulemast %s-i"
 
-msgid "Welcome"
-msgstr "Tere tulemast"
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Mida tuleks teha rämpspostiga pärast seda kui selle kohta on teade saadetud?"
 
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
 msgstr ""
-"Kirjade kustutamisel tõsta need kustutatuks märkimise asemel prügikausta."
+"Kirjade kustutamisel tõsta need kustutatuks märkimise asemel prügikasti."
+
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr "Millisele leheküljele minna kausta avamisel?"
 
-msgid "Wrap text at this many characters."
-msgstr "Vaheta rida nii mitme märgi järel"
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr "Kas saadetud kirja salvestamisel tuleks salvestada ka lisand?"
 
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"Millise domeeninime peaksime lisama kirja saatmisel või aadresside "
+"lahendamisel domeenita aadressidele (aadressidele mis ei sisalda \"@\" "
+"märki)?"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "Valge nimekiri"
+
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Jah"
 
-msgid "You are attempting to delete the following folders:"
-msgstr "Sa püüad kustutada järgmisi kaustu:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Sa kavatsed tirida kirju järgneva(te)lt konto(de)lt:"
 
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Sa kavatsed kustutada kõik kirjad järgmis(t)es kausta(de)s."
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Sa püüad kustutada järgmise(d) kausta(d)."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "You are copying/moving to a new folder."
+msgstr "Sa kopeerid/tõstad uude kausta."
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Sa lood alamkausta kaustale "
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Sa lood ülemise taseme kausta "
 
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr "Sul pole lubatud kaustu luua."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Sa ei või luua rohkem kui %d kausta."
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Sa nimetad ümber kausta: "
 
-#, c-format
+#: lib/Folder.php:557
+#, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Sa ei või loobuda kausta \"%s\" tellimusest."
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Kirjamalli tekstis võid kasutada järgmisi muutujaid: %c tähistab käesoleva "
+"kirja sisu, %s tähistab allkirja."
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+"Sa ei nõustunud kasutustingimustega, seega ei ole sul lubatud sisse logida."
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr "Sul pole õigust selle kausta juurdepääsuõiguste muutmiseks"
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr "Sa edastasid selle kirja %%s järgmistele adressaatidele: %s."
+
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Sulle on %s uut kirja."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Sulle on 1 uus kiri."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Sind logiti välja."
+#: compose.php:494
+msgid "You have already submitted this page."
+msgstr "Sa juba salvestasid selle lehekülje."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
+"Sul on märgitud vähemalt üks lisand, mida sa pole veel serverisse laadinud."
+"Kas oled kindel, et soovid kirja saata ilma nende lisanditeta?"
 
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Sulle on uusi kirju kaustas:"
 
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Sulle on uusi kirju järgmistes kaustades:"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Kõigepealt pead valima lisandi(d) mida kustutada."
+#: compose.php:153
+msgid "You must enter at least one recipient."
+msgstr "Kirjal peab olema vähemalt üks saaja."
 
-msgid "You must first specify the file to attach."
-msgstr "Kõigepealt pead valima faili mida soovid lisada."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr "Selle kirja vaatamiseks pead sisestama oma PGP salajase võtme salasõna"
 
-msgid "You must have at least one recipient."
-msgstr "Kirjal peab olema vähemalt üks saaja."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+"Selle kirja vaatamiseks pead sisestama oma S/MIME salajase võtme salasõna."
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Kõigepealt pead valima kausta."
 
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr "Pead valima konto mida soovid kustutada."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Kõigepealt pead valima aadressi."
 
-msgid "You must select an identity to be deleted."
-msgstr "Pead valima identiteedi mida soovid kustutada."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Kõigepealt pead valima vähemalt ühe kirja."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Kirja saaja peab olema määratud."
 
-#, c-format
+#: templates/compose/attachments.js:29
+msgid "You must specify at least one file to attach."
+msgstr "Pead valima vähemalt ühe lisatava faili."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Hooldustööde seadistuses peab sul olema \"%s\" sisse lülitatud."
+
+#: lib/Maillog.php:137
+#, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Sa suunasid selle kirja %s-le edasi %%s."
+
+#: lib/Maillog.php:141
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "Sa vastasid sellele kirjale %s."
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Sul ei õnnestunud tellida kausta \"%s\". Server ütles"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Sul ei õnnestunud tühistada kausta \"%s\" tellimust. Server ütles"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Sa tellisid kausta \"%s\"."
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Sa loobusid kausta \"%s\" tellimusest."
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Sinu %s sessioon on aegunud. Palun logi uuesti sisse."
-
-msgid "Your From: address:"
-msgstr "Sinu Kellelt: aadress:"
-
-msgid "Your Information"
-msgstr "Sinu info"
-
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Sinu Vasta: aadress: <i>(pole kohustuslik)</i>"
+#: templates/pgp/pgp.inc:98
+msgid "Your Name"
+msgstr "Sinu nimi"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr "Sinu PGP võtmepaar"
+
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr "Sinu salajane võti"
+
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+msgid "Your Public Key"
+msgstr "Sinu avalik võti:"
+
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Sinu Vasta: aadress: <em>(pole kohustuslik)</em>"
+
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "Sinu S/MIME avalik ja salajane sertifikaat"
+
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr "Sinu kontod:"
 
+#: config/prefs.php.dist:173
 msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Sinu browser ei toeta seda printimise võimalust. Vajuta printimiseks Ctrl+P."
-
-msgid "Your current time zone:"
-msgstr "Sinu ajavöönd:"
-
-msgid "Your default identity:"
-msgstr "Sinu vaikeidentiteet:"
+"Sinu alias aadressid: <em>(pole kohustuslik, sisesta iga aadress eraldi "
+"reale)</em>"
 
-msgid "Your full name:"
-msgstr "Sinu täisnimi:"
-
-msgid "Your identities:"
-msgstr "Sinu identiteedid:"
+#: lib/MIME/Viewer/images.php:92
+msgid "Your browser does not support inline display of this image type."
+msgstr "Sinu veebilehitseja ei võimalda seda tüüpi pilti vahetult näidata."
+
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr "Vaikemärgistik kirjade saatmisel:"
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr "Vaikimisi krüptimismeetod kirjade saatmisel:"
+
+#: lib/MIME/Viewer/status.php:89
+msgid "Your message was successfully delivered."
+msgstr "Sinu kiri jõudis õnnelikult pärale."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Sinu allkiri:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Teema puudub]"
 
-msgid "add source"
-msgstr "lisa allikas"
-
-msgid "cannot move past the beginning"
-msgstr "ei saa algusest mööda liikuda"
-
-msgid "cannot move past the end"
-msgstr "ei saa lõpust mööda liikuda"
-
-msgid "delete message"
-msgstr "kustuta kiri"
+#: templates/compose/compose.inc:205
+msgid "_Bcc"
+msgstr "_Pimekoopia"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+msgid "_Blacklist"
+msgstr "_Musta nimekirja"
+
+#: templates/compose/compose.inc:154
+msgid "_Cc"
+msgstr "_Koopia"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+msgid "_Delete"
+msgstr "Ku_stuta"
+
+#: lib/IMP.php:979
+msgid "_Folders"
+msgstr "_Kaustad"
+
+#: templates/compose/compose.inc:81
+msgid "_Identity"
+msgstr "_Identiteet"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr "_Inbox"
+
+#: lib/IMP.php:1020
+msgid "_Log out"
+msgstr "_Logi välja"
+
+#: message.php:384
+msgid "_Message Source"
+msgstr "Kirja _algtekst"
+
+#: lib/IMP.php:976
+msgid "_New Message"
+msgstr "_Uus kiri"
+
+#: templates/message/navbar_actions.inc:33
+msgid "_Print"
+msgstr "_Prindi"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr "_Tähtsus"
+
+#: mailbox.php:418
+#, php-format
+msgid "_Refresh %s"
+msgstr "_Värskenda %s"
+
+#: templates/message/navbar_actions.inc:8
+msgid "_Reply"
+msgstr "V_asta"
+
+#: lib/IMP.php:981
+msgid "_Search"
+msgstr "_Otsing"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+msgid "_Send Message"
+msgstr "_Saada kiri"
+
+#: templates/mailbox/message_headers.inc:32
+msgid "_Thread"
+msgstr "_Jutulõng"
+
+#: templates/compose/compose.inc:116
+msgid "_To"
+msgstr "_Kellele"
+
+#: templates/mailbox/actions.inc:13
+msgid "_Undelete"
+msgstr "_Taasta"
+
+#: templates/message/navbar_actions.inc:18
+msgid "_View Thread"
+msgstr "_Vaata jutulõnga"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr "Valgesse _nimekirja"
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr "adressaat tundmatu"
+
+#: lib/Compose.php:440
+msgid "attachment"
+msgstr "lisand"
+
+#: view.php:99
+msgid "attachments.zip"
+msgstr "attachments.zip"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr "baiti"
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr "väljundfaili loomine nurjus"
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr "sisendi avamine nurjus"
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr "käsurea vale kasutus"
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr "seadistuse viga"
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr "elutähtis süsteemifail puudub"
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr "andmete vormingu viga"
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr "kannet ei leitud"
 
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "kellelt"
 
-msgid "move down"
-msgstr "liigu alla"
-
-msgid "move message to"
-msgstr "tõsta kiri kausta"
-
-msgid "move up"
-msgstr "liigu üles"
-
-msgid "no folder selected"
-msgstr "kaust pole valitud"
-
-msgid "no rule selected"
-msgstr "reegel pole valitud"
-
-msgid "no text specified"
-msgstr "tekst pole määratud"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr "hostinimi on tundmatu"
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr "sisend/väljund viga"
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr "tarkvara seesmine viga"
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr "võti"
+
+#: folders.php:161
+msgid "mailbox file"
+msgstr "postkastifail"
+
+#: compose.php:1067 lib/Message.php:466
+msgid "name"
+msgstr "nimi"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "Ei midagi..."
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "või"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "palun kirjuta tekst ja vali väli või tegevus"
-
-msgid "remove source"
-msgstr "eemalda allikas"
-
-msgid "select folder"
-msgstr "vali kaust"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr "juurdepääs puudub"
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr "protokolli viga teises otsas"
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr "teenus pole saadaval"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "kirjaviga"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "kirjavead"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "kui %s väli sisaldab <b>%s</b>"
+#: lib/Compose.php:192
+msgid "system error"
+msgstr "süsteemi viga"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr "ajutine tõrge"
+
+#: lib/Filter.php:51
+msgid "your blacklist"
+msgstr "oma musta nimekirja"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr "oma valge nimekirja"


--- orig/templates/folders/foot.inc
+++ mod/templates/folders/foot.inc
@@ -6,7 +6,7 @@
 </form>
 </div>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 displayNames = new Array(<?php


--- orig/lib/MIME/Viewer/pgp.php
+++ mod/lib/MIME/Viewer/pgp.php
@@ -4,8 +4,7 @@
 
 /**
  * The IMP_MIME_Viewer_pgp class allows viewing/decrypting of PGP
- * formatted messages.  This class implements RFC 2015 and is also
- * compliant with the proposed revision, RFC 3156.
+ * formatted messages.  This class implements RFC 3156.
  *
  * This class handles the following MIME types:
  *   application/pgp-encryption
@@ -15,9 +14,9 @@
  * This class may add the following parameters to the URL:
  *   'rawpgpkey' -- Display the PGP Public Key in raw, text format
  *
- * $Horde: imp/lib/MIME/Viewer/pgp.php,v 1.96.6.6 2005/09/30 03:22:37 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/pgp.php,v 1.96.6.11 2006/02/10 16:50:31 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -52,7 +51,7 @@
     /**
      * Classwide cache for icons for status messages.
      *
-     * @var string 
+     * @var string
      */
     var $_icon = null;
 
@@ -101,7 +100,7 @@
         if (!empty($conf['utils']['gnupg']) &&
             $prefs->getValue('use_pgp') &&
             !Util::getFormData('rawpgpkey')) {
-            $msg = Util::bufferOutput('require_once', IMP_TEMPLATES . '/pgp/open_pgp_win.js');
+            $msg = Util::bufferOutput(array('Horde', 'addScriptFile'), 'popup.js');
         }
 
         /* For RFC 2015/3156, there are 3 types of messages:
@@ -168,10 +167,10 @@
             if ($prefs->getValue('use_pgp') &&
                 $GLOBALS['registry']->hasMethod('contacts/addField') &&
                 $prefs->getValue('add_source')) {
-                $this->_status[] = Horde::link('', _("Click to Save PGP Public Key in your Address book"), null, null, $this->_imp_pgp->savePublicKeyURL($mime) . ' return false;') . _("Click to Save PGP Public Key in your Address book") . '</a>.';
+                $this->_status[] = Horde::link('#', _("Click to Save PGP Public Key in your Address book"), null, null, $this->_imp_pgp->savePublicKeyURL($mime) . ' return false;') . _("Click to Save PGP Public Key in your Address book") . '</a>.';
             }
             $this->_status[] = sprintf(_("The raw text of the PGP Public Key can be viewed %s."), $this->_contents->linkViewJS($part, 'view_attach', _("HERE"), _("PGP Public Key Text"), null, array('rawpgpkey' => 1)));
-            
+
             $text = $this->_outputStatus(false) .
                 '<span class="fixed">' . nl2br(str_replace(' ', '&nbsp;', $this->_imp_pgp->pgpPrettyKey($pgp_key))) . '</span>';
         }
@@ -296,12 +295,17 @@
             return $this->_outputStatus();
         }
 
+        if (!$this->_imp_pgp->getPersonalPrivateKey()) {
+            $this->_status[] = _("No personal private key exists so the message is unable to be decrypted.");
+            return $this->_outputStatus();
+        }
+
         $passphrase = $this->_imp_pgp->getPassphrase();
         if (empty($passphrase)) {
             $url = $this->_imp_pgp->getJSOpenWinCode('open_passphrase_dialog');
-            $this->_status[] = Horde::link('', _("You must enter the passphrase for your PGP private key to view this message"), null, null, $url . ' return false;') . _("You must enter the passphrase for your PGP private key to view this message") . '</a>';
+            $this->_status[] = Horde::link('#', _("You must enter the passphrase for your PGP private key to view this message"), null, null, $url . ' return false;') . _("You must enter the passphrase for your PGP private key to view this message") . '</a>';
             $text .= $this->_outputStatus() .
-                '<script language="JavaScript" type="text/javascript">' . $url . '</script>';
+                '<script type="text/javascript">' . $url . '</script>';
         } else {
             if ($mimetype == 'multipart/encrypted') {
                 /* PGP control information appears in the first MIME
@@ -320,7 +324,7 @@
                         require_once 'Horde/MIME/Structure.php';
                         $mime_message = &MIME_Structure::parseTextMIMEMessage($decrypted_data->message);
                         if (!$mime_message) {
-                            require_once 'Horde/Text/Filter.php'; 
+                            require_once 'Horde/Text/Filter.php';
                             $text .= $this->_signedOutput($decrypted_data->sig_result);
                             $decrypted_message = String::convertCharset($decrypted_data->message, $subpart->getCharset());
                             $text .= '<span class="fixed">' . Text_Filter::filter($decrypted_message, 'text2html', array('parselevel' => TEXT_HTML_SYNTAX)) . '</span>';
@@ -360,7 +364,7 @@
                     $decrypted_message = String::convertCharset($decrypted_data->message, $mime->getCharset());
                 }
 
-                require_once 'Horde/Text/Filter.php'; 
+                require_once 'Horde/Text/Filter.php';
                 $text .= '<span class="fixed">' . Text_Filter::filter($decrypted_message, 'text2html', array('parselevel' => TEXT_HTML_SYNTAX)) . '</span>';
             }
         }


--- orig/lib/MIME/Viewer/alternative.php
+++ mod/lib/MIME/Viewer/alternative.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_alternative class renders out messages from
  * multipart/alternative content types.
  *
- * $Horde: imp/lib/MIME/Viewer/alternative.php,v 1.45.10.5 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/alternative.php,v 1.45.10.7 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -83,7 +83,7 @@
         /* Show links to alternative parts. */
         if (is_null($text) || (count($partList) > 1)) {
             if (is_null($text)) {
-                $text = '<i>' . _("There are no alternative parts that can be displayed inline.") . '</i>';
+                $text = '<em>' . _("There are no alternative parts that can be displayed inline.") . '</em>';
             }
 
             /* Generate the list of summaries to use. */


--- orig/lib/MIME/Viewer/zip.php
+++ mod/lib/MIME/Viewer/zip.php
@@ -6,10 +6,10 @@
  * The MIME_Viewer_zip class renders out the contents of ZIP files in HTML
  * format and allows downloading of extractable files.
  *
- * $Horde: imp/lib/MIME/Viewer/zip.php,v 1.25.10.4 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/zip.php,v 1.25.10.7 2006/02/10 14:00:18 jan Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -58,7 +58,7 @@
                     $text = '<pre>' . _("Could not extract the requested file from the Zip archive.") . '</pre>';
                 } else {
                     $this->mime_part->setType('application/octet-stream');
-                    $this->mime_part->setName($zipInfo[$fileKey]['name']);
+                    $this->mime_part->setName(basename($zipInfo[$fileKey]['name']));
                 }
             } else {
                 $text = '<pre>' . _("The requested file does not exist in the Zip attachment.") . '</pre>';
@@ -88,7 +88,7 @@
             ((($val['_method'] == 0x8) && Util::extensionExists('zlib')) ||
             ($val['_method'] == 0x0))) {
             $old_name = $this->mime_part->getName();
-            $this->mime_part->setName($name);
+            $this->mime_part->setName(basename($name));
             $val['name'] = str_replace($name, $this->_contents->linkView($this->mime_part, 'download_render', $name, array('jstext' => sprintf(_("View %s"), $name), 'class' => 'fixed', 'viewparams' => array('zip_attachment' => (urlencode($key) + 1)))), $val['name']);
             $this->mime_part->setName($old_name);
         }


--- orig/lib/MIME/Viewer/notification.php
+++ mod/lib/MIME/Viewer/notification.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_notification class handles multipart/report messages
  * that refer to mail notification messages (RFC 2298).
  *
- * $Horde: imp/lib/MIME/Viewer/notification.php,v 1.14.10.5 2005/09/30 03:22:37 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/notification.php,v 1.14.10.7 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/templates/fetchmail/fetchmail.inc
+++ mod/templates/fetchmail/fetchmail.inc
@@ -2,32 +2,29 @@
 <?php Util::pformInput() ?>
 <input type="hidden" name="actionID" value="fetchmail_fetch" />
 
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-<tr><td class="header" align="left"><b><?php echo _("Other Mail Accounts") ?></b></td></tr>
-</table>
+<h1 class="header">
+  <?php echo _("Other Mail Accounts") ?>
+</h1>
+<div class="item">
+<?php if ($accounts): ?>
+  <?php echo _("Check all mail servers you want to fetch mail from:") ?>&nbsp;<br />
 
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
-<tr><td class="item">
-  <table border="0"><tr valign="top"><td class="item">
-    <tr valign="top">
-      <td class="item">
-        <?php echo _("Check all mail servers you want to fetch mail from:") ?>&nbsp;<br />
-        <table>
-<?php foreach (array_keys($accounts) as $val): ?>
-          <tr>
-            <td><input type="checkbox" name="accounts[]" checked="checked" value="<?php echo $val ?>" /></td>
-            <td><?php echo htmlspecialchars($fm_account->getValue('id', $val)) ?></td>
-          </tr>
+  <ul>
+<?php foreach ($accounts as $key => $val): ?>
+    <li>
+      <input type="checkbox" name="accounts[]" checked="checked" value="<?php echo $key ?>" />
+      <?php echo htmlspecialchars($fm_account->getValue('id', $key)) ?>
+    </li>
 <?php endforeach; ?>
-        </table>
-      </td>
-    </tr>
-  </table>
-</td></tr>
-
-<tr><td class="header" align="left">
+  </ul>
+<?php else: ?>
+  <?php echo _("Check all mail servers you want to fetch mail from:") ?>&nbsp;<br />
+<?php endif; ?>
+</div>
+<div class="nowrap">
+<?php if ($accounts): ?>
   <input type="submit" name="fetch" class="button" value="<?php echo _("Fetch Mail") ?>" />
+<?php endif; ?>
   <input type="button" name="back" class="button" onclick="<?php echo $cancel_js ?>" value="<?php echo _("Close") ?>" />
-</td></tr>
-</table>
+</div>
 </form>


--- orig/lib/Auth/imp.php
+++ mod/lib/Auth/imp.php
@@ -10,9 +10,9 @@
  *   None.</pre>
  *
  *
- * $Horde: imp/lib/Auth/imp.php,v 1.16.6.6 2005/07/03 03:42:43 selsky Exp $
+ * $Horde: imp/lib/Auth/imp.php,v 1.16.6.15 2006/04/10 05:03:44 slusarz Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
@@ -79,9 +79,20 @@
                     require_once IMP_BASE . '/lib/Session.php';
                     if (IMP_Session::createSession($imapuser, $pass,
                                                    $ptr['server'], $ptr)) {
-                        $entry = sprintf('Login success for %s [%s] to {%s:%s}',
-                                         $imapuser, $_SERVER['REMOTE_ADDR'],
-                                         $ptr['server'], $ptr['port']);
+                        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                           $entry = sprintf('Login success for %s [%s] (forwarded for [%s]) to {%s:%s}',
+                                            $imapuser,
+                                            $_SERVER['REMOTE_ADDR'],
+                                            $_SERVER['HTTP_X_FORWARDED_FOR'],
+                                            $ptr['server'],
+                                            $ptr['port']);
+                        } else {
+                           $entry = sprintf('Login success for %s [%s] to {%s:%s}',
+                                            $imapuser,
+                                            $_SERVER['REMOTE_ADDR'],
+                                            $ptr['server'],
+                                            $ptr['port']);
+                        }
                         Horde::logMessage($entry, __FILE__, __LINE__,
                                           PEAR_LOG_NOTICE);
                         return true;
@@ -117,13 +128,7 @@
      * Keys:
      * -----
      * 'flags'  --  (integer) Flags to pass to imap_open().
-     *              DEAFULT: 0
-     *   OP_READONLY  : Open the mailbox read-only.
-     *   OP_ANONYMOUS : (NNTP only) Don't use or update a .newrc file.
-     *   OP_HALFOPEN  : (IMAP and NNTP only) Open a connection, but not a
-     *                  specific mailbox.
-     *   CL_EXPUNGE   : Expunge the mailbox automatically when the stream is
-     *                  closed.
+     *              DEFAULT: 0
      * </pre>
      */
     function authenticateOptions($params = array())
@@ -154,28 +159,14 @@
         }
 
         /* Set the maildomain. */
-        $maildomain = $prefs->getValue('mail_domain');
+        $maildomain = preg_replace('/[^-\.a-z0-9]/i', '',
+                                   $prefs->getValue('mail_domain'));
         if (!empty($maildomain)) {
             $_SESSION['imp']['maildomain'] = $maildomain;
         } elseif (!empty($_SESSION['imp']['maildomain'])) {
             $prefs->setValue('mail_domain', $_SESSION['imp']['maildomain']);
         }
 
-        /* Process the mailbox parameter (if present). */
-        $mailbox = Util::getFormData('mailbox');
-        if ($mailbox != null) {
-            /* If the mailbox parameter contains virtual folder information,
-              set the search parameters for that virtual folder now. */
-            if (strpos($mailbox, IMP_VFOLDER_PREFIX) === 0) {
-                require_once IMP_BASE . '/lib/VFolder.php';
-                IMP_VFolder::changeToVFolder($mailbox);
-                $_SESSION['imp']['mailbox'] = IMP_SEARCH_MBOX;
-            } else {
-                $_SESSION['imp']['mailbox'] = $mailbox;
-            }
-        } elseif (!isset($_SESSION['imp']['mailbox'])) {
-            $_SESSION['imp']['mailbox'] = 'INBOX';
-        }
 
         if (!isset($GLOBALS['imp'])) {
             $GLOBALS['imp'] = &$_SESSION['imp'];
@@ -183,12 +174,29 @@
 
         $connstr = null;
         $flags = $this->_impParams['flags'];
+        $flags &= ~OP_ANONYMOUS;
+
+        /* Process the mailbox parameter (if present). */
+        $mailbox = Util::getFormData('mailbox');
+        if (!is_null($mailbox)) {
+            $_SESSION['imp']['mailbox'] = $mailbox;
+        } elseif (!isset($_SESSION['imp']['mailbox'])) {
+            $_SESSION['imp']['mailbox'] = 'INBOX';
+        }
+        $_SESSION['imp']['thismailbox'] = Util::getFormData('thismailbox', $_SESSION['imp']['mailbox']);
+
+        /* Is this a search mailbox? */
+        $imp_search_params = null;
+        if (strpos($_SESSION['imp']['mailbox'], IMP_SEARCH_MBOX) === 0) {
+            $imp_search_params = array('id' => $_SESSION['imp']['mailbox']);
+        }
+        require_once IMP_BASE . '/lib/Search.php';
+        $GLOBALS['imp_search'] = new IMP_Search($imp_search_params);
 
         switch ($_SESSION['imp']['base_protocol']) {
         case 'pop3':
-            $flags &= ~OP_ANONYMOUS;
+            $connstr = 'INBOX';
             $flags &= ~OP_HALFOPEN;
-            $_SESSION['imp']['thismailbox'] = '';
 
             /* Turn some options off if we are working with POP3. */
             $conf['user']['allow_folders'] = false;
@@ -199,24 +207,24 @@
             $prefs->setLocked('trash_folder', true);
             break;
 
-        default:
-            $_SESSION['imp']['thismailbox'] = Util::getFormData('thismailbox', $_SESSION['imp']['mailbox']);
-            if ($_SESSION['imp']['thismailbox'] == IMP_SEARCH_MBOX) {
-                if (strstr(Util::getFormData('index'), ':')) {
-                    $tmp = explode(':', Util::getFormData('index'));
-                    $connstr = $tmp[1];
-                } else {
-                    $aindex = Util::getFormData('array_index');
-                    if ($aindex !== null) {
-                        $tmp = explode(IMP_MSG_SEP, $_SESSION['imp']['msgl']);
-                        $mbox = substr($tmp[$aindex], strpos($tmp[$aindex], IMP_IDX_SEP) + 1);
-                        $connstr = $mbox;
-                    } else {
+        case 'imap':
+            if ($flags ^ OP_HALFOPEN) {
+                $connstr = $_SESSION['imp']['thismailbox'];
+                if ($GLOBALS['imp_search']->isSearchMbox($_SESSION['imp']['thismailbox'])) {
+                    if (strstr(Util::getFormData('index'), ':')) {
+                        $tmp = explode(':', Util::getFormData('index'));
+                        $connstr = $tmp[1];
                         $flags |= OP_HALFOPEN;
+                    } else {
+                        $aindex = Util::getFormData('array_index');
+                        if ($aindex !== null) {
+                            $tmp = explode(IMP_MSG_SEP, $_SESSION['imp']['msgl']);
+                            $mbox = substr($tmp[$aindex], strpos($tmp[$aindex], IMP_IDX_SEP) + 1);
+                            $connstr = $mbox;
+                            $flags |= OP_HALFOPEN;
+                        }
                     }
                 }
-            } else {
-                $connstr = $_SESSION['imp']['thismailbox'];
             }
             break;
         }
@@ -227,12 +235,25 @@
         $imp_imap->changeMbox($connstr, $flags);
 
         if (!$_SESSION['imp']['stream']) {
-            if (!empty($_SESSION['imp']['server']) && !empty($_SESSION['imp']['port']) &&
-                !empty($_SESSION['imp']['protocol']) && !empty($_SESSION['imp']['user'])) {
+            if (!empty($_SESSION['imp']['server']) &&
+                !empty($_SESSION['imp']['port']) &&
+                !empty($_SESSION['imp']['protocol']) &&
+                !empty($_SESSION['imp']['user'])) {
                 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-                    $entry = sprintf('FAILED LOGIN %s (forwarded for [%s]) to %s:%s[%s] as %s', $_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_X_FORWARDED_FOR'], $_SESSION['imp']['server'], $_SESSION['imp']['port'], $_SESSION['imp']['protocol'], $_SESSION['imp']['user']);
+                    $entry = sprintf('FAILED LOGIN %s (forwarded for [%s]) to %s:%s[%s] as %s',
+                                     $_SERVER['REMOTE_ADDR'],
+                                     $_SERVER['HTTP_X_FORWARDED_FOR'],
+                                     $_SESSION['imp']['server'],
+                                     $_SESSION['imp']['port'],
+                                     $_SESSION['imp']['protocol'],
+                                     $_SESSION['imp']['user']);
                 } else {
-                    $entry = sprintf('FAILED LOGIN %s to %s:%s[%s] as %s', $_SERVER['REMOTE_ADDR'], $_SESSION['imp']['server'], $_SESSION['imp']['port'], $_SESSION['imp']['protocol'], $_SESSION['imp']['user']);
+                    $entry = sprintf('FAILED LOGIN %s to %s:%s[%s] as %s',
+                                     $_SERVER['REMOTE_ADDR'],
+                                     $_SESSION['imp']['server'],
+                                     $_SESSION['imp']['port'],
+                                     $_SESSION['imp']['protocol'],
+                                     $_SESSION['imp']['user']);
                 }
                 Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR);
             }
@@ -248,4 +269,15 @@
         return true;
     }
 
+    /**
+     * Somewhat of a hack to allow IMP to set an authentication error message
+     * that may occur outside of this file.
+     *
+     * @param string $msg  The error message to set.
+     */
+    function IMPsetAuthErrorMsg($msg)
+    {
+        $this->_setAuthError(AUTH_REASON_MESSAGE, $msg);
+    }
+
 }


--- orig/po/ru_RU.po
+++ mod/po/ru_RU.po
@@ -2,269 +2,369 @@
 # Copyright (C)
 # Anton Nekhoroshih <anton at valuehost.ru>, 2001
 # Fedor A. Fetisov <faf at ssc.ru>, 2002
-# Alexey Zakharov <themech at tut.by>, 2005
+# Alexey Zakharov <baber at mosga.net>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP v4.0.2\n"
+"Project-Id-Version: IMP H3 v4.1-RC3\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-14 15:36+0200\n"
-"PO-Revision-Date: 2005-03-22 19:40+0200\n"
-"Last-Translator: Alexey Zakharov <themech at tut.by>\n"
+"POT-Creation-Date: 2006-02-17 17:03+0200\n"
+"PO-Revision-Date: 2006-02-17 17:30+0200\n"
+"Last-Translator: Alexey Zakharov <baber at mosga.net>\n"
 "Language-Team: Russian <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CP1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:429
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Êîìó:"
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "      Êîìó:"
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "    Äàòà:"
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "    Îò êîãî:"
 
-#: mailbox.php:393
+#: mailbox.php:409 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr ""
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr " Òåìà: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " â "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr ""
 
-#: lib/Block/summary.php:71
-#, php-format
+#: lib/Block/summary.php:72
+#, fuzzy, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
-msgstr ""
+msgstr "Èñïîëüçîâàíî: %.2fÌá èç %.2fÌá (%.2f%%)"
+
+# fuzzy, php-format
+# fuzzy, php-format
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d ñîîáùåíèé"
 
-#: mailbox.php:190
+#: mailbox.php:176
 #, fuzzy, php-format
-msgid "%d message(s) have been deleted."
+msgid "%d messages have been deleted."
 msgstr "Ïîêàçûâàòü ñîîáùåíèÿ êîòîðûå ïðîøëè ÷åðåç ôèëüòð."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:196
 #, fuzzy, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:176
 #, fuzzy, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/Spam.php:161
+#: lib/Spam.php:188
 #, fuzzy, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/Spam.php:141
+#: lib/Spam.php:168
 #, fuzzy, php-format
 msgid "%d messages have been reported as spam."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: mailbox.php:362
+#: mailbox.php:359
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d ïî %d èç %d ñîîáùåíèé"
 
-#: mailbox.php:601
+#: mailbox.php:636
 #, php-format
 msgid "%s KB"
 msgstr ""
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr ""
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr ""
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s óæå ñóùåòâóåò. Âàøà %s ïàïêà íå áûëà ïåðåèìåíîâàíà."
 
-#: lib/Message.php:643
+#: lib/Message.php:689
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s ïàïêà áóäåò ïåðåèìåíîâàíà â íà÷àëå ìåñÿöà."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:603
-#, php-format
-msgid "%s has cancelled %s."
+#: lib/MIME/Viewer/itip.php:617
+#, fuzzy, php-format
+msgid "%s has cancelled \"%s\"."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"Ïàïêà \"%s\" áûëà óñïåøíî ïåðåèìåíîâàíà â \"%s\".\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]"
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:452
-#, php-format
+#: lib/MIME/Viewer/itip.php:492
+#, fuzzy, php-format
 msgid "%s has replied to a free/busy request."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Îøèáêà îòïðàâêè ïèñüìà: %s\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Îøèáêà îòïðàâêè ïèñüìà: %s\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Îøèáêà îòïðàâêè ïèñüìà: %s"
 
-#: lib/MIME/Viewer/itip.php:583
-#, php-format
-msgid "%s has replied to the invitation to %s."
+#: lib/MIME/Viewer/itip.php:609
+#, fuzzy, php-format
+msgid "%s has replied to the invitation to \"%s\"."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"Ïåðåíàïðàâèòü ýòî ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s."
 
-#: lib/MIME/Viewer/itip.php:441
-#, php-format
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy, php-format
 msgid "%s has sent you free/busy information."
-msgstr ""
+msgstr "Îøèáêà îòïðàâêè ïèñüìà: %s"
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:446
-#, php-format
+#: lib/MIME/Viewer/itip.php:488
+#, fuzzy, php-format
 msgid "%s requests your free/busy information."
-msgstr ""
+msgstr "Èíôîðìàöèÿ î ñåðâåðå"
 
-#: lib/MIME/Viewer/itip.php:541
-#, php-format
-msgid "%s requests your presence at %s."
+# #-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#
+# #-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#
+# #-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#
+# fuzzy
+# #-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#
+# fuzzy
+# #-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#
+# fuzzy
+#: lib/MIME/Viewer/itip.php:580
+#, fuzzy, php-format
+msgid "%s requests your presence at \"%s\"."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Âàøà èíôîðìàöèÿ\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Âàøà èíôîðìàöèÿ\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Âàøà èíôîðìàöèÿ"
 
-#: lib/Message.php:398
+#: lib/Message.php:463
 #, fuzzy, php-format
-msgid "%s was successfully added to %s."
+msgid "%s was successfully added to \"%s\"."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî ïåðåèìåíîâàíà â \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:553
-#, php-format
-msgid "%s wishes to ammend %s."
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:531
-#, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:558
-#, php-format
-msgid "%s wishes to receive the latest information about %s."
+#: lib/MIME/Viewer/itip.php:592
+#, fuzzy, php-format
+msgid "%s wishes to ammend \"%s\"."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"Ïàïêà \"%s\" áûëà óñïåøíî ïåðåèìåíîâàíà â \"%s\".\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"[ñòðîêà %s èç %s]"
+
+#: lib/MIME/Viewer/itip.php:571
+#, php-format
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:596
+#, fuzzy, php-format
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s.\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íåâîçìîæíî çàãðóçèòü îïðåäåëåíèå %s."
 
-#: message.php:277 message.php:282
+#: message.php:293 message.php:298
 #, php-format
 msgid "%s: %s"
 msgstr ""
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;èç&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Ñîõðàíèòü èçìåíåíèÿ è ïåðåéòè äàëåå)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Îòìåíèòü âñå èçìåíåíèÿ è ïåðåéòè ê ðåäàêòèðîâàíèþ)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr "(Âåðíóòüñÿ â ðåäàêòîð, ñîõðàíèâ âíåñåííûå èçìåíåíèÿ.)"
 
-#: spelling.php:274
+#: spelling.php:276
 #, fuzzy
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
 msgstr "(Âåðíóòüñÿ â ðåäàêòîð, ñîõðàíèâ âíåñåííûå èçìåíåíèÿ.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Äëÿ äîáàâëåíèÿ íàæìèòå OK *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Ïîæàëóéñòà âûáåðèòå àäðåñ(à) *"
 
-#: lib/Spam.php:171
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Ïðîôèëü \"%s\" áûë óäàëåí."
+
+#: lib/Spam.php:198
 #, fuzzy
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:178
 #, fuzzy
 msgid "1 message has been reported as not spam."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/Spam.php:163
+#: lib/Spam.php:190
 #, fuzzy
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/Spam.php:143
+#: lib/Spam.php:170
 #, fuzzy
 msgid "1 message has been reported as spam."
 msgstr "Îá ýòîì ïèñüìå, êàê î ñïàìå áûëî ñîîáùåíî àäìèíèñòðàòîðó."
 
-#: lib/config/prefs.php:788
+#: config/prefs.php.dist:808
 #, fuzzy
 msgid "100 characters"
 msgstr "Ñïåöèàëüíûå ñèìâîëû"
 
-#: lib/config/prefs.php:791
+#: config/prefs.php.dist:811
 #, fuzzy
 msgid "1000 characters"
 msgstr "Ñïåöèàëüíûå ñèìâîëû"
 
-#: lib/config/prefs.php:789
+#: config/prefs.php.dist:809
 #, fuzzy
 msgid "250 characters"
 msgstr "Ñïåöèàëüíûå ñèìâîëû"
 
-#: lib/config/prefs.php:790
+#: config/prefs.php.dist:810
 #, fuzzy
 msgid "500 characters"
 msgstr "Ñïåöèàëüíûå ñèìâîëû"
 
-#: lib/MIME/Viewer/itip.php:61
-msgid "<b>The calendar data is invalid</b>"
-msgstr ""
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr ""
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -272,121 +372,178 @@
 
 #: templates/search/fields.inc:5
 msgid "AND"
+msgstr "È"
+
+#: lib/MIME/Viewer/itip.php:582
+#, fuzzy
+msgid "Accept and add to my calendar"
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.6)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:738
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr ""
 
-#: lib/IMP.php:911 lib/IMP.php:913
-msgid "Acco_unts"
-msgstr "Äðóãèå ÿùèêè"
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr ""
 
 # fuzzy
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Ïðîôèëü:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 #, fuzzy
 msgid "Actions"
 msgstr "Äåéñòâèå"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Àäðåñíàÿ êíèãà"
+
 #: templates/prefs/sourceselect.inc:303
 #, fuzzy
 msgid "Add source"
 msgstr "äîáàâèòü òåêñò"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:573
+#, fuzzy
 msgid "Add this to my calendar"
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó"
 
-# fuzzy, php-format
-# php-format
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-msgid "Add to Address book (%s)"
-msgstr "Äîáàâèòü â àäðåñíóþ êíèãó (%s)"
+#: lib/MIME/Viewer/itip.php:583
+#, fuzzy
+msgid "Add to my calendar"
+msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Óäàëèòü ïàðó"
 
 # fuzzy, php-format
-#: compose.php:1166
+#: compose.php:590
+#, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Ôàéë \"%s\" ïðèêðåïëåí ê ïèñüìó"
 
-#: lib/config/prefs.php:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
+"Äîïîëíèòåëüíî îòîáðàæàòü ñëåäóþùèå çàãîëîâêè:  <em>(íå îáÿçàòåëüíû, êàæäûé ñ "
+"íîâîé ñòðîêè)</em>"
 
-#: lib/MIME/Viewer/notification.php:65
-#, php-format
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy, php-format
 msgid "Additional information can be viewed %s."
-msgstr ""
+msgstr "Ëè÷íûå íàñòðîéêè"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, fuzzy
 msgid "Additional information details"
 msgstr "Ëè÷íûå íàñòðîéêè"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
+#, fuzzy
 msgid "Additional message details"
-msgstr ""
+msgstr "Ëè÷íûå íàñòðîéêè"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr ""
 
-#: lib/MIME/Viewer/status.php:81
+# fuzzy
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
-msgstr ""
+msgstr "Äîïîëíèòåëüíàÿ èíôîðìàöèÿ îá îøèáêå"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
-msgstr ""
+msgstr "Äîïîëíèòåëüíàÿ èíôîðìàöèÿ îá îøèáêå ìîæåò áûòü ïðîñìîòðåíà %s."
 
-#: contacts.php:95 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Àäðåñíàÿ êíèãà"
 
 # fuzzy
-#: lib/config/prefs.php:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Àäðåñíûå êíèãè"
 
-#: lib/config/prefs.php:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
+"Íàïðàâëÿòü êîïèè âñåõ ñîîáùåíèé äàííûì àäðåñàòàì:  <em>(íå îáÿçàòåëüíû, "
+"êàæäûé ñ íîâîé ñòðîêè)</em>"
 
-#: lib/config/prefs.php:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
+"Àäðåñà, îòíîñÿùèåñÿ ê äàííîìó ïðîôèëþ:  <em>(íå îáÿçàòåëüíû, êàæäûé ñ íîâîé "
+"ñòðîêè)</em>"
 
-#: templates/mailbox/navbar.inc:10 lib/config/prefs.php:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "Âñå"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Âñå ñîîáùåíèÿ â ïàïêå(àõ) áóäóò óòåðÿíû!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13 templates/folders/javascript.inc:5
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Âñå ñîîáùåíèÿ â óêàçàííîé ïàïêå(àõ) áóäóò ïåðåìåùåíû â ôàéë MBOX:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -394,51 +551,60 @@
 msgstr ""
 "Âñå ñîîáùåíèÿ â  Âàøåé ïàïêå \"%s\" ñòàðøå %s äíÿ(äíåé) áóäóò óíè÷òîæåííû."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, fuzzy, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "Âñå ïàïêè îòïðàâëåííûõ ñîîáùåíèé ñòàðøå %s ìåñÿöåâ áóäóò óäàëåíû."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "Âñå ïàïêè îòïðàâëåííûõ ñîîáùåíèé ñòàðøå %s ìåñÿöåâ áóäóò óäàëåíû."
 
-#: acl.php:85
+#: acl.php:84
 #, fuzzy, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî ïåðåèìåíîâàíà â \"%s\"."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr ""
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
-msgstr ""
+msgstr "Àëüòåðíàòèâíûé âèä ýòîãî ñîîáùåíèÿ:"
 
-#: lib/config/prefs.php:565 lib/config/prefs.php:586
+#: config/prefs.php.dist:572
 #, fuzzy
 msgid "Always"
 msgstr "Ïñåâäîíèì"
 
 # fuzzy
-#: lib/config/prefs.php:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Âñåãäà ñîõðàíÿòü âëîæåíèÿ"
 
-#: lib/Message.php:491
+#: lib/Message.php:554
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
 
-#: lib/Message.php:385
+#: lib/Message.php:437
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Íåèçâåñòíàÿ îøèáêà ïðè äîáàâëåíèè íîâîé çàïèñè."
+
+#: lib/Message.php:436
 #, fuzzy
 msgid "An unknown error occured while creating the new task."
 msgstr "Íåèçâåñòíàÿ îøèáêà ïðè äîáàâëåíèè íîâîé çàïèñè."
 
-#: message.php:491 mailbox.php:671 templates/message/navbar_navigate.inc:9
+#: message.php:504 mailbox.php:709 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -455,48 +621,46 @@
 
 # fuzzy, php-format
 #: templates/mailbox/header.inc:7
+#, php-format
 msgid "Apply Filters to %s"
 msgstr "Âêëþ÷èòü ôèëüòðàöèþ äëÿ %s"
 
 # fuzzy
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Ïðèìåíèòü ïðàâèëà ôèëüòðàöèè ïðè âõîäå â ñèñòåìó"
 
 # fuzzy
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Ïðèìåíèòü ïðàâèëà ôèëüòðàöèè ïðè îáíîâëåíèè ïî÷òîâîãî ÿùèêà."
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Âû ÓÂÅÐÅÍÛ, ÷òî õîòèòå ïðîäîëæèòü?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Âû òî÷íî óâåðåíû è õîòèòå ïðîäîëæèòü?"
+# fuzzy
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Âû óâåðåíû, ÷òî õîòèòå ñäåëàòü ýòî?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, fuzzy
 msgid "Are you sure you want to delete this public key?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ñäåëàòü ýòî?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+#, fuzzy
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
-msgstr ""
+msgstr "Âû óâåðåíû, ÷òî õîòèòå ñäåëàòü ýòî?"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ñäåëàòü ýòî?"
 
-#: message.php:399 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:63
+#: message.php:409 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ÎÊÎÍ×ÀÒÅËÜÍÎ óäàëèòü ýòè ñîîáùåíèÿ?"
 
 # fuzzy
-#: lib/MIME/Contents.php:222
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ÎÊÎÍ×ÀÒÅËÜÍÎ óäàëèòü ýòè âëîæåíèÿ?"
 
@@ -505,7 +669,13 @@
 msgstr "Âû óâåðåíû, ÷òî õîòèòå î÷èñòèòü ýòó ïàïêó?"
 
 # fuzzy
-#: lib/IMP.php:902
+#: lib/IMP.php:949
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Âû óâåðåíû, ÷òî õîòèòå î÷èñòèòü êîðçèíó?"
+
+# fuzzy
+#: lib/IMP.php:942
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå î÷èñòèòü êîðçèíó?"
 
@@ -514,86 +684,91 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå ÎÊÎÍ×ÀÒÅËÜÍÎ óäàëèòü ýòè ñîîáùåíèÿ?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 #, fuzzy
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå î÷èñòèòü ýòó ïàïêó?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 #, fuzzy
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Âû óâåðåíû, ÷òî õîòèòå î÷èñòèòü ýòó ïàïêó?"
 
-#: lib/config/prefs.php:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Âðåìÿ ïîëó÷åíèÿ"
 
-#: lib/config/prefs.php:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Ïî âîçðàñòàíèþ"
 
-#: lib/config/prefs.php:564 lib/config/prefs.php:585
+#: config/prefs.php.dist:571
 msgid "Ask"
-msgstr ""
-
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Ïðèêðåïèòü"
+msgstr "Ñïðàøèâàòü"
 
 # fuzzy
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:472
 msgid "Attach Files"
 msgstr "Ïðèêðåïèòü"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:453
 msgid "Attach a copy of your PGP public key to your message?"
-msgstr ""
+msgstr "Ïðèëîæèòü ê ïèñüìó êîïèþ ïóáëè÷íîãî PGP êëþ÷à?"
 
 # fuzzy
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Ïðèêðåïëåííûå:"
 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr ""
 
-#: mailbox.php:705 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:500 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Âëîæåíèå"
 
-#: compose.php:976 lib/Message.php:452
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Âëîæåíèå %s óäàëåíî"
+
+#: lib/Compose.php:1125
+#, fuzzy
+msgid "Attachment Information"
+msgstr "Îáíîâèòü èíôîðìàöèþ î âëîæåíèÿõ"
+
+#: compose.php:1105 lib/Message.php:515
 msgid "Attachment stripped: Original attachment type"
 msgstr "Âëîæåíèå íå ñîõðàíÿëîñü, òèï"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:990
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:470
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Âëîæåíèÿ"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:678
 #, fuzzy
 msgid "Attendees"
 msgstr "Ïðèêðåïëåííûå"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 #, fuzzy
 msgid "Attention"
 msgstr "Äåéñòâèå"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr ""
 
-#: lib/config/prefs.php:643
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -604,7 +779,7 @@
 msgid "Available Address books:"
 msgstr "Äîñòóïíûå àäðåñíûå êíèãè:"
 
-#: lib/MIME/Viewer/itip.php:704
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr ""
 
@@ -615,29 +790,54 @@
 msgstr "Âåðíóòüñÿ â %s"
 
 # php-format
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Âåðíóòüñÿ â %s"
 
-#: message.php:258 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Èíäåêñ"
+
+#: thread.php:132
+#, fuzzy
+msgid "Back to Thread Display"
+msgstr "Ñïèñîê çàäà÷ ïóñò."
+
+#: lib/IMAP/Client.php:572
+#, fuzzy, php-format
+msgid "Bad login name or password."
+msgstr "Ïîæàëóéñòà, ââåäèòå Âàøè èìÿ ïîëüçîâàòåëÿ è ïàðîëü"
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr ""
+
+#: message.php:274 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
+#, fuzzy
 msgid "Below is the raw text of the status information message."
-msgstr ""
+msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "×åðíûé ñïèñîê"
 
-#: lib/config/prefs.php:631
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Íå îòîáðàæàòü êàðòèíêè â HTML ñîîáùåíèÿõ"
 
-#: search.php:161
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Òåêñò ñîîáùåíèÿ"
 
@@ -646,42 +846,47 @@
 msgid "Both"
 msgstr "Âìåñòå"
 
-#: lib/config/prefs.php:690
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Â çàãîëîâêå è â òåëå ñîîáùåíèÿ"
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
+
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "Êîäèðîâêà"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Åæåíåäåëüíèê"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr ""
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr ""
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr ""
 
-#: templates/contacts/contacts.inc:253 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:106 templates/pgp/passphrase.inc:32
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Îòìåíà"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:432
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Îòìåíèòü îòïðàâêó"
 
@@ -689,29 +894,35 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Ïðè îòìåíå îòïðàâêè ýòîãî ñîîáùåíèÿ âñå åãî ñîäåðæàíèå áóäåò óòåðÿíî."
 
-#: message.php:257 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:273 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:686
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:696
 #, fuzzy
 msgid "Chair Person"
 msgstr "Ëè÷íûå"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Èçìåíèòü"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Èçìåíèòü Âñå"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Èçìåíèòü ïàïêó"
 
-#: lib/config/prefs.php:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -719,34 +930,34 @@
 "Íàñòðîéêè ïðîñìîòðà ñîîáùåíèé. (Êîëè÷åñòâî ñîîáùåíèé íà ñòðàíèöå, ïîðÿäîê "
 "ñîðòèðîâêè.)"
 
-#: lib/config/prefs.php:24
+#: config/prefs.php.dist:24
 msgid "Change mail server and folder settings."
 msgstr "Íàñòðîèòü ïàïêè äëÿ ðàçëè÷íûõ íóæä"
 
-#: lib/config/prefs.php:15
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr "Íàñòðîéêè èìåíè, àäðåñà, ïîäïèñè."
 
-#: lib/config/prefs.php:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr ""
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Ïðîâåðèòü ïî÷òó â ïàïêå(àõ)"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
-msgstr ""
+msgstr "Âûäåëèòü âñå"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Çàáðàòü ïî÷òó ñ óêàçàííûõ ïî÷òîâûõ ñåðâåðîâ:"
 
 # fuzzy
-#: lib/config/prefs.php:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Ïðîâåðÿòü îðôîãðàôèþ ïåðåä îòïðàâêîé"
 
@@ -754,7 +965,7 @@
 msgid "Choose Action:"
 msgstr "Äåéñòâèå:"
 
-#: lib/config/servers.php:170
+#: config/servers.php.dist:202
 #, fuzzy
 msgid "Choose a mail server:"
 msgstr ""
@@ -762,10 +973,11 @@
 "#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
 "Äåéñòâèå:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:716
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
 #, fuzzy
-msgid "Choose an action:"
-msgstr "Äåéñòâèå:"
+msgid "Choose a match or edit the address to the right:"
+msgstr "Ïîæàëóéñòà, âûáåðèòå èëè îòðåäàêòèðóéòå:"
 
 # fuzzy
 #: templates/prefs/sourceselect.inc:349
@@ -777,43 +989,44 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Âûáåðèòå ïîðÿäîê ïåðåáîðà àäðåñíûõ êíèã ïðè ïîèñêå àäðåñîâ."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr ""
 
-#: lib/Filter.php:103
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:119
 #, fuzzy, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
 
-#: lib/MIME/Viewer/images.php:149
-#, php-format
+#: lib/MIME/Viewer/images.php:164
+#, fuzzy, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr ""
+msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:423
 #, fuzzy, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr ""
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
-msgstr ""
+msgstr "Íàææèòå çäåñü ÷òîáû ÓÂÈÄÅÒÜ èçîáðàæåíèÿ."
 
 #: templates/prefs/sourceselect.inc:321
 #, fuzzy
@@ -823,50 +1036,50 @@
 msgstr ""
 "Êëèêíèòå ìûøêîé ïî âûáðàíîé êíèãå è, çàòåì, îòìåòüòå âñå ïîëÿ äëÿ ïîèñêà."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
-msgstr ""
+msgstr "Íàæìèòå çäåñü ÷òîáû çàïèñàòü ïóáëè÷íûé êëþ÷ â àäðåñíóþ êíèãó"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 
-#: lib/config/prefs.php:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Ñîçäàíèå íîâîãî ñîîáùåíèÿ äëÿ äàííîãî àäðåñàòà"
 
-#: lib/config/prefs.php:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Îòêðûòèå âõîäÿùåãî ïèñüìà"
 
 # fuzzy
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Çàêðûòü"
 
-#: compose.php:1057
+#: compose.php:418
 msgid "Close this window"
 msgstr ""
 
-#: folders.php:387
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Çàêðûòàÿ ïàïêà"
 
-#: folders.php:407
+#: folders.php:430
 #, fuzzy
 msgid "Collapse"
 msgstr "Ñâåðíóòü âñå"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Ñâåðíóòü âñå"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Ñâåðíóòü âñå ïàïêè"
 
-#: folders.php:407
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Ñâåðíóòü ïàïêó"
 
@@ -874,69 +1087,71 @@
 msgid "Color Indicator: "
 msgstr "Öâåòîâîé èíäèêàòîð:"
 
-#: templates/pgp/pgp.inc:191
+# fuzzy
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
-msgstr ""
+msgstr "Êîììåíòàðèé"
 
-#: lib/MIME/Viewer/itip.php:754
+#: lib/MIME/Viewer/itip.php:762
 #, fuzzy
 msgid "Completed"
 msgstr "Íîâîå ñîîáùåíèå"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Íàïèñàòü"
-
-#: mailbox.php:735 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Ñîñòàâëåíèÿ ñîîáùåíèÿ (%s)"
-
-#: compose.php:1056
+#: compose.php:417
 #, fuzzy
 msgid "Compose another message"
 msgstr "Ñîñòàâëåíèå ñîîáùåíèÿ"
 
 # fuzzy
-#: lib/config/prefs.php:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Ñîçäàâàòü íîâîå ïèñüìî â îòäåëüíîì îêíå"
 
-#: lib/config/prefs.php:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr "Âêëþ÷èòü âèçóàëüíûé ðåäàêòîð ïî óìîë÷àíèþ"
 
-#: lib/config/prefs.php:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Íàñòðîéêà ðåæèìîâ îòîáðàæåíèÿ ñîîáùåíèé"
 
-#: lib/config/prefs.php:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr ""
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Íåóäà÷íîå ñîåäèíåíèå ñ ñåðâåðîì LDAP."
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr ""
 
-#: lib/config/prefs.php:135
+# fuzzy, php-format
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
-msgstr ""
+msgstr "Ïîääåðæêà ôóíêöèé PGP äëÿ %s"
 
-#: lib/config/prefs.php:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Ïîääåðæêà ôóíêöèé S/MIME äëÿ %s"
 
-#: lib/config/prefs.php:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Íàñòðîéêà ïàðàìåòðîâ, ñâÿçàííûõ ñ ïîèñêîì ñîîáùåíèé"
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "Íàñòðîéêè ïðîâåðêè ïî÷òû è èçâåùåíèé î íîâîé ïî÷òå."
 
-#: lib/config/prefs.php:700
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Êîíâåðòèðîâàòü òåêñòîâûå ýìîöèè â ãðàôè÷åñêèå?"
 
@@ -944,67 +1159,87 @@
 msgid "Copy"
 msgstr "Êîïèðîâàòü"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 #, fuzzy
 msgid "Copy to folder"
 msgstr " ïàïêà"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Îøèáêà"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Ïðîâåðåííûé òåêñò"
 
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Íå ìîãó îòêðûòü ìîäóëü Maintenance_Task %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr ""
 
-#: lib/Message.php:634
+#: lib/Message.php:680
 #, fuzzy, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Îøèáêà ïðè óäàëåíèè ïèñåì èç ïàïêè \"%s\". Ñåðâåð îòâåòèë"
 
-#: lib/Session.php:287
+#: lib/Session.php:333
 #, fuzzy
 msgid "Could not execute maintenance operations."
 msgstr "Îïåðàöèè Îáñëóæèâàíèÿ"
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr ""
 
-#: search.php:356 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, fuzzy, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Íåóäà÷íîå ñîåäèíåíèå ñ ñåðâåðîì LDAP."
+
+#: lib/Session.php:280
+#, fuzzy
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Íåóäà÷íîå ñîåäèíåíèå ñ ñåðâåðîì LDAP."
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Ñîçäàòü"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Ñîçäàòü ïàïêó"
 
-#: templates/pgp/pgp.inc:252
-#, fuzzy
+# fuzzy
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
-msgstr "Ñîçäàòü"
+msgstr "Ñîçäàòü êëþ÷è"
 
-#: templates/search/header.inc:14
-#, fuzzy
-msgid "Create Virtual Folder"
-msgstr "Ñîçäàòü ïàïêó"
+# fuzzy
+# fuzzy
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Ñîçäàòü íîâûé"
+
+# fuzzy
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Ñîçäàòü íîâóþ ïàïêó äëÿ ñïàìà"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Ñîçäàòü íîâóþ ïàïêó äëÿ ÷åðíîâèêîâ"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Ñîçäàòü íîâóþ ïàïêó äëÿ îòïðàâëåííûõ ñîîáùåíèé"
 
@@ -1012,7 +1247,7 @@
 msgid "Create a new trash folder"
 msgstr "Ñîçäàòü íîâóþ êîðçèíó"
 
-#: lib/config/prefs.php:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1020,104 +1255,147 @@
 "Ñîçäàíèå ôèëüòðîâ äëÿ âõîäÿùåé ïî÷òû, ñîðòèðîâêà ïî÷òû â ïàïêàõ, óäàëåíèå "
 "ñïàìà."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Ñîçäàòü íîâûé øàáëîí"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Ñîçäàòü øàáëîíû"
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr ""
 
 # fuzzy
-#: lib/config/prefs.php:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
 "Íàñòðîéêà âîçìîæíîñòè ñáîðà ïî÷òû ñ âàøèõ ïî÷òîâûõ ÿùèêîâ, ðàñïîëîæåííûõ íà "
 "äðóãèõ ñåðâåðàõ"
 
-#: lib/config/prefs.php:51
+#: config/prefs.php.dist:51
 msgid "Customize how you send mail."
 msgstr "Íàñòðîéêà ðåæèìîâ ñîñòàâëåíèÿ íîâûõ ñîîáùåíèé, ñîõðàíåíèÿ ÷åðíîâèêîâ"
 
 # php-format
-#: lib/config/prefs.php:40
+# fuzzy, php-format
+# fuzzy, php-format
+# fuzzy, php-format
+#: config/prefs.php.dist:40
+#, fuzzy, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Çàäà÷è, âûïîëíÿåìûå â ìîìåíò âõîäà â Ïî÷òó"
 
 # fuzzy
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Äàòà"
 
-#: message.php:254 thread.php:75
+#: message.php:270 thread.php:153
 msgid "Date"
 msgstr "Äàòà"
 
-#: lib/MIME/Viewer/itip.php:742
+#: lib/MIME/Viewer/itip.php:750
 #, fuzzy
 msgid "Declined"
 msgstr "Óäàëåííûå"
 
-#: lib/config/prefs.php:894
+#: lib/MIME/Viewer/itip.php:264
+#, fuzzy
+msgid "Declined: "
+msgstr "Óäàëåííûå"
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Óäàëèòü"
+
+# fuzzy
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Ïîëå ïîèñêà ïî óìîë÷àíèþ"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Ñîðòèðîâêà ïî óìîë÷àíèþ:"
 
 # fuzzy
-#: lib/config/prefs.php:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Ïîðÿäîê ñîðòèðîâêè"
 
-#: lib/MIME/Viewer/itip.php:750
+#: lib/MIME/Viewer/itip.php:758
 #, fuzzy
 msgid "Delegated"
 msgstr "Óäàëåííûå"
 
-#: folders.php:378 templates/fetchmail/manage.inc:68
+#: folders.php:400 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Óäàëèòü"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "Delete %s Public Key"
-msgstr ""
+msgstr "Âàøå ïîëíîå èìÿ:"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+# fuzzy
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
-msgstr ""
+msgstr "Óäàëèòü òåêóùèå êëþ÷è"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Óäàëèòü ïàïêó(è)"
 
-#: folders.php:378
-#, fuzzy
+# fuzzy
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "Óäàëèòü âûáðàííûå ïàïêè"
+
+# fuzzy
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Óäàëèòü øàáëîí"
+
+# fuzzy
+#: folders.php:400
 msgid "Delete Virtual Folder"
+msgstr "Óäàëèòü âèðòóàëüíóþ ïàïêó"
+
+#: templates/mailbox/header.inc:14
+#, fuzzy, php-format
+msgid "Delete Virtual Folder Definition for %s"
 msgstr "Óäàëèòü ïàïêó(è)"
 
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Óäàëèòü ïðèíÿòûå ñîîáùåíèÿ ñî ñòîðîííåãî ñåðâåðà"
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr ""
 
-#: lib/config/prefs.php:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Óäàëÿòü ñòàðûå âëîæåíèÿ â íà÷àëå ìåñÿöà?"
 
 # fuzzy
-#: lib/config/prefs.php:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Óäàëÿòü ïàïêó îòïðàâëåííûõ ñîîáùåíèé â íà÷àëå ìåñÿöà?"
 
 # fuzzy
-#: lib/config/prefs.php:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Óäàëÿòü ñïàì, ïîñëå òîãî êàê îí áûë ïîìå÷åí êàê òàêîâîé?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Óäàëÿòü ñïàì"
 
-#: message.php:494 mailbox.php:695 templates/mailbox/navbar.inc:20
+#: message.php:507 mailbox.php:735 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Óäàëåííûå"
@@ -1126,62 +1404,73 @@
 msgid "Deleted messages"
 msgstr "Óäàëåííûå ñîîáùåíèÿ"
 
-#: compose.php:292
+#: compose.php:570
 #, fuzzy, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Óäàëåííûé ïðèêðåïëåííûé ôàéë."
 
 # fuzzy
-#: lib/config/prefs.php:79
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Óäàëåííûå ñîîáùåíèÿ"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:542
+#, fuzzy
 msgid "Deny request for free/busy information"
-msgstr ""
+msgstr "Èíôîðìàöèÿ î ñåðâåðå"
 
-#: lib/config/prefs.php:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Ïî óáûâàíèþ"
 
 # fuzzy
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:656
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Îïèñàíèå"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
-#, fuzzy
+# fuzzy
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
-msgstr "Åæåäíåâíî"
+msgstr "Èíôîðìàöèÿ"
 
-#: lib/config/prefs.php:680
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr ""
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Îòòåíÿòü ïîäïèñè?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Îáîëî÷êà"
 
-#: lib/config/prefs.php:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Îòîáðàæàòü ïîäòâåðæäåíèå ïîñëå îòïðàâêè ñîîáùåíèÿ"
 
-#: lib/config/prefs.php:689
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Â òåëå ñîîáùåíèÿ"
 
-#: lib/config/prefs.php:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Îòîáðàæàòü âñïëûâàþùåå ñîîáùåíèå ïðè ïðèõîäå ïî÷òû?"
 
-#: lib/config/prefs.php:733
-msgid "Display the 'Empty Trash' link in the menubar?"
+# fuzzy
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Îòîáðàæàòü êíîïêó 'Î÷èñòèòü Ñïàì' â âåðõíåì ìåíþ?"
+
+# fuzzy
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Îòîáðàæàòü êíîïêó 'Î÷èñòèòü êîðçèíó' â âåðõíåì ìåíþ?"
 
 # fuzzy
@@ -1189,27 +1478,31 @@
 msgid "Disposition"
 msgstr "Òèï âëîæåíèÿ"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
-msgstr ""
+msgstr "ÍÅ ñîâïàäàåò"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Íå ïðîâåðÿòü ïàïêó(è) íà íîâóþ ïî÷òó"
 
-#: lib/config/prefs.php:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "Íèêàêîãî äåéñòâèÿ"
 
-#: lib/IMP.php:1004
+#: lib/IMP.php:1053
 msgid "Do you want to open that folder?"
 msgstr "Âû õîòèòå îòêðûòü ýòó ïàïêó?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Âûïîëíåíî"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Çàãðóçèòü %s â àðõèâ"
@@ -1219,26 +1512,26 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Çàãðóçèòü âñå âëîæåíèÿ â àðõèâ"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Çàãðóçèòü ïàïêó(è)"
 
 # fuzzy
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Çàãðóçèòü ïàïêó(è) â àðõèâ"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Çàãðóçèòü â àðõèâ"
 
-#: message.php:492 mailbox.php:676 templates/message/navbar_navigate.inc:11
+#: message.php:505 mailbox.php:714 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "×åðíîâèêè"
 
-#: folders.php:358
+#: folders.php:373
 #, fuzzy
 msgid "Draft folder"
 msgstr "Ïàïêà ÷åðíîâèêîâ:"
@@ -1247,129 +1540,176 @@
 msgid "Drafts folder:"
 msgstr "Ïàïêà ÷åðíîâèêîâ:"
 
-#: templates/pgp/pgp.inc:196
-#, fuzzy
+# fuzzy
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
-msgstr "Ñ àäðåñà"
+msgstr "Àäðåñ E-mail"
 
-#: lib/MIME/Viewer/status.php:77
-msgid "ERROR: Your message could not be delivered."
+#: lib/Mailbox.php:302
+msgid "END"
 msgstr ""
 
-#: folders.php:379
+# fuzzy
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr "ÎØÈÁÊÀ: Âàøå ñîîáùåíèå íå áûëî äîñòàâëåíî ïîëó÷àòåëþ"
+
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Ðåäàêòèðîâàíèå"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 #, fuzzy
 msgid "Edit Blacklist"
 msgstr "×åðíûé ñïèñîê"
 
 # fuzzy
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Ðåäàêòèðîâàòü ôèëüòðû"
 
-#: folders.php:379 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
-msgid "Edit Virtual Folder"
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+#, fuzzy
+msgid "Edit Search Query"
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"Ðåäàêòèðîâàòü çàïðîñ\n"
+"#-#-#-#-#  ru_RU.po (Whups 1.0-cvs)  #-#-#-#-#\n"
+"Ðåäàêòèðîâàòü"
+
+# fuzzy
+# fuzzy
+#: folders.php:401 templates/search/header.inc:17
+msgid "Edit Virtual Folder"
+msgstr "Ðåäàêòèðîâàòü âèðòóàëüíóþ ïàïêó"
 
 #: templates/mailbox/header.inc:13
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
 msgstr ""
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
+#, fuzzy
 msgid "Edit Whitelist"
-msgstr ""
+msgstr "Ðåäàêòèðîâàíèå Âàøèõ ïðàâèë ôèëüòðàöèè"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 #, fuzzy
 msgid "Edit your blacklist"
 msgstr "Ðåäàêòèðîâàíèå Âàøèõ ïðàâèë ôèëüòðàöèè"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Ðåäàêòèðîâàíèå Âàøèõ ïðàâèë ôèëüòðàöèè"
 
-#: lib/config/prefs.php:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Ðåäàêòèðîâàòü íàñòðîéêè ñáîðà ïî÷òû ñ äðóãèõ ñåðâåðîâ"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 #, fuzzy
 msgid "Edit your whitelist"
 msgstr "Ðåäàêòèðîâàíèå Âàøèõ ïðàâèë ôèëüòðàöèè"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 #, fuzzy
 msgid "Email Address"
 msgstr "Ñ àäðåñà"
 
-#: lib/Message.php:651
-#, fuzzy, php-format
+# fuzzy, php-format
+#: lib/Message.php:697
+#, php-format
 msgid "Emptied all messages from %s."
-msgstr "Ïåðåïðàâëåíîå ñîîáùåíèå îò %s"
+msgstr "Î÷èùåíû âñå ñîîáùåíèÿ èç %s"
 
-#: templates/folders/actions.inc:20
+# fuzzy, php-format
+#: lib/Message.php:673
+#, fuzzy
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Î÷èùåíû âñå ñîîáùåíèÿ èç %s"
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Î÷èñòèòü ïàïêó(è)"
 
+# fuzzy
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "Î÷èñòèòü âûáðàííûå ïàïêè"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Î÷èòèòü êîðçèíó"
 
 # fuzzy
-#: lib/IMP.php:902
+#: lib/IMP.php:949
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Î÷èòèòü êîðçèíó"
+
+# fuzzy
+#: lib/IMP.php:942
 msgid "Empty _Trash"
 msgstr "Î÷èòèòü êîðçèíó"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+# fuzzy
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
-msgstr ""
+msgstr "Âêëþ÷èòü ïîääåðæêó PGP?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Âêëþ÷èòü S/MIME"
 
-#: lib/config/prefs.php:780
+#: config/prefs.php.dist:800
 #, fuzzy
 msgid "Enable message previews?"
 msgstr "Ïåðåïðàâëåíîå ñîîáùåíèå îò %s"
 
-#: templates/compose/compose.inc:433
-#, fuzzy
+# fuzzy
+#: templates/compose/compose.inc:439
 msgid "Encr_yption Options"
-msgstr "Âåðíóòüñÿ ê íàñòðîéêàì"
+msgstr "Øèôðîâàíèå"
+
+# fuzzy
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Çàøèôðîâàíî"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
+#, fuzzy
 msgid "End"
-msgstr ""
+msgstr "Ðàçâåðíóòü âñå"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Êîíåö ïåðåñûëàåìîãî ñîîáùåíèÿ"
 
-#: lib/Compose.php:262
+#: lib/Compose.php:352
 #, fuzzy
 msgid "End message"
 msgstr "Ñòàðûå ñîîáùåíèÿ"
 
-#: lib/Compose.php:260
+#: lib/Compose.php:350
 #, fuzzy, php-format
 msgid "End message from %s"
 msgstr "Ïåðåïðàâëåíîå ñîîáùåíèå îò %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
-msgstr ""
+msgstr "Ââåñòè ïàðîëü"
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Ââåäèòå èìÿ ïàïêè äëÿ Âàøåé íîâîé êîðçèíû"
 
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Ââåäèòå èìÿ íîâîé ïàïêè äëÿ ÷åðíîâèêîâ"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Ââåäèòå èìÿ íîâîé ïàïêè äëÿ îòïðàâëåííûõ ñîîáùåíèé"
 
@@ -1377,92 +1717,110 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Ââåäèòå èìÿ ïàïêè äëÿ Âàøåé íîâîé êîðçèíû"
 
-#: message.php:186 compose.php:1043
-#, fuzzy, php-format
+# fuzzy
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "Ñîîáùåíèå öåëèêîì"
+
+# fuzzy, php-format
+#: message.php:195 compose.php:1172 thread.php:71
+#, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
-msgstr "Çàïèñü \"%s\" óäà÷íî äîáàâëåíà â àäðåñíóþ êíèãó"
+msgstr "Çàïèñü \"%s\" áûëà äîáàâëåíà â àäðåñíóþ êíèãó"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:367 lib/MIME/Viewer/pgp.php:392
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Îøèáêà"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, fuzzy, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Íåóäà÷íîå ñîåäèíåíèå ñ ñåðâåðîì LDAP."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:102
 #, fuzzy
 msgid "Event successfully deleted."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
 
 # fuzzy
-#: lib/config/prefs.php:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Êàæäûå 15 ìèíóò"
 
-#: lib/config/prefs.php:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Êàæäûå 30 ñåêóíä"
 
 # fuzzy
-#: lib/config/prefs.php:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Êàæäûå 5 ìèíóò"
 
-#: lib/config/prefs.php:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Êàæäûå ïîë÷àñà"
 
 # fuzzy
-#: lib/config/prefs.php:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Êàæäóþ ìèíóòó"
 
-#: folders.php:416
+#: folders.php:438
 #, fuzzy
 msgid "Expand"
 msgstr "Ðàçâåðíóòü âñå"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Ðàçâåðíóòü âñå"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Ðàçâåðíóòü âñå ïàïêè"
 
-#: folders.php:416
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Ðàçâåðíóòü ïàïêó"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Ðàçâåðíóòü èìåíà"
 
-#: lib/config/prefs.php:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Ðàçâîðà÷èâàòü èìåíà àâòîìàòè÷åñêè"
 
-#: lib/config/prefs.php:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Ðàçâåðíóòü äåðåâî ïàïîê ïî óìîë÷àíèþ?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 #, fuzzy
 msgid "Expanding"
 msgstr "Ðàçâåðíóòü âñå"
 
 # fuzzy
-#: templates/fetchmail/fetchmail.inc:29 lib/config/prefs.php:103
+# fuzzy
+#: lib/IMP.php:960 lib/IMP.php:962
+msgid "F_etch Mail"
+msgstr "Ñáîð"
+
+# fuzzy
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
-msgstr "Ñáîð ïî÷òû"
+msgstr "Ñáîð"
 
 # fuzzy
-#: lib/config/prefs.php:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "Ñîáèðàòü ïî÷òó â îòäåëüíîì îêíå."
 
@@ -1471,72 +1829,81 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Ïðèíÿòü ñîîáùåíèÿ ïðè âõîäå â ñèñòåìó"
 
-#: lib/Fetchmail.php:306
-#, fuzzy, php-format
-msgid "Fetched %d message(s) from %s"
-msgstr "Ïåðåïðàâëåíîå ñîîáùåíèå îò %s"
+# fuzzy, php-format
+#: lib/Fetchmail.php:291
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Ïðèíÿòî %d ïèñåì èç %s"
+
+# fuzzy, php-format
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Ïðèíÿòî 1 ñîîáùåíèå îò %s"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+# fuzzy
+# fuzzy
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
-msgstr ""
+msgstr "Ñáîð ïî÷òû: "
 
-#: lib/Fetchmail.php:308
-#, fuzzy
+# fuzzy
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
-msgstr "Äëÿ Âàñ åñòü %s íîâûõ ñîîáùåíèé."
+msgstr "Äëÿ Âàñ íåò íîâûõ ñîîáùåíèé."
 
-#: lib/IMP.php:917
-#, fuzzy
+# fuzzy
+#: lib/IMP.php:966
 msgid "Fi_lters"
 msgstr "Ôèëüòðû"
 
 # fuzzy
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:496 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Ôàéë"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 #, fuzzy
 msgid "Filter Options"
 msgstr "Äðóãèå íàñòðîéêè"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 #, fuzzy
 msgid "Filter Settings"
 msgstr "Ïðàâèëà ôèëüòðàöèè"
 
-#: lib/config/prefs.php:603
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
-msgstr ""
+msgstr "Ôèëüòðîâàòü ñîäåðæèìîå ñîîáùåíèé?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Ïîääåðæêà ôèëüòðàöèè â âàøåé ñèñòåìå íå âêëþ÷åíà"
 
 # fuzzy
-#: lib/config/prefs.php:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Ôèëüòðû"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Ôèëüòðàöèÿ ÎÒÊËÞ×ÅÍÀ"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr ""
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Íàéòè"
 
 # fuzzy
-#: lib/config/prefs.php:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Ïåðâàÿ ñòðàíèöà"
 
-#: mailbox.php:334
+#: mailbox.php:331
 msgid "First Page"
 msgstr "Ïåðâàÿ ñòðàíèöà"
 
@@ -1545,101 +1912,88 @@
 msgid "Fo_rward"
 msgstr "Ïåðåñëàòü"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Ïîäòâåðæäåíèå äåéñòâèÿ ñ ïàïêîé"
+
+#: folders.php:289 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Íàâèãàòîð ïàïîê"
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Ïðåôèêñ ïàïêè"
-
 # fuzzy
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Ñòàòèñòèêà"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr ""
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr ""
 
-#: lib/config/prefs.php:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Ôîðìàò îòîáðàæåíèÿ äàòû äëÿ ñîîáùåíèé, ïðèøåäøèõ ñåãîäíÿ"
 
-#: compose.php:706 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Ïåðåñëàòü"
 
-#: compose.php:691
+#: compose.php:805
 msgid "Forward:"
 msgstr "Ïåðåñëàòü:"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:380
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Êîíåö ïåðåñûëàåìîãî ñîîáùåíèÿ"
 
-#: lib/Compose.php:288
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Ïåðåïðàâëåíîå ñîîáùåíèå îò %s"
 
-#: lib/MIME/Viewer/itip.php:442
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "Èíôîðìàöèÿ î ñåðâåðå"
-
-#: lib/MIME/Viewer/itip.php:453
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:447
-msgid "Free/Busy Request"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr ""
 
 # fuzzy
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "Îò êîãî"
 
-#: message.php:255 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:271 thread.php:154 templates/compose/compose.inc:99
+#: lib/Search.php:589
 msgid "From"
 msgstr "Îò êîãî"
 
 # fuzzy
-#: lib/config/prefs.php:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "Àäðåñ îòïðàâèòåëÿ"
 
-#: compose.php:703 compose.php:707
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1204
+#: compose.php:1311
 #, fuzzy
 msgid "Fwd: "
 msgstr "Fwd:"
 
-#: compose.php:1206
+#: compose.php:1313
 #, fuzzy, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Êîíåö ïåðåñûëàåìîãî ñîîáùåíèÿ"
 
 # fuzzy
-#: lib/config/prefs.php:13 lib/config/prefs.php:22 lib/config/prefs.php:30
-#: lib/config/prefs.php:38
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
 msgid "General Options"
 msgstr "Îáùèå íàñòðîéêè"
 
@@ -1647,32 +2001,46 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Ïîëó÷èòü òîëüêî íîâûå ñîîáùåíèÿ (äëÿ IMAP)"
 
-#: thread.php:68
-#, fuzzy
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Ïåðåéòè"
+
+# fuzzy
+#: thread.php:136
 msgid "Go to Message"
-msgstr "Ñëåäóþùåå ñîîáøåíèå"
+msgstr "Ïåðåéòè ê ïèñüìó"
+
+# fuzzy, php-format
+# php-format
+#: lib/IMP.php:502
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Äîáàâèòü â àäðåñíóþ êíèãó (%s)"
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr ""
 
-#: message.php:547 lib/Filter.php:102 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/html.php:117
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/pkcs7.php:410 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/pgp.php:178 lib/MIME/Viewer/status.php:123
-#: lib/MIME/Viewer/status.php:130
+#: message.php:550 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
-msgstr ""
+msgstr "ÇÄÅÑÜ"
 
-#: lib/MIME/Viewer/html.php:118
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr ""
 
-#: compose.php:243
+#: compose.php:260
+#, fuzzy
 msgid "HTML Version of Message"
-msgstr ""
+msgstr "Ñëåäóþùåå ñîîáøåíèå"
 
 #: templates/message/headers.inc:58
 msgid "Headers"
@@ -1683,115 +2051,152 @@
 msgstr ""
 
 # fuzzy
-#: lib/config/prefs.php:671
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Ñêðûâàòü"
 
 # fuzzy
-#: lib/config/prefs.php:670
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Ñêðûâàòü ïðè ãðóïïèðîâêå"
 
-#: mailbox.php:356
+#: mailbox.php:353
 msgid "Hide Deleted"
 msgstr "Ñêðûòü óäàëåííûå"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Ñêðûòü íåïîäïèñàííûå"
 
-#: lib/MIME/Viewer/html.php:104
+#: templates/compose/compose.inc:294
 #, fuzzy
-msgid "Hide the Images"
-msgstr "óäàëèòü ñîîáùåíèå"
-
-#: templates/compose/compose.inc:305
 msgid "High"
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íèêîãäà\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íèêîãäà\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íèêîãäà\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íèêîãäà\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íèêîãäà\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Íèêîãäà"
 
-#: message.php:289 mailbox.php:681 templates/mailbox/legend.inc:12
+#: message.php:305 mailbox.php:719 templates/mailbox/legend.inc:12
+#, fuzzy
 msgid "High Priority"
-msgstr ""
+msgstr "Ïå÷àòü"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr ""
 
-#: lib/config/prefs.php:691
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Êàêèì îáðàçîì îòîáðàæàòü âëîæåíèÿ?"
 
-#: lib/config/prefs.php:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Êàêèì îáðàçîì ïîìå÷àòü âñòàâëåííûé â îòâåò îðèãèíàëüíûé òåêñò:"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr ""
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr ""
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr ""
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Òèï ñòîðîííåãî ïî÷òîâîãî ñåðâåðà:"
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "Ñåðâåð POP3/IMAP"
 
-#: folders.php:350
-msgid "INBOX"
-msgstr "Âõîäÿùèå"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+# fuzzy
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Åñëè âû ïðîäîëæèòå, âñå ñîîáùåíèÿ â ïàïêå áóäóò óòåðÿíû!"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Èãíîðèðîâàòü"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Èãíîðèðîâàòü âñå"
 
+#: templates/saveimage/saveimage.inc:8
+#, fuzzy
+msgid "Image"
+msgstr "Êàðòèíêè"
+
 # fuzzy
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Èìïîðòèðîâàòü"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
-#, fuzzy
+# fuzzy
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
-msgstr "Âàæíûå"
+msgstr "Èìïîðòèðîâàòü êëþ÷"
 
-#: templates/pgp/pgp.inc:254
-#, fuzzy
+# fuzzy
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
-msgstr "Âàæíûå"
+msgstr "Èìïîðòèðîâàòü ïàðó"
 
 # fuzzy
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Èìïîðòèðîâàòü ñîîáùåíèÿ"
 
-#: pgp.php:42
+#: pgp.php:41
+#, fuzzy
 msgid "Import PGP Key"
-msgstr ""
+msgstr "Âàæíûå"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr ""
+# fuzzy
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Èìïîðòèðîâàòü ïåðñîíàëüíûé ñåðòèôèêàò"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1805,21 +2210,25 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr ""
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+# fuzzy
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
-msgstr ""
+msgstr "Èìïîðòèðîâàòü ïóáëè÷íûé êëþ÷"
 
+# fuzzy
 #: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
-msgstr ""
+msgstr "Èìïîðòèðîâàòü ïóáëè÷íûé êëþ÷ PGP"
 
+# fuzzy
 #: templates/smime/import_key.inc:8
 msgid "Import Public S/MIME Key"
-msgstr ""
+msgstr "Èìïîðòèðîâàòü ïóáëè÷íûé êëþ÷ S/MIME"
 
+# fuzzy
 #: smime.php:16
 msgid "Import S/MIME Key"
-msgstr ""
+msgstr "Èìïîðòèðîâàòü êëþ÷ S/MIME"
 
 #: templates/folders/import.inc:9
 msgid "Import mbox File"
@@ -1830,7 +2239,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Èìïîðòèðîâàòü ôàéë %s â ÿùèê %s"
 
-#: message.php:493 mailbox.php:689 templates/message/navbar_navigate.inc:7
+#: message.php:506 mailbox.php:729 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1840,48 +2249,60 @@
 msgid "Important messages"
 msgstr "Âàæíûå ñîîáùåíèÿ"
 
-#: folders.php:157
+#: folders.php:151
 #, fuzzy, php-format
 msgid "Imported %d messages from %s."
 msgstr "Ïåðåïðàâëåíîå ñîîáùåíèå îò %s"
 
-#: lib/MIME/Viewer/itip.php:758
+#: lib/MIME/Viewer/itip.php:766
+#, fuzzy
 msgid "In Process"
 msgstr ""
-
-#: lib/Folder.php:248 lib/IMP.php:369
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Àäðåñ\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Àäðåñ\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Àäðåñ"
+
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:830 lib/IMAP/Tree.php:119
+#: lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Âõîäÿùèå"
 
-#: lib/config/prefs.php:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Âêëþ÷àòü ÷àñòü çàãîëîâêà ïèñüìà ïðè îòâåòå"
 
-#: lib/config/prefs.php:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Âêëþ÷àòü òåêñò îðèãèíàëüíîãî ñîîáùåíèÿ ïðè îòâåòå"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 #, fuzzy
 msgid "Info"
 msgstr "Èãíîðèðîâàòü"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "Information on %s Public Key"
-msgstr ""
+msgstr "Âàøå ïîëíîå èìÿ:"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr ""
 
 # fuzzy
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:501
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "â òåêñò"
 
@@ -1899,82 +2320,108 @@
 
 #: templates/pgp/import_key.inc:5
 msgid "Insert Public PGP Key Here"
-msgstr ""
+msgstr "Âñòàâüòå ïóáëè÷íûé PGP êëþ÷ òóò"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr ""
 
-#: mailbox.php:549 mailbox.php:590
+#: mailbox.php:575 mailbox.php:622
+#, fuzzy
 msgid "Invalid Address"
-msgstr ""
+msgstr "Ñ àäðåñà"
 
-#: lib/Fetchmail/imap.php:312
+# fuzzy
+#: lib/Fetchmail/imap.php:307
+#, fuzzy
 msgid "Invalid Remote Mailbox"
-msgstr ""
+msgstr "Ïàïêà íà ñòîðîííåì ñåðâåðå:"
 
-#: compose.php:132
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr ""
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr ""
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr ""
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr ""
 
 #: templates/mailbox/navbar.inc:12
 msgid "Invert"
-msgstr ""
+msgstr "Èíâåðòèðîâàòü"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr ""
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
+msgstr "Äëèíà êëþ÷à"
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "Ãåíåðàöèÿ êëþ÷åé ìîæåò çàíÿòü îïðåäåëåííîå âðåìÿ. Ñãåíåðèðîâàòü êëþ÷è?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
 msgstr ""
 
-#: pgp.php:318
-msgid "Key successfully sent to the public keyserver."
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
 msgstr ""
 
-#: templates/login/login.inc:227
+#: pgp.php:314
+msgid "Key successfully sent to the public keyserver."
+msgstr "Êëþ÷ óñïåøíî ïîñëàí íà ïóáëè÷íûé ñåðâåð"
+
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "ßçûê"
 
 # fuzzy
-#: lib/config/prefs.php:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Ïîñëåäíÿÿ ñòðàíèöà"
 
-#: mailbox.php:347
+#: mailbox.php:344
 msgid "Last Page"
 msgstr "Ïîñëåäíÿÿ ñòðàíèöà"
 
-#: templates/compose/compose.inc:380
+# fuzzy
+# fuzzy
+#: templates/compose/compose.inc:549
+msgid "Link Attachments?"
+msgstr "Îòïðàâëÿòü âëîæåíèÿ êàê ññûëêè"
+
+#: attachment.php:34 lib/Compose.php:1084
 #, fuzzy
-msgid "Li_nk Attachments"
+msgid "Linked attachments are forbidden."
 msgstr "Ïðèêðåïëåííûå"
 
-#: attachment.php:34 lib/Compose.php:980
-msgid "Linked attachments are forbidden."
+#: lib/Compose.php:1100
+#, php-format
+msgid "Links will expire on %s"
 msgstr ""
 
-#: lib/config/prefs.php:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr "Îòîáðàæàòü â àäðåñíîé êíèãå âñå êîíòàêòû?"
 
-#: lib/config/prefs.php:688
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Â çàãîëîâêå ñîîáùåíèÿ"
 
@@ -1983,53 +2430,54 @@
 msgid "Local Mailbox:"
 msgstr "Ïàïêà íà ëîêàëüíîì ñåðâåðå:"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:671
 #, fuzzy
 msgid "Location"
 msgstr "Äåéñòâèå"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Âõîä"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Âîéòè â %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:138
 #, fuzzy
 msgid "Login"
 msgstr "Âõîä"
 
 # fuzzy
-#: lib/config/prefs.php:39
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Âõîä"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr ""
 
-#: message.php:291 mailbox.php:684 templates/mailbox/legend.inc:13
+#: message.php:307 mailbox.php:722 templates/mailbox/legend.inc:13
+#, fuzzy
 msgid "Low Priority"
-msgstr ""
+msgstr "Ïå÷àòü"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 #, fuzzy
 msgid "Macintosh File"
 msgstr "Ïî÷òîâûå ôèëüòðû"
 
 # fuzzy
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Ïî÷òà"
 
-#: lib/config/prefs.php:95
+#: config/prefs.php.dist:96
 #, fuzzy
 msgid "Mail Previews"
 msgstr ""
@@ -2041,19 +2489,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Òèï ñòîðîííåãî ïî÷òîâîãî ñåðâåðà:"
 
-#: folders.php:368
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "ßùèêè"
 
-#: lib/config/prefs.php:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Ïàðàìåòðû îòîáðàæåíèÿ ïàïîê"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Ïîìåòèòü âñå ñîîáùåíèÿ êàê ïðî÷èòàííûå"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Ïîìåòèòü âñå ñîîáùåíèÿ êàê íåïðî÷èòàííûå"
 
@@ -2061,7 +2509,7 @@
 msgid "Mark as:"
 msgstr "Îòìåòèòü êàê:"
 
-#: lib/config/prefs.php:653
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Âûäåëÿòü öâåòàìè ðàçíûå óðîâíè öèòèðîâàíèÿ"
 
@@ -2069,103 +2517,82 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Ïîìåòèòü ñîîáùåíèÿ êàê ïðî÷èòàííûå (äëÿ IMAP)"
 
-#: lib/config/prefs.php:661
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Ïîìå÷àòü ïðîñòóþ ðàçìåòêó?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Ïî ÂÑÅÌ êðèòåðèÿì"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Ïî ËÞÁÎÌÓ êðèòåðèþ"
 
 # fuzzy
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:507
 msgid "Maximum Attachment Size"
 msgstr "Ìàêñèìàëüíûé ðàçìåð âëîæåíèé"
 
-#: templates/compose/compose.inc:484
-msgid "Maximum number of attachments reached."
-msgstr ""
-
-#: templates/compose/compose.inc:479
-msgid "Maximum total attachment size reached."
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:604
-msgid "Meeting Cancellation"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:532
+#: lib/api.php:79
 #, fuzzy
-msgid "Meeting Information"
-msgstr "Èíôîðìàöèÿ î ñåðâåðå"
-
-#: lib/MIME/Viewer/itip.php:542
-msgid "Meeting Proposal"
-msgstr ""
-
-#: lib/MIME/Viewer/itip.php:584
-msgid "Meeting Reply"
-msgstr ""
+msgid "Maximum Number of Folders"
+msgstr "Ìàêñèìàëüíîå êîëè÷åñòâî ñòðàíèö"
 
-#: lib/MIME/Viewer/itip.php:554
+# fuzzy
+#: templates/compose/compose.inc:489
 #, fuzzy
-msgid "Meeting Update"
-msgstr "Áûñòðûé ñòàðò"
+msgid "Maximum number of attachments reached."
+msgstr "Ìàêñèìàëüíûé ðàçìåð âëîæåíèé"
 
-#: lib/MIME/Viewer/itip.php:559
-msgid "Meeting Update Request"
-msgstr ""
+# fuzzy
+#: templates/compose/compose.inc:485
+#, fuzzy
+msgid "Maximum total attachment size reached."
+msgstr "Ìàêñèìàëüíûé ðàçìåð âëîæåíèé"
 
 #: lib/Block/tree_folders.php:3
 #, fuzzy
 msgid "Menu Folder List"
 msgstr "Îòêðûòü ïàïêó"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Ñîîáùåíèå"
 
-#: compose.php:508 compose.php:535 compose.php:568 lib/config/prefs.php:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Ñîñòàâëåíèå ñîîáùåíèÿ"
 
 # fuzzy
-#: lib/config/prefs.php:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Âðåìÿ îòïðàâêè"
 
 # fuzzy
-#: lib/config/prefs.php:49 lib/config/prefs.php:68 lib/config/prefs.php:78
-#: lib/config/prefs.php:86 lib/config/prefs.php:94 lib/config/prefs.php:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Íàñòðîéêè ñîîáùåíèé"
 
-#: search.php:354
+#: search.php:306
 msgid "Message Search"
 msgstr "Ïîèñê ñîîáùåíèÿ"
 
 # fuzzy
-#: lib/config/prefs.php:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Ðàçìåð ñîîáùåíèÿ"
 
-#: message.php:376
+#: message.php:392
 msgid "Message Source"
 msgstr "Èñõîäíèê"
 
 # fuzzy
-#: lib/config/prefs.php:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Ïðîñìîòð ñîîáùåíèÿ"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Ïîëÿ ñîîáùåíèé"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Ïîìåòêè ñîîáùåíèÿ"
@@ -2174,33 +2601,50 @@
 msgid "Message folders"
 msgstr "Ïàïêè ñîîáùåíèé"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:340
 #, fuzzy, php-format
 msgid "Message from %s"
 msgstr "Ïàïêè ñîîáùåíèé"
 
 # fuzzy
-#: templates/search/header.inc:33
+#: mailbox.php:663
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Ñîâïàäåíèå:"
+
+#: mailbox.php:654
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Ïîëÿ ñîîáùåíèé"
+
+#: mailbox.php:649
+#, fuzzy
+msgid "Message is signed"
+msgstr "Ïîëÿ ñîîáùåíèé"
+
+# fuzzy
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Ñîâïàäåíèå:"
 
-#: compose.php:750 compose.php:760
+#: compose.php:864 compose.php:871
 #, fuzzy
 msgid "Message redirected successfully."
 msgstr "Ñîîáùåíèå óñïåøíî îòïðàâëåíî, íî íå ñîõðàíåíî â"
 
 # fuzzy, php-format
-#: compose.php:993
+#: compose.php:1122
+#, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Ñîîáùåíèå óñïåøíî îòïðàâëåíî, íî íå ñîõðàíåíî â %s"
 
 # fuzzy
-#: compose.php:1052 compose.php:1067
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Ñîîáùåíèå óñïåøíî îòïðàâëåíî."
 
 # fuzzy
-#: lib/config/prefs.php:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Ñêîëüêî ñîîáùåíèé îòîáðàæàòü íà ñòðàíèöå"
 
@@ -2212,9 +2656,9 @@
 msgid "Modify"
 msgstr "Ðåäàêòèðîâàòü"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
-msgid "More than one address found for field '%s'."
+msgid "More than one address found for field \"%s\"."
 msgstr ""
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2226,7 +2670,11 @@
 msgid "Move down"
 msgstr "ïåðåìåñòèòü âíèç"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "Ïåðåìåùàòü ñïàì â ñïåöèàëüíóþ ïàïêó, à íå ñïàì âî Âõîäÿùèå"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 #, fuzzy
 msgid "Move to folder"
 msgstr "âûáåðèòå ïàïêó"
@@ -2236,57 +2684,79 @@
 msgid "Move up"
 msgstr "ïåðåìåñòèòü ââåðõ"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+# fuzzy
+# fuzzy
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Ïðîñìîòð ñîîáùåíèé"
+
+# fuzzy
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "- íåò -"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
-msgstr "N.B."
+msgstr "Ö.Ó."
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:673
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Èìÿ"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:763
+#: lib/MIME/Viewer/itip.php:771
 #, fuzzy
 msgid "Needs Action"
 msgstr "Äåéñòâèå"
 
-#: lib/config/prefs.php:563 lib/config/prefs.php:584 lib/config/prefs.php:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Íèêîãäà"
 
 # fuzzy
-#: lib/config/prefs.php:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Íèêîãäà íå ñîõðàíÿòü âëîæåíèÿ"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Íîâûå"
 
 # fuzzy
-#: lib/IMP.php:579
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Íîâàÿ ïàïêà"
 
 # fuzzy
 # fuzzy
-#: lib/config/prefs.php:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Íîâàÿ ïî÷òà"
 
+# fuzzy
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Íàïèñàòü"
+
+#: mailbox.php:771 lib/MIME/Headers.php:184
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Íîâûå ñîîáùåíèÿ"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Íîâûå ñîîáùåíèÿ"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Äàëåå"
 
@@ -2294,15 +2764,16 @@
 msgid "Next Message"
 msgstr "Ñëåäóþùåå ñîîáøåíèå"
 
-#: mailbox.php:345
+#: mailbox.php:342
 msgid "Next Page"
 msgstr "Ñëåäóþùåÿ ñòðàíèöà"
 
-#: templates/compose/compose.inc:532 lib/config/prefs.php:948
+#: templates/compose/compose.inc:540 templates/compose/compose.inc:553
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr "Íåò"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr ""
 
@@ -2310,109 +2781,138 @@
 msgid "No Encryption"
 msgstr "Áåç øèôðîâàíèÿ"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
-msgstr ""
+msgstr "Íåò êëþ÷åé â ñâÿçêå"
 
 # fuzzy, php-format
-#: mailbox.php:364
+#: mailbox.php:361
 #, php-format
 msgid "No Messages"
 msgstr "Íåò ñîîáùåíèé"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr ""
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
-msgstr ""
+msgstr "Íåò ïåðñîíàëüíûõ ñåðòèôèêàòîâ"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:319
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Íàçàä"
+
+# fuzzy
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
-msgstr ""
+msgstr "Ïóáëè÷íûõ êëþ÷åé íå íàéäåíî"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:92
 #, fuzzy
 msgid "No attachments found."
 msgstr "Ïðèêðåïëåííûå"
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:71 acl.php:97
 #, fuzzy
 msgid "No folder selected."
 msgstr "íå âûáðàíà ïàïêà"
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr ""
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:201 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Âû íå óêàçàëè ïàïêè"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 #, fuzzy
 msgid "No folders with new messages"
 msgstr "Íå óäàëåííûå ñîîáùåíèÿ"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 #, fuzzy
 msgid "No folders with unseen messages"
 msgstr "Íå óäàëåííûå ñîîáùåíèÿ"
 
-#: lib/Compose.php:231
+#: lib/Compose.php:336
 #, fuzzy
 msgid "No message body text"
 msgstr "Ïåðåìåñòèòü ñîîáîùåíèÿ â"
 
+#: lib/IMAP/Client.php:568
+#, fuzzy
+msgid "No message returned."
+msgstr "Ñîîáùåíèå"
+
 # fuzzy
-#: lib/Mailbox.php:1157
+#: lib/Mailbox.php:362
 msgid "No messages matched your search."
 msgstr "Ñîîáùåíèé, óäîâëåòâîðÿþùèõ êðèòåðèÿì ïîèñêà, íå íàéäåíî"
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr ""
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr ""
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+#, fuzzy
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Ïîääåðæêà òåõíîëîãèè PGP îòñóòñòâóåò íà âàøåì ñåðâåðå, ïîýòîìó ïîäïèñü íå "
+"ìîæåò áûòü ïðîâåðåíà"
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr ""
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Îøèáîê îðôîãðàôèè íå íàéäåíî"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Íèêàêèõ ïðåäëîæåíèé"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:67 acl.php:93
 #, fuzzy
 msgid "No user specified."
 msgstr "Âû íå óêàçàëè ïàïêè"
 
-#: lib/MIME/Viewer/itip.php:694
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr ""
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 lib/MIME/Viewer/itip.php:651
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Íåò"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr ""
 
@@ -2434,8 +2934,7 @@
 msgid "Not Personal"
 msgstr "Íå ëè÷íîå"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
-#: lib/Crypt/SMIME.php:166
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr ""
 
@@ -2447,205 +2946,223 @@
 msgid "Not important messages"
 msgstr "Íå âàæíûå ñîîáùåíèÿ"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr ""
 
-#: lib/config/prefs.php:371
+# fuzzy
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Íè÷åãî"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr ""
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr "Çà ñêîëüêî ìåñÿöåâ õðàíèòü ñòàðûå âëîæåíèÿ"
 
-#: lib/config/prefs.php:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "Çà ñêîëüêî ìåñÿöåâ õðàíèòü ñòàðûå ïàïêè îòïðàâëåííûõ ñîîáùåíèé"
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:718
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
-msgstr ""
+msgstr "ÈËÈ"
 
 #: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Ñòàðûå ñîîáùåíèÿ"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Ñòàðàÿ ïàïêà äëÿ îòïðàâëåííûõ ñîîáùåíèé î÷èùåííà."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Òîëüêî ïî ïàïêàì ñ íåïðî÷èòàííûìè ñîîáùåíèÿìè?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:81 templates/folders/javascript.inc:71
 #, fuzzy
 msgid "Only one folder should be selected for this action."
 msgstr "Ïîæàëóéñòà, âûáåðèòå òîëüêî îäíó ïàïêó äëÿ ýòîé îïåðàöèè."
 
 # fuzzy
-#: templates/menu.inc:24 templates/menu.inc:25
-msgid "Ope_n Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
 msgstr "Îòêðûòü ïàïêó"
 
-#: templates/menu.inc:16 templates/menu.inc:18
-msgid "Open Folder"
-msgstr "Îòêðûòü ïàïêó"
-
-#: folders.php:385
+#: folders.php:408
 #, fuzzy
 msgid "Opened Folder"
 msgstr "Îòêðûòü ïàïêó"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr ""
 
 # fuzzy
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Âàøè ïî÷òîâûå ÿùèêè íà äðóãèõ ñåðâåðàõ"
 
 # fuzzy
-#: lib/config/prefs.php:109 lib/config/prefs.php:118 lib/config/prefs.php:125
-#: lib/config/prefs.php:133 lib/config/prefs.php:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Äðóãèå íàñòðîéêè"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr ""
 
+# fuzzy
 #: templates/compose/encrypt_list.inc:7
-#, fuzzy
 msgid "PGP Encrypt Message"
-msgstr "Ïåðåàäðåñàöèÿ ñîîáùåíèÿ"
+msgstr "Øèôðîâàííèå PGP"
 
-#: compose.php:343
-#, fuzzy
+# fuzzy
+#: compose.php:335
 msgid "PGP Error: "
-msgstr "Îøèáêà"
+msgstr "Îøèáêà PGP"
 
-#: compose.php:322
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
-msgstr ""
-
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr ""
+msgstr "Îøèáêà: Íåîáõîäèì ïàðîëü äëÿ ïåðñîíàëüíîãî êëþ÷à."
 
-#: templates/pgp/pgp.inc:6 lib/config/prefs.php:134
-#, fuzzy
+# fuzzy
+#: config/prefs.php.dist:142
 msgid "PGP Options"
-msgstr "Íàñòðîéêè"
+msgstr "Íàñòðîéêè PGP"
 
 #: pgp.php:30
 msgid "PGP Passphrase Input"
-msgstr ""
+msgstr "PGP Ïàðîëü"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
-msgstr ""
+msgstr "Ïîääåðæêà PGP òðåáóåò çàùèùåííîãî ñîåäèíåíèÿ"
 
-#: lib/MIME/Viewer/pgp.php:178
+# fuzzy
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
-msgstr ""
+msgstr "Òåêñò ïóáëè÷íîãî êëþ÷à PGP"
 
-#: pgp.php:149
-#, fuzzy, php-format
+# fuzzy, php-format
+#: pgp.php:145
+#, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr "Ïàïêà \"%s\" áûëà óñïåøíî ñîçäàíà."
+msgstr "Ïóáëè÷íûé êëþ÷ PGP äëÿ %s (%s) áûë óñïåøíî äîáàâëåí"
 
-#: pgp.php:245
+# fuzzy, php-format
+#: pgp.php:241
 #, fuzzy, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
+msgstr "Ïóáëè÷íûé êëþ÷ PGP äëÿ %s (%s) áûë óñïåøíî óäàëåí"
 
-#: templates/pgp/pgp.inc:72
+# fuzzy
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
-msgstr ""
+msgstr "Ñâÿçêà ïóáëè÷íûõ êëþ÷åé PGP"
 
+# fuzzy
 #: templates/compose/encrypt_list.inc:8
-#, fuzzy
 msgid "PGP Sign Message"
-msgstr "Îòïðàâèòü ñîîáùåíèå"
+msgstr "Ïîäïèñü PGP"
 
+# fuzzy
 #: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
-msgstr ""
+msgstr "Ïîäïèñü è øèôðîâàíèå PGP"
 
-#: pgp.php:202
-#, fuzzy
+# fuzzy
+#: pgp.php:198
 msgid "PGP private key successfully added."
-msgstr "Ïîäïèñü óñïåøíî çàìåíåíà."
+msgstr "Ñåêðåòíûé êëþ÷ óñïåøíî äîáàâëåí"
 
-#: pgp.php:177
+# fuzzy
+#: pgp.php:173
 msgid "PGP public key successfully added."
-msgstr ""
+msgstr "Ïóáëè÷íûé êëþ÷ óñïåøíî äîáàâëåí"
 
-#: templates/pgp/notactive.inc:11
+# fuzzy
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
-msgstr ""
+msgstr "Ïîääåðæêà PGP â âàøåé ñèñòåìå íå âêëþ÷åíà"
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
-"Ïîääåðæêà òåõíîëîãèè PGP îòñóòñòâóåò íà âàøåì ñåðâåðå, ïîýòîìó ïîäïèñü íå "
-"ìîæåò áûòü ïðîâåðåíà"
+"Ïîääåðæêà òåõíîëîãèè PGP â äàííûé ìîìåíò îòêëþ÷åíà, ïîýòîìó ïîäïèñü íå ìîæåò "
+"áûòü ïðîâåðåíà"
 
-#: lib/MIME/Viewer/pgp.php:301
+# fuzzy
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
+"Ïîääåðæêà òåõíîëîãèè PGP â äàííûé ìîìåíò îòêëþ÷åíà, ïîýòîìó ñîîáùåíèå íå "
+"ìîæåò áûòü ðàñøèôðîâàíî"
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
+"Ïîääåðæêà PGP èñïîëüçóåò äëÿ ðàáîòû âñïëûâàþùèå îêíà. Åñëè âàø áðàóçåð "
+"íàñòðîåí íà ïîäàâëåíèå âñïëûâàþùèõ îêîí, âàì íåîáõîäèìî èçìåíèòü ýòè "
+"íàñòðîéêè, èíà÷å ïîääåðæêà PGP íå ñìîæåò ðàáîòàòü ïðàâèëüíî."
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:126
-msgid "POP3 over SSL (self-signed sertificate)"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
 msgstr ""
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr ""
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Ñòðàíèöà %d èç %d"
 
-#: lib/config/prefs.php:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Ïåðâîå íåïðî÷èòàííîå ñîîáùåíèå"
 
-#: lib/config/prefs.php:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Ïîñëåäíåå íåïðî÷èòàííîå ñîîáùåíèå"
 
@@ -2653,33 +3170,33 @@
 msgid "Part(s)"
 msgstr "Âëîæåíèÿ"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
-msgstr ""
+msgstr "Ïàðîëü"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
-msgstr ""
+msgstr "Ïàðîëü (ïîâòîðèòü)"
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 #, fuzzy
 msgid "Passphrase successfully unloaded."
 msgstr "Ñîîáùåíèå óñïåøíî îòïðàâëåíî, íî íå ñîõðàíåíî â"
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
-msgstr ""
+msgstr "Ïàðîëü:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
-msgstr ""
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "Ïàðîëü íå ìîæåò áûòü ïóñòûì"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
-msgstr ""
+msgstr "Ïàðîëè íå ñîâïàäàþò"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Ïàðîëü"
 
@@ -2688,54 +3205,68 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Âûïîëíèòü îïåðàöèè îáñëóæèâàíèÿ ïðè âõîäå â ñèñòåìó"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr ""
 
-#: message.php:484 mailbox.php:660 templates/mailbox/navbar.inc:24
+#: message.php:494 mailbox.php:698 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Ëè÷íûå"
 
 # fuzzy
-#: lib/config/prefs.php:14
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Ëè÷íûå"
 
-#: pgp.php:120
+# fuzzy
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
-msgstr ""
+msgstr "Ïåðñîíàëüíàÿ ïàðà PGP êëþ÷åé áûëà óñïåøíî ñãåíåðèðîâàíà."
 
-#: pgp.php:127
+#: pgp.php:123
+#, fuzzy
 msgid "Personal PGP keys deleted successfully."
-msgstr ""
+msgstr "Ñîîáùåíèå óñïåøíî îòïðàâëåíî, íî íå ñîõðàíåíî â"
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr ""
 
-#: smime.php:132
+#: smime.php:128
+#, fuzzy
 msgid "Personal S/MIME keys deleted successfully."
-msgstr ""
+msgstr "Ñîîáùåíèå óñïåøíî îòïðàâëåíî, íî íå ñîõðàíåíî â"
 
-#: lib/config/prefs.php:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "Ðàçìåùàòü ïîäïèñü ïîä îòâåòàìè è ïåðåñûëêàìè?"
+msgstr "Ðàçìåùàòü ïîäïèñü ïåðåä îòâåòàìè è ïåðåñûëêàìè?"
 
-#: compose.php:241
+#: compose.php:258
+#, fuzzy
 msgid "Plaintext Version of Message"
+msgstr "Â òåëå ñîîáùåíèÿ"
+
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
 msgstr ""
+"Èñïîëüçîâàòü çâóêîâîå óâåäîìëåíèå? Ýòî òðåáóåò ïîääåðæêè â áðàóçåðå, âîçîæíî "
+"ñ ïîìîùüþ ñïåöèàëüíûõ ïëàãèíîâ."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
-#, fuzzy
+# fuzzy
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Ââåäèòå èìÿ íîâîé ïàïêè:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
+#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
 msgid "Please enter the name of the new folder:"
 msgstr "Ââåäèòå èìÿ íîâîé ïàïêè:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:139 templates/folders/javascript.inc:129
 msgid "Please enter the new name:"
 msgstr "Ïîæàëóéñòà ââåäèòå íîâîå èìÿ:"
 
@@ -2745,6 +3276,8 @@
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per %s session."
 msgstr ""
+"Ââåäèòå ïàðîëü äëÿ âàøåãî ñåêðåòíîãî PGP êëþ÷à. Âàì íåîáõîäèìî ââîäèòü "
+"ïàðîëü îäèí ðàç çà ñåññèþ ðàáîòû ñ %s"
 
 #: templates/smime/passphrase.inc:13
 #, php-format
@@ -2753,7 +3286,7 @@
 "to enter this passphrase once per %s session."
 msgstr ""
 
-#: recompose.php:88
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2761,62 +3294,51 @@
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 #, fuzzy
 msgid "Please provide your password."
 msgstr "Ïîæàëóéñòà, óêàæèòå Âàøè ëîãèí è ïàðîëü"
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 #, fuzzy
 msgid "Please provide your username."
 msgstr "Ïîæàëóéñòà, óêàæèòå Âàøè ëîãèí è ïàðîëü"
 
-#: compose.php:80 lib/IMP.php:520
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Ïîæàëóéñòà, óäàëèòå ñîìíèòåëüíûå èëè íåïðàâèëüíûå àäðåñà."
 
-#: lib/MIME/Viewer/itip.php:631
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-
-#: templates/folders/javascript.inc:56
+#: templates/folders/javascript.inc:53
 msgid "Please select a folder before you perform any actions."
 msgstr "Ïîæàëóéñòà, âûáåðèòå ïàïêó ïåðåä îñóùåñòâëåíèåì äåéñòâèÿ."
 
-#: lib/MIME/Viewer/itip.php:461
+#: templates/javascript/folders.js:63
 #, fuzzy
-msgid "Please select an action from the menu below."
-msgstr "Ïîæàëóéñòà, âûáåðèòå õîòÿ áû îäíó ïàïêó äëÿ ïîèñêà."
+msgid "Please select a folder before you perform this action."
+msgstr "Ïîæàëóéñòà, âûáåðèòå ïàïêó ïåðåä îñóùåñòâëåíèåì äåéñòâèÿ."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Ïîæàëóéñòà, âûáåðèòå õîòÿ áû îäíó ïàïêó äëÿ ïîèñêà."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12 templates/folders/javascript.inc:4
 msgid "Please select only one folder for this operation."
 msgstr "Ïîæàëóéñòà, âûáåðèòå òîëüêî îäíó ïàïêó äëÿ ýòîé îïåðàöèè."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 #, fuzzy
 msgid "Please select or edit in the box to the right:"
 msgstr "Ïîæàëóéñòà, âûáåðèòå èëè îòðåäàêòèðóéòå:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Ïîæàëóéñòà, âûáåðèòå èëè îòðåäàêòèðóéòå:"
-
-#: lib/config/motd.php:41
+#: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr ""
 
-#: lib/config/prefs.php:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Îòäåëèòü âàøó ïîäïèñü îò ñîîáùåíèÿ ÷åðòîé?"
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 #, fuzzy
 msgid "Preferences successfully updated."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî ñîçäàíà."
@@ -2830,11 +3352,11 @@
 msgid "Previous Message"
 msgstr "Ïðåäûäóùåå ñîîáùåíèå"
 
-#: mailbox.php:336
+#: mailbox.php:333
 msgid "Previous Page"
 msgstr "Ïðåäûäóùàÿ ñòðàíèöà"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Ïå÷àòü"
 
@@ -2843,15 +3365,15 @@
 msgid "Priority"
 msgstr "Ïå÷àòü"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr ""
 
-#: lib/config/prefs.php:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Ñïðàøèâàòü êàæäûé ðàç ïðè âëîæåíèè, ïî óìîë÷àíèþ ÍÅÒ"
 
-#: lib/config/prefs.php:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Ñïðàøèâàòü êàæäûé ðàç ïðè âëîæåíèè, ïî óìîë÷àíèþ ÄÀ"
 
@@ -2859,46 +3381,47 @@
 msgid "Protocol:"
 msgstr "Ïðîòîêîë:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 
 # fuzzy
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Î÷èñòèòü Êîðçèíó"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Î÷èñòèòü Êîðçèíó"
 
-#: templates/folders/actions.inc:22
-#, fuzzy
+# fuzzy
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
-msgstr "Óäàëèòü ïàïêó(è)"
+msgstr "Î÷èñòèòü ïàïêó(è)"
 
-#: lib/config/prefs.php:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Î÷èùàòü êîðçèíó:"
 
 # fuzzy
-#: lib/config/prefs.php:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Óäàëÿòü èç êîðçèíû ñîîáùåíèÿ ñòàðøå óêàçàííîãî êîëè÷åñòâà äíåé"
 
 # fuzzy
-#: lib/config/prefs.php:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Óäàëÿòü ñòàðûå ñîîáùåíèÿ èç Êîðçèíû?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
-#, php-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
 msgstr "Óäàëåíî %d ñîîáùåíèé èç Êîðçèíû."
 
-#: lib/config/prefs.php:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "Äîìåí ïî óìîë÷àíèþ:"
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Óäàëåíî %d ñîîáùåíèé èç Êîðçèíû."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2906,9 +3429,9 @@
 msgstr "Èñïîëüçîâàíî: %.2fÌá èç %.2fÌá (%.2f%%)"
 
 #: templates/quota/quota.inc:21
-#, php-format
+#, fuzzy, php-format
 msgid "Quota status: %.2fMB / NO LIMIT"
-msgstr ""
+msgstr "Èñïîëüçîâàíî: %.2fÌá èç %.2fÌá (%.2f%%)"
 
 #: templates/quota/quota.inc:24
 #, php-format
@@ -2916,28 +3439,29 @@
 msgstr ""
 
 # php-format
-#: lib/config/prefs.php:492
+#: config/prefs.php.dist:500
+#, php-format
 msgid "Quoting %f:"
 msgstr "Öèòèðóþ %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr ""
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Ïåðåñòðîèòü äåðåâî"
 
-#: search.php:165
-#, fuzzy
+# fuzzy
+#: lib/Search.php:617
 msgid "Received On"
-msgstr "Ïîëó÷åííî íà:"
+msgstr "Ïîëó÷åííî:"
 
-#: search.php:173
-#, fuzzy
+# fuzzy
+#: lib/Search.php:625
 msgid "Received Since"
-msgstr "Ïîëó÷åííî íà:"
+msgstr "Ïîëó÷åííî c:"
 
-#: search.php:169
-#, fuzzy
+# fuzzy
+#: lib/Search.php:621
 msgid "Received Until"
-msgstr "Ïîëó÷åííî íà:"
+msgstr "Ïîëó÷åííî äî:"
 
 # fuzzy
 #: templates/message/navbar_actions.inc:16
@@ -2948,27 +3472,23 @@
 msgid "Redirect"
 msgstr "Ïåðåíàïðàâèòü"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Ïåðåíàïðàâèòü ñîîáùåíèå"
 
-#: compose.php:713
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
-#: compose.php:769
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Îøèáêà ïåðåíàïðàâëåíèÿ."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Îáíîâèòü"
-
-#: lib/config/prefs.php:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Ïðîâåðÿòü ïî÷òó íà ñåðâåðå:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 #, fuzzy
 msgid "Reload"
 msgstr "Ïðî÷èòàííûå"
@@ -2977,11 +3497,12 @@
 msgid "Reload View"
 msgstr "Ïåðåãðóçèòü ïðîñìîòð"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
+#, fuzzy
 msgid "Remember the free/busy information."
-msgstr ""
+msgstr "Èíôîðìàöèÿ î ñåðâåðå"
 
-#: lib/config/prefs.php:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Çàïîìíèòü ïîñëåäíåå ñîñòîÿíèå"
 
@@ -2990,7 +3511,7 @@
 msgid "Remote Mailbox:"
 msgstr "Ïàïêà íà ñòîðîííåì ñåðâåðå:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr ""
 
@@ -3000,15 +3521,15 @@
 msgstr "óäàëèòü èñõîäíîå"
 
 # fuzzy
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Ïåðåèìåíîâàòü ïàïêó"
 
-#: lib/config/prefs.php:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Ïåðåèìåíîâûâàòü ïàïêó îòïðàâëåííûõ ñîîáùåíèé â íà÷àëå ìåñÿöà?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:458
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Ïåðåèìåíîâàíèå \"%s\" â \"%s\" íå óäàëîñü. Ñåðâåð ïèøåò"
@@ -3018,7 +3539,7 @@
 msgid "Repl_y to List"
 msgstr "Îòâåòèòü â ðàññûëêó"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Çàìåíèòü íà:"
 
@@ -3026,7 +3547,7 @@
 msgid "Reply"
 msgstr "Îòâåòèòü"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 #, fuzzy
 msgid "Reply Sent."
 msgstr "Êîìó îòâåòèòü"
@@ -3035,7 +3556,7 @@
 msgid "Reply to All"
 msgstr "Îòâåòèòü âñåì"
 
-#: compose.php:660
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Îòâåòèòü âñåì:"
 
@@ -3044,7 +3565,7 @@
 msgid "Reply to List"
 msgstr "Îòâåòèòü âñåì"
 
-#: compose.php:662
+#: compose.php:773
 #, fuzzy
 msgid "Reply to List:"
 msgstr "Îòâåòèòü âñåì:"
@@ -3054,161 +3575,175 @@
 msgid "Reply to _All"
 msgstr "Îòâåòèòü âñåì"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
+#, fuzzy
 msgid "Reply with Not Supported Message"
-msgstr ""
+msgstr "Ïåðâîå íåïðî÷èòàííîå ñîîáùåíèå"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:537
+#, fuzzy
 msgid "Reply with free/busy for next 2 months."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Îøèáêà îòïðàâêè ïèñüìà: %s\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Îøèáêà îòïðàâêè ïèñüìà: %s\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Îøèáêà îòïðàâêè ïèñüìà: %s"
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:536
+#, fuzzy
 msgid "Reply with requested free/busy information."
-msgstr ""
+msgstr "Îøèáêà îòïðàâêè ïèñüìà: %s"
 
 # fuzzy
-#: message.php:259
+#: message.php:275
 msgid "Reply-To"
 msgstr "Êîìó îòâåòèòü:"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Îòâåòèòü"
 
-#: compose.php:658
+#: compose.php:769
 msgid "Reply:"
 msgstr "Îòâåòèòü:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 #, fuzzy
 msgid "Report as Innocent"
 msgstr "Îòïðàâèòü ñîîáùåíèå î ñïàìå"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Îòïðàâèòü ñîîáùåíèå î ñïàìå"
 
-#: templates/compose/compose.inc:374
-#, fuzzy
+# fuzzy
+#: templates/compose/compose.inc:386
 msgid "Request a _Read Receipt"
 msgstr "Çàïðîñèòü ïîäòâåðæäåíèå ïîëó÷åíèÿ"
 
-#: lib/config/prefs.php:587
-#, fuzzy
-msgid "Request delivery confirmation?"
-msgstr "Horde íå ïðàâèëüíî íàñòðîåí"
-
-#: lib/config/prefs.php:566
-#, fuzzy
+# fuzzy
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
-msgstr "Çàïðîñèòü ïîäòâåðæäåíèå ïîëó÷åíèÿ"
+msgstr "Çàïðîñèòü ïîäòâåðæäåíèå ïîëó÷åíèÿ?"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:692
+#, fuzzy
 msgid "Required Participant"
-msgstr ""
+msgstr "Çàïðîñèòü ïîäòâåðæäåíèå ïîëó÷åíèÿ"
 
-#: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:138 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Ñáðîñèòü"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr ""
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Ïðîäîëæèòü"
 
-#: recompose.php:89
+#: recompose.php:97
 msgid "Resume your session"
 msgstr ""
 
 # fuzzy
-#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
-#: templates/fetchmail/account_select.inc:32
-msgid "Return to Fetch Mail"
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
 msgstr "Âåðíóòüñÿ ê íàñòðîéêàì"
 
 # fuzzy
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Âåðíóòüñÿ íà Ãëàâíóþ ñòðàíèöó"
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:31
+msgid "Return to Fetch Mail"
+msgstr "Âåðíóòüñÿ ê íàñòðîéêàì"
 
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Âåðíóòüñÿ ê íàñòðîéêàì"
 
-# fuzzy
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Âåðíóòüñÿ íà Ãëàâíóþ ñòðàíèöó"
-
-#: lib/config/prefs.php:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "Îòîáðàçèòü ïî÷òîâûé ÿùèê ïîñëå óäàëåíèÿ èëè ïåðåìåùåíèÿ ñîîáùåíèÿ"
 
-#: lib/MIME/Viewer/itip.php:673
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Ñöåíàðèé"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:411
+# fuzzy
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
+#, fuzzy
 msgid "S/MIME"
-msgstr ""
+msgstr "Íàñòðîéêè S/MIME"
 
 #: templates/compose/encrypt_list.inc:12
+#, fuzzy
 msgid "S/MIME Encrypt Message"
-msgstr ""
+msgstr "Ïåðåàäðåñàöèÿ ñîîáùåíèÿ"
 
-#: compose.php:379
+#: compose.php:371
+#, fuzzy
 msgid "S/MIME Error: "
-msgstr ""
+msgstr "Îøèáêà"
 
-#: compose.php:358
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr ""
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "Âîçìîæíîñòè S/MIME îòêëþ÷åíû"
-
 # fuzzy
-#: templates/smime/smime.inc:6 lib/config/prefs.php:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "Íàñòðîéêè S/MIME"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr ""
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 
-#: smime.php:140
+#: smime.php:136
 #, fuzzy, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
 
-#: smime.php:162
+#: smime.php:158
+#, fuzzy
 msgid "S/MIME Public Key successfully added."
-msgstr ""
+msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
 
-#: templates/smime/smime.inc:45
+# fuzzy
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
-msgstr ""
+msgstr "Ñâÿçêà ïóáëè÷íûõ êëþ÷åé S/MIME"
 
-#: smime.php:211
+#: smime.php:207
+#, fuzzy
 msgid "S/MIME Public/Private Keypair successfully added."
-msgstr ""
+msgstr "Ïîäïèñü óñïåøíî çàìåíåíà."
 
 #: templates/compose/encrypt_list.inc:13
 #, fuzzy
@@ -3216,118 +3751,153 @@
 msgstr "Îòïðàâèòü ñîîáùåíèå"
 
 #: templates/compose/encrypt_list.inc:14
+#, fuzzy
 msgid "S/MIME Sign/Encrypt Message"
-msgstr ""
+msgstr "Îòïðàâèòü ñîîáùåíèå"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
+#, fuzzy
 msgid "S/MIME support is disabled on this system."
-msgstr ""
+msgstr "Ïîääåðæêà ôèëüòðàöèè â âàøåé ñèñòåìå íå âêëþ÷åíà"
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
+#, fuzzy
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
+"Ïîääåðæêà òåõíîëîãèè PGP îòñóòñòâóåò íà âàøåì ñåðâåðå, ïîýòîìó ïîäïèñü íå "
+"ìîæåò áûòü ïðîâåðåíà"
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
+#, fuzzy
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
+"Ïîääåðæêà òåõíîëîãèè PGP îòñóòñòâóåò íà âàøåì ñåðâåðå, ïîýòîìó ïîäïèñü íå "
+"ìîæåò áûòü ïðîâåðåíà"
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
+#, fuzzy
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr ""
+"Ïîääåðæêà òåõíîëîãèè PGP îòñóòñòâóåò íà âàøåì ñåðâåðå, ïîýòîìó ïîäïèñü íå "
+"ìîæåò áûòü ïðîâåðåíà"
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
+msgstr ""
+"Ïîääåðæêà S/MIME èñïîëüçóåò äëÿ ðàáîòû âñïëûâàþùèå îêíà. Åñëè âàø áðàóçåð "
+"íàñòðîåííà ïîäàâëåíèå âñïëûâàþùèõ îêîí, âàì íåîáõîäèìî èçìåíèòü ýòè "
+"íàñòðîéêè, èíà÷åïîääåðæêà S/MIME íå ñìîæåò ðàáîòàòü ïðàâèëüíî."
+
+#: templates/login/login.inc:204
+msgid "SMTP"
 msgstr ""
 
 # fuzzy
-#: templates/compose/compose.inc:266
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "Òåìà"
 
 # fuzzy
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Ñîõðàíèòü êîïèþ â"
 
 # fuzzy
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Ñîõðàíèòü êàê"
 
 # fuzzy
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:308 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Ñîõðàíèòü êàê"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:536
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Ñîõðàíèòü âëîæåíèÿ âíóòðè ñîîáùåíèé â ïàïêå îòïðàâëåííîé ïî÷òû?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save Draft"
 msgstr "Ñîõðàíèòü êàê ÷åðíîâèê"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Ñîõðàíèòü êàê"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Çàïèñàòü íàñòðîéêè"
 
 # fuzzy
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Ñîõðàíèòü"
+
+# fuzzy
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save _Draft"
 msgstr "Ñîõðàíèòü êàê ÷åðíîâèê"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Ñîõðàíèòü êàê"
 
-#: lib/config/prefs.php:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Ïîìå÷àòü ÷åðíîâèêè êàê íåïðî÷èòàííûå"
 
-#: lib/config/prefs.php:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr "Àâòîìàòè÷åñêè çàïèñûâàòü ïîëó÷àòåëÿ â àäðåñíóþ êíèãó"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:122
 msgid "Save search as a virtual folder?"
 msgstr "Çàïèñàòü ðåçóëüòàò ïîèñêà â âèðòóàëüíóþ ïàïêó?"
 
-#: lib/config/prefs.php:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Ñîõðàíÿòü îòïðàâëåííûå ñîîáùåíèÿ?"
 
-#: compose.php:1137
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Îøèáêà çàïèñè ÷åðíîâèêà. Ñåðâåð îòâåòèë: %s"
 
-#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Ïîèñê"
 
 # fuzzy, php-format
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
-#, fuzzy, php-format
+# fuzzy, php-format
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
+#, php-format
 msgid "Search %s"
-msgstr "Ïîèñê"
+msgstr "Èñêàòü %s"
 
 # fuzzy
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
+# fuzzy
+#: config/prefs.php.dist:120
+msgid "Search Options"
 msgstr "Ïîèñê"
 
-#: search.php:311
+#: search.php:263
 msgid "Search Results"
 msgstr "Ðåçóëüòàòû ïîèñêà"
 
@@ -3344,7 +3914,7 @@
 msgid "Select Another Account"
 msgstr "Âûáðàòü äðóãîé ïðîôèëü:"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 #, fuzzy
 msgid "Select a date"
 msgstr "Âûáðàòü ïðîôèëü"
@@ -3355,7 +3925,12 @@
 msgstr "Âûáåðèòå ïîëå"
 
 # fuzzy
-#: lib/config/prefs.php:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Âûáåðèòå øàáëîí"
+
+# fuzzy
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Âûáåðèòå àäðåñíóþ êíèãó äëÿ äîáàâëåíèÿ â íåå àäðåñîâ."
 
@@ -3377,6 +3952,12 @@
 msgid "Select none"
 msgstr "Îòìåíèòü âûáîð"
 
+# fuzzy
+#: templates/saveimage/saveimage.inc:9
+#, fuzzy
+msgid "Select the gallery to save the image in."
+msgstr "Ðåæèì ðàáîòû ïîñëå âõîäà â Çàïðîñû:"
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Âûáåðèòå òèï ïî÷òîâîãî ñåðâåðà"
@@ -3386,39 +3967,43 @@
 msgid "Selected Address books:"
 msgstr "Âûáðàííûå àäðåñíûå êíèãè:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
-msgstr ""
+msgstr "Ïîñëàòü êëþ÷ íà ïóáëè÷íûé ñåðâåð"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:597
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Èíôîðìàöèÿ î ñåðâåðå"
 
-#: lib/config/prefs.php:575
-msgid "Send MDN when requested by the sender?"
-msgstr ""
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Send Message"
 msgstr "Îòïðàâèòü ñîîáùåíèå"
 
-#: folders.php:363
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr ""
+
+#: config/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "Îòñûëàòü çàïðîøåííîå àäðåñàòîì ïîäòâåðæäåíèå î ïðî÷òåíèè?"
+
+#: folders.php:378
 #, fuzzy
 msgid "Sent mail folder"
 msgstr "Ïàïêà îòïðàâëåííûõ ñîîáùåíèé:"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Ïàïêà îòïðàâëåííûõ ñîîáùåíèé:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Ñåðâåð"
 
 # fuzzy
-#: lib/config/prefs.php:23
+#: config/prefs.php.dist:23
 msgid "Server and Folder Information"
 msgstr "Ïàïêè"
 
@@ -3427,15 +4012,15 @@
 msgid "Server:"
 msgstr "Ñåðâåð"
 
-#: lib/config/prefs.php:80
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Íàñòðîéêà ìàíèïóëÿöèé ñ óäàëåííûìè èëè ïåðåìåùåííûìè ñîîáùåíèÿìè"
 
-#: lib/config/prefs.php:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Óñòàíîâèòü ïðèîðèòåò ïèñüìà ïðè îòïðàâêå"
 
-#: lib/config/prefs.php:31
+#: config/prefs.php.dist:31
 #, fuzzy
 msgid "Share Folders"
 msgstr "Ïàïêà îòïðàâëåííûõ ñîîáùåíèé:"
@@ -3445,28 +4030,29 @@
 msgid "Share mail folders"
 msgstr "Ïàïêà îòïðàâëåííûõ ñîîáùåíèé:"
 
-#: lib/config/prefs.php:32
+#: config/prefs.php.dist:32
 #, fuzzy
 msgid "Share your mail folders with other users."
 msgstr "Ïàïêà îòïðàâëåííûõ ñîîáùåíèé:"
 
-#: lib/config/prefs.php:672
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr "Ïî óìîë÷àíèþ, ñêðûâàòü áîëüøèå áëîêè öèòèðóåìîãî òåêñòà?"
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
-msgstr ""
+msgstr "Èñêàòü â òåëå òåêñòîâûõ ñîîáùåíèé äàííûå PGP?"
 
-#: lib/config/prefs.php:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Çàêðûâàòü îêíî ñîñòàâëåíèÿ ñîîáùåíèÿ, ïðè ñîõðàíåíèè ÷åðíîâèêà?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
+"Äîáàâëÿòü âàø ïóáëè÷íûé êëþ÷ êî âñåì èñõîäÿùèì ñîîáùåíèÿì ïî óìîë÷àíèþ?"
 
 #: templates/search/main.inc:92
 #, fuzzy
@@ -3477,7 +4063,7 @@
 msgid "Show All Headers"
 msgstr "Ïîêàçàòü âñå çàãîëîâêè"
 
-#: mailbox.php:354
+#: mailbox.php:351
 msgid "Show Deleted"
 msgstr "Ïîêàçàòü óäàëåííûå"
 
@@ -3495,57 +4081,55 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Ïîäïèñàòüñÿ íà ïàïêó(è)"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Ïîêàçàòü íåïîäïèñàííûå"
 
-#: lib/config/prefs.php:612
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Ïîçâîëÿòü óäàëÿòü âëîæåíèÿ èç ïèñåì, íàæàòèåì íà èêîíêó"
 
-#: lib/config/prefs.php:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "Ïîêàçûâàòü ëåãåíäó ïðè ïðîñìîòðå ÿùèêà?"
 
-#: lib/config/prefs.php:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr ""
 
-#: lib/config/prefs.php:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr ""
 
-#: lib/config/prefs.php:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Îòîáðàçèòü èêîíêó ñáîðà ïî÷òû â âåðõíåì ìåíþ?"
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:98
+#, fuzzy
 msgid "Show the Images"
-msgstr ""
+msgstr "Ïðîñìîòð ñîîáùåíèÿ â"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
+#, fuzzy
 msgid "Show the filter icon on the menubar?"
-msgstr ""
+msgstr "Îòîáðàçèòü èêîíêó ñáîðà ïî÷òû â âåðõíåì ìåíþ?"
 
 # fuzzy
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Ïîêàçàòü ñóììàðíîå êîëè÷åñòâî ïèñåì â ïàïêå?"
 
 # fuzzy
-#: lib/config/prefs.php:669
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Îòîáðàæàòü"
 
 # fuzzy
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Ðàçìåð"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr ""
-
 # fuzzy
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
@@ -3555,121 +4139,155 @@
 msgid "Size"
 msgstr "Ðàçìåð"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Ïîðÿäîê ñîðòèðîâêè"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 #, fuzzy
 msgid "Sort by Arrival"
 msgstr "Ñîðòèðîâàòü ïî òåìå"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 #, fuzzy
 msgid "Sort by Date"
 msgstr "Ñîðòèðîâàòü ïî òåìå"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 #, fuzzy
 msgid "Sort by From Address"
 msgstr "Ñ àäðåñà"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 #, fuzzy
 msgid "Sort by Message Size"
 msgstr "Ðàçìåð ñîîáùåíèÿ"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 #, fuzzy
 msgid "Sort by Subject"
 msgstr "Áåç òåìû"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 #, fuzzy
 msgid "Sort by Thread"
 msgstr "Ñîðòèðîâàòü ïî òåìå"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 #, fuzzy
 msgid "Sort by To Address"
 msgstr "Ñ àäðåñà"
 
-#: templates/prefs/spamselect.inc:4
-#, fuzzy
+# fuzzy
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
-msgstr " ïàïêà"
+msgstr "Íåæåëàòåëüíûå ðàññûëêè:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Ñïåöèàëüíûå ñèìâîëû"
 
-#: templates/compose/compose.inc:334
+#: search.php:142
+msgid "Special Virtual Folders cannot be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Ïðîâåðêà îðôîãðàôèè"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Ïðîâåðêà îðôîãðàôèè"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Ïðîâåðêà îðôîãðàôèè çàâåðøåíà"
 
-#: lib/config/prefs.php:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Êîëè÷åñòâî îòîáðàæàåìûõ îøèáîê îðôîãðàôèè"
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
+#, fuzzy
 msgid "Start"
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Êàëåíäàðü\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Êàëåíäàðü\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"Êàëåíäàðü"
 
-#: lib/MIME/Viewer/itip.php:673
+# fuzzy
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Øàáëîíû"
+
+# fuzzy
+# fuzzy
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Íàçâàíèå:"
+
+# fuzzy
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Òèï:"
+
+# fuzzy
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Øàáëîí:"
+
+#: lib/MIME/Viewer/itip.php:683
+#, fuzzy
 msgid "Status"
-msgstr ""
+msgstr "Êàëåíäàðü"
 
 # fuzzy
-#: lib/MIME/Contents.php:222
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Óäàëèòü âëîæåíèå"
 
-#: lib/config/prefs.php:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr ""
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 #, fuzzy
 msgid "Sub_ject"
 msgstr "Òåìà"
 
-#: message.php:260 search.php:157 templates/compose/recompose.inc:25
+#: message.php:276 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Òåìà"
 
 # fuzzy
-#: lib/config/prefs.php:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Òåìà ñîîáùåíèÿ"
 
 # fuzzy
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:310 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
-msgstr "Èñêàòü"
+msgstr "Îê"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Ïîäïèñàòüñÿ íà ïàïêó(è)"
 
-#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:395
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Âûïîëíåíî"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Çàìåíèòü íà"
 
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 #, fuzzy
 msgid "Summary"
 msgstr ""
@@ -3677,66 +4295,84 @@
 "Ãëàâíàÿ\n"
 "#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:397 templates/compose/compose.inc:400
+#, fuzzy
 msgid "Switch Composition Method"
-msgstr ""
+msgstr "Âèçóàëüíûé ðåäàêòîð"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:401
 msgid "Switch to HTML composition"
 msgstr "Âèçóàëüíûé ðåäàêòîð"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:401
 msgid "Switch to plain text composition"
 msgstr "Ïåðåêëþ÷èòüñÿ â îáû÷íûé ðåæèì ñîñòàâëåíèÿ ñîîáùåíèÿ"
 
 # fuzzy
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:416
 msgid "Te_xt"
 msgstr "Òåêñò"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:746
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr ""
 
-#: lib/config/prefs.php:925
+# fuzzy
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Òåêñò"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "Êàêîå äåéñòâèå âûçûâàåò ùåë÷îê ïî àäðåñó îòïðàâèòåëÿ:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr ""
 
+# fuzzy, php-format
 #: fetchmailprefs.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "The account \"%s\" has been deleted."
 msgstr "Ïðîôèëü \"%s\" áûë óäàëåí."
 
+# fuzzy, php-format
 #: fetchmailprefs.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "The account \"%s\" has been saved."
 msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
 
-#: lib/Filter.php:94
-#, fuzzy, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
-
 #: attachment.php:43
+#, fuzzy
 msgid "The attachment was not found."
+msgstr "Ïðèêðåïëåííûå"
+
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
 msgstr ""
 
 #: templates/javascript/open_compose_win.js:37
@@ -3745,40 +4381,40 @@
 "block popup windows?"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Òåêóùàÿ ïàïêà(è) \"%s\" áóäåò ïåðåèìåíîâàíà â \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 
-#: compose.php:1146
-#, php-format
+#: compose.php:1272
+#, fuzzy, php-format
 msgid "The draft has been saved to the \"%s\" folder."
-msgstr ""
+msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr ""
 
 #: templates/compose/expand.inc:9
 #, fuzzy, php-format
-msgid "The field '%s' can't be expanded."
+msgid "The field \"%s\" can't be expanded."
 msgstr "Ïîäïèñü íå ìîæåò áûòü çàìåíåíà."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:332
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Ïàïêà \"%s\" óæå ñóùåñòâóåò"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:162
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3787,70 +4423,81 @@
 "Ïàïêà \"%s\" ñîäåðæèò çàïðåùåííûå ñèìâîëû â èìåíè. Ýòî ìîæåò âûçûâàòü "
 "ïðîáëåìû. Ïîæàëóéñòà, ñâÿæèòåñü ñ Âàøèì ñèñàäìèíîì."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:351
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Ïàïêà \"%s\" áûëà ñîçäàíà, íî Âû íå áûëè íà íåå ïîäïèñàíû."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:269
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Ïàïêà \"%s\" áûëà óäàëåíà, íî Âû íå àííóëèðîâàëè ïîäïèñêó íà íåå."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:338
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Ïàïêà \"%s\" íå áûëà ñîçäàíà. Ñåðâåð îòâåòèë"
 
-#: lib/Folder.php:373
+#: lib/Folder.php:262
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Ïàïêà \"%s\" íå áûëà óäàëåíà. Ñåðâåð îòâåòèë"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî ñîçäàíà."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:456
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî ïåðåèìåíîâàíà â \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/open_saveimage_win.js:12
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:100
+#, fuzzy
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
-msgstr ""
+msgstr "Îòîáðàæàòü êàðòèíêè â HTML ñîîáùåíèÿõ äëÿ àäðåñàòîâ èç àäðåñíîé êíèãè"
 
-#: lib/MIME/Viewer/status.php:78
+# fuzzy
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
-msgstr ""
+msgstr "Ïî÷òîâûé ñåðâåð ïðèñëàë ñëåäóþùåå ñîîáùåíèå îá îøèáêå:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 #, fuzzy
 msgid "The mail server generated the following informational message:"
 msgstr "Íàñòðîéêè ïî÷òîâîãî ñåðâåðà è èíôîðìàöèè î ïàïêàõ."
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
+#, fuzzy
 msgid "The mail server generated the following message:"
-msgstr ""
+msgstr "Íàñòðîéêè ïî÷òîâîãî ñåðâåðà è èíôîðìàöèè î ïàïêàõ."
 
-#: lib/Message.php:645
-#, fuzzy, php-format
+# fuzzy, php-format
+#: lib/Message.php:691
+#, php-format
 msgid "The mailbox %s is already empty."
-msgstr "Ïàïêà \"%s\" óæå ñóùåñòâóåò"
+msgstr "Ïàïêà \"%s\" óæå ïóñòàÿ"
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3860,20 +4507,25 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Ñîçäàâàåìîå ñîîáùåíèå áûëî çàêðûòî. Âûõîæó."
 
-#: message.php:143
+#: templates/compose/compose.js:126
+#, fuzzy
+msgid "The message does not have a Subject entered."
+msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
+
+#: message.php:149
 #, fuzzy
 msgid "The message has been deleted."
 msgstr "Ïðîôèëü \"%s\" áûë óäàëåí."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:397
 #, fuzzy
 msgid "The message has been verified."
 msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
 
-#: lib/MIME/Viewer/pkcs7.php:374
-#, php-format
+#: lib/MIME/Viewer/pkcs7.php:389
+#, fuzzy, php-format
 msgid "The message has been verified. Sender: %s."
-msgstr ""
+msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
 
 #: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
@@ -3881,20 +4533,20 @@
 "block popup windows?"
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
-msgstr ""
+msgstr "Ñàì êëþ÷ ïðîñìîòðåòü âû ñìîæåòå %s"
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr ""
 
-#: message.php:548
+#: message.php:551
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3902,12 +4554,16 @@
 "notification message."
 msgstr ""
 
-#: templates/compose/compose.js:104
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:90
 #, fuzzy
 msgid "The signature could not be replaced."
 msgstr "Ïîäïèñü íå ìîæåò áûòü çàìåíåíà."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Ïîäïèñü óñïåøíî çàìåíåíà."
 
@@ -3915,45 +4571,63 @@
 msgid "The specified file does not exist."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Çàãëàâèå %s áûëî äîáàâëåíî"
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Ñåðâåð %s áûë óäàëåí"
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Ñåðâåð %s áûë óäàëåí"
+
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
 msgid "The task has been added to your tasklist."
-msgstr ""
+msgstr "Ïðîôèëü \"%s\" áûë ñîõðàíåí."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 #, fuzzy
 msgid "The text of the message"
 msgstr "óäàëèòü ñîîáùåíèå"
 
-#: lib/MIME/Viewer/status.php:97
-#, php-format
+#: lib/MIME/Viewer/status.php:94
+#, fuzzy, php-format
 msgid "The text of the message can be viewed %s."
-msgstr ""
+msgstr "óäàëèòü ñîîáùåíèå"
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
+#, fuzzy
 msgid "The text of the returned message"
-msgstr ""
+msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
-#: lib/MIME/Viewer/status.php:82
+# fuzzy, php-format
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
-msgstr ""
+msgstr "Òåêñò âåðíóâøåãîñÿ ïèñüìà ìîæåò áûòü ïðîñìîòðåí %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, fuzzy
 msgid "The text of the sent message"
 msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
-#: lib/MIME/Viewer/notification.php:71
-#, php-format
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy, php-format
 msgid "The text of the sent message can be viewed %s."
-msgstr ""
+msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:155
 #, fuzzy
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Ïîäïèñü óñïåøíî çàìåíåíà."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr ""
 
@@ -3961,193 +4635,227 @@
 msgid "There are no messages in this mailbox."
 msgstr "Â ýòîì ÿùèêå íåò ïèñåì."
 
-#: lib/Message.php:604
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Ïðîáëåìà ïðè ïîïûòêå âû÷åðêíóòü %s. Ñåðâåð ñêàçàë"
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr ""
 
-#: lib/Message.php:647
+#: lib/Message.php:693
 #, fuzzy, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Ïðîáëåìà ïðè ïîïûòêå âû÷åðêíóòü ïî÷òîâûé ÿùèê. Ñåðâåð ñêàçàë"
 
-#: lib/Message.php:613
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Ïðîáëåìà ïðè ïîïûòêå âû÷åðêíóòü ïî÷òîâûé ÿùèê. Ñåðâåð ñêàçàë"
-
-#: lib/Message.php:107
+#: lib/Message.php:110
 #, fuzzy, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "Îøèáêà ïðè êîïèðîâàíèè ïèñåì â \"%s\". Ñåðâåð îòâåòèë"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "Îøèáêà ïðè óäàëåíèè ïèñåì èç ïàïêè \"%s\". Ñåðâåð îòâåòèë"
 
-#: lib/Message.php:296
+#: lib/Message.php:320
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Îøèáêà ïðè óäàëåíèè ïèñåì èç ïàïêè \"%s\". Ñåðâåð îòâåòèë"
 
-#: lib/Message.php:230
+#: lib/Message.php:242
 #, fuzzy, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Ïðîáëåìà ïðè óäàëåíèè ïèñåì. Ñåðâåð ñêàçàë"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:100
 #, fuzzy, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà."
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Îøèáêà ïðè îòîáðàæåíèè ýòîé ÷àñòè ñîîáùåíèÿ"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:594
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Îøèáêà ïðè ïîìåòêå ïèñåì â ïàïêå \"%s\". Ñåðâåð îòâåòèë "
 
-#: folders.php:155
+#: folders.php:149
 #, fuzzy, php-format
 msgid "There was an error importing %s."
 msgstr "Îøèáêà ïðè çàïèñè ÷åðíîâèêà."
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:137
 #, fuzzy, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:167
 #, fuzzy, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Ïðîáëåìà ïðè ïðîñìîòðå çàïðîøåííîãî ïèñüìà."
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:153
 #, fuzzy, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "Îøèáêà îòïðàâêè ïèñüìà: %s"
 
-#: lib/Message.php:102
+#: lib/Message.php:105
 #, fuzzy, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "Îøèáêà ïðè ïåðåìåùåíèè ïèñüìà â \"%s\". Ñåðâåð îòâåòèë"
 
-#: compose.php:1154
+#: compose.php:1280
 #, fuzzy
 msgid "There was an error saving this message as a draft."
 msgstr "Îøèáêà ïðè îòîáðàæåíèè ýòîé ÷àñòè ñîîáùåíèÿ"
 
-#: compose.php:915
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Îøèáêà îòïðàâêè ïèñüìà: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:114
 #, fuzzy, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Îøèáêà îòïðàâêè ïèñüìà: %s"
 
 # fuzzy
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "Ýòî ïèñüìî íå ñîäåðæèò òåêñòà"
 
-#: lib/MIME/Viewer/html.php:94
+# fuzzy
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
-msgstr ""
+msgstr "Ýòî ñîîáùåíèå ñîäåðæèò âñòðîåííûå èçîáðàæåíèÿ."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
+"Ýòî ñîîáùåíèå ñîäåðæèò âñòðîåííûå èçîáðàæåíèÿ. Çàáëîêèðîâàííûå èçîáðàæåíèÿ "
+"âûãëÿäÿò òàê:"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
-msgstr ""
+msgstr "Ê ñîîáùåíèþ ïðèëîæåí ïóáëè÷íûé PGP êëþ÷."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
+#, fuzzy
 msgid "This action is not supported."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå"
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
+#, fuzzy
 msgid "This action is not yet implemented."
 msgstr ""
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP v4.0.2)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå\n"
+"#-#-#-#-#  ru_RU.po (Horde v3.0.3)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (Horde v2.1)  #-#-#-#-#\n"
+"#-#-#-#-#  ru_RU.po (IMP v3.1)  #-#-#-#-#\n"
+"Íîâîå ñîîáùåíèå"
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14 templates/folders/javascript.inc:6
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Ýòî ìîæåò çàíÿòü êàêîå-òî âðåìÿ. Âû òî÷íî õîòèòå ïðîäîëæèòü?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:415
+#, fuzzy
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
-msgstr ""
+msgstr "Ýòî ïèñüìî áûëî ïîäïèñàíî öèôðîâîé ïîäïèñüþ PGP"
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Ýòî ïèñüìî áûëî ïîäïèñàíî öèôðîâîé ïîäïèñüþ PGP"
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
+#, fuzzy
 msgid "This message has been digitally signed via S/MIME."
-msgstr ""
+msgstr "Ýòî ïèñüìî áûëî ïîäïèñàíî öèôðîâîé ïîäïèñüþ PGP"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#, fuzzy
 msgid "This message has been encrypted via S/MIME."
-msgstr ""
+msgstr "Ïðîôèëü \"%s\" áûë óäàëåí."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+# fuzzy
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
-msgstr ""
+msgstr "Ýòî ïèñüìî áûëî çàøèôðîâàíî PGP"
 
-#: message.php:203
+#: message.php:211
 msgid "This message to"
 msgstr "Ýòî ñîîáùåíèå â"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr ""
 
@@ -4156,19 +4864,23 @@
 msgid "This window must be called from a compose window."
 msgstr "Ýòî îêíî äîëæíî âûçûâàòüñÿ èç îêíà ñîçäàíèÿ ñîîáùåíèÿ"
 
-#: thread.php:31 templates/thread/top.inc:3 lib/config/prefs.php:893
+#: thread.php:157
+#, fuzzy
+msgid "Thread Display"
+msgstr "Îòîáðàæåíèå ôàéëîâ"
+
+#: thread.php:76 templates/thread/top.inc:3 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Ïðîñìîðò ïî òåìàì"
 
-#: message.php:256 mailbox.php:570 search.php:145
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:272 mailbox.php:602 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "Êîìó"
 
 # fuzzy
-#: lib/config/prefs.php:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "Àäðåñ ïîëó÷àòåëÿ"
 
@@ -4178,12 +4890,18 @@
 "clicking."
 msgstr "Äëÿ âûáîðà íåñêîëüêèõ ïîëåé äåðæèòå êëàâèøó Ctrl"
 
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+
 # fuzzy
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Îáùèé ðàçìåð âëîæåíèé:"
 
-#: folders.php:354
+#: folders.php:369
 #, fuzzy
 msgid "Trash folder"
 msgstr "Ìóñîðíàÿ êîðçèíà:"
@@ -4192,8 +4910,8 @@
 msgid "Trash folder:"
 msgstr "Ìóñîðíàÿ êîðçèíà:"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr ""
 
@@ -4210,29 +4928,48 @@
 msgid "Undelete"
 msgstr "Âîññòàíîâèòü"
 
-#: mailbox.php:554 mailbox.php:566 lib/MIME/Headers.php:218
+#: mailbox.php:580 mailbox.php:598 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Íåðàñêðûòûå ïîëó÷àòåëè"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr ""
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr ""
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr ""
 
-#: mailbox.php:531
+#: mailbox.php:558
+#, fuzzy
 msgid "Unknown Date"
+msgstr "Íåðàñêðûòûå ïîëó÷àòåëè"
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:626
+#, fuzzy
 msgid "Unknown Meeting"
-msgstr ""
+msgstr "Íåðàñêðûòûå ïîëó÷àòåëè"
 
-#: mailbox.php:582
+#: mailbox.php:614
 #, fuzzy
 msgid "Unknown Recipient"
 msgstr "Íåðàñêðûòûå ïîëó÷àòåëè"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr ""
 
@@ -4240,47 +4977,56 @@
 msgid "Unnamed"
 msgstr "Íåíàçâàííûå"
 
-#: message.php:490 mailbox.php:665 templates/message/navbar_navigate.inc:6
+#: message.php:503 mailbox.php:703 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Íîâûå"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Îòìåíèòü ïîäïèñêó íà Ïàïêó(è)"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Îáíîâèòü èíôîðìàöèþ î âëîæåíèÿõ"
+# fuzzy
+#: templates/compose/compose.inc:515
+msgid "Update"
+msgstr "Ïðèìåíèòü"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr ""
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+# fuzzy
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
-msgstr ""
+msgstr "Çàãðóçèòü"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Èñïîëüçîâàòü çíà÷åíèÿ ïî óìîë÷àíèþ"
 
-#: lib/config/prefs.php:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
-msgstr ""
+msgstr "Èñïîëüçîâàòü ïîäïèñêó íà ïàïêè IMAP?"
 
-#: templates/acl/acl.inc:140
+# fuzzy
+# fuzzy
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Èñïîëüçîâàòü Âèðòóàëüíóþ Êîðçèíó?"
+
+#: templates/acl/acl.inc:143
 #, fuzzy
 msgid "User"
 msgstr "Èìÿ ïîëüçîâàòåëÿ"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Èìÿ ïîëüçîâàòåëÿ"
 
@@ -4289,98 +5035,151 @@
 msgid "Username:"
 msgstr "Èìÿ ïîëüçîâàòåëÿ"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
-#, fuzzy
+# fuzzy
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
-msgstr "Ïðîñìîòð %s"
+msgstr "Ïðîñìîòð"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "Ïðîñìîòð %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "View %s Public Key"
-msgstr ""
+msgstr "Âàøå ïîëíîå èìÿ:"
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:119
 #, fuzzy
 msgid "View HTML content in a separate window"
 msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+# fuzzy
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Ïðîñìîòðåòü ñîîáùåíèÿ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+#, fuzzy
 msgid "View Personal Public Key"
-msgstr ""
+msgstr "Âàøå ïîëíîå èìÿ:"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Ïðîñìîòðåòü ïî òåìàì"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
+#, fuzzy
 msgid "View Thumbnail"
-msgstr ""
+msgstr "Ïðîñìîòðåòü ïî òåìàì"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:423
 #, fuzzy
 msgid "View attachment in a separate window"
 msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Ñîçäàòü ïèñüìà â ðàçíûõ îêíàõ."
+
+#: lib/MIME/Viewer/itip.php:141
 #, fuzzy
 msgid "View event"
 msgstr "Ïðîñìîòð ïðèêðåïëåííîãî ôàéëà"
 
-#: folders.php:346 mailbox.php:500
-#, fuzzy, php-format
+# fuzzy, php-format
+#: folders.php:361 mailbox.php:521
+#, php-format
 msgid "View messages in %s"
-msgstr "Ïðîñìîòð ñîîáùåíèÿ â"
+msgstr "Ïðîñìîòð ñîîáùåíèé â %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Ïðîñìîòð ÿùèêà ïîñëå âõîäà â ñèñòåìó:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:171
 #, fuzzy
 msgid "View task"
 msgstr "Ïðîñìîòð %s"
 
-#: lib/MIME/Viewer/html.php:111
+#: lib/MIME/Viewer/html.php:104
 #, fuzzy
 msgid "View the Images"
 msgstr "Ïðîñìîòð ñîîáùåíèÿ â"
 
-#: search.php:309
+#: search.php:260
 #, fuzzy, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
 
 # fuzzy
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:118 lib/IMAP/Tree.php:308
-#: lib/IMAP/Tree.php:332 lib/IMAP/Tree.php:374
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Âèðòóàëüíûå ïàïêè"
 
-#: search.php:291
+#: search.php:252
+#, fuzzy
 msgid "Virtual Folders require a label."
-msgstr ""
+msgstr "Íàçâàíèå âèðòóàëüíîé ïàïêè"
+
+#: lib/VFolder.php:176 lib/VFolder.php:186 lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Âèðòóàëüíûå Âõîäÿùèå"
+
+# fuzzy
+# fuzzy
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Âèðòóàëüíûå Âõîäÿùèå"
+
+# fuzzy
+# fuzzy
+#: lib/Mailbox.php:156 lib/VFolder.php:111 lib/VFolder.php:123
+#: lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Âèðòóàëüíàÿ êîðçèíà"
 
-#: templates/search/main.inc:133
+# fuzzy
+# fuzzy
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Âèðòóàëüíàÿ êîðçèíà"
+
+#: templates/search/main.inc:128
 msgid "Virtual folder label"
 msgstr "Íàçâàíèå âèðòóàëüíîé ïàïêè"
 
-#: login.php:131
+#: lib/MIME/Viewer/pkcs7.php:379
+#, fuzzy
+msgid "Warning"
+msgstr "Ðàçâåðíóòü âñå"
+
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Äîáðî ïîæàëîâàòü â %s"
 
-#: lib/config/prefs.php:724
+# fuzzy
+# fuzzy
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"×òî äåëàòü ñ ñîîáùåíèåì, ïîñëå òîãî êàê îíî áûëî ïîìå÷åíî êàê ñïàì èëè íå "
+"ñïàì?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4388,66 +5187,99 @@
 "Ïðè óäàëåíèè ñîîáùåíèÿ, ïåðåìåñòèòü åãî â Êîðçèíó, à íå ïîìå÷àòü êàê "
 "óäàëåííîå?"
 
-#: lib/config/prefs.php:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Ïðè îòêðûòèè íîâîãî ÿùèêà, êàêèå ñîîáùåíèÿ îòîáðàçèòü ñðàçó?"
 
-#: lib/config/prefs.php:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Ñîõðàíÿòü âëîæåíèÿ â èñõîäÿùèõ ñîîáùåíèÿõ?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr "Äîìåí ïî óìîë÷àíèþ:"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr ""
 
-#: lib/config/prefs.php:437
-msgid "Wrap text at this many characters."
-msgstr "Àâòîìàòè÷åñêè ïåðåíîñèòü ñòðîêè áîëåå óêàçàííîé äëèííû"
-
-#: templates/compose/compose.inc:531 lib/config/prefs.php:949
+#: templates/compose/compose.inc:539 templates/compose/compose.inc:552
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Äà"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 #, fuzzy
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Âû õîòèòå óäàëèòü ñëåäóþùèå ïàïêè:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Âû õîòèòå óäàëèòü ñëåäóþùèå ïàïêè:"
+# fuzzy
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Âû ïûòàåòåñü óäàëèòü âñå ñîîáùåíèÿ â ñëåäóþùåé ïàïêå:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+# fuzzy
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Âû ïûòàåòåñü óäàëèòü ñëåäóþùèå ïàïêè:"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 #, fuzzy
 msgid "You are copying/moving to a new folder."
 msgstr "Âû ïåðåèìåíîâûâàåòå ïàïêó: "
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:104 templates/folders/javascript.inc:94
 msgid "You are creating a sub-folder to "
 msgstr "Âû ñîçäàåòå âëîæåííóþ ïàïêó â "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:106 templates/folders/javascript.inc:96
 msgid "You are creating a top-level folder."
 msgstr "Âû ñîçäàåòå ïàïêó âåðõíåãî óðîâíÿ."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:315
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Âû ñîçäàåòå ïàïêó âåðõíåãî óðîâíÿ."
+
+#: lib/Folder.php:322
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:137 templates/folders/javascript.inc:127
 msgid "You are renaming the folder: "
 msgstr "Âû ïåðåèìåíîâûâàåòå ïàïêó: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "Âû óñïåøíî îòêàçàëèñü îò ïîäïèñêè íà \"%s\""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr ""
 
-#: lib/Maillog.php:132
-#, php-format
+#: lib/Maillog.php:130
+#, fuzzy, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr ""
+msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
 #: templates/mailbox/alert.inc:3
 #, php-format
@@ -4458,37 +5290,38 @@
 msgid "You have 1 new message."
 msgstr "Äëÿ Âàñ åñòü îäíî íîâîå ñîîáùåíèå."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
+#: compose.php:482
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Äëÿ Âàñ åñòü îäíî íîâîå ñîîáùåíèå."
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1052
 msgid "You have new mail in the following folder:"
 msgstr "Äëÿ Âàñ åñòü ïî÷òà â ñëåäóþùåé ïàïêå:"
 
-#: lib/IMP.php:1008
+#: lib/IMP.php:1057
 msgid "You have new mail in the following folders:"
 msgstr "Äëÿ Âàñ åñòü ïî÷òà â ñëåäóþùèõ ïàïêàõ:"
 
-#: compose.php:127
+#: compose.php:153
 #, fuzzy
 msgid "You must enter at least one recipient."
 msgstr "Âû äîëæíû óêàçàòü ïî êðàéíåé ìåðå îäíîãî ïîëó÷àòåëÿ."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
+"Âû äîëæíû ââåñòè ïàðîëü ñâîåãî ñåêðåòíîãî êëþ÷à äëÿ òîãî ÷òîáû ïðîñìîòðåòü "
+"ñîîáùåíèå"
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Âû äîëæíû óêàçàòü ñíà÷àëà â êàêóþ ïàïêó."
 
@@ -4501,8 +5334,8 @@
 msgid "You must select an address first."
 msgstr "Âû äîëæíû ñíà÷àëà âûáðàòü àäðåñ."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Âû äîëæíû ñíà÷àëà âûáðàòü ïî êðàéíåé ìåðå îäíî ñîîáùåíèå."
 
@@ -4510,173 +5343,199 @@
 msgid "You must specify a recipient."
 msgstr "Âû äîëæíû óêàçàòü ïîëó÷àòåëÿ."
 
-#: templates/compose/attachments.js:29
-#, fuzzy
-msgid "You must specify at least one file to attach."
-msgstr "Ñíà÷àëà óêàæèòå ôàéë, êîòîðûé òðåáóåòñÿ ïðèêðåïèòü."
-
 # php-format
+# fuzzy, php-format
 #: templates/fetchmail/manage.inc:48
-msgid "You need to have '%s' enabled in your maintenance options."
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Âàì íåîáõîäèìî èìåòü âêëþ÷åííîé îïöèþ '%s' â îïåðàöèÿõ îáñëóæèâàíèÿ "
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:138
 #, fuzzy, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
 
-#: lib/Maillog.php:144
-#, fuzzy, php-format
+# fuzzy, php-format
+#: lib/Maillog.php:142
+#, php-format
 msgid "You replied to this message on %s."
-msgstr "Ïåðåíàïðàâèòü ýòî ñîîáùåíèå"
+msgstr "Âû îòâåòèëè íà ýòî ñîîáùåíèå %s"
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Âû íå áûëè ïîäïèñàíû íà \"%s\". Ñåðâåð îòâåòèë"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Âû íå ñìîãëè îêàçàòüñÿ îò ïîäïèñêè íà \"%s\". Ñåðâåð îòâåòèë"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Âû óñïåøíî ïîäïèñàëèñü íà \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Âû óñïåøíî îòêàçàëèñü îò ïîäïèñêè íà \"%s\""
 
-#: templates/pgp/pgp.inc:186
-#, fuzzy
+# fuzzy
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
-msgstr "Âàøå ïîëíîå èìÿ:"
+msgstr "Âàøå èìÿ:"
 
-#: templates/pgp/pgp.inc:119
+# fuzzy
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
-msgstr ""
+msgstr "Âàøè ïóáëè÷íûå/ñåêðåòíûå êëþ÷è PGP"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+# fuzzy
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
-msgstr ""
+msgstr "Âàø ñåêðåòíûé êëþ÷:"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
-#, fuzzy
+# fuzzy
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
-msgstr "Âàøå ïîëíîå èìÿ:"
+msgstr "Âàø ïóáëè÷íûé êëþ÷:"
 
-#: lib/config/prefs.php:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+# fuzzy
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Âàø àäðåñ äëÿ îòâåòà <i>(íå îáÿçàòåëåí)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
-msgstr ""
+msgstr "Âàøè ïóáëè÷íûå/ñåêðåòíûå ñåðòèôèêàòû S/MIME"
 
 # fuzzy
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "Âàøè ïðîôèëè:"
 
-#: lib/config/prefs.php:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
+"Âàøè àäðåñà-ïñåâäîíèìû <em>(íå îáÿçàòåëüíû, êàæäûé ñ íîâîé ñòðîêè)</em>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:101
 #, fuzzy
 msgid "Your browser does not support inline display of this image type."
 msgstr "Âàø áðîóçåð íå ïîääåðæèâàåò îïöèþ ïå÷àòè. Äëÿ ïå÷àòè íàæìèòå CTRL+P."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr "Âàø áðîóçåð íå ïîääåðæèâàåò îïöèþ ïå÷àòè. Äëÿ ïå÷àòè íàæìèòå CTRL+P."
-
-#: lib/config/prefs.php:532
+# fuzzy
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
-msgstr ""
+msgstr "Êîäèðîâêà ïî óìîë÷àíèþ äëÿ èñõîäÿùèõ ñîîáùåíèé:"
 
 #: templates/prefs/encryptselect.inc:1
 msgid "Your default encryption method for sending messages:"
 msgstr "Ìåòîä øèôðîâàíèÿ èñõîäÿùèõ ñîîáùåíèé:"
 
-#: lib/MIME/Viewer/status.php:92
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:89
 #, fuzzy
 msgid "Your message was successfully delivered."
 msgstr "Ïàïêà \"%s\" áûëà óñïåøíî óäàëåíà."
 
-#: lib/config/prefs.php:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Âàøà ïîäïèñü:"
 
-#: message.php:280 compose.php:1194 mailbox.php:515 lib/Compose.php:731
+#: templates/javascript/addressesBlocks.js:7
+#, fuzzy
+msgid "[Hide Addresses]"
+msgstr "Äîìàøíèé àäðåñ"
+
+#: message.php:296 compose.php:1301 mailbox.php:536 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Áåç òåìû]"
 
-#: templates/compose/compose.inc:216
+# fuzzy
+#: templates/javascript/addressesBlocks.js:8
+#, fuzzy
+msgid "[Show Addresses -"
+msgstr "Àäðåñ ïîëó÷àòåëÿ"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr ""
+
+#: templates/compose/compose.inc:205
 #, fuzzy
 msgid "_Bcc"
 msgstr "Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 #, fuzzy
 msgid "_Blacklist"
 msgstr "×åðíûé ñïèñîê"
 
 # fuzzy
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "Êîïèè"
 
 # fuzzy
-#: lib/IMP.php:904
-msgid "_Compose"
-msgstr "Íîâîå ïèñüìî"
-
-# fuzzy
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "Óäàëèòü"
 
-#: lib/IMP.php:906
+#: lib/IMP.php:955
 msgid "_Folders"
 msgstr "Ïàïêè"
 
 # fuzzy
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "Ïðîôèëü"
 
-#: lib/IMP.php:897
+#: lib/IMP.php:924
 msgid "_Inbox"
 msgstr "Âõîäÿùèå"
 
 # fuzzy
-#: lib/IMP.php:947
+#: lib/IMP.php:996
 msgid "_Log out"
 msgstr "Âûõîä"
 
 # fuzzy
-#: message.php:376
+#: message.php:392
 msgid "_Message Source"
 msgstr "Èñõîäíèê "
 
 # fuzzy
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:952
+msgid "_New Message"
+msgstr "Íàïèñàòü"
+
+# fuzzy
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "Ïå÷àòü"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+#, fuzzy
 msgid "_Priority"
-msgstr ""
+msgstr "Ïå÷àòü"
 
-#: mailbox.php:389
+#: mailbox.php:405
 #, fuzzy, php-format
 msgid "_Refresh %s"
 msgstr "Îáíîâèòü"
@@ -4687,91 +5546,174 @@
 msgstr "Îòâåòèòü"
 
 # fuzzy
-#: lib/IMP.php:908
+#: lib/IMP.php:957
 msgid "_Search"
 msgstr "Ïîèñê"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 #, fuzzy
 msgid "_Send Message"
 msgstr "Îòïðàâèòü ñîîáùåíèå"
 
 # fuzzy
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "ïî òåìàì"
 
 # fuzzy
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "Êîìó"
 
+# fuzzy
 #: templates/mailbox/actions.inc:13
-#, fuzzy
 msgid "_Undelete"
 msgstr "Âîññòàíîâèòü"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "Ïî òåìàì"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr ""
 
-#: lib/Compose.php:344
+#: lib/Compose.php:175
+#, fuzzy
+msgid "addressee unknown"
+msgstr "Àäðåñíàÿ êíèãà"
+
+#: lib/Compose.php:451
 #, fuzzy
 msgid "attachment"
 msgstr "Ïðèêðåïëÿåìîå"
 
-#: view.php:102
+#: view.php:97
 #, fuzzy
 msgid "attachments.zip"
 msgstr "Ïðèêðåïëåííûå"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:507
 msgid "bytes"
 msgstr "áàéò"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:223
+#, fuzzy
+msgid "entry not found"
+msgstr "Îòìåíèòü èçìåíåíèÿ"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "îò"
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr ""
 
-#: folders.php:151
+#: folders.php:145
 #, fuzzy
 msgid "mailbox file"
 msgstr "ßùèêè"
 
-#: compose.php:976 lib/Message.php:452
+#: compose.php:1105 lib/Message.php:515
 #, fuzzy
 msgid "name"
 msgstr "Èìÿ"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "íåò"
 
-#: templates/compose/spelling.inc:90
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "èëè"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:215
+#, fuzzy
+msgid "permission denied"
+msgstr ""
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"#-#-#-#-#  compendium.po (IMP H3 v4.0.4)  #-#-#-#-#\n"
+"Íàñòðîéêè ïîëüçîâàòåëÿ\n"
+"#-#-#-#-#  ru_RU.po (Nag H3 (2.0.3))  #-#-#-#-#\n"
+"Èçìåíèòü ïðàâà äîñòóïà\n"
+"#-#-#-#-#  ru_RU.po (Nag H3 (2.0.3))  #-#-#-#-#\n"
+"Èçìåíèòü ïðàâà äîñòóïà"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr ""
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:183
+#, fuzzy
+msgid "service unavailable"
+msgstr "Íåò äîñòóïíûõ íàñòðîåê."
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "îðôîãðàôè÷åñêàÿ îøèáêà"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "îðôîãðàôè÷åñêèå îøèáêè"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:191
+#, fuzzy
+msgid "system error"
+msgstr "îðôîãðàôè÷åñêàÿ îøèáêà"
+
+#: lib/Compose.php:207
+#, fuzzy
+msgid "temporary failure"
+msgstr "Ïîèñê"
+
+#: lib/Filter.php:79
 #, fuzzy
 msgid "your blacklist"
 msgstr "×åðíûé ñïèñîê"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:89
+#, fuzzy
 msgid "your whitelist"
-msgstr ""
+msgstr "Ðåäàêòèðîâàíèå Âàøèõ ïðàâèë ôèëüòðàöèè"


--- orig/docs/INSTALL
+++ mod/docs/INSTALL
@@ -1,9 +1,9 @@
 ====================
- Installing IMP 4.0
+ Installing IMP 4.1
 ====================
 
-:Last update:   $Date: 2005/08/23 12:23:31 $
-:Revision:      $Revision: 1.57.6.8 $
+:Last update:   $Date: 2006/02/05 07:17:14 $
+:Revision:      $Revision: 1.57.6.13 $
 :Contact:       imp at lists.horde.org
 
 .. contents:: Contents
@@ -75,6 +75,8 @@
 
       IMP **requires** IMAP and POP3 support in PHP, and can use IMAP-SSL and
       POP3-SSL if available (see the ``--with-imap-ssl`` configure option).
+      If using either TLS or SSL to connect to the IMAP/POP server, OpenSSL
+      support is **required** in PHP. See `OpenSSL Support`_ below.
 
       .. Tip:: If you notice strange behavior when running IMP (e.g. blank
                screens when accessing certain messages, blank message bodies)
@@ -123,11 +125,16 @@
    The following PHP options are **RECOMMENDED** to enable advanced features in
    IMP:
 
+.. _`OpenSSL Support`:
+
    a. OpenSSL support ``--with-openssl``
 
       The OpenSSL module is used by IMP to provide S/MIME functionality.
       Without the module, S/MIME options will be disabled.
 
+      Additionally, the OpenSSL module is REQUIRED if using either TLS or SSL
+      to connect to the IMAP/POP server.
+
       See http://www.php.net/openssl for information on compiling OpenSSL
       into PHP.
 
@@ -138,6 +145,11 @@
 
       HTTP_Request is required to use the HTML composition mode.
 
+   b. Auth_SASL [OPTIONAL]
+
+      Auth_SASL is required if your IMAP server uses CRAM-MD5 or DIGEST-MD5
+      authentication.
+
 4. At least one IMAP or POP3 server.
 
    While IMP is an application that is installed on a Web server and is run
@@ -146,9 +158,9 @@
    multiple servers) on which your users' mail is stored in order to use IMP.
 
    IMAP is recommended over POP3 in order to let users maintain mail folders
-   other than INBOX.  IMAP is also *much* faster than POP3 in displaying a
-   mailbox of messages.  In short, do not use POP3 unless IMAP is not
-   available.
+   other than INBOX and is required to allow messages to be flagged. IMAP is
+   also *much* faster than POP3 in displaying a mailbox of messages.  In
+   short, do not use POP3 unless IMAP is not available.
 
    Freely available IMAP servers (for \*nix systems) that have been verified
    to work with IMP include:
@@ -333,7 +345,7 @@
 
 2. Configuring IMP
 
-   To configure IMP, change to the ``config/`` directory of the installed
+   To configure IMP, change to the ``imp/config/`` directory of the installed
    distribution, and make copies of all of the configuration ``dist`` files
    without the ``dist`` suffix::
 
@@ -374,7 +386,7 @@
    IMP Configuration Pointers
 
    * If you would like IMP to scan all text messages for UUencoded data, you
-     must make change this line in ``imp/config/mime_drivers.php``::
+     must make this change in ``imp/config/mime_drivers.php``::
 
      $mime_drivers['imp']['plain']['uuencode'] = true;
 
@@ -382,6 +394,13 @@
      scanned in its entriety to look for uuencoded data.  Therefore, this
      feature is disabled by default.
 
+   * By default, IMP is configured to NOT display text/html message parts
+     inline.  This is done for various security reasons.  If you would like
+     to see text/html parts inline, you must make this change in
+     ``imp/config/mime_drivers.php``::
+
+     $mime_drivers['imp']['html']['inline'] = true;
+
 3. Securing IMP
 
    Before you can secure IMP, you need a secure Horde installation.  Please
@@ -423,7 +442,7 @@
    Once you have configured IMP, bring up the included test page in your Web
    browser to ensure that all necessary prerequisites have been met.  See the
    `horde/docs/INSTALL`_ document for further details on Horde test
-   scripts. vIf you installed IMP as described above, the URL to the test page
+   scripts. If you installed IMP as described above, the URL to the test page
    would be::
 
       http://your-server/horde/imp/test.php
@@ -431,7 +450,7 @@
    The test script will also allow you to test your connection to the mail
    server and provide some auto-detected configuration parameters that can
    then be inserted into the server configuration located in
-   config/servers.php.
+   ``imp/config/servers.php``.
 
    Next, use IMP to login to a known working IMAP or POP3 server.  Test at
    least the following:
@@ -440,7 +459,9 @@
    - Setting preferences (check to see if they survive after logging out and
      back in, if you are using an SQL or LDAP preferences system).
    - Reading mail.
-   - Changing folders.
+   - Deleting mail.
+   - Flagging mail (if using IMAP).
+   - Changing folders (if using IMAP).
 
 5. Tuning IMP (Performance)
 


--- orig/docs/CREDITS
+++ mod/docs/CREDITS
@@ -2,37 +2,17 @@
  IMP Development Team
 ======================
 
-:Last update:   $Date: 2005/10/14 15:45:13 $
-:Revision:      $Revision: 1.83.2.15 $
+:Last update:   $Date: 2006/03/27 07:31:49 $
+:Revision:      $Revision: 1.83.2.23 $
 :Contact:       imp at lists.horde.org
 
 
 Core Developers
 ===============
 
-Chuck Hagenbuch <chuck at horde.org>
-
-- original IMP design and programming
-- stuff
-
-Jon Parise <jon at csh.rit.edu>
-
-- preferences subsystem
-- help subsystem
-- documentation
-- general code maintenance
-- stuff
-
-Jan Schneider <jan at horde.org>
-
-- identities
-- code maintenance
-- stuff
-
-Michael Slusarz <slusarz at curecanti.org>
-
-- MIME support, PGP
-- stuff
+- Chuck Hagenbuch <chuck at horde.org>
+- Jan Schneider <jan at horde.org>
+- Michael Slusarz <slusarz at curecanti.org>
 
 
 Localization
@@ -45,7 +25,7 @@
                         Vedran Ljubovic <vljubovic at smartnet.ba>
 Brazilian Portuguese    <hostmaster at sbs.srv.br>
                         Antonio Dias <accdias at sst.com.br>
-                        Fabio Gomes <flgomes at fazenda.sp.gov.br>
+                        Fabio Gomes <flgoms at uol.com.br>
 Bulgarian               Miroslav Pendev <pendev at hotmail.com>
 Catalan                 Angels Guimerà <angels.Guimera at uab.es>
 Chinese (Simplified)    WangHengWen <whw at my169.com>
@@ -56,6 +36,7 @@
                         Brian Truelsen <horde+i18n at briantruelsen.dk>
 Dutch                   Jan Kuipers <jrkuipers at lauwerscollege.nl>
                         Peter Arien <peter.arien at cc.kuleuven.ac.be>
+                        Han Spruyt <han.spruyt at ijsselgroep.nl>
 Estonian                Toomas Aas <toomas.aas at raad.tartu.ee>
 Finnish                 Leena Heino <liinu at uta.fi>
 French                  Christophe Ruelle <ruelle at echo.fr>
@@ -69,6 +50,8 @@
 Greek                   Stefanos I. Dimitriou <support at teiath.gr>
                         Silligardos Xristoforos
                         Anagnostopoulos Apostolis
+                        Konstantinos C. Milosis <kmilosis at yahoo.com>
+Hebrew                  Matt Selsky <selsky at columbia.edu>
 Hungarian               Laszlo L. Tornoci <torlasz at xenia.sote.hu>
 Icelandic               Bjorn Davidsson <bjossi at snerpa.is>
 Indonesian              Slamin <slamin at unej.ac.id>
@@ -78,6 +61,7 @@
 Japanese                B.J. Black <william.black at sun.com>
                         Takeshi Morishima <tm at onepost.net>
                         Hiromi Kimura <hiromi at tac.tsukuba.ac.jp>
+Khmer                   Leang Chumsoben <soben at khmeros.info>
 Korean                  J.I Kim <aporie at netian.com>
                         Jinhyok Heo <novembre at ournature.org>
 Latvian                 Kaspars Kapenieks <kaspars at rcc.lv>
@@ -91,14 +75,16 @@
                         Andreas Gunleikskaas <andreas at gunleikskaas.no>
                         Trond Bjørstad <trb at ndn.no>
                         Thomas Chr. Dahl <tcd at ndn.no>
+                        Geir O. Hogberg <horde at skydiver.no>
 Norwegian Nynorsk       Per-Stian Vatne <psv at orsta.org>
-Persian (Western)       MetaNET Amirkabir <persian-horde at metanetworking.com>
+Persian                 MetaNET Amirkabir <persian-horde at metanetworking.com>
 Polish                  Mariusz Zynel <mariusz at math.uwb.edu.pl>
                         Piotr Roszatycki <dexter at debian.org>
                         Przemyslaw "Primo" Witek <primo at npl.pl>
                         Mateusz Kaminski <matipl at pld-linux.org>
                         Krzysztof Kozlowski <kozik1 at o2.pl>
 Portuguese              Nuno Loureiro <nuno at eth.pt>
+                        Manuel Menezes de Sequeira <Manuel.Sequeira>
 Romanian                Corneliu Musat <cmusat at tiamat.keysys.ro>
 Russian                 Anton Nekhoroshih <anton at valuehost.ru>
                         Fedor A. Fetisov <faf at ssc.ru>
@@ -107,10 +93,10 @@
                         Ivan Noris <noris at bgs.sk>
 Slovenian               Jure Krasovic <jurek at rcc-irc.si>
                         Matic Dolar <matic at medium.si>
-                        Robert Ludvik <r at aufbix.org>
 Spanish                 Raul Alvarez Venegas <rav at tecoman.ucol.mx>
                         Manuel Perez Ayala <mperaya at alcazaba.unex.es>
 Swedish                 Andreas Dahlén <andreas at dahlen.ws>
+                        Joaquim Homrighausen <joho at webbplatsen.se>
 Thai                    Surasak Srisawan <surasak at rirc.ac.th>
 Turkish                 Genco Yilmaz <gencoyilmaz at yahoo.com>
                         Istanbul Technical University IT Department
@@ -121,27 +107,14 @@
 =====================   ======================================================
 
 
-Cool Stuff
-==========
-
-Chris Hyde <chris at jeks.net>
-
-- Interactive Spell Checker
-
-
 Inactive Developers
 ===================
 
+- Jon Parise <jon at csh.rit.edu>
 - Mike Cochrane <mike at graftonhall.co.nz>
-
-  - S/MIME
-
 - Anil Madhavapeddy <anil at recoil.org>
-
-  - navigator
-  - to quote Chuck: 'stuff'
-
 - Jason Orcutt <zerodiv at zerodivide.net>
 - Brian Jones <cbj at gnu.org>
 - Mike Hardy <mike at itsprojects.com>
 - Ivan E. Moore II <rkrusty at tdyc.com>
+- Chris Hyde <chris at jeks.net> (Interactive Spell Checker)


--- orig/acl.php
+++ mod/acl.php
@@ -1,19 +1,18 @@
 <?php
 /**
- * $Horde: imp/acl.php,v 1.23.10.2 2005/08/24 13:15:22 selsky Exp $
+ * $Horde: imp/acl.php,v 1.23.10.7 2006/01/01 21:28:49 jan Exp $
  *
- * Copyright 2000-2005 Chris Hastie <imp at oak-wood.co.uk>
+ * Copyright 2000-2006 Chris Hastie <imp at oak-wood.co.uk>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
-define('IMP_BASE', dirname(__FILE__));
+ at define('IMP_BASE', dirname(__FILE__));
 $authentication = OP_HALFOPEN;
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Folder.php';
 require_once 'Horde/IMAP/ACL.php';
-require_once 'Horde/Prefs/UI.php';
 
 $prefs_url = IMP::prefsURL(true);
 
@@ -73,7 +72,7 @@
         $ok_form = false;
     }
     if (in_array($share_user, $protected)) {
-        $notification->push(_("Permissions for this user can not be changed."), 'horde.error');
+        $notification->push(_("Permissions for this user cannot be changed."), 'horde.error');
         $ok_form = false;
     }
 
@@ -99,7 +98,7 @@
         $ok_form = false;
     }
     if (in_array($share_user, $protected)) {
-        $notification->push(_("Permissions for this user can not be changed."), 'horde.error');
+        $notification->push(_("Permissions for this user cannot be changed."), 'horde.error');
         $ok_form = false;
     }
 
@@ -136,7 +135,7 @@
         foreach (array_keys($rights) as $right) {
             $js_right[$right] = '';
         }
-        
+
         foreach ($curr_acl as $curr_user => $granted) {
             if (strlen($js_user) > 0) {
                 $js_user .= ', ';
@@ -144,9 +143,9 @@
                     $js_right[$right] .= ', ';
                 }
             }
-            
+
             $js_user .= '"' . $curr_user . '"';
-            
+
             foreach (array_keys($rights) as $right) {
                 $js_right[$right] .= (empty($granted[$right])) ? '"0"' : '"1"';
             }


--- orig/locale/pt_PT/help.xml
+++ mod/locale/pt_PT/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/pt_PT/help.xml,v 1.16.6.1 2005/01/25 22:05:51 jan Exp $ -->
+<!-- $Horde: imp/locale/pt_PT/help.xml,v 1.16.6.5 2006/03/23 00:24:09 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/mailbox.php
+++ mod/mailbox.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/mailbox.php,v 2.617.4.21 2005/08/15 22:01:19 jan Exp $
+ * $Horde: imp/mailbox.php,v 2.617.4.58 2006/04/10 14:51:50 chuck Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -18,11 +18,9 @@
 
     if (!empty($indices)) {
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->delete($indices);
 
-        /* For POP3, redirect so that refreshing the page doesn't delete more
-           messages accidentally. */
         if ($imp['base_protocol'] == 'pop3') {
             header('Location: ' . Horde::url($mailbox_url, true));
             exit;
@@ -59,7 +57,7 @@
 {
     $template = &new Horde_Template();
     $template->set('idx_separator', IMP_IDX_SEP);
-    $template->set('search_mbox', $search_mbox, true);
+    $template->set('search_mbox', (bool) $search_mbox, true);
     $template->set('messages', $msgs, true);
 
     // Some browsers have trouble with hidden overflow in table cells
@@ -74,27 +72,6 @@
     echo $template->fetch(IMP_TEMPLATES . '/mailbox/mailbox.html');
 }
 
-/**
- * Utility function to return a url for the various images.
- *
- * @param string $name  Image filename.
- *
- * @return string  Link to the folder image.
- */
-function _image($name)
-{
-    global $graphicsdir;
-    static $cache = array();
-
-    if (!empty($cache[$name])) {
-        return $cache[$name];
-    }
-
-    $cache[$name] = Horde::img('tree/' . $name, '', 'style="vertical-align:middle"', $graphicsdir);
-
-    return $cache[$name];
-}
-
 $do_filter = false;
 $open_compose_window = false;
 $set = false;
@@ -119,7 +96,7 @@
         $redirect = call_user_func('_imp_hook_mbox_redirect', $imp['mailbox']);
         if (!empty($redirect)) {
             $redirect = Horde::applicationUrl($redirect, true);
-            header("Location: " . $redirect);
+            header('Location: ' . $redirect);
             exit;
         }
     }
@@ -128,8 +105,12 @@
 /* There is a chance that this page is loaded directly via
  * message.php. If so, don't re-include config files, and the
  * following variables will already be set: $actionID, $start. */
-if (!isset($from_message_page)) {
+if (isset($from_message_page)) {
+    $mailbox_url = Horde::applicationURL('mailbox.php');
+} else {
+    $mailbox_url = Horde::selfUrl();
     $actionID = Util::getFormData('actionID');
+    $start = Util::getFormData('start');
 }
 
 if ($actionID == 'login_compose') {
@@ -153,31 +134,28 @@
 /* Initialize the user's identities. */
 $identity = &Identity::singleton(array('imp', 'imp'));
 
-/* Get the base URL for this page. */
-if (isset($from_message_page)) {
-    $mailbox_url = Horde::applicationURL('mailbox.php');
-} else {
-    $mailbox_url = Horde::selfUrl();
-}
-
-/* Check for 'sortby' and 'sortdir' changes. */
-if (($sortby = Util::getFormData('sortby')) !== null) {
-    $prefs->setValue('sortby', $sortby);
-}
-if (($sortdir = Util::getFormData('sortdir')) !== null) {
-    $prefs->setValue('sortdir', $sortdir);
-}
-
 /* Run through the action handlers */
 switch ($actionID) {
+case 'change_sort':
+    if (($sortby = Util::getFormData('sortby')) !== null) {
+        $prefs->setValue('sortby', $sortby);
+    }
+    if (($sortdir = Util::getFormData('sortdir')) !== null) {
+        $prefs->setValue('sortdir', $sortdir);
+    }
+    $imp_mailbox = &IMP_Mailbox::singleton(null, true);
+    break;
+
 case 'blacklist':
     require_once IMP_BASE . '/lib/Filter.php';
-    IMP_Filter::blacklistMessage($indices_mbox);
+    $imp_filter = &IMP_Filter::singleton();
+    $imp_filter->blacklistMessage($indices_mbox);
     break;
 
 case 'whitelist':
     require_once IMP_BASE . '/lib/Filter.php';
-    IMP_Filter::whitelistMessage($indices_mbox);
+    $imp_filter = &IMP_Filter::singleton();
+    $imp_filter->whitelistMessage($indices_mbox);
     break;
 
 case 'spam_report':
@@ -188,7 +166,8 @@
     $imp_spam->reportSpam($indices_mbox, $action);
 
     /* Delete spam after report. */
-    if (($action == 'spam') && $prefs->getValue('delete_spam_after_report')) {
+    $delete_spam = $prefs->getValue('delete_spam_after_report');
+    if (($action == 'spam') && ($delete_spam == 1)) {
         if (_deleteMessages($indices_mbox)) {
             if (count($indices) == 1) {
                 $notification->push(_("1 message has been deleted."), 'horde.message');
@@ -197,6 +176,11 @@
                                             count($indices)), 'horde.message');
             }
         }
+    } elseif ($delete_spam == 2) {
+        $targetMbox = ($action == 'spam') ? IMP::folderPref($prefs->getValue('spam_folder'), true) : 'INBOX';
+        require_once IMP_BASE . '/lib/Message.php';
+        $imp_message = &IMP_Message::singleton();
+        $imp_message->copy($targetMbox, IMP_MESSAGE_MOVE, $indices_mbox);
     }
     break;
 
@@ -205,8 +189,7 @@
     break;
 
 case 'fwd_digest':
-    $options['fwddigest'] = serialize($indices);
-    $options['actionID'] = 'fwd_digest';
+    $options = array('fwddigest' => serialize($indices), 'actionID' => 'fwd_digest');
     $open_compose_window = IMP::openComposeWin($options);
     break;
 
@@ -217,7 +200,7 @@
 case 'undelete_messages':
     if (!empty($indices_mbox)) {
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->undelete($indices_mbox);
     }
     break;
@@ -226,18 +209,23 @@
 case 'copy_messages':
     if (!empty($indices) && !empty($targetMbox)) {
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $action = ($actionID == 'move_messages') ? IMP_MESSAGE_MOVE : IMP_MESSAGE_COPY;
 
         if ($conf['tasklist']['use_tasklist'] &&
             (strpos($targetMbox, '_tasklist_') === 0)) {
             /* If the target is a tasklist, handle the move/copy specially. */
             $tasklist = str_replace('_tasklist_', '', $targetMbox);
-            $imp_message->createTasks($tasklist, $action, $indices_mbox);
+            $imp_message->createTasksOrNotes($tasklist, $action, $indices_mbox, 'task');
+        } elseif ($conf['notepad']['use_notepad'] &&
+            (strpos($targetMbox, '_notepad_') === 0)) {
+            /* If the target is a notepad, handle the move/copy specially. */
+            $notepad = str_replace('_notepad_', '', $targetMbox);
+            $imp_message->createTasksOrNotes($notepad, $action, $indices_mbox, 'note');
         } else {
             /* Otherwise, the target is a standard mailbox. */
             if (!empty($newMbox) && ($newMbox == 1)) {
-                $new_mailbox = IMP::addPreambleString(String::convertCharset($targetMbox, $charset, 'UTF7-IMAP'));
+                $new_mailbox = String::convertCharset(IMP::folderPref($targetMbox, true), $charset, 'UTF7-IMAP');
 
                 require_once IMP_BASE . '/lib/Folder.php';
                 $imp_folder = &IMP_Folder::singleton();
@@ -254,7 +242,7 @@
 case 'flag_messages':
     $flag = Util::getPost('flag');
     if (!empty($indices) && !empty($flag)) {
-        if ($flag[0] == '0') {
+        if ($flag{0} == '0') {
             $_POST['flag'] = '\\' . substr($flag, 1);
             $set = false;
         } else {
@@ -262,7 +250,7 @@
             $set = true;
         }
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->flag($_POST['flag'], $indices_mbox, $set);
     }
     break;
@@ -273,7 +261,7 @@
 
 case 'expunge_mailbox':
     require_once IMP_BASE . '/lib/Message.php';
-    $imp_message = &new IMP_Message();
+    $imp_message = &IMP_Message::singleton();
     $imp_message->expungeMailbox(array($imp['mailbox']));
     break;
 
@@ -283,18 +271,21 @@
 
 case 'empty_mailbox':
     require_once IMP_BASE . '/lib/Message.php';
-    $mbox = Util::getFormData('thismailbox', $imp['mailbox']);
-    $imp_message = &new IMP_Message();
-    $imp_message->emptyMailbox(array($mbox));
-    if ($url = Util::getFormData('return_url')) {
-        header('Location: ' . str_replace('&amp;', '&', $url));
-        exit;
-    }
+    $imp_message = &IMP_Message::singleton();
+    $imp_message->emptyMailbox(array($imp['mailbox']));
+    break;
+
+case 'view_messages':
+    require_once 'Horde/SessionObjects.php';
+    $cacheSess = &Horde_SessionObjects::singleton();
+    $redirect = Util::addParameter(Horde::applicationUrl('thread.php', true), array('mode' => 'msgview', 'msglist' => $cacheSess->storeOid($indices_mbox)), null, false);
+    header("Location: " . $redirect);
+    exit;
     break;
 }
 
 /* Is this a search mailbox? */
-$search_mbox = ($imp['mailbox'] == IMP_SEARCH_MBOX);
+$search_mbox = $imp_search->searchMboxID();
 
 /* Deal with filter options. */
 if ($imp['filteravail']) {
@@ -310,53 +301,51 @@
 /* Run filters now. */
 if ($do_filter) {
     require_once IMP_BASE . '/lib/Filter.php';
-    IMP_Filter::filter($imp['mailbox']);
+    $imp_filter = &IMP_Filter::singleton();
+    $imp_filter->filter($imp['mailbox']);
 }
 
 /* Generate folder options list. */
 if ($conf['user']['allow_folders']) {
-    $folder_options = IMP::flistSelect(_("Messages to"), true, array(null, $imp['mailbox']), null, true, true);
-}
-
-/* Get the start index. It may already be set from message.php. */
-if (!isset($from_message_page)) {
-    $start = Util::getFormData('start');
+    $folder_options = IMP::flistSelect(_("Messages to"), true, array(), null, true, true, false, true);
 }
 
 /* Build the list of messages in the mailbox. */
 if (!isset($imp_mailbox)) {
-    $imp_mailbox = &new IMP_Mailbox();
+    $imp_mailbox = &IMP_Mailbox::singleton();
 }
+$imp_mailbox->setNoNewmailPopup(Util::getFormData('no_newmail_popup'));
 $pageOb = $imp_mailbox->buildMailboxPage(Util::getFormData('page'), $start);
+$mailboxOverview = $imp_mailbox->buildMailboxArray($pageOb->begin, $pageOb->end);
 
 /* Cache this value since we use it alot on this page. */
 $graphicsdir = $registry->getImageDir('horde');
 
 /* Generate First/Previous page links. */
 if ($pageOb->page == 1) {
-    $pages_first = Horde::img('nav/first-grey.png', '', 'width="16" height="16" align="middle"', $graphicsdir);
-    $pages_prev = Horde::img('nav/left-grey.png', '', 'width="16" height="16" align="middle"', $graphicsdir);
+    $pages_first = Horde::img('nav/first-grey.png', null, null, $graphicsdir);
+    $pages_prev = Horde::img('nav/left-grey.png', null, null, $graphicsdir);
 } else {
     $first_url = Util::addParameter($mailbox_url, 'page', 1);
-    $pages_first = Horde::link($first_url, _("First Page")) . Horde::img('nav/first.png', '<<', array('title' => _("First Page"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $graphicsdir) . '</a>';
+    $pages_first = Horde::link($first_url, _("First Page")) . Horde::img('nav/first.png', '<<', null, $graphicsdir) . '</a>';
     $prev_url = Util::addParameter($mailbox_url, 'page', $pageOb->page - 1);
-    $pages_prev = Horde::link($prev_url, _("Previous Page"), '', '', '', '', '', array('id' => 'prev')) . Horde::img('nav/left.png', '<', array('title' => _("Previous Page"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $graphicsdir) . '</a>';
+    $pages_prev = Horde::link($prev_url, _("Previous Page"), '', '', '', '', '', array('id' => 'prev')) . Horde::img('nav/left.png', '<', null, $graphicsdir) . '</a>';
 }
 
 /* Generate Next/Last page links. */
 if ($pageOb->page == $pageOb->pagecount) {
-    $pages_last = Horde::img('nav/last-grey.png', '', 'width="16" height="16" align="middle"', $graphicsdir);
-    $pages_next = Horde::img('nav/right-grey.png', '', 'width="16" height="16" align="middle"', $graphicsdir);
+    $pages_last = Horde::img('nav/last-grey.png', null, null, $graphicsdir);
+    $pages_next = Horde::img('nav/right-grey.png', null, null, $graphicsdir);
 } else {
     $next_url = Util::addParameter($mailbox_url, 'page', $pageOb->page + 1);
-    $pages_next = Horde::link($next_url, _("Next Page"), '', '', '', '', '', array('id' => 'next')) . Horde::img('nav/right.png', '>', array('title' => _("Next Page"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $graphicsdir) . '</a>';
+    $pages_next = Horde::link($next_url, _("Next Page"), '', '', '', '', '', array('id' => 'next')) . Horde::img('nav/right.png', '>', null, $graphicsdir) . '</a>';
     $last_url = Util::addParameter($mailbox_url, 'page', $pageOb->pagecount);
-    $pages_last = Horde::link($last_url, _("Last Page")) . Horde::img('nav/last.png', '>>', array('title' => _("Last Page"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $graphicsdir) . '</a>';
+    $pages_last = Horde::link($last_url, _("Last Page")) . Horde::img('nav/last.png', '>>', null, $graphicsdir) . '</a>';
 }
 
 /* Determine if we are going to show the Hide/Purge Deleted Message links. */
 $showdelete = $imp_mailbox->showDeleteLinks();
-if ($showdelete && !$prefs->isLocked('delhide')) {
+if ($showdelete['hide'] && !$prefs->isLocked('delhide')) {
     if ($prefs->getValue('delhide')) {
         $deleted_prompt = _("Show Deleted");
     } else {
@@ -391,11 +380,24 @@
     $strip_preview = $prefs->getValue('preview_strip_nl');
 }
 
-
+$vtrash = null;
 if ($search_mbox) {
     $unread = 0;
+    if ($imp_search->isVINBOXFolder()) {
+        $unread = $imp_mailbox->getMessageCount();
+    } elseif ($imp_search->isVTrashFolder()) {
+        $vtrash = IMP_SEARCH_MBOX . $search_mbox;
+    }
 } else {
-    $unread = $imp_mailbox->unseenMessageCount();
+    $unread = count($imp_mailbox->unseenMessages());
+}
+
+/* Play audio. */
+if ($prefs->getValue('nav_audio') &&
+    ($newmsgs = $imp_mailbox->newMessageCount()) &&
+    ($newmsgs > 0) &&
+    !Util::getFormData('no_newmail_popup')) {
+    $notification->push($registry->getImageDir() . '/audio/theetone.wav', 'audio');
 }
 
 $title = IMP::getLabel();
@@ -426,13 +428,11 @@
     }
 }
 
-/* Build the array of message information. */
-$mailboxOverview = $imp_mailbox->buildMailboxArray($pageOb->begin, $pageOb->index, $pageOb->end, $imp_mailbox->getSorted(), $imp_mailbox->getSortedMbox());
-
 /* Are we currently in the trash mailbox? */
-$preamble = IMP::preambleString();
 $use_trash = $prefs->getValue('use_trash');
-$trashMbox = ($use_trash && ($imp['mailbox'] == ($preamble . $prefs->getValue('trash_folder'))));
+$use_vtrash = $prefs->getValue('use_vtrash');
+$trashMbox = ($use_trash && ($imp['mailbox'] == (IMP::folderPref($prefs->getValue('trash_folder'), true)))) ||
+             ($use_vtrash && !is_null($vtrash));
 
 /* Show the [black|white]list link if we have functionality enabled. */
 $show_blacklist_link = $registry->hasMethod('mail/blacklistFrom');
@@ -472,6 +472,9 @@
    foreach() loop or the templates. */
 $curr_time = time();
 $curr_time -= $curr_time % 60;
+$ltime_val = localtime();
+$today_start = mktime(0, 0, 0, $ltime_val[4] + 1, $ltime_val[3], 1900 + $ltime_val[5]);
+$today_end = $today_start + 86400;
 $drafts_sm_folder = $imp_mailbox->isSpecialFolder();
 $lastMbox = '';
 $messages = array();
@@ -485,7 +488,11 @@
 /* Get thread object, if necessary. */
 if ($thread_sort) {
     $threadob = $imp_mailbox->getThreadOb();
-    $last_level = $last_thread = null;
+    $uid_list = array();
+    foreach ($mailboxOverview as $val) {
+        $uid_list[] = $val['header']->uid;
+    }
+    $threadtree = $threadob->getThreadImageTree($uid_list, $sortdir);
 }
 
 /* Don't show header row if this is a search mailbox or if no messages in the
@@ -519,7 +526,7 @@
 
     /* Initialize the header fields. */
     $msg = array(
-        'color' => (isset($message['color'])) ? $message['color'] : '',
+        'color' => (isset($message['color'])) ? htmlspecialchars($message['color']) : '',
         'date' => '&nbsp;',
         'from' => '&nbsp;',
         'mbox' => $message['mbox'],
@@ -540,25 +547,29 @@
     $messages[] = $h->uid;
 
     /* Formats the header date string nicely. */
-    if (empty($h->date) || (($udate = strtotime($h->date, $curr_time)) == -1)) {
+    if (empty($h->date)) {
+        $udate = false;
+    } else {
+        $h->date = preg_replace('/\s+\(\w+\)$/', '', $h->date);
+        $udate = strtotime($h->date, $curr_time);
+    }
+    if ($udate === false || $udate === -1) {
         $msg['date'] = _("Unknown Date");
+    } elseif (($udate < $today_start) || ($udate > $today_end)) {
+        /* Not today, use the date. */
+        $msg['date'] = strftime($datefmt, $udate);
     } else {
-        if ((date('Y') != @date('Y', $udate)) ||
-            (date('M') != @date('M', $udate)) ||
-            (date('d') != @date('d', $udate))) {
-            /* Not today, use the date. */
-            $msg['date'] = strftime($datefmt, $udate);
-        } else {
-            /* Else, it's today, use the time. */
-            $msg['date'] = strftime($timefmt, $udate);
-        }
+        /* Else, it's today, use the time. */
+        $msg['date'] = strftime($timefmt, $udate);
     }
 
     /* Format the from header. */
     if (isset($h->from)) {
         $from_adr = IMP::bareAddress($h->from);
-        $from_ob = imap_rfc822_parse_adrlist($h->from, '');
-        $from_ob = array_shift($from_ob);
+        $from_ob = IMP::parseAddressList($h->from, '');
+        if (!is_a($from_ob, 'PEAR_Error')) {
+            $from_ob = array_shift($from_ob);
+        }
         if (is_null($from_adr)) {
             $msg['from'] = _("Invalid Address");
             $showfromlink = false;
@@ -568,14 +579,19 @@
                     $msg['from'] = _("Undisclosed Recipients");
                     $showfromlink = false;
                 } else {
-                    $tmp = imap_rfc822_parse_adrlist($h->to, '');
-                    $tmp = array_shift($tmp);
+                    $tmp = IMP::parseAddressList($h->to, '');
+                    if (!is_a($tmp, 'PEAR_Error')) {
+                        $tmp = array_shift($tmp);
+                    }
                     if (isset($tmp->personal)) {
-                        $msg['from'] = MIME::decode($tmp->personal, $charset);
+                        $msg['from'] = stripslashes(MIME::decode($tmp->personal, $charset));
                     } else {
                         $msg['from'] = IMP::bareAddress($h->to);
                     }
                     $msg['fullfrom'] = MIME::decode($h->to, $charset);
+                    if (empty($msg['from'])) {
+                        $msg['from'] = $msg['fullfrom'];
+                    }
                 }
             } else {
                 $msg['from'] = _("Undisclosed Recipients");
@@ -586,7 +602,7 @@
             }
             $mailto_link = true;
         } elseif (isset($from_ob->personal)) {
-            $msg['from'] = trim(MIME::decode($from_ob->personal, $charset), '"');
+            $msg['from'] = trim(stripslashes(MIME::decode($from_ob->personal, $charset)), '"');
             if (!trim($msg['from'], chr(160) . ' ')) {
                 $msg['from'] = $from_adr;
             }
@@ -650,7 +666,7 @@
 
     /* Generate the target link. */
     $msgMbox = isset($message['mbox']) ? $message['mbox'] : '';
-    $target = IMP_Search::generateSearchUrl('message.php', $msgMbox);
+    $target = IMP::generateSearchUrl('message.php', $msgMbox);
     $target = Util::addParameter($target, 'index', $h->uid);
 
     /* Get all the flag information. */
@@ -665,7 +681,6 @@
         require_once IMP_BASE . '/lib/MIME/Headers.php';
         $imp_headers = &new IMP_Headers($h->uid);
         $imp_headers->buildHeaders();
-        $imp_headers->buildFlags();
         if (($priority = $imp_headers->getValue('x-priority'))) {
             if (preg_match('/\s*(\d+)\s*/', $priority, $matches)) {
                 if (($matches[1] == '1') || ($matches[1] == '2')) {
@@ -726,10 +741,9 @@
     }
 
     if ($conf['mailbox']['show_attachments'] && $attachment) {
-        $msg['status'] .= Horde::img($attachment . '.png', _("Attachment"));
+        $msg['status'] .= Horde::img($attachment . '.png', $attachment_alt);
     }
 
-
     /* Show message preview? */
     if ($show_preview) {
         $msg['preview'] = $message['preview'];
@@ -753,7 +767,7 @@
             if ($search_mbox) {
                 $extra['thismailbox'] = $mailboxOverview[$msgIndex]['mbox'];
             }
-            $msg['from'] = Horde::link(IMP::composeLink(array(), $extra), sprintf(_("Compose Message (%s)"), $msg['fullfrom'])) . $msg['from'] . '</a>';
+            $msg['from'] = Horde::link(IMP::composeLink(array(), $extra), sprintf(_("New Message to %s"), stripslashes($msg['fullfrom']))) . $msg['from'] . '</a>';
         }
         break;
 
@@ -761,7 +775,7 @@
         if (!isset($msg['fullfrom'])) {
             $msg['fullfrom'] = $msg['from'];
         }
-        $from_uri = IMP_Search::generateSearchUrl('message.php', $msgMbox);
+        $from_uri = IMP::generateSearchUrl('message.php', $msgMbox);
         $from_uri = Util::addParameter($from_uri, 'index', $h->uid);
         $msg['from'] = Horde::link($from_uri, $msg['fullfrom']) . $msg['from'] . '</a>';
         break;
@@ -776,38 +790,9 @@
     }
 
     /* Set up threading tree now. */
-    if ($thread_sort && !$search_mbox) {
-        $indentBase = $threadob->getThreadBase($h->uid);
-        if (!empty($indentBase)) {
-            $indentLevel = $threadob->getThreadIndent($h->uid);
-            if ($indentLevel > 1) {
-                $lines = '';
-                $lastinlevel = $threadob->lastInLevel($h->uid);
-                if ($sortdir) {
-                    if ($indentBase != $last_thread) {
-                        $threadLevel = array();
-                        $last_thread = $indentBase;
-                        for ($i = 1; $i <= $indentLevel; $i++) {
-                            $threadLevel[$i] = true;
-                        }
-                    } elseif ($indentLevel > $last_level) {
-                        $threadLevel[$last_level] = false;
-                        for ($i = ($last_level + 1); $i <= $indentLevel; $i++) {
-                            $threadLevel[$i] = true;
-                        }
-                    }
-                    $last_level = $indentLevel;
-                    $lastinlevel = !$lastinlevel;
-                    $join_img = ($lastinlevel) ? 'join.png' : 'joinbottom-down.png';
-                } else {
-                    $join_img = ($lastinlevel) ? 'joinbottom.png' : 'join.png';
-                }
-                $threadLevel[$indentLevel] = $lastinlevel;
-                for ($i = 2; $i < $indentLevel; $i++) {
-                    $lines .= _image(!isset($threadLevel[$i]) || ($threadLevel[$i]) ? 'blank.png' : 'line.png');
-                }
-                $msg['subject'] = $lines . _image($join_img) . ' ' . $msg['subject'];
-            }
+    if ($thread_sort) {
+        if (!empty($threadtree[$h->uid])) {
+            $msg['subject'] = $threadtree[$h->uid] . ' ' . $msg['subject'];
         }
     }
 
@@ -845,15 +830,14 @@
 
 if (!empty($open_compose_window)) {
     $args = 'popup=1';
-    if (isset($options)) {
-        foreach ($options as $arg => $value) {
-            $args .= !empty($value) ? '&' . $arg . '=' . urlencode($value) : '';
-        }
+    if (!isset($options)) {
+        $options = array();
     }
-    foreach (IMP::getComposeArgs() as $arg => $value) {
+    foreach (array_merge($options, IMP::getComposeArgs()) as $arg => $value) {
         $args .= !empty($value) ? '&' . $arg . '=' . urlencode($value) : '';
     }
-    echo "<script language='JavaScript' type='text/javascript'>open_compose_win('" . addslashes($args) . "'); focus_compose_win();</script>";
+    Horde::addScriptFile('popup.js');
+    echo "<script type='text/javascript'>popup_imp('" . Horde::applicationUrl('compose.php') . "',700,650,'" . addslashes($args) . "');</script>";
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/lib/Message.php
+++ mod/lib/Message.php
@@ -10,11 +10,16 @@
  * handled in here so that code need not be repeated between mailbox, message,
  * and other pages.
  *
- * $Horde: imp/lib/Message.php,v 1.164.8.8 2005/08/13 17:15:55 slusarz Exp $
+ * Indices format:
+ * ===============
+ * For any function below that requires an $indices parameter, see
+ * IMP::parseIndicesList() for the list of allowable inputs.
+ *
+ * $Horde: imp/lib/Message.php,v 1.164.8.40 2006/03/30 15:36:04 slusarz Exp $
  *
  * Copyright 2000-2001 Chris Hyde <chris at jeks.net>
- * Copyright 2000-2005 Chuck Hagenbuch <chuck at horde.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2000-2006 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -42,13 +47,33 @@
     var $_usepop = false;
 
     /**
+     * Returns a reference to the global IMP_Message object, only creating it
+     * if it doesn't already exist. This ensures that only one IMP_Message
+     * instance is instantiated for any given session.
+     *
+     * This method must be invoked as:<code>
+     *   $imp_message = &IMP_Message::singleton();
+     * </code>
+     *
+     * @return IMP_Message  The IMP_Message instance.
+     */
+    function &singleton()
+    {
+        static $message;
+
+        if (!isset($message)) {
+            $message = new IMP_Message();
+        }
+
+        return $message;
+    }
+
+    /**
      * Constructor.
      */
     function IMP_Message()
     {
-        global $imp;
-
-        if ($imp['base_protocol'] == 'pop3') {
+        if ($GLOBALS['imp']['base_protocol'] == 'pop3') {
             $this->_usepop = true;
         }
 
@@ -57,13 +82,6 @@
     }
 
     /**
-     * Indices format:
-     * ===============
-     * For any function below that requires an $indices parameter, see
-     * IMP::parseIndicesList() for the list of allowable inputs.
-     */
-
-    /**
      * Copies or moves a list of messages to a new folder.
      * Handles use of the IMP_SEARCH_MBOX mailbox and the Trash folder.
      *
@@ -148,8 +166,10 @@
         }
 
         $return_value = true;
-        $trash = IMP::addPreambleString($prefs->getValue('trash_folder'));
-        $use_trash = (!$nuke && $prefs->getValue('use_trash'));
+        $trash = IMP::folderPref($prefs->getValue('trash_folder'), true);
+        $use_vtrash = $prefs->getValue('use_vtrash');
+        $use_trash = $prefs->getValue('use_trash');
+        $maillog_update = (!$keeplog && !empty($conf['maillog']['use_maillog']));
 
         /* If the folder we are deleting from has changed. */
         foreach ($msgList as $folder => $msgIndices) {
@@ -159,9 +179,15 @@
             $this->_impImap->changeMbox($folder);
 
             /* Trash is only valid for IMAP mailboxes. */
-            if (!$this->_usepop && $use_trash && ($folder != $trash)) {
-                include_once IMP_BASE . '/lib/Folder.php';
-                $imp_folder = &IMP_Folder::singleton();
+            if (!$this->_usepop &&
+                !$nuke &&
+                !$use_vtrash &&
+                $use_trash &&
+                ($folder != $trash)) {
+                if (!isset($imp_folder)) {
+                    include_once IMP_BASE . '/lib/Folder.php';
+                    $imp_folder = &IMP_Folder::singleton();
+                }
 
                 if (!$imp_folder->exists($trash)) {
                     if (!$imp_folder->create($trash, $prefs->getValue('subscribe'))) {
@@ -176,7 +202,8 @@
                     /* Handle the case when the mailbox is overquota
                        (moving message to trash would fail) by first
                        deleting then copying message to Trash. */
-                    if (stristr('over quota', $error_msg) !== false) {
+                    if ((stristr($error_msg, 'over quota') !== false) ||
+                        (stristr($error_msg, 'exceeded your mail quota') !== false)) {
                         $error = false;
                         $msg_text = array();
 
@@ -189,7 +216,7 @@
 
                         /* Save messages in Trash folder. */
                         foreach ($msg_text as $val) {
-                            if (!@imap_append($imp['stream'], $trash, $val)) {
+                            if (!@imap_append($imp['stream'], IMP::serverString($trash), $val)) {
                                 $error = true;
                                 break;
                             }
@@ -204,8 +231,11 @@
                     @imap_expunge($imp['stream']);
                 }
             } else {
-                /* Get the list of Message-IDs for the deleted messages. */
-                $overview = @imap_fetch_overview($imp['stream'], $sequence, FT_UID);
+                /* Get the list of Message-IDs for the deleted messages if
+                 * using maillogging. */
+                if ($maillog_update) {
+                    $overview = @imap_fetch_overview($imp['stream'], $sequence, FT_UID);
+                }
 
                 /* Delete the messages. */
                 if (!@imap_delete($imp['stream'], $sequence, FT_UID)) {
@@ -216,16 +246,28 @@
                     }
                     $return_value = false;
                 } else {
-                    if ($nuke || ($use_trash && ($folder == $trash))) {
+                    $delIndices = array($folder => $msgIndices);
+                    $flag_str = '\\DELETED';
+
+                    if ($this->_usepop ||
+                        $nuke ||
+                        ($use_trash && ($folder == $trash))) {
                         /* Purge messages in the trash folder immediately. */
+                        $this->flag($flag_str, $delIndices);
                         @imap_expunge($imp['stream']);
-                    } elseif ($this->_usepop) {
-                        $this->_impImap->reopenIMAPStream(true);
+                    } else {
+                        /* If we are using vitrual trash, we must mark the 
+                         * message as seen or else it will appear as an
+                         * 'unseen' message for purposes of new message
+                         * counts. */
+                        if ($use_vtrash) {
+                            $this->flag($flag_str . ' \\SEEN', $delIndices);
+                        }
                     }
 
                     /* Get the list of Message-IDs deleted, and remove
                      * the information from the mail log. */
-                    if (!$keeplog && !empty($conf['maillog']['use_maillog'])) {
+                    if ($maillog_update) {
                         $msg_ids = array();
                         foreach ($overview as $val) {
                             if (!empty($val->message_id)) {
@@ -288,17 +330,18 @@
     }
 
     /**
-     * Copies or moves a list of messages to a tasklist.
+     * Copies or moves a list of messages to a tasklist or notepad.
      * Handles use of the IMP_SEARCH_MBOX mailbox and the Trash folder.
      *
-     * @param string    $tasklist   The tasklist in which the task will be
-     *                              created.
-     * @param integer   $action     Either IMP_MESSAGE_MOVE or IMP_MESSAGE_COPY.
-     * @param mixed     &$indices   See above.
+     * @param string $list      The list in which the task or note will be
+     *                          created.
+     * @param integer $action   Either IMP_MESSAGE_MOVE or IMP_MESSAGE_COPY.
+     * @param mixed $indices    See above.
+     * @param string $type      The object type to create, defaults to task.
      *
      * @return boolean  True if successful, false if not.
      */
-    function createTasks($tasklist, $action, &$indices)
+    function createTasksOrNotes($list, $action, &$indices, $type = 'task')
     {
         global $registry, $notification, $prefs;
 
@@ -320,7 +363,7 @@
                 $subject = $imp_headers->getValue('subject');
 
                 /* Fetch the message contents. */
-                $imp_contents = &IMP_Contents::singleton($index);
+                $imp_contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $folder);
                 $imp_contents->buildMessage();
 
                 /* Extract the message body. */
@@ -331,6 +374,10 @@
 
                 /* Re-flow the message for prettier formatting. */
                 $flowed = &new Text_Flowed($mime_message->replaceEOL($body, "\n"));
+                if (($mime_message->getContentTypeParameter('delsp') == 'yes') &&
+                    method_exists($flowed, 'setDelSp')) {
+                    $flowed->setDelSp(true);
+                }
                 $body = $flowed->toFlowed(false);
 
                 /* Convert to current charset */
@@ -345,36 +392,74 @@
                 $vCal->setAttribute('PRODID', '-//The Horde Project//IMP ' . IMP_VERSION . '//EN');
                 $vCal->setAttribute('METHOD', 'PUBLISH');
 
-                /* Create a new vTodo object using this message's contents. */
-                $vTodo = &Horde_iCalendar::newComponent('vtodo', $vCal);
-                $vTodo->setAttribute('SUMMARY', $subject);
-                $vTodo->setAttribute('DESCRIPTION', $body);
-                $vTodo->setAttribute('PRIORITY', '3');
+                switch ($type) {
+                case 'task':
+                    /* Create a new vTodo object using this message's
+                     * contents. */
+                    $vTodo = &Horde_iCalendar::newComponent('vtodo', $vCal);
+                    $vTodo->setAttribute('SUMMARY', $subject);
+                    $vTodo->setAttribute('DESCRIPTION', $body);
+                    $vTodo->setAttribute('PRIORITY', '3');
 
-                /* Get the list of editable tasklists. */
-                $tasklists = $registry->call('tasks/listTasklists',
+                    /* Get the list of editable tasklists. */
+                    $lists = $registry->call('tasks/listTasklists',
                                              array(false, PERMS_EDIT));
 
-                /* Attempt to add the new vTodo item to the requested tasklist. */
-                $res = $registry->call('tasks/import',
-                                       array($vTodo, 'text/x-vtodo', $tasklist));
+                    /* Attempt to add the new vTodo item to the requested
+                     * tasklist. */
+                    $res = $registry->call('tasks/import',
+                                           array($vTodo, 'text/x-vtodo', $list));
+                    break;
+
+                case 'note':
+                    /* Create a new vNote object using this message's
+                     * contents. */
+                    $vNote = &Horde_iCalendar::newComponent('vnote', $vCal);
+                    $vNote->setAttribute('BODY', $subject . "\n". $body);
+
+                    /* Get the list of editable notepads. */
+                    $lists = $registry->call('notes/listNotepads',
+                                             array(false, PERMS_EDIT));
+
+                    /* Attempt to add the new vNote item to the requested
+                     * notepad. */
+                    $res = $registry->call('notes/import',
+                                           array($vNote, 'text/x-vnote', $list));
+                    break;
+                }
+
                 if (is_a($res, 'PEAR_Error')) {
                     $notification->push($res, $res->getCode());
                 } elseif (!$res) {
-                    $notification->push(_("An unknown error occured while creating the new task."), 'horde.error');
+                    switch ($type) {
+                    case 'task': $notification->push(_("An unknown error occured while creating the new task."), 'horde.error'); break;
+                    case 'note': $notification->push(_("An unknown error occured while creating the new note."), 'horde.error'); break;
+                    }
                 } else {
-                    $task_name = '"' . htmlspecialchars($subject) . '"';
+                    $name = '"' . htmlspecialchars($subject) . '"';
 
-                    /* Attempt to convert the task name into a hyperlink. */
-                    $task_link = $registry->link('tasks/show',
-                                                 array('uid' => $res));
-                    if ($task_link && !is_a($task_link, 'PEAR_Error')) {
-                        $task_name = sprintf('<a href="%s">%s</a>',
-                                             Horde::url($task_link),
-                                             $task_name);
+                    /* Attempt to convert the object name into a hyperlink. */
+                    switch ($type) {
+                    case 'task':
+                        $link = $registry->link('tasks/show',
+                                                array('uid' => $res));
+                        break;
+                    case 'note':
+                        if ($registry->hasMethod('notes/show')) {
+                            $link = $registry->link('notes/show',
+                                                    array('uid' => $res));
+                        } else {
+                            $link = false;
+                        }
+                        break;
+                    }
+                    if ($link && !is_a($link, 'PEAR_Error')) {
+                        $name = sprintf('<a href="%s">%s</a>',
+                                        Horde::url($link),
+                                        $name);
                     }
 
-                    $notification->push(sprintf(_("%s was successfully added to %s."), $task_name, htmlspecialchars($tasklists[$tasklist]->get('name'))), 'horde.success', array('content.raw'));
+                    $notification->push(sprintf(_("%s was successfully added to \"%s\"."), $name, htmlspecialchars($lists[$list]->get('name'))), 'horde.success', array('content.raw'));
                 }
             }
         }
@@ -421,12 +506,15 @@
 
         /* Get a local copy of the message and strip out the desired
            MIME_Part object. */
-        $contents = &IMP_Contents::singleton($index);
+        $contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $folder);
         $contents->rebuildMessage();
         $message = $contents->getMIMEMessage();
         $oldPart = $message->getPart($partid);
         $newPart = new MIME_Part('text/plain');
-        $newPart->setContents('[' . _("Attachment stripped: Original attachment type") . ': "' . $oldPart->getType() . '", ' . _("name") . ': "' . $oldPart->getName(true, true) . '"]', '8bit');
+
+        /* We need to make sure all text is in the correct charset. */
+        $newPart->setCharset(NLS::getCharset());
+        $newPart->setContents(sprintf(_("[Attachment stripped: Original attachment type: %s, name: %s]"), $oldPart->getType(), $oldPart->getName(true, true)), '8bit');
         $message->alterPart($partid, $newPart);
 
         /* We need to make sure we add "\r\n" after every line for
@@ -435,7 +523,6 @@
 
         /* Get the headers for the message. */
         $headers = &new IMP_Headers($index);
-        $headertext = $headers->getHeaderText();
         $headers->buildFlags();
         $flags = array();
         foreach (array('answered', 'draft', 'flagged', 'deleted') as $flag) {
@@ -449,19 +536,20 @@
            we check imap_status() to determine the next available UID. We
            use this UID as the new index of the message. */
         $folderstring = IMP::serverString($folder);
+        $headerstring = $headers->getHeaderText();
         $this->_impImap->changeMbox($folderstring);
         $status = @imap_status($imp['stream'], $folderstring, SA_UIDNEXT);
-        if (@imap_append($imp['stream'], $folderstring, $headertext . $message->toString(), '\\SEEN')) {
+        if (@imap_append($imp['stream'], $folderstring, $headerstring . $contents->toString($message, true), '\\SEEN')) {
             $idx_array = array($folder => $index);
             $this->delete($idx_array, true, true);
             $idx_array = array($folder => $status->uidnext);
             $this->flag($flags, $idx_array);
-            $imp_mailbox->setNewIndex($status->uidnext);
             $imp_mailbox->updateMailbox(IMP_MAILBOX_UPDATE);
+            $imp_mailbox->setNewIndex($status->uidnext);
 
             /* We need to replace the old index in the query string with the
                new index. */
-            $_SERVER['QUERY_STRING'] = preg_replace('/' . $index . '/', $imp_mailbox->getIndex(), $_SERVER['QUERY_STRING']);
+            $_SERVER['QUERY_STRING'] = preg_replace('/' . $index . '/', $status->uidnext, $_SERVER['QUERY_STRING']);
 
             return true;
         } else {
@@ -517,12 +605,7 @@
      * Sets or clears a given flag(s) for all messages in a list of mailboxes.
      * This function works with IMAP only, not POP3.
      *
-     * Valid flags are:
-     *   \\SEEN
-     *   \\FLAGGED
-     *   \\ANSWERED
-     *   \\DELETED
-     *   \\DRAFT
+     * See flag() for the list of valid flags.
      *
      * @param string $flag     The IMAP flag(s) to set or clear.
      * @param array $mboxes    The list of mailboxes to flag.
@@ -537,16 +620,16 @@
             return false;
         }
 
-        $function = ($action) ? 'imap_setflag_full' : 'imap_clearflag_full';
         $return_value = true;
 
         foreach ($mboxes as $val) {
             /* Switch folders, if necessary. */
             $this->_impImap->changeMbox($val);
-
-            if (!call_user_func($function, $GLOBALS['imp']['stream'], '1:*', $flag)) {
-                $notification->push(sprintf(_("There was an error flagging messages in the folder \"%s\". This is what the server said"), IMP::displayFolder($val)) . ': ' . imap_last_error(), 'horde.error');
-                $return_value = false;
+            if ($uids = @imap_search($GLOBALS['imp']['stream'], 'ALL', SE_UID)) {
+                $indices = array($val => $uids);
+                if (!$this->flag($flag, $indices, $action)) {
+                    $return_value = false;
+                }
             }
         }
 
@@ -560,29 +643,18 @@
      */
     function expungeMailbox($mbox_list)
     {
-        global $imp, $notification;
+        global $imp;
 
         foreach ($mbox_list as $val) {
-            if ($val == IMP_SEARCH_MBOX) {
-                for ($i = 0; $i < count($imp['search']['folders']); $i++) {
-                    if ($this->_usepop) {
-                        $stream = $imp['stream'];
-                    } else {
-                        $stream = $this->_impImap->openIMAPStream($imp['search']['folders'][$i]);
-                    }
-
-                    if (!@imap_expunge($stream)) {
-                        $notification->push(sprintf(_("There was a problem expunging %s. This is what the server said"), IMP::displayFolder($imp['search']['folders'][$i])) . ': ' . imap_last_error(), 'horde.error');
-                    }
-                    if (!$this->_usepop) {
-                        @imap_close($stream);
-                    }
+            if ($GLOBALS['imp_search']->isSearchMbox($val)) {
+                foreach ($GLOBALS['imp_search']->getSearchFolders($val) as $folder) {
+                    $stream = $this->_impImap->openIMAPStream($folder);
+                    @imap_expunge($stream);
+                    @imap_close($stream);
                 }
             } else {
                 $this->_impImap->changeMbox($val);
-                if (!@imap_expunge($imp['stream'])) {
-                    $notification->push(_("There was a problem expunging the mailbox. This is what the server said") . ': ' . imap_last_error(), 'horde.error');
-                }
+                @imap_expunge($imp['stream']);
             }
         }
     }
@@ -597,6 +669,12 @@
         global $imp, $notification;
 
         foreach ($mbox_list as $mbox) {
+            if ($GLOBALS['imp_search']->isVTrashFolder($mbox)) {
+                $this->expungeMailbox($GLOBALS['imp_search']->getSearchFolders($mbox));
+                $notification->push(_("Emptied all messages from Virtual Trash Folder."), 'horde.success');
+                continue;
+            }
+
             $display_mbox = IMP::displayFolder($mbox);
 
             if (($this->_impImap->changeMbox($mbox)) !== true) {


--- orig/templates/mailbox/alert.inc
+++ mod/templates/mailbox/alert.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 alert('<?php echo addslashes(($newmsgs == 1) ? _("You have 1 new message.") : sprintf(_("You have %s new messages."), $newmsgs)) ?>');
 // -->


--- orig/lib/Quota.php
+++ mod/lib/Quota.php
@@ -3,9 +3,9 @@
  * IMP_Quota:: provides an API for retrieving Quota details from a mail
  * server.
  *
- * $Horde: imp/lib/Quota.php,v 1.23.10.5 2005/07/03 03:42:43 selsky Exp $
+ * $Horde: imp/lib/Quota.php,v 1.23.10.8 2006/01/01 21:28:55 jan Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -39,10 +39,12 @@
         require_once dirname(__FILE__) . '/Quota/' . $driver . '.php';
         $class = 'IMP_Quota_' . $driver;
         if (class_exists($class)) {
-            return $ret = &new $class($params);
+            $quota = &new $class($params);
         } else {
-            return false;
+            $quota = false;
         }
+
+        return $quota;
     }
 
     /**


--- orig/po/uk_UA.po
+++ mod/po/uk_UA.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP v3.1\n"
-"POT-Creation-Date: 2002-01-05 23:14+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-01-09 19:02+0200\n"
 "Last-Translator: Andriy Kopystyansky <anri at polynet.lviv.ua>\n"
 "Language-Team: Ukrainian <webmaster at polynet.lviv.ua>\n"
@@ -13,56 +14,193 @@
 "Content-Type: text/plain; charset=KOI8-U\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: lib/Compose.php:418
+msgid "      Cc: "
+msgstr ""
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr ""
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr ""
 
+#: lib/Compose.php:406
+#, fuzzy
 msgid "    From: "
-msgstr ""
-
-msgid " - $nm new message"
-msgstr " - $nm ÎÏ×ÉÊ ìÉÓÔ"
+msgstr "÷¦Ä:"
 
-msgid " - $nm new messages"
-msgstr " - $nm ÎÏ×ÉÈ ìÉÓÔ¦×"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " ôÅÍÁ: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " × "
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr "%A, %B %e, %Y, %I:%M:%S %p %Z"
+#: templates/mailbox/message_headers.inc:12
+msgid "#"
+msgstr ""
+
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d Ú %d ìÉÓÔ¦×"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "÷¦ÄÏÂÒÁÚÉÔÉ ÌÉÓÔ Ð¦ÓÌÑ ÚÏÓÔÏÓÕ×ÁÎÎÑ Æ¦ÌØÔÒ¦×."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d ÐÏ %d Ú %d ìÉÓÔ¦×"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ÕÖÅ ¦ÓÎÕ¤. ÷ÁÛÁ ÐÁÐËÁ %s ÎÅ ÂÕÌÁ ÐÅÒÅÊÍÅÎÏ×ÁÎÁ."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "ðÁÐËÁ %s ÂÕÄÅ ÐÅÒÅÊÍÅÎÏ×ÁÎÁ ÎÁ ÐÏÞÁÔËÕ Í¦ÓÑÃÑ."
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "ðÁÐËÁ \"%s\" ÕÓÐ¦ÛÎÏ ÐÅÒÅÊÍÅÎÏ×ÁÎÁ ÎÁ \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;of&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(úÁÓÔÏÓÕ×ÁÔÉ Ã¦ ÚÍ¦ÎÉ ¦ ÐÅÒÅÊÔÉ ÎÁ ÎÁÓÔÕÐÎÉÊ ÅËÒÁÎ.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(÷¦ÄÍ¦ÎÉÔÉ Ã¦ ÚÍ¦ÎÉ ¦ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÓÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -70,44 +208,197 @@
 "(úÁÓÔÏÓÕ×ÁÔÉ ÚÒÏÂÌÅÎ¦ ÎÁ ÃÅÊ ÞÁÓ ÚÍ¦ÎÉ ¦ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÓÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ.  "
 "úÍ¦ÎÉ Õ ÐÏÔÏÞÎÏÍÕ ×¦ËÎ¦ îå âõäõôø ÚÁÓÔÏÓÏ×ÁÎ¦.)"
 
-#, c-format
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(úÁÓÔÏÓÕ×ÁÔÉ ÚÒÏÂÌÅÎ¦ ÎÁ ÃÅÊ ÞÁÓ ÚÍ¦ÎÉ ¦ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÓÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ.  "
+"úÍ¦ÎÉ Õ ÐÏÔÏÞÎÏÍÕ ×¦ËÎ¦ îå âõäõôø ÚÁÓÔÏÓÏ×ÁÎ¦.)"
+
+#: templates/contacts/contacts.inc:227
+msgid "* Add these by clicking OK *"
+msgstr ""
+
+#: templates/contacts/contacts.inc:206
+msgid "* Please select address(es) *"
+msgstr ""
+
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÎÉÝÅÎÏ."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "óÐÅÃ¦ÁÌØÎ¦ ÓÉÍ×ÏÌÉ"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "óÐÅÃ¦ÁÌØÎ¦ ÓÉÍ×ÏÌÉ"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "óÐÅÃ¦ÁÌØÎ¦ ÓÉÍ×ÏÌÉ"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "óÐÅÃ¦ÁÌØÎ¦ ÓÉÍ×ÏÌÉ"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new "
-"window.</i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
 msgstr ""
-"<p><i>ãÅÊ ÌÉÓÔ ÂÕ× ÓÔ×ÏÒÅÎÉÊ × ¦ÎÛÏÍÕ ËÏÄÕ×ÁÎÎ¦, Î¦Ö ×ÓÔÁÎÏ×ÌÅÎÅ Õ ÷ÁÓ. "
-"ñËÝÏ ÌÉÓÔ ×¦ÄÏÂÒÁÖÅÎÉÊ ÎÅËÏÒÅËÔÎÏ, %sËÌÁÃÎ¦ÔØ ÔÕÔ</a>. "
-"</i></p>\n"
 
-msgid "Action"
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "îÁÚ×Á ¦ÐÏÓÔÁÓ¦:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "ïÐÅÒÁÃ¦Ñ"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "äÏÄÁÔÉ ÄÏ áÄÒÅÓÎÏ§ ËÎÉÇÉ (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "ÄÏÄÁÔÉ ÄÖÅÒÅÌÏ"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "ðÒÉËÒ¦ÐÌÅÎÏ ÄÏÄÁÔÏË."
 
-msgid "Addressbooks"
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "ïÓÏÂÉÓÔÁ ¶ÎÆÏÒÍÁÃ¦Ñ"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
+#, fuzzy
+msgid "Address Book"
 msgstr "áÄÒÅÓÎi ËÎÉÇÉ"
 
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "áÄÒÅÓÎi ËÎÉÇÉ"
+
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
 msgid ""
-"All messages in the folder(s) will be lost!\\nAre you completely sure you "
-"wish to continue?\\n"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"÷Ó¦ ÌÉÓÔÉ × ÐÁÐÃ¦ ÂÕÄÕÔØ ×ÔÒÁÞÅÎ¦!\\n ÷É Ä¦ÊÓÎÏ ×ÐÅ×ÎÅÎ¦, "
-"ÝÏ ÈÏÞÅÔÅ ÐÒÏÄÏ×ÖÉÔÉ?\\n"
 
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "×Ó¦"
+
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
-msgstr ""
-"÷Ó¦ ÌÉÓÔÉ Õ ÎÁÓÔÕÐÎÉÈ ÐÁÐÁÈ ÂÕÄÕÔØ ÚÁ×ÁÎÔÁÖÅÎ¦ × ÏÄÎÉÎ ÆÁÊÌ MBOX: "
-""
+msgstr "÷Ó¦ ÌÉÓÔÉ Õ ÎÁÓÔÕÐÎÉÈ ÐÁÐÁÈ ÂÕÄÕÔØ ÚÁ×ÁÎÔÁÖÅÎ¦ × ÏÄÎÉÎ ÆÁÊÌ MBOX: "
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
@@ -115,124 +406,349 @@
 "÷Ói ÌÉÓÔÉ Õ ÷ÁÛiÊ ÐÁÐÃi \"%s\", ÑË¦ ÓÔÁÒÛ¦ ÚÁ %s ÄÎi× ÂÕÄÕÔØ ÎÁÚÁ×ÖÄÉ "
 "ÚÎÉÝÅÎi."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "÷Ó¦ ÐÁÐËÉ ×¦Ä¦ÓÌÁÎÏ§ ÐÏÛÔÉ, ÑË¦ ÓÔÁÒÛ¦ ÚÁ %s Í¦ÓÑÃ¦×, ÂÕÄÕÔØ ×ÉÔÅÒÔ¦."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "÷Ó¦ ÐÁÐËÉ ×¦Ä¦ÓÌÁÎÏ§ ÐÏÛÔÉ, ÑË¦ ÓÔÁÒÛ¦ ÚÁ %s Í¦ÓÑÃ¦×, ÂÕÄÕÔØ ×ÉÔÅÒÔ¦."
 
-msgid ""
-"All sessions begin at the Login screen.  Before you can use any of the "
-"webmail features, you must connect to your IMAP account using the username "
-"and password assigned to you by your network administrator."
-msgstr ""
-"ëÏÖÎÁ ÓÅÓ¦Ñ ÐÏÞÉÎÁ¤ÔØÓÑ Ú ×¦ËÎÁ ÷ÈÏÄÕ. ðÅÒÛ Î¦Ö ÓËÏÒÉÓÔÁÔÉÓÑ ÐÏÓÌÕÇÁÍÉ "
-"ÐÏÛÔÏ×ÏÇÏ ¦ÎÔÅÒÆÅÊÓÕ, ÷É ÐÏ×ÉÎÎ¦ ÕÓÐ¦ÛÎÏ ÁÕÔÅÎÔÉÆ¦ËÕ×ÁÔÉÓÑ. äÌÑ ÃØÏÇÏ ÓÌ¦Ä "
-"×ËÁÚÁÔÉ ÷ÁÛ¦ ÎÁÚ×Õ ËÏÒÉÓÔÕ×ÁÞÁ ¦ ÐÁÒÏÌØ, ÎÁÄÁÎ¦ ÷ÁÍ ÁÄÍ¦Î¦ÓÔÒÁÃ¦¤À ÍÅÒÅÖ¦."
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "ðÁÐËÁ \"%s\" ÕÓÐ¦ÛÎÏ ÐÅÒÅÊÍÅÎÏ×ÁÎÁ ÎÁ \"%s\"."
 
-msgid "All"
-msgstr "×Ó¦"
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
 
-msgid "An illegal value was specified."
-msgstr "÷ËÁÚÁÎÅ ÎÅÐÒÉÊÎÑÔÅ ÚÎÁÞÅÎÎÑ."
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "ðÒÉËÒ¦ÐÌÅÎÏ ÄÏÄÁÔÏË."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "ôÒÁÐÉÌÁÓÑ ÎÅ×¦ÄÏÍÁ ÐÏÍÉÌËÁ ÐÒÉ ÄÏÄÁÎÎ¦ ÎÏ×ÏÇÏ ÚÁÐÉÓÕ."
 
-msgid "Answered messages"
-msgstr "ìÉÓÔÉ Ú ×¦ÄÐÏ×¦ÄÄÀ"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "ôÒÁÐÉÌÁÓÑ ÎÅ×¦ÄÏÍÁ ÐÏÍÉÌËÁ ÐÒÉ ÄÏÄÁÎÎ¦ ÎÏ×ÏÇÏ ÚÁÐÉÓÕ."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Ú&nbsp;×¦ÄÐÏ×¦ÄÄÀ"
 
-msgid "Apply All Rules"
-msgstr "úÁÓÔÏÓÕ×ÁÔÉ ×Ó¦ ðÒÁ×ÉÌÁ"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "ìÉÓÔÉ Ú ×¦ÄÐÏ×¦ÄÄÀ"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ ÐÒÉ"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ ÐÒÉ"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ ÐÒÉ ×ÈÏÄ¦"
 
-msgid "April"
-msgstr "ë×¦ÔÅÎØ"
+#: templates/filters/prefs.inc:42
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
-msgid "Are you SURE you want to continue?"
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Are you sure you want to do this?"
 msgstr "÷É ÷ðå÷îåî¶, ÝÏ ÈÏÞÅÔÅ ÐÒÏÄÏ×ÖÉÔÉ?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: templates/mailbox/actions.inc:39
+#, fuzzy
+msgid "Are you sure you wish to empty this folder?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ îáúá÷öäé ×ÉÔÅÒÔÉ Ã¦ ÌÉÓÔÉ?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "þÁÓ ÎÁÄÈÏÄÖÅÎÎÑ"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "ðÏ ÚÒÏÓÔÁÎÎÀ"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "ðÒÉËÒ¦ÐÉÔÉ"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "äÏÄÁÔËÉ"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "ðÒÉËÒ¦ÐÉÔÉ"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "äÏÄÁÔÏË"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "äÏÄÁÔËÉ"
 
-msgid "August"
-msgstr "óÅÒÐÅÎØ"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "äÏÄÁÔËÉ"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "ïÐÅÒÁÃ¦Ñ"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "äÏÓÔÕÐÎ¦ áÄÒÅÓÎ¦ ËÎÉÇÉ:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "îÁÚÁÄ ÄÏ %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "îÁÚÁÄ ÄÏ %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
-msgid ""
-"Begin by entering your user and password in the appropriate fields.  You'll "
-"then need to select the IMAP mail server to which you'd like to connect."
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
 msgstr ""
-"óÐÅÒÛÕ ×ËÁÖ¦ÔØ ÷ÁÛ¦ ÎÁÚ×Õ ËÏÒÉÓÔÕ×ÁÞÁ ¦ ÐÁÒÏÌØ Õ ×¦ÄÐÏ×¦ÄÎÉÈ ÐÏÌÑÈ. ðÏÔ¦Í "
-"×ËÁÖ¦ÔØ ÂÁÖÁÎÉÊ ÐÏÛÔÏ×ÉÊ ÓÅÒ×ÅÒ (ÑËÝÏ ÔÁËÉÊ ×ÉÂ¦Ò ÄÏÚ×ÏÌÅÎÉÊ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÏÍ)." 
 
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "ô¦ÌÏ"
 
-msgid "Body:"
-msgstr "ô¦ÌÏ:"
-
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "ïÂÉÄ×Á"
 
-msgid "Cancel Message"
-msgstr "÷¦ÄÍ¦ÎÉÔÉ ÌÉÓÔ"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "÷¦ÄÍ¦ÎÉÔÉ"
 
-msgid ""
-"Cancelling this message will permanently discard its contents.\\nAre you "
-"sure you want to do this?"
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "÷¦ÄÍ¦ÎÉÔÉ ÌÉÓÔ"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
-"÷¦ÄÍ¦ÎÁ ÃØÏÇÏ ÌÉÓÔÁ ÎÁÚÁ×ÖÄÉ ÚÎÉÝÉÔØ ÊÏÇÏ ×Í¦ÓÔ.\\n÷É ×ÐÅ×ÎÅÎ¦, "
-"ÝÏ ÈÏÞÅÔÅ ÃÅ ÚÒÏÂÉÔÉ?"
+"÷¦ÄÍ¦ÎÁ ÃØÏÇÏ ÌÉÓÔÁ ÎÁÚÁ×ÖÄÉ ÚÎÉÝÉÔØ ÊÏÇÏ ×Í¦ÓÔ.\\n÷É ×ÐÅ×ÎÅÎ¦, ÝÏ ÈÏÞÅÔÅ ÃÅ "
+"ÚÒÏÂÉÔÉ?"
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
 msgstr ""
 
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "ÐÒÉ×ÁÔÎ¦"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "úÍ¦ÎÉÔÉ"
+
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "úÍ¦ÎÉÔÉ ×Ó¦"
 
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "úÍ¦ÎÉÔÉ ÐÁÐËÕ"
 
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -240,6 +756,12 @@
 "÷ËÁÖ¦ÔØ ÏÐÃ¦§ ×¦ÄÏÂÒÁÖÅÎÎÑ - Ë¦ÌØË¦ÓÔØ ÌÉÓÔ¦×, ÑË¦ ×¦ÄÏÂÒÁÚÉÔÉ ÎÁ ÓÔÏÒ¦ÎËÕ, "
 "¦ ÐÒÁ×ÉÌÏ ÓÏÒÔÕ×ÁÎÎÑ ÌÉÓÔ¦×."
 
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
+msgstr "÷ËÁÖ¦ÔØ ÷ÁÛ ÐÏÛÔÏ×ÉÊ ÓÅÒ×ÅÒ ÔÁ ¦ÎÆÏÒÍÁÃ¦À ÐÒÏ ÐÁÐËÉ."
+
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -247,90 +769,311 @@
 "÷ËÁÖ¦ÔØ ¦Í'Ñ, ÁÄÒÅÓÕ ÔÁ Ð¦ÄÐÉÓ, ÑË¦ ÐÏÂÁÞÁÔØ ÷ÁÛ¦ ÒÅÓÐÏÎÄÅÎÔÉ, ÞÉÔÁÀÞÉ ÁÂÏ "
 "×¦ÄÐÏ×¦ÄÁÀÞÉ ÎÁ ÷ÁÛ ÌÉÓÔ."
 
-msgid "Change your mail server and folder information."
-msgstr "÷ËÁÖ¦ÔØ ÷ÁÛ ÐÏÛÔÏ×ÉÊ ÓÅÒ×ÅÒ ÔÁ ¦ÎÆÏÒÍÁÃ¦À ÐÒÏ ÐÁÐËÉ."
-
-msgid "Change"
-msgstr "úÍ¦ÎÉÔÉ"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ðÏÄÉ×ÉÔÉÓÑ ÚÁ Ó×¦ÖÏÀ ÐÏÛÔÏÀ × ÐÁÐËÁÈ"
 
-msgid "Checkbox"
-msgstr "÷¦ÄÍ¦ÔËÁ"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÓÉÌÁÎÎÑ ÷ÁÛÏÇÏ ÌÉÓÔÁ"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "÷ÉÂÅÒ¦ÔØ ÏÐÅÒÁÃ¦À:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:182
+msgid "Choose a mail server:"
+msgstr ""
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "÷ÉÂÅÒ¦ÔØ ÏÐÅÒÁÃ¦À:"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
 msgstr "÷ËÁÖ¦ÔØ áÄÒÅÓÎÕ ËÎÉÇÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ÁÄÒÅÓ."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr "÷ËÁÖ¦ÔØ ÞÅÒÇÏ×¦ÓÔØ áÄÒÅÓÎÉÈ ËÎÉÇ ÄÌÑ ÐÏÛÕËÕ ÁÂÏ ×ÓÔÁ×ËÉ ¦ÍÅÎ."
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
-"ëÌÁÃÎ¦ÔØ ÎÁ ÏÄÎÕ Ú ÷ÁÛÉÈ ×ÉÂÒÁÎÉÈ áÄÒÅÓÎÉÈ ËÎÉÇ ¦ ×¦ÄÍ¦ÔØÔÅ ×Ó¦ ÐÏÌÑ ÄÌÑ "
-"ÐÏÛÕËÕ."
 
-msgid "Closed Folder"
-msgstr "úÁËÒÉÔÁ ÐÁÐËÁ"
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
 
-msgid "Collapse All Folders"
-msgstr "úÇÏÒÎÕÔÉ ×Ó¦ ÐÁÐËÉ"
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"ëÌÁÃÎ¦ÔØ ÎÁ ÏÄÎÕ Ú ÷ÁÛÉÈ ×ÉÂÒÁÎÉÈ áÄÒÅÓÎÉÈ ËÎÉÇ ¦ ×¦ÄÍ¦ÔØÔÅ ×Ó¦ ÐÏÌÑ ÄÌÑ "
+"ÐÏÛÕËÕ."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "îÁÐÉÓÁÔÉ"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "úÁËÒÉÔÁ ÐÁÐËÁ"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "úÇÏÒÎÕÔÉ ×Ói"
 
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "úÇÏÒÎÕÔÉ ×Ói"
 
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "úÇÏÒÎÕÔÉ ×Ó¦ ÐÁÐËÉ"
+
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "úÇÏÒÎÕÔÉ ÐÁÐËÕ"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "îÁÐÉÓÁÔÉ ÌÉÓÔÁ (%s)"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "îÁÐÉÓÁÔÉ"
 
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "îÁÐÉÓÁÔÉ ÌÉÓÔÁ"
 
-msgid "Compose messages in a separate window."
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
 msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
 
-msgid "Compose"
-msgstr "îÁÐÉÓÁÔÉ"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
 
-msgid "Conclusion"
-msgstr "úÁËÌÀÞÎÅ ÓÌÏ×Ï"
+#: config/prefs.php.dist:97
+msgid "Configure mail preview options."
+msgstr ""
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
 
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"÷ËÁÖ¦ÔØ, ÑË ÞÁÓÔÏ ÄÉ×ÉÔÉÓÑ ÚÁ Ó×¦ÖÏÀ ÐÏÛÔÏÀ ¦ ÞÉ ÐÏ×¦ÄÏÍÌÑÔÉ ÷ÁÓ ÐÒÏ ÎÅ§."
-" "
+"÷ËÁÖ¦ÔØ, ÑË ÞÁÓÔÏ ÄÉ×ÉÔÉÓÑ ÚÁ Ó×¦ÖÏÀ ÐÏÛÔÏÀ ¦ ÞÉ ÐÏ×¦ÄÏÍÌÑÔÉ ÷ÁÓ ÐÒÏ ÎÅ§. "
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "ëÏÐ¦À×ÁÔÉ"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "úÇÏÒÎÕÔÉ ÐÁÐËÕ"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "ðÒÁ×ÉÌØÎÏ"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "÷ÉÐÒÁ×ÌÅÎÉÊ ÔÅËÓÔ"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr ""
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr ""
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× Ú ÐÁÐËÉ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "ðÒÏÆ¦ÌÁËÔÉÞÎ¦ ïÐÅÒÁÃ¦§"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "óÔ×ÏÒÉÔÉ"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "óÔ×ÏÒÉÔÉ ÐÁÐËÕ"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "óÔ×ÏÒÉÔÉ"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "óÔ×ÏÒÉÔÉ ÐÁÐËÕ"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÐÁÐËÕ-ÓÍ¦ÔÎÉË"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÐÁÐËÕ ÞÅÒÎÅÔÏË"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÐÁÐËÕ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦×"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÐÁÐËÕ-ÓÍ¦ÔÎÉË"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -338,826 +1081,2978 @@
 "óÔ×ÏÒÉÔÉ ÐÒÁ×ÉÌÁ Æ¦ÌØÔÒÕ×ÁÎÑÑ, ÝÏÂ ÏÒÇÁÎ¦ÚÕ×ÁÔÉ ÷ÁÛÕ ×È¦ÄÎÕ ÐÏÛÔÕ, ÓÏÒÔÕ×ÁÔÉ "
 "§§ ÐÏ ÐÁÐËÁÈ ¦ ×ÉÔÉÒÁÔÉ ÎÅÂÁÖÁÎ¦ ÌÉÓÔÉ (ÓÐÁÍ)."
 
-msgid "Create"
-msgstr "óÔ×ÏÒÉÔÉ"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÐÁÐËÕ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦×"
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "ïÒÇÁÎ¦ÚÕÊÔÅ ×¦ÄÐÒÁ×ÌÅÎÎÑ ÐÏÛÔÉ, ×ËÁÖ¦ÔØ, ËÕÄÉ ÚÁÐÉÓÕ×ÁÔÉ ÞÅÒÎÅÔËÉ."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
-msgid "Customize maintenance operations run upon login to IMP."
-msgstr "îÁÌÁÛÔÕÊÔÅ ÏÐÅÒÁÃ¦§ ÏÂÓÌÕÇÏ×Õ×ÁÎÎÑ ÄÌÑ ÚÁÐÕÓËÕ ÐÒÉ ×ÈÏÄ¦ × IMP."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
+
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "ïÒÇÁÎ¦ÚÕÊÔÅ ×¦ÄÐÒÁ×ÌÅÎÎÑ ÐÏÛÔÉ, ×ËÁÖ¦ÔØ, ËÕÄÉ ÚÁÐÉÓÕ×ÁÔÉ ÞÅÒÎÅÔËÉ."
 
-msgid "Customize tasks to run upon logon to IMP."
+#: config/prefs.php.dist:40
+#, fuzzy, php-format
+msgid "Customize tasks to run upon logon to %s."
 msgstr "îÁÌÁÛÔÕÊÔÅ ÚÁÄÁÞ¦, ÑË¦ ÍÁÀÔØ ×ÉËÏÎÕ×ÁÔÉÓØ ÐÒÉ ×ÈÏÄ¦ × IMP."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "äÁÔÁ"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "äÁÔÁ"
 
-msgid "December"
-msgstr "çÒÕÄÅÎØ"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "×ÉÔÅÒÔ¦"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "÷ÉÔÅÒÔÉ"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "ëÒÉÔÅÒ¦Ê ÓÏÒÔÕ×ÁÎÎÑ ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "îÁÐÒÑÍÏË ÓÏÒÔÕ×ÁÎÎÑ ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "×ÉÔÅÒÔ¦"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "÷ÉÔÅÒÔÉ"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
 
-msgid "Delete messages"
-msgstr "÷ÉÔÅÒÔÉ ÌÉÓÔÉ"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "÷ÉÔÉÒÁÔÉ ÓÔÁÒÕ ÐÁÐËÕ ×¦ÄÐÒÁ×ÌÅÎÉÈ ÌÉÓÔ¦× ÎÁ ÐÏÞÁÔËÕ Í¦ÓÑÃÑ"
 
-msgid "Delete"
-msgstr "÷ÉÔÅÒÔÉ"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "÷ÉÔÉÒÁÔÉ ÓÔÁÒÕ ÐÁÐËÕ ×¦ÄÐÒÁ×ÌÅÎÉÈ ÌÉÓÔ¦× ÎÁ ÐÏÞÁÔËÕ Í¦ÓÑÃÑ"
 
-msgid "Deleted an attachment."
-msgstr "äÏÄÁÔÏË ×ÉÔÅÒÔÏ"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "÷ÉÔÅÒÔÉ ÌÉÓÔÉ"
 
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "×ÉÔÅÒÔ¦"
+
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "÷ÉÔÅÒÔ¦ ÌÉÓÔÉ"
 
-msgid "Deleted"
-msgstr "×ÉÔÅÒÔ¦"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "äÏÄÁÔÏË ×ÉÔÅÒÔÏ"
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "÷ÉÔÉÒÁÎÎÑ ÁÂÏ ÐÅÒÅÎÅÓÅÎÎÑ ÌÉÓÔ¦×"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "ðÏ ÓÐÁÄÁÎÎÀ"
 
-msgid "Display Options"
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+msgid "Description"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
+#, fuzzy
+msgid "Dim signatures?"
+msgstr "÷ÁÛ Ð¦ÄÐÉÓ:"
+
+#: templates/contacts/contacts.inc:236
+#, fuzzy
+msgid "Display"
 msgstr "ïÐÃ¦§ ×¦ÄÏÂÒÁÖÅÎÎÑ"
 
-msgid "Display message when filters have been applied."
-msgstr "÷¦ÄÏÂÒÁÚÉÔÉ ÌÉÓÔ Ð¦ÓÌÑ ÚÏÓÔÏÓÕ×ÁÎÎÑ Æ¦ÌØÔÒ¦×."
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ×¦ËÏÎÅÞËÏ Ú ÐÏ×¦ÄÏÍÌÅÎÎÑÍ ÐÒÏ Ó×¦ÖÕ ÐÏÛÔÕ."
 
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "ïÐÃ¦§ ×¦ÄÏÂÒÁÖÅÎÎÑ"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "îÅ ÄÉ×ÉÔÉÓÑ × ÐÁÐÃ¦ ÚÁ Ó×¦ÖÏÀ ÐÏÛÔÏÀ"
 
-#, c-format
-msgid "Do you want to open %s?"
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
+#, fuzzy
+msgid "Do you want to open that folder?"
 msgstr "÷É ÈÏÞÅÔÅ ×¦ÄËÒÉÔÉ %s?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "úÒÏÂÌÅÎÏ"
 
-#, c-format
-msgid "Download %s"
-msgstr "úÁ×ÁÎÔÁÖÉÔÉ %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ðÁÐËÕ"
 
-msgid "Download"
-msgstr "úÁ×ÁÎÔÁÖÉÔÉ"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "úÁ×ÁÎÔÁÖÉÔÉ ðÁÐËÕ"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "ÞÅÒÎÅÔËÉ"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "ðÁÐËÁ ÞÅÒÎÅÔÏË:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "ðÁÐËÁ ÞÅÒÎÅÔÏË:"
 
-msgid "Edit my filter rules"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÒÁ×ÉÌÁ Æ¦ÌØÔÒÕ×ÁÎÎÑ"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
 
-msgid "Edit your identities"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÷ÁÛ¦ ¦ÐÏÓÔÁÓ¦"
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
 
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "òÅÄÁÇÕ×ÁÔÉ"
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "ðÏÛÔÏ×¦ Æ¦ÌØÔÒÉ"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "òÅÄÁÇÕ×ÁÔÉ ÷ÁÛ¦ ¦ÐÏÓÔÁÓ¦"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit your filter rules"
+msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÒÁ×ÉÌÁ Æ¦ÌØÔÒÕ×ÁÎÎÑ"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "òÅÄÁÇÕ×ÁÔÉ ÷ÁÛ¦ ¦ÐÏÓÔÁÓ¦"
+
+#: templates/contacts/contacts.inc:239
+#, fuzzy
+msgid "Email Address"
+msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
+
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "ðÅÒÅÓÌÁÎÉÊ ÌÉÓÔ ×¦Ä %s"
+
+#: templates/folders/actions.inc:22
+#, fuzzy
+msgid "Empty Folder(s)"
+msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
+
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
+
+#: templates/mailbox/actions.inc:39
+#, fuzzy
+msgid "Empty Trash folder"
+msgstr "óÍ¦ÔÎÉË:"
+
+#: lib/IMP.php:973
+msgid "Empty _Spam"
+msgstr ""
+
+#: lib/IMP.php:966
+msgid "Empty _Trash"
+msgstr ""
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "ë¦ÎÅÃØ ÐÅÒÅÓÌÁÎÏÇÏ ÌÉÓÔÁ"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "óÔÁÒ¦ ÌÉÓÔÉ"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "ðÅÒÅÓÌÁÎÉÊ ÌÉÓÔ ×¦Ä %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "÷×ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ-ÓÍ¦ÔÎÉËÁ"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "÷×ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ ÄÌÑ ÞÅÒÎÅÔÏË"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "÷×ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ ÄÌÑ ×¦Ä¦ÓÌÁÎÏ§ ÐÏÛÔÉ"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "÷×ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ-ÓÍ¦ÔÎÉËÁ"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ ìÉÓÔ"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "úÁÐÉÓ \"%s\" ÂÕ× ÕÓÐ¦ÛÎÏ ÄÏÄÁÎÉÊ ÄÏ ÁÄÒÅÓÎÏ§ ËÎÉÇÉ"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "ðÏÍÉÌËÁ"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ×ÉÔÅÒÔÏ."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "ëÏÖÎ¦ 15 È×ÉÌÉÎ"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "ëÏÖÎ¦ 30 ÓÅËÕÎÄ"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "ëÏÖÎ¦ 5 È×ÉÌÉÎ"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "ëÏÖÎ¦ Ð¦×ÇÏÄÉÎÉ"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "ýÏÈ×ÉÌÉÎÉ"
 
-msgid "Expand All Folders"
-msgstr "òÏÚÇÏÒÎÕÔÉ ×Ó¦ ÐÁÐËÉ"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "òÏÚÇÏÒÎÕÔÉ ×Ó¦"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "òÏÚÇÏÒÎÕÔÉ ×Ó¦"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "òÏÚÇÏÒÎÕÔÉ ×Ó¦ ÐÁÐËÉ"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "òÏÚÇÏÒÎÕÔÉ ÐÁÐËÕ"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "ðÏÛÕË ÁÄÒÅÓ"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÒÏÚÇÏÒÎÕÔÕ ÓÔÒÕËÔÕÒÕ ÐÁÐÏË Õ ×¦ËÎ¦ ðÁÐËÉ"
 
-msgid "February"
-msgstr "ìÀÔÉÊ"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "òÏÚÇÏÒÎÕÔÉ ×Ó¦"
 
-msgid "Field"
-msgstr "ðÏÌÅ"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "ó×¦ÖÁ ÐÏÛÔÁ"
 
-msgid "Filename"
-msgstr "îÁÚ×Á ÆÁÊÌÕ"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "ó×¦ÖÁ ÐÏÛÔÁ"
 
-msgid "Filter Rules"
-msgstr "ðÒÁ×ÉÌÁ Æ¦ÌØÔÒÕ×ÁÎÎÑ"
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
 
-msgid "Filter message content for profanity."
-msgstr "æ¦ÌØÔÒÕ×ÁÔÉ ÌÉÓÔÉ ÎÅÐÒÉÓÔÏÊÎÏÇÏ ×Í¦ÓÔÕ."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ ÐÒÉ ×ÈÏÄ¦"
 
-msgid "Filter"
-msgstr "æ¦ÌØÔÒ"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "ðÅÒÅÓÌÁÎÉÊ ÌÉÓÔ ×¦Ä %s"
 
-msgid "Filters"
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "ðÅÒÅÓÌÁÎÉÊ ÌÉÓÔ ×¦Ä %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr ""
+
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "õ ÷ÁÓ ¤ %s ÎÏ×ÉÈ ÌÉÓÔ¦×."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "æ¦ÌØÔÒÉ"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "æ¦ÌØÔÒ"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "¶ÎÛ¦ ïÐÃ¦§"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
+msgstr "ðÒÁ×ÉÌÁ Æ¦ÌØÔÒÕ×ÁÎÎÑ"
+
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
+msgstr "æ¦ÌØÔÒÕ×ÁÔÉ ÌÉÓÔÉ ÎÅÐÒÉÓÔÏÊÎÏÇÏ ×Í¦ÓÔÕ."
+
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
+msgid "Filters"
 msgstr "æ¦ÌØÔÒÉ"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
+#, fuzzy
+msgid "Find"
+msgstr "ðÏÌÅ"
+
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "ðÅÒÛÁ ÓÔÏÒ¦ÎËÁ"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "ðÅÒÛÁ ÓÔÏÒ¦ÎËÁ"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "ðÅÒÅÓÌÁÔÉ"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "ðÅÒÅÇÌÑÄ ÐÁÐÏË"
 
-msgid "Folder Prefix"
-msgstr "ðÒÅÆ¦ËÓ ÐÁÐËÉ"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "ìÀÔÉÊ"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
 
-msgid "Folders"
-msgstr "ðÁÐËÉ"
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
 
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "ðÅÒÅÓÌÁÔÉ"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "ðÅÒÅÓÌÁÔÉ:"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "ë¦ÎÅÃØ ÐÅÒÅÓÌÁÎÏÇÏ ÌÉÓÔÁ"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "ðÅÒÅÓÌÁÎÉÊ ÌÉÓÔ ×¦Ä %s"
 
-msgid "From Address"
-msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÓÅÒ×ÅÒ"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "÷¦Ä"
 
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "÷¦Ä"
 
-msgid "From:"
-msgstr "÷¦Ä:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
 
+#: compose.php:777 compose.php:781
+#, fuzzy
 msgid "Fwd:"
-msgstr ""
+msgstr "ðÅÒÅÓÌÁÔÉ:"
 
-msgid "Getting Started"
-msgstr "ðÏÒÁÄÎÉË ÐÏÞÁÔË¦×ÃÀ"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "ðÅÒÅÓÌÁÔÉ:"
 
-msgid "Help"
-msgstr "äÏÐÏÍÏÇÁ"
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "ë¦ÎÅÃØ ÐÅÒÅÓÌÁÎÏÇÏ ÌÉÓÔÁ"
 
-msgid "Hide Deleted"
-msgstr "óÈÏ×ÁÔÉ ×ÉÔÅÒÔ¦"
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "¶ÎÛ¦ ïÐÃ¦§"
 
-msgid "Hide Unsubscribed"
-msgstr "óÈÏ×ÁÔÉ ÎÅÐÅÒÅÄÐÌÁÞÅÎ¦"
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
 
-msgid "How to prefix quoted lines in a reply:"
-msgstr "ýÏ ÓÔÁ×ÉÔÉ ÐÅÒÅÄ ÃÉÔÏ×ÁÎÉÍÉ ÒÑÄËÁÍÉ Õ ×¦ÄÐÏ×¦Ä¦:"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
 
-msgid "IMP is not properly configured"
-msgstr "IMP ÎÅ ÐÏ×Î¦ÓÔÀ ÓËÏÎÆ¦ÇÕÒÏ×ÁÎÉÊ"
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "îÁÓÔÕÐÎÉÊ ÌÉÓÔ"
 
-msgid "INBOX"
-msgstr "óËÒÉÎØËÁ"
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "äÏÄÁÔÉ ÄÏ áÄÒÅÓÎÏ§ ËÎÉÇÉ (%s)"
 
-msgid "Identities"
-msgstr "¶ÐÏÓÔÁÓ¦"
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
 
-msgid "Identity's name:"
-msgstr "îÁÚ×Á ¦ÐÏÓÔÁÓ¦:"
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
 
-msgid "Ignore All"
-msgstr "¶ÇÎÏÒÕ×ÁÔÉ ×Ó¦"
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
 
-msgid "Ignore"
-msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
 
-msgid "Important messages"
-msgstr "÷ÁÖÌÉ×¦ ÌÉÓÔÉ"
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
 
-msgid "Important"
-msgstr "×ÁÖÌÉ×¦"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
 
-#, c-format
-msgid "Introduction to %s"
-msgstr "÷ÓÔÕÐ ÄÏ %s"
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
 
-msgid "Introduction"
-msgstr "÷ÓÔÕÐ"
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr ""
 
-msgid "January"
-msgstr "ó¦ÞÅÎØ"
+#: mailbox.php:367
+msgid "Hide Deleted"
+msgstr "óÈÏ×ÁÔÉ ×ÉÔÅÒÔ¦"
 
-msgid "July"
-msgstr "ìÉÐÅÎØ"
+#: folders.php:298
+msgid "Hide Unsubscribed"
+msgstr "óÈÏ×ÁÔÉ ÎÅÐÅÒÅÄÐÌÁÞÅÎ¦"
 
-msgid "June"
-msgstr "þÅÒ×ÅÎØ"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
 
-msgid "Language"
-msgstr "íÏ×Á"
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
 
-msgid "Last Page"
-msgstr "ïÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ"
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
 
-#, c-format
-msgid "Last login: %s"
-msgstr "ïÓÔÁÎÎ¦Ê ×È¦Ä: %s"
+#: config/prefs.php.dist:688
+#, fuzzy
+msgid "How do you want to display attachments?"
+msgstr "÷É ÈÏÞÅÔÅ ×¦ÄËÒÉÔÉ %s?"
 
-msgid "Last login: Never"
-msgstr "ïÓÔÁÎÎ¦Ê ×È¦Ä: Î¦ËÏÌÉ"
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
+msgstr "ýÏ ÓÔÁ×ÉÔÉ ÐÅÒÅÄ ÃÉÔÏ×ÁÎÉÍÉ ÒÑÄËÁÍÉ Õ ×¦ÄÐÏ×¦Ä¦:"
 
-#, c-format
-msgid "Log in to %s"
-msgstr "÷×¦ÊÔÉ ÄÏ %s"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
 
-msgid "Log in"
-msgstr "÷×¦ÊÔÉ"
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
 
-msgid "Logging In"
-msgstr "÷ÈÏÄÉÍÏ"
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
 
-msgid "Login Tasks"
-msgstr "úÁÄÁÞ¦, ÝÏ ×ÉËÏÎÕÀÔØÓÑ ÐÒÉ ×ÈÏÄ¦"
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
 msgstr ""
-"îÅ ×ÄÁÌÏÓÑ ××¦ÊÔÉ. íÁÂÕÔØ ÎÅÐÒÁ×ÉÌØÎÏ ×ËÁÚÁÎÁ ÎÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ ÁÂÏ "
-"ÐÁÒÏÌØ."
 
-msgid "Logout"
-msgstr "÷ÉÊÔÉ"
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
 
-msgid "Mail Filters"
-msgstr "ðÏÛÔÏ×¦ Æ¦ÌØÔÒÉ"
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
 
-msgid "Mail Management"
-msgstr "õÐÒÁ×Ì¦ÎÎÑ ÐÏÛÔÏÀ"
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
 
-msgid "Mailbox"
-msgstr "óËÒÉÎØËÁ"
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
 
-msgid "Maintenance Operations"
-msgstr "ðÒÏÆ¦ÌÁËÔÉÞÎ¦ ïÐÅÒÁÃ¦§"
+#: lib/IMP.php:866
+msgid "INBOX"
+msgstr "óËÒÉÎØËÁ"
 
-msgid "March"
-msgstr "âÅÒÅÚÅÎØ"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Mark as:"
-msgstr "÷¦ÄÍ¦ÔÉÔÉ ÑË:"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
 
-msgid "May"
-msgstr "ôÒÁ×ÅÎØ"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
 
-msgid "Message Composition"
-msgstr "óÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ"
+#: templates/compose/spelling.inc:83
+msgid "Ignore All"
+msgstr "¶ÇÎÏÒÕ×ÁÔÉ ×Ó¦"
 
-msgid "Message Date"
-msgstr "äÁÔÁ ÌÉÓÔÁ"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Message Search"
-msgstr "ðÏÛÕË ÌÉÓÔÁ"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "×ÁÖÌÉ×¦"
 
-msgid "Message Size"
-msgstr "ïÂÓÑÇ ÌÉÓÔÁ"
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "×ÁÖÌÉ×¦"
 
-msgid "Message Source"
-msgstr "÷ÉÈ¦ÄÎÉÊ ÔÅËÓÔ"
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "×ÁÖÌÉ×¦"
 
-msgid "Message Viewing"
-msgstr "ðÅÒÅÇÌÑÄ ÌÉÓÔÁ"
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "÷ÁÖÌÉ×¦ ÌÉÓÔÉ"
 
-msgid "Message fields"
-msgstr "ðÏÌÑ ÌÉÓÔÁ"
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
 
-msgid "Message flags"
-msgstr "÷¦ÄÍ¦ÔËÉ ÌÉÓÔÁ"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
 
-msgid "Message folders"
-msgstr "ðÁÐËÉ ÌÉÓÔ¦×"
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
 
-msgid "Message sent successfully, but not saved to"
-msgstr "ìÉÓÔ ÕÓÐ¦ÛÎÏ ×¦ÄÐÒÁ×ÌÅÎÉÊ, ÔÏÍÕ ÎÅ ÂÕÄÅ ÚÂÅÒÅÖÅÎÏ ÄÏ"
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
 
-msgid "Message"
-msgstr "ìÉÓÔ"
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
 
-msgid "Messages per page in the mailbox view."
-msgstr "ìÉÓÔ¦× ÎÁ ÓÔÏÒ¦ÎËÕ ÐÒÉ ÐÅÒÅÇÌÑÄ¦ ÓËÒÉÎØËÉ."
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
 
-msgid "Messages to"
-msgstr "ìÉÓÔÉ ÄÏ"
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
 
-msgid "Modify"
-msgstr "úÍ¦ÎÉÔÉ"
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
 
-msgid "Move Down"
-msgstr "ðÏÓÕÎÕÔÉ ×ÎÉÚ"
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
 
-msgid "Move Up"
-msgstr "ðÏÓÕÎÕÔÉ ×ÇÏÒÕ"
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
 
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "ðÅÒÅÎÅÓÔÉ ÌÉÓÔÉ × ÐÁÐËÕ <b>%s</b>"
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
 
-msgid "Move"
-msgstr "ðÅÒÅÎÅÓÔÉ"
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
+msgid "Important"
+msgstr "×ÁÖÌÉ×¦"
 
-msgid "Never"
-msgstr "î¦ËÏÌÉ"
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "÷ÁÖÌÉ×¦ ÌÉÓÔÉ"
 
-msgid "New Mail"
-msgstr "ó×¦ÖÁ ÐÏÛÔÁ"
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "ðÅÒÅÓÌÁÎÉÊ ÌÉÓÔ ×¦Ä %s"
 
-msgid "New User Introduction"
-msgstr "ðÏÒÁÄÎÉË ÄÌÑ ÐÏÞÁÔË¦×ÃÑ"
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
 
-msgid "New messages"
-msgstr "îÏ×¦ ÌÉÓÔÉ"
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
 
-msgid "New"
-msgstr "ÎÏ×¦"
+#: config/prefs.php.dist:492
+msgid "Include a brief summary of the header in a reply?"
+msgstr ""
 
-msgid "Next Message"
-msgstr "îÁÓÔÕÐÎÉÊ ÌÉÓÔ"
+#: config/prefs.php.dist:487
+msgid "Include original message in a reply?"
+msgstr ""
 
-msgid "Next Page"
-msgstr "îÁÓÔÕÐÎÁ ÓÔÏÒ¦ÎËÁ"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
 
-msgid "Next"
-msgstr "îÁÓÔÕÐÎÉÊ"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
 
-msgid "No folders were specified"
-msgstr "öÏÄÎÁ ÐÁÐËÁ ÎÅ ×ÉÂÒÁÎÁ"
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
 
-msgid "No messages matched your search"
-msgstr "îÅ ÚÎÁÊÄÅÎÏ ÖÏÄÎÏÇÏ ÌÉÓÔÁ ÚÁ ×ËÁÚÁÎÉÍ ËÒÉÔÅÒ¦¤Í"
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
 
-msgid "No spelling errors"
-msgstr "ïÒÆÏÇÒÁÆ¦ÞÎÉÈ ÐÏÍÉÌÏË ÎÅ ÚÎÁÊÄÅÎÏ"
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "ÖÏÄÎÏÇÏ"
 
-msgid "No subject"
-msgstr "âÅÚ ÔÅÍÉ"
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
 
-msgid "No"
-msgstr "î¦"
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
 
-msgid "None"
-msgstr "ÖÏÄÎÏÇÏ"
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
 
-msgid "Not Deleted"
-msgstr "ÎÅ ×ÉÔÅÒÔ¦"
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
 
-msgid "Not Draft"
-msgstr "ÎÅ ÞÅÒÎÅÔËÉ"
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
 
-msgid "Not Important"
-msgstr "ÎÅ ×ÁÖÌÉ×¦"
+#: mailbox.php:584 mailbox.php:626
+msgid "Invalid Address"
+msgstr ""
 
-msgid "Not Personal"
-msgstr "ÎÅ ÐÒÉ×ÁÔÎ¦"
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
 
-msgid "Not deleted messages"
-msgstr "îÅ ×ÉÔÅÒÔ¦ ÌÉÓÔÉ"
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
 
-msgid "Not important messages"
-msgstr "îÅ ×ÁÖÌÉ×¦ ÌÉÓÔÉ"
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
 
-msgid "November"
-msgstr "ìÉÓÔÏÐÁÄ"
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
-msgstr "ëiÌØËiÓÔØ ÐÁÐÏË ×iÄiÓÌÁÎÏ§ ÐÏÛÔÉ, ÑË¦ ÚÂÅÒ¦ÇÁÔÉ ÐÒÉ Í¦ÓÑÞÎÏÍÕ ×ÉÔÉÒÁÎÎ¦"
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
 
-msgid "October"
-msgstr "öÏ×ÔÅÎØ"
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
 
-msgid "Old messages"
-msgstr "óÔÁÒ¦ ÌÉÓÔÉ"
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
 
-msgid "Old sent-mail folders being purged."
-msgstr "óÔÁÒ¦ ÐÁÐËÉ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦× ÂÕÄÕÔØ ÏÞÉÝÅÎ¦."
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
 
+#: templates/pgp/pgp.inc:137
 msgid ""
-"Once you've filled in these three fields, click the \"Login\" button to "
-"proceed."
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
 msgstr ""
-"ð¦ÓÌÑ ÚÁÐÏ×ÎÅÎÎÑ ÃÉÈ ÔÒØÏÈ ÐÏÌ¦× ËÌÁÃÎ¦ÔØ ÐÏ ËÎÏÐÃ¦ \"÷×¦ÊÔÉ\" ÄÌÑ "
-"ÐÒÏÄÏ×ÖÅÎÎÑ."
 
-msgid "Open Folder"
-msgstr "÷¦ÄËÒÉÔÉ ðÁÐËÕ"
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
 
-msgid "Options"
-msgstr "ïÐÃ¦§"
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
 
-msgid "Other Options"
-msgstr "¶ÎÛ¦ ïÐÃ¦§"
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
 
-#, c-format
-msgid "Page %d of %d"
-msgstr "óÔÏÒ¦ÎËÁ %d Ú %d"
+#: templates/login/login.inc:216
+msgid "Language"
+msgstr "íÏ×Á"
 
-msgid "Part(s)"
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "ïÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ"
+
+#: mailbox.php:358
+msgid "Last Page"
+msgstr "ïÓÔÁÎÎÑ ÓÔÏÒ¦ÎËÁ"
+
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "äÏÄÁÔËÉ"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "óËÒÉÎØËÁ"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "ïÐÅÒÁÃ¦Ñ"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "÷×¦ÊÔÉ"
+
+#: lib/Block/summary.php:115
+#, php-format
+msgid "Log in to %s"
+msgstr "÷×¦ÊÔÉ ÄÏ %s"
+
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
+msgstr "÷×¦ÊÔÉ"
+
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr "úÁÄÁÞ¦, ÝÏ ×ÉËÏÎÕÀÔØÓÑ ÐÒÉ ×ÈÏÄ¦"
+
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr ""
+
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "ðÏÛÔÏ×¦ Æ¦ÌØÔÒÉ"
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "óËÒÉÎØËÁ"
+
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "ðÏÛÔÏ×¦ Æ¦ÌØÔÒÉ"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
+msgid "Mailbox"
+msgstr "óËÒÉÎØËÁ"
+
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "ïÐÃ¦§ ×¦ÄÏÂÒÁÖÅÎÎÑ"
+
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
+msgid "Mark as:"
+msgstr "÷¦ÄÍ¦ÔÉÔÉ ÑË:"
+
+#: config/prefs.php.dist:650
+msgid "Mark different levels of quoting with different colors?"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "äÏÄÁÔÏË"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÓÅÒ×ÅÒ"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+#, fuzzy
+msgid "Meeting Update"
+msgstr "ðÏÒÁÄÎÉË ÐÏÞÁÔË¦×ÃÀ"
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "÷¦ÄËÒÉÔÉ ðÁÐËÕ"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "ìÉÓÔ"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr "óÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ"
+
+#: config/prefs.php.dist:917
+msgid "Message Date"
+msgstr "äÁÔÁ ÌÉÓÔÁ"
+
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "ìÉÓÔÉ ÄÏ"
+
+#: search.php:312
+msgid "Message Search"
+msgstr "ðÏÛÕË ÌÉÓÔÁ"
+
+#: config/prefs.php.dist:921
+msgid "Message Size"
+msgstr "ïÂÓÑÇ ÌÉÓÔÁ"
+
+#: message.php:384
+msgid "Message Source"
+msgstr "÷ÉÈ¦ÄÎÉÊ ÔÅËÓÔ"
+
+#: config/prefs.php.dist:66
+msgid "Message Viewing"
+msgstr "ðÅÒÅÇÌÑÄ ÌÉÓÔÁ"
+
+#: templates/search/main.inc:6
+msgid "Message flags"
+msgstr "÷¦ÄÍ¦ÔËÉ ÌÉÓÔÁ"
+
+#: templates/search/main.inc:83
+msgid "Message folders"
+msgstr "ðÁÐËÉ ÌÉÓÔ¦×"
+
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "ðÁÐËÉ ÌÉÓÔ¦×"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "äÏÄÁÔÏË ×ÉÔÅÒÔÏ"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "ðÏÌÑ ÌÉÓÔÁ"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "ðÏÌÑ ÌÉÓÔÁ"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "äÁÔÁ ÌÉÓÔÁ"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
+msgstr "ìÉÓÔ ÕÓÐ¦ÛÎÏ ×¦ÄÐÒÁ×ÌÅÎÉÊ, ÔÏÍÕ ÎÅ ÂÕÄÅ ÚÂÅÒÅÖÅÎÏ ÄÏ"
+
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "ìÉÓÔ ÕÓÐ¦ÛÎÏ ×¦ÄÐÒÁ×ÌÅÎÉÊ, ÔÏÍÕ ÎÅ ÂÕÄÅ ÚÂÅÒÅÖÅÎÏ ÄÏ"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "ìÉÓÔ ÕÓÐ¦ÛÎÏ ×¦ÄÐÒÁ×ÌÅÎÉÊ, ÔÏÍÕ ÎÅ ÂÕÄÅ ÚÂÅÒÅÖÅÎÏ ÄÏ"
+
+#: config/prefs.php.dist:941
+msgid "Messages per page in the mailbox view."
+msgstr "ìÉÓÔ¦× ÎÁ ÓÔÏÒ¦ÎËÕ ÐÒÉ ÐÅÒÅÇÌÑÄ¦ ÓËÒÉÎØËÉ."
+
+#: mailbox.php:322
+msgid "Messages to"
+msgstr "ìÉÓÔÉ ÄÏ"
+
+#: templates/acl/acl.inc:29
+msgid "Modify"
+msgstr "úÍ¦ÎÉÔÉ"
+
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move"
+msgstr "ðÅÒÅÎÅÓÔÉ"
+
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "ÐÏÓÕÎÕÔÉ ×ÎÉÚ"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "×ÉÂÒÁÔÉ ÐÁÐËÕ"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "ÐÏÓÕÎÕÔÉ ××ÅÒÈ"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "ðÅÒÅÇÌÑÄ ÌÉÓÔÁ"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
+msgid "Name"
+msgstr ""
+
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "ïÐÅÒÁÃ¦Ñ"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
+msgid "Never"
+msgstr "î¦ËÏÌÉ"
+
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "äÏÄÁÔÏË ×ÉÔÅÒÔÏ"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "ÎÏ×¦"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "÷¦ÄËÒÉÔÉ ðÁÐËÕ"
+
+#: config/prefs.php.dist:88
+msgid "New Mail"
+msgstr "ó×¦ÖÁ ÐÏÛÔÁ"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "îÁÓÔÕÐÎÉÊ ÌÉÓÔ"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "îÏ×¦ ÌÉÓÔÉ"
+
+#: templates/search/main.inc:19
+msgid "New messages"
+msgstr "îÏ×¦ ÌÉÓÔÉ"
+
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "îÁÓÔÕÐÎÉÊ"
+
+#: templates/message/navbar_navigate.inc:33
+msgid "Next Message"
+msgstr "îÁÓÔÕÐÎÉÊ ÌÉÓÔ"
+
+#: mailbox.php:356
+msgid "Next Page"
+msgstr "îÁÓÔÕÐÎÁ ÓÔÏÒ¦ÎËÁ"
+
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "î¦"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "îÏ×¦ ÌÉÓÔÉ"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "÷ÉÐÒÁ×ÌÅÎÉÊ ÔÅËÓÔ"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "äÏÄÁÔËÉ"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "ÖÏÄÎÁ ÐÁÐËÁ ÎÅ ×ÉÂÒÁÎÁ"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
+msgid "No folders were specified"
+msgstr "öÏÄÎÁ ÐÁÐËÁ ÎÅ ×ÉÂÒÁÎÁ"
+
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "îÅ ×ÉÔÅÒÔ¦ ÌÉÓÔÉ"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "îÅ ×ÉÔÅÒÔ¦ ÌÉÓÔÉ"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "ÐÅÒÅÎÅÓÔÉ ÌÉÓÔ ×"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
+msgstr "îÅ ÚÎÁÊÄÅÎÏ ÖÏÄÎÏÇÏ ÌÉÓÔÁ ÚÁ ×ËÁÚÁÎÉÍ ËÒÉÔÅÒ¦¤Í"
+
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
+msgid "No spelling errors"
+msgstr "ïÒÆÏÇÒÁÆ¦ÞÎÉÈ ÐÏÍÉÌÏË ÎÅ ÚÎÁÊÄÅÎÏ"
+
+#: templates/compose/spelling.inc:100
+#, fuzzy
+msgid "No suggestions"
+msgstr "ðÒÏÐÏÚÉÃ¦§"
+
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "öÏÄÎÁ ÐÁÐËÁ ÎÅ ×ÉÂÒÁÎÁ"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
+msgid "None"
+msgstr "ÖÏÄÎÏÇÏ"
+
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
+msgid "Not Deleted"
+msgstr "ÎÅ ×ÉÔÅÒÔ¦"
+
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
+msgid "Not Draft"
+msgstr "ÎÅ ÞÅÒÎÅÔËÉ"
+
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
+msgid "Not Important"
+msgstr "ÎÅ ×ÁÖÌÉ×¦"
+
+#: templates/mailbox/navbar.inc:25
+msgid "Not Personal"
+msgstr "ÎÅ ÐÒÉ×ÁÔÎ¦"
+
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
+msgid "Not deleted messages"
+msgstr "îÅ ×ÉÔÅÒÔ¦ ÌÉÓÔÉ"
+
+#: templates/search/main.inc:51
+msgid "Not important messages"
+msgstr "îÅ ×ÁÖÌÉ×¦ ÌÉÓÔÉ"
+
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "ãÉÔÕÀ"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"ëiÌØËiÓÔØ ÐÁÐÏË ×iÄiÓÌÁÎÏ§ ÐÏÛÔÉ, ÑË¦ ÚÂÅÒ¦ÇÁÔÉ ÐÒÉ Í¦ÓÑÞÎÏÍÕ ×ÉÔÉÒÁÎÎ¦"
+
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"ëiÌØËiÓÔØ ÐÁÐÏË ×iÄiÓÌÁÎÏ§ ÐÏÛÔÉ, ÑË¦ ÚÂÅÒ¦ÇÁÔÉ ÐÒÉ Í¦ÓÑÞÎÏÍÕ ×ÉÔÉÒÁÎÎ¦"
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr ""
+
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "óÔÁÒ¦ ÌÉÓÔÉ"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "óÔÁÒ¦ ÐÁÐËÉ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦× ÂÕÄÕÔØ ÏÞÉÝÅÎ¦."
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "âÕÄØ-ÌÁÓËÁ, ×ËÁÖ¦ÔØ Ô¦ÌØËÉ ÏÄÎÕ ÐÁÐËÕ ÄÌÑ Ã¦¤§ ÏÐÅÒÁÃ¦§."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "÷¦ÄËÒÉÔÉ ðÁÐËÕ"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "÷¦ÄËÒÉÔÉ ðÁÐËÕ"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "¶ÎÛ¦ ïÐÃ¦§"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "¶ÎÛ¦ ïÐÃ¦§"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "÷¦ÄÍ¦ÎÉÔÉ ÌÉÓÔ"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "ðÏÍÉÌËÁ"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "ïÐÃ¦§"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ÓÔ×ÏÒÅÎÏ."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ×ÉÔÅÒÔÏ."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "÷¦Ä¦ÓÌÁÔÉ ìÉÓÔÁ"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "ð¦ÄÐÉÓ ÕÓÐ¦ÛÎÏ ÚÍ¦ÎÅÎÉÊ."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
+
+#: templates/mailbox/header.inc:19
+#, php-format
+msgid "Page %d of %d"
+msgstr "óÔÏÒ¦ÎËÁ %d Ú %d"
+
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
+msgid "Part(s)"
 msgstr "âÌÏË(É)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "ìÉÓÔ ÕÓÐ¦ÛÎÏ ×¦ÄÐÒÁ×ÌÅÎÉÊ, ÔÏÍÕ ÎÅ ÂÕÄÅ ÚÂÅÒÅÖÅÎÏ ÄÏ"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "ðÁÒÏÌØ"
 
-msgid "Path to your mail folders:"
-msgstr "ûÌÑÈ ÄÏ ÷ÁÛÉÈ ÐÏÛÔÏ×ÉÈ ÐÁÐÏË:"
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
+msgstr "îÁÌÁÛÔÕÊÔÅ ÏÐÅÒÁÃ¦§ ÏÂÓÌÕÇÏ×Õ×ÁÎÎÑ ÄÌÑ ÚÁÐÕÓËÕ ÐÒÉ ×ÈÏÄ¦ × IMP."
 
-msgid "Personal Information"
-msgstr "ïÓÏÂÉÓÔÁ ¶ÎÆÏÒÍÁÃ¦Ñ"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
 
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "ÐÒÉ×ÁÔÎ¦"
 
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "ïÓÏÂÉÓÔÁ ¶ÎÆÏÒÍÁÃ¦Ñ"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "òÏÚÍ¦ÝÕ×ÁÔÉ ÷ÁÛ Ð¦ÄÐÉÓ ÐÅÒÅÄ ÃÉÔÏ×ÁÎÉÍÉ ÌÉÓÔÁÍÉ ÐÒÉ ×¦ÄÐÏ×¦Ä¦?"
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "\\nâÕÄØ-ÌÁÓËÁ, ××ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ:\\n"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
+#, fuzzy
+msgid "Please enter the name of the new folder:"
+msgstr "\\nâÕÄØ-ÌÁÓËÁ, ××ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ:\\n"
+
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "âÕÄØ-ÌÁÓËÁ, ××ÅÄ¦ÔØ ÎÏ×Õ ÎÁÚ×Õ:"
 
-msgid "Please enter valid search criteria."
-msgstr "âÕÄØ-ÌÁÓËÁ, ××ÅÄ¦ÔØ ÐÒÁ×ÉÌØÎÉÊ ËÒÉÔÅÒ¦Ê ÐÏÛÕËÕ."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
 
-msgid "Please provide your username and password"
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "âÕÄØ-ÌÁÓËÁ, ×ËÁÖ¦ÔØ ÷ÁÛÕ îÁÚ×Õ ËÏÒÉÓÔÕ×ÁÞÁ ¦ ðÁÒÏÌØ"
+
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "âÕÄØ-ÌÁÓËÁ, ×ËÁÖ¦ÔØ ÷ÁÛÕ îÁÚ×Õ ËÏÒÉÓÔÕ×ÁÞÁ ¦ ðÁÒÏÌØ"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "âÕÄØ-ÌÁÓËÁ, ÐÅÒÅ×¦ÒÔÅ ¦ÓÔÉÎÎ¦ÓÔØ ×ËÁÚÁÎÉÈ ÁÄÒÅÓ."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "âÕÄØ-ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ÐÁÐËÕ, ÐÅÒÛ Î¦Ö ÐÒÏ×ÏÄÉÔÉ ÂÕÄØ-ÑË¦ ÏÐÅÒÁÃ¦§."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "âÕÄØ-ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ÈÏÞÁ Â ÏÄÎÕ ÐÁÐËÕ ÄÌÑ ÐÏÛÕËÕ."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "âÕÄØ-ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ÈÏÞÁ Â ÏÄÎÕ ÐÁÐËÕ ÄÌÑ ÐÏÛÕËÕ."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "âÕÄØ-ÌÁÓËÁ, ×ËÁÖ¦ÔØ Ô¦ÌØËÉ ÏÄÎÕ ÐÁÐËÕ ÄÌÑ Ã¦¤§ ÏÐÅÒÁÃ¦§."
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "âÕÄØ-ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ÁÂÏ ×¦ÄÒÅÄÁÇÕÊÔÅ ÎÁÓÔÕÐÎÅ:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "óÔÁ×ÉÔÉ ÐÅÒÅÄ Ð¦ÄÐÉÓÏÍ ÄÁÛÏË ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ÓÔ×ÏÒÅÎÏ."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "ðÏÐÅÒÅÄÎÑ óÔÏÒ¦ÎËÁ"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "ðÏÐÅÒÅÄÎ¦Ê ìÉÓÔ"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "ðÏÐÅÒÅÄÎÑ óÔÏÒ¦ÎËÁ"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "äÒÕË"
 
-msgid "Problem?"
-msgstr "ðÒÏÂÌÅÍÁ?"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "äÒÕË"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "úÎÉÝÉÔÉ ×ÉÔÅÒÔ¦"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "úÎÉÝÉÔÉ ×ÉÔÅÒÔ¦"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "÷ÉÔÅÒÔÉ ÐÁÐËÕ"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "ñË ÞÁÓÔÏ ÏÞÉÝÁÔÉ óÍ¦ÔÎÉË:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "úÎÉÝÉÔÉ ÌÉÓÔÉ × óÍ¦ÔÎÉËÕ, ÑË¦ ÓÔÁÒÛ¦ ÚÁ ÔÁËÕ Ë¦ÌØË¦ÓÔØ Ä¦Â"
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "úÎÉÝÉÔÉ ÓÔÁÒÉÊ ÌÉÓÔ × óÍ¦ÔÎÉËÕ"
 
-msgid "Purging "
-msgstr "úÎÉÝÅÎÎÑ "
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "úÎÉÝÉÔÉ ÓÔÁÒÉÊ ÌÉÓÔ × óÍ¦ÔÎÉËÕ"
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "úÎÉÝÉÔÉ ÓÔÁÒÉÊ ÌÉÓÔ × óÍ¦ÔÎÉËÕ"
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
 
-msgid "Quoting"
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "ãÉÔÕÀ"
 
-msgid "Received after:"
-msgstr "ïÔÒÉÍÁÎ¦ Ð¦ÓÌÑ:"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "ïÔÒÉÍÁÎ¦ ×:"
 
-msgid "Received before:"
-msgstr "ïÔÒÉÍÁÎ¦ ÄÏ:"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "ïÔÒÉÍÁÎ¦ ×:"
 
-msgid "Received on:"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "ïÔÒÉÍÁÎ¦ ×:"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ ìÉÓÔ"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ ÃÅÊ ìÉÓÔ"
 
-msgid "Redirect"
-msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÎÑ ÎÅ×ÄÁÌÅ."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "ïÂÎÏ×ÉÔÉ"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "ïÂÎÏ×ÉÔÉ ×ÉÇÌÑÄ ðÁÐÏË:"
 
-msgid "Refresh"
-msgstr "ïÂÎÏ×ÉÔÉ"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "ðÅÒÅÞÉÔÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "ðÅÒÅÞÉÔÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "ðÁÍ'ÑÔÁÔÉ ÏÓÔÁÎÎ¤ ×¦ÄÏÂÒÁÖÅÎÎÑ"
 
-msgid "Remove Selected"
-msgstr "úÁÂÒÁÔÉ ×ÉÄ¦ÌÅÎ¦"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "óËÒÉÎØËÁ"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "×ÉÄÁÌÉÔÉ ÄÖÅÒÅÌÏ"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ðÁÐËÕ"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÐÁÐËÕ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦× ÎÁ ÐÏÞÁÔËÕ Í¦ÓÑÃÑ"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÊÍÅÎÕ×ÁÔÉ \"%s\" ÎÁ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ ×Ó¦Í"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "úÁÍ¦ÎÉÔÉ ÎÁ:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "÷¦ÄÐÏ×¦ÓÔÉ ×Ó¦Í"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "÷¦ÄÐÏ×¦ÄØ ×Ó¦Í:"
 
-msgid "Reply"
-msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ ×Ó¦Í"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "÷¦ÄÐÏ×¦ÄØ ×Ó¦Í:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ ×Ó¦Í"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
 msgstr ""
 
-msgid "Reply-to"
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
 msgstr ""
 
-msgid "Reply:"
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
 msgstr ""
 
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+
+#: lib/Compose.php:409
+#, fuzzy
+msgid "Reply-To: "
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+
+#: compose.php:731
+#, fuzzy
+msgid "Reply:"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "ãÅÊ ÌÉÓÔ - ÓÐÁÍ"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "ãÅÊ ÌÉÓÔ - ÓÐÁÍ"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "ð¦ÄÔ×ÅÒÄÉÔÉ ÏÔÒÉÍÁÎÎÑ"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "ð¦ÄÔ×ÅÒÄÉÔÉ ÏÔÒÉÍÁÎÎÑ"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "ïÞÉÓÔÉÔÉ"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "ðÒÏÄÏ×ÖÉÔÉ"
 
-msgid "Return to Welcome Screen"
-msgstr "ðÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÷¦ËÎÁ ÷ÈÏÄÕ"
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "óÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "¶ÎÛ¦ ïÐÃ¦§"
 
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "ðÏ×ÅÒÎÕÔÉÓÑ ÄÏ ÓËÒÉÎØËÉ Ð¦ÓÌÑ ×ÉÔÉÒÁÎÎÑ, ÐÅÒÅÎÅÓÅÎÎÑ ÁÂÏ ËÏÐ¦À×ÁÎÎÑ ìÉÓÔÁ?"
 
-msgid "Rule Definition"
-msgstr "ïÐÉÓ ðÒÁ×ÉÌÁ"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "ïÐÃ¦§"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ×ÉÔÅÒÔÏ."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "÷¦Ä¦ÓÌÁÔÉ ìÉÓÔÁ"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "ôÅÍÁ"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "úÂÅÒÅÇÔÉ ËÏÐ¦À × "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "úÂÅÒÅÇÔÉ"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "úÂÅÒÅÇÔÉ"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "úÂÅÒÅÇÔÉ þÅÒÎÅÔËÕ"
 
-msgid "Save a copy in "
-msgstr "úÂÅÒÅÇÔÉ ËÏÐ¦À × "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "úÂÅÒÅÇÔÉ"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "ïÐÃ¦§"
 
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "úÂÅÒÅÇÔÉ þÅÒÎÅÔËÕ"
+
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "úÂÅÒÅÇÔÉ"
 
-msgid "Save as..."
-msgstr "úÂÅÒÅÇÔÉ ÑË..."
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "úÂÅÒ¦ÇÁÔÉ ×¦Ä¦ÓÌÁÎÕ ÐÏÛÔÕ"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÞÅÒÎÅÔËÕ. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ: %s"
 
-msgid "Search Results"
-msgstr "òÅÚÕÌØÔÁÔÉ ðÏÛÕËÕ"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "ðÏÛÕË"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "ðÏÛÕË"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "¶ÎÛ¦ ïÐÃ¦§"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "òÅÚÕÌØÔÁÔÉ ðÏÛÕËÕ"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "ÐÒÏÞÉÔÁÎ¦"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "÷ÉÂÒÁÔÉ"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "îÅ ×ÉÂÉÒÁÔÉ ÖÏÄÎÏÇÏ"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "÷ÉÂÅÒ¦ÔØ ¦ÐÏÓÔÁÓØ"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "÷ÉÂÒÁÔÉ ×Ó¦"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "îÅ ×ÉÂÉÒÁÔÉ ÖÏÄÎÏÇÏ"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "÷ÉÂÅÒ¦ÔØ ÁÄÒÅÓÎ¦ ËÎÉÇÉ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ ¦ ÐÏÛÕËÕ ÁÄÒÅÓ."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "÷ÉÂÒÁÔÉ ×Ó¦"
 
-msgid "Select an identity"
-msgstr "÷ÉÂÅÒ¦ÔØ ¦ÐÏÓÔÁÓØ"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "÷ËÁÖ¦ÔØ ÞÅÒÇÏ×¦ÓÔØ áÄÒÅÓÎÉÈ ËÎÉÇ ÄÌÑ ÐÏÛÕËÕ ÁÂÏ ×ÓÔÁ×ËÉ ¦ÍÅÎ."
 
-msgid "Select charset:"
-msgstr "÷ÉÂÅÒ¦ÔØ ËÏÄÏ×Õ ÔÁÂÌÉÃÀ:"
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "îÅ ×ÉÂÉÒÁÔÉ ÖÏÄÎÏÇÏ"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "îÅ ×ÉÂÉÒÁÔÉ ÖÏÄÎÏÇÏ"
 
-msgid "Select your preferred language:"
-msgstr "÷ÉÂÅÒ¦ÔØ ÂÁÖÁÎÕ ÍÏ×Õ:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "÷ÉÂÒÁÔÉ"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "÷ÉÂÒÁÎ¦ áÄÒÅÓÎ¦ ËÎÉÇÉ:"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÓÅÒ×ÅÒ"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ìÉÓÔÁ"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "ðÁÐËÁ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦×:"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "ðÁÐËÁ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦×:"
 
-msgid "September"
-msgstr "÷ÅÒÅÓÅÎØ"
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "óÅÒ×ÅÒ"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÓÅÒ×ÅÒ"
 
-msgid "Server"
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
 msgstr "óÅÒ×ÅÒ"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÐÒÁ×ÉÌÁ Æ¦ÌØÔÒÕ×ÁÎÎÑ ÌÉÓÔ¦× ÎÅÂÁÖÁÎÏÇÏ ÚÍ¦ÔÕ."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "÷ËÁÖ¦ÔØ, ÝÏ ÍÁ¤ ×¦ÄÂÕÔÉÓÑ ÐÒÉ ÐÅÒÅÎÅÓÅÎÎ¦ ÁÂÏ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦×."
 
-msgid "Set the current time zone."
-msgstr "÷ÓÔÁÎÏ×¦ÔØ ÐÏÔÏÞÎÉÊ ÞÁÓÏ×ÉÊ ÐÏÑÓ."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "úÍ¦ÎÉÔÉ ÐÁÐËÕ"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "ðÁÐËÁ ×¦Ä¦ÓÌÁÎÉÈ ÌÉÓÔ¦×:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "÷ÓÔÁÎÏ×¦ÔØ ÍÏ×Õ ÄÌÑ ÍÅÎÀ, ÐÏÑÓÎÅÎØ ¦ ÄÏÐÏÍÏÇÉ."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "úÁËÒÉ×ÁÔÉ ×¦ËÎÏ óÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ Ð¦ÓÌÑ ÚÂÅÒÅÖÅÎÎÑ ÞÅÒÎÅÔËÉ?"
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "úÇÏÒÎÕÔÉ ×Ó¦ ÐÁÐËÉ"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "ðÏËÁÚÁÔÉ ×ÉÔÅÒÔ¦"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "ïÓÏÂÉÓÔÁ ¶ÎÆÏÒÍÁÃ¦Ñ"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "ðÅÒÅÄÐÌÁÔÉÔÉ ðÁÐËÕ(É)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "ðÏËÁÚÁÔÉ ÎÅÐÅÒÅÄÐÌÁÞÅÎ¦"
 
-msgid "Show last login time when logging in"
-msgstr "ðÏËÁÚÕ×ÁÔÉ ÞÁÓ ÏÓÔÁÎÎØÏÇÏ ×ÈÏÄÕ ÐÒÉ ×ÈÏÄ¦"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
+
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
+msgstr "ìÉÓÔ¦× ÎÁ ÓÔÏÒ¦ÎËÕ ÐÒÉ ÐÅÒÅÇÌÑÄ¦ ÓËÒÉÎØËÉ."
+
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+#, fuzzy
+msgid "Show total number of mails in folder?"
+msgstr "ûÌÑÈ ÄÏ ÷ÁÛÉÈ ÐÏÛÔÏ×ÉÈ ÐÁÐÏË:"
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "ïÂÓÑÇ"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "ïÂÓÑÇ"
+
+#: templates/compose/attachments.inc:3
+msgid "Size"
+msgstr "ïÂÓÑÇ"
+
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "ïÂÓÑÇ ÌÉÓÔÁ"
 
-msgid "Size"
-msgstr "ïÂÓÑÇ"
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr " ôÅÍÁ: "
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "äÅÑË¦ ËÏÎÆ¦ÇÕÒÁÃ¦ÊÎ¦ ÆÁÊÌÉ IMP ×¦ÄÓÕÔÎ¦:"
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr ""
 
-msgid "Sort Direction"
-msgstr "îÁÐÒÑÍ ÓÏÒÔÕ×ÁÎÎÑ"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
 
-msgid "Spam Report from"
-msgstr "ðÏ×¦ÄÏÍÌÅÎÎÑ ÐÒÏ ÓÐÁÍ ×¦Ä"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "óÍ¦ÔÎÉË:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "óÐÅÃ¦ÁÌØÎ¦ ÓÉÍ×ÏÌÉ"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "ðÅÒÅ×¦ÒËÁ ÐÒÁ×ÏÐÉÓÕ"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "ðÒÏÇÒÁÍÁ ÐÅÒÅ×¦ÒËÉ ÐÒÁ×ÏÐÉÓÕ"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "ðÅÒÅ×¦ÒËÕ ÐÒÁ×ÏÐÉÓÕ ÚÁ×ÅÒÛÅÎÏ"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "ïÒÆÏÇÒÁÆ¦ÞÎÉÈ ÐÏÍÉÌÏË ÎÁ ÅËÒÁÎ ÐÒÉ ÐÅÒÅ×¦ÒÃ¦."
 
-msgid "Subject Field"
-msgstr "ðÏÌÅ ôÅÍÉ"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "äÏÄÁÔÏË"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "ôÅÍÁ"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "ôÅÍÁ"
 
-msgid "Subject:"
-msgstr "ôÅÍÁ:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "ðÏÌÅ ôÅÍÉ"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "ôÅÍÁ"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "ðÅÒÅÄÐÌÁÔÉÔÉ ðÁÐËÕ(É)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "õÓÐ¦ÛÎÏ"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "ðÒÏÐÏÚÉÃ¦§"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "ôÅËÓÔ"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "ôÅËÓÔ"
 
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
 msgid ""
-"The Compose Window allows you to set, among other things, the message "
-"recipient's address (who you're sending mail to), the message subject, and "
-"the message contents.  Simply fill out the appropriate fields at the top of "
-"the window (only the To: address is required, but the Subject: is suggested) "
-"and type your message in the large lower field.  Once you've completed "
-"entering your message, you may choose to Spell Check your message text.  "
-"Once you're done composing your new message, click the \"Send\" button to "
-"send the message to the recipient."
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
 msgstr ""
-"÷¦ËÎÏ óÔ×ÏÒÅÎÎÑ ìÉÓÔÁ ÄÏÚ×ÏÌÑ¤ ÷ÁÍ ×ËÁÚÁÔÉ ÁÄÒÅÓÕ ÏÔÒÉÍÕ×ÁÞÁ ÌÉÓÔÁ, "
-"ÔÅÍÕ ÌÉÓÔÁ ¦ ×ÌÁÓÎÅ ÔÅËÓÔ ÌÉÓÔÁ. úÁÐÏ×Î¦ÔØ ÎÅÏÂÈ¦ÄÎ¦ ÐÏÌÑ Õ ×ÅÒÈÎ¦Ê "
-"ÞÁÓÔÉÎ¦ ×¦ËÎÁ (Ô¦ÌØËÉ ÐÏÌÅ ëÏÍÕ: ¤ ÏÂÏ×'ÑÚËÏ×ÉÍ, ÐÏÌÅ ôÅÍÁ: ¤ ÂÁÖÁÎÉÍ, ÁÌÅ"
-"ÎÅ ÏÂÏ×'ÑÚËÏ×ÉÍ. õ ×ÅÌÉËÏÍÕ ÎÉÖÞÅ ÎÁÂÅÒ¦ÔØ ÔÅËÓÔ ÷ÁÛÏÇÏ ÌÉÓÔÁ. íÏÖÎÁ "
-"ÓËÏÒÉÓÔÁÔÉÓÑ ÐÅÒÅ×¦ÒËÏÀ ÏÒÆÏÇÒÁÆ¦§, ÎÁÔÉÓÎÕ×ÛÉ ÎÁ ×¦ÄÐÏ×¦ÄÎÕ ¦ËÏÎËÕ. "
-"ðÏ ÚÁ×ÅÒÛÅÎÎ¦ ÓÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ ÎÁÔÉÓÎ¦ÔØ ÎÁ ËÎÏÐËÕ ÷¦Ä¦ÓÌÁÔÉ. ìÉÓÔ ÂÕÄÅ "
-"×¦Ä¦ÓÌÁÎÏ ÁÄÒÅÓÁÔÕ."
 
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
 
-msgid "The Compose Window"
-msgstr "÷¦ËÎÏ óÔ×ÏÒÅÎÎÑ ÌÉÓÔÁ"
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
 
-msgid "The Mailbox Listing"
-msgstr "ðÅÒÅÇÌÑÄ ÓËÒÉÎØËÉ"
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÎÉÝÅÎÏ."
 
-msgid ""
-"The Message Screen display the contents of the selected message.  From here, "
-"you can browse message attachments, reply to the current message, delete the "
-"current message, or advance to the next message in your current mailbox."
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÂÅÒÅÖÅÎÏ."
+
+#: attachment.php:43
+msgid "The attachment was not found."
 msgstr ""
 
-msgid "The Message Screen"
-msgstr "ðÅÒÅÇÌÑÄ ìÉÓÔÁ"
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
 
+#: templates/javascript/open_compose_win.js:37
 msgid ""
-"The contents of your Inbox folder will be displayed immediately upon logging "
-"in.  The Mailbox Listing shows the contents of each message's header "
-"(message status, date sent, sender, subject, and size).  Each column has a "
-"heading.  Clicking on the heading will cause the listing to be sorted by "
-"that column."
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
 msgstr ""
-"÷¦ËÎÏ ðÅÒÅÇÌÑÄÕ ìÉÓÔÁ ×¦ÄÏÂÒÁÖÁ¤ ×Í¦ÓÔ ×ÉÂÒÁÎÏÇÏ ÷ÁÍÉ ÌÉÓÔÁ. ú×¦ÄÓÉ ÷É "
-"ÍÏÖÅÔÅ ÐÅÒÅÇÌÑÎÕÔÉ ÄÏÄÁÔËÉ, ÄÁÔÉ ×¦ÄÐÏ×¦ÄØ ÎÁ ÌÉÓÔ, ×ÉÔÅÒÔÉ ÊÏÇÏ ÁÂÏ "
-"ÐÅÒÅÊÔÉ ÎÁ ÎÁÓÔÕÐÎÉÊ ÌÉÓÔ Õ ÷ÁÛ¦Ê ÐÏÛÔÏ×¦Ê ÓËÒÉÎØÃ¦."
 
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "ðÏÔÏÞÎÁ ÐÁÐËÁ(É) \"%s\" ÂÕÄÅ ÐÅÒÅÊÍÅÎÏ×ÁÎÁ ÎÁ \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÎÉÝÅÎÏ."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "ðÁÐËÁ \"%s\" ×ÖÅ ¦ÓÎÕ¤"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1165,472 +4060,1187 @@
 "ðÁÐËÁ \"%s\" Í¦ÓÔÉÔØ ÎÅÄÏÚ×ÏÌÅÎ¦ ÓÉÍ×ÏÌÉ × ÎÁÚ×¦. ãÅ ÍÏÖÅ ÓÐÒÉÞÉÎÉÔÉ "
 "ÐÒÏÂÌÅÍÉ. âÕÄØ-ÌÁÓËÁ, ÐÏÒÁÄØÔÅÓÑ Ú ÓÉÓÔÅÍÎÉÍ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÏÍ."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "ðÁÐËÕ \"%s\" ÓÔ×ÏÒÅÎÏ, ÁÌÅ ÷É §§ ÎÅ ÐÅÒÅÄÐÌÁÔÉÌÉ."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "ðÁÐËÕ \"%s\" ÂÕÌÏ ÚÎÉÝÅÎÏ, ÁÌÅ ÷É ÎÅ ×¦ÄÍ¦ÎÉÌÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ ÎÅ§."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "ðÁÐËÁ \"%s\" ÎÅ ÂÕÌÁ ÓÔ×ÏÒÅÎÁ. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "ðÁÐËÁ \"%s\" ÎÅ ÂÕÌÁ ÚÎÉÝÅÎÁ. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ÓÔ×ÏÒÅÎÏ."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ×ÉÔÅÒÔÏ."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "ðÁÐËÁ \"%s\" ÕÓÐ¦ÛÎÏ ÐÅÒÅÊÍÅÎÏ×ÁÎÁ ÎÁ \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+#, fuzzy
+msgid "The mail server generated the following informational message:"
+msgstr "÷ËÁÖ¦ÔØ ÷ÁÛ ÐÏÛÔÏ×ÉÊ ÓÅÒ×ÅÒ ÔÁ ¦ÎÆÏÒÍÁÃ¦À ÐÒÏ ÐÁÐËÉ."
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "ðÁÐËÁ \"%s\" ×ÖÅ ¦ÓÎÕ¤"
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr ""
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÎÉÝÅÎÏ."
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÂÅÒÅÖÅÎÏ."
 
-msgid "The signature couldn't be replaced."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "îÅÍÏÖÌÉ×Ï ÚÍ¦ÎÉÔÉ Ð¦ÄÐÉÓ."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "ð¦ÄÐÉÓ ÕÓÐ¦ÛÎÏ ÚÍ¦ÎÅÎÉÊ."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÂÅÒÅÖÅÎÏ."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÎÉÝÅÎÏ."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "¶ÐÏÓÔÁÓØ \"%s\" ÚÎÉÝÅÎÏ."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "×ÉÔÅÒÔÉ ÌÉÓÔ"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ ÃÅÊ ìÉÓÔ"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "ð¦ÄÐÉÓ ÕÓÐ¦ÛÎÏ ÚÍ¦ÎÅÎÉÊ."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "îÅÍÁ ÖÏÄÎÏÇÏ ÌÉÓÔÁ × ÓËÒÉÎØÃ¦."
 
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÏÞÉÝÅÎÎ¦ %s. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÏÞÉÝÅÎÎ¦ ÓËÒÉÎØËÉ. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÏÞÉÝÅÎÎ¦ ÓËÒÉÎØËÉ. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
+#: lib/Message.php:90
+#, fuzzy, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ËÏÐ¦À×ÁÎÎ¦ ÌÉÓÔ¦× ÄÏ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr ""
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× Ú ÐÁÐËÉ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: lib/Message.php:275
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× × ÐÁÐÃ¦ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦×. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÏÂÒÁÖÅÎÎÑ ÚÁÍÏ×ÌÅÎÏÇÏ ÌÉÓÔÁ."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
+#, fuzzy
+msgid "There was an error displaying this message part"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÓÉÌÁÎÎÑ ÷ÁÛÏÇÏ ÌÉÓÔÁ"
+
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
+msgid ""
+"There was an error flagging messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÐÏÚÎÁÞÅÎÎ¦ ÌÉÓÔ¦× × ÐÁÐÃ¦ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÞÅÒÎÅÔËÉ."
+
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÏÂÒÁÖÅÎÎÑ ÚÁÍÏ×ÌÅÎÏÇÏ ÌÉÓÔÁ."
+
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÏÂÒÁÖÅÎÎÑ ÚÁÍÏ×ÌÅÎÏÇÏ ÌÉÓÔÁ."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÏÂÒÁÖÅÎÎÑ ÚÁÍÏ×ÌÅÎÏÇÏ ÌÉÓÔÁ."
+
+#: lib/Message.php:85
+#, fuzzy, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÐÅÒÅÎÅÓÅÎÎ¦ ÌÉÓÔ¦× ÄÏ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÞÅÒÎÅÔËÉ."
+
+#: compose.php:1006
+#, fuzzy, php-format
+msgid "There was an error sending your message: %s"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÓÉÌÁÎÎÑ ÷ÁÛÏÇÏ ÌÉÓÔÁ"
+
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÏÂÒÁÖÅÎÎÑ ÚÁÍÏ×ÌÅÎÏÇÏ ÌÉÓÔÁ."
+
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÓÉÌÁÎÎÑ ÷ÁÛÏÇÏ ÌÉÓÔÁ"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "ãÅ ÍÏÖÅ ÚÁÊÎÑÔÉ ÔÒÏÈÉ ÞÁÓÕ. þÉ ÷É ÚÇÏÄÎ¦ ÐÒÏÄÏ×ÖÕ×ÁÔÉ?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:315
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr ""
+
+#: message.php:211
+msgid "This message to"
+msgstr "ãÅÊ ìÉÓÔ ÄÏ"
+
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
+
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
+
+#: thread.php:152
+msgid "Thread Display"
+msgstr ""
+
+#: thread.php:76 config/prefs.php.dist:922
+#, fuzzy
+msgid "Thread View"
+msgstr "ðÅÒÅÞÉÔÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ"
+
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
+msgid "To"
+msgstr "äÏ"
+
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ"
+
+#: templates/prefs/sourceselect.inc:326
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ. íÁÂÕÔØ ÏÂÓÑÇ ÃØÏÇÏ ÆÁÊÌÕ ÐÅÒÅ×ÉÝÕ¤ "
-"ÍÁËÓÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÉÊ ÏÂÓÑÇ (%d íÂ)."
 
+#: lib/IMAP/Client.php:134
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "äÏÄÁÔËÉ"
+
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "óÍ¦ÔÎÉË:"
+
+#: templates/prefs/trashselect.inc:23
+msgid "Trash folder:"
+msgstr "óÍ¦ÔÎÉË:"
+
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ. íÁÂÕÔØ ÏÂÓÑÇ ÃØÏÇÏ ÆÁÊÌÕ ÐÅÒÅ×ÉÝÕ¤ "
-"ÍÁËÓÉÍÁÌØÎÏ ÄÏÐÕÓÔÉÍÉÊ ÏÂÓÑÇ."
 
-#, c-format
-msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
+msgid "Unanswered"
+msgstr "ÂÅÚ ×¦ÄÐÏ×¦Ä¦"
+
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "ìÉÓÔÉ ÂÅÚ ×¦ÄÐÏ×¦Ä¦"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
+msgid "Undelete"
+msgstr "÷¦ÄÎÏ×ÉÔÉ"
+
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
+msgid "Undisclosed Recipients"
+msgstr "îÅ×ÉËÒÉÔ¦ ÏÔÒÉÍÕ×ÁÞ¦"
+
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ËÏÐ¦À×ÁÎÎ¦ ÌÉÓÔ¦× ÄÏ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
-msgid ""
-"There was an error deleting messages from the folder \"%s\". This is what "
-"the server said"
+#: mailbox.php:565
+msgid "Unknown Date"
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× Ú ÐÁÐËÉ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× "
-"ÓÅÒ×ÅÒ"
 
-#, c-format
-msgid ""
-"There was an error deleting messages in the folder \"%s\". This is what the "
-"server said"
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× × ÐÁÐÃ¦ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× "
-"ÓÅÒ×ÅÒ"
-
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦×. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
-msgid ""
-"There was an error flagging messages in the folder \"%s\". This is what the "
-"server said"
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÐÏÚÎÁÞÅÎÎ¦ ÌÉÓÔ¦× × ÐÁÐÃ¦ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× "
-"ÓÅÒ×ÅÒ"
-
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÐÏÚÎÁÞÅÎÎ¦ ÌÉÓÔ¦×. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÐÅÒÅÎÅÓÅÎÎ¦ ÌÉÓÔ¦× ÄÏ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "îÅ×ÉËÒÉÔ¦ ÏÔÒÉÍÕ×ÁÞ¦"
 
-msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
 msgstr ""
-"ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ÐÅÒÅÎÅÓÅÎÎ¦ ÌÉÓÔ¦× ÄÏ ÓÍ¦ÔÎÉËÁ. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
-
-msgid "There was an error saving a draft."
-msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÞÅÒÎÅÔËÉ."
 
-msgid "There was an error sending your message"
-msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÓÉÌÁÎÎÑ ÷ÁÛÏÇÏ ÌÉÓÔÁ"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "âÅÚ¦ÍÅÎÎ¦"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ÐÒÉ ×¦ÄÎÏ×ÌÅÎÎ¦ ÌÉÓÔ¦×. ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
+msgid "Unseen"
+msgstr "ÎÅÞÉÔÁÎ¦"
 
-msgid "There was an error viewing the requested message."
-msgstr "ôÒÁÐÉÌÁÓÑ ÐÏÍÉÌËÁ ×¦ÄÏÂÒÁÖÅÎÎÑ ÚÁÍÏ×ÌÅÎÏÇÏ ÌÉÓÔÁ."
+#: templates/folders/actions.inc:12
+msgid "Unsubscribe from Folder(s)"
+msgstr "÷¦ÄÍ¦ÎÉÔÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ ðÁÐËÕ"
 
-msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
 msgstr ""
-"ãÅÊ ÆÁÊÌ ×ÉÚÎÁÞÁ¤ ÌÏËÁÌØÎ¦ MIME-ÄÒÁÊ×ÅÒÉ ÄÌÑ IMP, ÚÏËÒÅÍÁ ÑËÉÊ ÔÉÐ ÄÏÄÁÔË¦× "
-"¤ ÄÏÓÔÕÐÎÉÊ ÄÌÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÞÉ ÚÁ×ÁÎÔÁÖÕ×ÁÎÎÑ."
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
 msgstr ""
-"ãÅÊ ÆÁÊÌ ×ÉÚÎÁÞÁ¤ ÏÐÃ¦§ ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ ÄÌÑ IMP, ÔÁËÏÖ ×ÉÚÎÁÞÁ¤, ÑË¦ Ú ÎÉÈ "
-"ËÏÒÉÓÔÕ×ÁÞ ÍÏÖÅ ÚÍ¦ÎÀ×ÁÔÉ."
 
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
 msgstr ""
-"ãÅÊ ÆÁÊÌ ×ÉÚÎÁÞÁ¤ ÏÐÃ¦§ ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ ÄÌÑ IMP, ÔÁËÏÖ Í¦ÓÔÉÔØ ÐÅÒÅÌ¦Ë "
-"ÄÏÓÔÕÐÎÉÈ ÓÅÒ×ÅÒ¦×, ÑËÝÏ ÷É ÔÁËÉÊ ÐÅÒÅÌ¦Ë ×ÉËÏÒÉÓÔÏ×Õ¤ÔÅ."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: templates/prefs/sentmailselect.inc:41
+msgid "Use Default Value"
 msgstr ""
-"ãÅÊ ÆÁÊÌ ÏÐÉÓÕ¤ ÓÔÉÌ¦, ÑË¦ ×ÉÚÎÁÞÁÀÔØ ËÏÌØÏÒÉ ¦ ÛÒÉÆÔÉ ÎÁ ÄÏÄÁÔÏË ÁÂÏ "
-"ÚÁÍ¦ÓÔØ ÏÐÉÓÁÎÉÈ ÚÁ ÚÁÍÏ×ÞÕ×ÁÎÎÑÍ ÄÌÑ Horde."
 
-msgid ""
-"This has hopefully given you a general understanding of how to web mail "
-"interface works.  You'll surely become comfortable with it after seeing how "
-"easy and convenient it is for reading and sending mail, as well as managing "
-"your IMAP mail account."
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
+msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ ÐÁÐËÉ IMAP"
+
+#: config/prefs.php.dist:735
+msgid "Use Virtual Trash Folder?"
 msgstr ""
-"óÐÏÄ¦×Á¤ÍÏÓØ, ÝÏ ÃÅÊ ÐÏÒÁÄÎÉË ÄÁÓÔØ ÷ÁÍ ÚÁÇÁÌØÎÅ ÕÑ×ÌÅÎÎÑ ÐÒÏ ÒÏÂÏÔÕ "
-"ÐÏÛÔÏ×ÏÇÏ Web-¦ÎÔÅÒÆÅÊÓÕ. ÷É ÚÍÏÖÅÔÅ ÎÁÌÅÖÎÏ ÏÃ¦ÎÉÔÉ ÊÏÇÏ ÚÒÕÞÎ¦ÓÔØ, "
-"ËÏÌÉ ÐÏÂÁÞÉÔÅ, ÑË ÐÒÏÓÔÏ ¦ ¦ÎÔÕ§ÔÉ×ÎÏ-ÚÒÏÚÕÍ¦ÌÏ ÞÉÔÁÔÉ ¦ ×¦ÄÓÉÌÁÔÉ ÌÉÓÔÉ, "
-"ÁÄÍ¦Î¦ÓÔÒÕ×ÁÔÉ ÷ÁÛÕ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ."
 
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ"
+
+#: acl.php:87
+#, php-format
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
-"ãÅ ÏÓÎÏ×ÎÉÊ ËÏÎÆ¦ÇÕÒÁÃ¦ÊÎÉÊ ÆÁÊÌ IMP. ÷¦Î Í¦ÓÔÉÔØ ÛÌÑÈÉ ¦ ÏÐÃ¦§ ÄÌÑ "
-"ÓÃÅÎÁÒ¦§× IMP."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "ãÅ ÍÏÖÅ ÚÁÊÎÑÔÉ ÔÒÏÈÉ ÞÁÓÕ. þÉ ÷É ÚÇÏÄÎ¦ ÐÒÏÄÏ×ÖÕ×ÁÔÉ?"
+#: templates/login/login.inc:177
+msgid "Username"
+msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ"
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "ãÅÊ ÌÉÓÔ ÐÏ×¦ÄÏÍÌÅÎÉÊ ÓÉÓÔÅÍÎÏÍÕ ÁÄÍ¦Î¦ÓÔÒÁÔÏÒÕ ÑË ÓÐÁÍ."
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ"
 
-msgid "This message to"
-msgstr "ãÅÊ ìÉÓÔ ÄÏ"
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ %s"
 
-msgid "This number must be at least one."
-msgstr "ãÅ ÞÉÓÌÏ ÍÕÓÉÔØ ÂÕÔÉ ÐÒÉÎÁÊÍÎ¦ ÏÄÉÎÉÃÅÀ."
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
+msgid "View %s"
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ %s"
 
-msgid "This value must be a number."
-msgstr "ãÅ ÚÎÁÞÅÎÎÑ ÍÕÓÉÔØ ÂÕÔÉ ÞÉÓÌÏÍ."
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
 
-msgid "Time Zone"
-msgstr "þÁÓÏ×ÉÊ ÐÏÑÓ"
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
 
-msgid ""
-"To view the contents of a message, click on the message's subject.  You'll "
-"be taken to the Message screen."
-msgstr ""
-"äÌÑ ÐÅÒÅÇÌÑÄÕ ×Í¦ÓÔÕ ÌÉÓÔÁ ËÌÁÃÎ¦ÔØ ÎÁ ÊÏÇÏ ÔÅÍÕ. ÷É ÐÅÒÅÊÄÅÔÅ Õ ÷¦ËÎÏ "
-"ðÅÒÅÇÌÑÄÕ ìÉÓÔÁ."
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "îÏ×¦ ÌÉÓÔÉ"
 
-msgid "To"
-msgstr "äÏ"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
 
-msgid "To:"
-msgstr "äÏ:"
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "úÁÇÁÌØÎÉÊ ÏÂÓÑÇ: %s ëâ"
+#: templates/message/navbar_actions.inc:18
+msgid "View Thread"
+msgstr ""
 
-msgid "Trash folder:"
-msgstr "óÍ¦ÔÎÉË:"
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
 
-msgid "Unanswered messages"
-msgstr "ìÉÓÔÉ ÂÅÚ ×¦ÄÐÏ×¦Ä¦"
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
 
-msgid "Unanswered"
-msgstr "ÂÅÚ ×¦ÄÐÏ×¦Ä¦"
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "ðÉÓÁÔÉ ÌÉÓÔÉ × ÏËÒÅÍÏÍÕ ×¦ËÎ¦."
 
-msgid "Undelete"
-msgstr "÷¦ÄÎÏ×ÉÔÉ"
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
 
-msgid "Undisclosed Recipients"
-msgstr "îÅ×ÉËÒÉÔ¦ ÏÔÒÉÍÕ×ÁÞ¦"
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÌÉÓÔÉ × "
 
-msgid "Unnamed"
-msgstr "âÅÚ¦ÍÅÎÎ¦"
+#: templates/prefs/initialpageselect.inc:23
+msgid "View or mailbox to display after login:"
+msgstr ""
 
-msgid "Unread"
-msgstr "ÎÅÞÉÔÁÎ¦"
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ %s"
 
-msgid "Unseen Messages"
-msgstr "îÅÞÉÔÁÎ¦ ÌÉÓÔÉ"
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÌÉÓÔÉ × "
 
-msgid "Unseen"
-msgstr "ÎÅÞÉÔÁÎ¦"
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ×ÉÔÅÒÔÏ."
 
-msgid "Unsubscribe from Folder(s)"
-msgstr "÷¦ÄÍ¦ÎÉÔÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ ðÁÐËÕ"
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "óÔ×ÏÒÉÔÉ ÐÁÐËÕ"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "äÌÑ ×ÉÄ¦ÌÅÎÎÑ Ë¦ÌØËÏÈ ÐÏÌ¦× ËÌÁÃÁÊÔÅ ÎÁ ÎÉÈ ÕÔÒÉÍÕÀÞÉ Ctrl/Option"
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
 
-msgid "Use IMAP folder subscriptions"
-msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ ÐÁÐËÉ IMAP"
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
 
-msgid "User Preferences"
-msgstr "ïÐÃ¦§ ËÏÒÉÓÔÕ×ÁÞÁ"
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
 
-msgid "Username"
-msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ"
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
 
-#, c-format
-msgid "View %s"
-msgstr "ðÅÒÅÇÌÑÎÕÔÉ %s"
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "óÍ¦ÔÎÉË:"
 
-msgid "View messages in "
-msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÌÉÓÔÉ × "
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "õ×ÁÇÁ"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "÷ÁÓ ×¦ÔÁ¤ %s"
 
+#: config/prefs.php.dist:619
 msgid ""
-"Welcome to the Internet Message Program (IMP)!  Through IMP's intuitive "
-"interface, you'll be able to access and manage your IMAP mail account using "
-"the simplicity of a standard web browser."
-msgstr ""
-"÷¦ÔÁ¤ÍÏ ÷ÁÓ × ÐÏÛÔÏ×¦Ê ÐÒÏÇÒÁÍ¦ Internet Message Program (IMP)! "
-"¶ÎÔÕ§ÔÉ×ÎÉÊ ¦ÎÔÅÒÆÅÊÓ IMP ÄÏÚ×ÏÌÉÔØ ÷ÁÍ ÌÅÇËÏ ¦ ÚÒÕÞÎÏ ÄÏÓÔÕÐÁÔÉÓÑ ÄÏ ÷ÁÛÏ§ "
-"ÐÏÛÔÏ×Ï§ ÓËÒÉÎØËÉ ×ÉËÏÒÉÓÔÏ×ÕÀÞÉ Ú×ÉÞÎÉÊ Web-ÂÒÏÕÚÅÒ."
-
-msgid "Welcome"
-msgstr "÷È¦Ä"
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
 
+#: config/prefs.php.dist:727
+#, fuzzy
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
+msgstr ""
+"ðÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× ÐÅÒÅÎÏÓÉÔÉ §È × óÍ¦ÔÎÉË, Á ÎÅ ×¦ÄÍ¦ÞÁÔÉ §È ÑË ×ÉÔÅÒÔ¦."
+
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
-"ðÒÉ ×ÉÔÉÒÁÎÎ¦ ÌÉÓÔ¦× ÐÅÒÅÎÏÓÉÔÉ §È × óÍ¦ÔÎÉË, Á ÎÅ ×¦ÄÍ¦ÞÁÔÉ §È ÑË "
-"×ÉÔÅÒÔ¦."
 
-msgid "Wrap text at this many characters."
-msgstr "ðÅÒÅ×ÏÄÉÔÉ ÒÑÄÏË ÐÒÉ ÔÁË¦Ê Ë¦ÌØËÏÓÔ¦ ÓÉÍ×ÏÌ¦×."
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
 
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
+
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "ôÁË"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "÷É ÎÁÍÁÇÁ¤ÔÅÓØ ×ÉÔÅÒÔÉ ÔÁË¦ ÐÁÐËÉ:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "÷É ÎÁÍÁÇÁ¤ÔÅÓØ ×ÉÔÅÒÔÉ ÔÁË¦ ÐÁÐËÉ:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "÷É ÎÁÍÁÇÁ¤ÔÅÓØ ×ÉÔÅÒÔÉ ÔÁË¦ ÐÁÐËÉ:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "÷É ÐÅÒÅÊÍÅÎÏ×Õ¤ÔÅ ÐÁÐËÕ: "
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "÷É ÓÔ×ÏÒÀ¤ÔÅ ÐÁÐËÕ ×ÓÅÒÅÄÉÎ¦ "
 
-msgid ""
-"You are creating a top-level folder.\\nPlease enter the name of the new "
-"folder:\\n"
+#: templates/javascript/folders.js:104
+#, fuzzy
+msgid "You are creating a top-level folder."
+msgstr "÷É ÓÔ×ÏÒÀ¤ÔÅ ÐÁÐËÕ ×ÓÅÒÅÄÉÎ¦ "
+
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
 msgstr ""
-"÷É ÓÔ×ÏÒÀ¤ÔÅ ÐÁÐËÕ ×ÅÒÈÎØÏÇÏ Ò¦×ÎÑ.\\n÷ËÁÖ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ:\\n "
-" "
 
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "÷É ÐÅÒÅÊÍÅÎÏ×Õ¤ÔÅ ÐÁÐËÕ: "
 
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "÷É ×¦ÄÍ¦ÎÉÌÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
 msgid ""
-"You can send mail in a variety ways.  You might choose to compose a new "
-"message or perhaps to reply to an existing message.  Whichever method you "
-"choose, however, will open the standard Compose Window."
-msgstr ""
-"÷É ÍÏÖÅÔÅ ×¦Ä¦ÓÌÁÔÉ ÌÉÓÔÁ Ë¦ÌØËÏÍÁ ÛÌÑÈÁÍÉ. ÷É ÍÏÖÅÔÅ ×ÉÂÒÁÔÉ ÓÔ×ÏÒÉÔÉ ÎÏ×ÉÊ "
-"ÌÉÓÔ, ÁÂÏ ×¦ÄÐÏ×¦ÓÔÉ ÎÁ ¦ÓÎÕÀÞÉÊ. ðÒÉ ÂÕÄØ-ÑËÏÍÕ ×ÉÂÒÁÎÏÍÕ ×ÁÒ¦ÁÎÔ¦ ÄÌÑ ÷ÁÓ "
-"×¦ÄËÒÉ¤ÔØÓÑ ÷¦ËÎÏ óÔ×ÏÒÅÎÎÑ ìÉÓÔÁ."
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
 
-#, c-format
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "õ ÷ÁÓ ¤ %s ÎÏ×ÉÈ ÌÉÓÔ¦×."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "õ ÷ÁÓ ¤ 1 ÎÏ×ÉÊ ÌÉÓÔ."
 
-#, c-format
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "õ ÷ÁÓ ¤ 1 ÎÏ×ÉÊ ÌÉÓÔ."
+
+#: templates/compose/attachments.js:115
 msgid ""
-"You have been logged out of %s. Thank you for using the system. If you wish "
-"to log in again, please use the form below."
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
 msgstr ""
-"÷É ×ÉÊÛÌÉ Ú %s. äÑËÕ¤ÍÏ ÚÁ ËÏÒÉÓÔÕ×ÁÎÎÑ ÓÉÓÔÅÍÏÀ. ñËÝÏ ÷É ÚÁÈÏÞÅÔÅ ××¦ÊÔÉ "
-"ÚÎÏ×Õ - ÓËÏÒÉÓÔÁÊÔÅÓÑ ÆÏÒÍÏÀ ÎÉÖÞÅ."
 
-msgid "You have new mail in the following folders:\\n"
+#: lib/IMP.php:1074
+#, fuzzy
+msgid "You have new mail in the following folder:"
 msgstr "õ ÷ÁÓ ¤ Ó×¦ÖÁ ÐÏÛÔÁ × ÔÁËÉÈ ÐÁÐËÁÈ:\\n"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "óÐÅÒÛÕ ×ËÁÖ¦ÔØ ÄÏÄÁÔÏË, ÑËÉÊ ÔÒÅÂÁ ×ÉÔÅÒÔÉ."
-
-msgid "You must first specify the file to attach."
-msgstr "óÐÅÒÛÕ ×ËÁÖ¦ÔØ ÆÁÊÌ, ÑËÉÊ ÔÒÅÂÁ ÐÒÉËÒ¦ÐÉÔÉ."
+#: lib/IMP.php:1079
+#, fuzzy
+msgid "You have new mail in the following folders:"
+msgstr "õ ÷ÁÓ ¤ Ó×¦ÖÁ ÐÏÛÔÁ × ÔÁËÉÈ ÐÁÐËÁÈ:\\n"
 
-msgid "You must have at least one recipient."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
 msgstr "÷ËÁÖ¦ÔØ ÈÏÞÁ Â ÏÄÎÏÇÏ ÁÄÒÅÓÁÔÁ."
 
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "óÐÅÒÛÕ ×ËÁÖ¦ÔØ ÓËÒÉÎØËÕ ÐÒÉÚÎÁÞÅÎÎÑ."
 
-msgid "You must select an identity to be deleted."
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
 msgstr "÷ËÁÖ¦ÔØ ¦ÐÏÓÔÁÓØ, ÑËÕ ÓÌ¦Ä ×ÉÔÅÒÔÉ."
 
+#: templates/contacts/contacts.inc:81
+#, fuzzy
+msgid "You must select an address first."
+msgstr "óÐÅÒÛÕ ×ËÁÖ¦ÔØ ÓËÒÉÎØËÕ ÐÒÉÚÎÁÞÅÎÎÑ."
+
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "óÐÅÒÛÕ ×ÉÂÅÒ¦ÔØ ÈÏÞÁ Â ÏÄÉÎ ÌÉÓÔ."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "÷ËÁÖ¦ÔØ ÏÔÒÉÍÕ×ÁÞÁ."
 
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "óÐÅÒÛÕ ×ËÁÖ¦ÔØ ÆÁÊÌ, ÑËÉÊ ÔÒÅÂÁ ÐÒÉËÒ¦ÐÉÔÉ."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ ÃÅÊ ìÉÓÔ"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "ðÅÒÅÎÁÐÒÁ×ÉÔÉ ÃÅÊ ìÉÓÔ"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "÷É ÎÅ ÐÅÒÅÄÐÌÁÔÉÌÉ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "÷É ÎÅ ×¦ÄÍ¦ÎÉÌÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ \"%s\". ïÓØ ÝÏ ÓËÁÚÁ× ÓÅÒ×ÅÒ"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "÷É ÕÓÐ¦ÛÎÏ ÐÅÒÅÄÐÌÁÔÉÌÉ \"%s\""
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "÷É ×¦ÄÍ¦ÎÉÌÉ ÐÅÒÅÄÐÌÁÔÕ ÎÁ \"%s\""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "÷ÉÊÛÏ× ÞÁÓ ÷ÁÛÏ§ %s ÓÅÓ¦§. âÕÄØ-ÌÁÓËÁ, ××¦ÊÄ¦ÔØ ÝÅ ÒÁÚ."
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "÷ÁÛÅ ÐÏ×ÎÅ ¦Í'Ñ:"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-msgid "Your From: address:"
-msgstr "÷ÁÛÁ ÁÄÒÅÓÁ Å-ÐÏÛÔÉ:"
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-msgid "Your Information"
-msgstr "ðÅÒÓÏÎÁÌØÎ¦ ÄÁÎ¦"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "÷ÁÛÅ ÐÏ×ÎÅ ¦Í'Ñ:"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "÷ÁÛÁ Ú×ÏÒÏÔÎÑ ÁÄÒÅÓÁ: <i>(ÏÐÃ¦ÏÎÁÌØÎÏ)</i>"
 
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
-"÷ÁÛ ÂÒÏÕÚÅÒ ÎÅ Ð¦ÄÔÒÉÍÕ¤ ÃØÏÇÏ ÍÅÔÏÄÕ ÄÒÕËÕ. âÕÄØ-ÌÁÓËÁ, ÎÁÔÉÓÎ¦ÔØ "
-"Ctrl/Option + P, ÝÏÂ ÒÏÚÄÒÕËÕ×ÁÔÉ ÃÀ ÓÔÏÒ¦ÎËÕ."
 
-msgid "Your current time zone:"
-msgstr "÷ÁÛ ÐÏÔÏÞÎÉÊ ÞÁÓÏ×ÉÊ ÐÏÑÓ:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "÷ÁÛ¦ ¦ÐÏÓÔÁÓ¦:"
+
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-msgid "Your default identity:"
-msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁ ¦ÐÏÓÔÁÓØ:"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+"÷ÁÛ ÂÒÏÕÚÅÒ ÎÅ Ð¦ÄÔÒÉÍÕ¤ ÃØÏÇÏ ÍÅÔÏÄÕ ÄÒÕËÕ. âÕÄØ-ÌÁÓËÁ, ÎÁÔÉÓÎ¦ÔØ Ctrl/"
+"Option + P, ÝÏÂ ÒÏÚÄÒÕËÕ×ÁÔÉ ÃÀ ÓÔÏÒ¦ÎËÕ."
 
-msgid "Your full name:"
-msgstr "÷ÁÛÅ ÐÏ×ÎÅ ¦Í'Ñ:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
 
-msgid "Your identities:"
-msgstr "÷ÁÛ¦ ¦ÐÏÓÔÁÓ¦:"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your preferences have been updated."
-msgstr "÷ÁÛ¦ ÏÐÃ¦§ ÏÎÏ×ÌÅÎÏ."
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "ðÁÐËÕ \"%s\" ÕÓÐ¦ÛÎÏ ×ÉÔÅÒÔÏ."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "÷ÁÛ Ð¦ÄÐÉÓ:"
 
-msgid "[No subject]"
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
+#, fuzzy
+msgid "[No Subject]"
 msgstr "[âÅÚ ÔÅÍÉ]"
 
-msgid "\\nPlease enter the name of the new folder:\\n"
-msgstr "\\nâÕÄØ-ÌÁÓËÁ, ××ÅÄ¦ÔØ ÎÁÚ×Õ ÎÏ×Ï§ ÐÁÐËÉ:\\n"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Bcc"
 
-msgid "add source"
-msgstr "ÄÏÄÁÔÉ ÄÖÅÒÅÌÏ"
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
 
-msgid "cannot move past the beginning"
-msgstr "ÎÅ ÍÏÖÕ ÐÅÒÅÊÔÉ ×ÉÝÅ ÐÏÞÁÔËÕ"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Cc"
 
-msgid "cannot move past the end"
-msgstr "ÎÅ ÍÏÖÕ ÐÅÒÅÊÔÉ ÎÉÖÞÅ Ë¦ÎÃÑ"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "÷ÉÔÅÒÔÉ"
 
-msgid "delete message"
-msgstr "×ÉÔÅÒÔÉ ÌÉÓÔ"
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "ðÁÐËÉ"
 
-msgid "move down"
-msgstr "ÐÏÓÕÎÕÔÉ ×ÎÉÚ"
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "¶ÐÏÓÔÁÓ¦"
 
-msgid "move message to"
-msgstr "ÐÅÒÅÎÅÓÔÉ ÌÉÓÔ ×"
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
 
-msgid "move up"
-msgstr "ÐÏÓÕÎÕÔÉ ××ÅÒÈ"
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "÷ÉÊÔÉ"
 
-msgid "no folder selected"
-msgstr "ÖÏÄÎÁ ÐÁÐËÁ ÎÅ ×ÉÂÒÁÎÁ"
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "÷ÉÈ¦ÄÎÉÊ ÔÅËÓÔ"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "îÏ×¦ ÌÉÓÔÉ"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "äÒÕË"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "ïÂÎÏ×ÉÔÉ"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "÷¦ÄÐÏ×¦ÓÔÉ"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "ðÏÛÕË"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "÷¦Ä¦ÓÌÁÔÉ ìÉÓÔÁ"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "ÎÅÞÉÔÁÎ¦"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "äÏ"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "÷¦ÄÎÏ×ÉÔÉ"
+
+#: templates/message/navbar_actions.inc:18
+msgid "_View Thread"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "äÏÄÁÔÏË"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "äÏÄÁÔËÉ"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
+#, fuzzy
+msgid "from"
+msgstr "÷¦Ä"
+
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "ÖÏÄÎÅ ÐÒÁ×ÉÌÏ ÎÅ ×ÉÂÒÁÎÅ"
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "óËÒÉÎØËÁ"
 
-msgid "no text specified"
-msgstr "ÎÅ ×ËÁÚÁÎÉÊ ÔÅËÓÔ"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "âÅÚ¦ÍÅÎÎ¦"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ÖÏÄÎÏÇÏ"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ÁÂÏ"
 
-msgid "or:"
-msgstr "ÁÂÏ:"
-
-msgid "please fill in the text and choose a field and an action"
-msgstr "ÂÕÄØ-ÌÁÓËÁ, ××ÅÄ¦ÔØ ÔÅËÓÔ ¦ ×ÉÂÅÒ¦ÔØ ÐÏÌÅ ÔÁ ÏÐÅÒÁÃ¦À"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "×ÉÄÁÌÉÔÉ ÄÖÅÒÅÌÏ"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "×ÉÂÒÁÔÉ ÐÁÐËÕ"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ÇÒÁÍÁÔÉÞÎÁ ÐÏÍÉÌËÁ"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ÇÒÁÍÁÔÉÞÎÉÈ ÐÏÍÉÌÏË"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "ÄÅ ÐÏÌÅ %s Í¦ÓÔÉÔØ <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "ÇÒÁÍÁÔÉÞÎÁ ÐÏÍÉÌËÁ"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "¶ÇÎÏÒÕ×ÁÔÉ"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/config/prefs.php.dist
+++ mod/config/prefs.php.dist
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/config/prefs.php.dist,v 1.216.4.6 2005/10/04 16:09:11 jan Exp $
+ * $Horde: imp/config/prefs.php.dist,v 1.216.4.12 2006/03/23 00:43:40 jan Exp $
  *
  * See horde/config/prefs.php for documentation on the structure of this file.
  */
@@ -49,8 +49,8 @@
     'column' => _("Message Options"),
     'label' => _("Message Composition"),
     'desc' => _("Customize how you send mail."),
-    'members' => array('mail_domain', 'compose_popup', 'wrap_width',
-                       'compose_html', 'compose_spellcheck', 'num_words',
+    'members' => array('mail_domain', 'compose_popup', 'compose_html',
+                       'stationery_link', 'compose_spellcheck', 'num_words',
                        'compose_confirm', 'reply_quote', 'reply_headers',
                        'attrib_text', 'folderselect', 'close_draft',
                        'unseen_drafts', 'set_priority', 'sending_charset',
@@ -58,7 +58,7 @@
 );
 
 if (!empty($GLOBALS['conf']['compose']['allow_receipts'])) {
-    $prefGroups['compose']['members'] = array_merge($prefGroups['compose']['members'], array('disposition_request_read', 'disposition_request_delivery'));
+    $prefGroups['compose']['members'] = array_merge($prefGroups['compose']['members'], array('disposition_request_read'));
 }
 
 $prefGroups['viewing'] = array(
@@ -68,7 +68,8 @@
     'members' => array('filtering', 'strip_attachments',
                        'html_image_replacement', 'html_image_addrbook',
                        'highlight_text', 'highlight_simple_markup', 'show_quoteblocks',
-                       'dim_signature', 'emoticons', 'attachment_display')
+                       'dim_signature', 'emoticons', 'attachment_display',
+                       'default_msg_charset')
 );
 if (!empty($GLOBALS['conf']['maillog']['use_maillog'])) {
     $prefGroups['viewing']['members'] = array_merge($prefGroups['viewing']['members'], array('disposition_send_mdn'));
@@ -79,14 +80,15 @@
     'label' => _("Deleting and Moving Messages"),
     'desc' => _("Set preferences for what happens when you move and delete messages."),
     'members' => array('mailbox_return', 'delete_spam_after_report',
-                       'use_trash', 'trashselect', 'empty_trash_menu')
+                       'use_trash', 'use_vtrash', 'trashselect',
+                       'empty_trash_menu', 'empty_spam_menu')
 );
 
 $prefGroups['newmail'] = array(
     'column' => _("Message Options"),
     'label' => _("New Mail"),
     'desc' => _("Control when new mail will be checked for, and whether or not to notify you when it arrives."),
-    'members' => array('refresh_time', 'nav_popup')
+    'members' => array('refresh_time', 'nav_popup', 'nav_audio')
 );
 
 if (!empty($GLOBALS['conf']['mailbox']['show_preview'])) {
@@ -111,7 +113,14 @@
     'desc' => _("Change display options such as how many messages you see on each page and how messages are sorted."),
     'members' => array('mailbox_start', 'sortby', 'sortdir', 'max_msgs',
                        'from_link', 'time_format', 'nav_expanded',
-                       'show_legend')
+                       'nav_expanded_sidebar', 'show_legend')
+);
+
+$prefGroups['search'] = array(
+    'column' => _("Other Options"),
+    'label' => _("Search Options"),
+    'desc' => _("Control options relating to messages searching."),
+    'members' => array('defaultsearchselect')
 );
 
 $prefGroups['filters'] = array(
@@ -154,7 +163,7 @@
     'locked' => false,
     'shared' => false,
     'type' => 'text',
-    'desc' => _("Your Reply-to: address: <i>(optional)</i>"));
+    'desc' => _("Your Reply-to: address: <em>(optional)</em>"));
 
 // user preferred alias addresses
 $_prefs['alias_addr'] = array(
@@ -162,7 +171,7 @@
     'locked' => false,
     'shared' => false,
     'type' => 'textarea',
-    'desc' => _("Your alias addresses: <i>(optional, enter each address on a new line)</i>"));
+    'desc' => _("Your alias addresses: <em>(optional, enter each address on a new line)</em>"));
 
 // user preferred 'tie to' addresses
 $_prefs['tieto_addr'] = array(
@@ -170,7 +179,7 @@
     'locked' => false,
     'shared' => false,
     'type' => 'textarea',
-    'desc' => _("Addresses to explicitly tie to this identity: <i>(optional, enter each address on a new line)</i>"));
+    'desc' => _("Addresses to explicitly tie to this identity: <em>(optional, enter each address on a new line)</em>"));
 
 // Automatically Bcc addresses when composing
 $_prefs['bcc_addr'] = array(
@@ -178,7 +187,7 @@
     'locked' => false,
     'shared' => false,
     'type' => 'textarea',
-    'desc' => _("Addresses to BCC all messages: <i>(optional, enter each address on a new line)</i>"));
+    'desc' => _("Addresses to BCC all messages: <em>(optional, enter each address on a new line)</em>"));
 
 // Display custom headers (configured via the identity screen) when viewing
 // messages?
@@ -187,7 +196,7 @@
     'locked' => false,
     'shared' => false,
     'type' => 'textarea',
-    'desc' => _("Additional headers to display when viewing: <i>(optional, enter each header on a new line)</i>"));
+    'desc' => _("Additional headers to display when viewing: <em>(optional, enter each header on a new line)</em>"));
 
 // user signature
 $_prefs['signature'] = array(
@@ -214,7 +223,6 @@
     'desc' => _("Place your signature before replies and forwards?"));
 
 // save a copy of sent messages?
-// a value of 0 = no, 1 = yes
 $_prefs['save_sent_mail'] = array(
     'value' => 1,
     'locked' => false,
@@ -241,7 +249,6 @@
 // Server and Folder Information preferences
 
 // use IMAP subscribe?
-// value of 0 = no, 1 = yes
 $_prefs['subscribe'] = array(
     'value' => 0,
     'locked' => false,
@@ -400,7 +407,6 @@
     'help' => 'prefs-purge_trash_keep');
 
 // show tos agreement?
-// a value of 0 = no, 1 = yes
 $_prefs['tos_agreement'] = array(
     'value' => 0,
     'locked' => false,
@@ -428,14 +434,6 @@
     'type' => 'checkbox',
     'desc' => _("Compose messages in a separate window?"));
 
-// wrap text at this many characters
-$_prefs['wrap_width'] = array(
-    'value' => 80,
-    'locked' => false,
-    'shared' => false,
-    'type' => 'number',
-    'desc' => _("Wrap text at this many characters."));
-
 // If browser supports the HTML editor, should we compose in HTML mode by
 // default?
 $_prefs['compose_html'] = array(
@@ -445,6 +443,18 @@
     'type' => 'checkbox',
     'desc' => _("Compose messages with an HTML GUI by default (if browser supports the feature)?"));
 
+// Link to the stationery preferences.
+$_prefs['stationery_link'] = array(
+    'type' => 'link',
+    'url' => 'stationery.php',
+    'desc' => _("Create stationery and form responses."));
+
+$_prefs['stationery'] = array(
+    'value' => 'a:0:{}',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit');
+
 // Check spelling before sending the message?
 $_prefs['compose_spellcheck'] = array(
     'value' => 0,
@@ -479,7 +489,6 @@
 
 // Reply to header summary - leave a brief summary of the header inside
 // the message.
-// Value of 0 = no, 1 = yes
 $_prefs['reply_headers'] = array(
     'desc' => _("Include a brief summary of the header in a reply?"),
     'value' => 0,
@@ -513,7 +522,6 @@
     'desc' => _("Save drafts as unseen?"));
 
 // allow the user to add a "X-Priority" header when composing messages?
-// a value of 0 = no, 1 = yes
 $_prefs['set_priority'] = array(
     'value' => 0,
     'locked' => false,
@@ -567,25 +575,12 @@
     'help' => 'prefs-disposition_request_read'
 );
 
-$_prefs['disposition_request_delivery'] = array(
-    'value' => 'ask',
-    'locked' => false,
-    'shared' => false,
-    'type' => 'enum',
-    'enum' => array('never' => _("Never"),
-                    'ask' => _("Ask"),
-                    'always' => _("Always")),
-    'desc' => _("Request delivery confirmation?"),
-    'help' => 'prefs-disposition_request_delivery'
-);
-
 // End Message Composition preferences
 
 
 // Message Viewing preferences
 
 // filter message content?
-// a value of 0 = no, 1 = yes
 $_prefs['filtering'] = array(
     'value' => 0,
     'locked' => false,
@@ -594,7 +589,6 @@
     'desc' => _("Filter message content for profanity?"));
 
 // Should we display an icon to strip attachments?
-// a value of 0 = no, 1 = yes
 $_prefs['strip_attachments'] = array(
     'value' => 0,
     'locked' => false,
@@ -602,18 +596,20 @@
     'type' => 'checkbox',
     'desc' => _("Show an icon to allow stripping of attachments from messages?"));
 
-// Should we delete spam messages after reporting them?
-// a value of 0 = no, 1 = yes
+// What should we do with spam messages after reporting them?
 $_prefs['delete_spam_after_report'] = array(
     'value' => 0,
     'locked' => false,
     'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Delete spam messages after they have been reported as spam?")
+    'type' => 'enum',
+    'enum' => array(0 => _("Nothing"),
+                    1 => _("Delete spam messages"),
+                    2 => _("Move spam messages to spam folder and innocent messages to INBOX")),
+    'desc' => _("What should we do with spam messages after they have been reported as spam or innocent?"),
+    'help' => 'prefs-delete_spam_after_report'
 );
 
 // Replace image tags in HTML messages with blank images?
-// a value of 0 = no, 1 = yes
 $_prefs['html_image_replacement'] = array(
     'value' => 1,
     'locked' => false,
@@ -625,7 +621,6 @@
 
 // By default, automatically show images in HTML messages if the sender is in
 // the user's addressbook?
-// a value of 0 = no, 1 = yes
 $_prefs['html_image_addrbook'] = array(
     'value' => 1,
     'locked' => false,
@@ -670,6 +665,15 @@
     'type' => 'checkbox',
     'desc' => _("Dim signatures?"));
 
+// Convert textual emoticons into graphical ones?
+// a value of 0 = no, 1 = yes
+$_prefs['emoticons'] = array(
+    'value' => 0,
+    'locked' => false,
+    'shared' => false,
+    'type' => 'checkbox',
+    'desc' => _("Convert textual emoticons into graphical ones?"));
+
 // how do we display attachments?
 $_prefs['attachment_display'] = array(
     'value' => 'list',
@@ -681,14 +685,20 @@
                     'both'   => _("Both Header Listing and Body of Message")),
     'desc' => _("How do you want to display attachments?"));
 
-// Convert textual emoticons into graphical ones?
-// a value of 0 =no, 1 = yes
-$_prefs['emoticons'] = array(
-    'value' => 0,
+// default message character set
+$_prefs['default_msg_charset'] = array(
+    'value' => isset($GLOBALS['nls']['emails'][$GLOBALS['language']])
+        ? $GLOBALS['nls']['emails'][$GLOBALS['language']]
+        : (isset($GLOBALS['nls']['charsets'][$GLOBALS['language']])
+            ? $GLOBALS['nls']['charsets'][$GLOBALS['language']]
+            : 'ISO-8859-1'),
     'locked' => false,
-    'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Convert textual emoticons into graphical ones?"));
+    'shared' => true,
+    'type' => 'enum',
+    'enum' => array_merge(array('' => _("Default (US-ASCII)")),
+                          $GLOBALS['nls']['encodings']),
+    'desc' => _("The default charset for messages with no charset information:"),
+    'help' => 'prefs-default_msg_charset');
 
 $_prefs['disposition_send_mdn'] = array(
     'value' => 0,
@@ -705,7 +715,6 @@
 // Deleting and Moving Messages preferences
 
 // should we return to the mailbox listing after deleting a message?
-// a value of 0 = no, 1 = yes
 $_prefs['mailbox_return'] = array(
     'value' => 0,
     'locked' => false,
@@ -715,7 +724,6 @@
 
 // should we move messages to a trash folder instead of just marking
 // them as deleted?
-// a value of 0 = no, 1 = yes
 $_prefs['use_trash'] = array(
     'value' => 0,
     'locked' => false,
@@ -723,17 +731,38 @@
     'type' => 'checkbox',
     'desc' => _("When deleting messages, move them to your Trash folder instead of marking them as deleted?"));
 
+// use Virtual Trash folder
+$_prefs['use_vtrash'] = array(
+    'value' => 0,
+    'locked' => false,
+    'shared' => false,
+    'type' => 'checkbox',
+    'desc' => _("Use Virtual Trash Folder?"));
+
+// virtual trash folder identifier
+$_prefs['vtrash_id'] = array(
+    'value' => '',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit');
+
 // display the 'Empty Trash' link in the menubar?
-// 1 = yes, 0 = no
 $_prefs['empty_trash_menu'] = array(
     'value' => 1,
     'locked' => false,
     'shared' => false,
     'type' => 'checkbox',
-    'desc' => _("Display the 'Empty Trash' link in the menubar?"));
+    'desc' => _("Display the \"Empty Trash\" link in the menubar?"));
+
+// display the 'Empty Spam' link in the menubar?
+$_prefs['empty_spam_menu'] = array(
+    'value' => 0,
+    'locked' => false,
+    'shared' => false,
+    'type' => 'checkbox',
+    'desc' => _("Display the \"Empty Spam\" link in the menubar?"));
 
 // hide deleted
-// a value of 0 = no, 1 = yes
 $_prefs['delhide'] = array(
     'value' => 0,
     'locked' => false,
@@ -767,6 +796,13 @@
     'type' => 'checkbox',
     'desc' => _("Display pop-up notification of new mail?"));
 
+$_prefs['nav_audio'] = array(
+    'value' => 0,
+    'locked' => false,
+    'shared' => false,
+    'type' => 'checkbox',
+    'desc' => _("Play sound on new mail?  This requires your browser to support embedded sound files.  Almost all do on Windows and Mac, but other platforms will require a plugin."));
+
 // End New Mail preferences
 
 
@@ -830,7 +866,6 @@
     'desc' => _("Edit your preferences for accessing other mail accounts."));
 
 // Fetch mail on separate window?
-// a value of 0 = no, 1 = yes
 $_prefs['fetchmail_popup'] = array(
     'value' => 0,
     'locked' => false,
@@ -839,7 +874,6 @@
     'desc' => _("Fetch Mail in a separate window?"));
 
 // Show the Fetch mail icon on the menubar?
-// a value of 0 = no, 1 = yes
 $_prefs['fetchmail_menu'] = array(
     'value' => 1,
     'locked' => false,
@@ -950,6 +984,17 @@
                     2 => _("Remember the last view")),
     'desc' => _("Expand the entire folder tree by default in the folders view?"));
 
+// expand folder tree by default in sidebar
+$_prefs['nav_expanded_sidebar'] = array(
+    'value' => 0,
+    'locked' => false,
+    'shared' => false,
+    'type' => 'enum',
+    'enum' => array(0 => _("No"),
+                    1 => _("Yes"),
+                    2 => _("Current expanded status in the folders view")),
+    'desc' => _("Expand the entire folder tree by default in the sidebar?"));
+
 // list of folders to expand by default
 $_prefs['expanded_folders'] = array(
     'value' => 'a:0:{}',
@@ -965,7 +1010,6 @@
     'type' => 'implicit');
 
 // show mailbox legend?
-// a value of 0 = no, 1 = yes
 $_prefs['show_legend'] = array(
     'value' => 1,
     'locked' => false,
@@ -976,8 +1020,22 @@
 // End Display Options preferences
 
 
+// Search preferences
+
+// default search selection widget. this needs to be dynamically built.
+$_prefs['defaultsearchselect'] = array('type' => 'special');
+
+// default search field
+$_prefs['default_search'] = array(
+    'value' => '',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit');
+
+// End Search preferences
+
+
 // Filter preferences
-// a value of 0 = no, 1 = yes
 
 // run filters on login?
 $_prefs['filter_on_login'] = array(
@@ -1020,7 +1078,7 @@
     'type' => 'checkbox',
     'desc' => _("Expand names in the compose window automatically in the background?"));
 
-// Should recipients of outgoing messages automaticall be added to
+// Should recipients of outgoing messages be added automatically to
 // the address book?
 $_prefs['save_recipients'] = array(
     'value' => 0,
@@ -1083,7 +1141,6 @@
 // PGP options
 
 // Activate PGP support?
-// 0 = no, 1 = yes
 $_prefs['use_pgp'] = array(
     'value' => 0,
     'locked' => false,
@@ -1121,7 +1178,6 @@
 // S/MIME options
 
 // Activate S/MIME support?
-// 0 = no, 1 = yes
 $_prefs['use_smime'] = array(
     'value' => 0,
     'locked' => false,
@@ -1148,3 +1204,12 @@
     'type' => 'implicit');
 
 // End S/MIME Options
+
+// Other entries (used internally in IMP)
+
+// virtual inbox identifier
+$_prefs['vinbox_id'] = array(
+    'value' => '',
+    'locked' => false,
+    'shared' => false,
+    'type' => 'implicit');


--- orig/lib/Maintenance/Task/delete_sentmail_monthly.php
+++ mod/lib/Maintenance/Task/delete_sentmail_monthly.php
@@ -2,9 +2,9 @@
 /**
  * Maintenance module that deletes old sent-mail folders.
  *
- * $Horde: imp/lib/Maintenance/Task/delete_sentmail_monthly.php,v 1.18.10.5 2005/08/13 17:15:55 slusarz Exp $
+ * $Horde: imp/lib/Maintenance/Task/delete_sentmail_monthly.php,v 1.18.10.7 2006/01/01 21:28:59 jan Exp $
  *
- * Copyright 2001-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2001-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/lib/Compose.php
+++ mod/lib/Compose.php
@@ -16,9 +16,9 @@
  * The IMP_Compose:: class contains functions related to generating
  * outgoing mail messages.
  *
- * $Horde: imp/lib/Compose.php,v 1.107.2.16 2005/07/03 03:42:42 selsky Exp $
+ * $Horde: imp/lib/Compose.php,v 1.107.2.33 2006/03/12 18:47:07 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -63,18 +63,17 @@
     }
 
     /**
-     * Send a message.
+     * Sends a message.
      *
-     * @param string       $email    The e-mail list to send to.
-     * @param IMP_Headers &$headers  The IMP_Headers object holding
-     *                               this messages headers.
-     * @param mixed       &$message  Either the message text (string)
-     *                               or a MIME_Message object that
-     *                               contains the text to send.
-     * @param string       $charset  The charset that was used for the
-     *                               headers.
+     * @param string $email          The e-mail list to send to.
+     * @param IMP_Headers &$headers  The IMP_Headers object holding this
+     *                               messages headers.
+     * @param mixed &$message        Either the message text (string) or a
+     *                               MIME_Message object that contains the
+     *                               text to send.
+     * @param string $charset        The charset that was used for the headers.
      *
-     * @return mixed  True on success, PEAR_Error object on error.
+     * @return mixed  True on success, PEAR_Error on error.
      */
     function sendMessage($email, &$headers, &$message, $charset)
     {
@@ -83,9 +82,18 @@
         require_once 'Mail.php';
 
         /* We don't actually want to alter the contents of the $conf['mailer']
-           array, so we make a copy of the current settings. We will apply
-           our modifications (if any) to the copy, instead. */
+         * array, so we make a copy of the current settings. We will apply our
+         * modifications (if any) to the copy, instead. */
         $params = $conf['mailer']['params'];
+        $driver = $conf['mailer']['type'];
+
+        /* If user specifies an SMTP server on login, force SMTP mailer. */
+        if (!empty($conf['server']['change_smtphost'])) {
+            $driver = 'smtp';
+            if (empty($params['mailer']['auth'])) {
+                $params['mailer']['auth'] = '1';
+            }
+        }
 
         /* Force the SMTP host and port value to the current SMTP server if
          * one has been selected for this connection. */
@@ -97,11 +105,11 @@
         }
 
         /* If SMTP authentication has been requested, use either the username
-           and password provided in the configuration or populate the username
-           and password fields based on the current values for the user.
-           Note that we assume that the username and password values from the
-           current IMAP / POP3 connection are valid for SMTP authentication as
-           well. */
+         * and password provided in the configuration or populate the username
+         * and password fields based on the current values for the user. Note
+         * that we assume that the username and password values from the
+         * current IMAP / POP3 connection are valid for SMTP authentication as
+         * well. */
         if (!empty($params['auth']) && empty($params['username'])) {
             $params['username'] = $_SESSION['imp']['user'];
             $params['password'] = Secret::read(Secret::getKey('imp'), $_SESSION['imp']['pass']);
@@ -110,8 +118,8 @@
         /* Add the site headers. */
         $headers->addSiteHeaders();
 
-        /* If $message is a string, we need to get a MIME_Message
-           object to encode the headers. */
+        /* If $message is a string, we need to get a MIME_Message object to
+         * encode the headers. */
         if (is_string($message)) {
             $msg = $message;
             $mime_message = &new MIME_Message($_SESSION['imp']['maildomain']);
@@ -126,7 +134,7 @@
             $msg .= "\n";
         }
 
-        $mailer = &Mail::factory($conf['mailer']['type'], $params);
+        $mailer = Mail::factory($driver, $params);
         if (is_a($mailer, 'PEAR_Error')) {
             return $mailer;
         }
@@ -145,7 +153,83 @@
             return $result;
         }
 
-        return $mailer->send($email, $headerArray, $msg);
+        $result = $mailer->send($email, $headerArray, $msg);
+
+        if (is_a($result, 'PEAR_Error') &&
+            $conf['mailer']['type'] == 'sendmail') {
+            // Interpret return values as defined in /usr/include/sysexits.h
+            switch ($result->getCode()) {
+            case 64: // EX_USAGE
+                $error = 'sendmail: ' . _("command line usage error") . ' (64)';
+                break;
+
+            case 65: // EX_DATAERR
+                $error = 'sendmail: ' . _("data format error") . ' (65)';
+                break;
+
+            case 66: // EX_NOINPUT
+                $error = 'sendmail: ' . _("cannot open input") . ' (66)';
+                break;
+
+            case 67: // EX_NOUSER
+                $error = 'sendmail: ' . _("addressee unknown") . ' (67)';
+                break;
+
+            case 68: // EX_NOHOST
+                $error = 'sendmail: ' . _("host name unknown") . ' (68)';
+                break;
+
+            case 69: // EX_UNAVAILABLE
+                $error = 'sendmail: ' . _("service unavailable") . ' (69)';
+                break;
+
+            case 70: // EX_SOFTWARE
+                $error = 'sendmail: ' . _("internal software error") . ' (70)';
+                break;
+
+            case 71: // EX_OSERR
+                $error = 'sendmail: ' . _("system error") . ' (71)';
+                break;
+
+            case 72: // EX_OSFILE
+                $error = 'sendmail: ' . _("critical system file missing") . ' (72)';
+                break;
+
+            case 73: // EX_CANTCREAT
+                $error = 'sendmail: ' . _("cannot create output file") . ' (73)';
+                break;
+
+            case 74: // EX_IOERR
+                $error = 'sendmail: ' . _("input/output error") . ' (74)';
+                break;
+
+            case 75: // EX_TEMPFAIL
+                $error = 'sendmail: ' . _("temporary failure") . ' (75)';
+                break;
+
+            case 76: // EX_PROTOCOL
+                $error = 'sendmail: ' . _("remote error in protocol") . ' (76)';
+                break;
+
+            case 77: // EX_NOPERM
+                $error = 'sendmail: ' . _("permission denied") . ' (77)';
+                break;
+
+            case 78: // EX_CONFIG
+                $error = 'sendmail: ' . _("configuration error") . ' (78)';
+                break;
+
+            case 79: // EX_NOTFOUND
+                $error = 'sendmail: ' . _("entry not found") . ' (79)';
+                break;
+
+            default:
+                $error = $result;
+            }
+            return PEAR::raiseError($error);
+        }
+
+        return $result;
     }
 
     /**
@@ -222,17 +306,29 @@
         $msg = $mime_message->replaceEOL($msg, "\n");
 
         if (!is_null($this->_mimeid)) {
-            /* If the input is *not* in flowed format, make sure there is no
-             * padding at the end of lines. */
+            require_once 'Text/Flowed.php';
             $old_part = $mime_message->getPart($this->_mimeid);
-            if ($old_part->getContentTypeParameter('format') != 'flowed') {
+            if ($old_part->getContentTypeParameter('format') == 'flowed') {
+                /* We need to convert the flowed text to fixed text before
+                 * we begin working on it. */
+                $flowed = &new Text_Flowed($msg);
+                if (($mime_message->getContentTypeParameter('delsp') == 'yes') &&
+                    method_exists($flowed, 'setDelSp')) {
+                    $flowed->setDelSp(true);
+                }
+                $msg = $flowed->toFixed(false);
+            } else {
+                /* If the input is *not* in flowed format, make sure there is
+                 * no padding at the end of lines. */
                 $msg = preg_replace("/\s*\n/U", "\n", $msg);
             }
 
             $msg = String::convertCharset($msg, $old_part->getCharset());
 
-            require_once 'Text/Flowed.php';
             $flowed = &new Text_Flowed($msg);
+            if (method_exists($flowed, 'setDelSp')) {
+                $flowed->setDelSp(true);
+            }
             $msg = $flowed->toFlowed(true);
         }
 
@@ -248,22 +344,7 @@
 
             /* Extra '-'s line up with "End Message" below. */
             $msghead .= " ---------\n";
-
-            if (($date_ob = $h->getOb('date', true))) {
-                $msghead .= _("    Date: ") . $date_ob . "\n";
-            }
-            if (($from_ob = MIME::addrArray2String($h->getOb('from')))) {
-                $msghead .= _("    From: ") . $from_ob . "\n";
-            }
-            if (($rep_ob = MIME::addrArray2String($h->getOb('reply_to')))) {
-                $msghead .= _("Reply-To: ") . $rep_ob . "\n";
-            }
-            if (($sub_ob = $h->getOb('subject', true))) {
-                $msghead .= _(" Subject: ") . $sub_ob . "\n";
-            }
-            if (($to_ob = MIME::addrArray2String($h->getOb('to')))) {
-                $msghead .= _("      To: ") . $to_ob . "\n";
-            }
+            $msghead .= $this->_getMsgHeaders($h);
             $msg = $msghead . "\n\n" . $msg;
             if (!empty($from)) {
                 $msg .= "\n\n" . '----- ' . sprintf(_("End message from %s"), $from) . " -----\n";
@@ -300,23 +381,7 @@
         }
 
         $msg .= " -----\n";
-
-        if (($date = $h->getOb('date', true))) {
-            $msg .= _("    Date: ") . $date . "\n";
-        }
-        if (($from_ob = MIME::addrArray2String($h->getOb('from')))) {
-            $msg .= _("    From: ") . $from_ob . "\n";
-        }
-        if (($rep_ob = MIME::addrArray2String($h->getOb('reply_to')))) {
-            $msg .= _("Reply-To: ") . $rep_ob . "\n";
-        }
-        if (($subject = $h->getOb('subject', true))) {
-            $msg .= _(" Subject: ") . $subject . "\n";
-        }
-        if (($to_ob = MIME::addrArray2String($h->getOb('to')))) {
-            $msg .= _("      To: ") . $to_ob . "\n";
-        }
-
+        $msg .= $this->_getMsgHeaders($h);
         $msg .= "\n";
 
         $fwd_msg = $this->findBody($imp_contents);
@@ -333,6 +398,41 @@
     }
 
     /**
+     * Determine the header information to display in the forward/reply.
+     *
+     * @access private
+     *
+     * @param IMP_Headers &$h  The IMP_Headers object for the message.
+     *
+     * @return string  The header information for the original message.
+     */
+    function _getMsgHeaders(&$h)
+    {
+        $text = '';
+
+        if (($date_ob = $h->getOb('date', true))) {
+            $text .= _("    Date: ") . $date_ob . "\n";
+        }
+        if (($from_ob = MIME::addrArray2String($h->getOb('from')))) {
+            $text .= _("    From: ") . $from_ob . "\n";
+        }
+        if (($rep_ob = MIME::addrArray2String($h->getOb('reply_to')))) {
+            $text .= _("Reply-To: ") . $rep_ob . "\n";
+        }
+        if (($sub_ob = $h->getOb('subject', true))) {
+            $text .= _(" Subject: ") . $sub_ob . "\n";
+        }
+        if (($to_ob = MIME::addrArray2String($h->getOb('to')))) {
+            $text .= _("      To: ") . $to_ob . "\n";
+        }
+        if (($cc_ob = MIME::addrArray2String($h->getOb('cc')))) {
+            $text .= _("      Cc: ") . $cc_ob . "\n";
+        }
+
+        return $text;
+    }
+
+    /**
      * Adds an attachment to a MIME_Part from an uploaded file.
      * The actual attachment data is stored in a separate file - the
      * MIME_Part information entries 'temp_filename' and 'temp_filetype'
@@ -370,14 +470,17 @@
         } else {
             require_once 'Horde/MIME/Magic.php';
             /* Try to determine the MIME type from 1) analysis of the file
-               (if available) and, if that fails, 2) from the extension. */
-            if (!($type = MIME_Magic::analyzeFile($tempfile, isset($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null))) {
+             * (if available) and, if that fails, 2) from the extension. We
+             * do it in this order here because, most likely, if a browser
+             * can't identify the type of a file, it is because the file
+             * extensions isn't available and/or recognized. */
+            if (!($type = MIME_Magic::analyzeFile($tempfile, !empty($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null))) {
                 $type = MIME_Magic::filenameToMIME($filename, false);
             }
             $part = &new MIME_Part($type);
         }
         $part->setCharset(NLS::getCharset());
-        $part->setName($filename);
+        $part->setName(MIME::encode($filename));
         $part->setBytes($_FILES[$name]['size']);
         if ($disposition) {
             $part->setDisposition($disposition);
@@ -411,32 +514,39 @@
     {
         global $conf;
 
+        $type = $part->getType();
         $vfs = $conf['compose']['use_vfs'];
 
         /* Decode the contents. */
         $part->transferDecodeContents();
 
+        /* Try to determine the MIME type from 1) the extension and
+         * then 2) analysis of the file (if available). */
+        if ($type == 'application/octet-stream') {
+            require_once 'Horde/MIME/Magic.php';
+            $type = MIME_Magic::filenameToMIME($part->getName(true), false);
+        }
+
         /* Extract the data from the currently existing MIME_Part and then
            delete it. If this is an unknown MIME part, we must save to a
            temporary file to run the file analysis on it. */
-        if (!$vfs || ($part->getType() == 'application/octet-stream')) {
+        if (!$vfs) {
             $attachment = Horde::getTempFile('impatt', $vfs);
             $fp = fopen($attachment, 'w');
             fwrite($fp, $part->getContents());
             fclose($fp);
 
-            if ($part->getType() == 'application/octet-stream') {
-                require_once 'Horde/MIME/Magic.php';
-
-                /* Try to determine the MIME type from 1) analysis of the file
-                   (if available) and, if that fails, 2) from the extension. */
-                if (!($type = MIME_Magic::analyzeFile($attachment))) {
-                    $type = MIME_Magic::filenameToMIME($attachment, false);
-                }
-                $part->setType($type);
+            if (($type == 'application/octet-stream') &&
+                ($analyzetype = MIME_Magic::analyzeFile($attachment, !empty($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null))) {
+                $type = $analyzetype;
             }
+        } elseif (($type == 'application/octet-stream') &&
+                  ($analyzetype = MIME_Magic::analyzeData($part->getContents(), !empty($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null))) {
+            $type = $analyzetype;
         }
 
+        $part->setType($type);
+
         /* Set the size of the Part explicitly since we delete the contents
            later on in this function. */
         $part->setBytes($part->getBytes());
@@ -632,17 +742,15 @@
      *                          attachments to.
      * @param string $charset   The charset to use for the filename.
      */
-    function buildAllAttachments(&$base, $charset = null)
+    function buildAllAttachments(&$base, $charset)
     {
         foreach ($this->_cache as $part) {
             /* Store the data inside the current part. */
             $this->_buildPartData($part);
 
-            /* Convert the charset of the filename, if necessary. */
-            if (!is_null($charset)) {
-                $part->setName(String::convertCharset($part->getName(true), $part->getCharset(), $charset));
-                $part->setCharset($charset);
-            }
+            /* Convert the charset of the filename. */
+            $name = String::convertCharset($part->getName(true), NLS::getCharset(), $charset);
+            $part->setName(MIME::encode($name, $charset));
 
             /* Add to the base part. */
             $base->addPart($part);
@@ -667,9 +775,7 @@
             $vfs = &VFS::singleton($conf['vfs']['type'], Horde::getDriverConfig('vfs', $conf['vfs']['type']));
             $data = $vfs->read(IMP_VFS_ATTACH_PATH, $filename);
         } else {
-            $fd = fopen($filename, 'rb');
-            $data = fread($fd, filesize($filename));
-            fclose($fd);
+            $data = file_get_contents($filename);
         }
 
         /* Set the part's contents to the raw attachment data. */
@@ -696,7 +802,7 @@
         /* First we'll get a comma seperated list of email addresses
            and a comma seperated list of personal names out of $from
            (there just might be more than one of each). */
-        foreach (@imap_rfc822_parse_adrlist($from, '') as $entry) {
+        foreach (IMP::parseAddressList($from) as $entry) {
             if (isset($entry->mailbox) && isset($entry->host)) {
                 if (strlen($addressList) > 0) {
                     $addressList .= ', ';
@@ -964,7 +1070,8 @@
      * @param MIME_Part $base_part  The body of the message.
      * @param string    $auth       The authorized user who owns the attachments.
      *
-     * @return MIME_Part  Modified part with links to attachments.
+     * @return MIME_Part  Modified part with links to attachments. Returns
+     *                    PEAR_Error on error.
      */
     function linkAttachments($baseurl, $base_part, $auth)
     {
@@ -979,9 +1086,8 @@
 
         $ts = gmmktime();
         $fullpath = sprintf('%s/%s/%d', IMP_VFS_LINK_ATTACH_PATH, $auth, $ts);
-        $vfs->autoCreatePath($fullpath);
 
-        $trailer = "\n--\n" . String::convertCharset(_("Attachments"), NLS::getCharset(), $base_part->getCharset());
+        $trailer = String::convertCharset(_("Attachments"), NLS::getCharset(), $base_part->getCharset());
 
         if ($prefs->getValue('delete_attachments_monthly')) {
             /* Determine the first day of the month in which the current
@@ -997,19 +1103,30 @@
                                                                   'f' => $att->getName()),
                                                   null, false);
             if ($conf['compose']['use_vfs']) {
-                $vfs->rename(IMP_VFS_ATTACH_PATH, $att->getInformation('temp_filename'), $fullpath, escapeshellcmd($att->getName()));
+                $res = $vfs->rename(IMP_VFS_ATTACH_PATH, $att->getInformation('temp_filename'), $fullpath, escapeshellcmd($att->getName()));
             } else {
-                $fd = fopen($att->getInformation('temp_filename'), 'rb');
-                $data = fread($fd, filesize($att->getInformation('temp_filename')));
-                fclose($fd);
-                $vfs->writeData($fullpath, escapeshellcmd($att->getName()), $data);
+                $data = file_get_contents($att->getInformation('temp_filename'));
+                $res = $vfs->writeData($fullpath, escapeshellcmd($att->getName()), $data, true);
+            }
+            if (is_a($res, 'PEAR_Error')) {
+                return $res;
             }
         }
 
         $this->deleteAllAttachments();
-        $base_part->appendContents($trailer, $base_part->getCurrentEncoding());
 
-        return $base_part;
+        if ($base_part->getPrimaryType() == 'multipart') {
+            $mixed_part = &new MIME_Part('multipart/mixed');
+            $mixed_part->addPart($base_part);
+            $link_part = &new MIME_Part('text/plain', $trailer, $base_part->getCharset(), 'inline', $base_part->getCurrentEncoding());
+            $link_part->setDescription(_("Attachment Information"));
+            $mixed_part->addPart($link_part);
+            return $mixed_part;
+        } else {
+            $base_part->appendContents("\n-----\n" . $trailer, $base_part->getCurrentEncoding());
+            return $base_part;
+        }
+
     }
 
 }


--- orig/lib/Quota/mercury32.php
+++ mod/lib/Quota/mercury32.php
@@ -14,7 +14,7 @@
  * mail_user_folder --  The path to folder mail mercury
  *
  *****************************************************************************
- * PROBLEM TO ACCESS NETWORK DIRECOTRY 
+ * PROBLEM TO ACCESS NETWORK DIRECOTRY
  *****************************************************************************
  * Matt Grimm
  * 06-Jun-2003 10:25
@@ -30,9 +30,9 @@
  * UNC path ("\\\\shareDrive\\shareDir").
  *****************************************************************************
  *
- * $Horde: imp/lib/Quota/mercury32.php,v 1.1.10.5 2005/07/03 03:42:46 selsky Exp $
+ * $Horde: imp/lib/Quota/mercury32.php,v 1.1.10.7 2006/01/01 21:28:59 jan Exp $
  *
- * Copyright 2002-2005 Frank Lupo <frank_lupo at email.it>
+ * Copyright 2002-2006 Frank Lupo <frank_lupo at email.it>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -67,11 +67,11 @@
 
         $dir_path = $this->_params['mail_user_folder'] . '/' . $_SESSION['imp']['user'] . '/';
         if ($dir = @opendir($dir_path)) {
-            while (($file = readdir($dir)) !== false) { 
+            while (($file = readdir($dir)) !== false) {
                 $quota += filesize($dir_path . $file);
-            }  
+            }
             closedir($dir);
-            
+
             if (!is_null($quota)) {
                 return array('usage' => $quota, 'limit' => 0);
             }


--- orig/lib/Crypt/PGP.php
+++ mod/lib/Crypt/PGP.php
@@ -11,9 +11,9 @@
  * The IMP_PGP:: class contains all functions related to handling
  * PGP messages within IMP.
  *
- * $Horde: imp/lib/Crypt/PGP.php,v 1.90.2.9 2005/07/03 03:42:43 selsky Exp $
+ * $Horde: imp/lib/Crypt/PGP.php,v 1.90.2.14 2006/02/21 00:21:21 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -242,7 +242,8 @@
         $result = $this->parsePGPData($text);
         if (empty($result) ||
             ((count($result) == 1) && ($result[0]['type'] == PGP_ARMOR_TEXT))) {
-            return false;
+            $result = false;
+            return $result;
         }
 
         include_once 'Horde/MIME/Part.php';
@@ -542,11 +543,11 @@
             $oid = $cacheSess->storeOid($mime_part);
         }
 
-        return $this->getJSOpenWinCode('save_attachment_public_key', false, array('mimecache=' . $oid));
+        return $this->getJSOpenWinCode('save_attachment_public_key', false, array('mimecache' => $oid));
     }
 
     /**
-     * Print out the link for the open_pgp_win javascript function.
+     * Print out the link for the javascript PGP popup.
      *
      * @param string $actionid  The ActionID to perform.
      * @param mixed $reload     If true, reload base window on close. If text,
@@ -559,11 +560,11 @@
      */
     function getJSOpenWinCode($actionid, $reload = true, $params = null)
     {
-        $popup_url = Horde::applicationUrl('pgp.php', true);
+        $popup_url = Horde::applicationUrl('pgp.php');
         $popup_url = Util::addParameter($popup_url, 'actionID', $actionid, false);
         if (!empty($reload)) {
             if (is_bool($reload)) {
-                $popup_url = Util::addParameter($popup_url, 'reload', Horde::selfUrl(true), false);
+                $popup_url = Util::addParameter($popup_url, 'reload', Util::removeParameter(Horde::selfUrl(true), array('actionID')), false);
             } else {
                 require_once 'Horde/SessionObjects.php';
                 $cacheSess = &Horde_SessionObjects::singleton();
@@ -572,12 +573,12 @@
         }
 
         if (is_array($params)) {
-            foreach ($params as $val) {
-                $popup_url = Util::addParameter($popup_url, $val, null, false);
+            foreach ($params as $key => $val) {
+                $popup_url = Util::addParameter($popup_url, $key, $val, false);
             }
         }
 
-        return "open_pgp_win('" . $popup_url . "');";
+        return "popup_imp('" . $popup_url . "',450,200);";
     }
 
     /**
@@ -597,25 +598,34 @@
      *
      * @access private
      *
-     * @param string $to_address  The e-mail address of the key to use for
-     *                            encryption.
+     * @param array $addresses  The e-mail address of the keys to use for
+     *                          encryption.
      *
      * @return array  The list of parameters needed by encrypt().
      *                Returns PEAR_Error on error.
      */
-    function _encryptParameters($to_address)
+    function _encryptParameters($addresses)
     {
-        /* We can only encrypt if we are sending to a single person. */
-        $addrOb = IMP::bareAddress($to_address, true);
-        $key_addr = array_pop($addrOb);
+        $addr_list = array();
 
-        /* Get the public key for the address. */
-        $public_key = $this->getPublicKey($key_addr);
-        if (is_a($public_key, 'PEAR_Error')) {
-            return $public_key;
+        foreach ($addresses as $val) {
+            /* We can only encrypt if we are sending to a single person. */
+            $addrOb = IMP::bareAddress($val, true);
+            $key_addr = array_pop($addrOb);
+
+            /* Get the public key for the address. */
+            $public_key = $this->getPublicKey($key_addr);
+            if (is_a($public_key, 'PEAR_Error')) {
+                return $public_key;
+            }
+            $addr_list[$key_addr] = $public_key;
         }
 
-        return array('pubkey' => $public_key, 'email' => $key_addr);
+        if (!empty($this->multipleRecipientEncryption)) {
+            return array('recips' => $addr_list);
+        } else {
+            return array('pubkey' => $public_key, 'email' => $key_addr);
+        }
     }
 
     /**
@@ -635,15 +645,15 @@
      * Encrypt a MIME_Part using PGP using IMP default parameters.
      *
      * @param MIME_Part $mime_part  The MIME_Part object to encrypt.
-     * @param string $to_address    The e-mail address of the key to use for
+     * @param array $addresses      The e-mail address of the keys to use for
      *                              encryption.
      *
      * @return MIME_Part  See Horde_Crypt_pgp::encryptMIMEPart(). Returns
      *                    PEAR_Error object on error.
      */
-    function IMPencryptMIMEPart($mime_part, $to_address)
+    function IMPencryptMIMEPart($mime_part, $addresses)
     {
-        $params = $this->_encryptParameters($to_address);
+        $params = $this->_encryptParameters($addresses);
         if (is_a($params, 'PEAR_Error')) {
             return $params;
         }
@@ -654,15 +664,15 @@
      * Sign and Encrypt a MIME_Part using PGP using IMP default parameters.
      *
      * @param MIME_Part $mime_part  The MIME_Part object to sign and encrypt.
-     * @param string $to_address    The e-mail address of the key to use for
+     * @param array $addresses      The e-mail address of the keys to use for
      *                              encryption.
      *
      * @return MIME_Part  See Horde_Crypt_pgp::signAndencryptMIMEPart().
      *                    Returns PEAR_Error object on error.
      */
-    function IMPsignAndEncryptMIMEPart($mime_part, $to_address)
+    function IMPsignAndEncryptMIMEPart($mime_part, $addresses)
     {
-        $encrypt_params = $this->_encryptParameters($to_address);
+        $encrypt_params = $this->_encryptParameters($addresses);
         if (is_a($encrypt_params, 'PEAR_Error')) {
             return $encrypt_params;
         }


--- orig/po/hu_HU.po
+++ mod/po/hu_HU.po
@@ -1,42 +1,46 @@
 # IMP Hungarian translation file.
-# Copyright (C) 2002-2005 Laszlo L. Tornoci
+# Copyright (C) 2002-2006 Laszlo L. Tornoci
 # This file is distributed under the same license as the IMP package.
 # Latest versions: ftp://xenia.sote.hu/pub/linux/horde/
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0.4\n"
+"Project-Id-Version: IMP 4.1\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-02 09:20+0200\n"
-"PO-Revision-Date: 2005-10-04 18:34+0100\n"
+"POT-Creation-Date: 2006-02-17 10:00+0100\n"
+"PO-Revision-Date: 2006-02-18 09:46+0100\n"
 "Last-Translator: Laszlo L. Tornoci <torlasz at xenia.sote.hu>\n"
 "Language-Team: Hungarian <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "      Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr " Címzett: "
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "   Dátum: "
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "  Feladó: "
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:409 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Alt-billentyû %s)"
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr "Tartalom: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr ""
 
@@ -44,158 +48,161 @@
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr ""
 
-#: mailbox.php:196
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d levél"
+
+#: mailbox.php:176
 #, php-format
 msgid "%d messages have been deleted."
 msgstr "%d levelet töröltünk."
 
-#: lib/Spam.php:178
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "%d levelet minõsített nem spamnek a rendszergazdának küldött jelentésben."
 
-#: lib/Spam.php:158
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d levelet minõsített nem spamnek."
 
-#: lib/Spam.php:170
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d levelet minõsített spamnek a rendszergazdának küldött jelentésben."
 
-#: lib/Spam.php:150
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d levelet minõsített spamnek."
 
-#: mailbox.php:369
+#: mailbox.php:359
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d - %d (összesen %d levél)"
 
-#: mailbox.php:619
+#: mailbox.php:636
 #, php-format
 msgid "%s KB"
 msgstr ""
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP adminisztráció"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME adminisztráció"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s már létezik. A %s mappát nem sikerült átnevezni."
 
-#: lib/Message.php:612
+#: lib/Message.php:689
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s nem egy érvényes levélláda."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "A %s mappa a hónap elején nevezõdik át."
 
-#: lib/MIME/Viewer/itip.php:252
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s elfogadta a meghívást."
 
-#: lib/MIME/Viewer/itip.php:621
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s törölte %s eseményt."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s törölte a(z) \"%s\" eseményt."
 
-#: lib/MIME/Viewer/itip.php:258
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s elutasította a meghívást."
 
-#: lib/MIME/Viewer/itip.php:489
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s válaszolt az idõbeosztási adatkérésre."
 
-#: lib/MIME/Viewer/itip.php:612
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s válaszolt a %s-re szóló meghívásra."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s válaszolt a(z) \"%s\"-re szóló meghívásra."
 
-#: lib/MIME/Viewer/itip.php:478
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s idõbeosztási információt küldött Önnek."
 
-#: lib/MIME/Viewer/itip.php:264
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s feltételesen elfogadta a meghívást."
 
-#: lib/MIME/Viewer/itip.php:483
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s idõbeosztási adatokat kér Öntõl."
 
 #: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s szeretné, ha részt tudna venni a következõ eseményen: %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s szeretné, ha részt tudna venni a következõ eseményen: \"%s\"."
 
-#: lib/Message.php:377
+#: lib/Message.php:463
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s-t sikeresen hozzátettük %s-hez."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s-t sikeresen hozzátettük \"%s\"-hez."
 
-#: lib/MIME/Viewer/itip.php:593
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s változtatást szeretne a(z) %s eseménnyel kapcsolatosan."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s változtatást szeretne a(z) \"%s\" eseménnyel kapcsolatosan."
 
-#: lib/MIME/Viewer/itip.php:570
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s tájékoztatni kívánja Önt a következõ eseményrõl: %s"
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s tájékoztatni kívánja Önt a következõ eseményrõl: \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s a legfrissebb információt szeretné megkapni %s eseményrõl."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s a legfrissebb információt szeretné megkapni a(z) \"%s\" eseményrõl."
 
-#: message.php:269 message.php:274
+#: message.php:293 message.php:298
 #, php-format
 msgid "%s: %s"
 msgstr ""
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;a&nbsp;%d-bõl)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(A változtatások megtétele után térjünk át a következõ képernyõre.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr ""
 "(Vonjuk vissza az összes változtatást és térjünk vissza a levélíráshoz.)"
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(sima szöveg)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -203,7 +210,7 @@
 "(Térjünk vissza a levélíráshoz az eddigi változtatások megtétele után. A "
 "jelenlegi képernyõn látható változtatások azonban NEM történnek meg."
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -211,52 +218,52 @@
 "(Küldjük el a levelet az eddigi változtatások megtétele után. A jelenlegi "
 "képernyõn látható változtatások azonban NEM történnek meg."
 
-#: templates/contacts/contacts.inc:222
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Az OK gombra kattintva adjuk hozzá ezeket *"
 
-#: templates/contacts/contacts.inc:201
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Kérjük válasszon cím(ek)et *"
 
-#: mailbox.php:194
+#: mailbox.php:174
 msgid "1 message has been deleted."
 msgstr "1 levelet töröltünk."
 
-#: lib/Spam.php:180
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 "1 levelet minõsített nem spamnek a rendszergazdának küldött jelentésben."
 
-#: lib/Spam.php:160
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "1 levelet minõsített nem spamnek."
 
-#: lib/Spam.php:172
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 levelet minõsített spamnek a rendszergazdának küldött jelentésben."
 
-#: lib/Spam.php:152
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "1 levelet minõsített spamnek."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 karakter"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 karakter"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 karakter"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 karakter"
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Egy %s nevû nagyméretû kép van csatolva ehhez a levélhez."
@@ -271,19 +278,19 @@
 msgid "AND"
 msgstr "ÉS"
 
-#: lib/MIME/Viewer/itip.php:586
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Fogadjuk el a meghívást és írjuk be az eseményt a naptárunkba"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "elfogadom a meghívást"
 
-#: lib/MIME/Viewer/itip.php:583
-msgid "Accept request and add it to my calendar"
-msgstr "Fogadjuk el a meghívást és írjuk be az eseményt a naptárunkba."
-
-#: lib/MIME/Viewer/itip.php:749
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "elfogadva"
 
-#: lib/MIME/Viewer/itip.php:253
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "Elfogadva: "
 
@@ -291,36 +298,39 @@
 msgid "Account's name:"
 msgstr "Az áttöltéshez választott elnevezés:"
 
-#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:726
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Lehetõségek"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "adjuk hozzá %s-t a címjegyzékemhez"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "adjuk hozzá"
 
-#: lib/MIME/Viewer/itip.php:573 lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "adjuk hozzá a naptáramhoz"
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Adjuk hozzá a (%s) címjegyzékhez"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "adjuk hozzá a naptáramhoz"
 
-#: compose.php:1191
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\"-t mellékletként csatoltuk."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Beérkezõ levelek esetén a szokásosakon kívül mely fejlécsorokat (mail "
-"header) kíván megjeleníttetni <i>(nem kötelezõ, minden fejlécsor külön sorba "
-"kerüljön)</i>"
+"A szokásosakon kívül mely fejlécsorokat (mail header) kíván megjeleníttetni "
+"<em>(nem kötelezõ, minden fejlécsor külön sorba kerüljön)</em>"
 
 #: lib/MIME/Viewer/notification.php:62
 #, php-format
@@ -349,36 +359,36 @@
 msgid "Additional message error details can be viewed %s."
 msgstr "További részletes hibaüzenet látható %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Címjegyzékek"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Mely címekre kíván minden elküldött levélrõl \"BCC\" másolatot küldeni: <i>"
-"(nem kötelezõ, minden cím külön sorba kerüljön)</i>"
+"Mely címekre kíván minden elküldött levélrõl \"BCC\" másolatot küldeni: <em>"
+"(nem kötelezõ, minden cím külön sorba kerüljön)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Azok a címek, melyekre érkezõ leveleket ehhez az azonosítóhoz kíván kötni <i>"
-"(nem kötelezõ, minden cím külön sorba kerüljön)</i>"
+"Azok a címek, melyekre érkezõ leveleket ehhez az azonosítóhoz kíván kötni "
+"<em>(nem kötelezõ, minden cím külön sorba kerüljön)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "az összeset"
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -386,7 +396,7 @@
 "A következõ mappa(k) tartalma letölésre kerül egy standard mbox formátumú "
 "fájlba:"
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -409,14 +419,18 @@
 "A %s hónaposnál régebbi, elküldött leveleket tartalmazó (sent-mail) mappák "
 "törlésre kerülnek."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
 "\"%s\" mappához történõ hozzáférési jogokat sikeresen megvontuk \"%s\" "
 "felhasználótól."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Engedjük meg mappák létrehozását?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "A szûrési szabályokat bármelyik mappára engedjük alkalmazni?"
 
@@ -424,15 +438,15 @@
 msgid "Alternative parts for this section:"
 msgstr "Ennek a résznek az alternatív változatai:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "mindig"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Mindig mentsük el a mellékleteket."
 
-#: lib/Message.php:468
+#: lib/Message.php:554
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -440,11 +454,15 @@
 "Hiba történt a mellékletnek a levélrõl történõ leválasztása során. Az IMAP "
 "szerver üzenete: "
 
-#: lib/Message.php:364
+#: lib/Message.php:437
+msgid "An unknown error occured while creating the new note."
+msgstr "Az új feljegyzés létrehozása során valami hiba történt."
+
+#: lib/Message.php:436
 msgid "An unknown error occured while creating the new task."
-msgstr "Az új feladat hozzáadása során valami hiba történt."
+msgstr "Az új feladat létrehozása során valami hiba történt."
 
-#: message.php:484 mailbox.php:693 templates/message/navbar_navigate.inc:9
+#: message.php:504 mailbox.php:709 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -463,20 +481,24 @@
 msgid "Apply Filters to %s"
 msgstr "Alkalmazzuk a szûrõket %s-re"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "A szûrési szabályokat a bejelentkezéskor alkalmazzuk?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr ""
 "Alkalmazzuk a szûrési szabályokat az INBOX mappa minden megjelenítése esetén?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Biztos, hogy törölni akarja ezt virtuális mappát?"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Biztos, hogy törölni kívánja ezt a nyilvános kulcsot?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "Biztosan törölni akarja a saját kulcspárját? (Ez NEM ajánlatos!)"
@@ -485,11 +507,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Biztos, hogy ezt kívánja tenni?"
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:409 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Biztos, hogy VÉGÉRVÉNYESEN törölni kívánja ezeket a leveleket?"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Biztos, hogy VÉGÉRVÉNYESEN törölni kívánja ezt a mellékletet?"
 
@@ -497,7 +519,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Biztos, hogy ki szeretné üríteni ezt a mappát?"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:949
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Biztos, hogy ki szeretné üríteni a spam a mappát?"
+
+#: lib/IMP.php:942
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Biztos, hogy ki szeretné üríteni a szemetes (Trash) a mappát?"
 
@@ -505,47 +531,43 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Biztos abban, hogy végleg törölni kívánja ezeket a leveleket?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr ""
 "Biztos, hogy nemspamnek kívánja minõsíteni ezt a levelet a levelezõrendszer "
 "számára?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr ""
 "Biztos, hogy spamnek kívánja minõsíteni ezt a levelet a levelezõrendszer "
 "számára?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Érkezési idõ"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "növekvõ"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "választhassak"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Csatoljuk"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:472
 msgid "Attach Files"
 msgstr "Fájlok csatolása"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:453
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Mellékeljük az Ön PGP nyilvános kulcsát a levélhez?"
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Csatolt fájl:"
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -553,22 +575,30 @@
 "A mellékelni kívánt \"%s\" állománnyal túllépné a mellékletek méretére "
 "vonatkozó korlátokat. Az fájlt NEM csatoltuk."
 
-#: lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "A mellékletben az Ön idõbeosztási kérésére adott válasz van."
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:500 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Melléklet"
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "A(z) %s mellékletet töröltük."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "A mellékletek adatai"
+
+#: compose.php:1105 lib/Message.php:515
 msgid "Attachment stripped: Original attachment type"
 msgstr "A mellékletet leválasztottuk: az eredeti melléklet típusa"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:470
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Mellékletek"
 
@@ -584,7 +614,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: a szükéges IMAP bõvítõfunkció nem található."
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -596,7 +626,7 @@
 msgid "Available Address books:"
 msgstr "A rendelkezésre álló címjegyzékek:"
 
-#: lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "válaszra vár"
 
@@ -605,13 +635,36 @@
 msgid "Bac_k to %s"
 msgstr "Vissz_a %s-hez"
 
-#: thread.php:86 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Vissza %s-hez"
 
-#: message.php:250 search.php:147 templates/contacts/contacts.inc:217
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Vissza a levéllistához"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Vissza a logikai nézethez"
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "Ismeretlen felhasználói név vagy jelszó."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Hibás IMAP parancs. A szerver válasza: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Hibás lekérés: %s."
+
+#: message.php:274 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -619,17 +672,17 @@
 msgid "Below is the raw text of the status information message."
 msgstr "Alább látható a státusz információ nyers, szöveges változata."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Tiltólista"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Tiltsuk-e le a HTML formátumú levelekben levõ képek kérés nélküli, "
 "automatikus megjelenítését?"
 
-#: search.php:155
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Levéltörzs"
 
@@ -638,11 +691,17 @@
 msgid "Both"
 msgstr "Mindkettõ"
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "a fejlécben való felsorolás és a levéltörzsben való megjelenítés is"
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
+"A CRAM-MD5 ill. a DIGEST-MD5 használatához telepíteni kell az Auth_SASL "
+"csomagot."
+
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "_Karakterkészlet"
 
@@ -667,15 +726,16 @@
 "Nem jeleníthetõ meg - a levélnek csak %s darabját találni meg a(z) %s-bõl "
 "ebben a mappában."
 
-#: folders.php:273 templates/contacts/contacts.inc:250
-#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
-#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
-#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Mégse"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:432
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Mégsem kell ez a levél"
 
@@ -683,28 +743,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "A kilépés következtében e levél tartalma véglegesen elvész."
 
-#: message.php:249 search.php:143 templates/contacts/contacts.inc:216
-#: templates/compose/recompose.inc:15
+#: message.php:273 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:697
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"A tanúsítvány nem importálható. A szerveren nincs engedélyezve az állományok "
+"feltöltése."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Elnök"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Változtatás"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Változtassuk meg az összeset"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Másik mappa kiválasztása"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -724,23 +792,23 @@
 "Az Ön által elküldött leveleken szereplõ név, cím, állandó levélvégzõdés "
 "(signature) beállítása."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Hány karaktert mutassunk a levél elejérõl:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Ellenõrizzük, hogy jött-e új levél"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Jelöljük ki mind/egyiket sem"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Jelölje ki, mely levelezõszerverekrõl kíván leveleket áttölteni:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Ellenõrizzük a helyesírást a levél elküldése elõtt?"
 
@@ -748,19 +816,15 @@
 msgid "Choose Action:"
 msgstr "Mi történjen:"
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Válasszon levelezõszervert:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
 msgid "Choose a match or edit the address to the right:"
 msgstr "Kérem, hogy jobb oldali mezõben válassza ki, vagy módosítsa:"
 
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:727
-msgid "Choose an action:"
-msgstr "Mi történjen:"
-
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Melyik címjegyzéket kívánja használni új címek rögzítésére."
@@ -771,49 +835,45 @@
 "A címrészlet teljes címmé alakításakor milyen sorrendben keressen a gép a "
 "címjegyzékekben."
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "%s kattintson, ha a képet olyan formátumra kívánja alakítani, amit a "
 "böngészõprogramja meg tud jeleníteni."
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Ha le szeretné tölteni a képet, kattintson %s."
 
-#: lib/Filter.php:107
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "%s kattintson, ha %s menedzsment oldalára szeretne menni."
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "%s kattintson, a HTML tartalom külön ablakban való megjelenítéséhez."
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "%s kattintson, ha a képet piciben szeretné látni."
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "%s kattintson, a melléklet külön ablakban való megjelenítéséhez."
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 "%s kattintson, a melléklet e részének külön ablakban való megjelenítéséhez."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Kattintson ide a képek eltüntetéséhez"
-
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Kattintson ide a képek megjelenítéséhez"
 
@@ -825,52 +885,52 @@
 "Kattintson az egyik kiválasztott címjegyzékre, majd válassza ki, hogy melyik "
 "mezõkben történjen keresés."
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 "Kattintson ide, ha címjegyzékében el kívánja tárolni ezt a PGP nyilvános "
 "kulcsot"
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 "Kattintson a Mentés feliratra, ha címjegyzékében el kívánja tárolni %s S/"
 "MIME tanúsítványát"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "A címre kattintva a új levelet írhatunk a feladónak"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "A címre kattintva megnyílik a levél"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Bezárás"
 
-#: compose.php:775 compose.php:1082
+#: compose.php:418
 msgid "Close this window"
 msgstr "Az ablak bezárása"
 
-#: folders.php:416
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Zárt mappa"
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse"
 msgstr "Csukjuk be"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Csukjuk be az összeset"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Csukjuk össze az összes mappát"
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Csukjuk össze a mappát"
 
@@ -878,32 +938,23 @@
 msgid "Color Indicator: "
 msgstr "Színjelölés: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "befejezve"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Levélírás"
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Levélírás (%s)"
-
-#: compose.php:774 compose.php:1081
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Újabb levél írása"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "A levélírás külön ablakban történjék?."
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -915,25 +966,33 @@
 msgid "Configure how messages are displayed."
 msgstr "A levelek megjelenítésének beállításai."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Elõnézeti (mail preview) beállítások."
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Az IMAP szerver megszakította a kapcsolatot."
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "A szerverrel nem vehetõ fel a kapcsolat"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "%s PGP támogatásának beállításai."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "%s S/MIME támogatásának beállításai."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "A levelek közötti kereséssel kapcsolatos beállítások."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -941,7 +1000,7 @@
 "Mikor ellenõrizzük új levelek érkezését, és kapjon-e értesítést az új "
 "levelek érkezésekor."
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr ""
 "Az érzelemtükrözõ szöveges karaktercsoportokat (emoticons, \"smileys\") "
@@ -955,25 +1014,30 @@
 msgid "Copy to folder"
 msgstr "Másoljuk ide"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Hibátlan"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Javított szöveg"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "A kérést nem sikerült végrehajtani. Az ok a következõ: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "A VFS háttérprogram nem hozható létre: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:680
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nem sikerült %s-bõl törölni a leveleket. A szerver üzenete: %s"
 
-#: lib/Session.php:293
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Nem sikerült elvégezni a karbantartási feladatokat."
 
@@ -985,23 +1049,29 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "A kívánt állományt nem sikerült kibontani a Zip fájlból."
 
-#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr ""
+"Nem sikerült a titkosított kapcsolat felvétele az IMAP szerverrel. %s : %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Az IMAP szervertõl nem sikerült megkapni a \"namespace\" adatokat."
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Létrehozás"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Új mappa létrehozása"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Kulcspár létrehozása"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Új virtuális mappa létrehozása"
-
 #: templates/fetchmail/account_select.inc:26
 msgid "Create a New Account"
 msgstr "Új azonosító létrehozása"
@@ -1014,7 +1084,7 @@
 msgid "Create a new drafts folder"
 msgstr "Hozzunk létre új mappát a munkapéldányok (drafts) számára"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Hozzunk létre új mappát az elküldött levelek (sent-mail) számára"
 
@@ -1022,7 +1092,7 @@
 msgid "Create a new trash folder"
 msgstr "Hozzunk létre új 'Szemetes' (Trash) mappát"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1030,12 +1100,20 @@
 "Szûrõfeltételek adhatók meg, melyekkel a beérkezõ levelek automatikusan "
 "mappákba rendezhetõk."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Új levélpapír létrehozása"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Levélpapír vagy formanyomtatvány létrehozása."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "A(z) %s mappához való jelenlegi hozzáférési jogosultságok:"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
 "A levelek idegen levelezõszerverekrõl történõ áttöltésének beállításai."
@@ -1054,84 +1132,101 @@
 msgid "Dat_e"
 msgstr "Dátum"
 
-#: message.php:246 thread.php:92
+#: message.php:270 thread.php:153
 msgid "Date"
 msgstr "Dátum"
 
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "elutasítva"
 
-#: lib/MIME/Viewer/itip.php:259
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
 msgstr "Elutasítva: "
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Az alapértelmezés szerinti keresési mezõ"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "A sorbarendezés alapértelmezés szerinti szempontja:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "A sorbarendezés alapértelmezés szerinti iránya:"
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "másnak átadva"
 
-#: folders.php:407 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:239 templates/message/navbar_actions.inc:6
+#: folders.php:400 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Töröljük %s nyilvános kulcsot"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "A jelenlegi kulcsok törlése"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Mappa(k) törlése"
 
-#: folders.php:274
+#: folders.php:271
 msgid "Delete Selected Folders"
 msgstr "A kiválasztott mappák törlése"
 
-#: folders.php:407
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Töröljük ezt a levélpapírt"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Virtuális mappa törlése"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "A(z) %s virtuális mappa törlése."
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Töröljük a távoli szerverrõl az áthozott leveleket?"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Töröljük a naptáramból"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr ""
 "Töröljük a hónap elején a régi, hivatkozás formájában küldött mellékletek "
 "tényleges példányait?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr ""
 "Töröljük a régi elküldött leveleket (sent-mail) tartalmazó mappákat a hónap "
 "elején?"
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Töröljük a spameket a bejelentésüket követõen?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Töröljük a spam leveleket"
 
-#: message.php:487 mailbox.php:719 templates/mailbox/navbar.inc:20
+#: message.php:507 mailbox.php:735 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "törölt"
@@ -1140,7 +1235,7 @@
 msgid "Deleted messages"
 msgstr "Törölt levelek"
 
-#: compose.php:280
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "A \"%s\" mellékletet töröltük."
@@ -1149,51 +1244,59 @@
 msgid "Deleting and Moving Messages"
 msgstr "A levelek törlése és áthelyezése"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "elutasítom a meghívást"
 
-#: lib/MIME/Viewer/itip.php:536
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Az idõbeosztási adatkérés elutasítása"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "csökkenõ"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:665
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Leírás"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Részletesen"
 
-#: config/prefs.php.dist:671
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "\"%s\" nem került csatolásra, mert az állomány üres."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Az állandó levélvégzõdés (signature) halványan jelenjen meg?"
 
-#: templates/contacts/contacts.inc:231
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Megjelenítés"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "A levél elküldése után jelenjen meg egy ezt megerõsítõ üzenet?"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "a levéltörzsben való megjelenítés"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Új levél érkezésérõl külön felbukkanó ablakban kér értesítést?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Legyen egy 'Szemetes mappa ürítés' pontja a menüsornak?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Legyen egy \"Spam mappa ürítés\" pontja a menüsornak?"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Legyen egy \"Szemetes mappa ürítés\" pontja a menüsornak?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
@@ -1203,23 +1306,27 @@
 msgid "Do NOT match"
 msgstr "NE legyen benne"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Ne ellenõrizzük, hogy jött-e új levél"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "A Feladó oszlopra kattintva ne történjen semmi"
 
-#: lib/IMP.php:1031
+#: lib/IMP.php:1053
 msgid "Do you want to open that folder?"
 msgstr "Meg kívánja nyitni a mappát?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Nincs még login neve? Igényeljen egyet."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Kész"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Töltsük le %s-t .zip formátumban."
@@ -1228,25 +1335,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Az összes melléklet letöltése (egy .zip fájlba)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Töltsük le a mappá(ka)t"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Töltsük le a mappá(ka)t (egy .zip fájlba)"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Töltsük le .zip formátumban."
 
-#: message.php:485 mailbox.php:698 templates/message/navbar_navigate.inc:11
+#: message.php:505 mailbox.php:714 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "munkapéldány"
 
-#: folders.php:387
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Munkapéldány mappa"
 
@@ -1254,11 +1361,11 @@
 msgid "Drafts folder:"
 msgstr "Munkapéldány mappa:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Email cím"
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:302
 msgid "END"
 msgstr "VÉGE"
 
@@ -1266,20 +1373,23 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr "HIBA: levelét nem sikerült kézbesíteni."
 
-#: folders.php:408
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Módosítás"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "A tiltólista módosítása"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "A szûrõfeltételek módosítása"
 
-#: folders.php:408 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "A keresés módosítása"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Virtuális mappa átdefiniálása"
 
@@ -1288,40 +1398,44 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "A(z) %s virtuális mappa átdefiniálása."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Az engedélyezési lista módosítása"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Az Ön tiltólistájának módosítása"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "A szûrõfeltételek módosítása"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "A külsõ szerverekrõl történõ levéláttöltés beállításai."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Az engedélyezési lista módosítása"
 
-#: templates/contacts/contacts.inc:234
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Email cím"
 
-#: lib/Message.php:620
+#: lib/Message.php:697
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Az összes levelet töröltük %s-bõl."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:673
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "A virtuális szemetesmappát kiürítettük."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Ürítsük ki a mappá(ka)t"
 
-#: folders.php:275
+#: folders.php:272
 msgid "Empty Selected Folders"
 msgstr "Ürítsük ki a kiválasztott mappákat"
 
@@ -1329,44 +1443,53 @@
 msgid "Empty Trash folder"
 msgstr "Ürítsük ki a 'Szemetes' (Trash) mappát"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:949
+msgid "Empty _Spam"
+msgstr "A Spam mappa ürítése"
+
+#: lib/IMP.php:942
 msgid "Empty _Trash"
-msgstr "'Szemetes' ürítés"
+msgstr "A szemetes mappa ürítése"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Aktiváljuk a PGP szolgáltatásokat?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Aktiváljuk az S/MIME szolgáltatásokat?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Szeretne belenézni a levelekbe anélkül, hogy rájuk kattintana?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:439
 msgid "Encr_yption Options"
 msgstr "T_itkosítási beállítások"
 
-#: lib/MIME/Viewer/itip.php:513 lib/MIME/Viewer/itip.php:653
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Titkosított adat"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Vég"
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Vége a továbbított üzenetnek"
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "A levél vége"
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "%s levelének vége"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "A jelmondat megadása"
 
@@ -1378,7 +1501,7 @@
 msgid "Enter the name for your new drafts folder"
 msgstr "Adja meg a munkapéldányok (drafts) létrehozandó új mappájának nevét"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr ""
 "Adja meg az elküldött levelek (sent-mail) létrehozandó új mappájának nevét"
@@ -1387,92 +1510,98 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Adja meg az új 'Szemetes' (Trash) mappa nevét"
 
-#: search.php:159
+#: lib/Search.php:613
 msgid "Entire Message"
 msgstr "A teljes levél"
 
-#: message.php:178 compose.php:1068 thread.php:39
+#: message.php:195 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "A címjegyzékhez sikeresen hozzáadtuk \"%s\"-t."
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:387
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Hiba"
 
-#: lib/MIME/Viewer/itip.php:305 lib/MIME/Viewer/itip.php:403
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Az IMAP szerver nem érhetõ el. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Hiba történt a válasz küldésekor: %s"
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Az eseményt sikeresen töröltük."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "15 percenként"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "30 másodpercenként"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "5 percenként"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "félóránként"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "percenként"
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand"
 msgstr "Nyissuk szét"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Nyissuk szét az összeset"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Nyissuk szét az összes mappát"
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Nyissuk szét a mappát"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "A címrészlet teljessé egészítése"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Egészítsük-e ki a neveket automatikusan levélírás közben?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "A mappák nézetében rögtön kinyitva jelenjen meg az összes mappa?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 msgid "Expanding"
 msgstr "Címrészlet kiegészítése..."
 
-#: lib/IMP.php:940 lib/IMP.php:942
+#: lib/IMP.php:960 lib/IMP.php:962
 msgid "F_etch Mail"
 msgstr "Levelek áttöltése"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Levelek áttöltése"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "A levelek áttöltése külön ablakban történjék?"
 
@@ -1480,70 +1609,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Bejelentkezéskor automatikusan induljon meg a levelek áttöltése?"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
 #, php-format
 msgid "Fetched %d messages from %s"
 msgstr "%d levél töltõdött át %s-rõl."
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr "1 levél töltõdött át %s-rõl."
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Levéláttöltés: "
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Levéláttöltés: nincs új levele."
 
-#: lib/IMP.php:946
+#: lib/IMP.php:966
 msgid "Fi_lters"
 msgstr "Szûrõk"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:496 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Fájl"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Szûrési beállítások"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Szûrõfeltételek"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Szûrjük ki a közönséges (profán) kifejezéseket a levelek tartalmából?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Ez a rendszer nem támogatja a levélszûrést."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Szûrõk"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "A szûrõk ki vannak kapcsolva"
 
-#: lib/Filter.php:106
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Szûrõk: %s módosítási oldal"
 
-#: templates/contacts/contacts.inc:181
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Keresés"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "A mappa elsõ oldala"
 
-#: mailbox.php:341
+#: mailbox.php:331
 msgid "First Page"
 msgstr "Elsõ oldal"
 
@@ -1551,69 +1680,53 @@
 msgid "Fo_rward"
 msgstr "Tová_bbítás"
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:252 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
 msgstr "A mappákon végzett mûvelet megerõsítése"
 
-#: folders.php:292 templates/folders/head.inc:9
+#: folders.php:289 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Mappák kezelése"
 
-#: templates/login/login.inc:172
-msgid "Folder Prefix"
-msgstr "Mappa prefixum"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Mappa összefoglalás"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr ""
 "Nincs megengedve, hogy más felhasználóknak hozzáférési jogot adjunk "
 "mappáinkhoz."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "A mappák használata nincs megengedve."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Az aznap kapott levelek érkezési idõpontjának formátuma"
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Továbbítás"
 
-#: compose.php:712
+#: compose.php:805
 msgid "Forward:"
 msgstr "Továbbítás:"
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Továbbított levél"
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Továbbított levél %s címrõl"
 
-#: lib/MIME/Viewer/itip.php:479
-msgid "Free/Busy Information"
-msgstr "Elfoglaltsági információ"
-
-#: lib/MIME/Viewer/itip.php:490
-msgid "Free/Busy Reply"
-msgstr "Válasz elfoglaltsági kérdésre"
-
-#: lib/MIME/Viewer/itip.php:484
-msgid "Free/Busy Request"
-msgstr "Elfoglaltsági kérdés"
-
-#: lib/MIME/Viewer/itip.php:397
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Válasz elfoglaltsági kérdésre"
 
@@ -1621,24 +1734,24 @@
 msgid "Fro_m"
 msgstr "Feladó"
 
-#: message.php:247 search.php:135 thread.php:93
-#: templates/compose/compose.inc:98
+#: message.php:271 thread.php:154 templates/compose/compose.inc:99
+#: lib/Search.php:589
 msgid "From"
 msgstr "Feladó"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "A feladó címe"
 
-#: compose.php:724 compose.php:728
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1229
+#: compose.php:1311
 msgid "Fwd: "
 msgstr ""
 
-#: compose.php:1231
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u továbbított üzenet"
@@ -1652,34 +1765,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Csak az új leveleket hozzuk át? (csak IMAP)"
 
-#: thread.php:85
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Mehet"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "A levélhez"
 
-#: lib/IMP.php:553
+#: lib/IMP.php:502
 #, php-format
 msgid "Go to address book entry of \"%s\""
 msgstr "Menjünk a következõ címjegyzék adathoz: \"%s\""
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Jogosultság adása"
 
-#: message.php:540 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: message.php:550 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
 #: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
-#: lib/MIME/Viewer/related.php:61 lib/MIME/Viewer/pkcs7.php:407
-#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "ITT"
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:62
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr ""
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "A levél HTML változata"
 
@@ -1691,43 +1810,39 @@
 msgid "Here is the message you were composing:"
 msgstr "Itt az Ön által fogalmazott levél:"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "ne mutasssuk"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "logikai (thread) nézetben ne mutassuk"
 
-#: mailbox.php:363
+#: mailbox.php:353
 msgid "Hide Deleted"
 msgstr "A törölteket ne mutassuk"
 
-#: folders.php:287
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "A használaton kívül helyezett (unsubscribed) mappákat ne mutassuk"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Ne mutassuk a képeket"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "nagy"
 
-#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+#: message.php:305 mailbox.php:719 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Sürgõs"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "legnagyobb"
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Hogyan kívánja megjeleníttetni a mellékleteket?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Válaszoláskor hogyan jelezzük, hogy kitõl idéztünk"
 
@@ -1739,7 +1854,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (automatikus protokoll meghatározással)"
 
-#: templates/login/login.inc:160 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "Az IMAP szerver megszakította a kapcsolatot. A szerver válasza: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP SSL fölött"
 
@@ -1747,11 +1867,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP SSL fölött (öntanúsítvánnyal)"
 
-#: templates/login/login.inc:161
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "SSL fölött (öntanúsítvánnyal)"
 
-#: templates/login/login.inc:159 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "Az IMAP szerver megszakította a kapcsolatot."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, TLS nélkül"
 
@@ -1759,45 +1883,50 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 levelezõszerverek"
 
-#: lib/IMP.php:886
-msgid "INBOX"
-msgstr "Új levelek"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Az SSL vagy TSL használatához a PHP openssl bõvítésének be kell töltõdnie."
 
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr "Ha folytatja, a mappá(k)ban levõ összes levél törlõdik!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ne vegyük figyelembe"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Egyiket se vegyük figyelembe"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Kép"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importálás"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Kulcs importálása"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Kulcspár importálása"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Levelek importálása"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "PGP kulcs importálása"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Személyes tanúsítványok importálása"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Személyes tanúsítvány importálása"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1811,7 +1940,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Személyes S/MIME tanúsítványok importálása"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Nyilvános kulcs importálása"
 
@@ -1836,7 +1965,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "%s standard mbox fájl importálása (feltöltése) a(z) %s mappába."
 
-#: message.php:486 mailbox.php:713 templates/message/navbar_navigate.inc:7
+#: message.php:506 mailbox.php:729 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1846,25 +1975,26 @@
 msgid "Important messages"
 msgstr "Fontos levelek"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d levelet importáltunk %s-bõl."
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "folyamatban"
 
-#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:830 lib/IMAP/Tree.php:119
+#: lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr ""
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Válaszoláskor idézzük-e be a levél fejlécének fontosabb sorait?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Válaszoláskor idézzük be a megválaszolandó levelet?"
 
@@ -1872,21 +2002,21 @@
 msgid "Info"
 msgstr "Információ"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Információ %s nyilvános kulcsról"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Információ a személyes, titkos kulcsról"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Információ a személyes, nyilvános kulcsról"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:501
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "Levélbeni"
 
@@ -1906,11 +2036,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Ide másolja be a nyilvános PGP kulcsot"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Ez a lehetõség nem választható ebben az esetben."
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:575 mailbox.php:622
 msgid "Invalid Address"
 msgstr "Hibás/elfogadhatatlan cím."
 
@@ -1918,20 +2048,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr "Hibás/elfogadhatatlan távoli levélláda."
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Hibás/elfogadhatalan karakter az email címben: %s."
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "Hibás kulcs"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Hibás PGP személyes, titkos kulcs."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Hibás PGP személyes, nyilvános kulcs."
 
@@ -1939,44 +2069,66 @@
 msgid "Invert"
 msgstr "az ellenkezõjét"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr ""
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Kulcshosszúság"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+"A kulcs létrehozása hosszabb idõt vehet igénybe. Folytassuk a kulcs "
+"létrehozását?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"A kulcs nem importálható. A szerveren nincs engedélyezve az állományok "
+"feltöltése."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"A kulcs nem importálható. Nincs megadva a címjegyzék, ahova el lehetne "
+"menteni az adatokat."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "A kulcsot sikeresen elküldtük a nyilvános kulcsokat tároló szervernek."
 
-#: templates/login/login.inc:196
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Nyelv"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "A mappa utolsó oldala"
 
-#: mailbox.php:354
+#: mailbox.php:344
 msgid "Last Page"
 msgstr "Utolsó oldal"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "A mellékleteket hivatkozás formájában küldjük"
+#: templates/compose/compose.inc:549
+msgid "Link Attachments?"
+msgstr "A mellékleteket hivatkozás formájában küldjük?"
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "A mellékletek hivatkozás formájában való küldése nem megengedett."
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr "A hivatkozott mellékletek ekkor törlõdni fognak: %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1984,7 +2136,7 @@
 "Listázzuk ki az összes partnert a címjegyzék behívásakor? (ha nem, akkor "
 "csak azok a partnerek jelennek meg, melyekre rákeres)"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "a fejlécben való felsorolás"
 
@@ -1992,20 +2144,20 @@
 msgid "Local Mailbox:"
 msgstr "Helyi mappa:"
 
-#: lib/MIME/Viewer/itip.php:670
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Hely"
 
-#: templates/login/login.inc:204
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Bejelentkezés %s-be"
 
-#: templates/login/login.inc:133
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Bejelentkezés"
 
@@ -2013,15 +2165,15 @@
 msgid "Login Tasks"
 msgstr "Bejelentkezéssel kapcsolatos feladatok"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "alacsony"
 
-#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+#: message.php:307 mailbox.php:722 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Nem sürgõs"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "legalacsonyabb"
 
@@ -2029,11 +2181,11 @@
 msgid "Macintosh File"
 msgstr "Macintosh fájl"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Levelezés"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "A levelek elõnézete"
 
@@ -2041,19 +2193,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Az idegen levelezõszerver típusa:"
 
-#: folders.php:397
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Levélláda"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "A levélláda ill. a mappák megjelenítési beállításai"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "A mappa összes levelét olvasottként jelöljük meg"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "A mappa összes levelét olvasatlanként jelöljük meg"
 
@@ -2061,7 +2213,7 @@
 msgid "Mark as:"
 msgstr "Jelöljük meg, mint:"
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Az idézetek különbözõ szintjeit eltérõ színnel jelezzük?"
 
@@ -2069,85 +2221,65 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Olvasottként jelöljük meg a leveleket? (csak IMAP)"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Jelezzük az egyszerûbb HTML kódokat?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Az összes keresõfeltételt kielégítik"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Bármelyik keresõfeltételt kielégítik"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:507
 msgid "Maximum Attachment Size"
 msgstr "Maximális melléklet méret"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "A mappák maximális száma"
+
+#: templates/compose/compose.inc:489
 msgid "Maximum number of attachments reached."
 msgstr "A csatolt mellékletek száma nem növelhetõ tovább."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:485
 msgid "Maximum total attachment size reached."
 msgstr ""
 "A csatolt mellékletek összmérete elérte a maximális megengedett értéket."
 
-#: lib/MIME/Viewer/itip.php:622
-msgid "Meeting Cancellation"
-msgstr "A megbeszélés elmarad"
-
-#: lib/MIME/Viewer/itip.php:571
-msgid "Meeting Information"
-msgstr "Megbeszélési információ"
-
-#: lib/MIME/Viewer/itip.php:581
-msgid "Meeting Proposal"
-msgstr "Javaslat megbeszélésre"
-
-#: lib/MIME/Viewer/itip.php:613
-msgid "Meeting Reply"
-msgstr "Válasz megbeszélés ügyében"
-
-#: lib/MIME/Viewer/itip.php:594
-msgid "Meeting Update"
-msgstr "Új információ megbeszélés ügyben"
-
-#: lib/MIME/Viewer/itip.php:599
-msgid "Meeting Update Request"
-msgstr "Új információ kérése megbeszélés ügyben"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Mappa listázó menü"
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Levél"
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Levélírás"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "A levél dátuma"
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Levelekre vonatkozó beállítások"
 
-#: search.php:359
+#: search.php:306
 msgid "Message Search"
 msgstr "Keresés a levélben"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "A levél mérete"
 
-#: message.php:368
+#: message.php:392
 msgid "Message Source"
 msgstr "A levél forrása"
 
@@ -2155,10 +2287,6 @@
 msgid "Message Viewing"
 msgstr "A levél megtekintése"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "A levél részei"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "A levél fajtája"
@@ -2167,45 +2295,45 @@
 msgid "Message folders"
 msgstr "Melyik mappa"
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Levél %s-tõl"
 
-#: mailbox.php:646
+#: mailbox.php:663
 msgid "Message has attachments"
 msgstr "A levélhez mellékletek is vannak"
 
-#: mailbox.php:637
+#: mailbox.php:654
 msgid "Message is encrypted"
 msgstr "A levél kódolva van"
 
-#: mailbox.php:632
+#: mailbox.php:649
 msgid "Message is signed"
 msgstr "A levél digitális aláírással van ellátva"
 
-#: templates/search/header.inc:33
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "A keresett levelek"
 
-#: compose.php:771 compose.php:785
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "A levelet sikeresen átirányítottuk."
 
-#: compose.php:1018
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "A levél elment, de nem sikerült elmenteni itt: %s"
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "A levelet elküldtük."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Az egy oldalon megjelenõ levelek száma a levélláda megtekintésekor."
 
-#: mailbox.php:318
+#: mailbox.php:311
 msgid "Messages to"
 msgstr "a leveleket ide..."
 
@@ -2213,7 +2341,7 @@
 msgid "Modify"
 msgstr "Módosítás"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
 msgid "More than one address found for field \"%s\"."
 msgstr "Több, mint egy címet találtunk a \"%s\" mezõre."
@@ -2226,6 +2354,11 @@
 msgid "Move down"
 msgstr "vigyük lejjebb"
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"A spam küldeményeket tegyük át a spam mappába, a többit pedig az INBOX-ba"
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "tegyük át ebbe a mappába"
@@ -2238,49 +2371,66 @@
 msgid "Multipart/alternative"
 msgstr "Több, alternatív részt tartalmaz"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Levéllista nézet"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "SEMMI"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "MEGJEGYZÉS"
 
-#: templates/contacts/contacts.inc:233 lib/MIME/Viewer/itip.php:684
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Név"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
-msgstr "A név ill. email cím nem maradhat üresen."
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
+msgstr "A név ill. email cím nem maradhat üresen"
 
-#: lib/MIME/Viewer/itip.php:774
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "nincs válasz"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "soha"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "A mellékleteket sose mentsük el."
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "új"
 
-#: lib/IMP.php:615
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Új mappa"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Új levél"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Új levél"
+
+#: mailbox.php:771 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Új levél %s címre"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Új levelek"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Következõ"
 
@@ -2288,15 +2438,16 @@
 msgid "Next Message"
 msgstr "Következõ levél"
 
-#: mailbox.php:352
+#: mailbox.php:342
 msgid "Next Page"
 msgstr "Következõ oldal"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:540 templates/compose/compose.inc:553
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr "Nem"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Nem található tanúsítvány"
 
@@ -2304,106 +2455,127 @@
 msgid "No Encryption"
 msgstr "Titkosítás/digitális aláírás nélkül"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Egy kulcs sincs tárolva"
 
-#: mailbox.php:371
+#: mailbox.php:361
 #, php-format
 msgid "No Messages"
 msgstr "Nincs levél"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Nem importáltunk egy nyilvános PGP kulcsot sem."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Nem található személyes tanúsítvány"
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:319
 msgid "No Preview Text"
 msgstr "Nincs megjeleníthetõ szöveg"
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Nem található nyilvános kulcs"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Nem importálódott S/MIME nyilvános kulcs."
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Nincs melléklet."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "A nyilvános kulcs nem tartalmaz emailre vonatkozó információt."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Nincs kijelölt mappa."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "Egy mappában sem ellenõrizzük, érkezett-e új levél."
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:201 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Egy mappa sem volt kijelölve"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "Nincs új levelet tartalmazó mappa"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "Nincs olvasatlan levelet tartalmazó mappa"
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "A levéltörzs üres"
 
-#: lib/Mailbox.php:365
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Nincs levél."
+
+#: lib/Mailbox.php:362
 msgid "No messages matched your search."
 msgstr "A keresés nem talált semmit."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Nem importálódott a PGP személyes, titkos kulcs."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Nem importálódott a PGP személyes, nyilvános kulcs."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Nem importálódott S/MIME személyes tanúsítvány."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Nincs meg a titkos személyes kulcs, ezért a kódolt levél tartalma nem "
+"fejthetõ vissza."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "A helyesírásellenõrzõ program nincs konfigurálva."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Nincs helyesírási hiba"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Nincs javaslat"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+"Nincs olyan felhasználóazonosítási módszer, amit az IMAP szerver támogat."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Nem jelölt meg felhasználót."
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Nem résztvevõ"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
-#: lib/MIME/Viewer/itip.php:660
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "egyik(et) sem"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "közepes"
 
@@ -2425,8 +2597,7 @@
 msgid "Not Personal"
 msgstr "nem személyes"
 
-#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:140
-#: lib/Crypt/SMIME.php:149
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Nem érvényes nyilvános kulcs."
 
@@ -2442,24 +2613,31 @@
 msgid "Note that this can take some time"
 msgstr "Ez eltarthat egy ideig"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Semmi"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Tájékoztatás: a hivatkozott mellékletet letöltöttük"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 " hónapig tartsuk meg a hivatkozás formájában küldött mellékletek tényleges "
 "példányát, havi törlés esetén."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "db régi elküldött leveleket tartalmazó (sent-mail) mappát tartsunk meg, havi "
 "törlés esetén"
 
-#: templates/contacts/contacts.inc:249 lib/MIME/Viewer/itip.php:548
-#: lib/MIME/Viewer/itip.php:729
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "VAGY"
@@ -2472,43 +2650,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr "Törlõdnek a régi elküldött leveleket tartalmazó (sent-mail) mappák."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Csak azokat a mappákat mutassuk, melyekben van olvasatlan levél?"
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Kérem, hogy ehhez a feladathoz csak egy mappát jelöljön ki."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
 msgstr "Mappa nyitás"
 
-#: templates/menu.inc:23
-msgid "Open Folder"
-msgstr "Mappa nyitás"
-
-#: folders.php:414
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Kinyitott mappa"
 
-#: lib/MIME/Viewer/itip.php:701
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Választható résztvevõ"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Idegen levelezõszervereken levõ levélládák"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Egyéb beállítások"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:291
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Kimenõ (SMTP) szerver"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr ""
 
@@ -2516,19 +2694,15 @@
 msgid "PGP Encrypt Message"
 msgstr "Titkosítsuk a levelet PGP-vel"
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP hiba: "
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP hiba: a személyes titkos kulcs használatához jelmondat szükséges."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "A PGP NINCS aktiválva."
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP beállítások"
 
@@ -2536,26 +2710,26 @@
 msgid "PGP Passphrase Input"
 msgstr "Írja be a PGP jelmondatát"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 "A PGP személyes kulcspár támogatás titkosított web kapcsolatot igényel."
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "PGP nyilvános kulcs szövege"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "\"%s (%s)\" nyivános PGP kulcsát sikeresen felvettük."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "\"%s\" nyivános PGP kulcsát sikeresen töröltük."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP nyilvános kulcsok"
 
@@ -2567,19 +2741,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Titkosítsuk és digitálisan írjuk alá a levelet PGP-vel"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "A PGP titkos kulcsot sikeresen felvettük."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "A PGP nyilvános kulcsot sikeresen felvettük."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "A PGP támogatás inaktiválva van a rendszerben."
 
-#: lib/MIME/Viewer/pgp.php:209
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2587,23 +2761,23 @@
 "A PGP támogatás jelenleg nincs aktiválva, ezért a levél digitális "
 "aláírásának hitelessége nem ellenõrizhetõ."
 
-#: lib/MIME/Viewer/pgp.php:296
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "A PGP támogatás jelenleg nincs aktiválva, ezért a kódolt levél tartalma nem "
 "fejthetõ vissza."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "A PGP támogatás felbukkanó (popup) ablakokat igényel. Ha az Ön "
 "böngészõprogramja úgy van beállítva, hogy letiltja a felbukkanó ablakokat, "
 "akkor vagy változtasson a beállításokon, vagy a PGP szolgáltatások nem "
-"fognak megfelelõen mûködni"
+"fognak megfelelõen mûködni."
 
 #: lib/Fetchmail/imap.php:105
 msgid "POP3"
@@ -2621,7 +2795,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 SSL fölött (öntanúsítvánnyal)"
 
-#: templates/login/login.inc:163
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 SSL fölött (öntanúsítvánnyal)"
 
@@ -2629,16 +2803,16 @@
 msgid "POP3, no TLS"
 msgstr "POP2, TLS nélkül"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "%d. oldal a %d-bõl"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Az elsõ olvasatlan levelet tartalmazó oldal"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Az utolsó olvasatlan levelet tartalmazó oldal"
 
@@ -2646,32 +2820,32 @@
 msgid "Part(s)"
 msgstr "Rész(ek)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Jelmondat"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Jelmondat (még egyszer)"
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "A jelmondatot sikeresen eltávolítottuk."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Jelmondat:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr "A jelmondat nem lehet üres"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "A jelmondatok nem egyeznek"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:190
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Jelszó"
 
@@ -2679,11 +2853,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Bejelentkezéskor hajtsuk végre a karbantartási feladatokat?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "A felhasználó jogosultságai nem változtathatók meg."
 
-#: message.php:477 mailbox.php:682 templates/mailbox/navbar.inc:24
+#: message.php:494 mailbox.php:698 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "személyes"
@@ -2692,41 +2866,51 @@
 msgid "Personal Information"
 msgstr "Személyes adatok"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "A személyes PGP kulcspárt sikeresen létrehoztuk."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "A személyes PGP kulcsokat sikeresen töröltük."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "NEM importálódott S/MIME személyes tanúsítványok: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "A személyes S/MIME kulcsokat sikeresen töröltük."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr ""
 "Az Ön állandó levélvégzõdését (signature) válaszoláskor ill. "
 "levéltovábbításkor a beidézett levél elé helyezzük?"
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "A levél sima text változata"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Kér hangjelzést új levél érkezésekor? Ehhez böngészõprogramjának támogatnia "
+"kell a hanglejátszást. Erre a Windows és Mac programok csaknem mindegyike "
+"képes, de más platformokon kiegészítõ (plugin) program telepítése szükséges."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Kérem adja meg az új mappa nevét:"
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Kérem adja meg az új mappa nevét:"
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Kérem adja meg az új nevet:"
 
@@ -2748,7 +2932,7 @@
 "Kérem adja meg a személyes, titkos S/MIME kulcsához tartozó jelmondatot. Ez "
 "csak egyszer kell beírnia alkalmanként a %s használatakor."
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2761,42 +2945,31 @@
 "van így, hogy ne téríthessék el a szerverrel korábban felépített "
 "kapcsolatát. Elnézését kérjük a kellemetlenségért."
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Kérem adja meg a jelszavát."
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Kérem adja meg a bejelentkezési nevét."
 
-#: compose.php:79 lib/IMP.php:509
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Kérem javítsa ki a hibás vagy nem egyértelmû címeket."
 
-#: lib/MIME/Viewer/itip.php:638
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Kérem tekintse át a küldött információkat, majd válasszon az alábbi menübõl."
-
-#: templates/folders/javascript.inc:53
-msgid "Please select a folder before you perform any actions."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
 msgstr "Kérem jelöljön ki egy mappát a feladat végrehajtása elõtt."
 
-#: lib/MIME/Viewer/itip.php:498
-msgid "Please select an action from the menu below."
-msgstr "Kérem válasszon ki egy funkciót az alábbi menübõl."
-
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Kérem jelöljön ki legalább egy mappát, amiben a keresni óhajt."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Kérem, hogy ehhez a feladathoz csak egy mappát jelöljön ki."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Kérem, hogy jobb oldali mezõben válassza ki, vagy módosítsa:"
 
@@ -2804,12 +2977,12 @@
 msgid "Powered by Horde"
 msgstr "Ez egy Horde rendszer"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr ""
 "Legyen az Ön állandó levélvégzõdése (signature) elõtt két kötõjel ('-- ')?"
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 msgid "Preferences successfully updated."
 msgstr "A beállításokat sikeresen elmentettük."
 
@@ -2821,11 +2994,11 @@
 msgid "Previous Message"
 msgstr "Elõzõ levél"
 
-#: mailbox.php:343
+#: mailbox.php:333
 msgid "Previous Page"
 msgstr "Elõzõ oldal"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Nyomtatás"
 
@@ -2833,15 +3006,15 @@
 msgid "Priority"
 msgstr "Prioritás (sürgõsség)"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "A titkos kulcs jelszava"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Választhassak, ha melléklet van a levélben; NEM az alapértelmezett"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Választhassak, ha melléklet van a levélben; IGEN az alapértelmezett"
 
@@ -2849,40 +3022,40 @@
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "A nyilvános PGP kulcsszerver támogatás nincs engedélyzve."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "_Végleges törlés"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Végleges törlés"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Mappa(k) törlése"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Milyen gyakran ürítsük a 'Szemetes' (Trash) mappát?"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "napnál régebbi leveleket ürítsük ki a 'Szemetes' (Trash) mappából"
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "A 'Szemetes' (Trash) mappából töröljük ki a régi leveleket?"
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr "%d levél törlõdik a 'Szemetes' (Trash) mappából."
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr "1 levél törlõdik a 'Szemetes' (Trash) mappából."
 
@@ -2901,24 +3074,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Kvóta: nincs limit"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Idézet (%f):"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "Visszaigazolást kérek a kézbesítésrõl"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Építsük újra a mappastruktúrát"
 
-#: search.php:163
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Ezen a napon érkezett"
 
-#: search.php:171
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Ezután érkezett"
 
-#: search.php:167
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Ezelõtt érkezett"
 
@@ -2930,23 +3103,19 @@
 msgid "Redirect"
 msgstr "Átirányítás"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "A levél átirányítása"
 
-#: compose.php:734
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Irányítsuk át ezt a levelet"
 
-#: compose.php:794
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Az átirányítás nem sikerült."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Frissités"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Frissítsük a mappák listáját:"
 
@@ -2958,11 +3127,11 @@
 msgid "Reload View"
 msgstr "Kérjük le újra ezt az oldalt"
 
-#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Tároljuk el az idõbeosztási adatokat."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Tároljuk el az utolsó nézetet"
 
@@ -2978,17 +3147,17 @@
 msgid "Remove source"
 msgstr "távolítsuk el"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Mappa(k) átnevezése"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr ""
 "Nevezzük át az elküldött leveleket tartalmazó (sent-mail) mappát a hónap "
 "elején?"
 
-#: lib/Folder.php:440
+#: lib/Folder.php:458
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -2998,7 +3167,7 @@
 msgid "Repl_y to List"
 msgstr "Válasz a listára"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Cseréljük ki ezzel:"
 
@@ -3006,7 +3175,7 @@
 msgid "Reply"
 msgstr "Válasz"
 
-#: lib/MIME/Viewer/itip.php:307 lib/MIME/Viewer/itip.php:405
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "A választ elküldtük."
 
@@ -3014,7 +3183,7 @@
 msgid "Reply to All"
 msgstr "Válasz az összes címre"
 
-#: compose.php:680
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Válasz az összes címre:"
 
@@ -3022,7 +3191,7 @@
 msgid "Reply to List"
 msgstr "Válasz a listára"
 
-#: compose.php:682
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Válasz a listára:"
 
@@ -3030,105 +3199,99 @@
 msgid "Reply to _All"
 msgstr "Válasz az összes címre"
 
-#: lib/MIME/Viewer/itip.php:524 lib/MIME/Viewer/itip.php:533
-#: lib/MIME/Viewer/itip.php:543
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Az adott kérést a rendszer nem támogatja"
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Az idõbeosztási adatkérést 2 hónapra teljesítem."
 
-#: lib/MIME/Viewer/itip.php:530
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Az idõbeosztási adatkérés teljesítése."
 
-#: message.php:251
+#: message.php:275
 msgid "Reply-To"
 msgstr "Viszontválasz cím"
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Viszontválasz cím: "
 
-#: compose.php:678
+#: compose.php:769
 msgid "Reply:"
 msgstr "Válasz:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Nem-spam bejelentés"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Spam bejelentés"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:386
 msgid "Request a _Read Receipt"
 msgstr "Visszaigazolást kérek a levél elolvasásáról"
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr "Kér visszaigazolást a levelek kézbesítésérõl?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Kér visszaigazolást arról, amikor a címzett elolvassa a levelet?"
 
-#: mailbox.php:204
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr "A kívánt levél nem található."
 
-#: lib/MIME/Viewer/itip.php:693
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "szükséges résztvevõ"
 
-#: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:138 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Reset"
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "A válaszadó státuszát megújítottuk."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Folytatás"
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Folytassuk a levélírást"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Vissza a \"Levélírás\"-hoz"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
-#: templates/fetchmail/account_select.inc:32
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
 msgstr "Vissza a levéláttöltéshez"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Vissza a beállítások kezdõoldalára"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Vissza az opciókhoz"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Vissza az elõzõ képernyõhöz"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "Térjünk vissza a levéllistához törlés, áthelyezés vagy másolás után?"
 
-#: lib/MIME/Viewer/itip.php:684
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Szerep"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr ""
 
@@ -3136,46 +3299,42 @@
 msgid "S/MIME Encrypt Message"
 msgstr "A levél titkosítása S/MIME-mal"
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME hiba: "
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr ""
 "S/MIME hiba: a személyes titkos kulcs használatához jelmondat szükséges."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "Az S/MIME nem mûködik."
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME beállítások"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "Írja be az S/MIME jelmondatát"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "Az S/MIME személyes kulcspár támogatás titkosított web kapcsolatot igényel."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "\"%s\" nyivános S/MIME kulcsát sikeresen töröltük."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "A nyivános S/MIME kulcsot sikeresen felvettük."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "S/MIME nyilvános kulcsok"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Az S/MIME nyilvános/titkos kulcspárt sikeresen felvettük."
 
@@ -3187,11 +3346,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Titkosítsuk és digitálisan írjuk alá a levelet S/MIME-mal"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Ezen a rendszeren nincsen S/MIME támogatás."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3199,15 +3358,15 @@
 "Az S/MIME támogatás jelenleg nincs aktiválva, ezért a kódolt levél tartalma "
 "nem fejthetõ vissza."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 "Az S/MIME támogatás jelenleg nincs aktiválva, ezért e digitálisan aláírt "
 "levél tartalma nem jeleníthetõ meg."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3215,90 +3374,110 @@
 "Az S/MIME támogatás jelenleg nincs aktiválva, ezért a levél digitális "
 "aláírásának hitelessége nem ellenõrizhetõ."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "Az S/MIME támogatás felbukkanó (popup) ablakokat igényel. Ha az Ön "
 "böngészõprogramja úgy van beállítva, hogy letiltja a felbukkanó ablakokat, "
 "akkor vagy változtasson a beállításokon, vagy az S/MIME szolgáltatások nem "
-"fognak megfelelõen mûködni"
+"fognak megfelelõen mûködni."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "_Tárgy"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Mentsünk el egy példányt ebben a mappában: "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Mentés"
 
-#: search.php:363 templates/fetchmail/manage.inc:67
+#: search.php:308 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:536
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 "A mellékleteket a levéllel együtt mentsük el az elküldött levelek mappájában?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save Draft"
 msgstr "Mentsük el munkapéldányként"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "A kép elmentése"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "A kép galériában történõ elmentése"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Mentés"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "A levélpapír elmentése"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save _Draft"
 msgstr "Mentsük el mu_nkapéldányként"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Mentés"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "A munkapéldányként elmentett leveleket olvasatlanként jelöljük meg?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr ""
 "Mentsük el automatikusan a címzettek adatait az alapértelmezett "
 "címjegyzékben?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:122
 msgid "Save search as a virtual folder?"
 msgstr "Mentsük el a keresést virtuális mappaként?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Mentsük el az elküldött leveleket?"
 
-#: compose.php:1162
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "A munkapéldányként való mentés nem sikerült. A szerver válasza: %s"
 
-#: templates/contacts/contacts.inc:194 templates/mailbox/header.inc:11
-#: lib/Block/tree_folders.php:50
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Keresés"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Keresés a(z) %s mappában"
 
-#: search.php:316
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "A kereséssel kapcsolatos beállítások"
+
+#: search.php:263
 msgid "Search Results"
 msgstr "A keresés eredménye"
 
@@ -3322,7 +3501,11 @@
 msgid "Select a field"
 msgstr "Válasszon ki egy mezõt"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Válasszon ki egy levélpapírt:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 "Kiválasztható, hogy melyik címjegyzékekhez kíván hozzátenni, ill. melyekben "
@@ -3346,6 +3529,10 @@
 msgid "Select none"
 msgstr "Egy se legyen kijelölve"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Válassza ki, melyik galériában kívánja a képet elhelyezni."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Válassza ki a levelezõszerver típusát"
@@ -3354,34 +3541,38 @@
 msgid "Selected Address books:"
 msgstr "A kiválasztott címjegyzékek:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Küldjük el a kulcsot egy nyilvános kulcsszerverre"
 
-#: lib/MIME/Viewer/itip.php:600
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Kérem a legfrissebb információkat"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Send Message"
 msgstr "Küldjük el"
 
-#: config/prefs.php.dist:698
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Küldjük el a levelet a Tárgy megadása nélkül?"
+
+#: config/prefs.php.dist:692
 msgid "Send read receipt when requested by the sender?"
 msgstr ""
 "Küldjünk a beérkezõ levél elolvasásáról visszaigazolást, ha kért ilyet a "
 "feladó?"
 
-#: folders.php:392
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "Az elküldött levelek mappája"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Az elküldött levelek mappája:"
 
-#: templates/login/login.inc:129 templates/login/login.inc:142
-#: templates/login/login.inc:149
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Szerver"
 
@@ -3397,7 +3588,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "A levelek áthelyezésével és törlésével kapcsolatos beállítások."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Levélíráskor beállítódjék-e a X-Priority fejlécsor?"
 
@@ -3413,7 +3604,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Hozzáférést adhat más felhasználóknak egyes mappáihoz."
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3421,17 +3612,17 @@
 "A hosszú beidézett levélrészleteket alapértelmezésként ne mutassuk? Bárhogy "
 "válaszol, ez könnyen ki/bekapcsolható."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "A text/plain levelek törzsét vizsgáljuk végig PGP adatokat keresve?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 "Csukódjon-e be az ablak, ha levélíráskor munkapéldányként elmentjük az "
 "addigi munkánkat?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Küldjük el az Ön PGP nyilvános kulcsát mellékletként minden levéllel?"
 
@@ -3443,7 +3634,7 @@
 msgid "Show All Headers"
 msgstr "Mutassuk a levél teljes fejlécét"
 
-#: mailbox.php:361
+#: mailbox.php:351
 msgid "Show Deleted"
 msgstr "A törölteket is mutassuk"
 
@@ -3459,44 +3650,44 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Csak a használatba helyezett (subscribed) mappá(ka)t mutassuk"
 
-#: folders.php:287
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "A használaton kívül helyezett (unsubscribed) mappákat is mutassuk"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Szüksége van-e olyan ikonra, amivel kitörölhetõ egy levél melléklete?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "Legyen jelmagyarázat a levéllisták megjelenítésekor?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Csak az olvasatlan leveleknek legyen elõnézete?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr ""
 "Az elõnézet akkor jelenjen meg, ha az egeret a levél sora fölé visszük?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Legyen a menüben egy Levéláttöltés ikon?"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Mutassuk a képeket"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Legyen egy ikon a levélszûréshez a menüsorban?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Mutassuk a mappa összes leveleinek számát?"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "mutassuk"
 
@@ -3504,10 +3695,6 @@
 msgid "Si_ze"
 msgstr "Méret"
 
-#: templates/login/login.inc:210
-msgid "Sign up if not registered"
-msgstr "Ha Ön nem regisztrált felhasználó, töltse ki a jelentkezési lapot"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Digitálisan aláírt"
@@ -3516,10 +3703,6 @@
 msgid "Size"
 msgstr "Méret"
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr "A sorbarendezés iránya"
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Beérkezés szerinti sorrend"
@@ -3552,39 +3735,60 @@
 msgid "Spam folder:"
 msgstr "Spam mappa:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Speciális karakterek"
 
-#: templates/compose/compose.inc:334
+#: search.php:142
+msgid "Special Virtual Folders cannot be edited."
+msgstr "A speciális virtuális mappák nem módosíthatók."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Helyesírásellenõrzés"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Helyesírásellenõrzõ"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "A helyesírásellenõrzés befejezõdött"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Helyesírásellenõrzéskor az egy képernyõn megjelenített hibák száma."
 
-#: lib/MIME/Viewer/itip.php:508 lib/MIME/Viewer/itip.php:648
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Kezdet"
 
-#: lib/MIME/Viewer/itip.php:684
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Levélpapír"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "A levélpapír neve:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "A levélpapír fajtája:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Levélpapír:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Státusz"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "A melléklet eltávolítása"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Hagyjuk figyelmen kívül a sortöréseket?"
 
@@ -3592,61 +3796,62 @@
 msgid "Sub_ject"
 msgstr "Tárgy"
 
-#: message.php:252 search.php:151 templates/compose/recompose.inc:25
+#: message.php:276 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Tárgy"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Tárgy mezõ"
 
-#: search.php:365 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:310 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Küldjük el"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "A mappá(ka)t helyezzük használatba (subscribe)"
 
-#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Sikerült"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Javaslatok"
 
-#: lib/MIME/Viewer/itip.php:658 lib/MIME/Viewer/itip.php:660
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Összefoglalás"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:397 templates/compose/compose.inc:400
 msgid "Switch Composition Method"
 msgstr "Váltsunk levélírási módot"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:401
 msgid "Switch to HTML composition"
 msgstr "Váltsunk HTML formátumú levélírásra"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:401
 msgid "Switch to plain text composition"
 msgstr "Váltsunk sima text formátumú levélírásra"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:416
 msgid "Te_xt"
 msgstr "_Szöveg"
 
-#: lib/MIME/Viewer/itip.php:265
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
 msgstr "Feltételes: "
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "feltételesen elfogadom a meghívást"
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "feltételesen elfogadva"
 
@@ -3656,10 +3861,22 @@
 msgstr ""
 "A conf.php-ben nincs megadva a Szolgáltatás Feltételeit tartalmazó fájl."
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Szöveg"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "A levél Feladó oszlopára kattintva mi történjen:"
 
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"Az IMAP szerver úgy tûnik, nem támogatja a kiválasztott "
+"felhasználóazonosítási módszert. Forduljon a rendszergazdához."
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintosh \"resource fork\""
@@ -3679,49 +3896,36 @@
 msgid "The account \"%s\" has been saved."
 msgstr "A(z) \"%s\" azonosítót elmentettük."
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "A \"%s\" címet hozzátettük a(z) %s-hoz."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "A melléklet nem található."
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "A naptár adatok hibásak/elfogadhatatlanok"
 
-#: templates/javascript/open_compose_win.js:37
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"A levélíráshoz szükséges ablak nem nyitható meg. Lehet, hogy a "
-"böngészõprogramja beállításaiban letiltotta a felbukkanó (popup) ablakokat?"
-
 #: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "A Macintosh fájl tartalma alább tekinthetõ meg."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "A \"%s\" mappa(ka)t átnevezzük \"%s\"-re."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "Nem sikerült meghatározni azoknak a felhasználóknak a listáját akik "
 "hozzáférnek ehhez a mappához."
 
-#: compose.php:1171
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "A munkapéldányt a(z) \"%s\" mappában mentettük el."
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Az eseményt beírtuk a naptárába."
 
@@ -3730,12 +3934,12 @@
 msgid "The field \"%s\" can't be expanded."
 msgstr "A(z) \"%s\" mezõ tartalma nem egészíthetõ ki."
 
-#: lib/Folder.php:328
+#: lib/Folder.php:332
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "A \"%s\" nevû mappa már létezik"
 
-#: lib/Folder.php:171
+#: lib/Folder.php:162
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3744,50 +3948,58 @@
 "A \"%s\" folder nevében nem megengedett karakterek vannak. Ez gondot "
 "okozhat. Kérem forduljon a rendszergazdához."
 
-#: lib/Folder.php:347
+#: lib/Folder.php:351
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr ""
 "A \"%s\" mappát létrehoztuk, de nincs használatba helyezve (státusza "
 "unsubscribed)"
 
-#: lib/Folder.php:285
+#: lib/Folder.php:269
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr ""
 "A \"%s\" mappát töröltük, de továbbra is használatra van kijelölve (státusza "
 "subscribed)"
 
-#: lib/Folder.php:334
+#: lib/Folder.php:338
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "A \"%s\" mappát nem sikerült létrehozni. A szerver üzenete"
 
-#: lib/Folder.php:278
+#: lib/Folder.php:262
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "A(z) \"%s\" mappát nem sikerült törölni. A szerver üzenete"
 
-#: lib/Folder.php:350
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "A \"%s\" mappát sikeresen létrehoztuk."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "A \"%s\" mappát sikeresen töröltük."
 
-#: lib/Folder.php:438
+#: lib/Folder.php:456
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "A \"%s\" mappát sikeresen átneveztük \"%s\"-re."
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Ehhez a részhez a következõ fájlokat csatolták:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"A kép elmentéséhez szükséges ablak nem nyitható meg. Lehet, hogy a "
+"böngészõprogramja beállításaiban letiltotta a felbukkanó (popup) ablakokat?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3806,12 +4018,12 @@
 msgid "The mail server generated the following message:"
 msgstr "A levelezõszerver a következõ üzenetet küldte:"
 
-#: lib/Message.php:614
+#: lib/Message.php:691
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "A \"%s\" nevû mappa már üres."
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3822,28 +4034,24 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Az éppen fogalmazott levél bezárodott. Kilépés következik."
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Nem írt semmit a levél Tárgy mezejébe."
+
+#: message.php:149
 msgid "The message has been deleted."
 msgstr "A levelet kitöröltük."
 
-#: lib/MIME/Viewer/pgp.php:394
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "A levél tartalma megfelel a digitális aláírásnak."
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:389
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "A levél tartalma megfelel a digitális aláírásnak. A feladó: %s"
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Nem sikerült új ablakot megnyitni a jelmondat beviteléhez. Valószínûleg "
-"letiltotta a felbukkanó (popup) ablakokat a böngészõprogramja beállításaiban."
-
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "A PGP nyilvános kulcs megjelenítése nyers szöveges formátumban: %s"
@@ -3856,7 +4064,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "A kívánt állomány nincs benne a Zip mellékletben."
 
-#: message.php:541
+#: message.php:551
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3866,15 +4074,15 @@
 "A feladó visszaigazolást kér arról, hogy Ön elolvasta ezt a levelet. Kérem %"
 "s kattintson, ha teljesíteni kívánja ezt a kérést."
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
 msgstr "A szerver nem tudott pici változatot csinálni a képbõl."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "Az állandó levélvégzõdést (signature) nem sikerült felülírni."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Az állandó levélvégzõdést (signature) sikeresen megváltoztattuk."
 
@@ -3882,7 +4090,22 @@
 msgid "The specified file does not exist."
 msgstr "A megadott fájl nem létezik."
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Létrehoztuk a(z) \"%s\" levélpapírt."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "A(z) \"%s\" levélpapírt töröltük."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "A(z) \"%s\" levélpapírt módosítottuk."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "A feladatot hozzáírtuk a listához."
 
@@ -3913,7 +4136,7 @@
 msgid "The text of the sent message can be viewed %s."
 msgstr "Az elküldött levél szövege megtekinthetõ %s."
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "A felhasználó elfoglaltsági adatait sikeresen elmentettük."
 
@@ -3927,31 +4150,18 @@
 msgid "There are no messages in this mailbox."
 msgstr "Ebben a mappában nincs levél."
 
-#: thread.php:69
+#: thread.php:110
 msgid "There is no text that can be displayed inline."
 msgstr "Nincs a levél belsejében megjeleníthetõ szöveg."
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr ""
-"Hiba jelentkezett a törölt levelek %s-bõl történõ kiürítésekor. A szerver "
-"üzenete"
-
-#: lib/Message.php:616
+#: lib/Message.php:693
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 "Hiba jelentkezett a törölt leveleknek a levélládából történõ kiürítésekor. A "
 "szerver üzenete: %s"
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-"Hiba jelentkezett a törölt leveleknek a levélládából történõ kiürítésekor. A "
-"szerver üzenete"
-
-#: lib/Message.php:92
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3960,26 +4170,26 @@
 "A levelek \"%s\"-bõl \"%s\" mappába történõ másolásakor hiba történt. A "
 "szerver üzenete"
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "A levelek \"%s\" mappából való törlése nem sikerült. A szerver üzenete"
 
-#: lib/Message.php:277
+#: lib/Message.php:320
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "A levelek \"%s\" mappából való törlése nem sikerült. A szerver üzenete"
 
-#: lib/Message.php:213
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "A levelek törlésekor hiba történt. A szerver üzenete: %s"
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Hiba történt az esemény törlésekor: %s."
@@ -3988,7 +4198,7 @@
 msgid "There was an error displaying this message part"
 msgstr "A levél e részének megjelenítésekor hiba történt"
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:594
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3997,28 +4207,28 @@
 "A levelek \"%s\" mappában való megjelölése során hiba történt. A szerver "
 "üzenete"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "%s importálása során hiba történt."
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Az esemény importálása során hiba történt: %s"
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "A feladat importálása során hiba történt: %s"
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "A felhasználó elfoglaltsági adtainak importálása során hiba történt: %s"
 
-#: lib/Message.php:87
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -4027,16 +4237,16 @@
 "A levelek \"%s\"-bõl \"%s\" mappába való áthelyezése során hiba történt. A "
 "szerver üzenete"
 
-#: compose.php:1179
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "A levél munkapéldányként való elmentésekor hiba történt."
 
-#: compose.php:940
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "A levél küldésekor hiba történt: %s"
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Az esemény adatainak felülírásakor hiba történt: %s"
@@ -4045,11 +4255,11 @@
 msgid "There was no text in this message part"
 msgstr "A levél e részében nem volt szöveg"
 
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "Ez a HTML levél képeket tartalmaz."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -4057,21 +4267,21 @@
 "Ez a HTML levél képeket tartalmaz. A nem megjelenített képek helyén ez "
 "látszik: "
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "A levélhez ezt a PGP nyilvános kulcsot csatolták."
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:310
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Ezt a választási lehetõséget a rendszer nem támogatja."
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:415
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Ezt a választási lehetõséget a rendszer egyelõre nem támogatja."
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Ez hosszabb idõt vehet igénybe. Biztosan folytatni kívánja?"
 
@@ -4079,14 +4289,14 @@
 msgid "This message contains a Macintosh file."
 msgstr "Ez a levél egy Macintosh állományt tartalmaz."
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:415
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 "Ez a levél S/MIME szabvány szerint digitálisan aláírt mellékletet tartalmaz."
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Ez a levél S/MIME szabvány szerint titkosított mellékletet tartalmaz."
 
@@ -4097,43 +4307,43 @@
 msgstr ""
 "Ez a levél kézbesítési visszaigazolást tartalmaz, de ismeretlen formátumban."
 
-#: lib/MIME/Viewer/pgp.php:316
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Úgy tûnik ez a levél nem PGP szabvány szerint van titkosítva. A hiba: "
 
-#: lib/MIME/Viewer/pgp.php:241 lib/MIME/Viewer/pgp.php:351
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 "Ez a levél nem felel meg a pontos PGP szabványnak (az RFC 2015 szerint)."
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Ez a levél nem felel meg a pontos S/MIME szabványnak."
 
-#: lib/MIME/Viewer/pgp.php:206 lib/MIME/Viewer/pgp.php:417
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Ez a levél PGP szabványú digitális aláírást tartalmaz."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Ez a levél S/MIME szabványú digitális aláírást tartalmaz."
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Ezt a levelet S/MIME szabvány szerint titkosították."
 
-#: lib/MIME/Viewer/pgp.php:202 lib/MIME/Viewer/pgp.php:292
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Ezt a levelet PGP szabvány szerint titkosították."
 
-#: message.php:195
+#: message.php:211
 msgid "This message to"
 msgstr "Ezt a levelet ide..."
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr ""
 "Ez a szerver nem teszi lehetõvé, hogy más felhasználóknak hozzáférési jogot "
@@ -4143,18 +4353,21 @@
 msgid "This window must be called from a compose window."
 msgstr "Ezt az ablak csak az új levél fogalmazásakor hívható."
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Logikai (thread) nézet"
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Logikai (thread) nézet"
 
-#: message.php:248 mailbox.php:585 search.php:139
-#: templates/contacts/contacts.inc:214
-#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:272 mailbox.php:602 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "Címzett"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "A címzett"
 
@@ -4166,11 +4379,18 @@
 "Ha több mezõt kíván kijelölni, akkor tartsa nyomva a Control (PC-n) ill. "
 "Command (Mac-en) billentyût, és úgy kattintson az egérrel a további mezõkre."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"TLS kapcsolat használatához a PHP 5.1.0-s, vagy újabb verziójára van szükség."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Mellékletek összmérete:"
 
-#: folders.php:383
+#: folders.php:369
 msgid "Trash folder"
 msgstr "A 'Szemetes' (Trash) mappa"
 
@@ -4178,7 +4398,7 @@
 msgid "Trash folder:"
 msgstr "A 'Szemetes' (Trash) mappa:"
 
-#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
 #: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "A kvóta információ nem érhetõ el"
@@ -4196,28 +4416,45 @@
 msgid "Undelete"
 msgstr "Törlés vissza"
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:580 mailbox.php:598 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "A címzettek listája nem ismert"
 
-#: lib/MIME/Viewer/itip.php:443
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Váratlan válasz érkezett a szervertõl az AUTHENTICATE parancsra."
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Váratlan válasz érkezett a szervertõl a Digest-MD5 adatra."
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Váratlan válasz érkezett a szervertõl a LOGIN parancsra."
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Ismeretlen típus: %s"
 
-#: mailbox.php:544
+#: mailbox.php:558
 msgid "Unknown Date"
 msgstr "Ismeretlen dátum"
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Az IMAP szervertõl ismeretlen válasz érkezett. A szerver válasza: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Ismeretlen megbeszélés"
 
-#: mailbox.php:597
+#: mailbox.php:614
 msgid "Unknown Recipient"
 msgstr "Ismeretlen címzett"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "A megadott jelmondat visszavétele"
 
@@ -4225,41 +4462,45 @@
 msgid "Unnamed"
 msgstr "Nincs elnevezve"
 
-#: message.php:483 mailbox.php:687 templates/message/navbar_navigate.inc:6
+#: message.php:503 mailbox.php:703 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "nem olvasott"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "A következõ mappá(ka)t helyezzük használaton kívül (unsubscribe)"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "A mellékletekre vonatkozó adatok frissítése"
+#: templates/compose/compose.inc:515
+msgid "Update"
+msgstr "Módosítás"
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Módosítsuk a válaszadó státuszát"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Az alapértelmezett érték"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Alkalmazzuk az IMAP használatba vételi (subscription) mechanizmusát?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Használjunk virtuális szemetesmappát?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Felhasználói név"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
@@ -4267,7 +4508,7 @@
 "\"%s\" felhasználónak sikeresen megadtuk a kiválasztott - \"%s\" mappához "
 "történõ - hozzáférési jogokat."
 
-#: templates/login/login.inc:178
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Felhasználói név"
 
@@ -4275,100 +4516,127 @@
 msgid "Username:"
 msgstr "Felhasználói név:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Megtekintés"
 
-#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "%s megtekintése"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "%s nyilvános kulcs megtekintése"
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "A HTML tartalmat külön ablakban szeretném látni"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Levelek megtekintése"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "A személyes titkos kulcs megtekintése"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "A személyes nyilvános kulcs megtekintése"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Viszontválaszokkal együtt"
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Miniképek megjelenítése"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 msgid "View attachment in a separate window"
 msgstr "A mellékletet külön ablakban szeretném látni"
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "A tartalmat külön ablakban szeretném látni"
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Az elfoglaltság megtekintése"
 
-#: folders.php:375 mailbox.php:513
+#: folders.php:361 mailbox.php:521
 #, php-format
 msgid "View messages in %s"
 msgstr "A(z) %s mappa megtekintése"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Bejelentkezés után milyen képernyõvel kíván kezdeni:"
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "A feladat megtekintése"
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "A képek megjelenítése"
 
-#: search.php:314
+#: search.php:260
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "A(z) \"%s\" virtuális mappát sikeresen létrehoztuk."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtuális mappák"
 
-#: search.php:296
+#: search.php:252
 msgid "Virtual Folders require a label."
 msgstr "A virtuális mappát el kell nevezni valaminek."
 
-#: templates/search/main.inc:133
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Virtuális INBOX"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Virtuális INBOX mappa"
+
+#: lib/Mailbox.php:156 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Virtuális szemetesmappa"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Virtuális szemetesmappa"
+
+#: templates/search/main.inc:128
 msgid "Virtual folder label"
 msgstr "A virtuális mappa elnevezése"
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: login.php:130
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Üdvözöljük! Ez a %s levelezõrendszere"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Mi történjen a levéllel, miután spamként vagy nem-spamként bejelentettük?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4376,17 +4644,17 @@
 "Törléskor a törlésre való kijelölés helyett rakjuk át a leveleket a "
 "'Szemetes' (Trash) mappába?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Új mappa megnyitásakor melyik oldalt kívánja megjeleníteni?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr ""
 "Az elküldött levelek külön mappába történõ mentésekor mentsük-e el a "
 "mellékleteket is?"
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
@@ -4394,15 +4662,12 @@
 "Levélküldéskor ill. címek kiegészítésekor milyen domaint (\"@\" utáni rész) "
 "tegyünk a \"@\" nélküli címek végére?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Engedélyezési lista"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "A sorok hosszúsága ennyi legyen."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:539 templates/compose/compose.inc:552
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Igen"
 
@@ -4420,25 +4685,43 @@
 msgid "You are attempting to delete the following folder(s)."
 msgstr "A következõ mappákat kívánja törölni."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Új mappába kíván másolni/áthelyezni."
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "Almappát kíván nyitni a következõ mappából "
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "Új (legfelsõ szintû) mappát hoz létre."
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:315
+msgid "You are not allowed to create folders."
+msgstr "Önnek nincs jogosultsága mappákat létrehozni."
+
+#: lib/Folder.php:322
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Önnek nincs jogosultsága több, mint %d mappát létrehozni."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "A következõ mappát kívánja átnevezni: "
 
-#: lib/Folder.php:537
+#: templates/stationery/prefs.inc:35
 #, php-format
-msgid "You can not unsubscribe from \"%s\"."
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"A következõ szimbólumokat használhatja a levélpapírokon: %c jelzi a levél "
+"tartalmát, %s pedig az állandó levélvégzõdést (signature)."
+
+#: lib/Folder.php:557
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
 msgstr ""
 "Nem sikerült használaton kívülre helyeznie (unsubscribe) a \"%s\" mappát."
 
@@ -4449,11 +4732,11 @@
 msgstr ""
 "Ön nem egyezett bele a Szolgáltatás Feltételeibe, ezért nem jelentkezhet be."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "Ön nem jogosult megváltoztatni ennek a mappának a hozzáférhetõségét"
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
@@ -4468,35 +4751,30 @@
 msgid "You have 1 new message."
 msgstr "Érkezett egy új levele."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Ön mellékletként megjelölt egy (vagy több) állományt, de ez(eke)t mégnem "
-"töltötte fel a szerverre. Biztos abban, hogy a levelet enélkül a melléklet"
-"(ek) nélkül kívánja elküldeni?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Ezt az oldalt már elküldte egyszer."
 
-#: lib/IMP.php:1030
+#: lib/IMP.php:1052
 msgid "You have new mail in the following folder:"
 msgstr "Új levele van a következõ mappában:"
 
-#: lib/IMP.php:1035
+#: lib/IMP.php:1057
 msgid "You have new mail in the following folders:"
 msgstr "Új levele van a következõ mappákban:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Legalább egy címzettet meg kell adnia."
 
-#: lib/MIME/Viewer/pgp.php:303
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Ennek a levélnek a megtekintéséhez meg kell adnia az Ön titkos PGP kulcsához "
 "tartozó jelmondatot."
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4504,7 +4782,7 @@
 "Ennek a levélnek a megtekintéséhez meg kell adnia az Ön titkos S/MIME "
 "kulcsához tartozó jelmondatot."
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Elõször célként ki kell választania egy mappát."
 
@@ -4516,8 +4794,8 @@
 msgid "You must select an address first."
 msgstr "Elõször ki kell választania egy címet."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Elõbb legalább egy levelet ki kell választania."
 
@@ -4525,71 +4803,66 @@
 msgid "You must specify a recipient."
 msgstr "Meg kell adnia a címzettet."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr ""
-"Elõször ki kell jelölnie legalább egy, mellékletként csatolandó állományt."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Engedélyeznie kell \"%s\"-t a karbantartási feladatok beállításaiban."
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Ön %s-re irányította át ezt a levelet %%s-en."
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Erre a levélre válaszolt ekkor: %s."
 
-#: lib/Folder.php:487
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
 "A \"%s\" mappa nem volt használatba véve (státusza unsubscribed). A szerver "
 "üzenete:"
 
-#: lib/Folder.php:539
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 "A \"%s\" mappa használatra volt kijelölve (státusza subscribed). A szerver "
 "üzenete:"
 
-#: lib/Folder.php:490
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Sikeresen jelölte ki használatra (subscribed) a \"%s\" mappát."
 
-#: lib/Folder.php:542
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Sikeresen helyezte használaton kívülre (unsubscribed) a \"%s\" mappát."
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Az Ön neve"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Az Ön nyilvános/titkos PGP kulcsai"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Az Ön személyes, titkos kulcsa"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Az Ön nyilvános kulcsa"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Az Ön viszontválasz (Reply-to:) címe: <i>(opcionális)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Az Ön viszontválasz (Reply-to:) címe: <em>(opcionális)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Az Ön nyilvános/titkos S/MIME tanúsítványai"
 
@@ -4597,19 +4870,19 @@
 msgid "Your accounts:"
 msgstr "Az Ön azonosítói:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Az Ön alias címei:<i>(nem kötelezõ, minden cím külön sorba kerüljön)</i>"
+"Az Ön alias címei:<em>(nem kötelezõ, minden cím külön sorba kerüljön)</em>"
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "Az Ön böngészõprogramja nem támogatja ennek a képtípusnak a közvetlen "
 "megjelenítését."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Az Ön alapértelmezett karakterkészlete a levélíráshoz:"
 
@@ -4617,68 +4890,101 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Az Ön alapértelmezett titkosítási módja a levelezéshez:"
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"A hivatkozás formájában elküldött mellékletét már legalább egy címzett "
+"letöltötte.\n"
+"\n"
+"A melléklet neve: %s\n"
+"A melléklet dátuma: %s\n"
+"\n"
+"Kattintson a következõ szövegre, ha végleg törölni kívánja a mellékletet:\n"
+"%s"
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Az Ön levele sikeresen kézbesítésre került."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Az Ön állandó levélvégzõdése (signature):"
 
-#: message.php:272 compose.php:1219 mailbox.php:528 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Ne mutassuk a címeket]"
+
+#: message.php:296 compose.php:1301 mailbox.php:536 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Tárgy nélkül]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Mutassuk a címeket -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Mutassuk a címeket - %s címzett]"
+
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Tiltólista"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:933
-msgid "_Compose"
-msgstr "_Levélírás"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Törlés"
 
-#: lib/IMP.php:935
+#: lib/IMP.php:955
 msgid "_Folders"
 msgstr "_Mappák"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Azonosító"
 
-#: lib/IMP.php:926
+#: lib/IMP.php:924
 msgid "_Inbox"
 msgstr "_Inbox"
 
-#: lib/IMP.php:976
+#: lib/IMP.php:996
 msgid "_Log out"
 msgstr "_Kijelentkezés"
 
-#: message.php:368
+#: message.php:392
 msgid "_Message Source"
 msgstr "A levél forrása"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:952
+msgid "_New Message"
+msgstr "Új levelek"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "Prioritás (sürgõsség)"
 
-#: mailbox.php:402
+#: mailbox.php:405
 #, php-format
 msgid "_Refresh %s"
 msgstr "%s frissítése"
@@ -4687,11 +4993,11 @@
 msgid "_Reply"
 msgstr "_Válasz"
 
-#: lib/IMP.php:937
+#: lib/IMP.php:957
 msgid "_Search"
 msgstr "Kere_sés"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "_Send Message"
 msgstr "Küldjük _el"
 
@@ -4699,7 +5005,7 @@
 msgid "_Thread"
 msgstr "Logikai sorrend"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "Cí_mzett"
 
@@ -4707,62 +5013,131 @@
 msgid "_Undelete"
 msgstr "Törlés vissza"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "Viszontválaszokkal _együtt"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Engedélyezési lista"
 
-#: lib/Compose.php:351
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "a címzett ismeretlen"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "melléklet"
 
-#: view.php:98
+#: view.php:97
 msgid "attachments.zip"
 msgstr ""
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:507
 msgid "bytes"
 msgstr "bájt"
 
-#: templates/contacts/contacts.inc:185
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "a kimeneti állomány nem hozható létre"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "a bemenõ állomány nem nyitható meg"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "parancssori hiba"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "konfigurációs hiba"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "hiányzik egy fontos rendszerállomány"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "adatformátum hiba"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "az adat nem található"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "itt"
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "a gép neve nem ismert"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "input/output hiba"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "belsõ programhiba"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "kulcs"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "mailbox fájl"
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1105 lib/Message.php:515
 msgid "name"
 msgstr "név"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "egy sem"
 
-#: templates/compose/spelling.inc:111
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "vagy"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "nincs megfelelõ jogosultsága"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "címzett]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "adatátviteli (protokoll) hiba"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "a szolgáltatás nem áll rendelkezésre"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "helyesírási hiba"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "helyesírási hiba"
 
-#: lib/Filter.php:51
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "rendszerhiba"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "átmeneti hiba"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "tiltólistája"
 
-#: lib/Filter.php:61
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "engedélyezési listája"


--- orig/templates/mailbox/legend.inc
+++ mod/templates/mailbox/legend.inc
@@ -15,6 +15,7 @@
 <?php if ($conf['mailbox']['show_attachments']): ?>
     <li><div><div><?php echo Horde::img('attachment.png', _("Attachment")) ?></div><?php echo _("Attachment") ?></div></li>
     <li><div><div><?php echo Horde::img('signed.png', _("Signed")) ?></div><?php echo _("Signed") ?></div></li>
+    <li><div><div><?php echo Horde::img('encrypted.png', _("Encrypted")) ?></div><?php echo _("Encrypted") ?></div></li>
 <?php endif; ?>
    </ul>
    <div class="clear">&nbsp;</div>


--- orig/po/fr_FR.po
+++ mod/po/fr_FR.po
@@ -1,17 +1,18 @@
-# Horde 3.0.5 French translation.
-# Copyright (C) 2001-2002 The Horde Project.
+# translation of fr_FR.po to French
+# translation of fr_FR.po to français
+# IMP 4.1 French translation
+# Copyright (C) 2001, 2002 The Horde Project
 # Pierre Lachance <pl at pierrelachance.net> et Benoit St-André (ben at benoitst-andre.net), 2003, 2004.
+# Christophe Ruelle <xtof at xtof.com>, 2001.
 # Frederic Trudeau <ftrudeau at cam.org>, 2001.
-# Thierry Thomas <thierry at pompo.net>, 2002, 2005.
-# Country tranlations from Miguel Tremblay <kbabel.miguel at ptaff.ca>, 2004.
+# Thierry Thomas <thierry at pompo.net>, 2002, 2003, 2005, 2006.
 # Benoit St-André <ben at benoitst-andre.net>, 2004.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: fr_FR\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-07-12 21:38+0200\n"
-"PO-Revision-Date: 2005-07-12 21:38+0200\n"
+"POT-Creation-Date: 2006-03-31 22:56+0200\n"
+"PO-Revision-Date: 2006-03-31 22:58+0200\n"
 "Last-Translator: Thierry Thomas <thierry at pompo.net>\n"
 "Language-Team: French <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,8092 +20,5131 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: po/translation.php:49
-msgid ""
-"  -M, --message=MESSAGE  Use this commit message instead of the default ones."
-msgstr ""
-"  -M, --message=MESSAGE  Utiliser ce message de validation à la place de "
-"celui par défaut.  "
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "     Cc : "
+
+#: lib/Compose.php:426
+msgid "      To: "
+msgstr "      À : "
+
+#: lib/Compose.php:414
+msgid "    Date: "
+msgstr "    Date : "
+
+#: lib/Compose.php:417
+msgid "    From: "
+msgstr "     De : "
 
-#: po/translation.php:53
-msgid ""
-"  -a, --add=FILE        Add this PO file to the compendium. Useful to\n"
-"                        include a compendium from a different branch to\n"
-"                        the generated compendium."
-msgstr ""
-"  -a, --add=FICH        Ajouter ce fichier PO au compendium. Utile pour\n"
-"                        inclure un compendium d'une branche différente au\n"
-"                        compendium généré."
+#: mailbox.php:408 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr "(Touche d'accès rapide %s)"
 
-#: po/translation.php:113
-msgid ""
-"  -b, --base=/PATH  Full path to the (Horde) base directory that should be\n"
-"                    used."
-msgstr ""
-"  -b, --base=/REP   Chemin complet vers le répertoire de base (Horde) à\n"
-"                    utiliser."
+#: lib/Compose.php:423
+msgid " Subject: "
+msgstr " Objet : "
 
-#: po/translation.php:69
-msgid ""
-"  -c, --compendium=FILE  Merge new translations to this compendium file\n"
-"                         instead of the default one (compendium.po in the\n"
-"                         horde/po directory."
-msgstr ""
-"  -c, --compendium=FICH  Fusionner les nouvelles traductions à ce fichier\n"
-"                         compendium à la place de celui par défaut "
-"(compendium.po\n"
-"                         dans le répertoire horde/po)."
+#: templates/compose/spelling.inc:70
+msgid " in "
+msgstr " dans "
 
-#: po/translation.php:63 po/translation.php:81 po/translation.php:87
+#: templates/mailbox/message_headers.inc:12
+msgid "#"
+msgstr "N&ordm;"
+
+#: lib/Block/summary.php:72
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr "%.2f Mo / %.2f Mo  (%.2f%%)"
+
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d messages"
+
+#: mailbox.php:175
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "%d messages ont été supprimé(s)."
+
+#: lib/Spam.php:196
+#, php-format
 msgid ""
-"  -c, --compendium=FILE  Use this compendium file instead of the default\n"
-"                         one (compendium.po in the horde/po directory)."
+"%d messages have been reported as not spam to your system administrator."
 msgstr ""
-"  -c, --compendium=FICH  Utiliser ce fichier compendium à la place de celui\n"
-"                         par défaut (compendium.po dans le répertoire horde/"
-"po)."
+"%d messages n'ayant pas été considérés comme des pourriels ont été rapportés "
+"à votre administrateur système."
 
-#: po/translation.php:114
-msgid "  -d, --debug       Show error messages from the executed binaries."
+#: lib/Spam.php:176
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "%d messages ont été identifiés comme n'étant pas des pourriels."
+
+#: lib/Spam.php:188
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
-"  -d, --debug       Afficher les messages d'erreur des programmes exécutés."
+"%d messages considérés comme des pourriels ont été rapportés à votre "
+"administrateur système."
 
-#: po/translation.php:54
-msgid "  -d, --directory=DIR   Create compendium in this directory."
-msgstr "  -d, --directory=REP   Créer le compendium dans ce répertoire."
+#: lib/Spam.php:168
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "%d messages ont été identifiés comme pourriels."
 
-#: po/translation.php:115
-msgid "  -h, --help        Show this help message."
-msgstr "  -h, --help        Afficher ce message d'aide."
+#: mailbox.php:358
+#, php-format
+msgid "%d to %d of %d Messages"
+msgstr "Messages %d à %d sur %d"
 
-#: po/translation.php:42 po/translation.php:67 po/translation.php:75
-msgid "  -l, --locale=ll_CC     Use only this locale."
-msgstr "  -l, --locale=ll_PP     N'utiliser que cette locale."
+#: mailbox.php:635
+#, php-format
+msgid "%s KB"
+msgstr "%s Ko"
 
-#: po/translation.php:47 po/translation.php:61 po/translation.php:79
-#: po/translation.php:85
-msgid "  -l, --locale=ll_CC     Use this locale."
-msgstr "  -l, --locale=ll_PP     Utiliser cette locale."
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
+msgid "%s already exists. Your %s folder was not renamed."
+msgstr "%s existe déjà. Votre dossier %s n'a pas été renommé."
 
-#: po/translation.php:55
-msgid "  -l, --locale=ll_CC    Use this locale."
-msgstr "  -l, --locale=ll_PP    Utiliser cette locale."
+#: lib/Message.php:685
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr "%s ne semble pas être une boîte valide."
 
-#: po/translation.php:68
-msgid "  -m, --module=MODULE    Build MO files only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE    Ne générer les fichiers MO que pour ce module "
-"(Horde)."
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
+msgid "%s folder being renamed at the start of the month."
+msgstr "Le dossier %s a été renommé au début du mois."
 
-#: po/translation.php:43
-msgid "  -m, --module=MODULE    Cleanup PO files only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE    Ne fusionner les fichiers PO que pour ce module "
-"(Horde). "
+#: lib/MIME/Viewer/itip.php:257
+#, php-format
+msgid "%s has accepted."
+msgstr "%s a accepté."
 
-#: po/translation.php:48
-msgid ""
-"  -m, --module=MODULE    Commit translations only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE    Ne valider les traductions que pour ce module "
-"(Horde)."
+#: lib/MIME/Viewer/itip.php:617
+#, php-format
+msgid "%s has cancelled \"%s\"."
+msgstr "%s a annulé « %s »."
 
-#: po/translation.php:62
-msgid "  -m, --module=MODULE    Create a PO file only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE   Ne créer un fichier PO que pour ce module (Horde)."
+#: lib/MIME/Viewer/itip.php:263
+#, php-format
+msgid "%s has declined."
+msgstr "%s a refusé."
 
-#: po/translation.php:80
-msgid "  -m, --module=MODULE    Merge PO files only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE    Ne fusionner les fichiers PO que pour ce module "
-"(Horde)."
+#: lib/MIME/Viewer/itip.php:492
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr "%s a répondu à une requête sur ses disponibilités."
 
-#: po/translation.php:76
-msgid ""
-"  -m, --module=MODULE    Update help files only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE    Ne m. à j. les fichiers d'aide que pour ce module "
-"(Horde)."
+#: lib/MIME/Viewer/itip.php:609
+#, php-format
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s a répondu à l'invitation de « %s »."
 
-#: po/translation.php:86
-msgid "  -m, --module=MODULE    Update only this (Horde) module."
-msgstr "  -m, --module=MODULE    Ne m. à j. que ce module (Horde)."
+#: lib/MIME/Viewer/itip.php:483
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr "%s vous a envoyé ses disponibilités."
 
-#: po/translation.php:58
-msgid "  -m, --module=MODULE  Generate POT file only for this (Horde) module."
-msgstr ""
-"  -m, --module=MODULE  Ne générer un fichier POT que ce module (Horde)."
+#: lib/MIME/Viewer/itip.php:269
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr "%s a été accepté sous réserves."
 
-#: po/translation.php:70
-msgid ""
-"  -n, --no-compendium    Don't merge new translations to the compendium."
-msgstr ""
-"  -n, --no-compendium    Ne pas fusionner les nouvelles traductions au "
-"compendium."
+#: lib/MIME/Viewer/itip.php:488
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s demande vos disponibilités."
 
-#: po/translation.php:64 po/translation.php:82 po/translation.php:88
-msgid "  -n, --no-compendium    Don't use a compendium."
-msgstr "  -n, --no-compendium    Ne pas utiliser de compendium."
+#: lib/MIME/Viewer/itip.php:580
+#, php-format
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s réclame votre présence à « %s »."
 
-#: po/translation.php:71
-msgid "  -s, --statistics       Save translation statistics in a local file."
-msgstr ""
-"  -s, --statistics       Enregistrer les statistiques de traduction dans un "
-"fichier local."
+#: lib/Message.php:461
+#, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "« %s » a bien été ajouté à « %s »."
 
-#: po/translation.php:116
-msgid "  -t, --test        Show the executed commands but don't run anything."
-msgstr "  -t, --test        Afficher les commandes à exécuter sans les lancer."
+#: lib/MIME/Viewer/itip.php:592
+#, php-format
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s souhaite compléter « %s »."
 
-#: po/translation.php:105
-msgid ""
-"  cleanup     Cleans the PO files up from untranslated and obsolete entries."
-msgstr ""
-"  cleanup     Effacer les fichiers PO pour les entrées non-traduites et "
-"obsolètes."
+#: lib/MIME/Viewer/itip.php:571
+#, php-format
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s souhaite vous informer de « %s »."
 
-#: po/translation.php:108
-msgid "  commit      Commit translations to the CVS server."
-msgstr "  commit      Valider les traductions sur le serveur CVS."
+#: lib/MIME/Viewer/itip.php:596
+#, php-format
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s souhaite recevoir les dernières informations sur « %s »."
 
-#: po/translation.php:109
-msgid "  commit-help Commit help files to the CVS server."
-msgstr "  commit-help Valider les fichiers d'aide sur le serveur CVS."
+#: message.php:292 message.php:297
+#, php-format
+msgid "%s: %s"
+msgstr "%s : %s"
 
-#: po/translation.php:99
-msgid ""
-"  compendium  Rebuild the compendium file. Warning: This overwrites the\n"
-"              current compendium."
-msgstr ""
-"  compendium  Reconstruire le fichier compendium. Attention : ça écrase le\n"
-"              compendium courant."
+#: templates/message/navbar_top.inc:20
+#, php-format
+msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
+msgstr "%s : %s (%d&nbsp;de&nbsp;%d)"
 
-#: po/translation.php:100
-msgid "  extract     Generate PO template (.pot) files."
-msgstr "  extract     Générer les fichiers PO modèles (.pot)."
+#: templates/compose/spelling.inc:133
+msgid "(Apply these changes and move to next screen.)"
+msgstr "(Appliquer ces changements et poursuivre à l'écran suivant.)"
 
-#: po/translation.php:98
-msgid "  help        Show this help message."
-msgstr "  help        Afficher ce message d'aide."
+#: templates/compose/spelling.inc:120
+msgid "(Discard all changes and return to the compose screen.)"
+msgstr "(Annuler les changements et revenir à l'écran de rédaction)"
 
-#: po/translation.php:101
-msgid ""
-"  init        Create one or more PO files for a new locale. Warning: This\n"
-"              overwrites the existing PO files of this locale."
-msgstr ""
-"  init        Créer un ou plusieurs fichiers PO pour une nouvelle locale.\n"
-"              Attention : ça écrase les fichiers PO existants pour cette "
-"locale."
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML"
 
-#: po/translation.php:106
-msgid "  make        Build binary MO files from the specified PO files."
-msgstr ""
-"  make        Construire des fichiers binaires MO pour les fichiers PO "
-"spécifiés."
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Texte brut)"
 
-#: po/translation.php:107
+#: spelling.php:279
 msgid ""
-"  make-help   Mark all entries in the XML help file being up-to-date and\n"
-"              prepare the file for the next execution of update-help. You\n"
-"              should only run make-help AFTER update-help and revising the\n"
-"              help file."
+"(Return to the compose screen after applying all changes made thus far.  "
+"Changes on the current screen will NOT be applied.)"
 msgstr ""
-"  make-help   Marquer « à jour » toutes les entrées du fichier d'aide XML "
-"et\n"
-"              préparer le fichier pour la prochaine exécution d'update-help. "
-"Vous\n"
-"              ne devriez lancer make-help qu'APRÈS update-help et après "
-"avoir mis\n"
-"              le fichier d'aide à jour."
+"(Revenir à l'écran de rédaction après avoir appliqué toutes les "
+"modifications. Les changements en cours ne seront PAS appliqués.)"
 
-#: po/translation.php:102
+#: spelling.php:276
 msgid ""
-"  merge       Merge the current PO file with the current PO template file."
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
 msgstr ""
-"  merge       Fusionner le fichier PO courant avec le fichier modèle POT "
-"courant."
+"(Revenir à l'écran de rédaction après avoir appliqué toutes les "
+"modifications. Les changements en cours ne seront PAS appliqués.)"
 
-#: po/translation.php:103
-msgid "  update      Run extract and merge sequent."
-msgstr "  update      Lancer extract et merge à la suite."
+#: templates/contacts/contacts.inc:227
+msgid "* Add these by clicking OK *"
+msgstr "* Les ajouter en cliquant sur OK *"
 
-#: po/translation.php:104
-msgid ""
-"  update-help Extract all new and changed entries from the English XML help\n"
-"              file and merge them with the existing ones."
-msgstr ""
-"  update-help Extraire toutes les entrées nouvelles et modifiées du fichier "
-"d'aide\n"
-"              XML anglais et le fusionner avec ceux qui existent."
+#: templates/contacts/contacts.inc:206
+msgid "* Please select address(es) *"
+msgstr "* Veuillez sélectionner une(des) adresse(s) *"
 
-#: templates/maintenance/confirm_top.inc:11
-#, php-format
-msgid ""
-" &#151; %s is ready to perform the maintenance operations checked below."
-msgstr ""
-" &#151; %s s'apprête à effectuer les opérations de maintenance cochées ci-"
-"dessous."
-
-#: lib/Horde/Form.php:2367
-#, php-format
-msgid " (%s days ago)"
-msgstr " (il y a %s jours)"
+#: mailbox.php:173
+msgid "1 message has been deleted."
+msgstr "1 message a été supprimé."
 
-#: lib/Horde.php:1247
-#, php-format
-msgid " (Accesskey %s)"
-msgstr " (Touche d'accès rapide %s)"
+#: lib/Spam.php:198
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+"Un message a été rapporté à votre administrateur système comme n'étant pas "
+"un pourriel."
 
-#: lib/Horde/Form.php:2375
-#, php-format
-msgid " (in %s days)"
-msgstr " (dans %s jours)"
+#: lib/Spam.php:178
+msgid "1 message has been reported as not spam."
+msgstr "1 message a été identifié comme n'étant pas un pourriel."
 
-#: lib/Horde/Form.php:2371
-msgid " (today)"
-msgstr " (aujourd'hui)"
+#: lib/Spam.php:190
+msgid "1 message has been reported as spam to your system administrator."
+msgstr ""
+"Un message a été rapporté à votre administrateur système comme étant un "
+"pourriel."
 
-#: lib/Horde/Form.php:2373
-msgid " (tomorrow)"
-msgstr " (demain)"
+#: lib/Spam.php:170
+msgid "1 message has been reported as spam."
+msgstr "1 message a été identifié comme pourriel."
 
-#: lib/Horde/Form.php:2369
-msgid " (yesterday)"
-msgstr " (hier)"
+#: config/prefs.php.dist:808
+msgid "100 characters"
+msgstr "100 caractères"
 
-#: lib/Block/weatherdotcom.php:218
-msgid " at "
-msgstr " à "
+#: config/prefs.php.dist:811
+msgid "1000 characters"
+msgstr "1000 caractères"
 
-#: lib/Block/weatherdotcom.php:204
-#, php-format
-msgid "%d %s and %s"
-msgstr "%d %s et %s"
+#: config/prefs.php.dist:809
+msgid "250 characters"
+msgstr "250 caractères"
 
-#: po/translation.php:1176
-#, php-format
-msgid "%d bytes written."
-msgstr "Écriture de %d octets."
+#: config/prefs.php.dist:810
+msgid "500 characters"
+msgstr "500 caractères"
 
-#: po/translation.php:1284
+#: lib/MIME/Viewer/images.php:163
 #, php-format
-msgid "%d of %d entries marked as up-to-date"
-msgstr "%d sur %d entrées marquées « à jour »"
+msgid "A large image named %s is attached to this message."
+msgstr "Une image de grande taille nommée %s est jointe à ce message."
 
-#: lib/Block/weatherdotcom.php:245
-#, php-format
-msgid "%d-day forecast"
-msgstr "%d-prévision du jour"
+#: lib/MIME/Viewer/notification.php:50
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+"Un message que vous avez envoyé a provoqué une notification en retour du "
+"destinataire."
 
-#: templates/maintenance/notice_top.inc:4
-#, php-format
-msgid "%s - Notice"
-msgstr "%s - Notice"
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr "ET"
 
-#: templates/admin/common-header.inc:32
-#, php-format
-msgid "%s Administration"
-msgstr "%s Administration"
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Accepter et ajouter à mon agenda."
 
-#: lib/Horde/Crypt/smime.php:704
-#, php-format
-msgid "%s Fingerprint"
-msgstr "Empreinte PGP de %s"
+#: lib/MIME/Viewer/itip.php:585
+msgid "Accept request"
+msgstr "Accepter la requête"
 
-#: lib/Horde/MIME/Contents.php:826 lib/Horde/MIME/Contents.php:828
-#, php-format
-msgid "%s KB"
-msgstr "%s Ko"
+#: lib/MIME/Viewer/itip.php:746
+msgid "Accepted"
+msgstr "Accepté"
 
-#: templates/maintenance/confirm_top.inc:4
-#, php-format
-msgid "%s Maintenance Operations - Confirmation"
-msgstr "%s opérations de maintenance &ndash; Confirmation"
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr "Accepté : "
 
-#: admin/setup/config.php:30 admin/setup/index.php:218
-#, php-format
-msgid "%s Setup"
-msgstr "Configuration de %s"
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr "Nom du compte :"
 
-#: lib/Horde/Auth/Signup.php:263
-#, php-format
-msgid "%s Sign Up"
-msgstr "Inscription de %s"
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
+msgid "Actions"
+msgstr "Actions"
 
-#: templates/maintenance/agreement_top.inc:4
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
 #, php-format
-msgid "%s Terms of Agreement"
-msgstr "Conditions d'utilisation de %s"
+msgid "Add %s to my Address Book"
+msgstr "Ajouter %s à mon carnet d'adresses"
 
-#: lib/VFS/ftp.php:568 lib/VFS/ftp.php:636
-#, php-format
-msgid "%s already exists."
-msgstr "%s existe déjà."
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "Ajouter une source"
 
-#: lib/Block/metar.php:157 lib/Block/metar.php:163 lib/Block/metar.php:237
-#: lib/Block/metar.php:343 lib/Block/metar.php:349
-#, php-format
-msgid "%s at %s %s"
-msgstr " %s à %s %s"
+#: lib/MIME/Viewer/itip.php:573
+msgid "Add this to my calendar"
+msgstr "À ajouter à mon agenda"
 
-#: po/translation.php:287 po/translation.php:314
-#, php-format
-msgid "%s is not writable."
-msgstr "%s est protégé en écriture."
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Ajouter à mon agenda"
 
-#: lib/Horde/Form.php:2338
+#: compose.php:590
 #, php-format
-msgid "%s is required"
-msgstr "%s est obligatoire"
+msgid "Added \"%s\" as an attachment."
+msgstr "« %s » ajouté en pièce jointe."
 
-#: lib/Block/metar.php:284
-#, php-format
-msgid "%s minutes"
-msgstr "%s minutes"
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+"En-têtes additionnels à afficher: <em>(optionnel, entrez chaque en-tête sur  "
+"une nouvelle ligne)</em>."
 
-#: lib/Horde/Block/Collection.php:123 po/translation.php:1350
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
-msgid "%s not found."
-msgstr "%s non trouvé"
+msgid "Additional information can be viewed %s."
+msgstr "Une information complémentaire peut être consultée %s."
 
-#: po/translation.php:585
-#, php-format
-msgid "%s not found. Run 'translation extract' first."
-msgstr "%s non trouvé. Lancez d'abord « translation extract »."
+#: lib/MIME/Viewer/notification.php:62
+msgid "Additional information details"
+msgstr "Détails informatifs complémentaires"
 
-#: templates/admin/user/list.inc:4
-#, php-format
-msgid "%s to %s of %s"
-msgstr "%s à %s de %s"
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr "Détails complémentaires sur le message"
 
-#: lib/Horde/Kolab.php:891
+#: lib/MIME/Viewer/status.php:92
 #, php-format
-msgid "%s's Address Book"
-msgstr "Carnet d'adresses de %s"
+msgid "Additional message details can be viewed %s."
+msgstr "Des détails complémentaires peuvent être consultés %s."
 
-#: lib/Horde/Kolab.php:883
-#, php-format
-msgid "%s's Calendar"
-msgstr "Agenda de %s"
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr "Détails complémentaires du message d'erreur"
 
-#: lib/Horde/Kolab.php:875
+#: lib/MIME/Viewer/status.php:77
 #, php-format
-msgid "%s's Notepad"
-msgstr "Bloc-notes de %s"
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+"Des détails complémentaires au message d'erreur peuvent être consultés %s."
 
-#: lib/Horde/Kolab.php:899
-#, php-format
-msgid "%s's Tasklist"
-msgstr "Liste de tâches de %s"
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
+msgid "Address Book"
+msgstr "Carnet d'adresses"
 
-#: lib/Horde/Notification/Listener/mobile.php:96
-#, php-format
-msgid "%s: %s"
-msgstr "%s : %s"
+#: config/prefs.php.dist:134
+msgid "Address Books"
+msgstr "Carnets d'adresses"
 
-#: lib/Horde/CLI.php:272
-#, php-format
-msgid "'%s' is not a valid choice."
-msgstr "« %s » n'est pas un choix valide."
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+"Adresser en Cci tous les messages : <em>(optionnel, entrez chaque adresse "
+"sur  une nouvelle ligne)</em>."
 
-#: lib/Horde/Registry.php:554 lib/Horde/Registry.php:929
-#, php-format
-msgid "'%s' is not configured in the Horde Registry."
-msgstr "« %s » n'est pas configuré dans le registre de Horde."
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+"Adresses à attacher explicitement à cette identité : <em>(optionnel: entrer "
+"chaque adresse sur une nouvelle ligne)</em>"
 
-#: lib/Horde/Tree.php:164
-#, php-format
-msgid "'%s' tree renderer not found."
-msgstr "L'interpréteur d'arbre « %s » n'a pas été trouvé."
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
+msgid "All"
+msgstr "Tout"
 
-#: admin/groups.php:57
-#, php-format
-msgid "'%s' was added to the groups system."
-msgstr "« %s » a été ajouté aux groupes."
+#: templates/javascript/folders.js:13
+msgid ""
+"All messages in the following folder(s) will be downloaded into one MBOX "
+"file:"
+msgstr ""
+"Tous les messages de ce(s) dossier(s) seront téléchargés dans un fichier "
+"MBOX :"
 
-#: admin/perms/addchild.php:85
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
-msgid "'%s' was added to the permissions system."
-msgstr "« %s » a été ajouté au système des permissions."
+msgid ""
+"All messages in your \"%s\" folder older than %s days will be permanently "
+"deleted."
+msgstr ""
+"Tous les messages de votre dossier « %s » qui ont plus de « %s » jours "
+"seront effacés."
 
-#: admin/groups.php:55 admin/perms/addchild.php:83
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
-msgid "'%s' was not created: %s."
-msgstr "« %s » n'a pas été créé : %s."
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Tous vos dossiers d'anciens messages envoyés depuis plus de %s mois seront "
+"effacés."
 
-#: lib/Block/metar.php:186 lib/Block/metar.php:191
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
-msgid ", gusting %s %s"
-msgstr "rafale %s %s"
+msgid "All old sent-mail folders more than %s months old will be deleted."
+msgstr ""
+"Tous vos dossiers d'anciens messages envoyés depuis plus de %s mois seront "
+"effacés."
 
-#: lib/Block/metar.php:199
+#: acl.php:84
 #, php-format
-msgid ", variable from %s to %s"
-msgstr "variable du %s au %s"
-
-#: lib/Horde/Form.php:2069 lib/Horde/Form.php:2128
-#: lib/Horde/UI/VarRenderer/html.php:691
-msgid "-- select --"
-msgstr "-- Sélectionner --"
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr ""
+"Tous les droits sur le dossier « %s » ont bien été retirés pour "
+"l'utilisateur « %s »."
 
-#: po/translation.php:1328 po/translation.php:1330
-msgid "---------------------------"
-msgstr "---------------------------"
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Autoriser la création de dossiers ?"
 
-#: lib/Block/time.php:20
-msgid "12 Hour Format"
-msgstr "Format 12 heures"
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+"Autoriser les règles de filtrage à s'appliquer à n'importe quelle boîte de "
+"courriel ?"
 
-#: lib/Block/time.php:19
-msgid "24 Hour Format"
-msgstr "Format 24 heures"
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr "Parties alternatives pour cette section :"
 
-#: templates/data/time.inc:28
-msgid "24 hours"
-msgstr "24 heures"
+#: config/prefs.php.dist:572
+msgid "Always"
+msgstr "Toujours"
 
-#: lib/Horde/UI/Pager.php:69
-msgid "<Previous"
-msgstr "<Précédent"
+#: config/prefs.php.dist:557
+msgid "Always save attachments"
+msgstr "Toujours enregistrer les pièces jointes"
 
-#: po/translation.php:344
-#, php-format
+#: lib/Message.php:551
 msgid ""
-"<gettext> tag not closed in file %s.\n"
-"Opening tag found in line %d."
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
 msgstr ""
-"L'étiquette <gettext> n'est pas fermée dans le fichier %s.\n"
-"Étiquette ouverte trouvé à la ligne %d."
+"Une erreur s'est produite lors du retrait de la pièce jointe. Le serveur "
+"IMAP a répondu : "
 
-#: lib/Block/metar.php:117
-msgid "A database backend is required for this block."
-msgstr "Une base de données principale (backend) est nécessaire pour ce bloc"
-
-#: lib/Horde.php:160
-msgid "A fatal error has occurred"
-msgstr "Une erreur fatale s'est produite"
-
-#: lib/Horde/Crypt/pgp.php:917
-msgid "A public PGP key is required to encrypt a message."
-msgstr "Une clef publique PGP est nécessaire pour chiffrer un message."
-
-#: lib/Horde/Crypt/pgp.php:1142
-msgid "A public PGP key is required to verify a signed message."
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
 msgstr ""
-"Une clef publique PGP est nécessaire pour vérifier la signature d'un message."
+"Une erreur inconnue est survenue pendant la création de la nouvelle note."
 
-#: lib/Horde/Crypt/pgp.php:1074
-msgid ""
-"A public PGP key, private PGP key, and passphrase are required to decrypt a "
-"message."
+#: lib/Message.php:434
+msgid "An unknown error occured while creating the new task."
 msgstr ""
-"Une clef publique PGP, une clef privée PGP, et une phrase secrète sont "
-"nécessaires pour déchiffrer un message."
+"Une erreur inconnue est survenue pendant la création de la nouvelle tâche."
 
-#: lib/Horde/Crypt/pgp.php:992
-msgid ""
-"A public PGP key, private PGP key, and passphrase are required to sign a "
-"message."
-msgstr ""
-"Une clef publique PGP, une clef privée PGP, et une phrase secrète sont "
-"nécessaires pour signer un message."
+#: mailbox.php:708 message.php:503 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
+msgid "Answered"
+msgstr "Répondu"
 
-#: lib/Horde/Crypt/smime.php:505
-msgid ""
-"A public S/MIME key, private S/MIME key, and passphrase are required to "
-"decrypt a message."
-msgstr ""
-"Une clef publique S/MIME, une clef privée S/MIME, et une phrase secrète sont "
-"nécessaires pour déchiffrer un message."
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Messages répondus"
 
-#: lib/Horde/Crypt/smime.php:431
-msgid ""
-"A public S/MIME key, private S/MIME key, and passphrase are required to sign "
-"a message."
-msgstr ""
-"Une clef publique S/MIME, une clef privée S/MIME, et une phrase secrète sont "
-"nécessaires pour signer un message."
+#: templates/mailbox/header.inc:7
+msgid "Apply Filters"
+msgstr "Appliquer les filtres"
 
-#: lib/Horde/Crypt/smime.php:364
-msgid "A public SMIME key is required to encrypt a message."
-msgstr "Une clef publique S/MIME est nécessaire pour chiffrer un message."
+#: templates/mailbox/header.inc:7
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "Appliquer les filtres sur %s"
 
-#: lib/Block/weatherdotcom_strings.php:7
-msgid "AM Clouds"
-msgstr "Nuages le matin"
+#: templates/filters/prefs.inc:36
+msgid "Apply filter rules upon logging on?"
+msgstr "Appliquer ces filtres lors de la connexion ?"
 
-#: lib/Block/weatherdotcom_strings.php:8
-msgid "AM Light Rain"
-msgstr "Pluie légère le matin"
+#: templates/filters/prefs.inc:42
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr "Appliquer les filtres à chaque affichage de Boîte de réception ?"
 
-#: lib/Block/weatherdotcom_strings.php:9
-msgid "AM Rain"
-msgstr "Pluie le matin"
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr ""
+"Êtes-vous certain de vouloir supprimer cette définition de répertoire "
+"virtuel ?"
 
-#: lib/Block/weatherdotcom_strings.php:10
-msgid "AM Showers"
-msgstr "Averses le matin"
+#: templates/pgp/pgp.inc:27 templates/smime/smime.inc:25
+msgid "Are you sure you want to delete this public key?"
+msgstr "Êtes-vous certain de vouloir supprimer cette clef publique ?"
 
-#: lib/Block/weatherdotcom_strings.php:11
-msgid "AM Snow Showers"
-msgstr "Chutes de neige le matin"
+#: templates/pgp/pgp.inc:85 templates/smime/smime.inc:79
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+"Êtes-vous certain de vouloir détruire cette paire de clefs ? (ce n'est pas "
+"recommandé !)"
 
-#: templates/data/time.inc:29
-msgid "AM/PM"
-msgstr "AM/PM"
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+msgid "Are you sure you want to do this?"
+msgstr "Êtes-vous certain de vouloir faire ça ?"
 
-#: lib/Net/SMS/clickatell_http.php:199
-msgid "API ID"
-msgstr "API ID"
+#: message.php:408 templates/mailbox/javascript.inc:68
+msgid "Are you sure you wish to PERMANENTLY delete these messages?"
+msgstr "Êtes-vous certain de vouloir supprimer définitivement ces messages ?"
 
-#: templates/javascript/htmlarea_lang.js:30
-msgid "About this editor"
-msgstr "À propos de cet éditeur"
+#: lib/MIME/Contents.php:239
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr ""
+"Êtes-vous certain de vouloir supprimer définitivement cette pièce jointe ?"
 
-#: services/help/index.php:52
-msgid "About..."
-msgstr "À propos..."
+#: templates/mailbox/actions.inc:39
+msgid "Are you sure you wish to empty this folder?"
+msgstr "Êtes-vous certain de vouloir vider ce dossier ?"
 
-#: templates/javascript/htmlarea_lang.js:74
-msgid "Absbottom"
-msgstr "Bas absolu"
+#: lib/IMP.php:951
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Êtes-vous certain de vouloir vider votre dossier de pourriels ?"
 
-#: templates/javascript/htmlarea_lang.js:72
-msgid "Absmiddle"
-msgstr "Milieu absolu"
+#: lib/IMP.php:944
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "Êtes-vous certain de vouloir vider votre corbeille ?"
 
-#: lib/VFS/musql.php:270
-msgid "Access denied creating VFS directory."
-msgstr "Accès refusé lors de la création de répertoire VFS ."
+#: templates/mailbox/actions.inc:8
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Êtes-vous certain de vouloir effacer ces messages définitivement ?"
 
-#: lib/VFS/musql.php:136
-msgid "Access denied creating VFS file."
-msgstr "Accès refusé lors de la création de fichier VFS."
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Êtes-vous certain de vouloir déclarer ce message comme légitime ?"
 
-#: lib/Net/SMS/clickatell_http.php:292
-msgid "Account frozen."
-msgstr "Compte inactivé"
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Êtes-vous certain de vouloir rapporter ce message comme du pourriel ?"
 
-#: admin/perms/addchild.php:54 lib/Horde/Perms/UI.php:132
-#: templates/portal/add.inc:14 templates/admin/groups/addchild.inc:16
-msgid "Add"
-msgstr "Ajouter"
+#: config/prefs.php.dist:905
+msgid "Arrival Time"
+msgstr "Heure de réception"
 
-#: admin/groups.php:214 admin/groups.php:215
-msgid "Add Child Group"
-msgstr "Ajouter un sous-groupe"
+#: config/prefs.php.dist:920
+msgid "Ascending"
+msgstr "Croissant"
 
-#: lib/Horde/Perms/UI.php:84 lib/Horde/Perms/UI.php:85
-msgid "Add Child Permission"
-msgstr "Ajouter une nouvelle sous-permission"
+#: config/prefs.php.dist:571
+msgid "Ask"
+msgstr "Demander"
 
-#: templates/portal/add.inc:5
-msgid "Add Here:"
-msgstr "Ajouter ici :"
+#: templates/compose/compose.inc:470
+msgid "Attach Files"
+msgstr "Joindre les fichiers"
 
-#: admin/groups.php:208 admin/groups.php:209
-msgid "Add New Group"
-msgstr "Ajouter un nouveau groupe"
+#: templates/compose/compose.inc:451
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "Joindre une copie de votre clef PGP publique à votre message ?"
 
-#: lib/Horde/Perms/UI.php:73 lib/Horde/Perms/UI.php:74
-msgid "Add New Permission"
-msgstr "Ajouter une nouvelle permission"
+#: lib/MIME/Viewer/tnef.php:111
+msgid "Attached File:"
+msgstr "Pièce jointe :"
 
-#: templates/admin/groups/addchild.inc:9
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
-msgid "Add a child group to '%s'"
-msgstr "Ajouter un groupe fils à « %s »"
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+"La pièce jointe « %s » dépasse les limites de taille. Fichier NON attaché."
 
-#: admin/perms/addchild.php:53 lib/Horde/Perms/UI.php:131
-#, php-format
-msgid "Add a child permission to '%s'"
-msgstr "Ajouter une permission fille à « %s »"
+#: lib/MIME/Viewer/itip.php:377
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "Ci-joint une réponse à une requête vers un agenda."
 
-#: admin/user.php:30
-msgid "Add a new user:"
-msgstr "Ajouter un nouvel utilisateur :"
+#: templates/compose/compose.inc:498 templates/compose/attachments.js:55
+#: templates/compose/attachments.inc:14 templates/mailbox/legend.inc:16
+msgid "Attachment"
+msgstr "Pièce jointe"
 
-#: lib/Horde/UI/VarRenderer/html.php:529
-msgid "Add column"
-msgstr "Ajouter une colonne"
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Pièce jointe %s supprimée."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Information sur la pièce jointe"
 
-#: templates/admin/groups/edit.inc:35
-msgid "Add new members"
-msgstr "Ajouter de nouveaux membres"
+#: compose.php:1105 lib/Message.php:513
+msgid "Attachment stripped: Original attachment type"
+msgstr "Pièce jointe retirée : type d'origine de la pièce jointe"
 
-#: templates/data/csvmap.inc:103
-msgid "Add pair"
-msgstr "Ajouter une paire"
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
+msgid "Attachments"
+msgstr "Pièces jointes"
 
-#: lib/Horde/MIME/Viewer/vcard.php:71
-msgid "Add to address book:"
-msgstr "Ajouter au carnet d'adresses :"
+#: lib/MIME/Viewer/itip.php:678
+msgid "Attendees"
+msgstr "Présents"
 
-#: lib/Horde/MIME/Viewer/vcard.php:78
-msgid "Add to my address book"
-msgstr "Ajouter à mon carnet d'adresses"
+#: lib/MIME/Viewer/notification.php:53
+msgid "Attention"
+msgstr "Attention"
 
-#: admin/user.php:31
-msgid "Add user"
-msgstr "Ajouter un utilisateur"
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr "Auth_imp : extension requise IMAP non trouvée."
 
-#: admin/user.php:79
-#, php-format
+#: config/prefs.php.dist:628
 msgid ""
-"Added '%s' to the system, but could not add additional signup information: %"
-"s."
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
 msgstr ""
-"« %s » a été ajouté au système, mais l'ajout d'information supplémentaires %"
-"s n'est pas possible."
+"Afficher automatiquement les images des messages en HTML lorsque "
+"l'expéditeur est dans mon carnet d'adresses ?"
 
-#: signup.php:45
-#, php-format
-msgid "Added '%s' to the system. You can log in now."
-msgstr "« %s » a été ajouté. Vous pouvez vous connecter."
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
+msgstr "Carnets d'adresses disponibles :"
 
-#: po/translation.php:962
-msgid "Adding new files to repository:"
-msgstr "Ajout de nouveaux fichiers au dépôt :"
+#: lib/MIME/Viewer/itip.php:714
+msgid "Awaiting Response"
+msgstr "En attente d'une réponse"
 
-#: templates/admin/user/noadd.inc:4
-msgid "Adding users is disabled."
-msgstr "La fonction d'ajout d'utilisateurs est désactivée."
+#: templates/message/navbar_navigate.inc:26
+#, php-format
+msgid "Bac_k to %s"
+msgstr "Re_venir à %s"
 
-#: lib/Horde/Form.php:1446 lib/Horde/MIME/Viewer/vcard.php:126
-#: lib/Horde/MIME/Viewer/vcard.php:173
-msgid "Address"
-msgstr "Adresse"
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
+msgid "Back to %s"
+msgstr "Revenir à %s"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:94
-msgid "Administer - set permissions for other users"
-msgstr "Administrateur - ajuster les permissions pour d'autres utilisateurs"
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Retour à l'index de présentation des messages multiples"
 
-#: admin/index.php:19 services/portal/sidebar.php:113
-msgid "Administration"
-msgstr "Administration"
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Retour à l'affichage par fils"
 
-#: lib/Horde/NLS/GeoIP.php:56 lib/Horde/NLS/countries.php:11
-#: lib/Horde/NLS/tld.php:18
-msgid "Afghanistan"
-msgstr "Afghanistan"
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "Nom d'utilisateur ou mot de passe invalide."
 
-#: lib/Horde/NLS/GeoIP.php:57 lib/Horde/NLS/countries.php:12
-#: lib/Horde/NLS/tld.php:21
-msgid "Albania"
-msgstr "Albanie"
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Requête mauvaise ou mal formée. Le serveur a répondu : %s"
 
-#: lib/Horde/NLS/GeoIP.php:70 lib/Horde/NLS/countries.php:13
-#: lib/Horde/NLS/tld.php:74
-msgid "Algeria"
-msgstr "Algérie"
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Mauvaise requête : %s."
 
-#: lib/Horde/MIME/Viewer/vcard.php:107
-msgid "Alias"
-msgstr "Alias"
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
+msgid "Bcc"
+msgstr "Cci"
 
-#: templates/javascript/htmlarea_table_lang.js:16
-msgid "Align"
-msgstr "Aligner"
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr "Ci-dessous le texte brut à propos des informations du message."
 
-#: templates/javascript/htmlarea_lang.js:67
-msgid "Alignment:"
-msgstr "Alignement :"
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+msgid "Blacklist"
+msgstr "Liste noire"
 
-#: lib/Block/fortune.php:87
-msgid "All"
-msgstr "Tout"
+#: config/prefs.php.dist:617
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr "Bloquer les images des messages en HTML sauf demande explicite ?"
 
-#: admin/perms/edit.php:118 templates/shares/edit.inc:65
-msgid "All Authenticated Users"
-msgstr "Tous les participants authentifiés"
-
-#: admin/groups.php:33 admin/groups.php:212
-msgid "All Groups"
-msgstr "Tous les groupes"
-
-#: admin/perms/addchild.php:38 lib/Horde/Perms/UI.php:77
-msgid "All Permissions"
-msgstr "Toutes les permissions"
-
-#: templates/javascript/htmlarea_table_lang.js:17
-msgid "All four sides"
-msgstr "Les quatre côtés"
-
-#: lib/Horde/Form.php:1871
-msgid "Allow multiple addresses"
-msgstr "Permettre des adresses de courriel multiples"
-
-#: lib/Horde/DataTree/sql.php:408
-msgid "Already exists"
-msgstr "existe déjà"
-
-#: services/resetpassword.php:35
-msgid "Alternate email address"
-msgstr "Adresse de courriel alternative"
-
-#: admin/templates.php:142
-msgid "Alternate templates"
-msgstr "Autres modèles"
-
-#: templates/javascript/htmlarea_anselimage_lang.js:25
-#: templates/javascript/htmlarea_lang.js:122
-msgid "Alternate text:"
-msgstr "Texte alternatif :"
-
-#: lib/Horde/NLS/GeoIP.php:58 lib/Horde/NLS/countries.php:14
-#: lib/Horde/NLS/tld.php:27
-msgid "American Samoa"
-msgstr "Samoa Américain"
-
-#: lib/Horde/Prefs/UI.php:95 lib/Horde/Prefs/UI.php:115
-msgid "An illegal value was specified."
-msgstr "Une valeur illégale a été spécifiée."
-
-#: lib/Horde/NLS/GeoIP.php:55 lib/Horde/NLS/countries.php:15
-#: lib/Horde/NLS/tld.php:16
-msgid "Andorra"
-msgstr "Andorre"
-
-#: lib/Horde/NLS/GeoIP.php:58 lib/Horde/NLS/countries.php:16
-#: lib/Horde/NLS/tld.php:24
-msgid "Angola"
-msgstr "Angola"
-
-#: lib/Horde/NLS/GeoIP.php:57 lib/Horde/NLS/countries.php:17
-#: lib/Horde/NLS/tld.php:20
-msgid "Anguilla"
-msgstr "Anguilla"
-
-#: lib/Horde/NLS/GeoIP.php:119
-msgid "Anonymous Proxy"
-msgstr "Proxy anonyme"
-
-#: services/resetpassword.php:49
-msgid "Answer"
-msgstr "Réponse"
-
-#: lib/Horde/NLS/GeoIP.php:58 lib/Horde/NLS/countries.php:18
-#: lib/Horde/NLS/tld.php:25
-msgid "Antarctica"
-msgstr "Antarctique"
-
-#: lib/Horde/NLS/GeoIP.php:56 lib/Horde/NLS/countries.php:19
-#: lib/Horde/NLS/tld.php:19
-msgid "Antigua and Barbuda"
-msgstr "Antigua-et-Barbuda"
-
-#: admin/phpshell.php:35 admin/templates.php:74 lib/Horde/Block/UI.php:58
-#: templates/admin/setup/index.html:6
-msgid "Application"
-msgstr "Application"
-
-#: util/icon_browser.php:42
-msgid "Application List"
-msgstr "Liste d'applications"
-
-#: admin/setup/index.php:139
-msgid "Application is ready."
-msgstr "L'application est prête"
-
-#: templates/shares/edit.inc:218
-msgid "Apply to Child Shares"
-msgstr "Appliquer aux partages fils"
-
-#: templates/admin/user/approve.inc:21
-msgid "Approve"
-msgstr "Approuvé"
-
-#: lib/Horde/MIME/Contents.php:826
-msgid "Approximate Size"
-msgstr "Taille approximative"
-
-#: lib/Horde/UI/VarRenderer/html.php:377 lib/Horde/UI/VarRenderer/html.php:414
-#: templates/javascript/open_calendar.js:68
-msgid "April"
-msgstr "Avril"
-
-#: lib/Horde/MIME/Viewer/rar.php:59 lib/Horde/MIME/Viewer/tgz.php:81
-#: lib/Horde/MIME/Viewer/zip.php:63
-msgid "Archive File Size"
-msgstr "Taille du fichier archive"
-
-#: lib/Horde/MIME/Viewer/rar.php:58 lib/Horde/MIME/Viewer/tgz.php:80
-#: lib/Horde/MIME/Viewer/zip.php:62
-msgid "Archive Name"
-msgstr "Nom de l'archive"
-
-#: templates/admin/user/removequeued.inc:9
-#, php-format
-msgid "Are you sure you want to remove the signup request for %s ?"
-msgstr ""
-"Êtes-vous certain de vouloir supprimer cette requête d'inscription  pour %s ?"
-
-#: templates/admin/groups/delete.inc:9
-#, php-format
-msgid "Are you sure you wish to delete '%s' and any sub-groups?"
-msgstr "Êtes-vous certain de vouloir effacer « %s » et ses sous-groupes ?"
-
-#: lib/Horde/NLS/GeoIP.php:58 lib/Horde/NLS/countries.php:20
-#: lib/Horde/NLS/tld.php:26
-msgid "Argentina"
-msgstr "Argentine"
-
-#: lib/Horde/NLS/GeoIP.php:57 lib/Horde/NLS/countries.php:21
-#: lib/Horde/NLS/tld.php:22
-msgid "Armenia"
-msgstr "Arménie"
-
-#: lib/Block/fortune.php:28
-msgid "Art"
-msgstr "Art"
-
-#: lib/Horde/NLS/GeoIP.php:59 lib/Horde/NLS/countries.php:22
-#: lib/Horde/NLS/tld.php:30
-msgid "Aruba"
-msgstr "Aruba"
-
-#: lib/Horde/NLS/tld.php:15
-msgid "Ascension Island"
-msgstr "Ascension (Île)"
-
-#: lib/Block/fortune.php:29
-msgid "Ascii Art"
-msgstr "Art ASCII"
-
-#: lib/Horde/NLS/GeoIP.php:55
-msgid "Asia/Pacific Region"
-msgstr "Région Asie/Pacifique"
-
-#: lib/Horde/Form.php:3111
-msgid "Assignment columns"
-msgstr "Colonnes des tâches"
-
-#: admin/groups.php:75
-msgid "Attempt to delete a non-existent group."
-msgstr "Tentative d'effacement d'un groupe inexistant."
-
-#: admin/perms/delete.php:38
-msgid "Attempt to delete a non-existent permission."
-msgstr "Tentative  d'effacement d'une permission inexistante."
-
-#: admin/perms/edit.php:98
-msgid "Attempt to edit a non-existent permission."
-msgstr "Tentative de modification d'une permission inexistante."
-
-#: services/shares/edit.php:53
-msgid "Attempt to edit a non-existent share."
-msgstr "Tentative de modification d'un partage inexistant."
-
-#: lib/Horde/MIME/Viewer/rar.php:64 lib/Horde/MIME/Viewer/tgz.php:86
-#: lib/Horde/MIME/Viewer/zip.php:68
-msgid "Attributes"
-msgstr "Propriétés"
-
-#: lib/Horde/UI/VarRenderer/html.php:381 lib/Horde/UI/VarRenderer/html.php:418
-#: templates/javascript/open_calendar.js:72
-msgid "August"
-msgstr "Août"
-
-#: lib/Horde/NLS/GeoIP.php:59 lib/Horde/NLS/countries.php:23
-#: lib/Horde/NLS/tld.php:29
-msgid "Australia"
-msgstr "Australie"
-
-#: lib/Horde/NLS/GeoIP.php:59 lib/Horde/NLS/countries.php:24
-#: lib/Horde/NLS/tld.php:28
-msgid "Austria"
-msgstr "Autriche"
-
-#: lib/Horde/Auth/cyrsql.php:168
-msgid "Auth_cyrsql: Required imap extension not found."
-msgstr "Auth_cyrus : Extension requise IMAP non trouvée."
-
-#: lib/Horde/Auth/cyrus.php:135
-msgid "Auth_cyrus: Backend does not have required capabilites."
-msgstr "Auth_cyrus : le backend n'a pas les capacités requises."
-
-#: lib/Horde/Auth/cyrus.php:122
-msgid "Auth_cyrus: Required imap extension not found."
-msgstr "Auth_cyrus : extension requise IMAP non trouvée"
-
-#: lib/Horde/Auth/ftp.php:36
-msgid ""
-"Auth_ftp: Required FTP extension not found. Compile PHP with the --enable-"
-"ftp switch."
-msgstr ""
-"Auth_ftp : extension requise FTP non trouvée. Il faut compiler PHP avec "
-"l'option --enable-ftp."
-
-#: lib/Horde/Auth/imap.php:64
-msgid "Auth_imap: Required IMAP extension not found."
-msgstr "Auth_imap : extension requise IMAP non trouvée."
-
-#: lib/Horde/Auth/krb5.php:51
-msgid "Auth_krb5: Required krb5 extension not found."
-msgstr "Auth_krb5 : extension requise krb5 non trouvée."
-
-#: lib/Horde/Auth/ldap.php:58
-msgid "Auth_ldap: Required LDAP extension not found."
-msgstr "Auth_ldap : extension requise LDAP non trouvée."
-
-#: lib/Horde/Auth/ldap.php:184
-#, php-format
-msgid "Auth_ldap: Unable to add user %s. This is what the server said: "
-msgstr ""
-"Auth_ldap: Impossible d'ajouter l'utilisateur %s.  Ceci est la réponse du "
-"serveur : "
-
-#: lib/Horde/Auth/ldap.php:222
-#, php-format
-msgid "Auth_ldap: Unable to remove user %s"
-msgstr "Auth_ldap: Impossible de supprimer l'utilisateur %s"
-
-#: lib/Horde/Auth/ldap.php:280
-#, php-format
-msgid "Auth_ldap: Unable to update user %s"
-msgstr "Auth_ldap: Suppression impossible de l'utilisateur %s"
-
-#: lib/Horde/Auth/mcal.php:46
-msgid "Auth_mcal: Required MCAL extension not found."
-msgstr "Auth_mcal : extension requise MCAL non trouvée."
-
-#: lib/Horde/Auth/smb.php:60
-msgid "Auth_smbauth: Required smbauth extension not found."
-msgstr "Auth_smbauth : extension requise smbauth non trouvée."
-
-#: lib/Net/SMS/clickatell_http.php:289
-msgid "Authentication failed"
-msgstr "Échec de l'authentification"
-
-#: lib/Net/SMS/clickatell_http.php:67 lib/Net/SMS/clickatell_http.php:76
-#, php-format
-msgid "Authentication failed. %s"
-msgstr "Échec de l'authentification %s"
-
-#: lib/Horde/Auth/radius.php:176
-msgid "Authentication rejected by RADIUS server."
-msgstr "Le serveur RADIUS a rejeté l'authentification."
-
-#: lib/VFS/ftp.php:768
-msgid "Authentication to FTP server failed."
-msgstr "Échec de l'authentification serveur FTP"
-
-#: templates/data/csvmap.inc:83
-msgid "Available fields:"
-msgstr "Champs disponibles :"
-
-#: lib/Horde/NLS/GeoIP.php:59 lib/Horde/NLS/countries.php:25
-#: lib/Horde/NLS/tld.php:31
-msgid "Azerbaijan"
-msgstr "Azerbaïdjan"
-
-#: lib/Block/fortune.php:30
-msgid "BOFH Excuses"
-msgstr "Excuses BOFH"
-
-#: templates/javascript/htmlarea_table_lang.js:18
-msgid "Background"
-msgstr "Couleur de fond"
-
-#: templates/javascript/htmlarea_lang.js:23
-msgid "Background Color"
-msgstr "Couleur de fond"
-
-#: lib/Horde/Auth/krb5.php:81
-msgid "Bad kerberos password."
-msgstr "Mot de passe Kerberos erroné."
-
-#: lib/Horde/Auth/krb5.php:83
-msgid "Bad kerberos username."
-msgstr "Nom de connexion Kerberos erroné."
-
-#: lib/Horde/NLS/GeoIP.php:62 lib/Horde/NLS/countries.php:26
-#: lib/Horde/NLS/tld.php:45
-msgid "Bahamas"
-msgstr "Bahamas"
-
-#: lib/Horde/NLS/GeoIP.php:61 lib/Horde/NLS/countries.php:27
-#: lib/Horde/NLS/tld.php:38
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: lib/Horde/NLS/GeoIP.php:60 lib/Horde/NLS/countries.php:28
-#: lib/Horde/NLS/tld.php:34
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: lib/Horde/NLS/GeoIP.php:60 lib/Horde/NLS/countries.php:29
-#: lib/Horde/NLS/tld.php:33
-msgid "Barbados"
-msgstr "Barbade"
-
-#: util/icon_browser.php:31
-#, php-format
-msgid "Base graphics directory '%s' not found."
-msgstr "Répertoire des graphiques « %s » non trouvé."
-
-#: templates/javascript/htmlarea_lang.js:73
-#: templates/javascript/htmlarea_table_lang.js:19
-msgid "Baseline"
-msgstr "Ligne de base"
-
-#: lib/Horde/NLS/GeoIP.php:63 lib/Horde/NLS/countries.php:30
-#: lib/Horde/NLS/tld.php:49
-msgid "Belarus"
-msgstr "Bélarus"
-
-#: lib/Horde/NLS/GeoIP.php:60 lib/Horde/NLS/countries.php:31
-#: lib/Horde/NLS/tld.php:35
-msgid "Belgium"
-msgstr "Belgique"
-
-#: lib/Horde/NLS/GeoIP.php:63 lib/Horde/NLS/countries.php:32
-#: lib/Horde/NLS/tld.php:50
-msgid "Belize"
-msgstr "Belize"
-
-#: lib/Horde/NLS/GeoIP.php:61 lib/Horde/NLS/countries.php:33
-#: lib/Horde/NLS/tld.php:40
-msgid "Benin"
-msgstr "Bénin"
-
-#: lib/Horde/NLS/GeoIP.php:62 lib/Horde/NLS/countries.php:34
-#: lib/Horde/NLS/tld.php:41
-msgid "Bermuda"
-msgstr "Bermudes"
-
-#: lib/Horde/NLS/GeoIP.php:63 lib/Horde/NLS/countries.php:35
-#: lib/Horde/NLS/tld.php:46
-msgid "Bhutan"
-msgstr "Bhoutan"
-
-#: lib/Horde/MIME/Viewer/vcard.php:111
-msgid "Birthday"
-msgstr "Anniversaire"
-
-#: lib/Horde/Block/Collection.php:326
-#, php-format
-msgid "Block \"%s\" of application \"%s\" not found."
-msgstr "Bloc «%s » de l'application « %s » inconnu"
-
-#: templates/portal/layout.inc:89
-msgid "Block Settings"
-msgstr "Préférences de bloc"
-
-#: templates/portal/layout.inc:74
-msgid "Block Type"
-msgstr "Type de bloc"
-
-#: templates/javascript/htmlarea_lang.js:8
-msgid "Bold"
-msgstr "Gras"
-
-#: lib/Horde/NLS/GeoIP.php:62 lib/Horde/NLS/countries.php:36
-#: lib/Horde/NLS/tld.php:43
-msgid "Bolivia"
-msgstr "Bolivie"
-
-#: templates/javascript/htmlarea_table_lang.js:20
-msgid "Border"
-msgstr "Bordure"
-
-#: templates/javascript/htmlarea_lang.js:85
-msgid "Border thickness:"
-msgstr "Épaisseur de la bordure :"
-
-#: templates/javascript/htmlarea_table_lang.js:21
-msgid "Borders"
-msgstr "Bords"
-
-#: lib/Horde/NLS/GeoIP.php:60 lib/Horde/NLS/countries.php:37
-#: lib/Horde/NLS/tld.php:32
-msgid "Bosnia and Herzegovina"
-msgstr "Bosnie-Herzégovine"
+#: lib/Search.php:609
+msgid "Body"
+msgstr "Corps"
 
-#: lib/Block/fortune.php:96
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Les deux"
 
-#: lib/Horde/NLS/GeoIP.php:63 lib/Horde/NLS/countries.php:38
-#: lib/Horde/NLS/tld.php:48
-msgid "Botswana"
-msgstr "Botswana"
-
-#: templates/javascript/htmlarea_lang.js:75
-#: templates/javascript/htmlarea_table_lang.js:22
-msgid "Bottom"
-msgstr "Bas"
-
-#: lib/Horde/NLS/GeoIP.php:63 lib/Horde/NLS/countries.php:39
-#: lib/Horde/NLS/tld.php:47
-msgid "Bouvet Island"
-msgstr "Bouvet"
-
-#: lib/Horde/NLS/GeoIP.php:62 lib/Horde/NLS/countries.php:40
-#: lib/Horde/NLS/tld.php:44
-msgid "Brazil"
-msgstr "Brésil"
-
-#: lib/Horde/NLS/GeoIP.php:81 lib/Horde/NLS/countries.php:41
-#: lib/Horde/NLS/tld.php:117
-msgid "British Indian Ocean Territory"
-msgstr "Territoires britanniques de l'Océan Indien"
-
-#: lib/Horde/NLS/GeoIP.php:62 lib/Horde/NLS/countries.php:42
-#: lib/Horde/NLS/tld.php:42
-msgid "Brunei Darussalam"
-msgstr "Brunei Darussalam"
-
-#: po/translation.php:661
-#, php-format
-msgid "Building MO files for module %s..."
-msgstr "Construction des fichiers MO pour le module %s..."
-
-#: po/translation.php:673
-#, php-format
-msgid "Building locale %s... "
-msgstr "Construction de la locale %s... "
-
-#: lib/Horde/NLS/GeoIP.php:61 lib/Horde/NLS/countries.php:43
-#: lib/Horde/NLS/tld.php:37
-msgid "Bulgaria"
-msgstr "Bulgarie"
-
-#: templates/javascript/htmlarea_lang.js:19
-msgid "Bulleted List"
-msgstr "Liste à puces"
-
-#: lib/Horde/NLS/GeoIP.php:61 lib/Horde/NLS/countries.php:44
-#: lib/Horde/NLS/tld.php:36
-msgid "Burkina Faso"
-msgstr "Burkina Faso"
-
-#: lib/Horde/NLS/GeoIP.php:61 lib/Horde/NLS/countries.php:45
-#: lib/Horde/NLS/tld.php:39
-msgid "Burundi"
-msgstr "Burundi"
-
-#: lib/Horde/MIME/Viewer/zip.php:72
-msgid "CRC"
-msgstr "CRC"
-
-#: lib/Horde/Crypt/smime.php:597
-msgid "CRL Distribution Points"
-msgstr "Distribution des points LRC (Liste de révocation des certificats)"
-
-#: templates/javascript/htmlarea_context_lang.js:27
-msgid "C_ell Properties..."
-msgstr "Propriétés de la C_ellule"
+#: config/prefs.php.dist:684
+msgid "Both Header Listing and Body of Message"
+msgstr "Simultanément dans la liste des en-têtes et dans le corps du message"
+
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr "CRAM-MD5 ou DIGEST-MD5 nécessitent l'installation du paquet Auth_SASL."
+
+#: templates/compose/compose.inc:270
+msgid "C_harset"
+msgstr "_Jeu de caractères"
 
-#: lib/Horde/UI/VarRenderer/html.php:456
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Agenda"
 
-#: lib/Block/weatherdotcom.php:213
-msgid "Calm"
-msgstr "Calme"
-
-#: lib/Horde/NLS/GeoIP.php:83 lib/Horde/NLS/countries.php:46
-#: lib/Horde/NLS/tld.php:128
-msgid "Cambodia"
-msgstr "Cambodge"
-
-#: lib/Horde/NLS/GeoIP.php:67 lib/Horde/NLS/countries.php:47
-#: lib/Horde/NLS/tld.php:60
-msgid "Cameroon"
-msgstr "Cameroun"
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr "Connexion au serveur de courriel distant impossible."
 
-#: services/resetpassword.php:20
-msgid "Can not reset password automatically, contact your administrator."
-msgstr ""
-"Ne peut pas réinitialiser le mot de passe automatiquement, contactez votre "
-"administrateur système."
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr "Connexion au serveur de courriel distant impossible : "
 
-#: lib/Horde/Auth/cyrsql.php:316 lib/Horde/Auth/cyrus.php:235
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
-msgid "Can't connect to IMAP server: %s"
-msgstr "Échec de la connexion au serveur IMAP : %s"
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+"Ne peut afficher - trouvé seulement %s parties de %s de ce message dans la "
+"présente boîte de courriels."
 
-#: lib/Horde/NLS/GeoIP.php:64 lib/Horde/NLS/countries.php:48
-#: lib/Horde/NLS/tld.php:51
-msgid "Canada"
-msgstr "Canada"
-
-#: admin/user.php:101 admin/user.php:120
-#: templates/javascript/htmlarea_lang.js:47
-#: templates/javascript/htmlarea_lang.js:65 templates/admin/user/clear.inc:17
-#: templates/admin/user/remove.inc:17 templates/admin/groups/delete.inc:14
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120
 msgid "Cancel"
 msgstr "Annuler"
 
-#: templates/problem/problem.inc:59
-msgid "Cancel Problem Report"
-msgstr "Annuler le rapport du problème"
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Annuler le message"
 
-#: lib/VFS/ftp.php:256
-#, php-format
-msgid "Cannot delete file \"%s\"."
-msgstr "Impossible de supprimer le fichier « %s »."
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+msgid "Cancelling this message will permanently discard its contents."
+msgstr "L'annulation du message entraînera la perte définitive de son contenu."
 
-#: lib/VFS/ISOWriter/RealOutputStrategy/copy.php:52
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:46
-msgid "Cannot find a temporary directory."
-msgstr "Impossible de trouver un répertoire temporaire"
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
+msgid "Cc"
+msgstr "Cc"
 
-#: lib/VFS/ISOWriter.php:91
-msgid "Cannot proceed without 'targetFile' parameter."
-msgstr "Impossible de procéder sans le paramètre « targetFile »"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"L'importation de certificats n'est pas disponible. On ne peut pas envoyer de "
+"fichier sur ce serveur."
 
-#: lib/VFS/ftp.php:252
-#, php-format
-msgid "Cannot remove directory \"%s\"."
-msgstr "Impossible de supprimer le dossier « %s »."
+#: lib/MIME/Viewer/itip.php:696
+msgid "Chair Person"
+msgstr "Animateur"
 
-#: lib/Horde/DataTree.php:112 lib/Horde/DataTree/sql.php:586
-#, php-format
-msgid "Cannot remove, %d children exist."
-msgstr "Suppression impossible,  il y a des enregistrements fils %d."
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Modifier"
 
-#: lib/Horde/DataTree/sql.php:513
+#: templates/compose/spelling.inc:81
+msgid "Change All"
+msgstr "Changer tout"
+
+#: templates/acl/acl.inc:92
+msgid "Change Folder"
+msgstr "Changer de dossier"
+
+#: config/prefs.php.dist:112
 msgid ""
-"Cannot reorder, number of entries supplied for reorder does not match number "
-"stored."
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
 msgstr ""
-"Impossible de réordonner, le nombre d'éléments à réordonner ne correspond "
-"pas au nombre d'éléments enregistrés."
+"Changer les préférences d'affichage telles que le thème, le nombre de "
+"messages affichés par page et comment ils sont triés."
 
-#: lib/Net/SMS/clickatell_http.php:308
-msgid "Cannot route message to specified number."
-msgstr "Ne peut diriger le message vers le nombre spécifié."
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr "Modifier la configuration du serveur de courriel et des dossiers."
 
-#: lib/Horde/NLS/GeoIP.php:68 lib/Horde/NLS/countries.php:49
-#: lib/Horde/NLS/tld.php:65
-msgid "Cape Verde"
-msgstr "Cap-Vert"
+#: config/prefs.php.dist:15
+msgid ""
+"Change the name, address, and signature that people see when they read and "
+"reply to your email."
+msgstr ""
+"Changer le nom, l'adresse et la signature que les personnes voient quand "
+"elles lisent et répondent à vos messages."
 
-#: templates/javascript/htmlarea_table_lang.js:24
-msgid "Caption"
-msgstr "Légende"
+#: config/prefs.php.dist:813
+msgid "Characters to display:"
+msgstr "Caractères à afficher :"
 
-#: lib/Horde/NLS/GeoIP.php:86 lib/Horde/NLS/countries.php:50
-#: lib/Horde/NLS/tld.php:135
-msgid "Cayman Islands"
-msgstr "Îles Caïman"
+#: templates/folders/actions.inc:15
+msgid "Check Folder(s) for New Mail"
+msgstr "Vérifier les nouveaux messages du(des) dossier(s)"
 
-#: lib/Horde/MIME/Viewer/vcard.php:194
-msgid "Cell Phone"
-msgstr "Téléphone cellulaire"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr "Vérifier _Tout/Rien"
 
-#: templates/javascript/htmlarea_table_lang.js:25
-msgid "Cell Properties"
-msgstr "Propriétés de la cellule"
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr "Vérifiez tous les serveurs dont vous voulez récupérer le courrier :"
 
-#: templates/javascript/htmlarea_lang.js:114
-msgid "Cell padding:"
-msgstr "Remplissage autour de la cellule :"
+#: config/prefs.php.dist:463
+msgid "Check spelling before sending a message?"
+msgstr "Vérifier l'orthographe avant l'envoi d'un message ?"
 
-#: templates/javascript/htmlarea_table_lang.js:61
-msgid "Cell properties"
-msgstr "Propriétés de la cellule"
+#: templates/folders/actions.inc:4
+msgid "Choose Action:"
+msgstr "Choisir l'action :"
 
-#: templates/javascript/htmlarea_lang.js:112
-msgid "Cell spacing:"
-msgstr "Espacement de la cellule :"
+#: config/servers.php.dist:202
+msgid "Choose a mail server:"
+msgstr "Choisir un serveur de courriel :"
 
-#: lib/Horde/Form.php:1274
-msgid "Cellphone"
-msgstr "Téléphone cellulaire "
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
+msgid "Choose a match or edit the address to the right:"
+msgstr "Sélectionner une correspondance ou éditer l'adresse à droite :"
 
-#: templates/javascript/htmlarea_table_lang.js:26
-msgid "Center"
-msgstr "Centrer"
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
+msgstr ""
+"Choisissez le carnet d'adresses à utiliser lorsque vous ajoutez des adresses."
 
-#: lib/Horde/NLS/GeoIP.php:65 lib/Horde/NLS/countries.php:51
-#: lib/Horde/NLS/tld.php:54
-msgid "Central African Republic"
-msgstr "République centrafricaine"
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+"Choisissez l'ordre de recherche des carnets d'adresses lors du développement "
+"des noms."
 
-#: lib/Horde/Crypt/smime.php:699
-msgid "Certificate Details"
-msgstr "Détails du certificat"
+#: lib/MIME/Viewer/images.php:115
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+"Cliquer sur %s pour convertir l'image dans un format que votre navigateur "
+"peut lire."
 
-#: lib/Horde/Crypt/smime.php:596
-msgid "Certificate Policies"
-msgstr "Politique de certification"
+#: lib/MIME/Viewer/images.php:104
+#, php-format
+msgid "Click %s to download the image."
+msgstr "Cliquer %s pour télécharger l'image."
 
-#: lib/Horde/NLS/GeoIP.php:108 lib/Horde/NLS/countries.php:52
-#: lib/Horde/NLS/tld.php:221
-msgid "Chad"
-msgstr "Tchad"
+#: lib/Filter.php:132
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr "Cliquer %s pour vous rendre à la page de gestion de %s."
 
-#: templates/rpcsum/rpcsum.inc:24 templates/rpcsum/rpcsum.inc:97
-msgid "Change"
-msgstr "Modifier"
+#: lib/MIME/Viewer/html.php:119
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Cliquer sur %s pour visualiser le contenu HTML dans une autre fenêtre."
 
-#: templates/javascript/htmlarea_table_lang.js:27
-msgid "Char"
-msgstr "Char"
-
-#: templates/javascript/htmlarea_context_lang.js:25
-msgid "Chec_k Link..."
-msgstr "Vé_rifier le lien"
-
-#: templates/maintenance/confirm_top.inc:13
-msgid "Check the box for any operation(s) you want to perform at this time."
-msgstr "Sélectionnez la ou les opération(s) que vous voulez effectuer."
-
-#: lib/Horde/NLS/GeoIP.php:67 lib/Horde/NLS/countries.php:53
-#: lib/Horde/NLS/tld.php:59
-msgid "Chile"
-msgstr "Chili"
-
-#: lib/Horde/NLS/GeoIP.php:67 lib/Horde/NLS/countries.php:54
-#: lib/Horde/NLS/tld.php:61
-msgid "China"
-msgstr "Chine"
-
-#: lib/Horde/Auth/Signup.php:269
-msgid "Choose a password"
-msgstr "Choisir un mot de passe"
-
-#: lib/Horde/Auth/Signup.php:268
-msgid "Choose a username"
-msgstr "Choisir un nom de connexion"
-
-#: templates/javascript/htmlarea_listtype_lang.js:22
-msgid "Choose list style type (for ordered lists)"
-msgstr "Choisir le style de liste (pour les listes numériques)"
-
-#: lib/Horde/NLS/GeoIP.php:68 lib/Horde/NLS/countries.php:55
-#: lib/Horde/NLS/tld.php:66
-msgid "Christmas Island"
-msgstr "Îles Christmas"
-
-#: lib/VFS.php:613 lib/Net/SMS.php:294
-#, php-format
-msgid "Class definition of %s not found."
-msgstr "Définition de la classe de %s non trouvée."
-
-#: po/translation.php:855
-#, php-format
-msgid "Cleaning up PO files for module %s..."
-msgstr "Nettoyage des fichiers PO pour le module %s..."
-
-#: po/translation.php:867
-#, php-format
-msgid "Cleaning up locale %s... "
-msgstr "Nettoyage de la locale %s... "
-
-#: lib/Block/weatherdotcom_strings.php:12
-msgid "Clear"
-msgstr "Effacer"
-
-#: templates/javascript/htmlarea_lang.js:42
-msgid "Clear MSOffice tags"
-msgstr "Nettoyer les balises MSOffice"
-
-#: templates/admin/user/clear.inc:7
-#, php-format
-msgid "Clear out user: %s"
-msgstr "Retirer l'utilisateur: %s"
-
-#: templates/admin/user/clear.inc:16
-msgid "Clear user"
-msgstr "Effacer l'utilisateur"
-
-#: templates/admin/user/list.inc:34
-msgid "Clear user data"
-msgstr "Effacer les données de l'utilisateur"
-
-#: lib/Block/weatherdotcom_strings.php:13
-msgid "Clearing Late"
-msgstr "Éclaircies tard dans la journée"
-
-#: templates/maintenance/notice_bottom.inc:6
-msgid "Click to Continue"
-msgstr "Cliquer pour poursuivre"
-
-#: lib/Net/SMS/clickatell_http.php:183
-msgid "Clickatell via HTTP"
-msgstr "Clickatell via HTTP"
-
-#: services/keyboard.php:146 templates/shares/edit.inc:12
-msgid "Close Window"
-msgstr "Fermer la fenêtre"
-
-#: lib/Block/metar.php:242
-msgid "Clouds"
-msgstr "Nuages"
-
-#: lib/Block/weatherdotcom_strings.php:14
-msgid "Clouds Early"
-msgstr "Nuages matinaux"
-
-#: lib/Block/weatherdotcom_strings.php:15
-msgid "Cloudy"
-msgstr "Nuageux"
-
-#: lib/Horde/NLS/GeoIP.php:64 lib/Horde/NLS/countries.php:56
-#: lib/Horde/NLS/tld.php:52
-msgid "Cocos (Keeling) Islands"
-msgstr "Îles Cocos"
-
-#: templates/portal/sidebar.inc:4
-msgid "Collapse Sidebar"
-msgstr "Replier la barre de côté"
-
-#: templates/javascript/htmlarea_table_lang.js:28
-msgid "Collapsed borders"
-msgstr "Réduire les bords"
-
-#: lib/Horde/NLS/GeoIP.php:67 lib/Horde/NLS/countries.php:57
-#: lib/Horde/NLS/tld.php:62
-msgid "Colombia"
-msgstr "Colombie"
-
-#: lib/Block/color.php:18 lib/Block/color.php:29
-#: templates/javascript/htmlarea_table_lang.js:29
-msgid "Color"
-msgstr "Couleur"
-
-#: lib/Horde/UI/VarRenderer/html.php:472 lib/Horde/Block/Collection.php:297
-#: lib/Horde/Block/Collection.php:298 services/images/colorpicker.php:14
-#: templates/prefs/categorymanagement.inc:51
-#: templates/prefs/categorymanagement.inc:52
-#: templates/prefs/categorymanagement.inc:68
-#: templates/prefs/categorymanagement.inc:69
-#: templates/prefs/categorymanagement.inc:85
-#: templates/prefs/categorymanagement.inc:86
-msgid "Color Picker"
-msgstr "Palette de couleurs"
-
-#: lib/Horde/Form.php:2844
-msgid "Colour selection"
-msgstr "Sélection d'une couleur"
-
-#: templates/javascript/htmlarea_lang.js:103
-msgid "Cols:"
-msgstr "Cols :"
-
-#: lib/Horde/Form.php:1946
-msgid "Column titles"
-msgstr "Titres de colonne"
-
-#: admin/cmdshell.php:25
-msgid "Command"
-msgstr "Commande"
-
-#: admin/cmdshell.php:20
-msgid "Command Shell"
-msgstr "Commande shell"
-
-#: po/translation.php:38
-msgid "Command options:"
-msgstr "Options de la commande :"
-
-#: po/translation.php:97
-msgid "Commands:"
-msgstr "Commandes :"
+#: lib/MIME/Viewer/images.php:164
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr "Cliquer %s pour voir une étiquette de cette image."
 
-#: lib/Horde/Crypt/pgp.php:399
-msgid "Comment"
-msgstr "Commentaire"
+#: lib/MIME/Viewer/pkcs7.php:424
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Cliquer sur %s pour visualiser la pièce jointe dans une autre fenêtre."
 
-#: po/translation.php:1000
-msgid "Committing:"
-msgstr "Validation :"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Cliquer sur %s pour visualiser cette partie dans une autre fenêtre."
 
-#: lib/Horde/Crypt/smime.php:566
-msgid "Common Name"
-msgstr "Nom usuel"
+#: lib/MIME/Viewer/html.php:98
+msgid "Click here to SHOW the Images"
+msgstr "Cliquer ici pour MONTRER les images"
 
-#: lib/Horde/NLS/GeoIP.php:84 lib/Horde/NLS/countries.php:58
-#: lib/Horde/NLS/tld.php:130
-msgid "Comoros"
-msgstr "Comores"
+#: templates/prefs/sourceselect.inc:321
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"Choisissez un de vos carnets d'adresses et ensuite sélectionnez tous les "
+"champs à rechercher."
 
-#: lib/Horde/MIME/Viewer/vcard.php:239
-msgid "Company"
-msgstr "Société"
+#: lib/MIME/Viewer/pgp.php:170
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+"Cliquer pour enregistrer la clef PGP publique dans votre carnet d'adresses"
 
-#: lib/Horde/Text/Filter/emails.php:81 lib/Horde/Text/Filter/emails.php:87
-#: lib/Horde/Text/Filter/emails.php:97 lib/Horde/Text/Filter/emails.php:101
+# php-format
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
-msgid "Compose Message (%s)"
-msgstr "Rédaction du message (%s)"
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+"Cliquer pour enregistrer le certificat S/MIME de %s dans votre carnet "
+"d'adresses"
 
-#: lib/Block/fortune.php:31
-msgid "Computers"
-msgstr "Ordinateurs"
+#: config/prefs.php.dist:939
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr "Cliquer sur l'adresse composera un nouveau message à l'expéditeur"
 
-#: lib/Block/metar.php:247
-msgid "Conditions"
-msgstr "Conditions"
+#: config/prefs.php.dist:940
+msgid "Clicking on the address will open the message to be read"
+msgstr "Cliquer sur l'adresse ouvrira le message pour la lecture"
 
-#: admin/setup/diff.php:96
-msgid "Configuration Differences"
-msgstr "Différences de configuration"
+#: templates/fetchmail/fetchmail.inc:28
+msgid "Close"
+msgstr "Fermer"
 
-#: admin/setup/index.php:134
-msgid "Configuration is out of date."
-msgstr "La configuration n'est pas à jour."
+#: compose.php:418
+msgid "Close this window"
+msgstr "Fermer cette fenêtre"
 
-#: admin/setup/index.php:99
-#, php-format
-msgid "Configure %s"
-msgstr "Configurer %s"
+#: folders.php:410
+msgid "Closed Folder"
+msgstr "Dossier fermé"
 
-#: templates/admin/user/update.inc:37
-msgid "Confirm Password"
-msgstr "Confirmer le mot de passe"
+#: folders.php:430
+msgid "Collapse"
+msgstr "Réduire"
 
-#: lib/Horde/NLS/GeoIP.php:66 lib/Horde/NLS/countries.php:59
-#: lib/Horde/NLS/tld.php:55
-msgid "Congo"
-msgstr "Congo"
+#: templates/folders/actions.inc:40
+msgid "Collapse All"
+msgstr "Réduire tout"
 
-#: lib/Horde/NLS/GeoIP.php:65 lib/Horde/NLS/countries.php:60
-#: lib/Horde/NLS/tld.php:53
-msgid "Congo, The Democratic Republic of the"
-msgstr "République démocratique du Congo"
+#: templates/folders/actions.inc:40
+msgid "Collapse All Folders"
+msgstr "Réduire tous les dossiers"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:199 lib/Horde/IMAP/ACL/rfc2086.php:310
-msgid "Connection failed."
-msgstr "Échec de la connexion"
+#: folders.php:430
+msgid "Collapse Folder"
+msgstr "Réduire le dossier"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:199 lib/Horde/IMAP/ACL/rfc2086.php:310
-msgid "Connection failed: "
-msgstr "Échec de la connexion : "
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr "Indicateur de couleur : "
 
-#: lib/Horde/Crypt/pgp.php:776
-msgid "Connection refused to the public keyserver."
-msgstr "Connexion au serveur de clefs public refusée."
-
-#: lib/Horde/Crypt/pgp.php:778
-#, php-format
-msgid "Connection refused to the public keyserver. Reason: %s (%s)"
-msgstr "Connexion au serveur de clefs public refusée. Raison :  %s (%s)"
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr "Commentaire"
 
-#: lib/VFS/ftp.php:762
-msgid "Connection to FTP server failed."
-msgstr "Échec de la connexion au serveur FTP"
+#: lib/MIME/Viewer/itip.php:762
+msgid "Completed"
+msgstr "Terminé"
 
-#: lib/Horde/MIME/Viewer/vcard.php:53
-msgid "Contacts were successfully added to your address book."
-msgstr "Ces contacts ont bien été ajoutés à votre carnet d'adresses."
+#: compose.php:417
+msgid "Compose another message"
+msgstr "Rédiger un autre message"
 
-#: lib/Horde/MIME/Viewer/rar.php:56 lib/Horde/MIME/Viewer/tgz.php:78
-#: lib/Horde/MIME/Viewer/zip.php:60
-#, php-format
-msgid "Contents of '%s'"
-msgstr "Contenu de « %s »"
+#: config/prefs.php.dist:434
+msgid "Compose messages in a separate window?"
+msgstr "Rédiger les messages dans une fenêtre séparée ?"
 
-#: services/resetpassword.php:29
-msgid "Continue"
-msgstr "Poursuivre"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+"Composer les messages avec une interface en HTML par défaut (si le "
+"navigateur supporte cette option) ?"
 
-#: lib/Horde/NLS/GeoIP.php:66 lib/Horde/NLS/countries.php:61
-#: lib/Horde/NLS/tld.php:58
-msgid "Cook Islands"
-msgstr "Îles Cook"
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr "Configurer l'affichage des messages."
 
-#: lib/Block/fortune.php:32
-msgid "Cookie"
-msgstr "Témoin (cookie)"
+#: config/prefs.php.dist:97
+msgid "Configure mail preview options."
+msgstr "Configurer les options de pré-visualisation du courrier."
 
-#: templates/javascript/htmlarea_context_lang.js:21
-msgid "Copy"
-msgstr "Copier"
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Connexion rompue par le serveur IMAP."
 
-#: templates/javascript/htmlarea_lang.js:36
-msgid "Copy selection"
-msgstr "Sélection d'une copie"
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr "Échec de la connexion au serveur"
 
-#: po/translation.php:1084
+#: config/prefs.php.dist:143
 #, php-format
-msgid "Copying %s to %s"
-msgstr "Copie de %s vers %s"
+msgid "Control PGP support for %s."
+msgstr "Gestion du support de PGP dans %s."
 
-#: lib/Horde/NLS/GeoIP.php:67 lib/Horde/NLS/countries.php:62
-#: lib/Horde/NLS/tld.php:63
-msgid "Costa Rica"
-msgstr "Costa Rica"
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr "Gestion du support de S/MIME dans %s."
 
-#: lib/Horde/NLS/GeoIP.php:66 lib/Horde/NLS/countries.php:63
-#: lib/Horde/NLS/tld.php:57
-msgid "Cote d'Ivoire"
-msgstr "Côte d'Ivoire"
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Contrôle des options de recherche des messages."
 
-#: lib/Horde/Crypt/pgp.php:953
-msgid "Could not PGP encrypt message."
-msgstr "Impossible de chiffrer le message."
+#: config/prefs.php.dist:89
+msgid ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+msgstr ""
+"Régler la vérification de l'arrivée de nouveaux messages, et s'il faut ou "
+"non vous en avertir."
 
-#: lib/Horde/Crypt/pgp.php:1030
-msgid "Could not PGP sign message."
-msgstr "Signature PGP du message impossible."
+#: config/prefs.php.dist:674
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "Convertir les émoticônes textuels en graphique ?"
 
-#: lib/Horde/Crypt/smime.php:393
-msgid "Could not S/MIME encrypt message."
-msgstr "Impossible de chiffrer le message avec S/MIME."
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+msgid "Copy"
+msgstr "Copier"
 
-#: lib/Horde/Crypt/smime.php:467
-msgid "Could not S/MIME sign message."
-msgstr "Signature S/MIME du message impossible."
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+msgid "Copy to folder"
+msgstr "Copier vers le dossier"
 
-#: lib/Net/SMS/sms2email_http.php:183
-#, php-format
-msgid "Could not add contact. %s"
-msgstr "Ajout du contact %s impossible. "
+#: templates/compose/spelling.inc:63
+msgid "Correct"
+msgstr "Corriger"
 
-#: lib/Horde/Auth/ldap.php:110
-msgid "Could not bind to LDAP server."
-msgstr "Ne peut se connecter au serveur LDAP"
+#: templates/compose/spelling.inc:140
+msgid "Corrected Text"
+msgstr "Texte corrigé"
 
-#: lib/Net/SMS/clickatell_http.php:172 lib/Net/SMS/sms2email_http.php:155
+#: lib/IMAP/Client.php:382
 #, php-format
-msgid "Could not check balance. %s"
-msgstr "Vérification de la balance %s impossible. "
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Impossible de terminer la requête. Raison évoquée : %s"
 
-#: admin/setup/index.php:48
+#: attachment.php:50
 #, php-format
-msgid "Could not connect to server '%s' using FTP: %s"
-msgstr "Échec de la connexion au serveur %s via FTP: %s"
+msgid "Could not create the VFS backend: %s"
+msgstr "Impossible de créer un dorsal VFS : %s"
 
-#: po/translation.php:1087
+#: lib/Message.php:676
 #, php-format
-msgid "Could not copy %s to %s"
-msgstr "Impossible de copier %s vers %s"
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "Impossible de supprimer des messages de %s. Le serveur a répondu : %s"
 
-#: lib/Net/SMS/sms2email_http.php:321
-#, php-format
-msgid "Could not create distribution list. %s"
-msgstr "Création impossible de la liste de distribution %s"
+#: lib/Session.php:333
+msgid "Could not execute maintenance operations."
+msgstr "Impossible d'exécuter les opérations de maintenance."
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+"Impossible d'extraire le fichier demandé de la pièce jointe au format MS-"
+"TNEF."
 
-#: po/translation.php:681 po/translation.php:1077
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "Impossible d'extraire le fichier demandé de l'archive compressée."
+
+#: lib/IMAP/Client.php:446
 #, php-format
-msgid "Could not create locale directory for locale %s:"
-msgstr "Création impossible du répertoire pour la locale %s :"
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr ""
+"Impossible d'ouvrir une connexion sécurisée sur le serveur IMAP. %s : %s."
 
-#: lib/Horde/Crypt/pgp.php:1102
-msgid "Could not decrypt PGP data."
-msgstr "Impossible de déchiffrer les données PGP."
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+"Impossible de récupérer les informations de nommage à partir du serveur IMAP."
 
-#: lib/Horde/Crypt/smime.php:522
-msgid "Could not decrypt S/MIME data."
-msgstr "Impossible de déchiffrer les données S/MIME."
+#: templates/acl/acl.inc:39 templates/acl/acl.inc:161
+#: templates/fetchmail/manage.inc:67
+msgid "Create"
+msgstr "Créer"
 
-#: lib/Net/SMS/sms2email_http.php:245
-#, php-format
-msgid "Could not delete contact. %s"
-msgstr "Ne peut pas supprimer le contact %s"
+#: templates/folders/actions.inc:6
+msgid "Create Folder"
+msgstr "Créer un dossier"
 
-#: lib/Net/SMS/sms2email_http.php:355
-#, php-format
-msgid "Could not delete distribution list. %s"
-msgstr "Ne peut pas supprimer la liste de distribution %s"
+#: templates/pgp/pgp.inc:137
+msgid "Create Keys"
+msgstr "Créer des clefs"
 
-#: admin/setup/scripts.php:37
-#, php-format
-msgid "Could not delete setup upgrade script '%s'."
-msgstr "Ne peut pas supprimer le script de mise à jour %s"
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Créer un nouveau compte"
 
-#: lib/Horde/Crypt/pgp.php:935 lib/Horde/Crypt/smime.php:381
-msgid "Could not determine the recipient's e-mail address."
-msgstr "Détermination de l'adresse du destinataire impossible."
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Créer un nouveau dossier pour les pourriels"
 
-#: lib/Net/SMS/sms2email_http.php:282
-msgid "Could not fetch complete address book."
-msgstr "Ne peut récupérer tout le carnet d'adresse."
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
+msgid "Create a new drafts folder"
+msgstr "Créer un nouveau dossier de brouillons"
 
-#: lib/Net/SMS/sms2email_http.php:492
-msgid "Could not fetch complete distribution list."
-msgstr "Ne peut récupérer toute la liste de distribution."
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
+msgid "Create a new sent mail folder"
+msgstr "Créer un nouveau dossier de messages envoyés"
 
-#: lib/Net/SMS/sms2email_http.php:445
-msgid "Could not fetch the complete list of distribution lists."
-msgstr "N'a pas pu récupérer la liste complète de listes de distribution."
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
+msgid "Create a new trash folder"
+msgstr "Créer une nouvelle corbeille"
 
-#: lib/VFS/ISOWriter/RealInputStrategy.php:84
-#: lib/VFS/ISOWriter/RealOutputStrategy.php:68
-#, php-format
-msgid "Could not load strategy '%s'."
-msgstr "Impossible de charger la stratégie %s"
+#: config/prefs.php.dist:128
+msgid ""
+"Create filtering rules to organize your incoming mail, sort it into folders, "
+"and delete spam."
+msgstr ""
+"Créer des règles de filtrage pour organiser vos arrivées de messages, les "
+"trier dans des dossiers, et éliminer les pourriels."
 
-#: lib/VFS/ISOWriter/RealOutputStrategy/direct.php:30
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:110
-#, php-format
-msgid "Could not mkdir '%s'."
-msgstr "Impossible de créer le dossier '%s'"
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Créer une nouvelle papeterie"
 
-#: lib/Horde/Crypt/pgp.php:705
-msgid "Could not obtain public key from the keyserver."
-msgstr "Impossible d'obtenir la clef publique à partir du serveur de clefs."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Créer une papeterie et des formulaires de réponse."
 
-#: lib/Net/SMS/clickatell_http.php:344 lib/Net/SMS/sms2email_http.php:676
+#: templates/acl/acl.inc:95
 #, php-format
-msgid "Could not open %s."
-msgstr "Ouverture de %s impossible."
+msgid "Current access to %s"
+msgstr "Accès courant à %s"
 
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:139
-#, php-format
-msgid "Could not open '%s' for writing."
-msgstr "Ouverture de %s impossible en écriture."
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
+"Personnaliser les comptes pour la récupération de courrier depuis d'autres "
+"comptes."
 
-#: lib/Horde/Maintenance.php:418
-#, php-format
-msgid "Could not open Maintenance_Task module %s"
-msgstr "Impossible d'ouvrir le module Maintenance_Task %s"
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr "Définir comment vous envoyez des messages ."
 
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:70
+#: config/prefs.php.dist:40
 #, php-format
-msgid "Could not open directory '%s'."
-msgstr "Ouverture du dossier %s impossible."
+msgid "Customize tasks to run upon logon to %s."
+msgstr "Définir les tâches à effectuer lors de la connexion à %s."
 
-#: lib/VFS/Object.php:238
-#, php-format
-msgid "Could not read %s."
-msgstr "Lecture de %s impossible. "
+#: templates/mailbox/message_headers.inc:17
+msgid "Dat_e"
+msgstr "_Date"
 
-#: services/resetpassword.php:85
-msgid ""
-"Could not reset the password for the requested user. Some or all of the "
-"details are not correct. Try again or contact your administrator if you need "
-"further help."
-msgstr ""
-"N'a pu remettre à zéro le mot de passe pour l'utilisateur demandé. Certains "
-"(ou tous) les détails ne sont pas corrects. Réessayez ou contactez votre "
-"administrateur pour de l'aide."
+#: message.php:269 thread.php:153
+msgid "Date"
+msgstr "Date"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:309 lib/Horde/IMAP/ACL/rfc2086.php:340
-#: lib/Horde/IMAP/ACL/rfc2086.php:377 lib/Horde/IMAP/ACL/rfc2086.php:383
-#: lib/Horde/IMAP/ACL/rfc2086.php:389
-msgid "Could not retrieve ACL"
-msgstr "Récupération des ACL impossible"
+#: lib/MIME/Viewer/itip.php:750
+msgid "Declined"
+msgstr "Décliné"
+
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr "Décliné : "
 
-#: lib/Net/SMS/sms2email_http.php:273
-#, php-format
-msgid "Could not retrieve address book. %s"
-msgstr "Ne peut récupérer le carnet d'adresses. %s"
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Défaut"
 
-#: lib/Net/SMS/sms2email_http.php:483
-#, php-format
-msgid "Could not retrieve distribution list. %s"
-msgstr "Ne peut récupérer la liste de distribution. %s"
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Champ de recherche par défaut"
+
+#: config/prefs.php.dist:912
+msgid "Default sorting criteria:"
+msgstr "Critère de tri par défaut :"
+
+#: config/prefs.php.dist:922
+msgid "Default sorting direction:"
+msgstr "Ordre de tri par défaut :"
+
+#: lib/MIME/Viewer/itip.php:758
+msgid "Delegated"
+msgstr "Délégué"
+
+#: folders.php:400 templates/contacts/contacts.inc:244
+#: templates/message/navbar_actions.inc:6 templates/pgp/pgp.inc:27
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/fetchmail/manage.inc:68 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+msgid "Delete"
+msgstr "Supprimer"
 
-#: lib/Net/SMS/sms2email_http.php:436
+#: templates/pgp/pgp.inc:27 templates/smime/smime.inc:25
 #, php-format
-msgid "Could not retrieve distribution lists. %s"
-msgstr "Ne peut récupérer les listes de distribution. %s"
+msgid "Delete %s Public Key"
+msgstr "Supprimer la clef publique %s"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:199 lib/Horde/IMAP/ACL/rfc2086.php:219
-#: lib/Horde/IMAP/ACL/rfc2086.php:223
-msgid "Could not retrieve server's capabilities"
-msgstr "Ne peut récupérer les possibilités du serveur"
+#: templates/pgp/pgp.inc:85 templates/smime/smime.inc:79
+msgid "Delete Current Keys"
+msgstr "Supprimer les clefs courantes"
 
-#: admin/setup/config.php:54
-msgid "Could not revert configuration."
-msgstr "Ne peut pas revenir à la configuration précédente."
+#: templates/folders/actions.inc:9
+msgid "Delete Folder(s)"
+msgstr "Détruire le(s) dossier(s)"
 
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:94
-#, php-format
-msgid "Could not rmdir '%s'."
-msgstr "Effacement du dossier %s impossible. "
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "Supprimer les dossiers sélectionnés"
 
-#: admin/setup/scripts.php:71
-#, php-format
-msgid "Could not save %s configuration."
-msgstr "Ne peut pas enregistrer la configuration %s"
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Supprimer la papeterie"
 
-#: admin/setup/index.php:63 admin/setup/scripts.php:57
-msgid "Could not save a backup configuation."
-msgstr "Ne peut pas enregistrer une sauvegarde de la configuration."
+#: folders.php:400
+msgid "Delete Virtual Folder"
+msgstr "Détruire le dossier virtuel"
 
-#: admin/setup/index.php:61
+#: templates/mailbox/header.inc:14
 #, php-format
-msgid "Could not save a backup configuation: %s"
-msgstr "Impossible d'enregistrer une copie de la configuration : %s."
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Supprimer la définition du dossier virtuel pour %s"
 
-#: admin/setup/scripts.php:92
-#, php-format
-msgid "Could not save setup upgrade script to: '%s'."
-msgstr "Ne peut pas enregistrer le script de mise à jour dans: '%s'."
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr "Supprimer les messages ramenés du serveur distant ?"
 
-#: admin/setup/config.php:64
-#, php-format
-msgid "Could not save the backup configuration file %s."
-msgstr "Impossible d'enregistrer une copie du fichier de configuration %s."
+#: lib/MIME/Viewer/itip.php:619
+msgid "Delete from my calendar"
+msgstr "Supprimer de mon agenda"
 
-#: admin/setup/config.php:74
-#, php-format
-msgid ""
-"Could not save the configuration file %s. You can either use one of the "
-"options to save the code back on %s or copy manually the code below to %s."
-msgstr ""
-"Impossible d'enregistrer le fichier de configuration %s. Vous pouvez soit "
-"utiliser une des options pour sauver le code sur %s soit copier manuellement "
-"le code ci-dessous dans %s."
+#: config/prefs.php.dist:368
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Effacer les anciennes pièces jointes liées au début du mois ?"
 
-#: lib/Horde/Auth/ldap.php:120
-msgid "Could not search the LDAP server."
-msgstr "Ne peut pas rechercher le serveur LDAP"
+#: config/prefs.php.dist:350
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "Effacer les dossiers des anciens messages envoyés au début du mois ?"
 
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:86
-#, php-format
-msgid "Could not unlink '%s'."
-msgstr "Suppression de %s impossible."
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Supprimer les pourriels"
 
-#: lib/Net/SMS/sms2email_http.php:218
-#, php-format
-msgid "Could not update contact. %s"
-msgstr "Mise à jour du contact %s impossible. "
+#: mailbox.php:734 message.php:506 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Supprimé"
 
-#: lib/Net/SMS/sms2email_http.php:395
-#, php-format
-msgid "Could not update distribution list. %s"
-msgstr "Ne peut mettre à jour la liste de distribution. %s"
+#: templates/search/main.inc:63
+msgid "Deleted messages"
+msgstr "Messages supprimés"
 
-#: admin/setup/index.php:70
+#: compose.php:570
 #, php-format
-msgid "Could not write configuration for '%s': %s"
-msgstr "Ne peut pas enregistrer la configuration pour '%s' : %s"
+msgid "Deleted the attachment \"%s\"."
+msgstr "Détruire la pièce jointe « %s »."
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:154
-#, php-format
-msgid "Couldn't give user '%s' the following rights for the folder '%s': %s"
-msgstr ""
-"Ne peut attribuer ces droits à l'utilisateur « %s »  sur le dossier « %s » : "
-"%s"
+#: config/prefs.php.dist:79
+msgid "Deleting and Moving Messages"
+msgstr "Déplacement et destruction de messages"
 
-#: lib/Horde/Form.php:1424
-msgid "Counted text"
-msgstr "Texte compté"
-
-#: lib/Horde/Crypt/smime.php:569
-msgid "Country"
-msgstr "Pays"
+#: lib/MIME/Viewer/itip.php:587
+msgid "Deny request"
+msgstr "Refuser la requête"
 
-#: templates/rpcsum/rpcsum.inc:21 templates/rpcsum/rpcsum.inc:97
-#: templates/rpcsum/rpcsum.inc:101
-msgid "Create"
-msgstr "Créer"
+#: lib/MIME/Viewer/itip.php:542
+msgid "Deny request for free/busy information"
+msgstr "Refuser la requête sur les disponibilités"
 
-#: templates/javascript/htmlarea_context_lang.js:67
-msgid "Create a link"
-msgstr "Créer un lien"
-
-#: templates/prefs/identityselect.inc:93
-msgid "Create a new one"
-msgstr "Créer un nouveau"
-
-#: lib/Horde/IMAP/ACL/rfc2086.php:92
-msgid "Create sub folders"
-msgstr "Créer un sous-dossier"
-
-#: admin/perms/edit.php:136 lib/Horde/Perms/UI.php:214
-msgid "Creator Permissions"
-msgstr "Permissions De Créateur"
-
-#: lib/Horde/Form.php:3228
-msgid "Credit card number"
-msgstr "Numéro de carte de crédit"
-
-#: lib/Horde/NLS/GeoIP.php:79 lib/Horde/NLS/countries.php:64
-#: lib/Horde/NLS/tld.php:109
-msgid "Croatia"
-msgstr "Croatie"
-
-#: lib/Horde/NLS/GeoIP.php:68 lib/Horde/NLS/countries.php:65
-#: lib/Horde/NLS/tld.php:64
-msgid "Cuba"
-msgstr "Cuba"
-
-#: lib/Block/moon.php:26
-msgid "Current Phase"
-msgstr "Phase courante"
-
-#: lib/Block/time.php:3 lib/Block/time.php:30
-msgid "Current Time"
-msgstr "Heure actuelle"
-
-#: templates/javascript/htmlarea_context_lang.js:53
-msgid "Current URL is"
-msgstr "L'adresse URL actuelle est"
-
-#: lib/Block/metar.php:25
-msgid "Current Weather"
-msgstr "Observations actuelles"
-
-#: lib/Block/weatherdotcom.php:237
-msgid "Current condition: "
-msgstr "Condition actuelle : "
-
-#: templates/javascript/htmlarea_lang.js:32
-msgid "Current style"
-msgstr "Style courant"
-
-#: templates/javascript/htmlarea_context_lang.js:20
-msgid "Cut"
-msgstr "Couper"
-
-#: templates/javascript/htmlarea_lang.js:35
-msgid "Cut selection"
-msgstr "Couper la sélection"
-
-#: lib/Horde/NLS/GeoIP.php:68 lib/Horde/NLS/countries.php:66
-#: lib/Horde/NLS/tld.php:67
-msgid "Cyprus"
-msgstr "Chypre"
-
-#: lib/Horde/NLS/GeoIP.php:69 lib/Horde/NLS/countries.php:67
-#: lib/Horde/NLS/tld.php:68
-msgid "Czech Republic"
-msgstr "République Tchèque"
-
-#: lib/Horde/UI/VarRenderer/html.php:423 templates/data/date.inc:47
-#: templates/data/date.inc:48 templates/data/date.inc:49
-#: templates/data/date.inc:50
-msgid "DD"
-msgstr "JJ"
-
-#: lib/Horde/Maintenance.php:59
-msgid "Daily"
-msgstr "Chaque jour"
-
-#: admin/datatree.php:65
-msgid "DataTree Browser"
-msgstr "Navigateur de DataTree"
+#: config/prefs.php.dist:921
+msgid "Descending"
+msgstr "Décroissant"
 
-#: lib/Horde/Form.php:2397 lib/Horde/MIME/Viewer/rfc822.php:72
-msgid "Date"
-msgstr "Date"
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
+msgid "Description"
+msgstr "Description"
 
-#: templates/admin/user/approve.inc:13
-msgid "Date Received"
-msgstr "Date de réception"
-
-#: lib/Horde/Form.php:2805
-msgid "Date selection"
-msgstr "Sélection d'une date"
-
-#: lib/Block/weatherdotcom.php:281
-msgid "Day"
-msgstr "Jour"
-
-#: templates/javascript/htmlarea_context_lang.js:35
-msgid "De_lete Column"
-msgstr "Supprimer _la colonne"
-
-#: lib/Horde/UI/VarRenderer/html.php:385 lib/Horde/UI/VarRenderer/html.php:422
-#: templates/javascript/open_calendar.js:76
-msgid "December"
-msgstr "Décembre"
-
-#: templates/javascript/htmlarea_listtype_lang.js:16
-msgid "Decimal numbers"
-msgstr "Nombres décimaux"
-
-#: templates/javascript/htmlarea_lang.js:20
-msgid "Decrease Indent"
-msgstr "Diminuer l'indentation"
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+msgid "Details"
+msgstr "Détails"
 
-#: lib/prefs.php:111 lib/Horde/Prefs/UI.php:187
-msgid "Default"
-msgstr "Défaut"
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "Pièce jointe « %s » non attachée car le fichier était vide."
 
-#: templates/prefs/categorymanagement.inc:47
-#: templates/prefs/categorymanagement.inc:81
-msgid "Default Color"
-msgstr "Couleur par défaut"
-
-#: lib/Horde/Identity.php:91
-msgid "Default Identity"
-msgstr "Identité par défaut"
-
-#: admin/perms/edit.php:119 lib/Horde/Perms/UI.php:196
-msgid "Default Permissions"
-msgstr "Permissions par défaut"
-
-#: lib/Horde/Perms/UI.php:197
-msgid "Default permissions"
-msgstr "Permissions par défaut "
-
-#: lib/Block/fortune.php:33
-msgid "Definitions"
-msgstr "Définitions"
-
-#: admin/groups.php:72 admin/perms/delete.php:46 admin/perms/delete.php:52
-#: lib/Horde/Perms.php:295 lib/Horde/Perms/UI.php:315
-#: lib/Horde/Perms/UI.php:332 templates/shares/edit.inc:36
-#: templates/shares/edit.inc:70 templates/shares/edit.inc:93
-#: templates/shares/edit.inc:116 templates/shares/edit.inc:139
-#: templates/shares/edit.inc:182 templates/rpcsum/rpcsum.inc:73
-#: templates/rpcsum/rpcsum.inc:99 templates/admin/user/list.inc:31
-#: templates/admin/groups/delete.inc:13
-msgid "Delete"
-msgstr "Effacer"
+#: config/prefs.php.dist:665
+msgid "Dim signatures?"
+msgstr "Estomper les signatures ?"
 
-#: admin/groups.php:189 admin/groups.php:217
-msgid "Delete Group"
-msgstr "Supprimer un groupe"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Affichage"
 
-#: lib/Horde/Perms/UI.php:63 lib/Horde/Perms/UI.php:87
-msgid "Delete Permission"
-msgstr "Supprimer une permission"
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr "Afficher une confirmation après l'envoi d'un message ?"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:93
-msgid "Delete and purge messages"
-msgstr "Supprimer et purger les messages"
+#: config/prefs.php.dist:683
+msgid "Display in Body of Message"
+msgstr "Afficher dans le corps du message"
 
-#: templates/javascript/htmlarea_table_lang.js:57
-msgid "Delete cell"
-msgstr "Effacer la cellule"
+#: config/prefs.php.dist:781
+msgid "Display pop-up notification of new mail?"
+msgstr ""
+"Afficher une notification de nouveau courrier dans une boîte surgissante ?"
 
-#: templates/javascript/htmlarea_table_lang.js:63
-msgid "Delete column"
-msgstr "Effacer la colonne"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Afficher le lien « Vider les pourriels » dans la barre de menu ?"
 
-#: admin/templates.php:148
-msgid "Delete existing alternate template"
-msgstr "Supprimer un autre modèle existant"
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Afficher le lien « Vider la corbeille » dans la barre de menu ?"
 
-#: admin/perms/delete.php:50 lib/Horde/Perms/UI.php:314
-#, php-format
-msgid "Delete permissions for '%s'"
-msgstr "Supprimer les permissions pour « %s »"
+#: templates/compose/attachments.inc:11
+msgid "Disposition"
+msgstr "Disposition"
 
-#: lib/Horde/Perms/UI.php:317
-#, php-format
-msgid "Delete permissions for '%s' and any sub-permissions?"
-msgstr "Êtes-vous certain de vouloir effacer « %s » et ses sous-permissions ?"
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr "Ne correspondent pas"
 
-#: templates/javascript/htmlarea_table_lang.js:67
-msgid "Delete row"
-msgstr "Effacer la rangée"
+#: templates/folders/actions.inc:16
+msgid "Do Not Check Folder(s) for New Mail"
+msgstr "Ne pas vérifier les nouveaux messages des dossiers"
 
-#: templates/prefs/deleteidentity.inc:15
-msgid "Delete selected identity"
-msgstr "Supprimer l'identité sélectionnée"
+#: config/prefs.php.dist:941
+msgid "Do not generate a link in the From: column"
+msgstr "Ne pas générer un lien dans la colonne « De »"
 
-#: templates/javascript/htmlarea_context_lang.js:66
-msgid "Delete the current column"
-msgstr "Effacer la colonne actuelle"
+#: lib/IMP.php:1055
+msgid "Do you want to open that folder?"
+msgstr "Voulez-vous ouvrir ce dossier ?"
 
-#: templates/javascript/htmlarea_context_lang.js:62
-msgid "Delete the current row"
-msgstr "Effacer la rangée actuelle"
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Vous n'avez pas de compte ? Enregistrez-vous."
 
-#: admin/perms/delete.php:48
-msgid "Delete this permission and any sub-permissions?"
-msgstr ""
-"Êtes-vous certain de vouloir effacer cette permission et ses sous-"
-"permissions ?"
+#: templates/compose/spelling.inc:126
+msgid "Done"
+msgstr "Terminé"
 
-#: admin/setup/scripts.php:35
+#: lib/MIME/Contents.php:216
 #, php-format
-msgid "Deleted setup upgrade script '%s'."
-msgstr "Script de configuration de mise à jour supprimé '%s'."
+msgid "Download %s in .zip Format"
+msgstr "Télécharger %s au format .zip"
 
-#: lib/Net/SMS/clickatell_http.php:220 lib/Net/SMS/clickatell_http.php:252
-#: lib/Net/SMS/sms2email_http.php:562 lib/Net/SMS/sms2email_http.php:594
-msgid "Delivery time"
-msgstr "Heure de livraison"
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr "Télécharger toutes les pièces jointes (en format .zip)"
 
-#: lib/Horde/NLS/GeoIP.php:69 lib/Horde/NLS/countries.php:68
-#: lib/Horde/NLS/tld.php:71
-msgid "Denmark"
-msgstr "Danemark"
+#: templates/folders/actions.inc:20
+msgid "Download Folder(s)"
+msgstr "Télécharger un(des) dossier(s)"
 
-#: services/problem.php:110 services/problem.php:114 services/problem.php:124
-msgid "Describe the Problem"
-msgstr "Décrire le problème"
+#: templates/folders/actions.inc:21
+msgid "Download Folder(s) [.zip format]"
+msgstr "Télécharger un(des) dossier(s) [format .zip]"
 
-#: lib/Horde/Form.php:938 templates/javascript/htmlarea_table_lang.js:30
-msgid "Description"
-msgstr "Description"
+#: lib/MIME/Contents.php:216
+msgid "Download in .zip Format"
+msgstr "Télécharger au format .zip"
+
+#: mailbox.php:713 message.php:504 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
+msgid "Draft"
+msgstr "Brouillon"
+
+#: folders.php:373
+msgid "Draft folder"
+msgstr "Dossier de brouillons"
+
+#: templates/prefs/folderselect.inc:23
+msgid "Drafts folder:"
+msgstr "Dossier de brouillons :"
+
+#: templates/pgp/pgp.inc:108
+msgid "E-mail Address"
+msgstr "Adresse électronique"
+
+#: lib/Mailbox.php:316
+msgid "END"
+msgstr "FIN"
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr "ERREUR : votre message n'a pas pu être délivré."
 
-#: lib/Horde.php:195
-msgid "Details (also in Horde's logfile):"
-msgstr "Détails (aussi dans le fichier de traces de Horde) :"
-
-#: lib/Horde.php:199
-msgid "Details have been logged for the administrator."
-msgstr "Les détails ont été consignés pour l'administrateur."
-
-#: lib/Block/metar.php:215
-msgid "Dew Point"
-msgstr "Point de rosée"
-
-#: lib/Block/metar.php:292
-msgid "Dew Point for last hour: "
-msgstr "Point de rosée pour la dernière heure : "
-
-#: lib/Block/weatherdotcom.php:194
-msgid "Dew point: "
-msgstr "Point de rosée : "
-
-#: templates/javascript/htmlarea_lang.js:38
-msgid "Direction left to right"
-msgstr "De gauche à droite"
-
-#: templates/javascript/htmlarea_lang.js:39
-msgid "Direction right to left"
-msgstr "De droite à gauche"
-
-#: lib/Block/google.php:39
-msgid "Directory"
-msgstr "Répertoire"
-
-#: lib/Block/metar.php:83
-msgid "Display forecast (TAF)"
-msgstr "Afficher la prévision (TAF)"
-
-#: lib/Horde/Form.php:2815
-msgid "Display format"
-msgstr "Format d'affichage"
-
-#: lib/Horde/MIME/MDN.php:190
-msgid "Disposition Notification"
-msgstr "Avis de livraison"
-
-#: lib/Horde/NLS/GeoIP.php:69 lib/Horde/NLS/countries.php:69
-#: lib/Horde/NLS/tld.php:70
-msgid "Djibouti"
-msgstr "Djibouti"
-
-#: admin/perms/delete.php:46 lib/Horde/Perms/UI.php:315
-msgid "Do not delete"
-msgstr "Ne pas supprimer"
-
-#: services/maintenance.php:24
-msgid "Do not directly access maintenance.php"
-msgstr "Ne pas accéder directement à maintenance.php"
-
-#: templates/data/csvinfo.inc:19 templates/data/tsvinfo.inc:19
-msgid "Does the first row contain the field names? If yes, check this box:"
-msgstr ""
-"Le premier enregistrement contient-il le nom des champs ? Dans "
-"l'affirmative, cochez cette boîte :"
-
-#: lib/Horde/NLS/GeoIP.php:69 lib/Horde/NLS/countries.php:70
-#: lib/Horde/NLS/tld.php:72
-msgid "Dominica"
-msgstr "Dominique"
-
-#: lib/Horde/NLS/GeoIP.php:70 lib/Horde/NLS/countries.php:71
-#: lib/Horde/NLS/tld.php:73
-msgid "Dominican Republic"
-msgstr "République dominicaine"
-
-#: lib/Horde/MIME/Contents.php:837
-msgid "Download"
-msgstr "Télécharger"
-
-#: lib/Horde/MIME/Contents.php:837
-#, php-format
-msgid "Download %s"
-msgstr "Télécharger %s"
-
-#: admin/setup/index.php:165
-msgid "Download generated configuration as PHP script."
-msgstr "Télécharger la configuration générée comme un script PHP"
-
-#: lib/Horde/Form.php:2107
-msgid "Drop down list"
-msgstr "Liste déroulante"
-
-#: lib/Block/fortune.php:34
-msgid "Drugs"
-msgstr "Drogues"
-
-#: lib/Horde/Crypt/pgp.php:399
-msgid "E-Mail"
-msgstr "Courrier électronique"
-
-#: lib/Horde/Notification/Listener/mobile.php:34
-msgid "ERR"
-msgstr "ERR"
-
-#: lib/Horde/NLS/GeoIP.php:70 lib/Horde/NLS/countries.php:72
-#: lib/Horde/NLS/tld.php:75
-msgid "Ecuador"
-msgstr "Équateur"
-
-#: lib/Horde/Perms.php:294 templates/shares/edit.inc:35
-#: templates/shares/edit.inc:69 templates/shares/edit.inc:92
-#: templates/shares/edit.inc:115 templates/shares/edit.inc:138
-#: templates/shares/edit.inc:181 templates/rpcsum/rpcsum.inc:72
-#: templates/portal/edit.inc:22
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Modifier"
 
-#: lib/Horde/Block/UI.php:50 templates/portal/edit.inc:22
-msgid "Edit Block"
-msgstr "Éditer le bloc"
+#: templates/filters/prefs.inc:18
+msgid "Edit Blacklist"
+msgstr "Éditer la liste noire"
 
-#: admin/groups.php:188 admin/groups.php:216
-msgid "Edit Group"
-msgstr "Éditer un groupe"
+#: templates/filters/prefs.inc:13
+msgid "Edit Filters"
+msgstr "Éditer les filtres"
 
-#: lib/Horde/Perms/UI.php:62 lib/Horde/Perms/UI.php:86
-msgid "Edit Permission"
-msgstr "Éditer une permission"
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Modifier la requête"
 
-#: services/shares/edit.php:237
-msgid "Edit Permissions"
-msgstr "Éditer les permissions"
+#: folders.php:401 templates/search/header.inc:17
+msgid "Edit Virtual Folder"
+msgstr "Modifier dossier virtuel"
 
-#: services/shares/edit.php:239
+#: templates/mailbox/header.inc:13
 #, php-format
-msgid "Edit Permissions for %s"
-msgstr "Éditer les permissions pour « %s »"
+msgid "Edit Virtual Folder Definition for %s"
+msgstr "Modifier la définition du dossier virtuel pour %s"
 
-#: templates/prefs/app.inc:5
-msgid "Edit options for:"
-msgstr "Éditer les options pour :"
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr "Éditer la liste blanche"
 
-#: templates/shares/edit.inc:14
-#, php-format
-msgid "Edit permissions for %s"
-msgstr "Éditer les permissions pour « %s »"
+#: templates/filters/prefs.inc:18
+msgid "Edit your blacklist"
+msgstr "Éditer votre liste noire"
 
-#: admin/perms/edit.php:204 lib/Horde/Perms/UI.php:280
-#, php-format
-msgid "Edit permissions for '%s'"
-msgstr "Modifier les permissions pour « %s »"
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Éditer vos règles de filtre"
 
-#: lib/Block/fortune.php:35
-msgid "Education"
-msgstr "Éducation"
+#: config/prefs.php.dist:850
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr "Éditer vos préférences pour accéder à d'autres comptes de courrier."
 
-#: lib/Horde/NLS/GeoIP.php:70 lib/Horde/NLS/countries.php:73
-#: lib/Horde/NLS/tld.php:77
-msgid "Egypt"
-msgstr "Égypte"
+#: templates/filters/prefs.inc:23
+msgid "Edit your whitelist"
+msgstr "Éditer votre liste blanche"
 
-#: lib/Horde/NLS/GeoIP.php:107 lib/Horde/NLS/countries.php:74
-#: lib/Horde/NLS/tld.php:217
-msgid "El Salvador"
-msgstr "Salvador"
+#: templates/contacts/contacts.inc:239
+msgid "Email Address"
+msgstr "Adresse électronique"
 
-#: templates/javascript/htmlarea_context_lang.js:42
-msgid "Element..."
-msgstr "Élément..."
+#: lib/Message.php:693
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "Effacement de tous les messages de %s."
 
-#: templates/javascript/htmlarea_lang.js:109
-msgid "Em"
-msgstr "Em"
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Effacement de tous les messages du dossier virtuel de corbeille."
 
-#: lib/Horde/Form.php:1869 lib/Horde/MIME/Viewer/vcard.php:224
-msgid "Email"
-msgstr "Adresse électronique"
+#: templates/folders/actions.inc:22
+msgid "Empty Folder(s)"
+msgstr "Vider le(s) dossier(s)"
 
-#: lib/Horde/Crypt/smime.php:565 templates/admin/user/update.inc:40
-#: templates/admin/groups/edit.inc:12
-msgid "Email Address"
-msgstr "Adresse électronique"
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "Vider les dossiers sélectionnés"
 
-#: lib/Horde/Form.php:1963
-msgid "Email addresses must match."
-msgstr "Les adresses électroniques doivent correspondre."
-
-#: lib/Horde/Form.php:1989
-msgid "Email with confirmation"
-msgstr "Courriel avec confirmation"
-
-#: lib/Horde/UI/VarRenderer/html.php:280
-msgid "Emoticons"
-msgstr "Émoticônes"
-
-#: lib/Net/SMS/clickatell_http.php:301
-msgid "Empty message."
-msgstr "Message vide."
-
-#: lib/Horde/Auth/ldap.php:128
-msgid "Empty result."
-msgstr "Résultat vide."
-
-#: lib/Horde/SQL/Keywords.php:113
-msgid "Empty search terms"
-msgstr "Termes de recherche vide"
-
-#: lib/Horde/Form.php:2596 lib/Horde/Form.php:2809
-msgid "End year"
-msgstr "Fin de l'année"
-
-#: templates/javascript/htmlarea_lang.js:29
-msgid "Enlarge Editor"
-msgstr "Agrandir l'éditeur"
-
-#: templates/javascript/htmlarea_anselimage_lang.js:22
-#: templates/javascript/htmlarea_lang.js:119
-msgid "Enter the image URL here"
-msgstr "Inscrivez l'adresse URL de l'image ici"
-
-#: po/translation.php:1163
-#, php-format
-msgid "Entries: %d total, %d up-to-date, %d new, %d changed, %d unknown"
-msgstr ""
-"Entrées : %d au total, %d à jour, %d nouvelles, %d modifiées, %d inconnues"
-
-#: lib/Horde/NLS/GeoIP.php:76 lib/Horde/NLS/countries.php:75
-#: lib/Horde/NLS/tld.php:99
-msgid "Equatorial Guinea"
-msgstr "Guinée équatoriale"
-
-#: lib/Horde/NLS/GeoIP.php:71 lib/Horde/NLS/countries.php:76
-#: lib/Horde/NLS/tld.php:79
-msgid "Eritrea"
-msgstr "Érythrée"
-
-#: lib/Block/metar.php:36 lib/Block/weatherdotcom.php:45
-#: lib/Block/weatherdotcom.php:55
-#: lib/Horde/Notification/Listener/status.php:27 services/portal/index.php:79
-msgid "Error"
-msgstr "Erreur"
+#: templates/mailbox/actions.inc:39
+msgid "Empty Trash folder"
+msgstr "Vider la corbeille"
 
-#: lib/Net/SMS/clickatell_http.php:304
-msgid "Error with email message."
-msgstr "Erreur avec le message."
-
-#: lib/VFS/ISOWriter/RealInputStrategy/copy.php:142
-#, php-format
-msgid "Error writing '%s'."
-msgstr "Erreur lors de l'enregistrement %s"
-
-#: po/translation.php:413 po/translation.php:522 po/translation.php:1377
-#: po/translation.php:1438 po/translation.php:1501
-msgid "Error: "
-msgstr "Erreur : "
-
-#: lib/Horde/NLS/GeoIP.php:70 lib/Horde/NLS/countries.php:77
-#: lib/Horde/NLS/tld.php:76
-msgid "Estonia"
-msgstr "Estonie"
-
-#: lib/Horde/NLS/GeoIP.php:71 lib/Horde/NLS/countries.php:78
-#: lib/Horde/NLS/tld.php:81
-msgid "Ethiopia"
-msgstr "Éthiopie"
-
-#: lib/Block/fortune.php:36
-msgid "Ethnic"
-msgstr "Ethnique"
-
-#: lib/Horde/NLS/GeoIP.php:55
-msgid "Europe"
-msgstr "Europe"
-
-#: lib/Horde/Maintenance.php:60
-msgid "Every Login"
-msgstr "À chaque connexion"
-
-#: templates/data/datemap.inc:28
-msgid "Example values:"
-msgstr "Exemple de valeurs :"
-
-#: admin/cmdshell.php:50 admin/phpshell.php:81 admin/sqlshell.php:128
-msgid "Execute"
-msgstr "Exécuter"
-
-#: po/translation.php:299 po/translation.php:320 po/translation.php:362
-#: po/translation.php:441 po/translation.php:541 po/translation.php:601
-#: po/translation.php:702 po/translation.php:737 po/translation.php:798
-#: po/translation.php:875 po/translation.php:994 po/translation.php:1016
-msgid "Executing:"
-msgstr "Exécution de :"
+#: lib/IMP.php:951
+msgid "Empty _Spam"
+msgstr "Vider le _spam"
 
-#: lib/Horde/Block/Layout.php:394
-msgid "Expand"
-msgstr "Développer"
+#: lib/IMP.php:944
+msgid "Empty _Trash"
+msgstr "Vider la _corbeille"
 
-#: templates/portal/sidebar.inc:31
-msgid "Expand Sidebar"
-msgstr "Déplier la barre de côté"
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr "Activer les fonctionnalités de PGP ?"
 
-#: lib/Horde/SQL/Keywords.php:168
-msgid "Expected ')'"
-msgstr "« ) » attendue"
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr "Activer les fonctionnalités de S/MIME ?"
 
-#: lib/Horde/SQL/Keywords.php:175
-msgid "Expected bare word or quoted search term"
-msgstr "Un seul mot ou expression entre guillemets attendus"
+#: config/prefs.php.dist:800
+msgid "Enable message previews?"
+msgstr "Activer la pré-visualisation des messages ?"
 
-#: lib/Horde/Crypt/pgp.php:398
-msgid "Expiration Date"
-msgstr "Date d'expiration"
+#: templates/compose/compose.inc:437
+msgid "Encr_yption Options"
+msgstr "O_ptions de chiffrement"
 
-#: lib/Horde/Crypt/smime.php:676
-msgid "Exponent"
-msgstr "Représentant"
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Chiffré"
 
-#: po/translation.php:272
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
+msgid "End"
+msgstr "Fin"
+
+#: lib/Compose.php:395
+msgid "End forwarded message"
+msgstr "Fin du message transféré"
+
+#: lib/Compose.php:352
+msgid "End message"
+msgstr "Fin du message"
+
+#: lib/Compose.php:350
 #, php-format
-msgid "Extracting from %s... "
-msgstr "Extraction à partir de %s... "
+msgid "End message from %s"
+msgstr "Fin du message de %s"
+
+#: templates/pgp/pgp.inc:77 templates/smime/smime.inc:72
+msgid "Enter Passphrase"
+msgstr "Entrez la phrase secrète"
 
-#: templates/javascript/htmlarea_table_lang.js:31
-msgid "FG Color"
-msgstr "Couleur d'avant-plan"
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Entrez le nom de votre nouveau dossier de pourriels"
 
-#: admin/setup/index.php:180
-msgid "FTP upload of setup"
-msgstr "Téléchargement vers le serveur de la configuration par FTP"
+#: templates/prefs/folderselect.inc:9
+msgid "Enter the name for your new drafts folder"
+msgstr "Entrez le nom du nouveau dossier de brouillons"
 
-#: lib/Horde/Prefs/sql.php:216
-msgid "Failed retrieving preferences."
-msgstr "Lecture des préférences impossible."
+#: templates/prefs/sentmailselect.inc:23
+msgid "Enter the name for your new sent mail folder"
+msgstr "Entrez le nom du nouveau dossier de messages envoyés"
 
-#: lib/Horde/Auth/ldap.php:100
-msgid "Failed to connect to LDAP server."
-msgstr "Échec de la connexion au serveur LDAP."
+#: templates/prefs/trashselect.inc:9
+msgid "Enter the name for your new trash folder"
+msgstr "Entrez le nom de votre nouvelle corbeille"
 
-#: lib/Horde/Auth/smb.php:98
-msgid "Failed to connect to SMB server."
-msgstr "Échec de la connexion au serveur SMB."
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "Message complet"
 
-#: lib/VFS/ftp.php:603
+#: compose.php:1172 message.php:194 thread.php:71
 #, php-format
-msgid "Failed to copy from \"%s\"."
-msgstr "Échec de la copie depuis « %s »."
+msgid "Entry \"%s\" was successfully added to the address book"
+msgstr "Ajout réussi de « %s » dans le carnet d'adresses"
 
-#: lib/VFS/ftp.php:608
+#: templates/pgp/pgp.inc:21 templates/smime/smime.inc:18
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
+msgid "Error"
+msgstr "Erreur"
+
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Erreur de connexion au serveur IMAP. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
-msgid "Failed to copy to \"%s\"."
-msgstr "Échec de la copie vers  « %s »."
+msgid "Error sending reply: %s."
+msgstr "Erreur lors de l'envoi de la réponse : %s."
+
+#: lib/MIME/Viewer/itip.php:102
+msgid "Event successfully deleted."
+msgstr "L'événement a été effacé avec succès."
+
+#: config/prefs.php.dist:771
+msgid "Every 15 minutes"
+msgstr "Toutes les 15 minutes"
+
+#: config/prefs.php.dist:768
+msgid "Every 30 seconds"
+msgstr "Toutes les 30 secondes"
+
+#: config/prefs.php.dist:770
+msgid "Every 5 minutes"
+msgstr "Toutes les 5 minutes"
 
-#: lib/Horde/Auth/sasl.php:87
-msgid "Failed to create new SASL connection."
-msgstr "Impossible de créer une nouvelle connexion SASL"
+#: config/prefs.php.dist:772
+msgid "Every half hour"
+msgstr "Toutes les demi-heures"
 
-#: lib/VFS/ftp.php:641
-#, php-format
-msgid "Failed to move to \"%s\"."
-msgstr "Échec du déplacement vers « %s »."
+#: config/prefs.php.dist:769
+msgid "Every minute"
+msgstr "Toutes les minutes"
 
-#: lib/Block/weatherdotcom_strings.php:16
-msgid "Fair"
-msgstr "Beau"
+#: folders.php:438
+msgid "Expand"
+msgstr "Développer"
 
-#: lib/Horde/NLS/GeoIP.php:72 lib/Horde/NLS/countries.php:79
-#: lib/Horde/NLS/tld.php:84
-msgid "Falkland Islands (Malvinas)"
-msgstr "Îles Falkland (Malouines)"
+#: templates/folders/actions.inc:39
+msgid "Expand All"
+msgstr "Développer tout"
 
-#: lib/Horde/NLS/GeoIP.php:73 lib/Horde/NLS/countries.php:80
-#: lib/Horde/NLS/tld.php:86
-msgid "Faroe Islands"
-msgstr "Îles Féroé"
+#: templates/folders/actions.inc:39
+msgid "Expand All Folders"
+msgstr "Développer tous les dossiers"
 
-#: lib/Horde/CLI.php:238
-msgid "Fatal Error:"
-msgstr "Erreur fatale :"
+#: folders.php:438
+msgid "Expand Folder"
+msgstr "Développer le dossier"
 
-#: lib/Horde/MIME/Viewer/vcard.php:187
-msgid "Fax"
-msgstr "Fax"
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
+msgid "Expand Names"
+msgstr "Développer les noms"
 
-#: lib/Horde/UI/VarRenderer/html.php:375 lib/Horde/UI/VarRenderer/html.php:412
-#: templates/javascript/open_calendar.js:66
-msgid "February"
-msgstr "Février"
+#: config/prefs.php.dist:1052
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+"Développer les noms dans la fenêtre de rédaction automatiquement en arrière-"
+"plan ?"
 
-#: lib/Block/metar.php:218
-msgid "Feels Like"
-msgstr "Température ressentie"
+#: config/prefs.php.dist:969
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr "Développer la liste des dossiers par défaut ?"
 
-#: lib/Block/weatherdotcom.php:198
-msgid "Feels like: "
-msgstr "Température ressentie : "
+#: templates/compose/compose.inc:142 templates/compose/compose.inc:192
+#: templates/compose/compose.inc:243 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
+msgid "Expanding"
+msgstr "Développement... "
 
-#: lib/Block/weatherdotcom_strings.php:17
-msgid "Few Showers"
-msgstr "Quelques averses"
+#: lib/IMP.php:962 lib/IMP.php:964
+msgid "F_etch Mail"
+msgstr "Récupération du courri_er"
 
-#: lib/Block/weatherdotcom_strings.php:18
-msgid "Few Snow Showers"
-msgstr "Quelques chutes de neige"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+msgid "Fetch Mail"
+msgstr "Récupération du courrier"
 
-#: lib/Horde/Form.php:1944
-msgid "Field matrix"
-msgstr "Matrice des champs"
+#: config/prefs.php.dist:858
+msgid "Fetch Mail in a separate window?"
+msgstr "Récupération du courrier dans une fenêtre séparée ?"
 
-#: lib/Horde/NLS/GeoIP.php:72 lib/Horde/NLS/countries.php:81
-#: lib/Horde/NLS/tld.php:83
-msgid "Fiji"
-msgstr "Fidji"
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "Rapatrier les messages lors de la connexion ?"
 
-#: lib/Horde/MIME/Viewer/rar.php:60 lib/Horde/MIME/Viewer/tgz.php:82
-#: lib/Horde/MIME/Viewer/zip.php:64
+#: lib/Fetchmail.php:291
 #, php-format
-msgid "File Count: %s file"
-msgstr "Nombre de fichiers : %s"
+msgid "Fetched %d messages from %s"
+msgstr "%d messages rapatriés à partir de %s"
 
-#: lib/Horde/MIME/Viewer/rar.php:60 lib/Horde/MIME/Viewer/tgz.php:82
-#: lib/Horde/MIME/Viewer/zip.php:64
+#: lib/Fetchmail.php:289
 #, php-format
-msgid "File Count: %s files"
-msgstr "Nombre de fichiers : %s"
+msgid "Fetched 1 message from %s"
+msgstr "1 message rapatrié à partir de %s"
 
-#: lib/Horde/MIME/Viewer/rar.php:63 lib/Horde/MIME/Viewer/tgz.php:85
-#: lib/Horde/MIME/Viewer/zip.php:67
-msgid "File Name"
-msgstr "Nom du fichier"
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
+msgid "Fetchmail: "
+msgstr "Récupération du courrier : "
 
-#: lib/Horde/Form.php:2993
-msgid "File selection"
-msgstr "Choix de fichier"
+#: lib/Fetchmail.php:293
+msgid "Fetchmail: no new messages."
+msgstr "Fetchmail : pas de nouveaux messages."
 
-#: lib/Horde/Form.php:1491
-msgid "File upload"
-msgstr "Téléchargement de fichier"
+#: lib/IMP.php:968
+msgid "Fi_lters"
+msgstr "Fi_ltres"
 
-#: lib/Horde/Browser.php:853
-msgid "File uploads not supported."
-msgstr "L'envoi de fichiers n'est pas pris en compte."
+#: templates/compose/compose.inc:494 templates/compose/attachments.js:40
+msgid "File"
+msgstr "Fichier"
 
-#: lib/Horde/NLS/GeoIP.php:71 lib/Horde/NLS/countries.php:82
-#: lib/Horde/NLS/tld.php:82
-msgid "Finland"
-msgstr "Finlande"
+#: templates/filters/prefs.inc:31
+msgid "Filter Options"
+msgstr "Options de filtrage"
 
-#: lib/Block/moon.php:171
-msgid "First Half"
-msgstr "Première demie"
+#: templates/filters/prefs.inc:9
+msgid "Filter Settings"
+msgstr "Règles de filtres"
 
-#: lib/Block/moon.php:74 lib/Block/moon.php:76
-msgid "First Quarter"
-msgstr "Premier quartier"
+#: config/prefs.php.dist:588
+msgid "Filter message content for profanity?"
+msgstr "Filtrer le contenu des messages ?"
 
-#: lib/Horde/UI/VarRenderer/html.php:239
-msgid "Fix ratio"
-msgstr "Fixer le ratio"
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr "Le support du filtrage est désactivé sur ce système."
 
-#: lib/Horde/UI/VarRenderer/html.php:214
-msgid "Flip"
-msgstr "Flip"
+#: config/prefs.php.dist:127
+msgid "Filters"
+msgstr "Filtres"
 
-#: templates/javascript/htmlarea_table_lang.js:32
-msgid "Float"
-msgstr "Flottant"
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr "Filtres NON actifs"
 
-#: lib/Block/weatherdotcom_strings.php:19
-msgid "Fog"
-msgstr "Brouillard"
-
-#: lib/VFS/musql.php:107 lib/VFS/sql.php:158
+#: lib/Filter.php:131
 #, php-format
-msgid "Folder %s does not exist"
-msgstr "Dossier %s inexistant."
-
-#: templates/javascript/htmlarea_lang.js:22
-msgid "Font Color"
-msgstr "Couleur de police"
-
-#: lib/Block/fortune.php:37
-msgid "Food"
-msgstr "Nourriture"
-
-#: templates/javascript/htmlarea_anselimage_lang.js:26
-#: templates/javascript/htmlarea_lang.js:123
-msgid "For browsers that don't support images"
-msgstr "Pour les navigateurs ne supportant pas les images"
+msgid "Filters: %s management page"
+msgstr "Filtres : page de gestion %s"
 
-#: lib/Block/metar.php:332
-msgid "Forecast (TAF)"
-msgstr "Prévision (TAF)"
+#: templates/contacts/contacts.inc:186
+msgid "Find"
+msgstr "Chercher"
 
-#: lib/Block/weatherdotcom.php:78
-msgid ""
-"Forecast Days (note that the returned forecast returns both day and night; a "
-"large number here could result in a wide block)"
-msgstr ""
-"Jours de prévision (notez que les prévisions fournies donnent le jour et la "
-"nuit; un grand nombre ici peut faire un bloc très large"
+#: config/prefs.php.dist:894
+msgid "First Mailbox Page"
+msgstr "Première page de la boîte"
 
-#: templates/login/login.inc:95
-msgid "Forgot your password?"
-msgstr "Oublié votre mot de passe?"
+#: mailbox.php:330
+msgid "First Page"
+msgstr "Première page"
 
-#: lib/Block/fortune.php:21
-msgid "Fortune"
-msgstr "Fortune"
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+msgid "Fo_rward"
+msgstr "T_ransfert"
 
-#: lib/Block/fortune.php:99
-msgid "Fortune type"
-msgstr "Fortune"
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Action sur les dossiers - Confirmation"
 
-#: lib/Block/fortune.php:38
-msgid "Fortunes"
-msgstr "Fortunes"
+#: folders.php:289 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
+msgid "Folder Navigator"
+msgstr "Explorateur des dossiers"
 
-#: lib/Block/fortune.php:39
-msgid "Fortunes 2"
-msgstr "Fortunes 2"
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "Sommaire du dossier"
 
-#: po/translation.php:1458
-#, php-format
-msgid "Found applications: %s"
-msgstr "Applications trouvées : %s"
+#: acl.php:23
+msgid "Folder sharing is not enabled."
+msgstr "Le partage des dossiers n'est pas activé."
 
-#: po/translation.php:1452
-msgid "Found directories:"
-msgstr "Répertoires trouvés :"
+#: folders.php:47
+msgid "Folder use is not enabled."
+msgstr "L'utilisation des dossiers n'est pas activé."
 
-#: templates/javascript/open_calendar.js:60
-msgid "Fr"
-msgstr "Ve"
+#: config/prefs.php.dist:958
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+"Le format de la date dans la vue de boîte aux lettres pour des messages "
+"datés d'aujourd'hui"
 
-#: templates/javascript/htmlarea_table_lang.js:33
-msgid "Frames"
-msgstr "Cadres"
+#: compose.php:820 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
+msgid "Forward"
+msgstr "Transfert"
 
-#: lib/Horde/NLS/GeoIP.php:73 lib/Horde/NLS/countries.php:83
-#: lib/Horde/NLS/tld.php:87
-msgid "France"
-msgstr "France"
+#: compose.php:805
+msgid "Forward:"
+msgstr "Transfert :"
 
-#: lib/Horde/NLS/GeoIP.php:73
-msgid "France, Metropolitan"
-msgstr "France métropolitaine"
+#: lib/Compose.php:380
+msgid "Forwarded message"
+msgstr "Message transféré"
 
-#: lib/Horde/NLS/GeoIP.php:74 lib/Horde/NLS/countries.php:84
-#: lib/Horde/NLS/tld.php:91
-msgid "French Guiana"
-msgstr "Guyane française"
+#: lib/Compose.php:378
+#, php-format
+msgid "Forwarded message from %s"
+msgstr "Message transféré de %s"
 
-#: lib/Horde/NLS/GeoIP.php:98 lib/Horde/NLS/countries.php:85
-#: lib/Horde/NLS/tld.php:184
-msgid "French Polynesia"
-msgstr "Polynésie française"
+#: lib/MIME/Viewer/itip.php:402
+msgid "Free/Busy Request Response"
+msgstr "Réponse à la requête sur les disponibilités"
 
-#: lib/Horde/NLS/GeoIP.php:109 lib/Horde/NLS/countries.php:86
-#: lib/Horde/NLS/tld.php:222
-msgid "French Southern Territories"
-msgstr "Terres australes et antarctiques françaises"
+#: templates/mailbox/message_headers.inc:27
+msgid "Fro_m"
+msgstr "D_e"
 
-#: lib/Horde/MIME/Viewer/rfc822.php:74
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
 msgstr "De"
 
-#: lib/Block/weatherdotcom.php:215
-msgid "From the "
-msgstr "Du "
-
-#: templates/problem/problem.inc:48
-msgid "Full Description"
-msgstr "Description complète"
-
-#: lib/Block/moon.php:82 lib/Block/moon.php:181
-msgid "Full Moon"
-msgstr "Pleine lune"
-
-#: templates/admin/user/update.inc:39
-msgid "Full Name"
-msgstr "Nom complet"
-
-#: po/translation.php:657
-msgid "Fuzzy"
-msgstr "Approximatif"
-
-#: lib/Horde/NLS/GeoIP.php:73 lib/Horde/NLS/countries.php:87
-#: lib/Horde/NLS/tld.php:88
-msgid "Gabon"
-msgstr "Gabon"
-
-#: templates/javascript/htmlarea_anselimage_lang.js:30
-msgid "Gallery to take image from"
-msgstr "Album d'origine de l'image"
-
-#: templates/javascript/htmlarea_anselimage_lang.js:29
-msgid "Gallery:"
-msgstr "Album :"
-
-#: lib/Horde/NLS/GeoIP.php:75 lib/Horde/NLS/countries.php:88
-#: lib/Horde/NLS/tld.php:96
-msgid "Gambia"
-msgstr "Gambie"
-
-#: admin/setup/config.php:42
-#, php-format
-msgid "Generate %s Configuration"
-msgstr "Générer la configuration de %s"
-
-#: templates/admin/setup/config.html:10
-msgid "Generated Code"
-msgstr "Code généré"
-
-#: po/translation.php:479
-#, php-format
-msgid "Generating status for module %s..."
-msgstr "Génération de l'état du module %s..."
-
-#: lib/Horde/NLS/GeoIP.php:74 lib/Horde/NLS/countries.php:89
-#: lib/Horde/NLS/tld.php:90
-msgid "Georgia"
-msgstr "Géorgie"
-
-#: lib/Horde/NLS/GeoIP.php:69 lib/Horde/NLS/countries.php:90
-#: lib/Horde/NLS/tld.php:69
-msgid "Germany"
-msgstr "Allemagne"
-
-#: po/translation.php:1371
-msgid "Getopt Error: "
-msgstr "Erreur Getopt : "
-
-#: lib/Horde/NLS/GeoIP.php:75 lib/Horde/NLS/countries.php:91
-#: lib/Horde/NLS/tld.php:93
-msgid "Ghana"
-msgstr "Ghana"
-
-#: lib/Horde/NLS/GeoIP.php:75 lib/Horde/NLS/countries.php:92
-#: lib/Horde/NLS/tld.php:94
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: lib/Horde/Crypt/smime.php:575
-msgid "Given Name"
-msgstr "Prénom"
+#: config/prefs.php.dist:907
+msgid "From Address"
+msgstr "De l'adresse"
+
+#: compose.php:817 compose.php:821
+msgid "Fwd:"
+msgstr "Trans.:"
+
+#: compose.php:1311
+msgid "Fwd: "
+msgstr "Trans.: "
+
+#: compose.php:1313
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Trans.: %u messages transférés"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "Options générales"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "Ne recevoir que les nouveaux messages ? (IMAP seulement)"
 
-#: templates/prefs/app.inc:12
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
 msgid "Go"
 msgstr "Aller"
 
-#: lib/Block/fortune.php:40
-msgid "Goedel"
-msgstr "Goedel"
-
-#: lib/Block/google.php:3 lib/Block/google.php:21 lib/Block/google.php:41
-msgid "Google Search"
-msgstr "Recherche Google"
-
-#: lib/Horde/UI/VarRenderer/html.php:220
-msgid "Grayscale"
-msgstr "Niveau de gris"
-
-#: lib/Horde/NLS/GeoIP.php:76 lib/Horde/NLS/countries.php:93
-#: lib/Horde/NLS/tld.php:100
-msgid "Greece"
-msgstr "Grèce"
-
-#: lib/Horde/NLS/GeoIP.php:75 lib/Horde/NLS/countries.php:94
-#: lib/Horde/NLS/tld.php:95
-msgid "Greenland"
-msgstr "Groënland"
-
-#: lib/Horde/NLS/GeoIP.php:74 lib/Horde/NLS/countries.php:95
-#: lib/Horde/NLS/tld.php:89
-msgid "Grenada"
-msgstr "Grenade"
-
-#: admin/groups.php:170
-msgid "Group Administration"
-msgstr "Administration des groupes"
-
-#: lib/Horde/Group.php:58
-msgid "Group names must be non-empty"
-msgstr "Les noms de groupe ne peuvent pas être vides"
-
-#: admin/perms/edit.php:201 lib/Horde/Perms/UI.php:277
-msgid "Group permissions"
-msgstr "Permissions des groupes"
-
-#: admin/perms/edit.php:176 lib/Block/google.php:38 lib/Horde/Perms/UI.php:250
-#: templates/shares/edit.inc:177
-msgid "Groups"
-msgstr "Groupes"
-
-#: lib/Horde/NLS/GeoIP.php:76 lib/Horde/NLS/countries.php:96
-#: lib/Horde/NLS/tld.php:98
-msgid "Guadeloupe"
-msgstr "Guadeloupe"
-
-#: lib/Horde/NLS/GeoIP.php:77 lib/Horde/NLS/countries.php:97
-#: lib/Horde/NLS/tld.php:103
-msgid "Guam"
-msgstr "Guam"
-
-#: lib/Horde/NLS/GeoIP.php:77 lib/Horde/NLS/countries.php:98
-#: lib/Horde/NLS/tld.php:102
-msgid "Guatemala"
-msgstr "Guatemala"
-
-#: lib/Horde/NLS/tld.php:92
-msgid "Guernsey"
-msgstr "Guernesey"
-
-#: admin/perms/edit.php:127 lib/Horde/Perms/UI.php:205
-#: templates/shares/edit.inc:88
-msgid "Guest Permissions"
-msgstr "Permissions des invités"
-
-#: admin/perms/edit.php:128 lib/Horde/Perms/UI.php:206
-msgid "Guest permissions"
-msgstr "Permissions des invités"
-
-#: lib/Horde/NLS/GeoIP.php:75 lib/Horde/NLS/countries.php:99
-#: lib/Horde/NLS/tld.php:97
-msgid "Guinea"
-msgstr "Guinée"
-
-#: lib/Horde/NLS/GeoIP.php:78 lib/Horde/NLS/countries.php:100
-#: lib/Horde/NLS/tld.php:104
-msgid "Guinea-Bissau"
-msgstr "Guinée-Bissau"
-
-#: lib/Horde/NLS/GeoIP.php:78 lib/Horde/NLS/countries.php:101
-#: lib/Horde/NLS/tld.php:105
-msgid "Guyana"
-msgstr "Guyana"
-
-#: lib/Horde/UI/VarRenderer/html.php:331
-msgid "HH"
-msgstr "HH"
+#: thread.php:136
+msgid "Go to Message"
+msgstr "Aller au message"
+
+#: lib/IMP.php:502
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Aller à la fiche du carnet d'adresses de « %s »"
+
+#: templates/acl/acl.inc:136
+msgid "Grant access"
+msgstr "Accorder l'accès"
+
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:424
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr "ICI"
 
-#: lib/Horde/Form.php:960
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: templates/javascript/htmlarea_table_lang.js:85
-msgid "HTMLArea cowardly refuses to delete the last cell in row."
-msgstr "HTMLArea refuse bêtement de supprimer la dernière cellule de la rangée"
-
-#: templates/javascript/htmlarea_table_lang.js:86
-msgid "HTMLArea cowardly refuses to delete the last column in table."
-msgstr "HTMLArea refuse bêtement de supprimer la dernière colonne du tableau"
-
-#: templates/javascript/htmlarea_table_lang.js:87
-msgid "HTMLArea cowardly refuses to delete the last row in table."
-msgstr "HTMLArea refuse bêtement de supprimer la dernière rangée du tableau"
-
-#: lib/Horde/Auth/http.php:157
-msgid "HTTP Authentication not found."
-msgstr "Authentification HTTP non trouvée."
-
-#: lib/Horde/NLS/GeoIP.php:80 lib/Horde/NLS/countries.php:102
-#: lib/Horde/NLS/tld.php:110
-msgid "Haiti"
-msgstr "Haïti"
-
-#: lib/Horde/Crypt/pgp.php:399
-msgid "Hash-Algorithm"
-msgstr "Algorithme de hachage"
-
-#: lib/Block/weatherdotcom_strings.php:20
-msgid "Haze"
-msgstr "Brume sèche"
-
-#: lib/Horde/Form.php:919 lib/Horde/Form.php:2930
-msgid "Header"
-msgstr "En-tête"
-
-#: lib/Horde/NLS/GeoIP.php:79 lib/Horde/NLS/countries.php:103
-#: lib/Horde/NLS/tld.php:107
-msgid "Heard Island and McDonald Islands"
-msgstr "Îles Heard et McDonald"
-
-#: templates/javascript/htmlarea_table_lang.js:34
-msgid "Height"
-msgstr "Hauteur"
-
-#: lib/Horde/Help.php:178 lib/Horde/Help.php:185 services/help/index.php:17
-#: templates/help/index.inc:3
-msgid "Help"
-msgstr "Aide"
-
-#: templates/javascript/htmlarea_lang.js:31
-msgid "Help using editor"
-msgstr "Aide pour l'éditeur"
-
-#: lib/Horde/Form.php:1376
-msgid "Helper"
-msgstr "Aide"
-
-#: po/translation.php:95
-msgid ""
-"Helper application to create and maintain translations for the Horde\n"
-"framework and its applications.\n"
-"For an introduction read the file README in this directory."
-msgstr ""
-"Assistant pour créer et maintenir les traductions pour Horde et ses\n"
-"différents modules.\n"
-"Veuillez lire le fichier README de ce répertoire en guise d'introduction."
-
-#: lib/Block/moon.php:29
-msgid "Hemisphere"
-msgstr "Hémisphère"
-
-#: templates/data/csvinfo.inc:17 templates/data/tsvinfo.inc:17
-msgid "Here is the beginning of the file:"
-msgstr "Voici le début du fichier:"
+#: compose.php:260
+msgid "HTML Version of Message"
+msgstr "Version HTML du message"
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr "En-têtes"
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr "Voici le message que vous étiez en train de rédiger :"
+
+#: config/prefs.php.dist:656
+msgid "Hidden"
+msgstr "Caché"
+
+#: config/prefs.php.dist:655
+msgid "Hidden in Thread View"
+msgstr "Caché dans la vue avec les enfilades"
+
+#: mailbox.php:352
+msgid "Hide Deleted"
+msgstr "Cacher les messages effacés"
+
+#: folders.php:284
+msgid "Hide Unsubscribed"
+msgstr "Souscrits seulement"
 
-#: lib/Block/weatherdotcom_strings.php:65
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr "Haute"
 
-#: lib/Horde/History.php:321
-msgid "History entry names must be non-empty"
-msgstr "Les noms de l'entrée historique ne peuvent pas être vides"
+#: mailbox.php:718 message.php:304 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr "Priorité élevée"
 
-#: templates/portal/menu.inc:6 templates/admin/common-header.inc:4
-msgid "Ho_me"
-msgstr "A_ccueil"
+#: templates/compose/compose.inc:291
+msgid "Highest"
+msgstr "La plus élevée"
 
-#: lib/Horde/NLS/GeoIP.php:114 lib/Horde/NLS/countries.php:104
-#: lib/Horde/NLS/tld.php:243
-msgid "Holy See (Vatican City State)"
-msgstr "Cité du Vatican"
+#: config/prefs.php.dist:685
+msgid "How do you want to display attachments?"
+msgstr "Comment voulez-vous afficher les pièces jointes ?"
 
-#: lib/Horde.php:1426
-msgid "Home"
-msgstr "Accueil"
+#: config/prefs.php.dist:504
+msgid "How to attribute quoted lines in a reply"
+msgstr "Comment attribuer les citations dans une réponse"
 
-#: lib/Horde/MIME/Viewer/vcard.php:122 lib/Horde/MIME/Viewer/vcard.php:155
-msgid "Home Address"
-msgstr "Adresse personnelle"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr "IMAP"
 
-#: lib/Horde/MIME/Viewer/vcard.php:190
-msgid "Home Phone"
-msgstr "Téléphone personnel"
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr "IMAP (détecter automatiquement les protocoles)"
 
-#: lib/Horde/NLS/GeoIP.php:79 lib/Horde/NLS/countries.php:105
-#: lib/Horde/NLS/tld.php:108
-msgid "Honduras"
-msgstr "Honduras"
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "Le serveur IMAP a fermé la connexion. Le serveur a répondu : %s"
 
-#: lib/Horde/NLS/GeoIP.php:78 lib/Horde/NLS/countries.php:106
-#: lib/Horde/NLS/tld.php:106
-msgid "Hong Kong"
-msgstr "Hong Kong"
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr "IMAP sur SSL"
 
-#: po/translation.php:1329
-msgid "Horde translation generator"
-msgstr "Générateur de traductions de Horde"
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP sur SSL (certificat maison) "
 
-#: lib/Horde/Kolab.php:420
-#, php-format
-msgid "Horde/Kolab: Invalid %s XML data encountered in message %s"
-msgstr "Horde/Kolab : données XML %s invalides retrouvées dans le message %s"
+#: templates/login/login.inc:166
+msgid "IMAP over SSL (self-signed)"
+msgstr "IMAP sur SSL (certificat maison)"
 
-#: lib/Horde/Kolab.php:277
-#, php-format
-msgid "Horde/Kolab: No message corresponds to object %s"
-msgstr "Horde/Kolab : Aucun message ne correspond au sujet %s"
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "Le serveur IMAP a fermé la connexion."
 
-#: lib/Horde/Kolab.php:413
-#, php-format
-msgid "Horde/Kolab: No object of type %s found in message %s"
-msgstr "Horde/Kolab : Pas d'objet de type %s trouvé dans le message %s"
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr "IMAP, sans TLS"
 
-#: lib/Horde/Kolab.php:1208
-#, php-format
-msgid "Horde/Kolab: Successfully removed %s \"%s\""
-msgstr "Horde/Kolab : Enlevé %s « %s » avec succès"
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr "Serveurs de courrier IMAP/POP3"
 
-#: lib/Horde/Kolab.php:1154
-#, php-format
-msgid "Horde/Kolab: Successfully synchronised %s \"%s\""
-msgstr "Horde/Kolab : Synchronisé %s « %s » avec succès"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Pour utiliser SSL ou TLS, vous devez avoir chargé l'extension OpenSSL de PHP."
 
-#: lib/Horde/Kolab.php:223
-msgid "Horde/Kolab: The integration engine requires the 'domxml' PHP extension"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr ""
-"Horde/Kolab : Le moteur d'intégration nécessite l'extension 'domxml' de PHP"
+"Si vous continuez, tous les messages de ce(s) dossier(s) seront perdus !"
 
-#: lib/Horde/Kolab.php:481
-#, php-format
-msgid "Horde/Kolab: Unable to create new XML tree for object %s"
-msgstr "Horde/Kolab : Impossible de créer un nouvel arbre XML pour l'objet %s"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignorer"
 
-#: lib/Horde/Kolab.php:1205
-#, php-format
-msgid "Horde/Kolab: Unable to remove %s \"%s\": %s"
-msgstr "Horde/Kolab : impossible d'enlever %s « %s » : %s"
+#: templates/compose/spelling.inc:83
+msgid "Ignore All"
+msgstr "Ignorer tout"
 
-#: lib/Horde/Kolab.php:452
-#, php-format
-msgid "Horde/Kolab: Unable to retrieve MIME ID for the part of type %s"
-msgstr ""
-"Horde/Kolab : impossible de récupérer l'identifiant MIME pour la partie de "
-"type %s"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Image"
 
-#: lib/Horde/Kolab.php:1151
-#, php-format
-msgid "Horde/Kolab: Unable to synchronise %s \"%s\": %s"
-msgstr "Horde/Kolab : impossible de synchroniser %s « %s » : %s"
+#: templates/folders/import.inc:20
+msgid "Import"
+msgstr "Importer"
 
-#: lib/Horde/Kolab.php:1282
-#, php-format
-msgid "Horde/Kolab: Unable to synchronise shares: %s"
-msgstr "Horde/Kolab : impossible de synchroniser les partages : %s"
+#: templates/pgp/import_key.inc:65 templates/smime/import_key.inc:85
+msgid "Import Key"
+msgstr "Importer la clef"
 
-#: lib/Horde/Kolab.php:318
-#, php-format
-msgid "Horde/Kolab: Unknown share \"%s\""
-msgstr "Horde/Kolab : partage inconnu « %s »"
+#: templates/pgp/pgp.inc:139
+msgid "Import Keypair"
+msgstr "Importer la paire de clefs"
 
-#: templates/javascript/htmlarea_lang.js:24
-msgid "Horizontal Rule"
-msgstr "Ligne horizontale"
+#: templates/folders/actions.inc:27
+msgid "Import Messages"
+msgstr "Importer les messages"
 
-#: templates/javascript/htmlarea_lang.js:82
-msgid "Horizontal padding"
-msgstr "Remplissage horizontal"
+#: pgp.php:41
+msgid "Import PGP Key"
+msgstr "Importer la clef PGP"
 
-#: templates/javascript/htmlarea_lang.js:81
-msgid "Horizontal:"
-msgstr "Horizontal :"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Importer le certificat personnel"
 
-#: templates/javascript/htmlarea_context_lang.js:50
-msgid "How did you get here? (Please report!)"
-msgstr "Comment êtes-vous arrivé ici ? (SVP rapportez-le !)"
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr "Importer la clef privée personnelle (PGP)"
 
-#: templates/javascript/htmlarea_table_lang.js:35
-msgid "How many columns would you like to merge?"
-msgstr "Combien de colonnes voulez-vous fusionner ?"
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr "Importer la clef publique personnelle (PGP)"
 
-#: templates/data/csvinfo.inc:28
-msgid "How many fields (columns) are there?"
-msgstr "Combien de champs (colonnes) y a-t-il ?"
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr "Importer les certificats S/MIME personnels"
 
-#: templates/javascript/htmlarea_table_lang.js:36
-msgid "How many rows would you like to merge?"
-msgstr "Combien de rangées voulez-vous fusionner ?"
+#: templates/pgp/pgp.inc:42 templates/smime/smime.inc:40
+msgid "Import Public Key"
+msgstr "Importer la clef publique"
 
-#: lib/Block/metar.php:228
-msgid "Humidity"
-msgstr "Humidité"
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr "Importer la clef publique PGP"
 
-#: lib/Block/weatherdotcom.php:221
-msgid "Humidity: "
-msgstr "Humidité : "
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr "Importer la clef publique S/MIME"
 
-#: lib/Block/fortune.php:41
-msgid "Humorists"
-msgstr "Humoristes"
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr "Importer la clef S/MIME"
 
-#: lib/Horde/NLS/GeoIP.php:80 lib/Horde/NLS/countries.php:107
-#: lib/Horde/NLS/tld.php:111
-msgid "Hungary"
-msgstr "Hongrie"
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr "Importer un fichier mbox"
 
-#: lib/Horde/Auth/cyrsql.php:232 lib/Horde/Auth/cyrus.php:172
+#: templates/folders/import.inc:16
 #, php-format
-msgid "IMAP mailbox creation failed: %s"
-msgstr "Échec lors de la création de la boîte IMAP : %s"
+msgid "Import mbox file %s into folder %s."
+msgstr "Importer un fichier mbox %s dans le répertoire %s."
 
-#: lib/Horde/Auth/cyrsql.php:292 lib/Horde/Auth/cyrus.php:214
-#, php-format
-msgid "IMAP mailbox deletion failed: %s"
-msgstr "Échec lors de la suppression de la boîte IMAP : %s"
+#: mailbox.php:728 message.php:505 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
+msgid "Important"
+msgstr "Haute importance"
 
-#: lib/Horde/Auth/cyrsql.php:239 lib/Horde/Auth/cyrus.php:179
-#, php-format
-msgid "IMAP mailbox quota creation failed: %s"
-msgstr "Échec lors de la création du quota sur la boîte IMAP : %s"
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Messages importants"
 
-#: lib/Horde/Form.php:1320
-msgid "IP Address"
-msgstr "Adresse IP"
+#: folders.php:151
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr "%d messages importés à partir de %s."
 
-#: lib/Horde/Auth/ipbasic.php:77
-msgid "IP Address not available."
-msgstr "Adresse IP non disponible."
+#: lib/MIME/Viewer/itip.php:766
+msgid "In Process"
+msgstr "En cours"
 
-#: lib/Horde/Auth/ipbasic.php:89
-msgid "IP Address not within allowed CIDR block."
-msgstr "Adresse IP hors du bloc CIDR alloué."
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/IMP.php:832
+#: lib/Folder.php:85 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
+msgid "Inbox"
+msgstr "Boîte de réception"
 
-#: lib/Net/SMS/clickatell_http.php:294
-msgid "IP lockdown violation."
-msgstr "Violation de blocage IP"
+#: config/prefs.php.dist:492
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Inclure un bref rappel des en-têtes dans les réponses ?"
 
-#: templates/javascript/htmlarea_context_lang.js:29
-msgid "I_nsert Row Before"
-msgstr "I_nsérer rangée avant"
+#: config/prefs.php.dist:487
+msgid "Include original message in a reply?"
+msgstr "Inclure le message d'origine dans les réponses ?"
 
-#: lib/Horde/NLS/GeoIP.php:82 lib/Horde/NLS/countries.php:108
-#: lib/Horde/NLS/tld.php:120
-msgid "Iceland"
-msgstr "Islande"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+msgid "Info"
+msgstr "Info"
 
-#: util/icon_browser.php:49
+#: templates/pgp/pgp.inc:27 templates/smime/smime.inc:25
 #, php-format
-msgid "Icons for %s"
-msgstr "Icônes pour %s"
+msgid "Information on %s Public Key"
+msgstr "Information sur la clef publique %s"
 
-#: lib/Horde/MIME/Contents.php:588
-#, php-format
-msgid "If it is not displayed correctly, %s to open it in a new window."
-msgstr ""
-"Si l'affichage n'est pas correct,  %s pour l'ouvrir dans une nouvelle "
-"fenêtre."
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr "Information sur la clef privée personnelle"
 
-#: lib/Horde/UI/VarRenderer/html.php:158
-msgid ""
-"If you see this message but no image, the image you want to upload can't be "
-"displayed by your browser."
-msgstr ""
-"Si vous voyez ce message mais aucune image, l'image que vous voulez envoyer "
-"ne peut être affichée par votre navigateur."
+#: templates/pgp/pgp.inc:72 templates/smime/smime.inc:68
+msgid "Information on Personal Public Key"
+msgstr "Information sur la clef publique personnelle"
 
-#: templates/javascript/htmlarea_anselimage_lang.js:28
-#: templates/javascript/htmlarea_lang.js:125
-msgid "Image Preview:"
-msgstr "Aperçu de l'image :"
+#: templates/compose/compose.inc:499 templates/compose/attachments.js:56
+#: templates/compose/attachments.inc:15
+msgid "Inline"
+msgstr "Incorporée"
 
-#: templates/javascript/htmlarea_table_lang.js:37
-msgid "Image URL"
-msgstr "Adresse URL de l'image"
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr "Insérer le certificat ici"
 
-#: templates/javascript/htmlarea_anselimage_lang.js:21
-#: templates/javascript/htmlarea_lang.js:118
-msgid "Image URL:"
-msgstr "Adresse URL de l'image :"
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Insérer la clef privée personnelle (PGP) ici"
 
-#: templates/javascript/htmlarea_anselimage_lang.js:32
-msgid "Image from gallery"
-msgstr "Image de l'album"
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Insérer la clef publique personnelle (PGP) ici"
 
-#: templates/javascript/htmlarea_anselimage_lang.js:31
-msgid "Image from gallery:"
-msgstr "Image de l'album :"
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr "Insérer la clef publique PGP ici"
 
-#: lib/Horde/Form.php:1765
-msgid "Image upload"
-msgstr "Téléchargement d'images"
+#: lib/MIME/Viewer/itip.php:413
+msgid "Invalid Action selected for this component."
+msgstr "Sélection d'une action invalide pour ce composant."
 
-#: lib/Block/google.php:37
-msgid "Images"
-msgstr "Images"
+#: mailbox.php:574 mailbox.php:621
+msgid "Invalid Address"
+msgstr "Adresse invalide"
 
-#: templates/data/csvinfo.inc:10 templates/data/csvmap.inc:57
-#: templates/data/datemap.inc:10 templates/data/tsvinfo.inc:10
-#, php-format
-msgid "Import, Step %d"
-msgstr "Importation, étape %d"
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr "Boîte distante invalide"
 
-#: templates/data/datemap.inc:20
+#: compose.php:158
 #, php-format
-msgid "Imported field: %s"
-msgstr "Champ importé : %s"
+msgid "Invalid character in e-mail address: %s."
+msgstr "Caractère invalide dans l'adresse de courriel : %s."
+
+#: smime.php:78 pgp.php:16
+msgid "Invalid key"
+msgstr "Clef invalide"
 
-#: templates/data/csvmap.inc:73
-msgid "Imported fields:"
-msgstr "Champs importés :"
+#: pgp.php:192
+msgid "Invalid personal PGP private key."
+msgstr "Clef privée PGP personnelle invalide."
 
-#: templates/javascript/htmlarea_context_lang.js:30
-msgid "In_sert Row After"
-msgstr "In_sérer rangée après"
+#: pgp.php:167
+msgid "Invalid personal PGP public key."
+msgstr "Clef publique PGP personnelle invalide."
 
-#: lib/Horde/Compress/zip.php:134
-msgid "Incorrect action code given."
-msgstr "Code d'action incorrect."
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr "Inverser"
 
-#: lib/Net/SMS/sms2email_http.php:631
-msgid "Incorrect username and/or password."
-msgstr "Nom d'utilisateur et/ou votre mot de passe incorrect."
+#: templates/compose/compose.inc:591
+msgid "KB"
+msgstr "Ko"
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr "Longueur de la clef"
 
-#: services/resetpassword.php:51
+#: templates/pgp/pgp.inc:137
 msgid ""
-"Incorrect username or alternate address. Try again or contact your "
-"administrator if you need further help."
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
 msgstr ""
-"Nom d'utilisateur ou adresse alternative incorrect.  Réessayez ou contactez "
-"votre administrateur système pour de l'aide."
+"Générer la clef peut être assez long. Continuer la génération de la clef ?"
 
-#: templates/javascript/htmlarea_lang.js:21
-msgid "Increase Indent"
-msgstr "Augmenter l'indentation"
+#: templates/pgp/pgp.inc:37 templates/smime/smime.inc:35
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Importation de la clef non disponible. On ne peut pas déposer de fichier sur "
+"ce serveur."
 
-#: lib/Horde/NLS/GeoIP.php:81 lib/Horde/NLS/countries.php:109
-#: lib/Horde/NLS/tld.php:116
-msgid "India"
-msgstr "Inde"
+#: templates/pgp/pgp.inc:39 templates/smime/smime.inc:37
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Importation de la clef non disponible. Vous n'avez pas défini de carnet "
+"d'adresses où ajouter vos contacts."
 
-#: admin/perms/edit.php:141 templates/shares/edit.inc:134
-msgid "Individual Users"
-msgstr "Utilisateurs individuels"
+#: pgp.php:314
+msgid "Key successfully sent to the public keyserver."
+msgstr "La clef a bien été envoyée au serveur de clefs public."
 
-#: lib/Horde/NLS/GeoIP.php:80 lib/Horde/NLS/countries.php:110
-#: lib/Horde/NLS/tld.php:112
-msgid "Indonesia"
-msgstr "Indonésie"
+#: templates/login/login.inc:215
+msgid "Language"
+msgstr "Langue"
 
-#: lib/Horde/MIME/Viewer/rfc822.php:67
-msgid "Info"
-msgstr "Info"
+#: config/prefs.php.dist:895
+msgid "Last Mailbox Page"
+msgstr "Dernière page de la boîte"
 
-#: po/translation.php:582
-#, php-format
-msgid "Initializing module %s... "
-msgstr "Initialisation du module %s... "
+#: mailbox.php:343
+msgid "Last Page"
+msgstr "Dernière page"
 
-#: templates/javascript/htmlarea_context_lang.js:34
-msgid "Insert C_olumn After"
-msgstr "Insérer c_olonne après"
-
-#: templates/javascript/htmlarea_anselimage_lang.js:20
-#: templates/javascript/htmlarea_lang.js:117
-msgid "Insert Image"
-msgstr "Insérer image"
-
-#: templates/javascript/htmlarea_lang.js:27
-#: templates/javascript/htmlarea_lang.js:100
-msgid "Insert Table"
-msgstr "Insérer un tableau"
-
-#: templates/javascript/htmlarea_lang.js:25
-msgid "Insert Web Link"
-msgstr "Insérer un lien web"
-
-#: templates/javascript/htmlarea_context_lang.js:33
-msgid "Insert _Column Before"
-msgstr "Insérer _colonne avant"
-
-#: templates/javascript/htmlarea_context_lang.js:65
-msgid "Insert a new column after the current one"
-msgstr "Insérer une nouvelle colonne après la colonne actuelle"
-
-#: templates/javascript/htmlarea_context_lang.js:64
-msgid "Insert a new column before the current one"
-msgstr "Insérer une nouvelle colonne avant la colonne actuelle"
-
-#: templates/javascript/htmlarea_context_lang.js:61
-msgid "Insert a new row after the current one"
-msgstr "Insérer une nouvelle rangée après la rangée actuelle"
-
-#: templates/javascript/htmlarea_context_lang.js:60
-msgid "Insert a new row before the current one"
-msgstr "Insérer une nouvelle rangée avant la rangée actuelle"
-
-#: templates/javascript/htmlarea_context_lang.js:69
-msgid "Insert a paragraph after the current node"
-msgstr "Insérer un paragraphe après le noeud actuel"
-
-#: templates/javascript/htmlarea_context_lang.js:68
-msgid "Insert a paragraph before the current node"
-msgstr "Insérer un paragraphe avant le noeud actuel"
-
-#: admin/templates.php:150
-msgid "Insert alternate template"
-msgstr "Insérer un autre modèle"
-
-#: templates/javascript/htmlarea_table_lang.js:58
-msgid "Insert cell after"
-msgstr "Insérer cellule après"
-
-#: templates/javascript/htmlarea_table_lang.js:59
-msgid "Insert cell before"
-msgstr "Insérer cellule avant"
-
-#: templates/javascript/htmlarea_table_lang.js:64
-msgid "Insert column after"
-msgstr "Insérer colonne après"
-
-#: templates/javascript/htmlarea_table_lang.js:65
-msgid "Insert column before"
-msgstr "Insérer colonne avant"
-
-#: lib/Horde/IMAP/ACL/rfc2086.php:90
-msgid "Insert messages"
-msgstr "Insérer les messages"
-
-#: templates/javascript/htmlarea_context_lang.js:44
-msgid "Insert paragraph after"
-msgstr "Insérer paragraphe après"
-
-#: templates/javascript/htmlarea_context_lang.js:43
-msgid "Insert paragraph before"
-msgstr "Insérer paragraphe avant"
-
-#: templates/javascript/htmlarea_table_lang.js:69
-msgid "Insert row after"
-msgstr "Insérer rangée après"
-
-#: templates/javascript/htmlarea_table_lang.js:68
-msgid "Insert row before"
-msgstr "Insérer rangée avant"
-
-#: templates/javascript/htmlarea_lang.js:26
-msgid "Insert/Modify Image"
-msgstr "Insérer/Modifier une image"
-
-#: templates/javascript/htmlarea_lang.js:89
-msgid "Insert/Modify Link"
-msgstr "Insérer/Modifier un lien web"
-
-#: lib/Net/SMS/sms2email_http.php:642
-msgid "Insufficient credit to send to the distribution list."
-msgstr "Crédit insuffisant pour envoyer à la liste de distribution."
-
-#: lib/Net/SMS/sms2email_http.php:634
-msgid "Insufficient credit."
-msgstr "Crédit insuffisant."
-
-#: lib/Horde/Form.php:1075
-msgid "Integer"
-msgstr "Entier"
-
-#: lib/Horde/Form.php:1133
-msgid "Integer list"
-msgstr "Liste complète"
-
-#: lib/Net/SMS/clickatell_http.php:296
-msgid "Invalid UDH. (User Data Header)."
-msgstr "UDH (User Data Header) invalide"
-
-#: admin/setup/config.php:34
-msgid "Invalid application."
-msgstr "Application invalide."
-
-#: lib/Net/SMS/clickatell_http.php:311
-msgid "Invalid batch ID."
-msgstr "Groupe ID invalide."
-
-#: lib/Horde/Form.php:2087 lib/Horde/Form.php:2158 lib/Horde/Form.php:2232
-#: lib/Horde/Form.php:2297
-msgid "Invalid data submitted."
-msgstr "Envoi de données invalides."
-
-#: lib/Net/SMS/clickatell_http.php:299
-msgid "Invalid destination address."
-msgstr "Adresse de destination invalide."
-
-#: lib/Horde/Compress/dbx.php:81 lib/Horde/Compress/dbx.php:100
-#: lib/Horde/Compress/dbx.php:220
-msgid "Invalid file format"
-msgstr "Format de fichier invalide."
-
-#: lib/Net/SMS/clickatell_http.php:306
-msgid "Invalid msg_type."
-msgstr "«msg_type» invalide."
-
-#: lib/Net/SMS/clickatell_http.php:302
-msgid "Invalid or missing api_id."
-msgstr "«api_id» invalide ou manquant."
-
-#: lib/Net/SMS/clickatell_http.php:295
-msgid "Invalid or missing parameters."
-msgstr "Paramètres invalides ou manquants."
-
-#: admin/perms/addchild.php:43
-msgid "Invalid parent permission."
-msgstr "Permission invalide."
-
-#: lib/Net/SMS/clickatell_http.php:305
-msgid "Invalid protocol."
-msgstr "Protocole invalide."
-
-#: lib/Net/SMS/sms2email_http.php:92
-#, php-format
-msgid "Invalid recipient: '%s'"
-msgstr "Destinataire invalide : '%s'"
-
-#: lib/Horde/Kolab.php:1043 lib/Horde/Kolab.php:1220
-msgid "Invalid share object"
-msgstr "Objet de partage invalide"
-
-#: lib/Net/SMS/clickatell_http.php:300
-msgid "Invalid source address."
-msgstr "Adresse source invalide."
-
-#: lib/Net/SMS/clickatell_http.php:310
-msgid "Invalid unicode data."
-msgstr "Donnée Unicode invalide."
-
-#: lib/Horde/NLS/GeoIP.php:82 lib/Horde/NLS/countries.php:111
-#: lib/Horde/NLS/tld.php:119
-msgid "Iran, Islamic Republic of"
-msgstr "République islamique d'Iran"
-
-#: lib/Horde/NLS/GeoIP.php:81 lib/Horde/NLS/countries.php:112
-#: lib/Horde/NLS/tld.php:118
-msgid "Iraq"
-msgstr "Irak"
-
-#: lib/Horde/NLS/GeoIP.php:80 lib/Horde/NLS/countries.php:113
-#: lib/Horde/NLS/tld.php:113
-msgid "Ireland"
-msgstr "Irlande"
-
-#: lib/Horde/NLS/tld.php:115
-msgid "Isle of Man"
-msgstr "Île de Man"
-
-#: lib/Block/weatherdotcom_strings.php:21
-msgid "Isolated T-Storms"
-msgstr "Tempêtes isolées"
-
-#: lib/Horde/NLS/GeoIP.php:80 lib/Horde/NLS/countries.php:114
-#: lib/Horde/NLS/tld.php:114
-msgid "Israel"
-msgstr "Israël"
-
-#: lib/Horde/Crypt/smime.php:625
-msgid "Issuer"
-msgstr "Émetteur"
-
-#: templates/javascript/htmlarea_lang.js:9
-msgid "Italic"
-msgstr "Italique"
-
-#: lib/Horde/NLS/GeoIP.php:82 lib/Horde/NLS/countries.php:115
-#: lib/Horde/NLS/tld.php:121
-msgid "Italy"
-msgstr "Italie"
-
-#: lib/Horde/NLS/GeoIP.php:82 lib/Horde/NLS/countries.php:116
-#: lib/Horde/NLS/tld.php:123
-msgid "Jamaica"
-msgstr "Jamaïque"
-
-#: lib/Horde/UI/VarRenderer/html.php:374 lib/Horde/UI/VarRenderer/html.php:411
-#: templates/javascript/open_calendar.js:65
-msgid "January"
-msgstr "Janvier"
-
-#: lib/Horde/NLS/GeoIP.php:83 lib/Horde/NLS/countries.php:117
-#: lib/Horde/NLS/tld.php:125
-msgid "Japan"
-msgstr "Japon"
-
-#: lib/Horde/NLS/tld.php:122
-msgid "Jersey"
-msgstr "Jersey"
-
-#: lib/Horde/NLS/GeoIP.php:83 lib/Horde/NLS/countries.php:118
-#: lib/Horde/NLS/tld.php:124
-msgid "Jordan"
-msgstr "Jordanie"
-
-#: lib/Horde/UI/VarRenderer/html.php:380 lib/Horde/UI/VarRenderer/html.php:417
-#: templates/javascript/open_calendar.js:71
-msgid "July"
-msgstr "Juillet"
-
-#: lib/Horde/UI/VarRenderer/html.php:379 lib/Horde/UI/VarRenderer/html.php:416
-#: templates/javascript/open_calendar.js:70
-msgid "June"
-msgstr "Juin"
-
-#: templates/javascript/htmlarea_table_lang.js:38
-msgid "Justify"
-msgstr "Justifier"
-
-#: templates/javascript/htmlarea_context_lang.js:37
-#: templates/javascript/htmlarea_lang.js:15
-msgid "Justify Center"
-msgstr "Centrer"
-
-#: templates/javascript/htmlarea_context_lang.js:39
-#: templates/javascript/htmlarea_lang.js:17
-msgid "Justify Full"
-msgstr "Justifier"
-
-#: templates/javascript/htmlarea_context_lang.js:36
-#: templates/javascript/htmlarea_lang.js:14
-msgid "Justify Left"
-msgstr "Aligner à gauche"
-
-#: templates/javascript/htmlarea_context_lang.js:38
-#: templates/javascript/htmlarea_lang.js:16
-msgid "Justify Right"
-msgstr "Aligner à droite"
-
-#: lib/Horde/NLS/GeoIP.php:86 lib/Horde/NLS/countries.php:119
-#: lib/Horde/NLS/tld.php:136
-msgid "Kazakhstan"
-msgstr "Kazakhstan"
-
-#: lib/Horde/UI/VarRenderer/html.php:246
-msgid "Keep original?"
-msgstr "Garder l'originale ?"
-
-#: lib/Horde/NLS/GeoIP.php:83 lib/Horde/NLS/countries.php:120
-#: lib/Horde/NLS/tld.php:126
-msgid "Kenya"
-msgstr "Kenya"
-
-#: lib/Horde/Auth/krb5.php:85
-msgid "Kerberos server rejected authentication."
-msgstr "Le serveur Kerberos a rejeté l'authentification."
-
-#: lib/Block/fortune.php:42
-msgid "Kernel Newbies"
-msgstr "Débutants du noyau"
-
-#: lib/Horde/Crypt/pgp.php:397
-msgid "Key Creation"
-msgstr "Création de clef"
-
-#: lib/Horde/Crypt/pgp.php:400
-msgid "Key Fingerprint"
-msgstr "Empreinte de la clef"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "Lier les pièces jointes ?"
 
-#: lib/Horde/Crypt/pgp.php:398
-msgid "Key Length"
-msgstr "Longueur de la clef"
+#: attachment.php:34 lib/Compose.php:1084
+msgid "Linked attachments are forbidden."
+msgstr "Les pièces jointes liées ne sont pas permises."
 
-#: lib/Horde/Crypt/pgp.php:397
-msgid "Key Type"
-msgstr "Type de clef"
-
-#: lib/Horde/Crypt/smime.php:598
-msgid "Key Usage"
-msgstr "Utilisation de la clef"
-
-#: lib/Horde/Crypt/pgp.php:726
-msgid "Key already exists on the public keyserver."
-msgstr "La clef se trouve déjà sur le serveur de clefs public."
-
-#: lib/Block/fortune.php:43
-msgid "Kids"
-msgstr "Enfants"
-
-#: lib/Horde/NLS/GeoIP.php:84 lib/Horde/NLS/countries.php:121
-#: lib/Horde/NLS/tld.php:129
-msgid "Kiribati"
-msgstr "Kiribati"
-
-#: lib/Horde/NLS/GeoIP.php:85 lib/Horde/NLS/countries.php:122
-#: lib/Horde/NLS/tld.php:132
-msgid "Korea, Democratic People's Republic of"
-msgstr "Corée du Nord"
-
-#: lib/Horde/NLS/GeoIP.php:85 lib/Horde/NLS/countries.php:123
-#: lib/Horde/NLS/tld.php:133
-msgid "Korea, Republic of"
-msgstr "Corée du Sud"
-
-#: lib/Horde/NLS/GeoIP.php:86 lib/Horde/NLS/countries.php:124
-#: lib/Horde/NLS/tld.php:134
-msgid "Kuwait"
-msgstr "Koweït"
-
-#: lib/Horde/NLS/GeoIP.php:83 lib/Horde/NLS/countries.php:125
-#: lib/Horde/NLS/tld.php:127
-msgid "Kyrgyzstan"
-msgstr "Kirghizistan"
-
-#: templates/portal/menu.inc:8
-msgid "La_yout"
-msgstr "Pré_sentation"
+#: lib/Compose.php:1100
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Les liens expireront le %s"
 
-#: templates/login/login.inc:76 po/translation.php:657
-msgid "Language"
-msgstr "Langue"
+#: config/prefs.php.dist:1071
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+"Lister tous les contacts au chargement de l'écran des contacts ? (si "
+"désactivé, vous ne verrez que les contacts explicitement demandés)"
 
-#: lib/Horde/NLS/GeoIP.php:87 lib/Horde/NLS/countries.php:126
-#: lib/Horde/NLS/tld.php:137
-msgid "Lao People's Democratic Republic"
-msgstr "Laos"
-
-#: lib/Block/moon.php:174
-msgid "Last Half"
-msgstr "Dernière demie"
-
-#: lib/Block/moon.php:88 lib/Block/moon.php:90
-msgid "Last Quarter"
-msgstr "Dernier quartier"
-
-#: lib/Block/metar.php:149
-msgid "Last Updated:"
-msgstr "Dernière mise à jour :"
-
-#: lib/Horde/Auth.php:666
-#, php-format
-msgid "Last login: %s"
-msgstr "Dernière connexion : %s"
-
-#: lib/Horde/Auth.php:668
-#, php-format
-msgid "Last login: %s from %s"
-msgstr "Dernière connexion : %s à partir de %s"
-
-#: lib/Horde/Auth.php:663
-msgid "Last login: Never"
-msgstr "Dernière connexion : jamais"
-
-#: lib/Horde/NLS/GeoIP.php:89 lib/Horde/NLS/countries.php:127
-#: lib/Horde/NLS/tld.php:146
-msgid "Latvia"
-msgstr "Lettonie"
-
-#: lib/Block/fortune.php:44
-msgid "Law"
-msgstr "Loi"
-
-#: templates/javascript/htmlarea_lang.js:79
-#: templates/javascript/htmlarea_table_lang.js:39
-msgid "Layout"
-msgstr "Présentation"
-
-#: templates/javascript/htmlarea_lang.js:86
-msgid "Leave empty for no border"
-msgstr "Laisser vide pour ne pas avoir de bordure"
-
-#: lib/Horde/NLS/GeoIP.php:87 lib/Horde/NLS/countries.php:128
-#: lib/Horde/NLS/tld.php:138
-msgid "Lebanon"
-msgstr "Liban"
-
-#: templates/javascript/htmlarea_lang.js:69
-#: templates/javascript/htmlarea_table_lang.js:40
-msgid "Left"
-msgstr "Gauche"
-
-#: lib/Horde/Form.php:3117
-msgid "Left header"
-msgstr "Entête gauche"
-
-#: lib/Horde/Form.php:3113
-msgid "Left values"
-msgstr "Valeurs de gauche"
-
-#: lib/Horde/NLS/GeoIP.php:88 lib/Horde/NLS/countries.php:129
-#: lib/Horde/NLS/tld.php:143
-msgid "Lesotho"
-msgstr "Lesotho"
-
-#: lib/Horde/NLS/GeoIP.php:88 lib/Horde/NLS/countries.php:130
-#: lib/Horde/NLS/tld.php:142
-msgid "Liberia"
-msgstr "Libéria"
-
-#: lib/Horde/NLS/GeoIP.php:89 lib/Horde/NLS/countries.php:131
-#: lib/Horde/NLS/tld.php:147
-msgid "Libyan Arab Jamahiriya"
-msgstr "Libye"
-
-#: lib/Horde/NLS/GeoIP.php:88 lib/Horde/NLS/countries.php:132
-#: lib/Horde/NLS/tld.php:140
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: lib/Block/weatherdotcom_strings.php:22
-msgid "Light Drizzle"
-msgstr "Bruine légère"
-
-#: lib/Block/weatherdotcom_strings.php:23
-msgid "Light Rain"
-msgstr "Pluie légère"
-
-#: lib/Block/weatherdotcom_strings.php:24
-msgid "Light Rain Early"
-msgstr "Pluie légère tôt dans la journée"
-
-#: lib/Block/weatherdotcom_strings.php:25
-msgid "Light Rain Late"
-msgstr "Pluie légère tard"
-
-#: lib/Block/weatherdotcom_strings.php:26
-msgid "Light Rain Shower"
-msgstr "Averses légères"
-
-#: lib/Block/weatherdotcom_strings.php:27
-msgid "Light Rain with Thunder"
-msgstr "Pluie légère avec tonnerre"
-
-#: lib/Block/weatherdotcom_strings.php:28
-msgid "Light Snow"
-msgstr "Neige intermittente"
-
-#: lib/Block/weatherdotcom_strings.php:29
-msgid "Light Snow Shower"
-msgstr "Averse de neige légère"
-
-#: lib/Block/fortune.php:45
-msgid "Limerick"
-msgstr "Rimes"
-
-#: lib/Horde/Form.php:1818
-msgid "Link"
-msgstr "Lien"
-
-#: templates/javascript/htmlarea_context_lang.js:56
-msgid "Link points to:"
-msgstr "Le lien pointe vers :"
-
-#: lib/Horde/Form.php:1875
-msgid "Link the email address to the compose page when displaying"
-msgstr ""
-"Lie l'adresse de courriel à la page de composition du message en l'affichant"
-
-#: lib/Horde/Text/Filter/html2text.php:183
-msgid "Links"
-msgstr "Liens"
-
-#: lib/Block/fortune.php:46
-msgid "Linux Cookie"
-msgstr "Biscuit Linux"
-
-#: lib/Horde/IMAP/ACL/rfc2086.php:86
-msgid "List - user can see the folder"
-msgstr "Liste - utilisateur peut voir le dossier"
-
-#: admin/sqlshell.php:130
-msgid "List Databases"
-msgstr "Liste des bases de données"
-
-#: services/help/index.php:50
-msgid "List Help Topics"
-msgstr "Index de l'aide"
-
-#: admin/sqlshell.php:129
-msgid "List Tables"
-msgstr "Afficher les tables"
-
-#: lib/Horde/MIME/Headers.php:594
-msgid "List-Archive"
-msgstr "Archives de la liste"
-
-#: lib/Horde/MIME/Headers.php:589
-msgid "List-Help"
-msgstr "Aide de la liste"
-
-#: lib/Horde/MIME/Headers.php:596
-msgid "List-Id"
-msgstr "Id. de la liste"
-
-#: lib/Horde/MIME/Headers.php:592
-msgid "List-Owner"
-msgstr "Propriétaire de la liste"
-
-#: lib/Horde/MIME/Headers.php:593
-msgid "List-Post"
-msgstr "Envoi à la liste"
-
-#: lib/Horde/MIME/Headers.php:591
-msgid "List-Subscribe"
-msgstr "Abonnement à la liste"
-
-#: lib/Horde/MIME/Headers.php:590
-msgid "List-Unsubscribe"
-msgstr "Désabonnement de la liste"
-
-#: templates/admin/user/nolist.inc:4
-msgid "Listing users is disabled."
-msgstr "L'affichage de la liste des utilisateurs est désactivé."
-
-#: lib/Block/fortune.php:47
-msgid "Literature"
-msgstr "Littérature"
-
-#: lib/Horde/NLS/GeoIP.php:89 lib/Horde/NLS/countries.php:133
-#: lib/Horde/NLS/tld.php:144
-msgid "Lithuania"
-msgstr "Lituanie"
-
-#: po/translation.php:1338
-msgid "Loading libraries..."
-msgstr "Chargement des bibliothèques..."
-
-#: lib/Horde/MIME/Viewer/images.php:83
-msgid "Loading..."
-msgstr "Chargement..."
-
-#: lib/Block/weatherdotcom.php:178
-msgid "Local time: "
-msgstr "Heure locale : "
+#: config/prefs.php.dist:682
+msgid "Listing in the Header"
+msgstr "Liste dans les en-têtes"
 
-#: lib/Block/metar.php:63 lib/Block/sunrise.php:22
-#: lib/Block/weatherdotcom.php:64 lib/Horde/Crypt/smime.php:571
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "Boîte locale :"
+
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Lieu"
 
-#: login.php:155 services/portal/sidebar.php:164 templates/login/login.inc:83
-#: templates/login/mobile.inc:3 templates/login/mobile.inc:15
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Connexion"
 
-#: services/portal/sidebar.php:158
-msgid "Log out"
-msgstr "Déconnexion"
-
-#: lib/Horde/Auth.php:911
-msgid "Login failed because your username or password was entered incorrectly."
-msgstr ""
-"La connexion est refusée. Il est probable que votre nom d'utilisateur ou "
-"votre mot de passe a été mal saisi"
-
-#: lib/Horde/Auth.php:907
-msgid "Login failed."
-msgstr "Échec de connexion."
+#: lib/Block/summary.php:119
+#, php-format
+msgid "Log in to %s"
+msgstr "Connexion à %s"
 
-#: lib/Horde/Form.php:1370
-msgid "Long text"
-msgstr "Texte long"
+#: templates/login/login.inc:138
+msgid "Login"
+msgstr "Nom d'utilisateur"
 
-#: lib/Block/fortune.php:48
-msgid "Love"
-msgstr "Amour"
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr "Tâches de connexion"
 
-#: lib/Block/weatherdotcom_strings.php:63
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr "Faible"
 
-#: templates/javascript/htmlarea_listtype_lang.js:21
-msgid "Lower greek letters"
-msgstr "Lettre grecques minuscules"
-
-#: templates/javascript/htmlarea_listtype_lang.js:19
-msgid "Lower latin letters"
-msgstr "Lettre latines minuscules"
-
-#: templates/javascript/htmlarea_listtype_lang.js:17
-msgid "Lower roman numbers"
-msgstr "Nombre romains minuscules"
-
-#: lib/Horde/NLS/GeoIP.php:89 lib/Horde/NLS/countries.php:134
-#: lib/Horde/NLS/tld.php:145
-msgid "Luxembourg"
-msgstr "Luxembourg"
-
-#: lib/Horde/UI/VarRenderer/html.php:342 lib/Horde/UI/VarRenderer/html.php:373
-#: lib/Horde/UI/VarRenderer/html.php:410 templates/data/date.inc:47
-#: templates/data/date.inc:48 templates/data/date.inc:49
-#: templates/data/date.inc:50
-msgid "MM"
-msgstr "MM"
-
-#: lib/Horde/MIME/Viewer/tnef.php:36
-msgid "MS-TNEF Attachment contained no data."
-msgstr "La pièce jointe MS-TNEF ne contenait aucune donnée."
-
-#: lib/Horde/Notification/Listener/mobile.php:37
-msgid "MSG"
-msgstr "MSG"
-
-#: lib/Horde/NLS/GeoIP.php:92 lib/Horde/NLS/countries.php:135
-#: lib/Horde/NLS/tld.php:157
-msgid "Macao"
-msgstr "Macao"
-
-#: lib/Horde/NLS/GeoIP.php:91 lib/Horde/NLS/countries.php:136
-#: lib/Horde/NLS/tld.php:153
-msgid "Macedonia, The Former Yugoslav Republic of"
-msgstr "République de Macédoine"
-
-#: lib/Horde/NLS/GeoIP.php:90 lib/Horde/NLS/countries.php:137
-#: lib/Horde/NLS/tld.php:151
-msgid "Madagascar"
-msgstr "Madagascar"
-
-#: lib/Block/fortune.php:49
-msgid "Magic"
-msgstr "Magie"
-
-#: templates/javascript/htmlarea_context_lang.js:40
-msgid "Make lin_k..."
-msgstr "Faire un lie_n"
-
-#: po/translation.php:1357
-msgid "Make sure that you have PEAR installed and in your include path."
-msgstr ""
-"Assurez vous que PEAR est installé et présent dans votre « include_path »."
-
-#: po/translation.php:678 po/translation.php:1074
-#, php-format
-msgid "Making directory %s"
-msgstr "Création du répertoire %s"
-
-#: lib/Horde/NLS/GeoIP.php:94 lib/Horde/NLS/countries.php:138
-#: lib/Horde/NLS/tld.php:165
-msgid "Malawi"
-msgstr "Malawi"
-
-#: lib/Horde/NLS/GeoIP.php:95 lib/Horde/NLS/countries.php:139
-#: lib/Horde/NLS/tld.php:167
-msgid "Malaysia"
-msgstr "Malaisie"
-
-#: lib/Horde/NLS/GeoIP.php:94 lib/Horde/NLS/countries.php:140
-#: lib/Horde/NLS/tld.php:164
-msgid "Maldives"
-msgstr "Maldives"
-
-#: lib/Horde/NLS/GeoIP.php:92 lib/Horde/NLS/countries.php:141
-#: lib/Horde/NLS/tld.php:154
-msgid "Mali"
-msgstr "Mali"
-
-#: lib/Horde/NLS/GeoIP.php:94 lib/Horde/NLS/countries.php:142
-#: lib/Horde/NLS/tld.php:162
-msgid "Malta"
-msgstr "Malte"
-
-#: lib/Horde/UI/VarRenderer/html.php:1040
-msgid "Map24 map"
-msgstr "Carte « Map24 »"
-
-#: lib/Horde/UI/VarRenderer/html.php:978
-#: lib/Horde/UI/VarRenderer/html.php:1055
-msgid "MapQuest map"
-msgstr "Carte « Mapquest »"
-
-#: lib/Horde/UI/VarRenderer/html.php:376 lib/Horde/UI/VarRenderer/html.php:413
-#: templates/javascript/open_calendar.js:67
-msgid "March"
-msgstr "Mars"
-
-#: templates/javascript/htmlarea_table_lang.js:41
-msgid "Margin"
-msgstr "Marge"
-
-#: lib/Horde/IMAP/ACL/rfc2086.php:88
-msgid "Mark with Seen/Unseen flags"
-msgstr "Marquer avec des étiquettes Vu/Non vu"
-
-#: lib/Horde/IMAP/ACL/rfc2086.php:89
-msgid "Mark with other flags (e.g. Important/Answered)"
-msgstr "Marquer avec d'autres étiquettes (ex.: Important/Répondu)"
-
-#: lib/Horde/NLS/GeoIP.php:91 lib/Horde/NLS/countries.php:143
-#: lib/Horde/NLS/tld.php:152
-msgid "Marshall Islands"
-msgstr "Îles Marshall"
-
-#: lib/Horde/NLS/GeoIP.php:93 lib/Horde/NLS/countries.php:144
-#: lib/Horde/NLS/tld.php:159
-msgid "Martinique"
-msgstr "Martinique"
-
-#: templates/data/csvmap.inc:111
-msgid "Matching fields"
-msgstr "Champs apparentés"
-
-#: lib/Horde/NLS/GeoIP.php:93 lib/Horde/NLS/countries.php:145
-#: lib/Horde/NLS/tld.php:160
-msgid "Mauritania"
-msgstr "Mauritanie"
-
-#: lib/Horde/NLS/GeoIP.php:94 lib/Horde/NLS/countries.php:146
-#: lib/Horde/NLS/tld.php:163
-msgid "Mauritius"
-msgstr "Maurice"
-
-#: lib/Net/SMS/clickatell_http.php:314
-msgid "Max allowed credit."
-msgstr "Crédit maximum alloué."
-
-#: lib/Net/SMS/clickatell_http.php:307
-msgid "Max message parts exceeded."
-msgstr "Limite du message dépassée."
-
-#: lib/Block/metar.php:304
-msgid "Max temp last 24 hours: "
-msgstr "Température maximale des 24 dernières heures : "
-
-#: lib/Block/metar.php:296
-msgid "Max temp last 6 hours: "
-msgstr "Température maximale des 6 dernières heures : "
-
-#: lib/Horde/Form.php:898 lib/Horde/Form.php:1217 lib/Horde/Form.php:1239
-msgid "Maximum length"
-msgstr "Longueur maximum"
-
-#: lib/Horde/UI/VarRenderer/html.php:378 lib/Horde/UI/VarRenderer/html.php:415
-#: templates/javascript/open_calendar.js:69
-msgid "May"
-msgstr "Mai"
-
-#: lib/Horde/NLS/GeoIP.php:117 lib/Horde/NLS/countries.php:147
-#: lib/Horde/NLS/tld.php:253
-msgid "Mayotte"
-msgstr "Mayotte"
-
-#: lib/Block/fortune.php:50
-msgid "Medicine"
-msgstr "Médicament"
-
-#: templates/admin/groups/edit.inc:19
-msgid "Members"
-msgstr "Membres"
-
-#: templates/javascript/htmlarea_table_lang.js:60
-msgid "Merge cells"
-msgstr "Fusionner les cellules"
-
-#: po/translation.php:527
-#, php-format
-msgid "Merging all %s.po files to the compendium... "
-msgstr "Fusion de tous les fichiers %s.po dans le compendium... "
-
-#: po/translation.php:438
-#, php-format
-msgid "Merging locale %s... "
-msgstr "Fusion de la locale %s...  "
-
-#: po/translation.php:788
-#, php-format
-msgid "Merging the PO file for %s to the compendium... "
-msgstr "Fusion du fichier PO de %s au compendium... "
-
-#: po/translation.php:425
-#, php-format
-msgid "Merging translation for module %s..."
-msgstr "Fusion de la traduction du module %s..."
+#: mailbox.php:721 message.php:306 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr "Priorité faible"
+
+#: templates/compose/compose.inc:295
+msgid "Lowest"
+msgstr "La plus basse"
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr "Fichier Macintosh"
+
+#: templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "Courrier"
+
+#: config/prefs.php.dist:96
+msgid "Mail Previews"
+msgstr "Pré-visualisations du courrier"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr "Type de serveur auquel se connecter :"
+
+#: folders.php:369 folders.php:383
+msgid "Mailbox"
+msgstr "Boîte de courrier"
+
+#: config/prefs.php.dist:111
+msgid "Mailbox and Folder Display Options"
+msgstr "Options d'affichage pour les boîtes de courrier et les dossiers"
+
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr "Marquer tous les messages du dossier comme lus"
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "Marquer tous les messages du dossier comme non-lus"
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
+msgid "Mark as:"
+msgstr "Marquer comme :"
+
+#: config/prefs.php.dist:638
+msgid "Mark different levels of quoting with different colors?"
+msgstr "Distinguer les niveaux de citations par des couleurs différentes ?"
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "Marquer les messages comme lus ? (IMAP seulement)"
+
+#: config/prefs.php.dist:646
+msgid "Mark simple markup?"
+msgstr "Marquer avec une étiquette simple ?"
+
+#: templates/search/header.inc:49
+msgid "Match All Queries"
+msgstr "Correspond à toutes les requêtes"
+
+#: templates/search/header.inc:45
+msgid "Match Any Query"
+msgstr "Correspond à n'importe quelle des requêtes"
+
+#: templates/compose/compose.inc:505
+msgid "Maximum Attachment Size"
+msgstr "Taille maximale de la pièce jointe"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Nombre maximal de dossiers"
+
+#: templates/compose/compose.inc:487
+msgid "Maximum number of attachments reached."
+msgstr "Nombre maximal de pièces jointes atteint."
+
+#: templates/compose/compose.inc:483
+msgid "Maximum total attachment size reached."
+msgstr "Taille maximale totale des pièces jointes atteinte."
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr "Menu liste de dossiers"
 
-#: lib/Horde/Notification/Listener/status.php:30
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Message"
 
-#: lib/Horde/Crypt/smime.php:216
-msgid ""
-"Message Verified Successfully but the signer's certificate could not be "
-"verified."
-msgstr ""
-"Vérification du message réussie, mais le certificat du signataire n'a pas pu "
-"être vérifié."
-
-#: lib/Net/SMS/clickatell_http.php:309
-msgid "Message expired."
-msgstr "Message expiré."
-
-#: lib/Net/SMS/clickatell_http.php:226 lib/Net/SMS/clickatell_http.php:259
-#: lib/Net/SMS/sms2email_http.php:568 lib/Net/SMS/sms2email_http.php:601
-msgid "Message type"
-msgstr "Type de message"
-
-#: lib/Block/metar.php:3
-msgid "Metar Weather"
-msgstr "Météo Metar"
-
-#: lib/Block/metar.php:37
-msgid "Metar block not available."
-msgstr "Le bloc « Metar » n'est pas disponible."
-
-#: lib/Block/metar.php:110
-msgid ""
-"Metar block not available. Details have been logged for the administrator."
-msgstr ""
-"Le bloc « Metar » n'est pas disponible.  Les détails ont été consignés pour "
-"l'administrateur."
-
-#: lib/Horde/MIME/Viewer/rar.php:67 lib/Horde/MIME/Viewer/zip.php:71
-msgid "Method"
-msgstr "Méthode"
-
-#: lib/Horde/RPC/soap.php:117 lib/Horde/RPC/xmlrpc.php:81
-#, php-format
-msgid "Method '%s' is not defined"
-msgstr "La méthode « %s » n'est pas définie"
-
-#: lib/Block/metar.php:73 lib/Block/weatherdotcom.php:73
-msgid "Metric"
-msgstr "Métrique"
-
-#: lib/Horde/NLS/GeoIP.php:95 lib/Horde/NLS/countries.php:148
-#: lib/Horde/NLS/tld.php:166
-msgid "Mexico"
-msgstr "Mexique"
-
-#: lib/Horde/NLS/GeoIP.php:72 lib/Horde/NLS/countries.php:149
-#: lib/Horde/NLS/tld.php:85
-msgid "Micronesia, Federated States of"
-msgstr "États fédérés de Micronésie"
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr "Rédaction de message"
 
-#: templates/javascript/htmlarea_lang.js:76
-#: templates/javascript/htmlarea_table_lang.js:42
-msgid "Middle"
-msgstr "Milieu"
+#: config/prefs.php.dist:906
+msgid "Message Date"
+msgstr "Date du message"
 
-#: lib/Horde/MIME/Viewer/tnef.php:38
-msgid "Mime Type"
-msgstr "Type MIME"
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+msgid "Message Options"
+msgstr "Options du message"
 
-#: lib/Block/metar.php:308
-msgid "Min temp last 24 hours: "
-msgstr "Température minimum des 24 dernières heures : "
+#: search.php:302
+msgid "Message Search"
+msgstr "Rechercher un message"
 
-#: lib/Block/metar.php:300
-msgid "Min temp last 6 hours: "
-msgstr "Température minimum des 6 dernières heures : "
+#: config/prefs.php.dist:910
+msgid "Message Size"
+msgstr "Taille du message"
 
-#: lib/Horde/UI/VarRenderer/html.php:217
-msgid "Mirror"
-msgstr "Miroir"
+#: message.php:391
+msgid "Message Source"
+msgstr "Source du message"
 
-#: lib/Block/fortune.php:51
-msgid "Miscellaneous"
-msgstr "Variés"
+#: config/prefs.php.dist:66
+msgid "Message Viewing"
+msgstr "Consultation du message"
 
-#: lib/Net/SMS/clickatell_http.php:339 lib/Net/SMS/sms2email_http.php:671
-msgid "Missing PEAR package HTTP_Request."
-msgstr "Le paquetage HTTP_request PEAR est manquant."
+#: templates/search/main.inc:6
+msgid "Message flags"
+msgstr "Étiquettes du message"
 
-#: admin/setup/index.php:114
-msgid ""
-"Missing configuration. You have to generate it now if you want to use this "
-"application."
-msgstr ""
-"Configuration inexistante. Vous devez la générer maintenant si vous voulez "
-"utiliser cette application."
-
-#: lib/Net/SMS/clickatell_http.php:303
-msgid "Missing message ID."
-msgstr "ID du message manquant."
-
-#: lib/Net/SMS/vodafoneitaly_smtp.php:57
-msgid "Missing required PEAR package Mail."
-msgstr "Le paquetage PEAR Mail est manquant."
-
-#: lib/Net/SMS/clickatell_http.php:293
-msgid "Missing session ID."
-msgstr "ID de session manquant."
-
-#: templates/javascript/open_calendar.js:56
-msgid "Mo"
-msgstr "Lu"
-
-#: lib/Block/weatherdotcom_strings.php:64
-msgid "Moderate"
-msgstr "Modéré"
-
-#: lib/Horde/MIME/Viewer/rar.php:66 lib/Horde/MIME/Viewer/tgz.php:88
-#: lib/Horde/MIME/Viewer/zip.php:70
-msgid "Modified Date"
-msgstr "Date de modification"
+#: templates/search/main.inc:83
+msgid "Message folders"
+msgstr "Dossiers du message"
 
-#: templates/javascript/htmlarea_context_lang.js:52
-msgid "Modify URL"
-msgstr "Modifier l'URL"
-
-#: po/translation.php:657
-msgid "Module"
-msgstr "Module"
+#: lib/Compose.php:340
+#, php-format
+msgid "Message from %s"
+msgstr "Message de %s"
 
-#: lib/Horde/Crypt/smime.php:673
-msgid "Modulus"
-msgstr "Modulo"
+#: mailbox.php:662
+msgid "Message has attachments"
+msgstr "Le message a des pièces jointes"
 
-#: lib/Horde/NLS/GeoIP.php:90 lib/Horde/NLS/countries.php:150
-#: lib/Horde/NLS/tld.php:150
-msgid "Moldova, Republic of"
-msgstr "Moldavie"
+#: mailbox.php:653
+msgid "Message is encrypted"
+msgstr "Le message est chiffré"
 
-#: lib/Horde/NLS/GeoIP.php:90 lib/Horde/NLS/countries.php:151
-#: lib/Horde/NLS/tld.php:149
-msgid "Monaco"
-msgstr "Monaco"
+#: mailbox.php:648
+msgid "Message is signed"
+msgstr "Le message est signé"
 
-#: lib/Horde/NLS/GeoIP.php:92 lib/Horde/NLS/countries.php:152
-#: lib/Horde/NLS/tld.php:156
-msgid "Mongolia"
-msgstr "Mongolie"
+#: templates/search/header.inc:36
+msgid "Message matches"
+msgstr "Le message correspond"
 
-#: lib/Horde/Form.php:2592
-msgid "Month and year"
-msgstr "Mois et année"
+#: compose.php:864 compose.php:871
+msgid "Message redirected successfully."
+msgstr "Le message a bien été redirigé."
 
-#: lib/Horde/Maintenance.php:57
-msgid "Monthly"
-msgstr "Mensuellement"
+#: compose.php:1122
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Message bien envoyé, mais non enregistré dans %s"
 
-#: lib/Horde/NLS/GeoIP.php:94 lib/Horde/NLS/countries.php:153
-#: lib/Horde/NLS/tld.php:161
-msgid "Montserrat"
-msgstr "Montserrat"
+#: compose.php:1181 compose.php:1189
+msgid "Message sent successfully."
+msgstr "Le message a bien été envoyé."
 
-#: lib/Block/moon.php:3 lib/Block/moon.php:16
-msgid "Moon Phases"
-msgstr "Phases de la lune"
+#: config/prefs.php.dist:930
+msgid "Messages per page in the mailbox view."
+msgstr "Messages par page lors de l'affichage de la boîte."
 
-#: lib/Horde/NLS/GeoIP.php:90 lib/Horde/NLS/countries.php:154
-#: lib/Horde/NLS/tld.php:148
-msgid "Morocco"
-msgstr "Maroc"
+#: mailbox.php:310
+msgid "Messages to"
+msgstr "Messages à"
 
-#: lib/Block/weatherdotcom_strings.php:30
-msgid "Mostly Clear"
-msgstr "Généralement ensoleillé"
+#: templates/acl/acl.inc:29
+msgid "Modify"
+msgstr "Modifier"
 
-#: lib/Block/weatherdotcom_strings.php:31
-msgid "Mostly Cloudy"
-msgstr "Généralement nuageux"
+#: templates/compose/expand.inc:11
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "Plusieurs adresses correspondent au champ « %s »."
 
-#: lib/Block/weatherdotcom_strings.php:32
-msgid "Mostly Sunny"
-msgstr "Généralement ensoleillé"
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move"
+msgstr "Déplacer"
 
-#: lib/Horde/Block/Layout.php:428
-msgid "Move Down"
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
 msgstr "Vers le bas"
 
-#: lib/Horde/Block/Layout.php:432
-msgid "Move Left"
-msgstr "Déplacer à gauche"
-
-#: lib/Horde/Block/Layout.php:436
-msgid "Move Right"
-msgstr "Déplacer à droite"
-
-#: lib/Horde/Block/Layout.php:424
-msgid "Move Up"
-msgstr "Vers le haut"
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"Déplacer les pourriels vers le dossier de spam et les messages légitimes "
+"vers la boîte de réception"
 
-#: lib/Horde/UI/VarRenderer/html.php:497
-msgid "Move down"
-msgstr "Vers le bas"
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move to folder"
+msgstr "Vers le dossier"
 
-#: lib/Horde/UI/VarRenderer/html.php:496 lib/Horde/UI/VarRenderer/html.php:497
+#: templates/prefs/sourceselect.inc:314
 msgid "Move up"
 msgstr "Vers le haut"
 
-#: lib/Horde/NLS/GeoIP.php:95 lib/Horde/NLS/countries.php:155
-#: lib/Horde/NLS/tld.php:168
-msgid "Mozambique"
-msgstr "Mozambique"
-
-#: lib/Horde/Form.php:2184
-msgid "Multi-level drop down lists"
-msgstr "Listes déroulantes multiniveaux"
-
-#: lib/Horde/Form.php:2242
-msgid "Multiple selection"
-msgstr "Sélection multiple"
-
-#: services/portal/index.php:51
-msgid "My Portal"
-msgstr "Mon portail"
-
-#: services/portal/edit.php:124
-msgid "My Portal Layout"
-msgstr "Présentation de mon portail"
-
-#: lib/Horde/NLS/GeoIP.php:92 lib/Horde/NLS/countries.php:156
-#: lib/Horde/NLS/tld.php:155
-msgid "Myanmar"
-msgstr "Birmanie"
-
-#: templates/maintenance/agreement_bottom.inc:7
-msgid "NO, I Do NOT Agree"
-msgstr "NON, je n'accepte pas"
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr "Multipart/Alternative"
+
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Affichage des messages multiples"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "AUCUN"
+
+#: templates/pgp/pgp.inc:2 templates/smime/smime.inc:2
+#: templates/fetchmail/manage.inc:48
+msgid "NOTE"
+msgstr "NOTE"
 
-#: lib/Horde/MIME/Viewer/tnef.php:38 lib/Horde/MIME/Viewer/vcard.php:102
-#: lib/Horde/Crypt/pgp.php:397
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Nom"
 
-#: lib/Horde/NLS/GeoIP.php:95 lib/Horde/NLS/countries.php:157
-#: lib/Horde/NLS/tld.php:169
-msgid "Namibia"
-msgstr "Namibie"
-
-#: lib/Horde/NLS/GeoIP.php:97 lib/Horde/NLS/countries.php:158
-#: lib/Horde/NLS/tld.php:178
-msgid "Nauru"
-msgstr "Nauru"
-
-#: lib/Horde/NLS/GeoIP.php:97 lib/Horde/NLS/countries.php:159
-#: lib/Horde/NLS/tld.php:177
-msgid "Nepal"
-msgstr "Népal"
-
-#: lib/Horde/NLS/GeoIP.php:97 lib/Horde/NLS/countries.php:160
-#: lib/Horde/NLS/tld.php:175
-msgid "Netherlands"
-msgstr "Pays-Bas"
-
-#: lib/Horde/NLS/GeoIP.php:57 lib/Horde/NLS/countries.php:161
-#: lib/Horde/NLS/tld.php:23
-msgid "Netherlands Antilles"
-msgstr "Antilles néerlandaises"
-
-#: lib/Horde/Crypt/smime.php:581
-msgid "Netscape Base URL"
-msgstr "URL de base de Netscape"
-
-#: lib/Horde/Crypt/smime.php:583
-msgid "Netscape CA Revocation URL"
-msgstr "URL de révocation de l'A.C. Netscape"
-
-#: lib/Horde/Crypt/smime.php:585
-msgid "Netscape CA policy URL"
-msgstr "URL de la politique d'A.C. Netscape"
-
-#: lib/Horde/Crypt/smime.php:584
-msgid "Netscape Renewal URL"
-msgstr "URL de renouvellement Netscape"
-
-#: lib/Horde/Crypt/smime.php:582
-msgid "Netscape Revocation URL"
-msgstr "URL de révocation Netscape"
-
-#: lib/Horde/Crypt/smime.php:586
-msgid "Netscape SSL server name"
-msgstr "Nom du serveur SSL Netscape"
-
-#: lib/Horde/Crypt/smime.php:587
-msgid "Netscape certificate comment"
-msgstr "Commentaire du certificat Netscape"
-
-#: lib/Horde/Crypt/smime.php:580
-msgid "Netscape certificate type"
-msgstr "Type du certificat Netscape"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
+msgstr "Le nom et/ou l'adresse ne peuvent pas être vides"
+
+#: lib/MIME/Viewer/itip.php:771
+msgid "Needs Action"
+msgstr "Attente d'action"
 
-#: lib/Horde/Crypt/pgp.php:411
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Jamais"
 
-#: lib/Horde/NLS/GeoIP.php:95 lib/Horde/NLS/countries.php:162
-#: lib/Horde/NLS/tld.php:170
-msgid "New Caledonia"
-msgstr "Nouvelle-Calédonie"
-
-#: lib/Horde/Prefs/CategoryManager.php:50
-#: templates/prefs/categorymanagement.inc:27
-msgid "New Category"
-msgstr "Nouvelle catégorie"
-
-#: lib/Block/moon.php:46 lib/Block/moon.php:68 lib/Block/moon.php:179
-msgid "New Moon"
-msgstr "Nouvelle lune"
-
-#: templates/admin/user/update.inc:35
-msgid "New Username (optional)"
-msgstr "Nouveau nom de connexion (facultatif)"
-
-#: lib/Horde/NLS/GeoIP.php:98 lib/Horde/NLS/countries.php:163
-#: lib/Horde/NLS/tld.php:180
-msgid "New Zealand"
-msgstr "Nouvelle-Zélande"
-
-#: templates/javascript/htmlarea_lang.js:91
-msgid "New window (_blank)"
-msgstr "Nouvelle fenêtre (_blank)"
-
-#: lib/Block/fortune.php:52 lib/Block/google.php:40
-msgid "News"
-msgstr "Nouvelles"
+#: config/prefs.php.dist:560
+msgid "Never save attachments"
+msgstr "Ne jamais enregistrer les pièces jointes"
 
-#: templates/data/csvinfo.inc:32 templates/data/csvmap.inc:137
-#: templates/data/datemap.inc:46 templates/data/tsvinfo.inc:21
-msgid "Next"
-msgstr "Suivant"
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Nouveau"
 
-#: lib/Block/moon.php:27
-msgid "Next Phase"
-msgstr "Phase suivante"
-
-#: lib/Horde/Prefs/UI.php:368 lib/Horde/Prefs/UI.php:372
-msgid "Next options"
-msgstr "Options suivantes"
-
-#: lib/Horde/UI/Pager.php:103
-msgid "Next>"
-msgstr "Suivant>"
-
-#: lib/Horde/NLS/GeoIP.php:96 lib/Horde/NLS/countries.php:164
-#: lib/Horde/NLS/tld.php:174
-msgid "Nicaragua"
-msgstr "Nicaragua"
-
-#: lib/Horde/NLS/GeoIP.php:96 lib/Horde/NLS/countries.php:165
-#: lib/Horde/NLS/tld.php:171
-msgid "Niger"
-msgstr "Niger"
-
-#: lib/Horde/NLS/GeoIP.php:96 lib/Horde/NLS/countries.php:166
-#: lib/Horde/NLS/tld.php:173
-msgid "Nigeria"
-msgstr "Nigéria"
-
-#: lib/Block/weatherdotcom.php:293
-msgid "Night"
-msgstr "Nuit"
-
-#: lib/Horde/NLS/GeoIP.php:97 lib/Horde/NLS/countries.php:167
-#: lib/Horde/NLS/tld.php:179
-msgid "Niue"
-msgstr "Niue"
+#: lib/IMP.php:595
+msgid "New Folder"
+msgstr "Nouveau dossier"
 
-#: lib/Horde/UI/VarRenderer/html.php:888
-msgid "No"
-msgstr "Non"
+#: config/prefs.php.dist:88
+msgid "New Mail"
+msgstr "Nouveau courrier"
 
-#: templates/admin/setup/diff.html:16
-msgid "No available configuration data to show differences for."
-msgstr ""
-"Pas de données de configuration pour lesquelles montrer les différences"
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Nouveau message"
 
-#: lib/VFS/ISOWriter.php:105
-msgid "No available strategy for making ISO images."
-msgstr "Pas de stratégie disponible pour faire des images ISO."
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Nouveau message pour %s"
 
-#: lib/Net/SMS/clickatell_http.php:312
-msgid "No batch template."
-msgstr "Pas de gabarit en lot."
+#: templates/search/main.inc:19
+msgid "New messages"
+msgstr "Nouveaux messages"
 
-#: lib/Horde/Block/Layout.php:79 lib/Horde/Block/Layout.php:230
-#: lib/Horde/Block/Layout.php:252
-msgid "No block exists at the requested position"
-msgstr "Aucun bloc n'existe à la position demandée"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Suivant"
 
-#: lib/Horde/Auth/mcal.php:50
-msgid "No calendar name provided for MCAL authentication."
-msgstr "Pas de nom de calendrier fourni pour l'authentification par MCAL."
+#: templates/message/navbar_navigate.inc:33
+msgid "Next Message"
+msgstr "Message suivant"
+
+#: mailbox.php:341
+msgid "Next Page"
+msgstr "Page suivante"
 
-#: admin/setup/diff.php:54
-msgid "No change."
-msgstr "Non modifié."
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966
+msgid "No"
+msgstr "Non"
 
-#: lib/Horde/Perms/UI.php:140
-msgid "No child permissions are to be added below this level."
-msgstr "Aucune sous-permission n'a besoin d'être ajoutée sous ce niveau."
+#: smime.php:222
+msgid "No Certificate found"
+msgstr "Aucun certificat trouvé"
 
-#: admin/perms/addchild.php:61
-msgid "No children can be added to this permission."
-msgstr "Aucune sous-permission n'a besoin d'être ajoutée sous ce niveau."
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr "Aucun chiffrement"
 
-#: po/translation.php:1377
-msgid "No command specified."
-msgstr "Aucune commande spécifiée"
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr "Aucune clef dans l'anneau"
 
-#: lib/Horde.php:167 lib/Horde.php:477 lib/Horde/Util.php:776
+#: mailbox.php:360
 #, php-format
-msgid "No configuration information specified for %s."
-msgstr "Aucune information de configuration spécifiée pour %s."
-
-#: lib/VFS/ftp.php:741
-msgid "No configuration information specified for FTP VFS."
-msgstr "Aucune information de configuration fournie pour FTP VFS."
-
-#: lib/VFS/sql.php:575
-msgid "No configuration information specified for SQL VFS."
-msgstr "Aucune information de configuration fournie pour SQL VFS."
-
-#: lib/VFS/sql_file.php:704
-msgid "No configuration information specified for SQL-File VFS."
-msgstr "Aucune information de configuration fournie pour SQL-File VFS."
+msgid "No Messages"
+msgstr "Pas de messages"
 
-#: lib/Net/SMS/clickatell_http.php:313
-msgid "No credit left."
-msgstr "Aucun crédit disponible."
+#: pgp.php:133
+msgid "No PGP public key imported."
+msgstr "Aucune clef publique PGP n'a été importée."
 
-#: lib/Net/SMS/sms2email_http.php:633
-msgid "No destination supplied."
-msgstr "Aucune destination trouvée."
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr "Pas de certificat personnel présent"
 
-#: po/translation.php:1271
-#, php-format
-msgid "No entry with the id '%s' exists in the original help file."
-msgstr ""
-"Il n'y a pas d'entrée avec l'id. « %s » dans le fichier d'aide original."
+#: lib/Mailbox.php:333
+msgid "No Preview Text"
+msgstr "Pas de pré-visualisation"
 
-#: lib/Horde/Browser.php:871
-msgid "No file uploaded"
-msgstr "Aucun fichier envoyé"
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr "Aucune clef publique trouvée"
 
-#: util/icon_browser.php:71
-msgid "No icons found."
-msgstr "Aucun icône trouvé."
+#: smime.php:147
+msgid "No S/MIME public key imported."
+msgstr "Aucune clef publique S/MIME importée."
 
-#: po/translation.php:413 po/translation.php:522
-msgid "No locale specified."
-msgstr "Aucune locale spécifiée"
+#: lib/MIME/Viewer/tnef.php:92
+msgid "No attachments found."
+msgstr "Aucune pièce jointe trouvée."
 
-#: lib/Block/metar.php:121 lib/Block/sunrise.php:40
-#: lib/Block/weatherdotcom.php:120
-msgid "No location is set."
-msgstr "Aucun lieu n'est sélectionné"
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Aucune information sur l'adresse dans la clef publique."
 
-#: lib/Net/SMS/sms2email_http.php:632
-msgid "No message supplied."
-msgstr "Aucun message fourni"
+#: acl.php:71 acl.php:97
+msgid "No folder selected."
+msgstr "Aucun dossier n'a été sélectionné."
 
-#: lib/Net/SMS/sms2email_http.php:635
-msgid "No name specified."
-msgstr "Aucun nom spécifié."
+#: lib/Block/summary.php:149
+msgid "No folders are being checked for new mail."
+msgstr "Aucun dossier n'est vérifié pour les nouveaux messages."
 
-#: lib/Net/SMS/sms2email_http.php:636
-msgid "No number specified."
-msgstr "Aucun nombre spécifié."
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
+msgid "No folders were specified"
+msgstr "Aucun dossier spécifié"
 
-#: lib/Block/fortune.php:94
-msgid "No offensive fortunes"
-msgstr "Pas de citations offensantes"
+#: lib/Block/summary.php:155
+msgid "No folders with new messages"
+msgstr "Aucun dossier avec de nouveaux messages"
 
-#: lib/Horde/Auth/http.php:91
-msgid "No password provided for HTTP authentication."
-msgstr "Aucun mot de passe fourni pour l'authentification par HTTP."
+#: lib/Block/summary.php:152
+msgid "No folders with unseen messages"
+msgstr "Aucun dossier avec des messages non-lus"
 
-#: lib/Horde/Auth/imap.php:108
-msgid "No password provided for IMAP authentication."
-msgstr "Aucun mot de passe fourni pour l'authentification par IMAP."
+#: lib/Compose.php:336
+msgid "No message body text"
+msgstr "Pas de texte dans le corps du message"
 
-#: lib/Horde/Auth/krb5.php:72
-msgid "No password provided for Kerberos authentication."
-msgstr "Aucun mot de passe fourni pour l'authentification par Kerberos."
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Aucun message retourné."
 
-#: lib/Horde/Auth/ldap.php:94
-msgid "No password provided for LDAP authentication."
-msgstr "Aucun mot de passe spécifié pour l'authentification LDAP."
+#: lib/Mailbox.php:375
+msgid "No messages matched your search."
+msgstr "Aucun message ne correspond à votre recherche."
 
-#: lib/Horde/Auth/login.php:84 lib/Horde/Auth/pam.php:75
-#: lib/Horde/Auth/sasl.php:77
-msgid "No password provided for Login authentication."
-msgstr "Aucun mot de passe spécifié pour l'authentification."
+#: pgp.php:185
+msgid "No personal PGP private key imported."
+msgstr "Aucune clef privée PGP n'a été importée."
 
-#: lib/Horde/Auth/passwd.php:135
-msgid "No password provided for PASSWD authentication."
-msgstr "Aucun mot de passe spécifié pour l'authentification PASSWD."
+#: pgp.php:161
+msgid "No personal PGP public key imported."
+msgstr "Aucune clef publique PGP n'a été importée."
 
-#: lib/Horde/Auth/smb.php:84
-msgid "No password provided for SMB authentication."
-msgstr "Aucun mot de passe spécifié pour l'authentification SMB."
+#: smime.php:197
+msgid "No personal S/MIME certificates imported."
+msgstr "Aucun certificat personnel S/MIME importé."
 
-#: lib/Horde/Crypt/smime.php:1286
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
 msgid ""
-"No path to the OpenSSL binary provided. The OpenSSL binary is necessary to "
-"work with PKCS 12 data."
+"No personal private key exists so the message is unable to be decrypted."
 msgstr ""
-"Aucun chemin vers le binaire OpenSSL fourni. Le binaire d'OpenSSL est "
-"nécessaire pour fonctionner avec des données PKCS 12."
-
-#: templates/admin/user/approve.inc:6
-msgid "No pending signups."
-msgstr "Aucune confirmation en attente"
-
-#: templates/javascript/htmlarea_table_lang.js:43
-msgid "No rules"
-msgstr "Pas de règles"
+"Il n'existe aucune clef privée, et le message ne peut donc pas être "
+"déchiffré."
 
-#: templates/javascript/htmlarea_table_lang.js:44
-msgid "No sides"
-msgstr "Pas de côtés"
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr "Aucun vérificateur d'orthographe configuré."
 
-#: lib/Block/weatherdotcom.php:130
-msgid "No temporary directory available for cache."
-msgstr "Aucun répertoire temporaire est disponible pour la cache"
+#: templates/compose/spelling.inc:48
+msgid "No spelling errors"
+msgstr "Aucune erreur d'orthographe"
 
-#: lib/Net/SMS/sms2email_http.php:630
-msgid "No username and/or password sent."
-msgstr "Aucun nom d'utilisateur et /ou mot de passe envoyé."
+#: templates/compose/spelling.inc:100
+msgid "No suggestions"
+msgstr "Aucune suggestion"
 
-#: lib/Horde/RPC/xmlrpc.php:140
-msgid "No valid XML data returned"
-msgstr "Aucune donnée XML valide n'a été retournée"
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr "Aucune méthode d'authentification IMAP supportée n'a été trouvée."
 
-#: lib/Horde/UI/VarRenderer/html.php:896 lib/Horde/UI/VarRenderer/html.php:906
-#: lib/Horde/UI/VarRenderer/html.php:917 lib/Horde/UI/VarRenderer/html.php:934
-msgid "No values"
-msgstr "Pas de valeur"
+#: acl.php:67 acl.php:93
+msgid "No user specified."
+msgstr "Aucun utilisateur spécifié."
 
-#: admin/setup/index.php:119
-msgid "No version found in original configuration. Regenerate configuration."
-msgstr ""
-"Pas de version trouvée dans la configuration originale. Régénérez la "
-"configuration."
-
-#: admin/setup/index.php:127
-msgid "No version found in your configuration. Regenerate configuration."
-msgstr ""
-"Pas de version trouvée dans votre configuration. Régénérez la configuration."
+#: lib/MIME/Viewer/itip.php:704
+msgid "Non Participant"
+msgstr "Non-participant"
 
-#: lib/Horde/Crypt/pgp.php:413 templates/prefs/identityselect.inc:92
-#: templates/javascript/htmlarea_table_lang.js:45
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: templates/prefs/folderselect.inc:24 templates/mailbox/navbar.inc:11
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Aucun"
 
-#: templates/javascript/htmlarea_lang.js:90
-msgid "None (use implicit)"
-msgstr "Aucun (utiliser implicitement)"
-
-#: lib/Horde/NLS/GeoIP.php:96 lib/Horde/NLS/countries.php:168
-#: lib/Horde/NLS/tld.php:172
-msgid "Norfolk Island"
-msgstr "Île Norfolk"
-
-#: lib/Block/moon.php:32 lib/Block/moon.php:60
-msgid "Northern Hemisphere"
-msgstr "Hémisphère Nord"
-
-#: lib/Horde/NLS/GeoIP.php:93 lib/Horde/NLS/countries.php:169
-#: lib/Horde/NLS/tld.php:158
-msgid "Northern Mariana Islands"
-msgstr "Îles Mariannes du nord"
-
-#: lib/Horde/NLS/GeoIP.php:97 lib/Horde/NLS/countries.php:170
-#: lib/Horde/NLS/tld.php:176
-msgid "Norway"
-msgstr "Norvège"
-
-#: lib/Horde/Crypt/smime.php:640
-msgid "Not After"
-msgstr "Pas après"
-
-#: lib/Horde/Crypt/smime.php:639
-msgid "Not Before"
-msgstr "Pas avant"
-
-#: lib/VFS/file.php:331
-msgid "Not a directory"
-msgstr "Pas un dossier"
-
-#: lib/VFS/ISOWriter.php:63 lib/VFS/ISOWriter/RealInputStrategy.php:48
-#: lib/VFS/ISOWriter/RealInputStrategy.php:59
-#: lib/VFS/ISOWriter/RealOutputStrategy.php:83
-#: lib/VFS/ISOWriter/RealOutputStrategy.php:94
-msgid "Not implemented."
-msgstr "Non implémenté."
-
-#: templates/javascript/htmlarea_lang.js:68
-msgid "Not set"
-msgstr "Inactivé"
-
-#: lib/VFS.php:175 lib/VFS.php:193 lib/VFS.php:210 lib/VFS.php:226
-#: lib/VFS.php:242 lib/VFS.php:257 lib/VFS.php:274 lib/VFS.php:307
-#: lib/VFS.php:365 lib/VFS.php:444 lib/VFS.php:513 lib/VFS.php:530
-#: lib/Horde/SessionHandler.php:143 lib/Horde/SessionHandler.php:158
-#: lib/Horde/SessionHandler.php:173 lib/Horde/SessionHandler.php:187
-#: lib/Horde/SessionHandler.php:234
-msgid "Not supported."
-msgstr "Non pris en compte."
-
-#: lib/Horde/MIME/Viewer/vcard.php:244
-msgid "Notes"
-msgstr "Notes"
-
-#: services/obrowser/index.php:36
-msgid "Nothing to browse, go back."
-msgstr "Rien à naviguer, retournez en arrière."
-
-#: templates/maintenance/confirm_top.inc:10
-msgid "Notice"
-msgstr "Avertissement"
-
-#: lib/Horde/UI/VarRenderer/html.php:384 lib/Horde/UI/VarRenderer/html.php:421
-#: templates/javascript/open_calendar.js:75
-msgid "November"
-msgstr "Novembre"
-
-#: lib/Horde/Form.php:1046
-msgid "Number"
-msgstr "Nombre"
-
-#: lib/Horde/Form.php:1430
-msgid "Number of characters"
-msgstr "Nombre de caractères"
-
-#: lib/Horde/Form.php:1374 lib/Horde/Form.php:1428 lib/Horde/Form.php:1450
-#: templates/javascript/htmlarea_lang.js:104
-msgid "Number of columns"
-msgstr "Nombre de colonnes"
-
-#: lib/Horde/Form.php:1372 lib/Horde/Form.php:1426 lib/Horde/Form.php:1448
-#: templates/javascript/htmlarea_lang.js:102
-msgid "Number of rows"
-msgstr "Nombre de rangées"
-
-#: lib/Net/SMS/sms2email_http.php:643
-msgid "Numbers not specified for updating in distribution list."
-msgstr "Nombre non spécifié pour la mise à jour de la liste de distribution."
-
-#: templates/javascript/htmlarea_lang.js:46
-#: templates/javascript/htmlarea_lang.js:64 po/translation.php:148
-#: po/translation.php:1348
-msgid "OK"
-msgstr "OK"
-
-#: lib/Horde/UI/VarRenderer/html.php:814
-msgid "Object"
-msgstr "Objet"
-
-#: templates/shares/edit.inc:111
-msgid "Object Creator"
-msgstr "Créateur d'objet"
-
-#: admin/perms/edit.php:137 lib/Horde/Perms/UI.php:215
-msgid "Object creator permissions"
-msgstr "Permission de créateur d'objets"
-
-#: lib/Horde/Form.php:1104
-msgid "Octal"
-msgstr "Octal"
-
-#: lib/Horde/UI/VarRenderer/html.php:383 lib/Horde/UI/VarRenderer/html.php:420
-#: templates/javascript/open_calendar.js:74
-msgid "October"
-msgstr "Octobre"
-
-#: lib/Block/fortune.php:92
-msgid "Offense filter"
-msgstr "Filtre anti-offensant"
-
-#: lib/Horde/NLS/GeoIP.php:98 lib/Horde/NLS/countries.php:171
-#: lib/Horde/NLS/tld.php:181
-msgid "Oman"
-msgstr "Oman"
-
-#: lib/Horde/IMAP/ACL/rfc2086.php:73
-msgid "Only IMAP servers support shared folders."
-msgstr "Seul les serveurs IMAP supportent les dossiers partagés."
-
-#: lib/Block/fortune.php:95
-msgid "Only offensive fortunes"
-msgstr "Seulement les « fortunes » offensantes"
-
-#: lib/Horde/Form.php:1851 lib/Horde/Form.php:1971
-msgid "Only one email address allowed."
-msgstr "Une seule adresse de courriel permise."
-
-#: services/shares/edit.php:65
-msgid ""
-"Only the owner or system administrator may change ownership or owner "
-"permissions for a share"
-msgstr ""
-"Seuls le propriétaire ou l'administrateur système peut modifier les "
-"permissions d'un partage."
-
-#: lib/Block/iframe.php:35
-msgid "Open in a new window"
-msgstr "Ouvrir dans une nouvelle fenêtre"
-
-#: lib/Horde/Crypt/smime.php:245
-msgid "OpenSSL error: Could not extract data from signed S/MIME part."
-msgstr ""
-"Erreur OpenSSL : Impossible d'extraire les données de la partie signée S/MIME"
-
-#: templates/javascript/htmlarea_context_lang.js:54
-msgid "Opens this link in a new window"
-msgstr "Ouvrir les liens dans une nouvelle fenêtre"
-
-#: lib/Block/fortune.php:53
-msgid "Operating System"
-msgstr "Système d'exploitation"
-
-#: services/portal/sidebar.php:151
-msgid "Options"
-msgstr "Options"
-
-#: services/prefs.php:31 templates/prefs/app.inc:14
-#, php-format
-msgid "Options for %s"
-msgstr "Options pour %s"
-
-#: po/translation.php:112
-msgid "Options:"
-msgstr "Options :"
-
-#: templates/javascript/htmlarea_lang.js:18
-msgid "Ordered List"
-msgstr "Liste numérotée"
-
-#: lib/Horde/Crypt/smime.php:567
-msgid "Organisation"
-msgstr "Organisation"
-
-#: lib/Horde/Crypt/smime.php:568
-msgid "Organisational Unit"
-msgstr "Unité organisationnelle"
-
-#: admin/templates.php:135
-msgid "Original application template"
-msgstr "Modèle original d'application"
-
-#: admin/templates.php:117
-#, php-format
-msgid "Original templates in %s:"
-msgstr "Modèles originaux dans %s :"
-
-#: lib/Horde/NLS/GeoIP.php:119 services/keyboard.php:117
-#: templates/javascript/htmlarea_lang.js:94
-msgid "Other"
-msgstr "Autre"
-
-#: templates/shares/edit.inc:31
-msgid "Owner Permissions"
-msgstr "Permissions du propriétaire"
-
-#: lib/Horde/Auth/pam.php:79
-msgid "PAM authentication is not available."
-msgstr "L'authentification PAM n'est pas disponible."
-
-#: lib/Horde/Crypt/pgp.php:1250
-msgid "PGP Digital Signature"
-msgstr "Signature numérique PGP"
-
-#: lib/Horde/Crypt/pgp.php:1296
-msgid "PGP Encrypted Data"
-msgstr "Données PGP chiffrées"
-
-#: lib/Horde/Crypt/pgp.php:1348
-msgid "PGP Public Key"
-msgstr "Clef publique PGP"
-
-#: lib/Horde/Crypt/pgp.php:1330
-msgid "PGP Signed/Encrypted Data"
-msgstr "Données PGP signées/chiffrées"
-
-#: admin/phpshell.php:68
-msgid "PHP Code"
-msgstr "Code PHP"
-
-#: admin/phpshell.php:20
-msgid "PHP Shell"
-msgstr "Interpréteur PHP"
-
-#: lib/Block/weatherdotcom_strings.php:34
-msgid "PM Light Rain"
-msgstr "Pluie légère l'après-midi"
-
-#: lib/Block/weatherdotcom_strings.php:35
-msgid "PM Showers"
-msgstr "Averses l'après-midi"
-
-#: lib/Block/weatherdotcom_strings.php:36
-msgid "PM Snow"
-msgstr "Neige l'après-midi"
-
-#: lib/Block/weatherdotcom_strings.php:37
-msgid "PM Snow Showers"
-msgstr "Chutes de neige l'après-midi"
-
-#: lib/Block/weatherdotcom_strings.php:38
-msgid "PM Sun"
-msgstr "Soleil l'après-midi"
-
-#: lib/Block/weatherdotcom_strings.php:39
-msgid "PM T-Storms"
-msgstr "Orages l'après-midi"
-
-#: lib/api.php:126
-msgid "P_HP Shell"
-msgstr "Interpréteur P_HP"
-
-#: templates/javascript/htmlarea_table_lang.js:46
-msgid "Padding"
-msgstr "Remplissage"
-
-#: lib/Horde/NLS/GeoIP.php:99 lib/Horde/NLS/countries.php:172
-#: lib/Horde/NLS/tld.php:187
-msgid "Pakistan"
-msgstr "Pakistan"
-
-#: lib/Horde/NLS/GeoIP.php:101 lib/Horde/NLS/countries.php:173
-#: lib/Horde/NLS/tld.php:194
-msgid "Palau"
-msgstr "Belau"
-
-#: lib/Horde/NLS/GeoIP.php:101 lib/Horde/NLS/countries.php:174
-#: lib/Horde/NLS/tld.php:192
-msgid "Palestinian Territory, Occupied"
-msgstr "Palestine (territoire occupé)"
-
-#: lib/Horde/NLS/GeoIP.php:98 lib/Horde/NLS/countries.php:175
-#: lib/Horde/NLS/tld.php:182
-msgid "Panama"
-msgstr "Panama"
-
-#: lib/Horde/NLS/GeoIP.php:99 lib/Horde/NLS/countries.php:176
-#: lib/Horde/NLS/tld.php:185
-msgid "Papua New Guinea"
-msgstr "Papouasie-Nouvelle-Guinée"
-
-#: lib/Horde/NLS/GeoIP.php:102 lib/Horde/NLS/countries.php:177
-#: lib/Horde/NLS/tld.php:195
-msgid "Paraguay"
-msgstr "Paraguay"
-
-#: lib/Block/weatherdotcom_strings.php:33
-msgid "Partly Cloudy"
-msgstr "Partiellement nuageux"
-
-#: admin/user.php:36 admin/setup/index.php:183
-#: lib/Net/SMS/clickatell_http.php:198 lib/Net/SMS/sms2email_http.php:536
-#: lib/Horde/Form.php:2018 templates/login/login.inc:70
-#: templates/admin/user/update.inc:36
-msgid "Password"
-msgstr "Mot de passe"
+#: templates/compose/compose.inc:293
+msgid "Normal"
+msgstr "Normal"
 
-#: lib/Horde/Crypt/smime.php:1322
-msgid "Password incorrect"
-msgstr "Mot de passe incorrect"
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
+msgid "Not Deleted"
+msgstr "Non supprimé"
 
-#: lib/Horde/Auth/radius.php:152
-msgid "Password required for RADIUS authentication."
-msgstr "Mot de passe requis pour l'authentification RADIUS."
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
+msgid "Not Draft"
+msgstr "N'est pas un brouillon"
 
-#: lib/Horde/Form.php:2053
-msgid "Password with confirmation"
-msgstr "Mot de passe avec confirmation"
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
+msgid "Not Important"
+msgstr "Peu important"
 
-#: templates/rpcsum/rpcsum.inc:90
-msgid "Password:"
-msgstr "Mot de passe :"
+#: templates/mailbox/navbar.inc:25
+msgid "Not Personal"
+msgstr "Non personnel"
 
-#: templates/login/mobile.inc:11
-msgid "Password: "
-msgstr "Mot de passe : "
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr "Clef publique invalide."
 
-#: admin/user.php:150 lib/Horde/Form.php:2034
-#: templates/admin/user/update.inc:15
-msgid "Passwords must match."
-msgstr "Les mots de passe doivent être identiques."
+#: templates/search/main.inc:67
+msgid "Not deleted messages"
+msgstr "Messages non-supprimés"
 
-#: admin/sqlshell.php:120 templates/javascript/htmlarea_context_lang.js:22
-msgid "Paste"
-msgstr "Coller"
+#: templates/search/main.inc:51
+msgid "Not important messages"
+msgstr "Messages peu importants"
 
-#: templates/javascript/htmlarea_lang.js:37
-msgid "Paste from clipboard"
-msgstr "Coller depuis le presse-papiers"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr "Notez que cela peut prendre un certain temps"
 
-#: templates/javascript/htmlarea_lang.js:51
-msgid "Path"
-msgstr "Chemin"
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Rien"
 
-#: templates/admin/user/approve.inc:2 templates/admin/user/removequeued.inc:4
-msgid "Pending Signups:"
-msgstr "Confirmations en attente :"
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Notification : les pièces jointes liées ont été téléchargées"
 
-#: lib/Block/fortune.php:54
-msgid "People"
-msgstr "Personnes"
+#: config/prefs.php.dist:377
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Nombre de mois pour garder de vieux attachements liés si supprimés "
+"mensuellement."
 
-#: templates/javascript/htmlarea_lang.js:107
-msgid "Percent"
-msgstr "Pourcentage"
+#: config/prefs.php.dist:359
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"Nombre de dossiers de messages envoyés à garder s'ils sont effacés "
+"mensuellement."
 
-#: templates/maintenance/confirm_bottom.inc:6
-msgid "Perform Maintenance Operations"
-msgstr "Effectuer les opérations de maintenance"
+#: templates/contacts/contacts.inc:254
+msgid "OK"
+msgstr "OK"
 
-#: admin/perms/addchild.php:61 admin/perms/addchild.php:64
-#: admin/perms/addchild.php:67
-msgid "Permission"
-msgstr "Permission"
+#: templates/search/fields.inc:5 templates/pgp/import_key.inc:48
+#: templates/smime/import_key.inc:49
+msgid "OR"
+msgstr "OU"
 
-#: admin/perms/delete.php:68
-#, php-format
-msgid "Permission '%s' not deleted."
-msgstr "La permission %s n'est pas supprimée."
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "Anciens messages"
 
-#: admin/perms/addchild.php:93 admin/perms/delete.php:74
-#: admin/perms/edit.php:224 admin/perms/index.php:22
-msgid "Permissions Administration"
-msgstr "Administration des permissions"
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Les dossiers d'anciens messages envoyés sont en cours d'effacement."
 
-#: lib/Horde/Perms/UI.php:145 lib/Horde/Perms/UI.php:148
-#: lib/Horde/Perms/UI.php:152
-msgid "Permissions for"
-msgstr "Permissions pour"
+#: lib/Block/summary.php:28
+msgid "Only display folders with unread messages in them?"
+msgstr "Afficher les dossiers avec des messages non-lus seulement ?"
 
-#: lib/Horde/NLS/GeoIP.php:98 lib/Horde/NLS/countries.php:178
-#: lib/Horde/NLS/tld.php:183
-msgid "Peru"
-msgstr "Pérou"
+#: templates/javascript/folders.js:81
+msgid "Only one folder should be selected for this action."
+msgstr "Vous ne pouvez sélectionner qu'un seul dossier pour cette action."
 
-#: lib/Block/fortune.php:55
-msgid "Pets"
-msgstr "Animaux"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "Ouvrir _le dossier"
 
-#: lib/Horde/NLS/GeoIP.php:99 lib/Horde/NLS/countries.php:179
-#: lib/Horde/NLS/tld.php:186
-msgid "Philippines"
-msgstr "Philippines"
+#: folders.php:408
+msgid "Opened Folder"
+msgstr "Dossier ouvert"
 
-#: lib/Horde/MIME/Viewer/vcard.php:196
-msgid "Phone"
-msgstr "Téléphone"
+#: lib/MIME/Viewer/itip.php:700
+msgid "Optional Participant"
+msgstr "Participant facultatif"
 
-#: lib/Horde/NLS/GeoIP.php:100 lib/Horde/NLS/countries.php:180
-#: lib/Horde/NLS/tld.php:190
-msgid "Pitcairn"
-msgstr "Pitcairn"
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr "Autres comptes de courrier"
 
-#: templates/javascript/htmlarea_lang.js:108
-msgid "Pixels"
-msgstr "Pixels"
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "Autres options"
 
-#: lib/Block/fortune.php:56
-msgid "Platitudes"
-msgstr "Platitudes"
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Serveur distant"
 
-#: templates/javascript/htmlarea_table_lang.js:47
-msgid "Please click into some cell"
-msgstr "SVP cliquez dans une cellule"
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
+msgid "PGP"
+msgstr "PGP"
 
-#: templates/javascript/htmlarea_context_lang.js:48
-msgid "Please confirm that you want to remove this element:"
-msgstr "SVP confirmez la suppression de cet élément :"
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr "Chiffrer le message avec PGP"
 
-#: templates/javascript/htmlarea_context_lang.js:55
-msgid "Please confirm that you want to unlink this element."
-msgstr "SVP confirmez que vous voulez délier cet élément."
+#: compose.php:335
+msgid "PGP Error: "
+msgstr "Erreur PGP : "
 
-#: lib/Horde/Form.php:2569
-msgid "Please enter a month and a year."
-msgstr "Veuillez saisir un mois et une année."
+#: compose.php:314
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+"Erreur PGP : la phrase secrète est nécessaire pour la clef privée "
+"personnelle."
 
-#: templates/prefs/categorymanagement.inc:12
-msgid "Please enter a name for the new category:"
-msgstr "Veuillez saisir un nom pour la nouvelle catégorie :"
+#: config/prefs.php.dist:142
+msgid "PGP Options"
+msgstr "Options de PGP"
 
-#: lib/Horde/Form.php:1307
-msgid "Please enter a valid IP address."
-msgstr "Veuillez entrer une adresse IP valide."
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr "Entrée de la phrase secrète PGP"
 
-#: lib/Horde/Form.php:2658
-msgid "Please enter a valid date, check the number of days in the month."
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
-"Veuillez entrer une date valide ; vérifiez le nombre de jours du mois. "
+"Le support de la paire de clefs personnelles requiert une connexion au web "
+"sécurisée."
 
-#: lib/Horde/Form.php:2449
-msgid "Please enter a valid time."
-msgstr "Veuillez entrer une heure valide."
+#: lib/MIME/Viewer/pgp.php:172
+msgid "PGP Public Key Text"
+msgstr "Texte de la clé publique PGP"
 
-#: templates/problem/problem.inc:7
-msgid "Please provide a summary of the problem."
-msgstr "Veuillez fournir un résumé du problème."
-
-#: templates/login/login.inc:18 templates/login/login.inc:22
-msgid "Please provide your username and password"
-msgstr "Veuillez fournir votre nom d'utilisateur et votre mot de passe"
+#: pgp.php:145
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "La clef publique PGP de « %s (%s) » a bien été ajoutée."
 
-#: templates/maintenance/agreement_top.inc:12
+#: pgp.php:241
 #, php-format
-msgid ""
-"Please read the following text.  You MUST agree with the terms to use the "
-"system."
-msgstr ""
-"Veuillez lire le texte suivant. Vous devez accepter les conditions pour "
-"utiliser le système."
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "La clef publique PGP de « %s » a bien été supprimée."
 
-#: po/translation.php:17
-msgid "Please report any bugs to i18n at lists.horde.org."
-msgstr "Veuillez faire part des dysfonctionnements à i18n at lists.horde.org."
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr "Anneau de clefs publiques PGP"
 
-#: lib/Horde/Prefs/CategoryManager.php:71
-msgid "Please type the new category name:"
-msgstr "Veuillez entrer le nouveau nom de la catégorie :"
+#: templates/compose/encrypt_list.inc:8
+msgid "PGP Sign Message"
+msgstr "Signer le message avec PGP"
 
-#: lib/Horde/NLS/GeoIP.php:99 lib/Horde/NLS/countries.php:181
-#: lib/Horde/NLS/tld.php:188
-msgid "Poland"
-msgstr "Pologne"
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr "Signer/chiffrer le message avec PGP"
 
-#: lib/Block/fortune.php:57
-msgid "Politics"
-msgstr "Politique"
+#: pgp.php:198
+msgid "PGP private key successfully added."
+msgstr "La clef PGP privée a bien été ajoutée."
 
-#: lib/Horde/NLS/GeoIP.php:101 lib/Horde/NLS/countries.php:182
-#: lib/Horde/NLS/tld.php:193
-msgid "Portugal"
-msgstr "Portugal"
+#: pgp.php:173
+msgid "PGP public key successfully added."
+msgstr "La clef PGP publique a bien été ajoutée."
 
-#: templates/javascript/htmlarea_anselimage_lang.js:27
-#: templates/javascript/htmlarea_lang.js:124
-msgid "Positioning of this image"
-msgstr "Position de cette image"
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr "Le support de PGP est désactivé sur ce système."
 
-#: templates/javascript/htmlarea_lang.js:111
-msgid "Positioning of this table"
-msgstr "Position de ce tableau"
+#: lib/MIME/Viewer/pgp.php:207
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+"Le support de PGP n'est pas actif actuellement, et la signature numérique "
+"n'a donc pas été vérifiée."
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:91
-msgid "Post to this folder (not enforced by IMAP)"
-msgstr "Envoyer à ce dossier (non appliqué par IMAP)"
+#: lib/MIME/Viewer/pgp.php:294
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+"Le support de PGP n'est pas actif actuellement, et le message ne peut donc "
+"pas être déchiffré."
 
-#: lib/Block/metar.php:264 lib/Block/metar.php:269
-#, php-format
-msgid "Precipitation for last %s hour(s): "
-msgstr "Précipitations pour les %s dernières heures : "
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+"PGP utilise des fenêtres surgissantes. Si cette fonction est désactivée dans "
+"votre navigateur, il faut l'activer, sans quoi PGP ne fonctionnera pas "
+"correctement."
 
-#: lib/Horde/Prefs/ldap.php:98
-msgid "Prefs_ldap: Required LDAP extension not found."
-msgstr "Prefs_ldap : extension requise LDAP non trouvée."
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr "POP3"
 
-#: lib/Horde/Prefs/session.php:33
-msgid "Prefs_session: Required session extension not found."
-msgstr "Prefs_session : extension requise « session » non trouvée."
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr "POP3 (détecter automatiquement les protocoles)"
 
-#: lib/Block/metar.php:223
-msgid "Pressure"
-msgstr "Pression"
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr "POP3 sur SSL"
 
-#: lib/Block/metar.php:257
-msgid "Pressure at sea level: "
-msgstr "Pression au niveau de la mer : "
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 sur SSL (certificat maison) "
 
-#: lib/Block/weatherdotcom.php:202
-msgid "Pressure: "
-msgstr "Pression : "
+#: templates/login/login.inc:168
+msgid "POP3 over SSL (self-signed)"
+msgstr "POP3 sur SSL (certificat maison)"
 
-#: lib/Horde/UI/VarRenderer/html.php:188
-#: templates/javascript/htmlarea_anselimage_lang.js:23
-#: templates/javascript/htmlarea_lang.js:120
-msgid "Preview"
-msgstr "Aperçu"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr "POP3, sans TLS"
 
-#: templates/javascript/htmlarea_anselimage_lang.js:24
-#: templates/javascript/htmlarea_lang.js:121
-msgid "Preview the image in a new window"
-msgstr "Aperçu de l'image dans une nouvelle fenêtre"
+#: templates/mailbox/header.inc:22
+#, php-format
+msgid "Page %d of %d"
+msgstr "Page %d de %d"
 
-#: lib/Horde/Prefs/UI.php:358 lib/Horde/Prefs/UI.php:362
-msgid "Previous options"
-msgstr "Options précédentes"
+#: config/prefs.php.dist:892
+msgid "Page with the First Unseen Message"
+msgstr "Page avec le premier message non lu"
 
-#: templates/javascript/htmlarea_lang.js:41
-msgid "Print document"
-msgstr "Imprimer le document"
+#: config/prefs.php.dist:893
+msgid "Page with the Last Unseen Message"
+msgstr "Page avec le dernier message non lu"
 
-#: lib/Horde/Crypt/pgp.php:409
-msgid "Private Key"
-msgstr "Clef privée"
+#: templates/message/headers.inc:43
+msgid "Part(s)"
+msgstr "Partie(s)"
 
-#: lib/Horde/Menu.php:169
-msgid "Problem"
-msgstr "Problème"
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr "Phrase secrète"
 
-#: services/problem.php:127
-msgid "Problem Description"
-msgstr "Description du problème"
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr "Phrase secrète (à nouveau)"
 
-#: lib/Horde/Form.php:2111 lib/Horde/Form.php:2188
-msgid "Prompt text"
-msgstr "Texte court"
+#: smime.php:231 pgp.php:306
+msgid "Passphrase successfully unloaded."
+msgstr "La phrase secrète a bien été déchargée."
 
-#: lib/Horde/Crypt/pgp.php:409
-msgid "Public Key"
-msgstr "Clef publique"
+#: templates/pgp/passphrase.inc:29 templates/smime/passphrase.inc:18
+msgid "Passphrase:"
+msgstr "Phrase secrète :"
 
-#: lib/Horde/Crypt/smime.php:645
-msgid "Public Key Algorithm"
-msgstr "Algorithme de clef publique"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "La phrase secrète ne doit pas être vide"
 
-#: lib/Horde/Crypt/pgp.php:227
-msgid "Public/Private keypair not generated successfully."
-msgstr "Échec de la génération de la paire de clefs publique/privée."
+#: pgp.php:110
+msgid "Passphrases do not match"
+msgstr "Les phrases secrètes diffèrent"
 
-#: lib/Horde/NLS/GeoIP.php:100 lib/Horde/NLS/countries.php:183
-#: lib/Horde/NLS/tld.php:191
-msgid "Puerto Rico"
-msgstr "Porto Rico"
+#: templates/smime/import_key.inc:71 templates/login/login.inc:191
+#: templates/fetchmail/manage.inc:20
+msgid "Password"
+msgstr "Mot de passe"
 
-#: lib/Horde/NLS/GeoIP.php:102 lib/Horde/NLS/countries.php:184
-#: lib/Horde/NLS/tld.php:196
-msgid "Qatar"
-msgstr "Qatar"
+#: templates/fetchmail/manage.inc:48
+msgid "Perform maintenance operations on login?"
+msgstr "Exécution des opérations de maintenance à la connexion ?"
 
-#: admin/sqlshell.php:62
-msgid "Query"
-msgstr "Requête"
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
+msgstr "Modification impossible des permissions de cet utilisateur."
 
-#: lib/Horde/Crypt/smime.php:663
-#, php-format
-msgid "RSA Public Key (%d bit)"
-msgstr "Clef publique RSA (%d bits)"
+#: mailbox.php:697 message.php:493 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+msgid "Personal"
+msgstr "Personnel"
 
-#: lib/Horde/Form.php:2264
-msgid "Radio selection"
-msgstr "Sélection radio"
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "Données personnelles"
 
-#: lib/Block/weatherdotcom_strings.php:40
-msgid "Rain"
-msgstr "Pluie"
+#: pgp.php:116
+msgid "Personal PGP keypair generated successfully."
+msgstr "Votre paire de clefs PGP personnelle a bien été générée."
 
-#: lib/Block/weatherdotcom_strings.php:41
-msgid "Rain Early"
-msgstr "Pluie tôt le matin"
+#: pgp.php:123
+msgid "Personal PGP keys deleted successfully."
+msgstr "Vos clefs PGP personnelles ont bien été effacées."
 
-#: lib/Block/weatherdotcom_strings.php:42
-msgid "Rain Late"
-msgstr "Pluie tard dans la journée"
+#: smime.php:203
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Certificats personnels S/MIME NON importés : "
 
-#: lib/Block/weatherdotcom_strings.php:43
-msgid "Rain Shower"
-msgstr "Averses"
+#: smime.php:128
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "Vos clefs S/MIME personnelles ont bien été effacées."
 
-#: lib/Block/weatherdotcom_strings.php:44
-msgid "Rain and Snow"
-msgstr "Pluie et neige"
+#: config/prefs.php.dist:222
+msgid "Place your signature before replies and forwards?"
+msgstr "Placer votre signature au début des réponses et des transferts ?"
 
-#: lib/Block/weatherdotcom_strings.php:45
-msgid "Rain to Snow"
-msgstr "Pluie puis neige"
+#: compose.php:258
+msgid "Plaintext Version of Message"
+msgstr "Version texte brut du message"
 
-#: lib/Block/fortune.php:3
-msgid "Random Fortune"
-msgstr "Fortune au hasard"
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Notification sonore de courrier ? Cela suppose que votre navigateur supporte "
+"l'incorporation de fichiers sons. C'est le cas de la plupart sous Windows ou "
+"Mac, mais sur d'autres plates-formes une extension peut être nécessaire."
 
-#: lib/Horde/MIME/Viewer/rar.php:68 lib/Horde/MIME/Viewer/zip.php:73
-msgid "Ratio"
-msgstr "Taux"
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "Please enter a name for the new folder:"
+msgstr "Veuillez entrer un nom pour le nouveau dossier :"
 
-#: lib/Horde/Perms.php:293 templates/shares/edit.inc:34
-#: templates/shares/edit.inc:68 templates/shares/edit.inc:91
-#: templates/shares/edit.inc:114 templates/shares/edit.inc:137
-#: templates/shares/edit.inc:180
-msgid "Read"
-msgstr "Lire"
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
+msgid "Please enter the name of the new folder:"
+msgstr "Veuillez entrer le nom du nouveau dossier :"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:87
-msgid "Read messages"
-msgstr "Messages lus"
+#: templates/javascript/folders.js:139
+msgid "Please enter the new name:"
+msgstr "Veuillez entrer le nouveau nom :"
 
-#: templates/admin/user/remove.inc:12
+#: templates/pgp/passphrase.inc:19
 #, php-format
-msgid "Really delete %s? This operation cannot be undone."
-msgstr "Suppression définitive de %s ?"
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+"Veuillez entrer la phrase secrète pour votre clef PGP privée. Il ne faudra "
+"entrer cette phrase secrète qu'une seule fois par session %s."
 
-#: templates/admin/user/clear.inc:12
+#: templates/smime/passphrase.inc:13
 #, php-format
-msgid "Really remove user data for user %s? This operation cannot be undone."
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
 msgstr ""
-"Suppression définitive des données pour l'utilisateur %s ? Cette opération "
-"est définitive."
+"Veuillez entrer la phrase secrète pour votre clef S/MIME privée. Il ne "
+"faudra entrer cette phrase secrète qu'une seule fois par session %s."
 
-#: templates/javascript/htmlarea_lang.js:34
-msgid "Redoes your last action"
-msgstr "Reprendre votre dernière action"
+#: recompose.php:96
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+"Veuillez vous reconnecter pour poursuivre la rédaction de votre message. Si "
+"vous n'utilisez PAS les cookies ET si vous rédigez les messages dans une "
+"fenêtre à part, vous devrez aussi vous reconnecter dans votre fenêtre "
+"principale. Ceci permet d'empêcher l'utilisation de votre identifiant de "
+"session par d'éventuels intrus, et ne peut pas être évité. Veuillez nous "
+"excuser de ce désagrément. "
 
-#: lib/Horde/Form.php:894 lib/Horde/Form.php:1213 lib/Horde/Form.php:1235
-msgid "Regex"
-msgstr "Expression rationnelle"
+#: templates/login/login.inc:71
+msgid "Please provide your password."
+msgstr "Veuillez saisir votre mot de passe."
 
-#: lib/Horde/Form.php:3247
-msgid "Relationship Browser"
-msgstr "Navigateur relationnel"
+#: templates/login/login.inc:67
+msgid "Please provide your username."
+msgstr "Veuillez saisir votre nom d'utilisateur."
 
-#: lib/Block/metar.php:324
-msgid "Remarks"
-msgstr "Remarques"
+#: compose.php:106 lib/IMP.php:463
+msgid "Please resolve ambiguous or invalid addresses."
+msgstr "Veuillez corriger les adresses ambiguës ou invalides."
 
-#: templates/rpcsum/rpcsum.inc:84
-msgid "Remote URL (http://www.example.com/horde):"
-msgstr "URL distante (http://www.exemple.com/horde/) :"
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Veuillez sélectionner un dossier avant d'accomplir cette action."
 
-#: templates/admin/user/approve.inc:28
-#: templates/admin/user/removequeued.inc:15 templates/admin/groups/edit.inc:21
-msgid "Remove"
-msgstr "Retirer"
+#: templates/search/javascript.inc:41
+msgid "Please select at least one folder to search."
+msgstr "Veuillez sélectionner au moins un dossier de recherche."
 
-#: templates/portal/layout.inc:11
-msgid "Remove Block"
-msgstr "Retirer le bloc"
+#: templates/javascript/folders.js:12
+msgid "Please select only one folder for this operation."
+msgstr "Veuillez sélectionner un dossier unique pour cette opération."
 
-#: lib/Horde/UI/VarRenderer/html.php:532
-msgid "Remove column"
-msgstr "Retirer la colonne"
+#: templates/compose/redirect.inc:73
+msgid "Please select or edit in the box to the right:"
+msgstr "Veuillez sélectionner ou éditer dans la boîte à droite :"
 
-#: templates/javascript/htmlarea_lang.js:40
-msgid "Remove formatting"
-msgstr "Retirer le formatage"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr "Propulsé par Horde"
 
-#: templates/data/csvmap.inc:136
-msgid "Remove pair"
-msgstr "Retirer la paire"
+#: config/prefs.php.dist:214
+msgid "Precede your signature with dashes ('-- ')?"
+msgstr "Faire précéder votre signature de tirets ('-- ') ?"
 
-#: admin/setup/index.php:205
-msgid "Remove saved script from server's temporary directory."
-msgstr "Enlever le script enregistré du répertoire temporaire du serveur."
+#: smime.php:237 pgp.php:253 filterprefs.php:39
+msgid "Preferences successfully updated."
+msgstr "Les préférences ont bien été mises à jour."
 
-#: templates/javascript/htmlarea_context_lang.js:41
-msgid "Remove the"
-msgstr "Retirer le"
+#: templates/compose/attachments.inc:3
+msgid "Preview"
+msgstr "Pré-visualisation"
 
-#: templates/javascript/htmlarea_context_lang.js:49
-msgid "Remove this node from the document"
-msgstr "Retirer ce noeud du document"
+#: templates/message/navbar_navigate.inc:28
+msgid "Previous Message"
+msgstr "Message précédent"
 
-#: templates/admin/user/remove.inc:16
-msgid "Remove user"
-msgstr "Retirer l'utilisateur"
+#: mailbox.php:332
+msgid "Previous Page"
+msgstr "Page précédente"
 
-#: templates/admin/user/remove.inc:7
-#, php-format
-msgid "Remove user: %s"
-msgstr "Retirer l'utilisateur : %s"
+#: templates/message/navbar_actions.inc:33
+msgid "Print"
+msgstr "Imprimer"
 
-#: lib/Horde/RPC/xmlrpc.php:138
-msgid "Request couldn't be answered. Returned errorcode: "
-msgstr "Aucune réponse à votre requête. Code d'erreur retourné : "
+#: templates/message/headers.inc:38
+msgid "Priority"
+msgstr "Priorité"
 
-#: lib/Horde.php:174 lib/Horde.php:487
-#, php-format
-msgid "Required '%s' not specified in %s configuration."
-msgstr ""
-"Le paramètre obligatoire '%s' n'est pas spécifié dans la configuration %s."
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr "Mot de passe de la clef privée"
 
-#: lib/VFS/ftp.php:747 lib/VFS/sql.php:581 lib/VFS/sql_file.php:710
-#, php-format
-msgid "Required '%s' not specified in VFS configuration."
-msgstr ""
-"Le paramètre obligatoire '%s' n'est pas spécifié dans la configuration du "
-"VFS."
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr "Demander chaque fois qu'une pièce jointe est envoyée ; NON par défaut"
 
-#: lib/Horde/Util.php:784
-#, php-format
-msgid "Required '%s' not specified in configuration."
-msgstr ""
-"Le paramètre obligatoire '%s' n'est pas spécifié dans la configuration."
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr "Demander chaque fois qu'une pièce jointe est envoyée ; OUI par défaut"
 
-#: lib/Horde/Form/Renderer.php:328
-msgid "Required Field"
-msgstr "Champ obligatoire"
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr "Protocole :"
 
-#: admin/user.php:31 lib/Horde/Form.php:339 lib/Horde/Form/Renderer.php:315
-#: templates/rpcsum/rpcsum.inc:101 templates/admin/user/update.inc:44
-msgid "Reset"
-msgstr "RÀZ"
+#: lib/Crypt/PGP.php:430
+msgid "Public PGP keyserver support has been disabled."
+msgstr "Le support du serveur de clefs public a été désactivé."
 
-#: services/resetpassword.php:46
-msgid "Reset Password"
-msgstr "Remise à zéro du mot de passe"
-
-#: services/resetpassword.php:27
-msgid "Reset Your Password"
-msgstr "Remettre à zéro votre mot de passe"
-
-#: admin/cmdshell.php:28 admin/phpshell.php:71 admin/sqlshell.php:65
-msgid "Results"
-msgstr "Résultats"
-
-#: po/translation.php:821
-msgid "Results (including Horde):"
-msgstr "Résultats (incluant Horde) :"
-
-#: po/translation.php:819
-msgid "Results:"
-msgstr "Résultats :"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
+msgid "Pur_ge Deleted"
+msgstr "Pur_ger les effacés"
 
-#: templates/rpcsum/rpcsum.inc:102 templates/prefs/end.inc:7
-msgid "Return to Options"
-msgstr "Revenir aux options"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
+msgid "Purge Deleted"
+msgstr "Purger les éléments effacés"
 
-#: lib/Horde/NLS/GeoIP.php:102 lib/Horde/NLS/countries.php:185
-#: lib/Horde/NLS/tld.php:197
-msgid "Reunion"
-msgstr "Réunion"
-
-#: admin/setup/config.php:44 admin/setup/config.php:48
-msgid "Revert Configuration"
-msgstr "Revenir à la configuration précédente"
-
-#: lib/Block/fortune.php:58
-msgid "Riddles"
-msgstr "Devinettes"
-
-#: templates/javascript/htmlarea_lang.js:70
-#: templates/javascript/htmlarea_table_lang.js:48
-msgid "Right"
-msgstr "Droite"
-
-#: lib/Horde/Form.php:3119
-msgid "Right header"
-msgstr "Entête de droite"
-
-#: lib/Horde/Form.php:3115
-msgid "Right values"
-msgstr "Valeurs correctes"
-
-#: templates/javascript/htmlarea_context_lang.js:28
-msgid "Ro_w Properties..."
-msgstr "Propriétés de la ran_gée ..."
+#: templates/folders/actions.inc:24
+msgid "Purge Folder(s)"
+msgstr "Vider le(s) dossier(s)"
 
-#: lib/Horde/MIME/Viewer/vcard.php:234
-msgid "Role"
-msgstr "Rôle"
+#: config/prefs.php.dist:396
+msgid "Purge Trash how often:"
+msgstr "Fréquence d'effacement du contenu de la corbeille :"
 
-#: lib/Horde/NLS/GeoIP.php:102 lib/Horde/NLS/countries.php:186
-#: lib/Horde/NLS/tld.php:198
-msgid "Romania"
-msgstr "Roumanie"
-
-#: lib/Horde/UI/VarRenderer/html.php:208
-msgid "Rotate 180"
-msgstr "Pivoter 180"
-
-#: lib/Horde/UI/VarRenderer/html.php:205
-msgid "Rotate Left"
-msgstr "Pivoter à gauche"
-
-#: lib/Horde/UI/VarRenderer/html.php:211
-msgid "Rotate Right"
-msgstr "Pivoter à droite"
-
-#: templates/javascript/htmlarea_table_lang.js:49
-msgid "Row Properties"
-msgstr "Propriétés de la rangée"
-
-#: templates/javascript/htmlarea_table_lang.js:70
-msgid "Row properties"
-msgstr "Propriétés de la rangée"
-
-#: templates/javascript/htmlarea_lang.js:101
-msgid "Rows:"
-msgstr "Rangées :"
-
-#: templates/javascript/htmlarea_table_lang.js:53
-msgid "Rules"
-msgstr "Règles"
-
-#: templates/javascript/htmlarea_table_lang.js:50
-msgid "Rules will appear between all rows and columns"
-msgstr "Des filets apparaîtront entre toutes les rangées et les colonnes"
-
-#: templates/javascript/htmlarea_table_lang.js:51
-msgid "Rules will appear between columns only"
-msgstr "Des filets apparaîtront entre les colonnes seulement"
-
-#: templates/javascript/htmlarea_table_lang.js:52
-msgid "Rules will appear between rows only"
-msgstr "Des filets apparaîtront entre les rangées seulement"
-
-#: admin/sqlshell.php:121
-msgid "Run"
-msgstr "Lancer"
-
-#: lib/Horde/NLS/GeoIP.php:103 lib/Horde/NLS/countries.php:187
-#: lib/Horde/NLS/tld.php:199
-msgid "Russian Federation"
-msgstr "Russie"
-
-#: lib/Horde/NLS/GeoIP.php:103 lib/Horde/NLS/countries.php:188
-#: lib/Horde/NLS/tld.php:200
-msgid "Rwanda"
-msgstr "Rwanda"
-
-#: lib/Horde/Crypt/smime.php:285
-msgid "S/MIME Cryptographic Signature"
-msgstr "Signature électronique S/MIME"
-
-#: lib/Horde/Crypt/smime.php:323
-msgid "S/MIME Encrypted Message"
-msgstr "Message chiffré S/MIME"
-
-#: lib/Horde/Auth/sasl.php:81
-msgid "SASL authentication is not available."
-msgstr "L'authentification SASL n'est pas disponible"
-
-#: admin/sqlshell.php:21
-msgid "SQL Shell"
-msgstr "Interpréteur SQL"
-
-#: lib/Horde/UI/VarRenderer/html.php:358
-msgid "SS"
-msgstr "SS"
-
-#: lib/Horde/Notification/Listener/mobile.php:35
-msgid "SUCCESS"
-msgstr "SUCCÈS"
-
-#: lib/api.php:130
-msgid "S_QL Shell"
-msgstr "Interpréteur S_QL"
-
-#: templates/javascript/open_calendar.js:61
-msgid "Sa"
-msgstr "Sa"
-
-#: lib/Horde/NLS/GeoIP.php:104 lib/Horde/NLS/countries.php:189
-#: lib/Horde/NLS/tld.php:207
-msgid "Saint Helena"
-msgstr "Sainte-Hélène"
-
-#: lib/Horde/NLS/GeoIP.php:84 lib/Horde/NLS/countries.php:190
-#: lib/Horde/NLS/tld.php:131
-msgid "Saint Kitts and Nevis"
-msgstr "Saint-Christophe-et-Niévès"
-
-#: lib/Horde/NLS/GeoIP.php:87 lib/Horde/NLS/countries.php:191
-#: lib/Horde/NLS/tld.php:139
-msgid "Saint Lucia"
-msgstr "Sainte-Lucie"
-
-#: lib/Horde/NLS/GeoIP.php:100 lib/Horde/NLS/countries.php:192
-#: lib/Horde/NLS/tld.php:189
-msgid "Saint Pierre and Miquelon"
-msgstr "Saint-Pierre et Miquelon"
-
-#: lib/Horde/NLS/GeoIP.php:115 lib/Horde/NLS/countries.php:193
-#: lib/Horde/NLS/tld.php:244
-msgid "Saint Vincent and the Grenadines"
-msgstr "Saint-Vincent-et-les Grenadines"
-
-#: templates/javascript/htmlarea_lang.js:92
-msgid "Same frame (_self)"
-msgstr "Même cadre (_self)"
-
-#: lib/Horde/NLS/GeoIP.php:117 lib/Horde/NLS/countries.php:194
-#: lib/Horde/NLS/tld.php:251
-msgid "Samoa"
-msgstr "Samoa occidentales"
-
-#: lib/Horde/NLS/GeoIP.php:106 lib/Horde/NLS/countries.php:195
-#: lib/Horde/NLS/tld.php:212
-msgid "San Marino"
-msgstr "Saint-Marin"
-
-#: lib/Horde/NLS/GeoIP.php:107 lib/Horde/NLS/countries.php:196
-#: lib/Horde/NLS/tld.php:216
-msgid "Sao Tome and Principe"
-msgstr "Sao-Tomé-et-Principe"
-
-#: lib/Horde/NLS/GeoIP.php:119
-msgid "Satellite Provider"
-msgstr "Fournisseur satellite"
-
-#: lib/Horde/NLS/GeoIP.php:103 lib/Horde/NLS/countries.php:197
-#: lib/Horde/NLS/tld.php:201
-msgid "Saudi Arabia"
-msgstr "Arabie Saoudite"
+#: config/prefs.php.dist:405
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr "Effacer les messages de la corbeille au delà de tant de jours."
 
-#: templates/portal/layout.inc:98
-msgid "Save"
-msgstr "Enregistrer"
+#: config/prefs.php.dist:386
+msgid "Purge old messages in the Trash folder?"
+msgstr "Effacer les anciens messages de la corbeille ?"
 
-#: templates/shares/edit.inc:216
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Save %s"
-msgstr "Enregistrer %s"
+msgid "Purging %d messages from Trash folder."
+msgstr "Effacement de %d message de la corbeille."
 
-#: templates/admin/groups/edit.inc:49
-#, php-format
-msgid "Save '%s'"
-msgstr "Enregistrer « %s »"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "Effacement de 1 message de la corbeille."
 
-#: templates/prefs/end.inc:5
-msgid "Save Options"
-msgstr "Enregistrer les options"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "État du quota : %.2f Mo / %.2f Mo  (%.2f%%)"
 
-#: admin/setup/index.php:170
-msgid ""
-"Save generated configuration as a PHP script to your server's temporary "
-"directory."
-msgstr ""
-"Enregistrer la configuration générée comme un script PHP dans le répertoire "
-"temporaire de votre serveur."
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "État du quota : %.2f Mo /aucune limite"
 
-#: admin/setup/scripts.php:69
+#: templates/quota/quota.inc:24
 #, php-format
-msgid "Saved %s configuration."
-msgstr "Enregistrer la configuration de %s"
+msgid "Quota status: NO LIMIT"
+msgstr "État du quota : aucune limite"
 
-#: admin/setup/scripts.php:90
+#: config/prefs.php.dist:500
 #, php-format
-msgid "Saved setup upgrade script to: '%s'."
-msgstr "Enregistré le script de configuration de mise à jour sous: %s"
+msgid "Quoting %f:"
+msgstr "%f a écrit :"
 
-#: lib/Block/weatherdotcom_strings.php:46
-msgid "Scattered T-Storms"
-msgstr "Orages isolés"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Reconstruire l'arborescence des dossiers"
 
-#: lib/Block/fortune.php:59
-msgid "Science"
-msgstr "Science"
+#: lib/Search.php:617
+msgid "Received On"
+msgstr "Reçu le "
 
-#: templates/admin/user/list.inc:14 templates/admin/user/list.inc:16
-msgid "Search"
-msgstr "Recherche"
+#: lib/Search.php:625
+msgid "Received Since"
+msgstr "Reçu depuis"
 
-#: po/translation.php:1448
-#, php-format
-msgid "Searching Horde applications in %s"
-msgstr "Recherche des modules Horde dans %s"
+#: lib/Search.php:621
+msgid "Received Until"
+msgstr "Reçu depuis"
 
-#: po/translation.php:123
-msgid "Searching gettext binaries..."
-msgstr "Recherche des binaires gettext..."
+#: templates/message/navbar_actions.inc:16
+msgid "Redirec_t"
+msgstr "Rediri_ger"
 
-#: lib/Horde/Form.php:2971
-msgid "Select Files"
-msgstr "Choisissez les fichiers"
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Rediriger"
 
-#: lib/Horde/UI/VarRenderer/html.php:456
-msgid "Select a date"
-msgstr "Sélectionnez une date"
+#: templates/compose/redirect.inc:110
+msgid "Redirect Message"
+msgstr "Rediriger le message"
 
-#: templates/shares/edit.inc:198
-msgid "Select a group to add"
-msgstr "Sélectionnez un groupe à ajouter"
-
-#: templates/shares/edit.inc:43
-msgid "Select a new owner"
-msgstr "Sélectionnez un nouveau propriétaire"
-
-#: templates/rpcsum/rpcsum.inc:60
-msgid "Select a server"
-msgstr "Sélectionnez un serveur"
-
-#: templates/shares/edit.inc:156
-msgid "Select a user to add"
-msgstr "Sélectionnez un utilisateur à ajouter"
-
-#: lib/Horde/Form.php:2661
-msgid "Select all date components."
-msgstr "Sélectionnez toutes les composantes de la date."
-
-#: lib/Horde/UI/VarRenderer/html.php:814
-msgid "Select an object"
-msgstr "Choisissez un objet"
-
-#: services/keyboard.php:37
-msgid ""
-"Select the characters you need from the boxes below. You can then copy and "
-"paste them from the text area."
-msgstr ""
-"Sélectionnez les caractères dont vous avez besoin à l'aide de l'outil ci-"
-"dessous. Vous pouvez ensuite les copier et les coller dans votre texte."
-
-#: templates/data/date.inc:34
-msgid "Select the date delimiter:"
-msgstr "Sélectionnez le délimiteur de date :"
-
-#: templates/data/date.inc:44
-msgid "Select the date format:"
-msgstr "Sélectionnez le format de date :"
-
-#: templates/prefs/identityselect.inc:89
-msgid "Select the identity you want to change:"
-msgstr "Sélectionner le profil que vous désirez modifier :"
-
-#: templates/data/time.inc:16
-msgid "Select the time delimiter:"
-msgstr "Sélectionnez le délimiteur d'heure :"
-
-#: templates/data/time.inc:25
-msgid "Select the time format:"
-msgstr "Sélectionnez le format de l'heure :"
-
-#: templates/data/csvmap.inc:64
-msgid "Select two matching fields."
-msgstr "Sélectionnez deux champs apparentés."
-
-#: templates/problem/problem.inc:58
-msgid "Send Problem Report"
-msgstr "Envoyer le rapport d'anomalie"
-
-#: lib/Horde/UI/VarRenderer/html.php:964
-msgid "Send SMS"
-msgstr "Envoyer SMS"
-
-#: lib/Horde/NLS/GeoIP.php:106 lib/Horde/NLS/countries.php:198
-#: lib/Horde/NLS/tld.php:213
-msgid "Senegal"
-msgstr "Sénégal"
-
-#: lib/Block/metar.php:314
-msgid "Sensor: "
-msgstr "Sonde : "
-
-#: lib/Horde/UI/VarRenderer/html.php:382 lib/Horde/UI/VarRenderer/html.php:419
-#: templates/javascript/open_calendar.js:73
-msgid "September"
-msgstr "Septembre"
-
-#: lib/Horde/NLS/countries.php:199
-msgid "Serbia and Montenegro"
-msgstr "Serbie et Montenegro"
-
-#: lib/Horde/Crypt/smime.php:701
-msgid "Serial Number"
-msgstr "Numéro de série"
-
-#: lib/Net/SMS/clickatell_http.php:291
-msgid "Session ID expired."
-msgstr "Session expirée."
+#: compose.php:827
+msgid "Redirect this message"
+msgstr "Rediriger ce message"
 
-#: lib/Horde/Form.php:2312
-msgid "Set"
-msgstr "Sélectionner"
+#: compose.php:880
+msgid "Redirecting failed."
+msgstr "La redirection a échoué."
 
-#: admin/setup/config.php:74
-msgid "Setup"
-msgstr "Configuration"
-
-#: templates/admin/setup/index.html:39
-msgid "Setup upgrade scripts available"
-msgstr "Script de configuration de mise à jour disponible"
-
-#: lib/Block/weatherdotcom.php:153
-msgid "Several locations possible with the parameter: "
-msgstr "Plusieurs endroits possibles avec le paramètre : "
-
-#: lib/Horde/NLS/GeoIP.php:104 lib/Horde/NLS/countries.php:200
-#: lib/Horde/NLS/tld.php:203
-msgid "Seychelles"
-msgstr "Seychelles"
-
-#: templates/problem/problem.inc:43
-msgid "Short Summary"
-msgstr "Résumé"
-
-#: lib/Horde/Perms.php:292 templates/shares/edit.inc:33
-#: templates/shares/edit.inc:67 templates/shares/edit.inc:90
-#: templates/shares/edit.inc:113 templates/shares/edit.inc:136
-#: templates/shares/edit.inc:179
-msgid "Show"
-msgstr "Afficher"
-
-#: admin/setup/index.php:158
-msgid ""
-"Show differences between currently saved and the newly generated "
-"configuration."
-msgstr ""
-"Montrer les différences entre la configuration enregistrée actuellement et "
-"celle nouvellement générée."
-
-#: lib/Horde/Form.php:1769
-msgid "Show option to keep original"
-msgstr "Montrer l'option de conserver l'original"
-
-#: lib/Horde/Form.php:2811
-msgid "Show picker"
-msgstr "Montrer le sélecteur"
-
-#: templates/javascript/htmlarea_context_lang.js:58
-msgid "Show the Table Cell Properties dialog"
-msgstr "Afficher la boîte de dialogue tableau cellule"
-
-#: templates/javascript/htmlarea_context_lang.js:63
-msgid "Show the Table Properties dialog"
-msgstr "Afficher la boîte de dialogue des propriétés du tableau"
-
-#: templates/javascript/htmlarea_context_lang.js:59
-msgid "Show the Table Row Properties dialog"
-msgstr "Afficher la boîte de dialogue des propriétés de la rangée du tableau"
-
-#: templates/javascript/htmlarea_context_lang.js:51
-msgid "Show the image properties dialog"
-msgstr "Afficher la boîte de dialogue des propriétés de l'image"
-
-#: lib/Horde/Form.php:1767
-msgid "Show upload"
-msgstr "Afficher l'envoi de fichier"
-
-#: lib/Block/weatherdotcom_strings.php:47
-msgid "Showers"
-msgstr "Averses"
-
-#: lib/Block/weatherdotcom_strings.php:48
-msgid "Showers Early"
-msgstr "Averses tôt dans la journée"
-
-#: lib/Block/weatherdotcom_strings.php:49
-msgid "Showers Late"
-msgstr "Averses tard en journée"
-
-#: lib/Block/weatherdotcom_strings.php:50
-msgid "Showers in the Vicinity"
-msgstr "Averses aux alentours"
-
-#: lib/Horde/Block/Layout.php:399
-msgid "Shrink"
-msgstr "Resserrer"
-
-#: lib/Horde/Block/Layout.php:692 lib/Horde/Block/Layout.php:754
-#: lib/Horde/Block/Layout.php:812 lib/Horde/Block/Layout.php:874
-#: lib/Horde/Block/Layout.php:909 lib/Horde/Block/Layout.php:946
-#: lib/Horde/Block/Layout.php:974 lib/Horde/Block/Layout.php:1004
-msgid "Shrink or move neighbouring block(s) out of the way first"
-msgstr "Resserrer ou dégager d'abord le(s) bloc(s) voisin(s)"
-
-#: lib/Horde/NLS/GeoIP.php:105 lib/Horde/NLS/countries.php:201
-#: lib/Horde/NLS/tld.php:211
-msgid "Sierra Leone"
-msgstr "Sierra Leone"
-
-#: lib/Horde/Auth/Signup.php:265
-msgid "Sign up"
-msgstr "S'inscrire"
-
-#: templates/login/login.inc:89
-msgid "Sign up if not registered"
-msgstr "S'inscrire si non-enregistré"
-
-#: lib/Horde/Crypt/smime.php:712
-msgid "Signature"
-msgstr "Signature"
-
-#: lib/Horde/Crypt/smime.php:711
-msgid "Signature Algorithm"
-msgstr "Algorithme de signature"
-
-#: lib/Horde/NLS/GeoIP.php:104 lib/Horde/NLS/countries.php:202
-#: lib/Horde/NLS/tld.php:206
-msgid "Singapore"
-msgstr "Singapour"
-
-#: lib/Horde/Form.php:896 lib/Horde/Form.php:1215 lib/Horde/Form.php:1237
-#: lib/Horde/Form.php:2246 lib/Horde/Form.php:2928 lib/Horde/Form.php:3121
-#: lib/Horde/MIME/Viewer/rar.php:65 lib/Horde/MIME/Viewer/tgz.php:87
-#: lib/Horde/MIME/Viewer/zip.php:69
-msgid "Size"
-msgstr "Taille"
+#: config/prefs.php.dist:773
+msgid "Refresh Folder Views:"
+msgstr "Rafraîchir l'affichage des dossiers :"
 
-#: templates/maintenance/confirm_bottom.inc:9
-msgid "Skip Maintenance"
-msgstr "Annuler la maintenance"
-
-#: po/translation.php:431 po/translation.php:484 po/translation.php:666
-#: po/translation.php:860 po/translation.php:1223
-msgid "Skipped..."
-msgstr "Passé..."
-
-#: lib/Horde/NLS/GeoIP.php:105 lib/Horde/NLS/countries.php:203
-#: lib/Horde/NLS/tld.php:210
-msgid "Slovakia"
-msgstr "Slovaquie"
-
-#: lib/Horde/NLS/GeoIP.php:105 lib/Horde/NLS/countries.php:204
-#: lib/Horde/NLS/tld.php:208
-msgid "Slovenia"
-msgstr "Slovénie"
-
-#: lib/Block/weatherdotcom_strings.php:51
-msgid "Snow"
-msgstr "Neige"
-
-#: lib/Block/weatherdotcom_strings.php:52
-msgid "Snow Shower"
-msgstr "Averse de neige"
-
-#: lib/Block/weatherdotcom_strings.php:53
-msgid "Snow Showers"
-msgstr "Averses de neige"
-
-#: lib/Block/weatherdotcom_strings.php:54
-msgid "Snow Showers Early"
-msgstr "Averses de neige tôt dans la journée"
-
-#: lib/Block/weatherdotcom_strings.php:55
-msgid "Snow Showers Late"
-msgstr "Averses de neige tard en journée"
-
-#: lib/Block/metar.php:276
-msgid "Snow depth: "
-msgstr "Hauteur de neige : "
-
-#: lib/Block/metar.php:280
-msgid "Snow equivalent in water: "
-msgstr "Quantité d'eau équivalente à la quantité de neige : "
-
-#: lib/Horde/NLS/GeoIP.php:103 lib/Horde/NLS/countries.php:205
-#: lib/Horde/NLS/tld.php:202
-msgid "Solomon Islands"
-msgstr "Îles Salomon"
-
-#: lib/Horde/NLS/GeoIP.php:106 lib/Horde/NLS/countries.php:206
-#: lib/Horde/NLS/tld.php:214
-msgid "Somalia"
-msgstr "Somalie"
-
-#: lib/Block/fortune.php:60
-msgid "Songs & Poems"
-msgstr "Chansons et poèmes"
-
-#: lib/Horde/Form.php:2924
-msgid "Sort order selection"
-msgstr "Sélection de l'ordre de tri"
-
-#: lib/Net/SMS/clickatell_http.php:216 lib/Net/SMS/clickatell_http.php:246
-#: lib/Net/SMS/sms2email_http.php:558 lib/Net/SMS/sms2email_http.php:588
-msgid "Source address"
-msgstr "Adresse source"
-
-#: lib/Horde/NLS/GeoIP.php:118 lib/Horde/NLS/countries.php:207
-#: lib/Horde/NLS/tld.php:255
-msgid "South Africa"
-msgstr "Afrique du sud"
-
-#: lib/Horde/NLS/GeoIP.php:77 lib/Horde/NLS/countries.php:208
-#: lib/Horde/NLS/tld.php:101
-msgid "South Georgia and the South Sandwich Islands"
-msgstr "Géorgie-du-sud et îles Sandwich-du-sud"
-
-#: lib/Block/moon.php:33 lib/Block/moon.php:62
-msgid "Southern Hemisphere"
-msgstr "Hémisphère Sud"
-
-#: templates/javascript/htmlarea_lang.js:113
-msgid "Space between adjacent cells"
-msgstr "Espace entre cellules adjacentes"
-
-#: templates/javascript/htmlarea_lang.js:115
-msgid "Space between content and border in cell"
-msgstr "Espace entre le contenu et la bordure dans une cellule"
-
-#: lib/Horde/Form.php:815
-msgid "Spacer"
-msgstr "Espaceur"
-
-#: templates/javascript/htmlarea_lang.js:80
-#: templates/javascript/htmlarea_table_lang.js:55
-msgid "Spacing"
-msgstr "Espacement"
-
-#: templates/javascript/htmlarea_table_lang.js:54
-msgid "Spacing and padding"
-msgstr "Espacement et remplissage"
-
-#: lib/Horde/NLS/GeoIP.php:71 lib/Horde/NLS/countries.php:209
-#: lib/Horde/NLS/tld.php:80
-msgid "Spain"
-msgstr "Espagne"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+msgid "Reload"
+msgstr "Rafraîchir"
 
-#: services/keyboard.php:14
-msgid "Special Character Input"
-msgstr "Caractères spéciaux"
+#: templates/folders/head.inc:3
+msgid "Reload View"
+msgstr "Recharger"
 
-#: templates/javascript/htmlarea_table_lang.js:62
-msgid "Split cell"
-msgstr "Scinder la cellule"
-
-#: templates/javascript/htmlarea_table_lang.js:66
-msgid "Split column"
-msgstr "Scinder la colonne"
-
-#: templates/javascript/htmlarea_table_lang.js:71
-msgid "Split row"
-msgstr "Scinder la rangée"
-
-#: lib/Block/fortune.php:61
-msgid "Sports"
-msgstr "Sports"
-
-#: lib/Horde/NLS/GeoIP.php:88 lib/Horde/NLS/countries.php:210
-#: lib/Horde/NLS/tld.php:141
-msgid "Sri Lanka"
-msgstr "Sri Lanka"
-
-#: lib/Block/metar.php:72 lib/Block/weatherdotcom.php:72
-msgid "Standard"
-msgstr "Standard"
-
-#: lib/Block/fortune.php:62
-msgid "Star Trek"
-msgstr "Star Trek"
-
-#: lib/Horde/Form.php:2594 lib/Horde/Form.php:2807
-msgid "Start year"
-msgstr "Année de début"
-
-#: lib/Horde/Crypt/smime.php:570
-msgid "State or Province"
-msgstr "État ou province"
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
+msgid "Remember the free/busy information."
+msgstr "Se souvenir des disponibilités."
 
-#: templates/admin/setup/index.html:12
-msgid "Status"
-msgstr "Statut"
+#: config/prefs.php.dist:968
+msgid "Remember the last view"
+msgstr "Se souvenir du dernier affichage"
+
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr "Boîte distante :"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr "Enlever le champ Recherche"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "Retirer la source"
+
+#: templates/folders/actions.inc:8
+msgid "Rename Folder(s)"
+msgstr "Renommer le(s) dossier(s)"
+
+#: config/prefs.php.dist:341
+msgid "Rename sent-mail folder at beginning of month?"
+msgstr "Renommer le dossier des messages envoyés au début du mois ?"
 
-#: po/translation.php:491
+#: lib/Folder.php:425
 #, php-format
-msgid "Status for locale %s... "
-msgstr "État de la locale %s... "
+msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
+msgstr ""
+"Le changement de nom de « %s » en « %s » a échoué. Le serveur a répondu"
 
-#: lib/Horde/Form.php:2813
-msgid "Storage format"
-msgstr "Format de sauvegarde"
+#: templates/message/navbar_actions.inc:10
+msgid "Repl_y to List"
+msgstr "Rép_ondre à la liste"
 
-#: lib/Horde/Crypt/smime.php:572
-msgid "Street Address"
-msgstr "Rue"
+#: templates/compose/spelling.inc:105
+msgid "Replace with:"
+msgstr "Remplacer par :"
 
-#: templates/javascript/htmlarea_lang.js:11
-msgid "Strikethrough"
-msgstr "Barré"
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Répondre"
 
-#: lib/Horde/Form.php:1233
-msgid "String list"
-msgstr "Liste de chaînes"
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
+msgid "Reply Sent."
+msgstr "Réponse envoyée."
 
-#: lib/Horde/Form.php:1873
-msgid "Strip domain from the address"
-msgstr "Retirer le domaine de l'adresse"
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to All"
+msgstr "Répondre à tous"
 
-#: templates/javascript/htmlarea_table_lang.js:23
-msgid "Style [CSS]"
-msgstr "Style [CSS]"
+#: compose.php:771
+msgid "Reply to All:"
+msgstr "Répondre à tous :"
 
-#: templates/javascript/open_calendar.js:62
-msgid "Su"
-msgstr "Di"
+#: templates/message/navbar_actions.inc:10
+msgid "Reply to List"
+msgstr "Répondre à la liste"
 
-#: util/icon_browser.php:37
-#, php-format
-msgid "Subdirectory '%s' not found."
-msgstr "Sous-répertoire « %s » non trouvé"
+#: compose.php:773
+msgid "Reply to List:"
+msgstr "Répondre à la liste :"
 
-#: lib/Horde/MIME/Viewer/rfc822.php:73 lib/Horde/Crypt/smime.php:611
-msgid "Subject"
-msgstr "Sujet"
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to _All"
+msgstr "Répondre à _tous"
 
-#: lib/Horde/Crypt/smime.php:644
-msgid "Subject Public Key Info"
-msgstr "Informations sur la clef publique"
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
+msgid "Reply with Not Supported Message"
+msgstr "Renvoyer un message « Non supporté »"
 
-#: lib/Horde/Form.php:332 lib/Horde/Form/Renderer.php:312
-msgid "Submit"
-msgstr "Envoi"
+#: lib/MIME/Viewer/itip.php:537
+msgid "Reply with free/busy for next 2 months."
+msgstr "Répondre avec les disponibilités des 2 prochains mois."
 
-#: signup.php:49
-#, php-format
-msgid ""
-"Submitted request to add '%s' to the system. You can not log in until your "
-"request has been approved."
-msgstr ""
-"La demande d'ajout de « %s » au système a été soumise. Vous ne pourrez pas "
-"vous connecter jusqu'à son approbation."
+#: lib/MIME/Viewer/itip.php:536
+msgid "Reply with requested free/busy information."
+msgstr "Répondre avec les disponibilités demandées."
 
-#: templates/javascript/htmlarea_lang.js:12
-msgid "Subscript"
-msgstr "Indice"
+#: message.php:274
+msgid "Reply-To"
+msgstr "Répondre à"
 
-#: admin/sqlshell.php:105 lib/Horde/Notification/Listener/status.php:28
-msgid "Success"
-msgstr "Succès"
+#: lib/Compose.php:420
+msgid "Reply-To: "
+msgstr "Répondre à : "
 
-#: admin/user.php:85
-#, php-format
-msgid "Successfully added '%s' to the system."
-msgstr "« %s » a bien été ajouté(e)."
+#: compose.php:769
+msgid "Reply:"
+msgstr "Répondre :"
 
-#: admin/user.php:124
-#, php-format
-msgid "Successfully cleared data for user '%s' from the system."
-msgstr "Les données de l'utilisateur « %s » ont bien été retirées du système.."
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+msgid "Report as Innocent"
+msgstr "Déclarer légitime"
 
-#: admin/groups.php:81 admin/perms/delete.php:61
-#, php-format
-msgid "Successfully deleted '%s'."
-msgstr "« %s » a bien été supprimé(e)."
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
+msgid "Report as Spam"
+msgstr "Déclarer comme pourriel"
 
-#: admin/user.php:105
-#, php-format
-msgid "Successfully removed '%s' from the system."
-msgstr "« %s » a bien été retiré(e)."
+#: templates/compose/compose.inc:384
+msgid "Request a _Read Receipt"
+msgstr "Demander un accusé de _lecture"
 
-#: admin/setup/config.php:51
-msgid "Successfully reverted configuration. Reload to see changes."
-msgstr ""
-"Retour à la configuration initiale réussi.  Rafraîchir la page pour voir les "
-"modifications."
+#: config/prefs.php.dist:573
+msgid "Request read receipts?"
+msgstr "Demander des accusés de lecture ?"
 
-#: admin/setup/index.php:59 admin/setup/scripts.php:55
-msgid "Successfully saved backup configuration."
-msgstr "Enregistrement de la configuration de la sauvegarde réussi."
+#: mailbox.php:188
+msgid "Requested message not found."
+msgstr "Message demandé non trouvé."
 
-#: admin/setup/config.php:62
-#, php-format
-msgid "Successfully saved the backup configuration file %s."
-msgstr ""
-"Enregistrement réussi de la copie de sauvegarde du fichier de configuration %"
-"s."
+#: lib/MIME/Viewer/itip.php:692
+msgid "Required Participant"
+msgstr "Participant indispensable"
 
-#: admin/user.php:168
-#, php-format
-msgid "Successfully updated '%s'"
-msgstr "« %s » a bien été mis(e) à jour."
+#: templates/search/main.inc:140 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
+msgid "Reset"
+msgstr "RÀZ"
 
-#: admin/setup/config.php:71 admin/setup/index.php:72
-#, php-format
-msgid "Successfully wrote %s"
-msgstr "Écriture de %s réussi"
+#: lib/MIME/Viewer/itip.php:116
+msgid "Respondent Status Updated."
+msgstr "Le statut du correspondant a été modifié."
+
+#: templates/message/navbar_actions.inc:30
+msgid "Resume"
+msgstr "Reprendre"
+
+#: recompose.php:97
+msgid "Resume your session"
+msgstr "Reprendre votre session"
+
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Retour vers la « Rédaction de message »"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:31
+msgid "Return to Fetch Mail"
+msgstr "Retour vers la récupération du courrier"
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
+msgid "Return to Options"
+msgstr "Retour aux options"
 
-#: lib/Horde/NLS/GeoIP.php:104 lib/Horde/NLS/countries.php:211
-#: lib/Horde/NLS/tld.php:204
-msgid "Sudan"
-msgstr "Soudan"
+#: config/prefs.php.dist:707
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr ""
+"Retourner au contenu de votre boîte de réception après avoir effacé, "
+"déplacé, ou copié un message ?"
 
-#: templates/javascript/htmlarea_table_lang.js:56
-msgid "Summary"
-msgstr "Sommaire"
+#: lib/MIME/Viewer/itip.php:683
+msgid "Role"
+msgstr "Rôle"
 
-#: lib/Block/sunrise.php:66
-msgid "Sun Rise"
-msgstr "Lever du Soleil"
-
-#: lib/Block/sunrise.php:71
-msgid "Sun Set"
-msgstr "Coucher du Soleil"
-
-#: lib/Block/weatherdotcom_strings.php:56
-msgid "Sunny"
-msgstr "Ensoleillé"
-
-#: lib/Block/weatherdotcom.php:183
-msgid "Sunrise"
-msgstr "Lever du Soleil"
-
-#: lib/Block/sunrise.php:3 lib/Block/sunrise.php:16
-msgid "Sunrise/Sunset"
-msgstr "Lever/Coucher du Soleil"
-
-#: lib/Block/weatherdotcom.php:182
-msgid "Sunrise: "
-msgstr "Lever du Soleil: "
-
-#: lib/Block/weatherdotcom.php:186
-msgid "Sunset"
-msgstr "Coucher du Soleil"
-
-#: lib/Block/weatherdotcom.php:185
-msgid "Sunset: "
-msgstr "Coucher du Soleil : "
-
-#: templates/javascript/htmlarea_lang.js:13
-msgid "Superscript"
-msgstr "Exposant"
-
-#: lib/Horde/NLS/GeoIP.php:106 lib/Horde/NLS/countries.php:212
-#: lib/Horde/NLS/tld.php:215
-msgid "Suriname"
-msgstr "Surinam ou Guyane hollandaise"
-
-#: lib/Horde/Crypt/smime.php:574
-msgid "Surname"
-msgstr "Nom de famille"
-
-#: lib/Horde/NLS/GeoIP.php:105 lib/Horde/NLS/countries.php:213
-#: lib/Horde/NLS/tld.php:209
-msgid "Svalbard and Jan Mayen"
-msgstr "Îles Svalbard et Jan Mayen"
-
-#: lib/Horde/NLS/GeoIP.php:108 lib/Horde/NLS/countries.php:214
-#: lib/Horde/NLS/tld.php:219
-msgid "Swaziland"
-msgstr "Swaziland"
-
-#: lib/Horde/NLS/GeoIP.php:104 lib/Horde/NLS/countries.php:215
-#: lib/Horde/NLS/tld.php:205
-msgid "Sweden"
-msgstr "Suède"
-
-#: lib/Horde/NLS/GeoIP.php:66 lib/Horde/NLS/countries.php:216
-#: lib/Horde/NLS/tld.php:56
-msgid "Switzerland"
-msgstr "Suisse"
-
-#: lib/Horde/SQL/Keywords.php:97
-msgid "Syntax error in search terms"
-msgstr "Erreur de syntaxe dans les termes de recherche"
-
-#: lib/Horde/NLS/GeoIP.php:107 lib/Horde/NLS/countries.php:217
-#: lib/Horde/NLS/tld.php:218
-msgid "Syrian Arab Republic"
-msgstr "Syrie"
-
-#: lib/Block/weatherdotcom_strings.php:57
-msgid "T-Storm"
-msgstr "Orages"
-
-#: lib/Block/weatherdotcom_strings.php:58
-msgid "T-Storm and Windy"
-msgstr "Orage et vent"
-
-#: lib/Block/weatherdotcom_strings.php:59
-msgid "T-Storms"
-msgstr "Orages"
-
-#: lib/Horde/Data/tsv.php:166
-msgid "TSV file"
-msgstr "Fichier TSV"
-
-#: lib/Horde/UI/Table.php:136
-msgid "Table"
-msgstr "Tableau"
-
-#: templates/javascript/htmlarea_table_lang.js:73
-msgid "Table Properties"
-msgstr "Propriétés du tableau"
-
-#: templates/javascript/htmlarea_table_lang.js:72
-msgid "Table properties"
-msgstr "Propriétés du tableau"
-
-#: lib/Horde/NLS/GeoIP.php:111 lib/Horde/NLS/tld.php:234
-msgid "Taiwan"
-msgstr "Taïwan"
-
-#: lib/Horde/NLS/countries.php:218
-msgid "Taiwan, Province of China"
-msgstr "Taïwan, province de Chine"
-
-#: lib/Horde/NLS/GeoIP.php:109 lib/Horde/NLS/countries.php:219
-#: lib/Horde/NLS/tld.php:225
-msgid "Tajikistan"
-msgstr "Tajikistan"
-
-#: lib/Horde/NLS/GeoIP.php:112 lib/Horde/NLS/countries.php:220
-#: lib/Horde/NLS/tld.php:235
-msgid "Tanzania, United Republic of"
-msgstr "Tanzanie"
-
-#: templates/javascript/htmlarea_lang.js:95
-msgid "Target:"
-msgstr "Cible :"
-
-#: lib/Horde/Crypt/smime.php:573
-msgid "Telephone Number"
-msgstr "Numéro de téléphone"
-
-#: lib/Block/metar.php:288
-msgid "Temp for last hour: "
-msgstr "Température pour la dernière heure : "
-
-#: lib/Block/metar.php:212
-msgid "Temperature"
-msgstr "Température"
-
-#: lib/Block/weatherdotcom.php:190
-msgid "Temperature: "
-msgstr "Température : "
-
-#: lib/Horde/Template.php:217
-#, php-format
-msgid "Template '%s' not found."
-msgstr "Le profil %s non trouvé"
-
-#: admin/templates.php:169
-msgid "Template Administration"
-msgstr "Administration des modèles"
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:425
+msgid "S/MIME"
+msgstr "S/MIME"
 
-#: lib/Horde/Form.php:1211
-msgid "Text"
-msgstr "Texte"
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr "Chiffrer le message en S/MIME"
 
-#: templates/javascript/htmlarea_table_lang.js:74
-msgid "Text align"
-msgstr "Alignement du texte"
+#: compose.php:371
+msgid "S/MIME Error: "
+msgstr "Erreur S/MIME : "
 
-#: templates/javascript/htmlarea_lang.js:71
-msgid "Texttop"
-msgstr "Texte en haut"
+#: compose.php:350
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+"Erreur S/MIME : la phrase secrète est nécessaire pour la clef privée "
+"personnelle."
 
-#: templates/javascript/open_calendar.js:59
-msgid "Th"
-msgstr "Je"
+#: config/prefs.php.dist:151
+msgid "S/MIME Options"
+msgstr "Options S/MIME"
 
-#: lib/Horde/NLS/GeoIP.php:109 lib/Horde/NLS/countries.php:221
-#: lib/Horde/NLS/tld.php:224
-msgid "Thailand"
-msgstr "Thaïlande"
+#: smime.php:46
+msgid "S/MIME Passphrase Input"
+msgstr "Entrée de la phrase secrète S/MIME"
 
-#: lib/Horde/Auth.php:903
-msgid "Thank you for using the system."
-msgstr "Merci d'avoir utilisé le système."
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+"Le support de la paire de clefs S/MIME personnelles requiert une connexion "
+"au web sécurisée."
 
-#: po/translation.php:1069
+#: smime.php:136
 #, php-format
-msgid "The %s help file for %s doesn't yet exist. Creating a new one."
-msgstr "Le fichier d'aide %s pour %s n'existe pas. Création d'un nouveau."
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "La clef publique S/MIME de « %s » a bien été supprimée."
 
-#: lib/VFS/ftp.php:737
-msgid "The FTP extension is not available."
-msgstr "L'extension FTP n'est pas disponible."
+#: smime.php:158
+msgid "S/MIME Public Key successfully added."
+msgstr "La clé publique S/MIME a bien été ajoutée."
 
-#: lib/Horde/Kolab.php:903
-#, php-format
-msgid "The Horde/Kolab integration engine does not support \"%s\""
-msgstr "Le moteur d'intégration Horde/Kolab ne supporte pas « %s »"
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr "Anneau de clefs publiques S/MIME"
 
-#: services/maintenance.php:29
-msgid "The Maintenance:: class did not load successfully"
-msgstr "La classe Maintenance:: n'a pas été chargée correctement"
+#: smime.php:207
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "La paire de clefs S/MIME publique/privée a bien été ajoutée."
 
-#: services/images/colorpicker.php:29
-msgid "The Options window has closed. Exiting."
-msgstr "La fenêtre des options s'est fermée. Sortie."
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr "Signer le message en S/MIME"
 
-#: lib/Horde/Perms.php:158 lib/Horde/Perms.php:169 lib/Horde/Perms.php:180
-#: lib/Horde/Perms.php:192 lib/Horde/Perms.php:203 lib/Horde/Perms.php:221
-#: lib/Horde/Perms.php:233 lib/Horde/Perms.php:272
-msgid ""
-"The administrator needs to configure a permanent Permissions backend if you "
-"want to use Permissions."
-msgstr ""
-"L'administrateur doit configurer un backend permanent pour les permissions "
-"si vous voulez les employer."
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "Signer/chiffrer le message en S/MIME"
 
-#: templates/javascript/htmlarea_table_lang.js:75
-msgid "The bottom side only"
-msgstr "La bordure du bas seulement"
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr "Le support de S/MIME est désactivé sur ce système."
 
-#: lib/Net/SMS/sms2email_http.php:638
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
-"The contact ID number was not specified, left blank or was not found in the "
-"database."
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
 msgstr ""
-"L'ID du contact n'a pas été spécifié, laissé vide ou n'a pas été trouvé dans "
-"la base de données."
+"Le support de S/MIME n'est pas actif actuellement, et le message ne peut "
+"donc pas être déchiffré."
 
-#: lib/Horde/MIME/Viewer/vcard.php:51
-msgid "The contact was successfully added to your address book."
-msgstr "Ce contact a bien été ajouté à votre carnet d'adresses. "
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message cannot "
+"be displayed."
+msgstr ""
+"Le support de S/MIME n'est pas activé, et le contenu de ce message signé ne "
+"peut donc pas être affiché."
 
-#: lib/Horde/Crypt/pgp.php:1146
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
-"The detached PGP signature block is required to verify the signed message."
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
 msgstr ""
-"Le bloc de signature PGP séparé est nécessaire pour vérifier la signature."
+"Le support de PGP n'est pas actif actuellement, et la signature numérique ne "
+"peut donc pas être vérifiée."
 
-#: lib/Net/SMS/sms2email_http.php:640
+#: templates/smime/smime.inc:2
 msgid ""
-"The distribution list ID was either not specified, left blank or not found "
-"in the database."
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
 msgstr ""
-"L'ID de la liste n'a pas été spécifié, laissé vide ou non trouvé dans la "
-"base de données."
+"Le support S/MIME utilise des fenêtres surgissantes. Si cette fonction est "
+"désactivée dans votre navigateur, il faut l'activer, sans quoi S/MIME ne "
+"fonctionnera pas correctement."
 
-#: lib/Net/SMS/sms2email_http.php:641
-msgid "The distribution list was not specified."
-msgstr "La liste de distribution n'a pas été spécifiée."
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
 
-#: lib/Horde/Crypt.php:113
-msgid "The encryption features require a secure web connection."
-msgstr "Le chiffrement nécessite une connexion sécurisée."
+#: templates/compose/compose.inc:253
+msgid "S_ubject"
+msgstr "S_ujet"
 
-#: lib/Horde.php:175 lib/Horde.php:488
-#, php-format
-msgid "The file %s should contain a %s setting."
-msgstr "Le fichier %s doit contenir les options %s."
+#: templates/compose/compose.inc:361
+msgid "Sa_ve a copy in "
+msgstr "Enre_gistrer une copie dans "
 
-#: lib/Horde.php:168 lib/Horde.php:478
-#, php-format
-msgid "The file %s should contain some %s settings."
-msgstr "Le fichier %s doit contenir certaines options %s."
+#: templates/message/navbar_actions.inc:32
+msgid "Sa_ve as"
+msgstr "En_registrer sous"
+
+#: search.php:304 templates/fetchmail/manage.inc:67
+msgid "Save"
+msgstr "Enregistrer"
+
+#: templates/compose/compose.inc:534
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+"Sauvegarder les pièces jointes avec le message dans le dossier courrier "
+"envoyé ?"
 
-#: lib/VFS/file.php:152
-msgid "The file can not be copied onto itself."
-msgstr "Le fichier ne peut pas être copié sur lui-même."
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
+msgid "Save Draft"
+msgstr "Enregistrer le brouillon"
+
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Enregistrer l'image"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Enregistrer l'image dans la galerie"
+
+#: templates/filters/prefs.inc:59 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13
+msgid "Save Options"
+msgstr "Enregistrer les options"
 
-#: lib/Horde/Data.php:260
-msgid "The file contained no data."
-msgstr "Le fichier ne contenait aucune donnée."
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Enregistrer la papeterie"
 
-#: lib/Horde/MIME/Viewer/rfc822.php:67
-msgid "The following are the headers for this message/rfc822 message."
-msgstr "Ce qui suit sont les en-têtes pour ce message message/RFC822."
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
+msgid "Save _Draft"
+msgstr "Enregistrer le _brouillon"
 
-#: templates/javascript/htmlarea_lang.js:56
-msgid ""
-"The full screen mode is known to cause problems with Internet Explorer, due "
-"to browser bugs that we weren't able to workaround.  You might experience "
-"garbage display, lack of editor functions and/or random browser crashes.  If "
-"your system is Windows 9x it's very likely that you'll get a 'General "
-"Protection Fault' and need to reboot.\\n\\nYou have been warned.  Please "
-"press OK if you still want to try the full screen editor."
+#: templates/message/navbar_actions.inc:32
+msgid "Save as"
+msgstr "Enregistrer sous"
+
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr "Enregistrer les brouillons en tant que non-lus ?"
+
+#: config/prefs.php.dist:1061
+msgid "Save recipients automatically to the default address book?"
 msgstr ""
-"Le mode plein écran cause des problèmes avec Internet Explorer dû à des "
-"bogues du navigateur qui n'ont pu être contournés. Vous pouvez être "
-"confrontés à de l'affichage de caractères étranges, au non-fonctionnement "
-"des certaines fonctions et/ou au plantage aléatoire du navigateur. Si votre "
-"système est un Windows 9x, il est très possible que vous aurez une 'Faute "
-"générale de protection' et que vous devrez redémarrer votre ordinateur.\\n"
-"\\nVous avez été prévenus. SVP appuyez sur OK si vous voulez toujours "
-"essayer le mode plein écran de l'éditeur"
+"Enregistrer les adresses automatiquement dans le carnet d'adresses par "
+"défaut ?"
+
+#: templates/search/main.inc:123
+msgid "Save search as a virtual folder?"
+msgstr "Enregistrer la recherche comme dossier virtuel ?"
 
-#: po/translation.php:1097 po/translation.php:1235
+#: config/prefs.php.dist:230
+msgid "Save sent mail?"
+msgstr "Enregistrer le courrier envoyé ?"
+
+#: compose.php:1263
 #, php-format
-msgid "The help file %s didn't start with <?xml"
-msgstr "Le fichier d'aide %s ne commence pas par <?xml"
+msgid "Saving the draft failed. This is what the server said: %s"
+msgstr "L'enregistrement du brouillon a échoué. Le serveur a répondu : %s "
+
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
+msgid "Search"
+msgstr "Recherche"
 
-#: services/prefs.php:90
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "L'identité « %s »  a été supprimée."
+msgid "Search %s"
+msgstr "Recherche %s"
 
-#: templates/javascript/htmlarea_table_lang.js:76
-msgid "The left-hand side only"
-msgstr "Le côté gauche seulement"
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Options de recherche"
 
-#: lib/Horde/Crypt/pgp.php:143
-msgid ""
-"The location of the GnuPG binary must be given to the Crypt_pgp:: class."
-msgstr ""
-"L'emplacement du programme GnuPG doit être fourni à la classe Crypt_pgp::."
+#: search.php:258
+msgid "Search Results"
+msgstr "Résultats de la recherche"
 
-#: lib/Horde/MIME/MDN.php:201
-#, php-format
-msgid ""
-"The message sent on %s to %s with subject \"%s\" has been displayed.\n"
-"This is no guarantee that the message has been read or understood."
-msgstr ""
-"Le message envoyé le %s à %s avec comme sujet « %s » a été affiché. \n"
-"Il n'y a aucune garantie que ce message a été lu ou compris."
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
+msgid "Seen"
+msgstr "Ouvert"
 
-#: lib/Horde/Form.php:1877
-msgid "The name to use when linking to the compose page"
-msgstr "Le nom à utiliser en liant à la page de composition"
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Sélectionner"
 
-#: lib/Horde/Crypt/smime.php:1231
-msgid "The openssl module is required for the Horde_Crypt_smime:: class."
-msgstr "Le module OpenSSL est requis pour la classe Horde_Crypt_smime::."
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "Sélectionnez un autre compte"
 
-#: lib/Horde/Prefs.php:285
-#, php-format
-msgid ""
-"The preference \"%s\" could not be saved because its data exceeded the "
-"maximum allowable size"
-msgstr ""
-"La préférence « %s » n'a pas pu être enregistrée car sa taille dépasse le "
-"maximum autorisé"
+#: templates/search/fields.inc:36
+msgid "Select a date"
+msgstr "Sélectionnez une date"
 
-#: lib/Horde/MIME/Viewer/deb.php:32 lib/Horde/MIME/Viewer/enscript.php:35
-#: lib/Horde/MIME/Viewer/msexcel.php:32
-#: lib/Horde/MIME/Viewer/mspowerpoint.php:32
-#: lib/Horde/MIME/Viewer/msword.php:32 lib/Horde/MIME/Viewer/rpm.php:32
-#: lib/Horde/MIME/Viewer/srchighlite.php:37
-#: lib/Horde/MIME/Viewer/webcpp.php:37
-#, php-format
-msgid ""
-"The program used to view this data type (%s) was not found on the system."
-msgstr ""
-"Le programme utilisé pour visualiser ce type de données (%s) n'a pas été "
-"trouvé."
+#: templates/search/fields.inc:10
+msgid "Select a field"
+msgstr "Choisissez un champ"
 
-#: templates/javascript/htmlarea_table_lang.js:77
-msgid "The right and left sides only"
-msgstr "Les côtés gauche et droit seulement"
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr "Sélectionnez une papeterie :"
 
-#: templates/javascript/htmlarea_table_lang.js:78
-msgid "The right-hand side only"
-msgstr "Le côté droit seulement"
+#: config/prefs.php.dist:135
+msgid "Select address book sources for adding and searching for addresses."
+msgstr ""
+"Sélectionnez les carnets d'adresses à utiliser pour l'ajout ou la recherche "
+"d'adresses."
 
-#: services/portal/rpcsum.php:78
-#, php-format
-msgid "The server \"%s\" has been deleted."
-msgstr "Le serveur « %s » a été supprimé."
+#: templates/search/main.inc:88
+msgid "Select all"
+msgstr "Tout sélectionner"
 
-#: services/portal/rpcsum.php:49
-#, php-format
-msgid "The server \"%s\" has been saved."
-msgstr "Le serveur « %s » a été enregistré."
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"Sélectionner tous les champs lors d'une recherche pour développer une "
+"adresse."
 
-#: admin/user.php:198
-#, php-format
-msgid "The signup request for %s has been removed."
-msgstr "La requête d'enregistrement pour %s a été déplacée."
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "Sélectionnez un compte"
 
-#: lib/Horde/Block/Layout.php:290
-msgid "The specified row does not exist."
-msgstr "La ligne demandée n'existe pas."
+#: templates/search/main.inc:89
+msgid "Select none"
+msgstr "Aucun"
 
-#: lib/VFS/sql.php:108
-#, php-format
-msgid "The temporary file \"%s\" does not exist."
-msgstr "Le fichier temporaire « %s » n'existe pas."
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Sélectionnez la galerie dans laquelle sauvez l'image."
 
-#: templates/javascript/htmlarea_table_lang.js:79
-msgid "The top and bottom sides only"
-msgstr "Le haut et le bas seulement"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr "Sélectionner le type de serveur de courrier"
 
-#: templates/javascript/htmlarea_table_lang.js:80
-msgid "The top side only"
-msgstr "Le haut seulement"
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
+msgstr "Carnets d'adresses sélectionnés :"
 
-#: lib/Horde/Data.php:307
-msgid "The uploaded data was lost since the previous step."
-msgstr ""
-"Les données téléchargées vers le serveur ont été perdues depuis l'étape "
-"précédente. "
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr "Envoyer la clef au serveur public"
 
-#: lib/Horde/Data/csv.php:240 lib/Horde/Data/tsv.php:172
-msgid "The uploaded file could not be saved."
-msgstr "Le fichier émis n'a pas pu être enregistré."
+#: lib/MIME/Viewer/itip.php:597
+msgid "Send Latest Information"
+msgstr "Envoyer l'information la plus récente"
 
-#: lib/Block/weatherdotcom.php:46 lib/Block/weatherdotcom.php:56
-#: lib/Block/weatherdotcom.php:107 lib/Block/weatherdotcom.php:111
-msgid "The weather.com block is not available."
-msgstr "Le bloc « weather.com » n'est pas disponible."
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
+msgid "Send Message"
+msgstr "Envoyer le message"
 
-#: util/icon_browser.php:25
-#, php-format
-msgid "Themes directory '%s' not found."
-msgstr "Répertoire des thèmes « %s » non trouvé"
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Envoyer le message sans objet ?"
 
-#: lib/Horde/Prefs/UI.php:178
-msgid "There are no options available."
-msgstr "Il n'y a pas d'options disponibles"
+#: config/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "Envoyer un avis de réception s'il est demandé par l'expéditeur ?"
 
-#: lib/Horde/MIME/Contents.php:340
-msgid "There are no parts that can be displayed inline."
-msgstr "Aucune partie ne peut être affichée en ligne."
+#: folders.php:378
+msgid "Sent mail folder"
+msgstr "Dossier du courrier envoyé"
 
-#: lib/Horde/Form.php:1406
-#, php-format
-msgid ""
-"There are too many characters in this field. You have entered %s characters; "
-"you must enter less than %s."
-msgstr ""
-"Il y  a trop de caractères dans ce champ. Vous en avez entré %s ; il en faut "
-"moins de %s."
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "Dossier du courrier envoyé :"
 
-#: po/translation.php:1060
-#, php-format
-msgid "There doesn't yet exist a help file for %s."
-msgstr "Il n'y a pas encore de fichier d'aide pour %s."
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
+msgid "Server"
+msgstr "Serveur"
 
-#: signup.php:53
-#, php-format
-msgid "There was a problem adding '%s' to the system. %s."
-msgstr "Un problème est apparu lors de l'ajout de « %s ».  %s."
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr "Information du serveur et du dossier"
 
-#: admin/user.php:73
-#, php-format
-msgid "There was a problem adding '%s' to the system: %s"
-msgstr "Un problème est apparu lors de l'ajout de « %s » : %s"
+#: templates/fetchmail/manage.inc:23
+msgid "Server:"
+msgstr "Serveur :"
 
-#: admin/user.php:122
-#, php-format
-msgid "There was a problem clearing data for user '%s' from the system: "
+#: config/prefs.php.dist:80
+msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
-"Un problème est apparu lors de la suppression des données de l'utilisateur "
-"« %s » : "
+"Choisir les préférences pour les déplacements et la destruction des messages."
 
-#: admin/user.php:103
-#, php-format
-msgid "There was a problem removing '%s' from the system: "
-msgstr "Un problème est apparu lors de la suppression de « %s » : "
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr "Définir l'en-tête X-Priority lors de la rédaction des messages ?"
 
-#: admin/user.php:159
-#, php-format
-msgid "There was a problem updating '%s': %s"
-msgstr "Un problème est apparu lors de la mise à jour de « %s » : %s"
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr "Partager les dossiers"
 
-#: lib/Horde/Browser.php:878
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr ""
-"Un problème est apparu lors de l'envoi du fichier : aucun %s n'a été "
-"transmis."
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr "Partager les dossiers de courrier"
 
-#: lib/Horde/Browser.php:883
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr ""
-"Une erreur est survenue lors de l'envoi du fichier : le %s était plus gros "
-"que le maximum autorisé (%d octets)."
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr "Partager vos dossiers de courrier avec d'autres utilisateurs."
 
-#: lib/Horde/Browser.php:885
-#, php-format
+#: config/prefs.php.dist:657
 msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
 msgstr ""
-"Une erreur est survenue lors de l'envoi du fichier : le %s a été transmis "
-"partiellement."
+"Les grands blocs de texte cité devraient-ils être montrés ou cachés par "
+"défaut ? Vous pouvez basculer facilement vers celui que vous désirez."
 
-#: lib/Horde/MIME/Viewer/rfc822.php:35
-msgid "There was an error displaying this message part"
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
-"Une erreur s'est produite lors de l'affichage de cette parte du message"
+"Voulez-vous rechercher des données PGP dans le corps des messages textuels ?"
 
-#: lib/Horde/MIME/Viewer/vcard.php:39 lib/Horde/MIME/Viewer/vcard.php:48
-msgid "There was an error importing the contact data."
+#: config/prefs.php.dist:513
+msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
-"Une erreur s'est produite lors de l'importation des données de ce contact."
+"Faut-il fermer la fenêtre de rédaction après l'enregistrement d'un "
+"brouillon ?"
 
-#: lib/Horde/Data/imc.php:32
-msgid "There was an error importing the iCalendar data."
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
-"Une erreur s'est produite lors de l'importation de cette carte iCalendar."
+"Voulez-vous joindre votre clef publique PGP à vos messages par défaut ?"
 
-#: admin/setup/config.php:79
-msgid ""
-"There was an error in the configuration form. Perhaps you left out a "
-"required field."
-msgstr ""
-"Il y avait une erreur dans le formulaire de configuration. Peut-être avez-"
-"vous laissé un champ requis vide."
+#: templates/search/main.inc:92
+msgid "Show All Folders"
+msgstr "Montrer tous les dossiers"
 
-#: po/translation.php:1107 po/translation.php:1113 po/translation.php:1245
-#: po/translation.php:1251
-#, php-format
-msgid ""
-"There was an error opening the file %s. Try running translation.php with the "
-"flag -d to see any error messages from the xml parser."
-msgstr ""
-"Une erreur s'est produite lors de l'ouverture du fichier %s. Essayez de "
-"lancer translation.php avec l'option -d pour voir les messages d'erreur de "
-"l'analyseur XML."
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr "Montrer toutes les en-têtes"
 
-#: lib/Net/SMS/sms2email_http.php:637
-msgid ""
-"There was an error performing the specified address book function. Please "
-"try again later."
-msgstr ""
-"Une erreur s'est produite lors de l'exécution de cette fonction du carnet "
-"d'adresse. SVP essayer à nouveau plus tard."
+#: mailbox.php:350
+msgid "Show Deleted"
+msgstr "Montrer les messages effacés"
 
-#: lib/Net/SMS/sms2email_http.php:639
-msgid ""
-"There was an error updating the contact details. Please try again later."
-msgstr ""
-"Il y a eu une erreur lors de la mise à jour des informations sur le "
-"contact.  Veuillez essayer à nouveau."
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr "Ne montrer que les en-têtes principales"
 
-#: lib/Net/SMS/sms2email_http.php:644
-msgid ""
-"There was an error updating the distribution list. Please try again later."
+#: templates/message/headers.inc:70
+msgid "Show Mailing List Information"
+msgstr "Montrer les informations sur la liste de diffusion"
+
+#: templates/search/main.inc:92
+msgid "Show Only Subscribed Folders"
+msgstr "Montrer seulement les dossiers auxquels vous êtes abonnés"
+
+#: folders.php:284
+msgid "Show Unsubscribed"
+msgstr "Montrer tous les dossiers"
+
+#: config/prefs.php.dist:596
+msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr ""
-"Il y a eu une erreur lors de la mise à jour de la liste de distribution.  "
-"Veuillez essayer de nouveau."
+"Montrer une icône permettant de détacher les pièces jointes des messages ?"
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:148
-msgid "This IMAP server does not support sharing folders."
-msgstr "Le présent serveur IMAP ne supporte pas le partage de dossiers."
+#: config/prefs.php.dist:991
+msgid "Show legend in the mailbox view?"
+msgstr "Montrer la légende dans la vue de la boîte ?"
 
-#: lib/Horde/MIME/Viewer/rar.php:48
-msgid "This does not appear to be a valid rar archive."
-msgstr "Ça ne semble pas être une archive RAR valide."
+#: config/prefs.php.dist:829
+msgid "Show previews for unread messages only?"
+msgstr "Ne pré-visualiser que les messages non ouverts ?"
 
-#: lib/Horde/MIME/Viewer/zip.php:52
-msgid "This does not appear to be a valid zip file."
-msgstr "Ça ne semble pas être un fichier ZIP valide."
+#: config/prefs.php.dist:837
+msgid "Show previews in tooltips?"
+msgstr "Montrer les pré-visualisations dans les bulles d'aide ?"
 
-#: lib/Horde/Form.php:3143
-msgid "This does not seem to be a valid card number."
-msgstr "Ça ne semble pas être un numéro de carte valide."
+#: config/prefs.php.dist:866
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr "Montrer l'icône de récupération du courrier dans la barre de menu ?"
 
-#: lib/Net/SMS/clickatell_http.php:184
-msgid ""
-"This driver allows sending of messages through the Clickatell (http://"
-"clickatell.com) gateway, using the HTTP API"
-msgstr ""
-"Ce pilote permet l'envoi de messages à travers la passerelle Clickatell "
-"(http://clickatell.com) en utilisant l'API HTTP"
+#: lib/MIME/Viewer/html.php:98
+msgid "Show the Images"
+msgstr "Montrer les images"
 
-#: lib/Net/SMS/sms2email_http.php:514
-msgid ""
-"This driver allows sending of messages through the sms2email (http://"
-"sms2email.com) gateway, using the HTTP API"
-msgstr ""
-"Ce pilote permet l'envoi de messages à travers la passerelle sms2email "
-"(http://sms2email.com) en utilisant l'API HTTP"
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr "Afficher l'icône du filtrage dans la barre de menu ?"
 
-#: lib/Net/SMS/vodafoneitaly_smtp.php:80
-msgid ""
-"This driver allows sending of messages via SMTP through the Vodafone Italy "
-"gateway, only to Vodafone numbers. It requires an email account with "
-"Vodafone Italy (http://www.190.it)."
-msgstr ""
-"Ce pilote permet l'envoi de messages par SMTP à travers la passerelle "
-"Vodafone Italie, seulement aux numéros Vodafone. Cela nécessite un compte de "
-"courriel Vodafone Italie (http://www.190.it)."
+#: lib/Block/summary.php:31
+msgid "Show total number of mails in folder?"
+msgstr "Afficher le nombre total de messages dans le dossier ?"
 
-#: lib/Horde/Form.php:978 lib/Horde/Form.php:1057 lib/Horde/Form.php:1086
-#: lib/Horde/Form.php:1115 lib/Horde/Form.php:1182 lib/Horde/Form.php:1256
-#: lib/Horde/Form.php:1290 lib/Horde/Form.php:1403 lib/Horde/Form.php:1562
-#: lib/Horde/Form.php:1843 lib/Horde/Form.php:1958 lib/Horde/Form.php:2005
-#: lib/Horde/Form.php:2029 lib/Horde/Form.php:2078 lib/Horde/Form.php:2149
-#: lib/Horde/Form.php:2221 lib/Horde/Form.php:2408 lib/Horde/Form.php:2452
-#: lib/Horde/Form.php:2655 lib/Horde/Form.php:2826 lib/Horde/Form.php:3135
-#: lib/Horde/Form.php:3722 lib/Horde/Form.php:3730
-msgid "This field is required."
-msgstr "Ce champ est obligatoire."
+#: config/prefs.php.dist:654
+msgid "Shown"
+msgstr "Affiché"
 
-#: lib/Horde/Form.php:1065
-msgid "This field may only contain integers."
-msgstr "Ce champ ne doit contenir que des entiers."
+#: templates/mailbox/message_headers.inc:42
+msgid "Si_ze"
+msgstr "_Taille"
 
-#: lib/Horde/Form.php:2416
-msgid "This field may only contain numbers and the colon."
-msgstr "Ce champ ne doit contenir que des nombres et les deux-points."
+#: templates/mailbox/legend.inc:17
+msgid "Signed"
+msgstr "Signé"
 
-#: lib/Horde/Form.php:1094
-msgid "This field may only contain octal values."
-msgstr "Ce champ ne doit contenir que des valeurs octales."
+#: templates/compose/attachments.inc:3
+msgid "Size"
+msgstr "Taille"
 
-#: lib/Horde/Form.php:1123
-msgid "This field must be a comma or space separated list of integers"
-msgstr ""
-"Ce champ doit contenir une liste d'entiers séparés par des virgules ou des "
-"espaces"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr "Tri selon l'arrivée"
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr "Tri selon la date"
+
+#: templates/mailbox/message_headers.inc:26
+msgid "Sort by From Address"
+msgstr "Tri selon l'adresse de l'expéditeur"
+
+#: templates/mailbox/message_headers.inc:41
+msgid "Sort by Message Size"
+msgstr "Tri selon la taille du message"
+
+#: templates/mailbox/message_headers.inc:36
+msgid "Sort by Subject"
+msgstr "Tri selon le sujet"
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr "Tri par fil de discussion"
+
+#: templates/mailbox/message_headers.inc:21
+msgid "Sort by To Address"
+msgstr "Tri selon l'adresse du destinataire"
+
+#: templates/prefs/spamselect.inc:23
+msgid "Spam folder:"
+msgstr "Dossier de pourriels :"
 
-#: lib/Horde/Form.php:989
-msgid "This field must be a valid number."
-msgstr "Ce champ doit être un nombre valide."
+#: templates/compose/compose.inc:344
+msgid "Special Characters"
+msgstr "Caractères spéciaux"
 
-#: lib/Horde/Form.php:2834
-msgid ""
-"This field must contain a color code in the RGB Hex format, for example "
-"'#1234af'."
-msgstr ""
-"Ce champ doit contenir un code de couleur au format RGB hexadécimal, par "
-"exemple '#1234af'."
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Les dossiers virtuels spéciaux ne peuvent pas être édités."
+
+#: templates/compose/compose.inc:341
+msgid "Spell Check"
+msgstr "Vérification de l'orthographe"
+
+#: templates/compose/spelling.inc:46
+msgid "Spell Checker"
+msgstr "Vérificateur d'orthographe"
+
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
+msgid "Spell check complete"
+msgstr "Vérification de l'orthographe terminée"
+
+#: config/prefs.php.dist:471
+msgid "Spelling errors per screen when spell checking."
+msgstr "Erreurs d'orthographe par écran lors de la correction."
+
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
+msgid "Start"
+msgstr "Début"
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr "Papeterie"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Nom de la papeterie :"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Type de papeterie :"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Papeterie :"
 
-#: lib/Horde/Form.php:561
-msgid "This form has already been processed."
-msgstr "Ce formulaire a déjà été traité."
+#: lib/MIME/Viewer/itip.php:683
+msgid "Status"
+msgstr "Statut"
 
-#: templates/help/about.inc:1
-#, php-format
-msgid "This is %s."
-msgstr "C'est %s"
+#: lib/MIME/Contents.php:239
+msgid "Strip Attachment"
+msgstr "Retirer la pièce jointe"
+
+#: config/prefs.php.dist:821
+msgid "Strip linebreaks?"
+msgstr "Supprimer les sauts de ligne ?"
+
+#: templates/mailbox/message_headers.inc:37
+msgid "Sub_ject"
+msgstr "Su_jet"
 
-#: lib/Horde/Kolab.php:437
-#, php-format
-msgid ""
-"This is a Kolab Groupware object. To view this object you will need an email "
-"client that understands the Kolab Groupware format. For a list of such email "
-"clients please visit %s"
-msgstr ""
-"Ceci est un objet Kolab Groupware. Pour voir cet objet, vous devrez avoir un "
-"client de courriel qui comprend le format Kolab Groupware. Pour une liste de "
-"ces clients de courriel, visitez %s"
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
+msgid "Subject"
+msgstr "Sujet"
 
-#: lib/Horde/MIME/Contents.php:587
-#, php-format
-msgid "This message was written in a character set (%s) other than your own."
-msgstr ""
-"Ce message a été écrit dans un code de caractères (%s) autre que le vôtre."
+#: config/prefs.php.dist:909
+msgid "Subject Field"
+msgstr "Champ sujet"
 
-#: lib/Horde/Prefs/UI.php:126
-msgid "This number must be at least one."
-msgstr "Ce nombre doit être supérieur à un."
+#: search.php:306 templates/pgp/passphrase.inc:31
+#: templates/saveimage/saveimage.inc:18 templates/smime/passphrase.inc:20
+msgid "Submit"
+msgstr "Envoyer"
 
-#: po/translation.php:1304
-msgid "This script must be run from the command line."
-msgstr "Ce script doit être exécuté depuis une ligne de commande."
+#: templates/folders/actions.inc:11
+msgid "Subscribe to Folder(s)"
+msgstr "S'abonner au(x) dossier(s)"
 
-#: lib/Horde/Compress/gzip.php:45
-msgid "This server can't uncompress zip and gzip files."
-msgstr "Ce serveur ne peut pas décompresser les fichiers ZIP et gzip."
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/status.php:87
+msgid "Success"
+msgstr "Réussi"
 
-#: lib/Horde/Registry.php:147
-msgid "This system is currently deactivated."
-msgstr "Ce système est présentement désactivé."
+#: templates/compose/spelling.inc:86
+msgid "Suggestions"
+msgstr "Suggestions"
 
-#: lib/Horde/Prefs/UI.php:124
-msgid "This value must be a number."
-msgstr "Cette valeur doit être un nombre."
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
+msgid "Summary"
+msgstr "Sommaire"
 
-#: services/images/colorpicker.php:35
-msgid "This window must be called from an Options window"
-msgstr "Cette fenêtre doit être appelée depuis une fenêtre des options"
+#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
+msgid "Switch Composition Method"
+msgstr "Basculer les méthodes de rédaction"
 
-#: lib/Block/weatherdotcom_strings.php:60
-msgid "Thunder"
-msgstr "Tonnerre"
+#: templates/compose/compose.inc:399
+msgid "Switch to HTML composition"
+msgstr "Basculer vers la rédaction en HTML"
 
-#: lib/Horde/Form.php:2426
-msgid "Time"
-msgstr "Heure"
+#: templates/compose/compose.inc:399
+msgid "Switch to plain text composition"
+msgstr "Basculer vers la rédaction en texte brut"
 
-#: lib/Block/time.php:17
-msgid "Time format"
-msgstr "Format d'heure"
+#: templates/compose/compose.inc:414
+msgid "Te_xt"
+msgstr "Te_xte"
 
-#: lib/Horde/Form.php:2537
-msgid "Time selection"
-msgstr "Sélection de l'heure"
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr "Tentative : "
 
-#: lib/Horde/NLS/GeoIP.php:110 lib/Horde/NLS/countries.php:222
-#: lib/Horde/NLS/tld.php:230
-msgid "Timor-Leste"
-msgstr "Timor oriental"
+#: lib/MIME/Viewer/itip.php:586
+msgid "Tentatively Accept request"
+msgstr "Demande acceptée mais à confirmer"
 
-#: lib/Block/iframe.php:20 lib/Horde/MIME/Viewer/vcard.php:229
-msgid "Title"
-msgstr "Titre"
+#: lib/MIME/Viewer/itip.php:754
+msgid "Tentatively Accepted"
+msgstr "Accepté mais à confirmer"
 
-#: templates/javascript/htmlarea_lang.js:96
-msgid "Title (tooltip):"
-msgstr "Titre (infobulle) :"
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr "Les conditions d'utilisation ne sont pas indiquées dans conf.php"
 
-#: lib/Horde/MIME/Viewer/rfc822.php:75
-msgid "To"
-msgstr "À"
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Texte"
+
+#: config/prefs.php.dist:943
+msgid "The From: column of the message should be linked:"
+msgstr "La colonne « De : » de ce message devrait être liée :"
 
-#: lib/Horde/UI/VarRenderer/html.php:629
+#: lib/IMAP/Client.php:525
 msgid ""
-"To select multiple items, hold down the Control (PC) or Command (Mac) key "
-"while clicking."
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
 msgstr ""
-"Pour sélectionner plusieurs items à la fois, maintenez enfoncé le bouton "
-"« Ctrl » (PC) ou « Commande » (Mac) en cliquant."
+"Le serveur IMAP ne semble pas supporter la méthode d'authentification "
+"choisie. Veuillez contacter l'administrateur de votre système."
 
-#: lib/Block/weatherdotcom.php:255
-msgid "Today"
-msgstr "Aujourd'hui"
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr "La palette de ressources Macintosh"
 
-#: templates/javascript/htmlarea_lang.js:28
-msgid "Toggle HTML Source"
-msgstr "Voir la source HTML"
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr "Les ressources Macintosh peuvent être téléchargées %s."
 
-#: lib/Horde/NLS/GeoIP.php:109 lib/Horde/NLS/countries.php:223
-#: lib/Horde/NLS/tld.php:223
-msgid "Togo"
-msgstr "Togo"
+#: fetchmailprefs.php:81
+#, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Le compte « %s » a été supprimé."
 
-#: lib/Horde/NLS/GeoIP.php:110 lib/Horde/NLS/countries.php:224
-#: lib/Horde/NLS/tld.php:226
-msgid "Tokelau"
-msgstr "Tokelau"
+#: fetchmailprefs.php:74
+#, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Le compte « %s » a été enregistré."
 
-#: lib/Block/weatherdotcom.php:257
-msgid "Tomorrow"
-msgstr "Demain"
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "La pièce jointe n'a pas été trouvée."
 
-#: lib/Horde/NLS/GeoIP.php:110 lib/Horde/NLS/countries.php:225
-#: lib/Horde/NLS/tld.php:229
-msgid "Tonga"
-msgstr "Tonga"
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr "Les données du calendrier sont invalides"
 
-#: templates/javascript/htmlarea_lang.js:77
-#: templates/javascript/htmlarea_table_lang.js:81
-msgid "Top"
-msgstr "Haut"
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr "Le contenu du fichier Macintosh est ci-dessous."
 
-#: templates/javascript/htmlarea_lang.js:93
-msgid "Top frame (_top)"
-msgstr "Cadre du haut (_top)"
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
+#, php-format
+msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
+msgstr "Le dossier courant « %s » sera renommé en « %s »."
 
-#: po/translation.php:657
-msgid "Translated"
-msgstr "Traduit"
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+"Lecture impossible de la liste des utilisateurs qui ont accès à ce dossier"
 
-#: lib/Block/fortune.php:63
-msgid "Translations"
-msgstr "Traductions"
+#: compose.php:1272
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "Le brouillon a été enregistré dans le dossier « %s »."
 
-#: lib/Horde/NLS/GeoIP.php:111 lib/Horde/NLS/countries.php:226
-#: lib/Horde/NLS/tld.php:232
-msgid "Trinidad and Tobago"
-msgstr "Trinité-et-Tobago"
+#: lib/MIME/Viewer/itip.php:140
+msgid "The event was added to your calendar."
+msgstr "Cet événement a bien été ajouté à votre agenda."
 
-#: lib/Horde/Form.php:1794
-msgid "True or false"
-msgstr "Vrai ou faux"
+#: templates/compose/expand.inc:9
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Le champ « %s » ne peut pas être développé."
 
-#: templates/javascript/open_calendar.js:57
-msgid "Tu"
-msgstr "Ma"
+#: lib/Folder.php:293
+#, php-format
+msgid "The folder \"%s\" already exists"
+msgstr "Le dossier « %s » existe déjà"
 
-#: lib/Horde/NLS/GeoIP.php:110 lib/Horde/NLS/countries.php:227
-#: lib/Horde/NLS/tld.php:228
-msgid "Tunisia"
-msgstr "Tunisie"
+#: lib/Folder.php:150
+#, php-format
+msgid ""
+"The folder \"%s\" contains illegal characters in its name. It may cause "
+"problems. Please see your system administrator."
+msgstr ""
+"Le nom du dossier « %s » contient des caractères illégaux. Cela pourrait "
+"éventuellement causer des problèmes. Veuillez contacter votre administrateur "
+"système."
 
-#: lib/Horde/NLS/GeoIP.php:111 lib/Horde/NLS/countries.php:228
-#: lib/Horde/NLS/tld.php:231
-msgid "Turkey"
-msgstr "Turquie"
+#: lib/Folder.php:312
+#, php-format
+msgid "The folder \"%s\" was created but you were not subscribed to it."
+msgstr "Le dossier « %s » a été créé, mais vous n'y avez pas souscrit."
 
-#: lib/Horde/NLS/GeoIP.php:110 lib/Horde/NLS/countries.php:229
-#: lib/Horde/NLS/tld.php:227
-msgid "Turkmenistan"
-msgstr "Turkménistan"
+#: lib/Folder.php:229
+#, php-format
+msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
+msgstr ""
+"Le dossier « %s » a été supprimé, mais vous n'en n'avez pas été désabonné."
 
-#: lib/Horde/NLS/GeoIP.php:108 lib/Horde/NLS/countries.php:230
-#: lib/Horde/NLS/tld.php:220
-msgid "Turks and Caicos Islands"
-msgstr "Îles Turques et Caïques"
+#: lib/Folder.php:299
+#, php-format
+msgid "The folder \"%s\" was not created. This is what the server said"
+msgstr " Le dossier « %s » n'a pas été créé. Le serveur a répondu"
 
-#: lib/Horde/NLS/GeoIP.php:111 lib/Horde/NLS/countries.php:231
-#: lib/Horde/NLS/tld.php:233
-msgid "Tuvalu"
-msgstr "Tuvalu"
+#: lib/Folder.php:222
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "Le dossier « %s » n'a pas été supprimé. Le serveur a répondu"
 
-#: lib/Horde/CLI.php:264
-msgid "Type your choice: "
-msgstr "Entrez votre choix : "
+#: lib/Folder.php:315
+#, php-format
+msgid "The folder \"%s\" was successfully created."
+msgstr "Le dossier « %s » a bien été créé."
 
-#: lib/Block/weatherdotcom.php:231
-msgid "U.V. index: "
-msgstr "Indice UV : "
+#: lib/Folder.php:232
+#, php-format
+msgid "The folder \"%s\" was successfully deleted."
+msgstr "Le dossier « %s » a bien été détruit."
 
-#: lib/Block/iframe.php:17 lib/Horde/MIME/Viewer/vcard.php:249
-msgid "URL"
-msgstr "URL"
+#: lib/Folder.php:421
+#, php-format
+msgid "The folder \"%s\" was successfully renamed to \"%s\"."
+msgstr "Le dossier « %s » a bien été renommé en « %s »."
 
-#: lib/Net/SMS/sms2email_http.php:540
-msgid "URL for your script delivery status report"
-msgstr "URL pour votre rapport de livraison du script"
+#: lib/MIME/Viewer/tnef.php:94
+msgid "The following files were attached to this part:"
+msgstr "Les fichiers suivants sont attachés à cette partie :"
 
-#: templates/javascript/htmlarea_lang.js:97
-msgid "URL:"
-msgstr "URL:"
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"La fenêtre de sauvegarde des images ne peut être ouverte. Est-il possible "
+"que vous ayez activé le blocage des fenêtres surgissantes ?"
 
-#: lib/Horde/NLS/GeoIP.php:112 lib/Horde/NLS/countries.php:232
-#: lib/Horde/NLS/tld.php:237
-msgid "Uganda"
-msgstr "Ouganda"
+#: lib/MIME/Viewer/html.php:100
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+"Les images seront affichées parce que l'expéditeur est dans votre carnet "
+"d'adresses."
 
-#: lib/Horde/NLS/GeoIP.php:112 lib/Horde/NLS/countries.php:233
-#: lib/Horde/NLS/tld.php:236
-msgid "Ukraine"
-msgstr "Ukraine"
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr "Le serveur de courriel a généré ce message d'erreur :"
 
-#: lib/VFS/file.php:335
-msgid "Unable to access VFS directory."
-msgstr "Impossible d'atteindre le répertoire VFS."
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr "Le serveur de courriel a généré ce message informatif :"
 
-#: lib/Horde/Auth/Signup.php:96
-msgid "Unable to add extra user information when signing up."
-msgstr "Impossible d'ajouter des informations complémentaires à l'inscription."
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr "Le serveur de courriel a généré ce message :"
 
-#: lib/VFS/ftp.php:326
+#: lib/Message.php:687
 #, php-format
-msgid "Unable to change permission for VFS file \"%s\"."
-msgstr "Impossible de modifier les permissions pour le fichier VFS « %s »."
+msgid "The mailbox %s is already empty."
+msgstr "La boîte %s est déjà vide."
 
-#: lib/VFS/file.php:308 lib/VFS/musql.php:468
+#: lib/Fetchmail.php:247
 #, php-format
-msgid "Unable to change permission for VFS file %s/%s."
-msgstr "Impossible de modifier les permissions pour le fichier VFS %s/%s."
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr "Le message «%s »de «%s» (%d octets) dépasse la limite permise."
+
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr "Le message en cours de rédaction a été fermé. Sortie."
 
-#: lib/VFS/ftp.php:672
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Le message ne comporte pas d'objet."
+
+#: message.php:148
+msgid "The message has been deleted."
+msgstr "Le message a été supprimé."
+
+#: lib/MIME/Viewer/pgp.php:397
+msgid "The message has been verified."
+msgstr "Le message a été vérifié."
+
+#: lib/MIME/Viewer/pkcs7.php:390
 #, php-format
-msgid "Unable to change to %s."
-msgstr "Impossible de changer pour %s."
+msgid "The message has been verified. Sender: %s."
+msgstr "Le message a été vérifié. Expéditeur : %s."
 
-#: lib/Horde/Auth/sql.php:371
-msgid "Unable to connect to SQL server."
-msgstr "Connexion impossible au serveur SQL."
+#: lib/MIME/Viewer/pgp.php:172
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr "Le texte brut de la clef PGP peut être consulté %s."
 
-#: lib/VFS/ftp.php:756
-msgid "Unable to connect with SSL."
-msgstr "Connexion impossible en SSL"
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "Le fichier demandé ne se trouve pas dans la pièce jointe MS-TNEF."
 
-#: lib/VFS/file.php:158 lib/VFS/file.php:163 lib/VFS/sql_file.php:188
-#: lib/VFS/sql_file.php:193 lib/VFS/sql_file.php:201
-msgid "Unable to copy VFS file."
-msgstr "Impossible de copier un fichier VFS."
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "Le fichier demandé ne se trouve pas dans la pièce jointe compressée."
 
-#: lib/VFS/ftp.php:303
+#: message.php:550
 #, php-format
-msgid "Unable to create VFS directory \"%s\"."
-msgstr "Impossible de créer un répertoire VFS « %s »."
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+"L'expéditeur de ce message vous demande un avis de livraison (MDN) lorsque "
+"vous aurez lu ce message. SVP cliquez %s pour envoyer l'avis de livraison."
 
-#: lib/VFS/file.php:277 lib/VFS/musql.php:258 lib/VFS/sql_file.php:248
-msgid "Unable to create VFS directory."
-msgstr "Impossible de créer un répertoire VFS."
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "Le serveur n'a pas pu créer une vignette à partir de cette image."
 
-#: lib/VFS/musql.php:124
-msgid "Unable to create VFS file."
-msgstr "Impossible de créer le fichier VFS."
+#: templates/compose/compose.js:90
+msgid "The signature could not be replaced."
+msgstr "La signature n'a pu être remplacée."
 
-#: lib/VFS/file.php:198
-msgid "Unable to create empty VFS file."
-msgstr "Impossible de créer un fichier VFS vide. "
+#: templates/compose/compose.js:88
+msgid "The signature was successfully replaced."
+msgstr "La signature a bien été remplacée."
 
-#: lib/Horde/Compress/gzip.php:79 lib/Horde/Compress/tar.php:76
-msgid "Unable to decompress data."
-msgstr "Ouverture impossible de l'archive compressée. "
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr "Le fichier demandé n'existe pas."
 
-#: lib/VFS/ftp.php:236
+#: stationery.php:85
 #, php-format
-msgid "Unable to delete \"%s\", the directory is not empty."
-msgstr "Suppression impossible de « %s », le dossier n'est pas vide."
+msgid "The stationery \"%s\" has been added."
+msgstr "La papeterie « %s » a été enregistrée."
 
-#: lib/VFS/file.php:254 lib/VFS/musql.php:311 lib/VFS/sql.php:305
-#: lib/VFS/sql_file.php:326
+#: stationery.php:63
 #, php-format
-msgid "Unable to delete %s, the directory is not empty"
-msgstr "Suppression impossible de %s, le dossier n'est pas vide"
+msgid "The stationery \"%s\" has been deleted."
+msgstr "La papeterie « %s » a été supprimée."
 
-#: admin/groups.php:79 admin/perms/delete.php:59
+#: stationery.php:88
 #, php-format
-msgid "Unable to delete '%s': %s."
-msgstr "Suppression impossible de « %s » : %s."
+msgid "The stationery \"%s\" has been updated."
+msgstr "La papeterie « %s » a été mise à jour."
 
-#: lib/VFS/sql_file.php:340 lib/VFS/sql_file.php:344
-msgid "Unable to delete VFS directory recursively."
-msgstr "Suppression récursive du dossier VFS impossible."
+#: lib/MIME/Viewer/itip.php:170
+msgid "The task has been added to your tasklist."
+msgstr "Cette tâche a bien été ajoutée à votre liste."
 
-#: lib/VFS/file.php:260 lib/VFS/musql.php:322 lib/VFS/musql.php:335
-#: lib/VFS/musql.php:343 lib/VFS/sql_file.php:336
-msgid "Unable to delete VFS directory."
-msgstr "Suppression du répertoire VFS impossible."
+#: lib/MIME/Viewer/status.php:95
+msgid "The text of the message"
+msgstr "Texte du message"
 
-#: lib/VFS/sql.php:330 lib/VFS/sql.php:342
+#: lib/MIME/Viewer/status.php:94
 #, php-format
-msgid "Unable to delete VFS directory: %s."
-msgstr "Impossible de supprimer le répertoire VFS : %s."
+msgid "The text of the message can be viewed %s."
+msgstr "Le texte du message peut être consulté %s."
 
-#: lib/VFS/ftp.php:170
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr "Texte du message retourné"
+
+#: lib/MIME/Viewer/status.php:79
 #, php-format
-msgid "Unable to delete VFS file \"%s\"."
-msgstr "Suppression impossible du fichier VFS « %s »."
+msgid "The text of the returned message can be viewed %s."
+msgstr "Le texte du message retourné peut être consulté %s."
 
-#: lib/VFS/file.php:226 lib/VFS/musql.php:167 lib/VFS/musql.php:180
-#: lib/VFS/musql.php:187 lib/VFS/sql.php:206 lib/VFS/sql_file.php:370
-#: lib/VFS/sql_file.php:378
-msgid "Unable to delete VFS file."
-msgstr "Suppression impossible du fichier VFS."
+#: lib/MIME/Viewer/notification.php:68
+msgid "The text of the sent message"
+msgstr "Le texte du message envoyé"
 
-#: lib/VFS/sql.php:319
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
-msgid "Unable to delete VFS recursively: %s."
-msgstr "Suppression VFS récursive impossible : %s."
+msgid "The text of the sent message can be viewed %s."
+msgstr "Le texte du message envoyé peut être consulté %s."
 
-#: lib/VFS/ftp.php:720
-msgid "Unable to determine current directory."
-msgstr "Impossible de déterminer le dossier courant."
+#: lib/MIME/Viewer/itip.php:155
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Les disponibilités de l'utilisateur ont bien été enregistrées."
 
-#: lib/Horde/Crypt/smime.php:603
-msgid "Unable to extract certificate details"
-msgstr "Impossible d'extraire les détails du certificat"
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Aucune partie alternative ne peut être affichée en ligne."
 
-#: lib/Net/IMSP.php:451 lib/Net/IMSP/Auth.php:117
-#, php-format
-msgid "Unable to load the definition of %s."
-msgstr "Impossible de charger la définition de %s."
+#: templates/mailbox/empty_mailbox.inc:3
+msgid "There are no messages in this mailbox."
+msgstr "Il n'y a aucun message dans cette boîte."
 
-#: lib/VFS/file.php:129 lib/VFS/file.php:134 lib/VFS/sql_file.php:158
-#: lib/VFS/sql_file.php:163
-msgid "Unable to move VFS file."
-msgstr "Impossible de déplacer le fichier VFS."
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr "Aucun texte ne peut être affiché en ligne."
 
-#: lib/VFS/ftp.php:76
+#: lib/Message.php:689
 #, php-format
-msgid "Unable to open VFS file \"%s\"."
-msgstr "Impossible d'ouvrir le fichier VFS « %s »."
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "Une erreur est survenue en vidant la boîte. Le serveur a répondu : %s"
 
-#: lib/VFS/file.php:205 lib/VFS/sql_file.php:122 lib/VFS/sql_file.php:125
-msgid "Unable to open VFS file for writing."
-msgstr "Impossible d'ouvrir un fichier VFS en écriture."
-
-#: lib/VFS/file.php:67 lib/VFS/sql_file.php:72
-msgid "Unable to open VFS file."
-msgstr "Impossible d'ouvrir un fichier VFS."
+#: lib/Message.php:110
+#, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"Il y a eu une erreur lors de la copie des messages de « %s » vers « %s ». Le "
+"serveur a répondu"
 
-#: lib/Horde/MIME/Viewer/tgz.php:45
-msgid "Unable to open compressed archive."
-msgstr "Ouverture impossible de l'archive compressée."
+#: lib/Message.php:226 lib/Message.php:244
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr ""
+"Il y a eu une erreur lors de la destruction des messages du dossier « %s ». "
+"Le serveur a répondu"
 
-#: lib/Horde/SessionHandler/none.php:38
-msgid "Unable to read file: "
-msgstr "Impossible de lire le fichier : "
+#: lib/Message.php:318
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+"Il y a eu une erreur lors de la destruction des messages dans le dossier « %"
+"s ». Le serveur a répondu"
 
-#: lib/VFS/file.php:592
-msgid "Unable to read the vfsroot directory."
-msgstr "Lecture du répertoire racine VFS impossible."
+#: lib/Message.php:242
+#, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr ""
+"Une erreur est survenue lors de la destruction des messages. Le serveur a "
+"répondu : %s"
 
-#: lib/Horde/Kolab.php:1067
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
-msgid "Unable to rename %s to %s: destination folder already exists"
-msgstr "Impossible de renommer %s en %s : le dossier cible existe déjà"
+msgid "There was an error deleting the event: %s."
+msgstr "Une erreur est apparue lors de la suppression de l'événement : %s."
 
-#: lib/VFS/sql_file.php:285
-msgid "Unable to rename VFS directory."
-msgstr "Impossible de renommer le répertoire VFS."
+#: lib/MIME/Viewer/enriched.php:37 lib/MIME/Viewer/plain.php:52
+msgid "There was an error displaying this message part"
+msgstr "Une erreur est survenue lors de l'affichage de cette partie"
 
-#: lib/VFS/sql.php:244
+#: lib/Message.php:591
 #, php-format
-msgid "Unable to rename VFS directory: %s."
-msgstr "Impossible de renommer le répertoire VFS : %s."
+msgid ""
+"There was an error flagging messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+"Une erreur est survenue lors du changement d'état des messages dans le "
+"dossier « %s ». Le serveur a répondu"
 
-#: lib/VFS/ftp.php:281
+#: folders.php:149
 #, php-format
-msgid "Unable to rename VFS file \"%s\"."
-msgstr "Impossible de renommer le fichier VFS « %s »."
+msgid "There was an error importing %s."
+msgstr "Une erreur est survenue lors de l'importation de %s."
 
-#: lib/VFS/file.php:533 lib/VFS/musql.php:229
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
-msgid "Unable to rename VFS file %s/%s."
-msgstr "Impossible de renommer le fichier VFS %s/%s."
-
-#: lib/VFS/musql.php:213 lib/VFS/musql.php:452 lib/VFS/sql.php:238
-#: lib/VFS/sql_file.php:277 lib/VFS/sql_file.php:293
-msgid "Unable to rename VFS file."
-msgstr "Impossible de renommer le fichier VFS."
+msgid "There was an error importing the event: %s."
+msgstr "Une erreur est apparue lors de l'importation de l'événement : %s."
 
-#: lib/VFS/ISOWriter/mkisofs.php:50
-msgid "Unable to run 'mkisofs'."
-msgstr "Impossible d'exécuter 'mkisofs'."
+#: lib/MIME/Viewer/itip.php:167
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Une erreur est apparue lors de l'importation de cette tâche : %s."
 
-#: lib/Horde/MIME/Viewer/msword.php:59
-msgid "Unable to translate this Word document"
-msgstr "Impossible de traduire ce document Word."
+#: lib/MIME/Viewer/itip.php:153
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr ""
+"Une erreur est survenue lors de l'importation des données iCalendar : %s."
 
-#: lib/VFS/ftp.php:122 lib/VFS/ftp.php:125
+#: lib/Message.php:105
 #, php-format
-msgid "Unable to write VFS file \"%s\"."
-msgstr "Impossible d'écrire le fichier VFS « %s »."
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"Une erreur est survenue lors du déplacement des messages de « %s » vers « %"
+"s ». Le serveur a répondu"
 
-#: lib/VFS/file.php:112
-msgid "Unable to write VFS file (copy() failed)."
-msgstr "Impossible d'écrire les données du fichier VFS (copy() impossible)."
+#: compose.php:1280
+msgid "There was an error saving this message as a draft."
+msgstr "Une erreur est survenue lors de l'enregistrement du brouillon."
 
-#: lib/VFS/file.php:209 lib/VFS/sql_file.php:130 lib/VFS/sql_file.php:135
-msgid "Unable to write VFS file data."
-msgstr "Impossible d'écrire les données du fichier VFS."
+#: compose.php:1039
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr "Une erreur est survenue lors de l'envoi du message : %s"
 
-#: templates/javascript/htmlarea_lang.js:10
-msgid "Underline"
-msgstr "Souligner"
+#: lib/MIME/Viewer/itip.php:114
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Une erreur est apparue lors de la mise à jour de l'événement : %s."
 
-#: templates/prefs/end.inc:6
-msgid "Undo Changes"
-msgstr "Annuler les changements"
+#: lib/MIME/Viewer/html.php:100
+msgid "This HTML message has images embedded in it."
+msgstr "Ce message HTML comporte des images imbriquées."
 
-#: templates/javascript/htmlarea_lang.js:33
-msgid "Undoes your last action"
-msgstr "Annule votre dernière action"
+#: lib/MIME/Viewer/html.php:93
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+"Ce message HTML comporte des images imbriquées. Les images bloquées "
+"apparaissent comme suit : "
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:223 lib/Horde/IMAP/ACL/rfc2086.php:390
-msgid "Unexpected response from server on connection: "
-msgstr "Réponse inattendue du serveur lors de la connexion : "
+#: lib/MIME/Viewer/pgp.php:165
+msgid "This PGP Public Key was attached to the message."
+msgstr "Cette clef PGP publique a été jointe au message."
 
-#: lib/Horde/IMAP/ACL/rfc2086.php:219 lib/Horde/IMAP/ACL/rfc2086.php:341
-#: lib/Horde/IMAP/ACL/rfc2086.php:378 lib/Horde/IMAP/ACL/rfc2086.php:384
-msgid "Unexpected response from server to: "
-msgstr "Réponse inattendue du serveur à : "
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
+msgid "This action is not supported."
+msgstr "Cette action n'est pas prise en compte."
 
-#: lib/Horde/Prefs/CategoryManager.php:57
-#: templates/prefs/categorymanagement.inc:64
-msgid "Unfiled"
-msgstr "Hors catégorie"
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
+msgid "This action is not yet implemented."
+msgstr "Cette action n'est pas encore implémentée."
 
-#: lib/Horde/NLS/GeoIP.php:56 lib/Horde/NLS/countries.php:234
-#: lib/Horde/NLS/tld.php:17
-msgid "United Arab Emirates"
-msgstr "Émirats Arabes Unis"
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr ""
+"Cette opération peut prendre un peu de temps. Êtes-vous certain de vouloir "
+"continuer ?"
 
-#: lib/Horde/NLS/GeoIP.php:74 lib/Horde/NLS/countries.php:235
-#: lib/Horde/NLS/tld.php:238
-msgid "United Kingdom"
-msgstr "Royaume-Uni"
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr "Ce message contient un fichier Macintosh."
 
-#: lib/Horde/NLS/GeoIP.php:113 lib/Horde/NLS/countries.php:236
-#: lib/Horde/NLS/tld.php:240
-msgid "United States"
-msgstr "États-Unis"
+#: lib/MIME/Viewer/pkcs7.php:416
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+"Ce message contient une pièce jointe qui a été signée numériquement via S/"
+"MIME."
 
-#: lib/Horde/NLS/GeoIP.php:113 lib/Horde/NLS/countries.php:237
-#: lib/Horde/NLS/tld.php:239
-msgid "United States Minor Outlying Islands"
-msgstr "Îles extérieures des États-Unis"
+#: lib/MIME/Viewer/pkcs7.php:420
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Ce message contient une pièce jointe qui a été chiffré via S/MIME."
 
-#: lib/Block/metar.php:69 lib/Block/weatherdotcom.php:69
-msgid "Units"
-msgstr "Unités"
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
+"Ce message contient les informations à propos de l'état d'envoi du courriel, "
+"mais le format de ce message est inconnu."
 
-#: lib/Horde/Crypt/pgp.php:415 lib/Horde/Crypt/pgp.php:416
-msgid "Unknown"
-msgstr "Inconnu"
+#: lib/MIME/Viewer/pgp.php:319
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "Ce message ne semble pas être un message chiffré PGP valide. Erreur : "
 
-#: lib/Net/SMS/clickatell_http.php:297
-msgid "Unknown apimsgid (API Message ID)."
-msgstr "apimsgid inconnu (API Message ID)."
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+"Ce message ne semble pas être au format PGP correct (selon la RFC 2015)."
 
-#: lib/Net/SMS/clickatell_http.php:298
-msgid "Unknown climsgid (Client Message ID)."
-msgstr "climsgid inconnu (Client Message ID)."
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr "Ce message ne semble pas être dans un format S/MIME correct."
 
-#: po/translation.php:1501
-#, php-format
-msgid "Unknown command: %s"
-msgstr "Commande inconnue : %s"
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
+msgid "This message has been digitally signed via PGP."
+msgstr "Ce message a été signé numériquement au format PGP."
 
-#: lib/Net/SMS/clickatell_http.php:290
-msgid "Unknown username or password."
-msgstr "Nom d'utilisateur ou mot de passe inconnu."
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Ce message a été signé numériquement au format S/MIME."
 
-#: templates/javascript/htmlarea_context_lang.js:57
-msgid "Unlink the current element"
-msgstr "Délier l'élément courant"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr "Ce message a été chiffré au format S/MIME."
 
-#: lib/Horde/Identity.php:296
-msgid "Unnamed"
-msgstr "Sans nom"
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
+msgid "This message has been encrypted with PGP."
+msgstr "Ce message a été chiffré avec PGP."
 
-#: templates/javascript/htmlarea_lang.js:59
-msgid ""
-"Unprivileged scripts cannot access Cut/Copy/Paste programatically for "
-"security reasons.  Click OK to see a technical note at mozilla.org which "
-"shows you how to allow a script to access the clipboard."
-msgstr ""
-"Les scripts non-privilégiés ne peuvent accéder aux fonctions couper/copier/"
-"coller pour des raisons de sécurité. Appuyez sur OK pour voir une note "
-"technique sur mozilla.org qui vous expliquera comment autoriser un script à "
-"utiliser le presse-papiers"
-
-#: templates/javascript/htmlarea_table_lang.js:82
-msgid "Unset color"
-msgstr "Remettre la couleur à zéro"
-
-#: lib/Horde/Crypt/smime.php:686 lib/Horde/Crypt/smime.php:926
-#: lib/Horde/Crypt/smime.php:932
-msgid "Unsupported Extension"
-msgstr "Extension non prise en compte"
-
-#: po/translation.php:657
-msgid "Untranslated"
-msgstr "Non traduit"
+#: message.php:210
+msgid "This message to"
+msgstr "Ce message à"
 
-#: admin/perms/edit.php:106 lib/Horde/Perms/UI.php:183
-#: templates/admin/user/list.inc:33
-msgid "Update"
-msgstr "Modifier"
+#: acl.php:45
+msgid "This server does not support sharing folders."
+msgstr "Ce serveur ne supporte pas le partage des dossiers."
 
-#: templates/admin/user/update.inc:31
-#, php-format
-msgid "Update %s"
-msgstr "Modifier %s"
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr "Cette fenêtre doit être appelée depuis la fenêtre de rédaction."
 
-#: templates/admin/user/update.inc:43
-msgid "Update user"
-msgstr "Modifier l'utilisateur"
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Affichage des enfilades"
 
-#: admin/groups.php:137 admin/perms/edit.php:217 services/shares/edit.php:230
-#, php-format
-msgid "Updated '%s'."
-msgstr "Mise à jour de « %s »."
+#: thread.php:76 config/prefs.php.dist:911
+msgid "Thread View"
+msgstr "Vue avec les enfilades"
 
-#: po/translation.php:1092 po/translation.php:1230
-#, php-format
-msgid "Updating %s help file for %s."
-msgstr "Mise à jour du fichier d'aide %s pour %s."
+#: mailbox.php:601 message.php:271 templates/contacts/contacts.inc:219
+#: templates/compose/recompose.inc:10 templates/compose/redirect.inc:61
+#: templates/mailbox/message_headers.inc:22 lib/Search.php:593
+msgid "To"
+msgstr "À"
 
-#: admin/setup/scripts.php:81
-msgid "Upgrade script deleted."
-msgstr "Le script de mise à jour est supprimé"
+#: config/prefs.php.dist:908
+msgid "To Address"
+msgstr "Adresse du destinataire"
 
-#: admin/setup/index.php:181 lib/Horde/UI/VarRenderer/html.php:182
-msgid "Upload"
-msgstr "Charger"
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+"Pour sélectionner plusieurs items à la fois, maintenez enfoncé le bouton "
+"« Ctrl » (PC) ou Command (Mac) et cliquez."
 
-#: admin/setup/index.php:189
-msgid "Uploaded all application setup files to the server."
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
 msgstr ""
-"Tous les fichiers de configuration des applications ont été envoyés sur le "
-"serveur."
+"Pour utiliser une connexion TLS, vous devez avoir une version 5.1.0 ou "
+"supérieure de PHP."
 
-#: templates/javascript/htmlarea_listtype_lang.js:20
-msgid "Upper latin letters"
-msgstr "Lettres latines majuscules"
+#: templates/compose/compose.inc:591
+msgid "Total Attachments Size:"
+msgstr "Taille totale des pièces jointes :"
 
-#: templates/javascript/htmlarea_listtype_lang.js:18
-msgid "Upper roman numbers"
-msgstr "Nombres romains majuscules"
+#: folders.php:369
+msgid "Trash folder"
+msgstr "Corbeille"
 
-#: lib/Horde/NLS/GeoIP.php:113 lib/Horde/NLS/countries.php:238
-#: lib/Horde/NLS/tld.php:241
-msgid "Uruguay"
-msgstr "Uruguay"
+#: templates/prefs/trashselect.inc:23
+msgid "Trash folder:"
+msgstr "Corbeille :"
 
-#: po/translation.php:35 po/translation.php:92 po/translation.php:93
-msgid "Usage:"
-msgstr "Utilisation :"
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr "Récupération du quota impossible"
 
-#: lib/Horde/Prefs/CategoryManager.php:45
-#, php-format
-msgid "Use Current: %s"
-msgstr "Employé actuellement : %s"
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
+msgid "Unanswered"
+msgstr "Sans réponse"
 
-#: lib/Net/SMS/sms2email_http.php:537
-msgid "Use SSL"
-msgstr "Utiliser SSL"
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Messages sans réponses"
 
-#: lib/Horde/Registry.php:618
-#, php-format
-msgid "User %s is not authorised for %s."
-msgstr "L'utilisateur %s n'a pas l'autorisation pour %s."
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
+msgid "Undelete"
+msgstr "Restaurer"
 
-#: admin/user.php:203
-msgid "User Administration"
-msgstr "Administration des utilisateurs"
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
+msgid "Undisclosed Recipients"
+msgstr "Destinataires cachés"
 
-#: lib/Horde/Prefs/UI.php:250
-msgid "User Options"
-msgstr "Préférences personnelles"
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Réponse inattendue du serveur à la commande AUTHENTICATE."
 
-#: signup.php:62
-msgid "User Registration"
-msgstr "Enregistrement des utilisateurs"
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Réponse inattendue du serveur à la commande Digest-MD5"
 
-#: signup.php:22
-msgid "User Registration has been disabled for this site."
-msgstr "L'enregistrement d'utilisateur est désactivé sur ce système."
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Réponse inattendue du serveur à la commande LOGIN."
 
-#: admin/perms/edit.php:172 lib/Horde/Perms/UI.php:246
-msgid "User permissions"
-msgstr "Permissions de l'utilisateur"
+#: lib/MIME/Viewer/itip.php:448
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr "Pas de prise en compte du composant de type : %s"
 
-#: admin/user.php:35 admin/setup/index.php:182
-#: lib/Net/SMS/clickatell_http.php:197 lib/Net/SMS/sms2email_http.php:535
-#: lib/Net/SMS/vodafoneitaly_smtp.php:93 services/resetpassword.php:33
-#: templates/login/login.inc:65 templates/admin/user/approve.inc:12
-msgid "Username"
-msgstr "Nom d'utilisateur"
+#: mailbox.php:557
+msgid "Unknown Date"
+msgstr "Date inconnue"
 
-#: lib/Horde/Auth/Signup.php:124
+#: lib/IMAP/Client.php:395
 #, php-format
-msgid "Username '%s' already exists."
-msgstr "Le nom de connexion « %s » existe déjà."
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Réponse IMAP inconnue du serveur. Le serveur a répondu : %s"
 
-#: templates/rpcsum/rpcsum.inc:87
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
+#: lib/MIME/Viewer/itip.php:626
+msgid "Unknown Meeting"
+msgstr "Réunion inconnue"
 
-#: templates/login/mobile.inc:8
-msgid "Username: "
-msgstr "Nom d'utilisateur : "
-
-#: lib/Horde/Perms/UI.php:219
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: templates/admin/user/list.inc:2
-msgid "Users in the system:"
-msgstr "Utilisateurs définis :"
-
-#: lib/Horde/NLS/GeoIP.php:114 lib/Horde/NLS/countries.php:239
-#: lib/Horde/NLS/tld.php:242
-msgid "Uzbekistan"
-msgstr "Ouzbékistan"
-
-#: lib/VFS/file.php:101 lib/VFS/file.php:188
-msgid "VFS directory does not exist."
-msgstr "Répertoire VFS inexistant."
-
-#: lib/Horde/Form.php:866
-msgid "Valid locations found include: "
-msgstr "Les emplacements valides trouvés incluent : "
-
-#: lib/Horde/Crypt/smime.php:638
-msgid "Validity"
-msgstr "Validité"
-
-#: lib/Net/SMS/clickatell_http.php:254 lib/Net/SMS/sms2email_http.php:596
-msgid "Value in minutes from now."
-msgstr "Valeur en minutes à partir de maintenant."
-
-#: lib/Horde/Form.php:856 lib/Horde/Form.php:1177
-#, php-format
-msgid "Value is over the maximum length of %s."
-msgstr "Valeur supérieure à la longueur maximale de %s."
-
-#: lib/Horde/Form.php:2244 lib/Horde/Form.php:2266 lib/Horde/Form.php:2314
-#: lib/Horde/Form.php:2926
-msgid "Values"
-msgstr "Valeurs"
-
-#: lib/Horde/Form.php:2109 lib/Horde/Form.php:2186
-msgid "Values to select from"
-msgstr "Valeurs à sélectionner de"
-
-#: lib/Horde/NLS/GeoIP.php:117 lib/Horde/NLS/countries.php:240
-#: lib/Horde/NLS/tld.php:249
-msgid "Vanuatu"
-msgstr "Vanuatu"
-
-#: lib/Block/weatherdotcom.php:211
-msgid "Variable"
-msgstr "Variable"
-
-#: lib/Horde/NLS/GeoIP.php:115 lib/Horde/NLS/countries.php:241
-#: lib/Horde/NLS/tld.php:245
-msgid "Venezuela"
-msgstr "Vénézuela"
-
-#: lib/Horde/Crypt/smime.php:218
-msgid "Verification failed - this message may have been tampered with."
-msgstr "Échec de la vérification &mdash; ce message a peut-être été falsifié."
-
-#: lib/Horde/Crypt/smime.php:700
-msgid "Version"
-msgstr "Version"
-
-#: templates/javascript/htmlarea_table_lang.js:83
-msgid "Vertical align"
-msgstr "Alignement vertical"
-
-#: templates/javascript/htmlarea_lang.js:84
-msgid "Vertical padding"
-msgstr "Remplissage vertical"
-
-#: templates/javascript/htmlarea_lang.js:83
-msgid "Vertical:"
-msgstr "Vertical :"
-
-#: lib/Block/weatherdotcom_strings.php:66
-msgid "Very High"
-msgstr "Très haute"
-
-#: lib/Horde/NLS/GeoIP.php:116 lib/Horde/NLS/countries.php:242
-#: lib/Horde/NLS/tld.php:248
-msgid "Viet Nam"
-msgstr "Vietnam"
+#: mailbox.php:613
+msgid "Unknown Recipient"
+msgstr "Destinataire inconnu"
 
-#: lib/Horde/MIME/Contents.php:955
-#, php-format
-msgid "View %s"
-msgstr "Voir %s"
+#: templates/pgp/pgp.inc:77 templates/smime/smime.inc:72
+msgid "Unload Passphrase"
+msgstr "Effacer la phrase secrète"
 
-#: lib/Block/iframe.php:3
-msgid "View an external web page"
-msgstr "Voir une page web externe"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "Sans nom"
 
-#: lib/Horde/MIME/Contents.php:814
-#, php-format
-msgid "View as %s"
-msgstr "Voir comme %s"
+#: mailbox.php:702 message.php:502 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
+msgid "Unseen"
+msgstr "Non vu"
+
+#: templates/folders/actions.inc:12
+msgid "Unsubscribe from Folder(s)"
+msgstr "Se désabonner de(s) dossier(s)"
+
+#: templates/compose/compose.inc:513
+msgid "Update"
+msgstr "Joindre"
 
-#: lib/Horde/NLS/GeoIP.php:116 lib/Horde/NLS/countries.php:243
-#: lib/Horde/NLS/tld.php:246
-msgid "Virgin Islands, British"
-msgstr "Îles Vierges britanniques"
+#: lib/MIME/Viewer/itip.php:612
+msgid "Update respondent status"
+msgstr "Modifier le statut du correspondant"
 
-#: lib/Horde/NLS/GeoIP.php:116 lib/Horde/NLS/countries.php:244
-#: lib/Horde/NLS/tld.php:247
-msgid "Virgin Islands, U.S."
-msgstr "Îles Vierges des États-Unis"
+#: templates/pgp/import_key.inc:56 templates/smime/import_key.inc:58
+msgid "Upload"
+msgstr "Charger"
 
-#: lib/Block/metar.php:207
-msgid "Visibility"
-msgstr "Visibilité"
+#: templates/prefs/sentmailselect.inc:41
+msgid "Use Default Value"
+msgstr "Utiliser la valeur par défaut"
 
-#: lib/Block/weatherdotcom.php:225
-msgid "Visibility: "
-msgstr "Visibilité : "
+#: config/prefs.php.dist:256
+msgid "Use IMAP folder subscriptions?"
+msgstr "Utiliser les abonnements aux dossiers IMAP ?"
 
-#: lib/Net/SMS/vodafoneitaly_smtp.php:79
-msgid "Vodafone Italy via SMTP"
-msgstr "Vodafone Italy via SMTP"
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Utiliser le dossier virtuel de corbeille ?"
 
-#: lib/Horde/Notification/Listener/mobile.php:36
-msgid "WARN"
-msgstr "NOTICE"
+#: templates/acl/acl.inc:143
+msgid "User"
+msgstr "Utilisateur"
 
-#: admin/setup/scripts.php:83
+#: acl.php:86
 #, php-format
-msgid "WARNING!!! REMOVE SCRIPT MANUALLY FROM %s."
-msgstr "ATTENTION!!!  SUPPRIMER LE SCRIPT MANUELLEMENT DE %s"
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+"Les droits spécifiés ont bien été attribués à l'utilisateur « %s » pour le "
+"dossier « %s »."
 
-#: lib/Horde/NLS/GeoIP.php:117 lib/Horde/NLS/countries.php:245
-#: lib/Horde/NLS/tld.php:250
-msgid "Wallis and Futuna"
-msgstr "Wallis et Futuna"
+#: templates/login/login.inc:176
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
-#: lib/Horde/Notification/Listener/status.php:29
-msgid "Warning"
-msgstr "Attention"
+#: templates/fetchmail/manage.inc:17
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
 
-#: po/translation.php:145 po/translation.php:681 po/translation.php:711
-#: po/translation.php:725 po/translation.php:1060 po/translation.php:1069
-#: po/translation.php:1077 po/translation.php:1087 po/translation.php:1097
-#: po/translation.php:1107 po/translation.php:1113 po/translation.php:1235
-#: po/translation.php:1245 po/translation.php:1251 po/translation.php:1271
-msgid "Warning: "
-msgstr "Avertissement : "
-
-#: templates/javascript/open_calendar.js:58
-msgid "We"
-msgstr "Me"
-
-#: lib/Block/weatherdotcom.php:29
-msgid "Weather Forecast"
-msgstr "Prévisions météo"
-
-#: lib/Block/weatherdotcom.php:309
-msgid "Weather data provided by"
-msgstr "Données météo fournies par"
-
-#: lib/Horde/Form.php:892
-msgid "Weather.com"
-msgstr "Weather.com"
-
-#: lib/Block/google.php:36
-msgid "Web"
-msgstr "Web"
-
-#: lib/Horde/Maintenance.php:58
-msgid "Weekly"
-msgstr "Chaque semaine"
-
-#: services/portal/mobile.php:28
-msgid "Welcome"
-msgstr "Bienvenue"
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72
+msgid "View"
+msgstr "Voir"
 
-#: templates/login/login.inc:50 templates/login/mobile.inc:4
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenue à %s"
+msgid "View %s"
+msgstr "Voir %s"
 
-#: services/portal/mobile.php:29 templates/portal/menu.inc:2
+#: templates/pgp/pgp.inc:27 templates/smime/smime.inc:25
 #, php-format
-msgid "Welcome, %s"
-msgstr "Bienvenue, %s"
+msgid "View %s Public Key"
+msgstr "Voir la clef publique %s"
 
-#: lib/Horde/NLS/GeoIP.php:71 lib/Horde/NLS/countries.php:246
-#: lib/Horde/NLS/tld.php:78
-msgid "Western Sahara"
-msgstr "Sahara Occidental"
+#: lib/MIME/Viewer/html.php:119
+msgid "View HTML content in a separate window"
+msgstr "Voir le contenu HTML dans une fenêtre séparée"
 
-#: templates/data/csvinfo.inc:21
-msgid "What is the delimiter character?"
-msgstr "Quel est le caractère de séparation ?"
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Voir les messages"
 
-#: templates/data/csvinfo.inc:24
-msgid "What is the quote character?"
-msgstr "Quel est le caractère de citation ?"
+#: templates/pgp/pgp.inc:77 templates/smime/smime.inc:72
+msgid "View Personal Private Key"
+msgstr "Voir la clef privée personnelle"
 
-#: lib/Block/moon.php:23
-msgid "Which phases"
-msgstr "Quelles phases"
+#: templates/pgp/pgp.inc:72 templates/smime/smime.inc:68
+msgid "View Personal Public Key"
+msgstr "Voir la clef publique personnelle"
 
-#: templates/javascript/htmlarea_table_lang.js:84
-msgid "Width"
-msgstr "Largeur"
+#: templates/message/navbar_actions.inc:18
+msgid "View Thread"
+msgstr "Voir les Enfilades"
 
-#: lib/Horde/Form.php:3123
-msgid "Width in CSS units"
-msgstr "Largeur en unités CSS"
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
+msgid "View Thumbnail"
+msgstr "Voir étiquette"
 
-#: templates/javascript/htmlarea_lang.js:106
-msgid "Width of the table"
-msgstr "Largeur du tableau"
+#: lib/MIME/Viewer/pkcs7.php:424
+msgid "View attachment in a separate window"
+msgstr "Voir la pièce jointe dans une fenêtre séparée"
 
-#: templates/javascript/htmlarea_lang.js:110
-msgid "Width unit"
-msgstr "Unité de largeur"
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Voir le contenu dans une fenêtre séparée"
 
-#: templates/javascript/htmlarea_lang.js:105
-msgid "Width:"
-msgstr "Largeur :"
+#: lib/MIME/Viewer/itip.php:141
+msgid "View event"
+msgstr "Voir les événements"
 
-#: lib/Block/weatherdotcom_strings.php:61
-msgid "Wind"
-msgstr "Vent"
+#: folders.php:361 mailbox.php:520
+#, php-format
+msgid "View messages in %s"
+msgstr "Voir les messages dans %s"
 
-#: lib/Block/weatherdotcom_strings.php:62
-msgid "Wind Early"
-msgstr "Vent tôt le matin"
+#: templates/prefs/initialpageselect.inc:23
+msgid "View or mailbox to display after login:"
+msgstr "Vue ou boîte à afficher après la connexion :"
 
-#: lib/Block/metar.php:78
-msgid "Wind speed in knots"
-msgstr "Vitesse du vent en n&oelig;uds"
+#: lib/MIME/Viewer/itip.php:171
+msgid "View task"
+msgstr "Voir la tâche"
 
-#: lib/Block/metar.php:154
-msgid "Wind:"
-msgstr "Vent :"
+#: lib/MIME/Viewer/html.php:104
+msgid "View the Images"
+msgstr "Voir les images"
 
-#: lib/Block/weatherdotcom.php:209
-msgid "Wind: "
-msgstr "Vent : "
+#: search.php:255
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Le dossier virtuel« %s » a été créé avec succès."
 
-#: lib/Block/fortune.php:64
-msgid "Wisdom"
-msgstr "Sagesse"
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
+msgid "Virtual Folders"
+msgstr "Dossiers virtuels"
 
-#: lib/Block/fortune.php:65
-msgid "Work"
-msgstr "Travail"
+#: search.php:247
+msgid "Virtual Folders require a label."
+msgstr "Une étiquette est obligatoire pour les dossiers virtuels."
 
-#: lib/Horde/MIME/Viewer/vcard.php:124 lib/Horde/MIME/Viewer/vcard.php:164
-msgid "Work Address"
-msgstr "Adresse professionnelle"
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Boîte de réception virtuelle"
 
-#: lib/Horde/MIME/Viewer/vcard.php:192
-msgid "Work Phone"
-msgstr "Téléphone professionnel"
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Dossier de réception virtuel"
 
-#: po/translation.php:1169
-#, php-format
-msgid "Writing updated help file to %s."
-msgstr "Écriture du fichier d'aide mis à jour sur %s."
+#: lib/Search.php:366 lib/Mailbox.php:171
+msgid "Virtual Trash"
+msgstr "Corbeille virtuelle"
 
-#: lib/Horde/Crypt/smime.php:593
-msgid "X509v3 Basic Constraints"
-msgstr "Contraintes basiques X509v3"
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Dossier de corbeille virtuel"
 
-#: lib/Horde/Crypt/smime.php:592
-msgid "X509v3 Extended Key Usage"
-msgstr "Utilisation de clé étendue X509v3"
+#: templates/search/main.inc:129
+msgid "Virtual folder label"
+msgstr "Nom du dossier virtuel"
 
-#: lib/Horde/Crypt/smime.php:594
-msgid "X509v3 Subject Alternative Name"
-msgstr "Autre nom du sujet X509v3"
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "Attention"
 
-#: lib/Horde/Crypt/smime.php:595
-msgid "X509v3 Subject Key Identifier"
-msgstr "Identificateur de clé du sujet X509v3"
+#: login.php:152
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenue à %s"
 
-#: lib/Horde/Crypt/smime.php:682
-msgid "X509v3 extensions"
-msgstr "Extensions X509v3"
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Que faire des pourriels après qu'ils aient été déclarés pourriel ou "
+"légitime ?"
 
-#: templates/data/date.inc:47 templates/data/date.inc:48
-#: templates/data/date.inc:49 templates/data/date.inc:50
-msgid "YY"
-msgstr "AA"
+#: config/prefs.php.dist:716
+msgid ""
+"When deleting messages, move them to your Trash folder instead of marking "
+"them as deleted?"
+msgstr ""
+"Quand vous détruisez des messages, les déplacer dans votre corbeille au lieu "
+"de les marquer comme détruits ?"
 
-#: lib/Horde/UI/VarRenderer/html.php:386 lib/Horde/UI/VarRenderer/html.php:427
-msgid "YYYY"
-msgstr "AAAA"
+#: config/prefs.php.dist:896
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr "Quelle page de démarrage à l'ouverture d'une nouvelle boîte ?"
 
-#: lib/Horde/UI/VarRenderer/html.php:1002
-msgid "Yahoo! map"
-msgstr "Carte « Yahoo ! »"
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+"Lorsque l'on enregistre le courrier envoyé, doit-on enregistrer les pièces "
+"jointes ?"
 
-#: lib/Horde/Maintenance.php:56
-msgid "Yearly"
-msgstr "Annuellement"
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"Lors de l'envoi du courrier ou de l'expansion des adresses, quel domaine "
+"ajouter aux adresses non-qualifiées (adresses sans « @ ») ?"
 
-#: lib/Horde/NLS/GeoIP.php:117 lib/Horde/NLS/countries.php:247
-#: lib/Horde/NLS/tld.php:252
-msgid "Yemen"
-msgstr "Yémen"
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "Liste blanche"
 
-#: lib/Horde/UI/VarRenderer/html.php:888
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Oui"
 
-#: templates/maintenance/agreement_bottom.inc:6
-msgid "Yes, I Agree"
-msgstr "Oui, j'accepte"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Vous allez rapatrier le courrier des comptes suivants :"
 
-#: templates/javascript/htmlarea_lang.js:52
-msgid "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG."
-msgstr ""
-"Vous êtes en mode « Texte »,  Utiliser le bouton [<>] pour revenir au mode "
-"« WYSIWYG »."
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Vous allez détruire tous les messages du(des) dossier(s) suivant(s) :"
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Vous allez détruire le(s) dossier(s) suivant(s) :"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "You are copying/moving to a new folder."
+msgstr "Vous aller copier/déplacer vers un nouveau dossier."
+
+#: templates/javascript/folders.js:104
+msgid "You are creating a sub-folder to "
+msgstr "Vous allez créer un sous-dossier de "
+
+#: templates/javascript/folders.js:106
+msgid "You are creating a top-level folder."
+msgstr "Vous allez créer un dossier au niveau supérieur."
 
-#: lib/Horde.php:1288
-msgid "You are not authenticated."
-msgstr "Vous n'êtes pas authentifié."
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr "Vous n'êtes pas autorisé à créer des dossiers."
 
-#: lib/Horde/Identity.php:302
-msgid "You can not have the '\\' character in your full name."
-msgstr "Vous ne pouvez pas avoir le caractère «\\» dans votre nom complet."
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Vous n'êtes pas autorisé à créer plus de %d dossiers."
 
-#: lib/Horde/Form.php:1855 lib/Horde/Form.php:1975
-msgid "You did not enter a valid email address."
-msgstr "Vous n'avez pas saisi une adresse électronique valide."
+#: templates/javascript/folders.js:137
+msgid "You are renaming the folder: "
+msgstr "Vous allez renommer le dossier : "
 
-#: lib/Horde/Data.php:270
+#: templates/stationery/prefs.inc:35
 #, php-format
 msgid ""
-"You didn't map any fields from the imported file to the corresponding fields "
-"in %s."
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
 msgstr ""
-"Vous n'avez pas associé les champs du fichier importé aux champs "
-"correspondants dans %s."
+"Vous pouvez utiliser les conteneurs suivants dans le texte de la papeterie : "
+"%c pour le contenu du message courant ; %s pour la signature."
 
-#: lib/Horde/Auth.php:903
-msgid "You have been logged out."
-msgstr "Vous avez été déconnecté."
+#: lib/Folder.php:524
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "Vous ne pouvez pas vous désabonner de « %s »."
 
-#: lib/Horde/Form.php:1261
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
-"You have to enter a valid cellphone number, digits only with an optional '+' "
-"for the international dialing prefix."
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
 msgstr ""
-"Vous devez inscrire un numéro de cellulaire valide, seuls des nombres et un "
-"«+» optionnel pour les appels internationaux."
+"Vous n'étiez pas d'accord sur les termes de l'accord de service, vous n'avez "
+"donc pas la permission de vous connectez."
 
-#: lib/Horde/Form.php:1188
-msgid "You have to enter a valid value."
-msgstr "Vous n'avez pas saisi une entrée valide."
+#: templates/acl/acl.inc:170
+msgid "You do not have permission to change access to this folder"
+msgstr "Vous n'avez pas l'autorisation de modifier l'accès à ce dossier"
 
-#: lib/Horde/Auth/Signup.php:37
-msgid "You must configure a DataTree backend to use Signups."
+#: lib/Maillog.php:130
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
-"Vous devez configurer un backend DataTree pour utiliser les inscriptions"
+"Vous avez transféré ce message sur %%s aux destinataires suivants : %s."
+
+#: templates/mailbox/alert.inc:3
+#, php-format
+msgid "You have %s new messages."
+msgstr "Vous avez %s nouveaux messages."
 
-#: lib/Horde.php:431
-msgid "You must configure a VFS backend."
-msgstr "Vous devez configurer un module VFS."
+#: templates/mailbox/alert.inc:3
+msgid "You have 1 new message."
+msgstr "Vous avez 1 nouveau message."
 
-#: templates/problem/problem.inc:11
-msgid "You must describe the problem before you can send the problem report."
-msgstr ""
-"Vous devez décrire le problème avant de nous faire parvenir le rapport."
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Vous avez déjà envoyé cette page."
+
+#: lib/IMP.php:1054
+msgid "You have new mail in the following folder:"
+msgstr "Vous avez du nouveau courrier dans le dossier suivant :"
+
+#: lib/IMP.php:1059
+msgid "You have new mail in the following folders:"
+msgstr "Vous avez du nouveau courrier dans les dossiers suivants :"
 
-#: templates/javascript/htmlarea_lang.js:98
-msgid "You must enter the URL where this link points to"
-msgstr "Vous devez entrer une URL où pointe de lien."
+#: compose.php:153
+msgid "You must enter at least one recipient."
+msgstr "Vous devez avoir au moins un destinataire."
 
-#: services/portal/rpcsum.php:80
-msgid "You must select an server to be deleted."
-msgstr "Il faut sélectionner un serveur à supprimer."
+#: lib/MIME/Viewer/pgp.php:306
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+"Vous devez entrer la phrase secrète pour votre clef PGP privée afin de voir "
+"ce message"
+
+#: lib/MIME/Viewer/pkcs7.php:254
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+"Vous devez entrer la phrase secrète pour votre clef S/MIME privée afin de "
+"voir ce message"
 
-#: admin/user.php:119
-msgid "You must specify a username to clear out."
-msgstr "Vous devez spécifier un utilisateur à retirer. "
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
+msgid "You must select a target mailbox first."
+msgstr "Vous devez d'abord sélectionner une boîte."
 
-#: admin/user.php:100
-msgid "You must specify a username to remove."
-msgstr "Vous devez spécifier un utilisateur à retirer."
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr "Vous devez sélectionner un compte à supprimer."
 
-#: admin/user.php:62 templates/admin/user/update.inc:8
-msgid "You must specify the username to add."
-msgstr "Vous devez spécifier un utilisateur à ajouter."
+#: templates/contacts/contacts.inc:81
+msgid "You must select an address first."
+msgstr "Vous devez d'abord sélectionner une adresse."
 
-#: admin/user.php:146
-msgid "You must specify the username to update."
-msgstr "Vous devez spécifier le nom de l'utilisateur à modifier."
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
+msgid "You must select at least one message first."
+msgstr "Vous devez sélectionner au moins un message."
 
-#: lib/Horde/Compress/zip.php:137
-msgid "You must specify what action to perform."
-msgstr "Vous devez indiquer quelle action accomplir."
+#: templates/compose/redirect.inc:13
+msgid "You must specify a recipient."
+msgstr "Vous devez choisir un destinataire."
 
-#: lib/Horde/Prefs/CategoryManager.php:72
-msgid "You must type a new category name."
-msgstr "Vous devez écrire un nom pour la nouvelle catégorie."
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Note : « %s » doit être activé dans vos options de maintenance."
 
-#: lib/Horde/Auth.php:891
+#: lib/Maillog.php:138
 #, php-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Votre session %s a expiré. Veuillez vous reconnecter."
+msgid "You redirected this message to %s on %%s."
+msgstr "Vous avez redirigé ce message vers %s dans %%s."
 
-#: templates/problem/problem.inc:38
-msgid "Your Email Address"
-msgstr "Votre adresse de courriel"
+#: lib/Maillog.php:142
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "Vous avez répondu à ce message le %s."
 
-#: lib/Horde/Auth.php:895
+#: lib/Folder.php:474
 #, php-format
-msgid ""
-"Your Internet Address has changed since the beginning of your %s session. To "
-"protect your security, you must login again."
+msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
-"Votre adresse Internet a changé depuis l'ouverture de votre session %s.  "
-"Pour votre sécurité, vous devez vous reconnecter."
+"Une erreur est survenue lors de la souscription à « %s ». Le serveur a "
+"répondu"
 
-#: templates/problem/problem.inc:33
+#: lib/Folder.php:526
+#, php-format
+msgid "You were not unsubscribed from \"%s\". Here is what the server said"
+msgstr "Vous n'avez pas été désabonné de « %s ». Le serveur a répondu"
+
+#: lib/Folder.php:477
+#, php-format
+msgid "You were successfully subscribed to \"%s\""
+msgstr "Vous avez bien été abonné à « %s »"
+
+#: lib/Folder.php:529
+#, php-format
+msgid "You were successfully unsubscribed from \"%s\""
+msgstr "Vous avez bien été désabonné de « %s »"
+
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Votre nom"
 
-#: templates/admin/user/noadd.inc:9
-msgid ""
-"Your authentication backend does not support adding users, or the feature "
-"has been disabled for some other reason."
-msgstr ""
-"Votre module d'authentification ne supporte pas l'ajout d'utilisateurs, ou "
-"cette fonction a été retirée pour une autre raison."
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr "Vos clefs PGP publique/privée"
 
-#: templates/admin/user/nolist.inc:9
-msgid ""
-"Your authentication backend does not support listing users, or the feature "
-"has been disabled for some other reason."
-msgstr ""
-"Votre module d'authentification n'est pas en mesure d'établir une liste des "
-"utilisateurs, ou cette fonction a été retirée pour une autre raison."
+#: templates/pgp/pgp.inc:76 templates/smime/smime.inc:71
+msgid "Your Private Key"
+msgstr "Votre clef privée"
 
-#: lib/Horde/Auth.php:899
-#, php-format
-msgid ""
-"Your browser appears to have changed since the beginning of your %s session. "
-"To protect your security, you must login again."
-msgstr ""
-"Votre navigateur semble avoir changé depuis le début de votre session %s.  "
-"Pour votre sécurité, vous devez vous reconnecter."
+#: templates/pgp/pgp.inc:71 templates/smime/smime.inc:67
+msgid "Your Public Key"
+msgstr "Votre clef publique"
 
-#: lib/Block/iframe.php:50
-msgid "Your browser does not support this feature."
-msgstr "Votre navigateur ne supporte pas cette option"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Votre adresse de réponse : <em>(optionnelle)</em>"
 
-#: templates/javascript/print.js:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Votre navigateur ne prend pas en compte cette option d'impression. Pressez "
-"Control/Option + P pour imprimer"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "Vos certificats S/MIME public/privé"
+
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr "Vos comptes :"
 
-#: po/translation.php:145
+#: config/prefs.php.dist:173
 msgid ""
-"Your gettext version is too old and does not support PHP natively.\n"
-"Not all strings will be extracted."
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Votre version de gettext est trop ancienne et ne supporte pas PHP "
-"nativement.\n"
-"Toutes les chaînes ne seront pas extraites"
+"Vos adresses alternatives : <em>(optionnel, entrez chaque adresse sur une "
+"nouvelle ligne)</em>. "
 
-#: services/resetpassword.php:76
-#, php-format
-msgid "Your new password for %s is: %s"
-msgstr "Votre nouveau mot de passe pour %s est :%s"
-
-#: lib/Horde/Prefs/UI.php:154
-msgid "Your options have been updated for the duration of this session."
-msgstr "Vos options ont été mises à jour pour la durée de cette session."
+#: lib/MIME/Viewer/images.php:101
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+"Votre navigateur ne supporte pas l'affichage en ligne des images de ce type."
 
-#: lib/Horde/Prefs/UI.php:156
-msgid "Your options have been updated."
-msgstr "Vos options ont été mises à jour."
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr "Votre encodage par défaut pour l'envoi des messages :"
 
-#: services/resetpassword.php:75
-msgid "Your password has been reset"
-msgstr "Votre mot de passe a été remis à zéro"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr "Votre méthode de chiffrement par défaut pour l'envoi des messages :"
 
-#: services/resetpassword.php:79
+#: attachment.php:94
+#, php-format
 msgid ""
-"Your password has been reset, check your email and log in with your new "
-"password."
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
 msgstr ""
-"Votre mot de passe a été remis à zéro, vérifier votre courrier et connectez-"
-"vous avez votre nouveau mot de passe."
+"Votre pièce jointe liée a été téléchargée par au moins une personne.\n"
+"\n"
+"Nom de la pièce jointe : %s\n"
+"Date de la pièce jointe : %s\n"
+"\n"
+"Cliquez sur le lien suivant pour supprimer définitivement cette pièce "
+"jointe :\n"
+"%s"
 
-#: templates/rpcsum/rpcsum.inc:58
-msgid "Your remote servers:"
-msgstr "Vos serveurs distants :"
+#: lib/MIME/Viewer/status.php:89
+msgid "Your message was successfully delivered."
+msgstr "Votre message a bien été distribué."
 
-#: lib/Horde/NLS/GeoIP.php:118 lib/Horde/NLS/tld.php:254
-msgid "Yugoslavia"
-msgstr "Yougoslavie"
+#: config/prefs.php.dist:206
+msgid "Your signature:"
+msgstr "Votre signature :"
 
-#: lib/Horde/NLS/GeoIP.php:118
-msgid "Zaire"
-msgstr "Zaïre"
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Cacher les adresses]"
 
-#: lib/Horde/NLS/GeoIP.php:118 lib/Horde/NLS/countries.php:248
-#: lib/Horde/NLS/tld.php:256
-msgid "Zambia"
-msgstr "Zambie"
+#: mailbox.php:535 compose.php:1301 message.php:295 lib/Compose.php:838
+msgid "[No Subject]"
+msgstr "[Pas de sujet]"
 
-#: lib/Horde/NLS/GeoIP.php:118 lib/Horde/NLS/countries.php:249
-#: lib/Horde/NLS/tld.php:257
-msgid "Zimbabwe"
-msgstr "Zimbabwe"
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Montrer les adresses -"
 
-#: lib/Block/fortune.php:66
-msgid "Zippy"
-msgstr "Zippy"
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Montrer les adresses - %s destinataires]"
 
-#: lib/Horde/Text/Filter/highlightquotes.php:172
-#: templates/javascript/quoteBlocks.js:12
-msgid "[Hide Quoted Text]"
-msgstr "[Cacher les citations]"
+#: templates/compose/compose.inc:203
+msgid "_Bcc"
+msgstr "Cc_i"
 
-#: services/problem.php:56
-msgid "[Problem Report]"
-msgstr "[Rapport de problème]"
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+msgid "_Blacklist"
+msgstr "Liste _noire"
 
-#: templates/javascript/quoteBlocks.js:13
-msgid "[Show Quoted Text -"
-msgstr "[Afficher le texte cité -"
+#: templates/compose/compose.inc:152
+msgid "_Cc"
+msgstr "_Cc"
 
-#: lib/Horde/Text/Filter/highlightquotes.php:172
-#, php-format
-msgid "[Show Quoted Text - %s lines]"
-msgstr "[Afficher le texte cité - %s lignes]"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+msgid "_Delete"
+msgstr "_Supprimer"
 
-#: lib/Horde.php:193
-#, php-format
-msgid "[line %s of %s]"
-msgstr "[ligne %s de %s]"
+#: lib/IMP.php:957
+msgid "_Folders"
+msgstr "D_ossiers"
 
-#: lib/Horde.php:1432 templates/portal/menu.inc:11
-msgid "_Administration"
-msgstr "_Administration"
+#: templates/compose/compose.inc:79
+msgid "_Identity"
+msgstr "Ide_ntité"
 
-#: lib/api.php:134
-msgid "_CLI"
-msgstr "Ligne de _commande"
+#: lib/IMP.php:926
+msgid "_Inbox"
+msgstr "Boîte de récept_ion"
 
-#: lib/api.php:122
-msgid "_DataTree"
-msgstr "_DataTree"
+#: lib/IMP.php:998
+msgid "_Log out"
+msgstr "Déconne_xion"
 
-#: templates/javascript/htmlarea_context_lang.js:31
-msgid "_Delete Row"
-msgstr "Supprimer la _rangée"
+#: message.php:391
+msgid "_Message Source"
+msgstr "Source du _message"
 
-#: lib/api.php:114
-msgid "_Groups"
-msgstr "_Groupes"
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr "_Nouveau message"
 
-#: lib/Horde/Menu.php:175
-msgid "_Help"
-msgstr "_Aide"
+#: templates/message/navbar_actions.inc:33
+msgid "_Print"
+msgstr "Im_primer"
 
-#: templates/javascript/htmlarea_context_lang.js:23
-msgid "_Image Properties..."
-msgstr "Propr_iétés de l'image..."
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
+msgid "_Priority"
+msgstr "_Priorité"
 
-#: lib/Horde/Menu.php:194
-msgid "_Log in"
-msgstr "_Connexion"
+#: mailbox.php:404
+#, php-format
+msgid "_Refresh %s"
+msgstr "_Rafraîchir %s"
 
-#: lib/Horde/Menu.php:190
-msgid "_Log out"
-msgstr "_Déconnexion"
+#: templates/message/navbar_actions.inc:8
+msgid "_Reply"
+msgstr "_Répondre"
 
-#: templates/javascript/htmlarea_context_lang.js:24
-msgid "_Modify Link..."
-msgstr "_Modifier un lien web..."
+#: lib/IMP.php:959
+msgid "_Search"
+msgstr "Rec_herche"
 
-#: lib/Horde/Menu.php:164
-msgid "_Options"
-msgstr "_Options"
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
+msgid "_Send Message"
+msgstr "Envo_yer le message"
 
-#: lib/api.php:118
-msgid "_Permissions"
-msgstr "_Permissions"
+#: templates/mailbox/message_headers.inc:32
+msgid "_Thread"
+msgstr "Enfi_lade"
 
-#: templates/javascript/htmlarea_context_lang.js:26
-msgid "_Remove Link..."
-msgstr "_Retirer un lien"
+#: templates/compose/compose.inc:114
+msgid "_To"
+msgstr "_A"
 
-#: lib/api.php:106
-msgid "_Setup"
-msgstr "_Configuration"
+#: templates/mailbox/actions.inc:13
+msgid "_Undelete"
+msgstr "Resta_urer"
 
-#: templates/javascript/htmlarea_context_lang.js:32
-msgid "_Table Properties..."
-msgstr "Propriétés du _tableau"
+#: templates/message/navbar_actions.inc:18
+msgid "_View Thread"
+msgstr "_Voir les Enfilades"
 
-#: lib/api.php:110
-msgid "_Users"
-msgstr "_Utilisateurs"
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr "Li_ste blanche"
 
-#: lib/Horde/Kolab.php:890
-msgid "address book"
-msgstr "carnet d'adresses"
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "destinataire inconnu"
 
-#: po/translation.php:711
-msgid "an error has occured:"
-msgstr "une erreur s'est produite :"
+#: lib/Compose.php:451
+msgid "attachment"
+msgstr "pièce jointe"
 
-#: lib/Horde/Kolab.php:882
-msgid "calendar"
-msgstr "agenda"
+#: view.php:97
+msgid "attachments.zip"
+msgstr "pièce jointe.zip"
 
-#: lib/Block/metar.php:170 lib/Block/metar.php:356
-#, php-format
-msgid "calm"
-msgstr "calme"
+#: templates/compose/compose.inc:505
+msgid "bytes"
+msgstr "octets"
 
-#: lib/Horde/MIME/Contents.php:588
-msgid "click here"
-msgstr "cliquez ici"
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "impossible de créer le fichier de sortie"
 
-#: po/translation.php:445 po/translation.php:550 po/translation.php:611
-#: po/translation.php:749 po/translation.php:810 po/translation.php:887
-msgid "done"
-msgstr "terminé"
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "impossible d'ouvrir l'entrée"
 
-#: po/translation.php:552 po/translation.php:584 po/translation.php:613
-#: po/translation.php:778 po/translation.php:812 po/translation.php:890
-msgid "failed"
-msgstr "échec"
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "erreur d'utilisation de la ligne de commande"
 
-#: lib/Block/weatherdotcom_strings.php:67
-msgid "falling"
-msgstr "tombé"
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "erreur de configuration"
 
-#: lib/Horde/Browser.php:849
-msgid "file"
-msgstr "fichier"
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "absence critique d'un fichier système"
 
-#: po/translation.php:129
-msgid "found: "
-msgstr "trouvé : "
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "erreur de format de donnée"
 
-#: lib/Block/metar.php:172 lib/Block/metar.php:358 lib/Block/metar.php:384
-#, php-format
-msgid "from the %s (%s) at %s %s"
-msgstr "depuis le %s (%s) à %s %s"
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "entrée non trouvé"
 
-#: lib/Horde/UI/VarRenderer/html.php:232
-msgid "h:"
-msgstr "h:"
+#: templates/contacts/contacts.inc:190
+msgid "from"
+msgstr "de"
 
-#: lib/Net/SMS/clickatell_http.php:222 lib/Net/SMS/sms2email_http.php:564
-msgid "immediate"
-msgstr "immédiatement"
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "nom d'hôte inconnu"
 
-#: admin/setup/diff.php:67 admin/setup/diff.php:79
-msgid "inline"
-msgstr "incorporée"
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "erreur d'entrée/sortie"
 
-#: templates/javascript/quoteBlocks.js:13
-msgid "lines]"
-msgstr "lignes]"
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "erreur logicielle interne"
 
-#: lib/VFS/ISOWriter/mkisofs.php:53
-#, php-format
-msgid "mkisofs error code %d while making ISO."
-msgstr "erreur mkisofs code %d en créant l'ISO"
+#: smime.php:29 pgp.php:68
+msgid "key"
+msgstr "clef"
+
+#: folders.php:145
+msgid "mailbox file"
+msgstr "fichier de boîte de courrier"
 
-#: lib/Horde/Prefs/UI.php:287 services/portal/sidebar.php:205
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr "nom"
 
-#: po/translation.php:378
-msgid "not changed"
-msgstr "non modifié"
-
-#: po/translation.php:131
-msgid "not found"
-msgstr "non trouvé"
-
-#: lib/Horde/RPC.php:121
-msgid "not implemented"
-msgstr "non-implémenté"
-
-#: lib/Horde/Crypt/smime.php:1219
-msgid "not yet implemented"
-msgstr "pas encore implémenté"
-
-#: lib/Horde/Kolab.php:874
-msgid "notepad"
-msgstr "bloc-notes"
-
-#: templates/javascript/htmlarea_table_lang.js:88
-msgid "percent"
-msgstr "pourcentage"
-
-#: templates/javascript/htmlarea_table_lang.js:89
-msgid "pixels"
-msgstr "pixels"
-
-#: lib/Block/weatherdotcom_strings.php:69
-msgid "rising"
-msgstr "levé"
-
-#: admin/setup/config.php:98
-msgid "show differences"
-msgstr "montrer les différences"
-
-#: lib/Net/SMS/sms2email_http.php:513
-msgid "sms2email via HTTP"
-msgstr "sms2email via HTTP"
-
-#: lib/Block/weatherdotcom_strings.php:68
-msgid "steady"
-msgstr "fixe"
-
-#: lib/Horde/Kolab.php:898
-msgid "task list"
-msgstr "liste de tâches"
-
-#: po/translation.php:725
-#, php-format
-msgid "the Horde PO file for the locale %s does not exist:"
-msgstr "le fichier PO Horde n'existe pas pour la locale %s :"
-
-#: admin/user.php:36 lib/Horde/Auth/Signup.php:269
-msgid "type the password twice to confirm"
-msgstr "entrez le mot de passe deux fois pour confirmer"
-
-#: admin/setup/diff.php:67 admin/setup/diff.php:79
-msgid "unified"
-msgstr "unifié"
-
-#: lib/Horde/MIME/Part.php:27
-msgid "unnamed"
-msgstr "sans nom"
-
-#: po/translation.php:375
-msgid "updated"
-msgstr "Mis à jour"
-
-#: lib/Net/SMS/clickatell_http.php:222 lib/Net/SMS/sms2email_http.php:564
-msgid "user select"
-msgstr "Sélection d'utilisateur"
-
-#: lib/Horde/MIME/Viewer/vcard.php:35
-msgid "vCard"
-msgstr "vCard"
-
-#: lib/Horde/UI/VarRenderer/html.php:224
-msgid "w:"
-msgstr "w:"
-
-#: lib/Block/weatherdotcom.php:6
-msgid "weather.com"
-msgstr "weather.com"
+#: templates/compose/spelling.inc:76
+msgid "none"
+msgstr "aucun"
+
+#: templates/compose/spelling.inc:105
+#: templates/fetchmail/account_select.inc:25
+msgid "or"
+msgstr "ou"
+
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "permission refusée"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "destinataires]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "erreur distante dans le protocole"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "service non disponible"
+
+#: templates/compose/spelling.inc:46
+msgid "spelling error"
+msgstr "erreur d'orthographe"
+
+#: templates/compose/spelling.inc:46
+msgid "spelling errors"
+msgstr "erreurs d'orthographe"
+
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "erreur système"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "échec temporaire"
+
+#: lib/Filter.php:79
+msgid "your blacklist"
+msgstr "votre liste noire"
+
+#: lib/Filter.php:89
+msgid "your whitelist"
+msgstr "votre liste blanche"


--- orig/attachment.php
+++ mod/attachment.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: imp/attachment.php,v 2.5.10.6 2005/07/31 06:10:12 slusarz Exp $
+ * $Horde: imp/attachment.php,v 2.5.10.10 2006/01/24 06:00:36 slusarz Exp $
  *
- * Copyright 2004-2005 Andrew Coleman <mercury at appisolutions.net>
+ * Copyright 2004-2006 Andrew Coleman <mercury at appisolutions.net>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -14,13 +14,13 @@
  */
 
 // Set up initial includes.
-//
 // This does *not* include IMP's base.php because we do not need to be
 // authenticated to get the file. Most users won't send linked
 // attachments just to other IMP users.
 if (!defined('HORDE_BASE')) {
     @define('HORDE_BASE', dirname(__FILE__) . '/..');
 }
+ at define('IMP_BASE', dirname(__FILE__));
 require_once HORDE_BASE . '/lib/core.php';
 require_once 'VFS.php';
 require_once 'Horde/MIME/Magic.php';
@@ -59,6 +59,47 @@
     Horde::fatal(_("The specified file does not exist."), $_self_url, __LINE__);
 }
 
+// Check to see if we need to send a verification message.
+if ($conf['compose']['link_attachments_notify']) {
+    if ($vfsroot->exists($full_path, $file_name . '.notify')) {
+        $delete_id = Util::getFormData('d');
+        $read_id = $vfsroot->read($full_path, $file_name . '.notify');
+        if (!is_a($read_id, 'PEAR_Error') && ($delete_id == $read_id)) {
+            $vfsroot->deleteFile($full_path, $file_name);
+            $vfsroot->deleteFile($full_path, $file_name . '.notify');
+            printf (_("Attachment %s deleted."), $file_name);
+            exit;
+        }
+    } else {
+        /* Create a random identifier for this file. */
+        $id = base_convert($file_name . microtime(), 10, 36);
+        $res = $vfsroot->writeData($full_path, $file_name . '.notify' , $id, true);
+        if (!is_a($res, 'PEAR_Error')) {
+            require_once 'Horde/MIME/Headers.php';
+            require_once 'Horde/MIME/Message.php';
+
+            /* Set up the mail headers and read the log file. */
+            $msg_headers = &new MIME_Headers();
+            $msg_headers->addReceivedHeader();
+            $msg_headers->addMessageIdHeader();
+            $msg_headers->addAgentHeader();
+            $msg_headers->addHeader('Date', date('r'));
+            $msg_headers->addHeader('From', $mail_user);
+            $msg_headers->addHeader('To', $mail_user);
+            $msg_headers->addHeader('Subject', _("Notification: Linked attachment downloaded"));
+
+            $msg = &new MIME_Message();
+            $msg->setType('text/plain');
+            $msg->setCharset(NLS::getCharset());
+            $msg->setContents(String::wrap(sprintf(_("Your linked attachment has been downloaded by at least one user.\n\nAttachment name: %s\nAttachment date: %s\n\nClick on the following link to permanently delete the attachment:\n%s"), $file_name, date('r', $time_stamp), Util::addParameter(Horde::selfUrl(true, false, true), 'd', $id))));
+
+            $msg_headers->addMIMEHeaders($msg);
+
+            $msg->send($mail_user, $msg_headers);
+        }
+    }
+}
+
 // Find the file's mime-type.
 $file_data = $vfsroot->read($full_path, $file_name);
 $mime_type = MIME_Magic::analyzeData($file_data, isset($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null);


--- orig/lib/Fetchmail/imap.php
+++ mod/lib/Fetchmail/imap.php
@@ -3,10 +3,10 @@
  * The IMP_Fetchmail_imap driver implements the IMAP_Fetchmail class for use
  * with IMAP/POP3 servers.
  *
- * $Horde: imp/lib/Fetchmail/imap.php,v 1.5.10.4 2005/07/03 03:42:44 selsky Exp $
+ * $Horde: imp/lib/Fetchmail/imap.php,v 1.5.10.7 2006/03/30 10:15:31 selsky Exp $
  *
- * Copyright 2002-2005 Nuno Loureiro <nuno at co.sapo.pt>
- * Copyright 2004-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Nuno Loureiro <nuno at co.sapo.pt>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -196,9 +196,9 @@
         $mailserver = @fsockopen($this->_params['server'], $this->_protocols[$this->_currprotocol]['port'], $errno, $errstr);
         if (!$mailserver) {
             if ($errno) {
-                return PEAR::raiseError(_("Can not connect to the remote mail server: ") . $errstr);
+                return PEAR::raiseError(_("Cannot connect to the remote mail server: ") . $errstr);
             } else {
-                return PEAR::raiseError(_("Can not connect to the remote mail server."));
+                return PEAR::raiseError(_("Cannot connect to the remote mail server."));
             }
         }
 


--- orig/lib/Maintenance/Task/rename_sentmail_monthly.php
+++ mod/lib/Maintenance/Task/rename_sentmail_monthly.php
@@ -2,9 +2,9 @@
 /**
  * Maintenance module that renames the sent-mail folder.
  *
- * $Horde: imp/lib/Maintenance/Task/rename_sentmail_monthly.php,v 1.28.10.4 2005/08/13 17:15:55 slusarz Exp $
+ * $Horde: imp/lib/Maintenance/Task/rename_sentmail_monthly.php,v 1.28.10.7 2006/02/21 01:33:31 slusarz Exp $
  *
- * Copyright 2001-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2001-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -22,8 +22,6 @@
      */
     function doMaintenance()
     {
-        global $imp, $notification, $prefs;
-
         $success = true;
 
         include_once 'Horde/Identity.php';
@@ -41,15 +39,13 @@
                Only do this if sent-mail folder currently exists. */
             if ($imp_folder->exists($sent_folder)) {
                 $old_folder = Maintenance_Task_rename_sentmail_monthly::_renameSentmailMonthlyName($sent_folder);
-                $notification->push(sprintf(_("%s folder being renamed at the start of the month."), IMP::displayFolder($sent_folder)), 'horde.message');
+                $GLOBALS['notification']->push(sprintf(_("%s folder being renamed at the start of the month."), IMP::displayFolder($sent_folder)), 'horde.message');
                 if ($imp_folder->exists($old_folder)) {
-                    $notification->push(sprintf(_("%s already exists. Your %s folder was not renamed."), IMP::displayFolder($old_folder), IMP::displayFolder($sent_folder)), 'horde.warning');
+                    $GLOBALS['notification']->push(sprintf(_("%s already exists. Your %s folder was not renamed."), IMP::displayFolder($old_folder), IMP::displayFolder($sent_folder)), 'horde.warning');
                     $success = false;
                 } else {
                     if ($imp_folder->rename($sent_folder, $old_folder)) {
-                        /* Rebuild folder hash. */
-                        $imp_folder->exists($sent_folder, true);
-                        if (!$imp_folder->create($sent_folder, $prefs->getValue('subscribe'))) {
+                        if (!$imp_folder->create($sent_folder, $GLOBALS['prefs']->getValue('subscribe'))) {
                             $success = false;
                         }
                     } else {
@@ -71,8 +67,6 @@
      */
     function describeMaintenance()
     {
-        global $imp;
-
         include_once 'Horde/Identity.php';
         $identity = &Identity::singleton(array('imp', 'imp'));
         $folder_list = $identity->getAllSentmailfolders();
@@ -111,12 +105,10 @@
      */
     function _renameSentmailMonthlyName($folder)
     {
-        global $language, $prefs;
-
-        $last_maintenance = $prefs->getValue('last_maintenance');
+        $last_maintenance = $GLOBALS['prefs']->getValue('last_maintenance');
         $last_maintenance = empty($last_maintenance) ? mktime(0, 0, 0, date('m') - 1, 1) : $last_maintenance;
 
-        if (substr($language, 0, 2) == 'en') {
+        if (substr($GLOBALS['language'], 0, 2) == 'en') {
             return $folder . String::convertCharset(strtolower(strftime('-%b-%Y', $last_maintenance)), NLS::getExternalCharset(), 'UTF7-IMAP');
         } else {
             return $folder . String::convertCharset(strftime('-%m-%Y', $last_maintenance), NLS::getExternalCharset(), 'UTF7-IMAP');


--- orig/templates/mailbox/searchfolder.inc
+++ mod/templates/mailbox/searchfolder.inc
@@ -1,3 +1,3 @@
 <?php if (!empty($lastMbox)): ?></td></tr></table><?php endif; ?>
-<tr class="header"><td colspan="6" class="smallheader">&nbsp;<b><?php echo $folder_link ?></b>
+<tr class="header"><td colspan="6" class="smallheader">&nbsp;<?php echo $folder_link ?>
 </td></tr>


--- orig/lib/Notification/Listener/status.php
+++ mod/lib/Notification/Listener/status.php
@@ -7,7 +7,7 @@
  * Notification_Listener_status:: class to display the messages for
  * IMP's special message types 'imp.forward' and 'imp.reply'.
  *
- * $Horde: imp/lib/Notification/Listener/status.php,v 1.7.10.2 2005/07/03 03:42:46 selsky Exp $
+ * $Horde: imp/lib/Notification/Listener/status.php,v 1.7.10.3 2005/10/18 12:13:36 jan Exp $
  *
  * @author  Chuck Hagenbuch <chuck at horde.org>
  * @since   IMP 4.0
@@ -37,11 +37,11 @@
         $event = $this->getEvent($message);
         switch ($message['type']) {
         case 'imp.reply':
-            return '<p class="notice">' . Horde::img('reply.png') . '&nbsp;&nbsp;' . $event->getMessage() . '</p>';
+            return '<p class="notice">' . Horde::img('mail_answered.png') . '&nbsp;&nbsp;' . $event->getMessage() . '</p>';
 
         case 'imp.forward':
         case 'imp.redirect':
-            return '<p class="notice">' . Horde::img('forward.png') . '&nbsp;&nbsp;' . $event->getMessage() . '</p>';
+            return '<p class="notice">' . Horde::img('mail_forwarded.png') . '&nbsp;&nbsp;' . $event->getMessage() . '</p>';
         }
 
         return parent::getMessage($message);


--- orig/templates/compose/redirect.inc
+++ mod/templates/compose/redirect.inc
@@ -1,7 +1,7 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 function confirmCancel()
-{   
+{
     if (window.confirm('<?php echo addslashes(_("Cancelling this message will permanently discard its contents.")) . '\n' . addslashes(_("Are you sure you want to do this?")) ?>')) {
         <?php echo $cancel_js ?>
     }
@@ -38,13 +38,10 @@
 
 <?php echo IMP::status(); $tabindex = 0; ?>
 
-<table border="0" align="center" width="95%" cellpadding="0" cellspacing="0">
-<tr class="header">
-  <td colspan="2" class="header">
-    <b><?php echo htmlspecialchars($title) ?></b>
-  </td>
-</tr>
-
+<h1 class="header">
+  <?php echo htmlspecialchars($title) ?>
+</h1>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php if ($GLOBALS['registry']->hasMethod('contacts/search')): ?>
 <?php $contacts_url = Util::addParameter(Horde::applicationUrl('contacts.php'), array('formname' => 'redirect', 'to_only' => 1)); ?>
 <tr>
@@ -52,8 +49,8 @@
   <td class="item">
     <table cellspacing="0" width="100%">
       <tr>
-        <td align="center"><?php echo Horde::link('', _("Address Book"), 'widget', null, 'window.open(\'' . $contacts_url . '\', \'contacts\', \'toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=550,height=300,left=100,top=100\'); return false;') . Horde::img('addressbook-red.png') . '<br />' . _("Address Book") . '</a>' ?></td>
-        <td align="center"><?php echo Horde::link('', _("Expand Names"), 'widget', null, "document.redirect.actionID.value='redirect_expand_addr'; uniqSubmit(); return false;") . Horde::img('expand.png') . '<br />' . _("Expand Names") . '</a>' ?></td>
+        <td align="center"><?php echo Horde::link('#', _("Address Book"), 'widget', null, 'window.open(\'' . $contacts_url . '\', \'contacts\', \'toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=550,height=300,left=100,top=100\'); return false;') . Horde::img('addressbook_browse.png') . '<br />' . _("Address Book") . '</a>' ?></td>
+        <td align="center"><?php echo Horde::link('#', _("Expand Names"), 'widget', null, "document.redirect.actionID.value='redirect_expand_addr'; uniqSubmit(); return false;") . Horde::img('expand.png') . '<br />' . _("Expand Names") . '</a>' ?></td>
       </tr>
     </table>
   </td>
@@ -61,14 +58,14 @@
 <?php endif; ?>
 
 <tr>
-  <td class="light" align="right" valign="middle"><b><?php echo Horde::label('to', _("To")) ?>&nbsp;</b></td>
-  <td class="item" align="left">
+  <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('to', _("To")) ?>&nbsp;</strong></td>
+  <td class="item leftAlign">
       <table border="0" width="100%" cellpadding="0">
 <?php if (is_array($header['to'])): $first_to = true; ?>
 <?php foreach ($header['to'] as $to_item): ?>
         <tr>
 <?php if (count($to_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table border="0" cellspacing="0" cellpadding="0">
               <tr>
                 <td width="350">
@@ -86,44 +83,41 @@
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" /></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" /></td>
 <?php endif; ?>
 <?php if ($first_to): $first_to = false; ?>
-          <td align="right"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
 <?php else: ?>
           <td>&nbsp;</td>
 <?php endif; ?>
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" /></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
         <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to" value="<?php echo htmlspecialchars($header['to']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this)" /><span id="expandingto" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>'; ?></td>
-          <td align="right"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to" value="<?php echo htmlspecialchars($header['to']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this)" /><span id="expandingto" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>'; ?></td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
         </tr>
 <?php endif; ?>
       </table>
     </td>
+  </tr><tr>
+    <td>&nbsp;</td>
+    <td>
+      <input name="submitBtn" type="submit" class="button" onclick="return redirectSubmit();" value="<?php echo _("Redirect Message") ?>" />
+      <input name="cancelBtn" type="button" class="button" onclick="confirmCancel();" value="<?php echo _("Cancel Message") ?>" />
+    </td>
   </tr>
-
-<tr>
-  <td>&nbsp;</td>
-  <td align="center" class="header">
-    <input name="submitBtn" type="submit" class="button" onclick="return redirectSubmit();" value="<?php echo _("Redirect Message") ?>" />
-    <input name="cancelBtn" type="button" class="button" onclick="confirmCancel();" value="<?php echo _("Cancel Message") ?>" />
-  </td>
-</tr>
 </table>
-
 </form>
 
 <br />
 
 <?php if ($browser->hasFeature('javascript')): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 document.redirect.to.focus();


--- orig/lib/MIME/Viewer/pkcs7.php
+++ mod/lib/MIME/Viewer/pkcs7.php
@@ -14,10 +14,10 @@
  *   application/x-pkcs7-mime
  *   application/x-pkcs7-signature
  *
- * $Horde: imp/lib/MIME/Viewer/pkcs7.php,v 1.68.2.12 2005/09/30 03:22:37 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/pkcs7.php,v 1.68.2.18 2006/03/02 18:26:41 slusarz Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
- * Copyright 2004-2005 Michael Slusarz <slusarz at curecanti.org>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at curecanti.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -65,6 +65,17 @@
     var $_headers;
 
     /**
+     * Some mailers set S/MIME messages to always be attachments.  However,
+     * most of the time S/MIME is used to secure the contents of the message,
+     * so displaying as an attachment makes no sense.  Therefore, force
+     * viewing inline (or at least let MIME_Viewer/MIME_Contents make the
+     * determination on whether the data can be viewed inline or not).
+     *
+     * @var boolean
+     */
+    var $_forceinline = true;
+
+    /**
      * Render out the currently set contents.
      *
      * @param array $params  An array with a reference to a MIME_Contents
@@ -89,7 +100,7 @@
             !is_a($openssl_check, 'PEAR_Error')) {
             /* We need to insert JavaScript code now if S/MIME support is
                active. */
-            $msg = Util::bufferOutput('require_once', IMP_TEMPLATES . '/smime/open_smime_win.js');
+            $msg = Util::bufferOutput(array('Horde', 'addScriptFile'), 'popup.js');
         }
 
         /* Get the type of message now. */
@@ -159,7 +170,7 @@
                 $this->_status[] = _("This message does not appear to be in the correct S/MIME format.");
             }
         } elseif (!$active) {
-            $this->_status[] = _("S/MIME support is not enabled so the contents of this signed message can not be displayed."); 
+            $this->_status[] = _("S/MIME support is not enabled so the contents of this signed message cannot be displayed.");
         }
 
         if ($active) {
@@ -188,7 +199,7 @@
                 if (isset($smime_from) &&
                     $GLOBALS['registry']->hasMethod('contacts/addField') &&
                     $GLOBALS['prefs']->getValue('add_source')) {
-                    $this->_status[] = Horde::link('', '', null, null, $this->_impSmime->savePublicKeyURL($sig_result->cert, $smime_from) . ' return false;') . sprintf(_("Click to Save S/MIME certificate of %s in your Address Book"), @htmlspecialchars($smime_from, ENT_COMPAT, NLS::getCharset())) . '</a>.';
+                    $this->_status[] = Horde::link('#', '', null, null, $this->_impSmime->savePublicKeyURL($sig_result->cert, $smime_from) . ' return false;') . sprintf(_("Click to Save S/MIME certificate of %s in your Address Book"), @htmlspecialchars($smime_from, ENT_COMPAT, NLS::getCharset())) . '</a>.';
                     $text .= $this->_outputStatus();
                 }
             }
@@ -231,13 +242,18 @@
             return $this->_outputStatus();
         }
 
+        if (!$this->_impSmime->getPersonalPrivateKey()) {
+            $this->_status[] = _("No personal private key exists so the message is unable to be decrypted.");
+            return $this->_outputStatus();
+        }
+
         /* Make sure we have a passphrase. */
         $passphrase = $this->_impSmime->getPassphrase();
         if ($passphrase === false) {
             $url = $this->_impSmime->getJSOpenWinCode('open_passphrase_dialog');
-            $this->_status[] = Horde::link('', _("You must enter the passphrase for your S/MIME private key to view this message"), null, null, $url . ' return false;') . '<i>' . _("You must enter the passphrase for your S/MIME private key to view this message") . '</i></a>.';
+            $this->_status[] = Horde::link('#', _("You must enter the passphrase for your S/MIME private key to view this message"), null, null, $url . ' return false;') . '<em>' . _("You must enter the passphrase for your S/MIME private key to view this message") . '</em></a>.';
             $msg .= $this->_outputStatus() .
-                '<script language="JavaScript" type="text/javascript">' . $url . ';</script>';
+                '<script type="text/javascript">' . $url . ';</script>';
             return $msg;
         }
 
@@ -370,6 +386,7 @@
             /* This message has been verified but there was no output
                from the PGP program. */
             if (empty($result) || ($result === true)) {
+               $email = (is_array($email)) ? implode(', ', $email): $email;
                $result = sprintf(_("The message has been verified. Sender: %s."), htmlspecialchars($email));
             }
         }


--- orig/lib/Quota/command.php
+++ mod/lib/Quota/command.php
@@ -7,21 +7,17 @@
  * authentication and file servers (e.g. via NIS/NFS).  And last, it (as
  * written) requires the POSIX PHP extensions.
  *
- * You must configure this in horde/imp/config/servers.php.  You must
- * pass the path to your quota and grep commands as parameters.  An example
- * config would be something like:
+ * You must configure this driver in horde/imp/config/servers.php.  The
+ * driver supports the following parameters:
+ *   'quota_path' => Path to the quota binary - REQUIRED
+ *   'grep_path'  => Path to the grep binary - REQUIRED
+ *   'partition'  => If all user mailboxes are on a single partition, the
+ *                   partition label.  By default, quota will determine
+ *                   quota information using the user's home directory value.
  *
- * 'quota' => array(
- *     'driver' => 'command',
- *     'params' => array(
- *         'quota_path' => '/usr/bin/quota',
- *         'grep_path'  => '/bin/grep'
- *     )
- * )
+ * $Horde: imp/lib/Quota/command.php,v 1.11.10.9 2006/02/10 04:58:26 selsky Exp $
  *
- * $Horde: imp/lib/Quota/command.php,v 1.11.10.4 2005/07/03 03:42:46 selsky Exp $
- *
- * Copyright 2002-2005 Eric Jon Rostetter <eric.rostetter at physics.utexas.edu>
+ * Copyright 2002-2006 Eric Jon Rostetter <eric.rostetter at physics.utexas.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -31,9 +27,9 @@
  * @package IMP_Quota
  */
 class IMP_Quota_command extends IMP_Quota {
-    
+
     /**
-     * Constructor 
+     * Constructor
      *
      * @param array $params  Hash containing connection parameters.
      */
@@ -41,7 +37,8 @@
     {
         $this->_params = array(
             'quota_path' => 'quota',
-            'grep_path'  => 'grep'
+            'grep_path'  => 'grep',
+            'partition'  => null
         );
 
         $this->_params = array_merge($this->_params, $params);
@@ -57,14 +54,16 @@
      */
     function getQuota()
     {
-        global $imp;
-
-        $imap_user = strtolower($imp['user']);
-        $passwd_array = posix_getpwnam($imap_user);
-        $homedir = split('/', $passwd_array['dir']);
-        $cmdline = $this->_params['quota_path'] . " -u $imap_user | " . 
-                   $this->_params['grep_path'] . " $homedir[1]";
-        $junk = exec($cmdline, $quota_data, $return_code);
+        $imap_user = strtolower($GLOBALS['imp']['user']);
+        if (empty($this->_params['partition'])) {
+            $passwd_array = posix_getpwnam($imap_user);
+            list($junk, $search_string, $junk) = explode('/', $passwd_array['dir']);
+        } else {
+            $search_string = $this->_params['partition'];
+        }
+        $cmdline = $this->_params['quota_path'] . ' -u ' . $imap_user . ' | ' .
+                   $this->_params['grep_path'] . ' ' . $search_string;
+        exec($cmdline, $quota_data, $return_code);
         if (($return_code == 0) && (count($quota_data) == 1)) {
            $quota = split("[[:blank:]]+", trim($quota_data[0]));
            return array('usage' => $quota[1] * 1024, 'limit' => $quota[2] * 1024);


--- orig/config/conf.xml
+++ mod/config/conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/config/conf.xml,v 1.53 2004/12/09 15:33:27 slusarz Exp $ -->
+<!-- $Horde: imp/config/conf.xml,v 1.53.2.12 2006/03/22 21:37:38 slusarz Exp $ -->
 <configuration>
  <configtab name="utils" desc="External Utilities and Menu">
   <configsection name="utils">
@@ -23,11 +23,13 @@
    connecting to the PGP keyserver. Timeouts are not supported on all
    systems.">10</configstring>
    <configstring name="openssl_cafile" required="false" desc="The location of
-   the root certificates bundle.">/somewhere/ca-bundle.crt</configstring>
+   the root certificates bundle, e.g. /etc/ssl/certs. See
+   http://www.php.net/manual/en/ref.openssl.php#openssl.cert.verification for
+   details."/>
    <configstring name="openssl_binary" required="false" desc="The location of
-   the OpenSSL binary on your system. This program is REQUIRED to import
-   personal S/MIME certificate information, as there is no native PHP function
-   that can read pkcs12 files.">/usr/bin/openssl</configstring>
+   the OpenSSL binary on your system, e.g. /usr/bin/openssl. This program is
+   REQUIRED to import personal S/MIME certificate information, as there is no
+   native PHP function that can read pkcs12 files."/>
   </configsection>
 
   <configsection name="menu">
@@ -44,63 +46,68 @@
  <configtab name="user" desc="User Capabilities and Constraints">
   <configsection name="user">
    <configheader>User Capabilities and Constraints</configheader>
-   <configboolean name="allow_folders" desc="Should we allow users to use
+   <configswitch name="allow_folders" desc="Should we allow users to use
    folders at all? NOTE: setting this to false will mean there is no place to
    save sent-mail or postponed messages, along with the obvious affects of
-   restricting the user to their INBOX.">true</configboolean>
+   restricting the user to their INBOX.">true
+    <case name="true" desc="Yes">
+     <configboolean name="select_sentmail_folder" desc="If this is true, then
+     users will be given a drop down menu in the compose window allowing them to
+     choose which folder to save their sent messages to. If this is false, then
+     messages will be saved to the folder defined in their
+     preferences.">false</configboolean>
+     <configboolean name="allow_resume_all_in_drafts" desc="If this is true, the
+     user will be able to resume any message in their draft mailbox (to
+     compensate for some clients that don't bother setting the draft flag).
+     Otherwise, only messages marked as 'drafts' can be
+     resumed.">false</configboolean>
+    </case>
+    <case name="false" desc="No" />
+   </configswitch>
+   <configboolean name="allow_resume_all" desc="If this is true, the user will
+   be able to resume any message in any mailbox.  Otherwise, only messages
+   marked as 'drafts' can be resumed.">false</configboolean>
    <configboolean name="allow_view_source" desc="If this is true, then there
    will be a 'Message Source' link in the parts list of every message, allowing
    the user to view the entire raw message, or to download it and save it to
    disk.">true</configboolean>
-   <configboolean name="allow_resume_all" desc="If this is true, the user will
-   be able to resume any message in any mailbox.  Otherwise, only messages
-   marked as 'drafts' can be resumed.">false</configboolean>
-   <configboolean name="allow_resume_all_in_drafts" desc="If this is true, the
-   user will be able to resume any message in their draft mailbox (to
-   compensate for some clients that don't bother setting the draft flag).
-   Otherwise, only messages marked as 'drafts' can be
-   resumed.">false</configboolean>
    <configstring name="alternate_login" desc="If this is not false, it is
    assumed to be the URL of an alternate login screen which will be used in
-   place of IMP's default one.">false</configstring>
+   place of IMP's default one. &lt;b&gt;This setting will be ignored if an
+   alternate login screen is configured for horde.&lt;/b&gt;">
+   false</configstring>
    <configstring name="redirect_on_logout" desc="If this is not false, it is
    assumed to be the URL of an alternate logout page which users will be sent
-   to when they log out.">false</configstring>
-   <configboolean name="select_sentmail_folder" desc="If this is true, then
-   users will be given a drop down menu in the compose window allowing them to
-   choose which folder to save their sent messages to. If this is false, then
-   messages will be saved to the folder defined in their
-   preferences.">false</configboolean>
+   to when they log out. &lt;b&gt;This setting will be ignored if an alternate
+   logout page is configured for horde&lt;/b&gt;">false</configstring>
   </configsection>
  </configtab>
 
  <configtab name="server" desc="Mail Server">
   <configsection name="server">
    <configheader>Mail Server Settings</configheader>
-   <configenum name="server_list" desc="Should we display a list of servers
+   <configswitch name="server_list" desc="Should we display a list of servers
    (defined in config/servers.php) for users to choose from? The options are
    'shown', 'hidden', and 'none'. If the server list is hidden then you can use
    the 'preferred' mechanism to auto-select from it based on an HTTP
    virtualhost or another piece of data. If it is shown, the user will be able
    to pick from any of the options. If none, no server list will be shown and
    the defaults will be used unless another mechanism changes them.">none
-    <values>
-     <value>none</value>
-     <value>shown</value>
-     <value>hidden</value>
-    </values>
-   </configenum>
-   <configboolean name="change_server" desc="If we are not using the server
-   list, should we allow users to type in a mail server?">false</configboolean>
-   <configboolean name="change_port" desc="If we are not using the server list,
-   should we allow users to select the mail server's
-   port?">false</configboolean>
-   <configboolean name="change_protocol" desc="If we are not using the server
-   list, should we allow users to select the mail server's
-   protocol?">false</configboolean>
-   <configboolean name="change_folders" desc="If we are not using the server
-   list, should we allow users to select the mail server's folder
-   prefix?">false</configboolean>
+    <case name="none" desc="None">
+     <configboolean name="change_server" desc="Should we allow users to type in a mail
+     server?">false</configboolean>
+     <configboolean name="change_port" desc="Should we allow users to select the mail
+     server's port?">false</configboolean>
+     <configboolean name="change_protocol" desc="Should we allow users to select the
+     mail server's protocol?">false</configboolean>
+     <configboolean name="change_smtphost" desc="Should we allow users to select the
+     SMTP (outbound) mail server?">false</configboolean>
+     <configboolean name="change_smtpport" desc="Should we allow users to select the
+     SMTP server's port?">false</configboolean>
+    </case>
+    <case name="shown" desc="Shown" />
+    <case name="hidden" desc="Hidden" />
+   </configswitch>
    <configstring name="sort_limit" desc="On slower mailservers, sorting by any
    field other than the arrival of the message may result in very slow
    performance.  If the number here is greater than 0, that is the number of
@@ -113,6 +120,12 @@
    login. If IMP will be the exclusive means of accessing the mail server, or
    you are not concerned about this behavior, this setting should be set to
    true.">false</configboolean>
+   <configboolean name="cache_msgbody" desc="Should we cache the contents of
+   small messages (less than 10 KB) in the session so that the IMAP server does
+   not have to be accessed again?  Enabling this option will result in a larger
+   session size (approx. 100 - 200 KB per user) so make sure your session
+   backend can handle the increased storage demands.">
+   false</configboolean>
   </configsection>
  </configtab>
 
@@ -123,19 +136,18 @@
    information in the mailbox index? This is a performance hit, but may be okay
    on smaller installations.">false</configboolean>
    <configboolean name="show_preview" desc="Should we allow users to display
-   message previews in the mailbox index? This is a performance hit, but may be
-   okay on smaller installations.">false</configboolean>
+   message previews in the mailbox index? This is a performance hit, but may be okay
+   on smaller installations.">false</configboolean>
    <configboolean name="show_xpriority" desc="Should we display message
-   priority information in the mailbox index? This is a performance hit, but
-   may be okay on smaller installations.">false</configboolean>
+   priority information in the mailbox index? This is a performance hit, but may be okay
+   on smaller installations.">false</configboolean>
   </configsection>
 
   <configsection name="fetchmail">
    <configheader>Fetchmail Settings</configheader>
    <configboolean name="show_account_colors" desc="Should we display colors for
    messages fetched from other accounts in the mailbox index? This is a
-   performance hit, but may be okay on smaller
-   installations.">false</configboolean>
+   performance hit, but may be okay on smaller installations.">false</configboolean>
    <configstring name="size_limit" desc="What is the maximum total size of
    mails to be fetched (in bytes)? (Remember you need more than the double of
    this value for 'memory_limit' in php.ini.) Set this value to 0 for no
@@ -157,34 +169,51 @@
 
   <configsection name="spam">
    <configheader>Spam Reporting</configheader>
-   <configboolean name="reporting" desc="Should we display a 'report this
-   message as spam' link in the message view?">false</configboolean>
-   <configstring name="email" required="false" desc="If so, should we report
-   them via email? The messages will be sent to this address in a single
-   multipart/digest message (useful for reporting to an admin user, for
-   example)."/>
-   <configstring name="bounce" required="false" desc="Should we bounce the
-   message to an email address? This is useful for automated spam processing
-   programs that need the original message. If you need to dynamically set the
-   email address for each user (e.g. DSPAM), this setting should be empty and
-   you should look at the _imp_hook_spam_bounce hook instead."/>
-   <configstring name="program" required="false" desc="Should we report them
-   via an external program? (e.g. /usr/local/bin/spamassassin -r)"/>
+   <configswitch name="reporting" desc="Should we display a 'report this
+   message as spam' link?">false
+    <case name="true" desc="Yes">
+     <configboolean name="spamfolder" desc="Should the link also appear in the user's
+     spam folder?">false</configboolean>
+     <configstring name="email" required="false" desc="Should we report spam messages
+     via email? The messages will be sent to this address in a single
+     multipart/digest message (useful for reporting to an admin user, for
+     example)."/>
+     <configstring name="bounce" required="false" desc="Should we bounce the spam
+     message to an email address? This is useful for automated spam processing
+     programs that need the original message. If you need to dynamically set the
+     email address for each user (e.g. DSPAM), this setting should be empty and
+     you should look at the _imp_hook_spam_bounce hook instead."/>
+     <configstring name="program" required="false" desc="Should we report the spam
+     message via an external program (e.g. /usr/local/bin/spamassassin -r)? If you
+     include the placeholder %u in this string, it will be replaced with the
+     current username."/>
+    </case>
+    <case name="false" desc="No" />
+   </configswitch>
   </configsection>
+
   <configsection name="notspam">
-   <configboolean name="reporting" desc="Should we display a 'report this
-   message as innocent' link in the message view?">false</configboolean>
-   <configstring name="email" required="false" desc="If so, should we report
-   them via email? The messages will be sent to this address in a single
-   multipart/digest message (useful for reporting to an admin user, for
-   example)."/>
-   <configstring name="bounce" required="false" desc="Should we bounce the
-   message to an email address? This is useful for automated spam processing
-   programs that need the original message. If you need to dynamically set the
-   email address for each user (e.g. DSPAM), this setting should be empty and
-   and you should look at the _imp_hook_spam_bounce hook instead."/>
-   <configstring name="program" required="false" desc="Should we report them
-   via an external program? (e.g. /usr/local/bin/spamassassin -k)"/>
+   <configswitch name="reporting" desc="Should we display a 'report this
+   message as innocent' link?">false
+    <case name="true" desc="Yes">
+     <configboolean name="spamfolder" desc="Should the link only appear in the user's
+     spam folder?">true</configboolean>
+     <configstring name="email" required="false" desc="Should we report innocent
+     messages via email? The messages will be sent to this address in a single
+     multipart/digest message (useful for reporting to an admin user, for
+     example)."/>
+     <configstring name="bounce" required="false" desc="Should we bounce the
+     innocent message to an email address? This is useful for automated spam processing
+     programs that need the original message. If you need to dynamically set the
+     email address for each user (e.g. DSPAM), this setting should be empty and
+     and you should look at the _imp_hook_spam_bounce hook instead."/>
+     <configstring name="program" required="false" desc="Should we report the innocent
+     message via an external program (e.g. /usr/local/bin/spamassassin -k)? If you
+     include the placeholder %u in this string, it will be replaced with the
+     current username."/>
+    </case>
+    <case name="false" desc="No" />
+   </configswitch>
   </configsection>
  </configtab>
 
@@ -200,8 +229,6 @@
   </configsection>
 
   <configsection name="compose">
-   <configboolean name="use_vfs" desc="Should we use the Horde VFS system for
-   storing uploaded attachments?">false</configboolean>
    <configboolean name="allow_cc" desc="Should we allow users to set the Cc:
    header?">true</configboolean>
    <configboolean name="allow_bcc" desc="Should we allow users to set the Bcc:
@@ -210,14 +237,20 @@
    receipt?">true</configboolean>
    <configboolean name="special_characters" desc="Should we give the user a
    pop-up window with special characters in it?">true</configboolean>
+   <configboolean name="use_vfs" desc="Should we use the Horde VFS system for
+   storing uploaded attachments?">false</configboolean>
    <configswitch name="link_attachments" desc="Should we allow the users to
    send attachments as links?">true
     <case name="true" desc="Yes">
      <configboolean name="link_all_attachments" desc="Should IMP send all
      attachments as links? If this is false the user will be given the option
      to link any attachment.">false</configboolean>
+     <configboolean name="link_attachments_notify" desc="Should IMP send an
+     e-mail notification to the sender when the first person attempts to
+     download the linked attachment? This notification will include a link
+     to delete the file.">true</configboolean>
     </case>
-    <case name="false" desc="No"></case>
+    <case name="false" desc="No" />
    </configswitch>
    <configboolean name="add_maildomain_to_unexpandable" desc="Should we add the
    default domain to addresses that couldn't be expanded
@@ -277,13 +310,13 @@
    <configheader>Mail Logging</configheader>
    <configboolean name="use_maillog" desc="By default, IMP will keep track of
    both who a message was sent to and the date it was sent when forwarding,
-   replying, or redirecting a message.  This information is stored using the
-   Categories class provided by Horde.  These entries are deleted when the mail
-   is deleted using IMP in an attempt to keep the number of entries to the
+   replying, or redirecting a message. This information is stored using the
+   History class provided by Horde. These entries are deleted when the mail is
+   deleted using IMP in an attempt to keep the number of entries to the
    minimum required - if not deleted the maillog entry will persist forever.
    On large installations, there may be significant lookup times and/or large
-   amounts of maillog entries so this functionality can be turned off by
-   setting this configuration entry to false.">true</configboolean>
+   amounts of maillog entries with older versions of Horde before Horde 3.1 so
+   this functionality can be turned off.">true</configboolean>
   </configsection>
 
   <configsection name="tasklist">
@@ -292,18 +325,24 @@
    system, IMP can allow users to add the details of mail messages to a new
    task. If you do not want this functionality enabled (it will add to server
    load because the list of available task categories must be generated on
-   every page load), you should set this entry to false.">true</configboolean>
+   every page load), you should disable this checkbox.">true</configboolean>
+  </configsection>
+
+  <configsection name="notepad">
+   <configheader>Add to Notes</configheader>
+   <configboolean name="use_notepad" desc="If Mnemo is installed on the local
+   system, IMP can allow users to add the details of mail messages to a new
+   note. If you do not want this functionality enabled (it will add to server
+   load because the list of available note categories must be generated on
+   every page load), you should disable this checkbox.">true</configboolean>
   </configsection>
 
   <configsection name="tos">
    <configheader>Terms of Service Agreement</configheader>
-   <configdescription>
-        If we want to require users to accept certain terms before they can use
-   the system, enter the name of the agreement file to display here. Also, make
-   sure to activate the preference in prefs.php (set the value of
-   'tos_agreement' to 1).
-   </configdescription>
-   <configstring name="file" required="false" desc="TOS filename"></configstring>
+    <configstring name="file" required="false" desc="If you want to require users to
+    accept certain terms before they can use the system, enter the name of the
+    agreement file to display here. Also, make sure to activate the preference in
+    prefs.php (set the value of 'tos_agreement' to 1)."/>
   </configsection>
  </configtab>
 </configuration>


--- orig/po/ar_OM.po
+++ mod/po/ar_OM.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP v3.2.1\n"
-"Report-Msgid-Bugs-To: <i18n at lists.horde.org>\n"
-"POT-Creation-Date: 2003-04-12 7:30+0100\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-04-21 23:25+0100\n"
 "Last-Translator: AL Hosni <admin at wabhosting.com>\n"
 "Language-Team: Arabic <i18n at lists.horde.org>\n"
@@ -15,642 +15,1467 @@
 "Content-Type: text/html; charset=CP1256\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Çáì : "
 
-#: compose.php:647
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Çáì : "
 
-#: compose.php:630
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "   ÇáÊÇÑíÎ : "
 
-#: compose.php:634
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "     ãä : "
 
-#: lib/api.php:94 folders.php:447
-msgid " - $nm new message"
-msgstr " - $nm ÑÓÇáÉ ÌÏíÏÉ"
-
-#: lib/api.php:94 folders.php:447
-msgid " - $nm new messages"
-msgstr " - $nm ÑÓÇÆá ÌÏíÏÉ"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
-#: compose.php:642
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "  ÇáãæÖæÚ : "
 
-#: templates/compose/spelling.inc:59
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " Ýí "
 
-#: templates/mailbox/message_headers.inc:9
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "ÑÞã"
 
-#: mailbox.php:522
-#, c-format
-msgid "%d of %d Messages"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d ãä %d ÑÓÇáÉ"
 
-#: mailbox.php:520
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d Çáì %d ãä %d ÑÓÇáÉ"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:50
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ãæÌæÏÉ ãÓÈÞÇ. ãÌáÏ %s áã íÊã ÊÛííÑå."
 
-#: folders.php:256
-#, c-format
+#: lib/Message.php:649
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s áÇ íÙåÑ Çäå ÚäæÇä ÈÑíÏí ÕÇáÍ."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:48
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Êã ÊÛííÑ ÇÓãÇÁ  %s ãÌáÏ ÚäÏ ÈÏÇíÉ ÇáÔåÑ."
 
-#: folders.php:258
-#, c-format
-msgid "%s is already empty."
-msgstr "%s ÝÇÑÛ ãÓÈÞÇ."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Êã ÇÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ \"%s\" Çáì \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
 
-#: templates/message/navbar_aux_top.inc:14
-#, c-format
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
-#: templates/compose/spelling.inc:126
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(ØÈÞ åÐå ÇáÊÛííÑÇÊ æÇäÊÞá Çáì ÇáÔÇÔÉ ÇáÊÇáíÉ.)"
 
-#: templates/compose/spelling.inc:113
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Þã ÈÇáÛÇÁ ÌãíÚ ÇáÊÛííÑÇÊ æÚÏ Çáì ÔÇÔÉ ÇáÇÑÓÇá)"
 
-#: templates/compose/spelling.inc:119
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(ÚÏ Çáì ÔÇÔÉ ÇáÇÑÓÇá ÈÚÏ ÊØÈíÞ ÌãíÚ ÇáÊÛííÑÇÊ ÇáãÏÑÌÉ ÍÊì ÇáÂä. "
-"áä íÊã ÊØÈíÞ ÇáÊÛííÑÇÊ Úáì ÇáÔÇÔÉ ÇáÍÇáíÉ.)"
+"(ÚÏ Çáì ÔÇÔÉ ÇáÇÑÓÇá ÈÚÏ ÊØÈíÞ ÌãíÚ ÇáÊÛííÑÇÊ ÇáãÏÑÌÉ ÍÊì ÇáÂä. áä íÊã ÊØÈíÞ "
+"ÇáÊÛííÑÇÊ Úáì ÇáÔÇÔÉ ÇáÍÇáíÉ.)"
+
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(ÚÏ Çáì ÔÇÔÉ ÇáÇÑÓÇá ÈÚÏ ÊØÈíÞ ÌãíÚ ÇáÊÛííÑÇÊ ÇáãÏÑÌÉ ÍÊì ÇáÂä. áä íÊã ÊØÈíÞ "
+"ÇáÊÛííÑÇÊ Úáì ÇáÔÇÔÉ ÇáÍÇáíÉ.)"
 
-#: templates/contacts/contacts.inc:56
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* ÇÖÝ åÐå ÈÇáÖÛØ Úáì ÒÑ äÚã *"
 
-#: templates/contacts/contacts.inc:40
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* íÑÌì ÇÎÊíÇÑ ÇáÚäæÇä ( ÇáÚäÇæíä ) . *"
 
-#: lib/MIME/Viewer/text.php:109 lib/MIME/Viewer/enriched.php:183
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
-msgstr ""
-"<p><i>ßÊÈÊ åÐå ÇáÑÓÇáÉ ÈÊÑãíÒ ãÎÊáÝ Úä áÛÊß ÇáÍÇáíÉ .ÇÐÇ áã . "
-"íÊã ÚÑÖåÇ ÈÔßá ÌíÏ ÇÖÛØ, %såäÇ</a> áßí íÊã ÝÊÍ ÇáÑÓÇáÉ "
-"Ýí ÕÝÍÉ ÌÏíÏÉ.</i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
 
-#: templates/filters/manage.inc:50
-msgid "Action"
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "ÃÓãÇÁ ÇáåæíÇÊ :"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "ÅÌÑÇÁ"
 
-#: message.php:89
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "ÇÖÝ Çáì ÓÌá ÇáÚäÇæíä (%s)"
 
-#: compose.php:996
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "ÇÖÝ ÇáãÕÏÑ"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "ÇÖÝ ãÑÝÞÇÊ."
 
-#: templates/compose/compose.inc:301
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "ãÚáæãÇÊ ÔÎÕíÉ"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "ÓÌá ÇáÚäÇæíä"
 
-#: config/prefs.php.dist:116
-msgid "Addressbooks"
-msgstr "ÓÌáÇÊ ÇáÚäÇæíä"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "ÓÌá ÇáÚäÇæíä"
+
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:10
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "ÇáÌãíÚ"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "ÌãíÚ ÇáÑÓÇÆá Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÓæÝ ÊÝÞÏ !"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
-"ÌãíÚ ÇáÑÓÇÆá ÇáãæÌæÏÉ Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÇáÊÇáíÉ ÓæÝ íÊã ÊÍãíáåÇ Ýí ÕäÏæÞ æÇÍÏ "
-"ÇáÕäÏæÞ :"
+"ÌãíÚ ÇáÑÓÇÆá ÇáãæÌæÏÉ Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÇáÊÇáíÉ ÓæÝ íÊã ÊÍãíáåÇ Ýí ÕäÏæÞ "
+"æÇÍÏ ÇáÕäÏæÞ :"
 
-#: lib/Maintenance/Task/purge_trash.php:96
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
-msgstr ""
-"ßá ÇáÑÓÇÆá Ýí ãÌáÏ \"%s\" ÇáÇÞÏã ãä %s íæã ÓæÝ íÊã ÈÔßá ÏÇÆã"
-"ÇáÛÇÄåÇ."
+msgstr "ßá ÇáÑÓÇÆá Ýí ãÌáÏ \"%s\" ÇáÇÞÏã ãä %s íæã ÓæÝ íÊã ÈÔßá ÏÇÆãÇáÛÇÄåÇ."
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "ßá ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÇÞÏã ãä  %s ÔåÑÇ ÓæÝ ÊáÛì "
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
-#, c-format
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
+msgstr "ßá ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÇÞÏã ãä  %s ÔåÑÇ ÓæÝ ÊáÛì "
+
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Êã ÇÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ \"%s\" Çáì \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
 msgstr ""
-"ßá ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÇÞÏã ãä  %s ÔåÑÇ ÓæÝ ÊáÛì "
 
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "ÇÖÝ ãÑÝÞÇÊ."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-#: prefs.php:96
-msgid "An illegal value was specified."
-msgstr "Êã ÊÍÏíÏ ÞíãÉ ÛíÑ ãÞÈæáÉ."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "ÎØÃ ÛíÑ ãÚÑæÝ ÇËäÇÁ ÇÖÇÝÉ ÇáãÏÎáÇÊ ÇáÌÏíÏÉ."
 
-#: message.php:449
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
 msgstr "ÎØÃ ÛíÑ ãÚÑæÝ ÇËäÇÁ ÇÖÇÝÉ ÇáãÏÎáÇÊ ÇáÌÏíÏÉ."
 
-#: templates/mailbox/navbar.inc:17 templates/mailbox/navbar.inc:34
-#: templates/mailbox/legend.inc:12 config/conf.php.dist:132
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Êã ÇáÑÏ ÚáíåÇ"
 
-#: templates/search/main.inc:153
+#: templates/search/main.inc:31
 msgid "Answered messages"
 msgstr "ÇáÑÓÇÆá ÇáÊí Êã ÇáÑÏ ÚáíåÇ"
 
-#: templates/filters/list.inc:12
-msgid "Apply All Rules"
-msgstr "Þã ÈÊØÈíÞ ÌãíÚ ÇáÞæÇÚÏ"
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ Úáì"
 
-#: templates/mailbox/header.inc:21
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ Úáì"
 
-#: config/prefs.php.dist:320
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr " Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ ÇËäÇÁ ÇáÏÎæá ¿"
 
-#: config/prefs.php.dist:330
-msgid "Apply filter rules when mailbox is refreshed?"
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ ÇËäÇÁ ÇäÚÇÔ ÇáÕäÏæÞ ÇáÈÑíÏí"
 
-#: search.php:58
-msgid "April"
-msgstr "ÃÈÑíá"
-
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇáÇÓÊãÑÇÑ ¿"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "åá ÇäÊ ÈÇáÝÚá æÇËÞ ãä Çäß ÊÑíÏ ÇáÇÓÊãÑÇÑ¿"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "åá ÇäÊ æÇËÞ ãä Çäß ÊÑíÏ ÝÚá Ðáß ¿"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
-#: templates/compose/javascript.inc:46
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "åá ÇäÊ æÇËÞ ãä Çäß ÊÑíÏ ÝÚá Ðáß ¿"
 
-#: message.php:605
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇáÛÇÁ åÐå ÇáÑÓÇÆá ÈÔßá äåÇÆí ¿"
 
-#: templates/mailbox/actions.inc:32
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇáÛÇÁ åÐå ÇáÑÓÇÆá ÈÔßá äåÇÆí ¿"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇÝÑÇÛ åÐÇ ÇáãÌáÏ ¿"
 
-#: templates/menu/menu.inc:18
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇÝÑÇÛ ãÌáÏ ÓáÉ ÇáãåãáÇÊ ¿"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇÝÑÇÛ ãÌáÏ ÓáÉ ÇáãåãáÇÊ ¿"
 
-#: config/prefs.php.dist:507
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇáÛÇÁ åÐå ÇáÑÓÇÆá ÈÔßá äåÇÆí ¿"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇÝÑÇÛ åÐÇ ÇáãÌáÏ ¿"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "åá ÇäÊ æÇËÞ ãä ÑÛÈÊß Ýí ÇÝÑÇÛ åÐÇ ÇáãÌáÏ ¿"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "æÞÊ ÇáæÕæá"
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "ÊÕÇÚÏí"
 
-#: templates/compose/compose.inc:407
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "ÇÑÝÇÞ"
 
-#: templates/compose/compose.inc:405
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "ãÑÝÞÇÊ"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "ÇÑÝÇÞ"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "ãÑÝÞ"
 
-#: templates/compose/compose.inc:310 templates/compose/compose.inc:400
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "ãÑÝÞÇÊ"
 
-#: search.php:62
-msgid "August"
-msgstr "ÃÛÓØÓ"
-
-#: templates/message/navbar.inc:49
-msgid "Automatic charset"
-msgstr "ÊÑãíÒ ÊáÞÇÆí"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "ãÑÝÞÇÊ"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "ÅÌÑÇÁ"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:264
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "ÓÌáÇÊ ÇáÒæÇÑ ÇáãÊæÝÑÉ :"
 
-#: templates/message/navbar.inc:29
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "ÇáÚæÏÉ Çáì %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "ÇáÚæÏÉ Çáì %s"
 
-#: templates/compose/compose.inc:218 templates/message/headers.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "ãÑÝÞ ãÎÝí"
 
-#: templates/mailbox/actions.inc:16 templates/message/navbar.inc:14
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
 
-#: templates/search/main.inc:62 templates/filters/manage.inc:17
-#: filters.php:143
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "ÇáäÕ"
 
-#: templates/search/main.inc:147 templates/search/main.inc:161
-#: templates/search/main.inc:175 templates/search/main.inc:189
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "ÇáÇËäÇä"
 
-#: templates/compose/spelling.inc:106 templates/filters/manage.inc:77
-#: templates/contacts/contacts.inc:92
-#: templates/identities/manage.inc:113
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+#, fuzzy
+msgid "C_harset"
+msgstr "ÊÑãíÒ MAC"
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "ÇáÛÇÁ"
 
-#: templates/compose/compose.inc:43 templates/compose/compose.inc:379
-#: templates/compose/bounce.inc:38
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "ÇáÛÇÁ ÇáÑÓÇáÉ"
 
-#: templates/compose/javascript.inc:46
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
-msgstr ""
-"ÇáÛÇÁ åÐå ÇáÑÓÇáÉ ÓæÝ íÄÏí ÊáÞÇÆíÇ Çáì ÊÏãíÑ ãÍÊæíÇÊåÇ."
+msgstr "ÇáÛÇÁ åÐå ÇáÑÓÇáÉ ÓæÝ íÄÏí ÊáÞÇÆíÇ Çáì ÊÏãíÑ ãÍÊæíÇÊåÇ."
 
-#: templates/search/main.inc:46 templates/compose/compose.inc:162
-#: templates/message/headers.inc:16
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "äÓÎÉ"
 
-#: templates/filters/manage.inc:14 filters.php:140
-msgid "Cc:"
-msgstr "äÓÎÉ :"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "ÔÎÕí"
 
-#: templates/compose/spelling.inc:68
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "ÊÛííÑ"
 
-#: templates/compose/spelling.inc:69
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "ÊÛííÑ ÇáÌãíÚ"
 
-#: config/prefs.php.dist:86
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "ÅäÔÇÁ ãÌáÏ"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
-"ÊÛííÑ ÎíÇÑÇÊ ÇáÚÑÖ ãËá ÚÏÏ ÇáÑÓÇÆá ÇáãÚÑæÖÉ Ýí ßá ÕÝÍÉ æ  "
-"ßíÝíÉ ÝåÑÓÉ ÇáÑÓÇÆá."
+"ÊÛííÑ ÎíÇÑÇÊ ÇáÚÑÖ ãËá ÚÏÏ ÇáÑÓÇÆá ÇáãÚÑæÖÉ Ýí ßá ÕÝÍÉ æ  ßíÝíÉ ÝåÑÓÉ "
+"ÇáÑÓÇÆá."
 
-#: config/prefs.php.dist:32
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "ÊÛííÑ ÖæÇÈØ ãÒæÏ ÇáÈÑíÏ"
 
-#: config/prefs.php.dist:25
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr ""
-"ÊÛííÑ ÇáÇÓã¡ ÇáÚäæÇä ¡ æ ÇáÊæÞíÚ ÇáÐí íÑÇå ÇáÇÔÎÇÕ ÚäÏãÇ íÞÑÇæä æ "
-" íÑÏæä Úáì ÑÓÇÆáß."
+"ÊÛííÑ ÇáÇÓã¡ ÇáÚäæÇä ¡ æ ÇáÊæÞíÚ ÇáÐí íÑÇå ÇáÇÔÎÇÕ ÚäÏãÇ íÞÑÇæä æ  íÑÏæä Úáì "
+"ÑÓÇÆáß."
+
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ÇáÈÍË Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) Úä ÑÓÇÆá ÌÏíÏÉ."
 
-#: templates/mailbox/message_headers.inc:6
-msgid "Checkbox"
-msgstr "ÎÇäÉ ÇÎÊíÇÑ"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "åäÇáß ÎØÃ Ýí ÇÑÓÇá ÑÓÇáÊß : %s"
 
 #: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "ÇÎÊÑ ÅÌÑÇÁ :"
 
-#: config/servers.php.dist:85
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "ÇÎÊÑ ãÒæÏ ÇáÈÑíÏ :"
 
-#: templates/prefs/sourceselect.inc:304
-msgid "Choose the addressbook to use when adding addresses."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "ÇÎÊÑ ÅÌÑÇÁ :"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
+msgstr "ÇÎÊÑ ÓÌá ÇáÚäÇæíä ."
+
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr "ÇÎÊÑ ÇáÊÑÊíÈ ÇáÐí ÊÑíÏ Çä íÊã ÇáÈÍË Èå ÚäÏ ÝÊÍ ÓÌáÇÊ ÇáÚäÇæíä. "
+
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
-"ÇÎÊÑ ÓÌá ÇáÚäÇæíä ."
 
-#: templates/prefs/sourceselect.inc:258
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
 msgstr ""
-"ÇÎÊÑ ÇáÊÑÊíÈ ÇáÐí ÊÑíÏ Çä íÊã ÇáÈÍË Èå ÚäÏ ÝÊÍ ÓÌáÇÊ ÇáÚäÇæíä. "
-""
 
-#: mailbox.php:335 folders.php:265
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ÇÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:287
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
 msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
+"Click on one of your selected address books and then select all fields to "
 "search."
+msgstr "ÇäÞÑ Úáì æÇÍÏÇ ãä ÓÌáÇÊ ÒæÇÑß ÇáãÎÊÇÑÉ Ëã ÇÎÊÑ ÌãíÚ ÇáÍÞæá  ááÈÍË."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
-"ÇäÞÑ Úáì æÇÍÏÇ ãä ÓÌáÇÊ ÒæÇÑß ÇáãÎÊÇÑÉ Ëã ÇÎÊÑ ÌãíÚ ÇáÍÞæá  "
-"ááÈÍË."
 
-#: folders.php:367
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "ÅÑÓÇá"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "ãÌáÏ ãÛáÞ"
 
-#: templates/folders/actions.inc:29
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Øí ÇáÌãíÚ"
+
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Øí ÇáÌãíÚ"
 
-#: templates/folders/actions.inc:28
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Øí ÌãíÚ ÇáãÌáÏÇÊ"
 
-#: folders.php:375 folders.php:376
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Øí ãÌáÏ"
 
-#: lib/api.php:43 templates/menu/menu.inc:20
-msgid "Compose"
-msgstr "ÅÑÓÇá"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
 
-#: mailbox.php:812 message.php:81
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "ÃÑÓÇá ÑÓÇáÉ (%s)"
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "ÅÑÓÇá"
 
-#: compose.php:427 compose.php:441 compose.php:456 compose.php:506
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "ÇÑÓÇá ÑÓÇáÉ"
 
-#: config/prefs.php.dist:639
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "ÇÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
 
-#: templates/contacts/contacts.inc:8 contacts.php:81
-msgid "Contact List"
-msgstr "ÞÇÆãÉ ÇáÇÊÕÇá"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "ÊÛííÑ ÖæÇÈØ ãÒæÏ ÇáÈÑíÏ"
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"ÇáÊÍßã Ýí æÞÊ ÇáÈÍË Úä ÑÓÇÆá ÌÏíÏÉ ¡ æåá íÊã ÊäÈíåß Çã áÇ  "
-"ÚäÏ æÕá ÑÓÇÆá ÌÏíÏÉ."
+"ÇáÊÍßã Ýí æÞÊ ÇáÈÍË Úä ÑÓÇÆá ÌÏíÏÉ ¡ æåá íÊã ÊäÈíåß Çã áÇ  ÚäÏ æÕá ÑÓÇÆá "
+"ÌÏíÏÉ."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:62 templates/message/navbar_aux_top.inc:20
-#: templates/message/navbar_aux_bottom.inc:6
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "äÓÎ"
 
-#: templates/compose/spelling.inc:52
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "ÕÍíÍ"
 
-#: templates/compose/spelling.inc:131
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "ÇáäÕ ÇáãÕÍÍ"
 
-#: folders.php:252 folders.php:260 folders.php:262
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "ÊÚÐÑ ÇáÛÇÁ ÇáÑÓÇÆá ãä %s : %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "ÊÚÐÑ ÇáÛÇÁ ÇáÑÓÇÆá ãä %s : %s"
 
-#: templates/filters/manage.inc:75 templates/filters/javascript.inc:75
-#: templates/identities/manage.inc:105
-#: templates/identities/manage.inc:112
-#: templates/identities/javascript.inc:32
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "ÚãáíÇÊ ÇáÕíÇäÉ"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "ÅäÔÇÁ"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "ÅäÔÇÁ ãÌáÏ"
 
-#: templates/prefs/folderselect.inc:24
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "ÅäÔÇÁ"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "ÅäÔÇÁ ãÌáÏ"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "ÇäÔÇÁ ãÌáÏ ãåãáÇÊ ÌÏíÏ"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "ÇäÔÇÁ ãÌáÏ ãÓæÏÇÊ ÌÏíÏ"
 
-#: templates/identities/manage.inc:95
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "ÅäÔÇÁ ãÌáÏ ÑÓÇÆá ãÑÓáÉ ÌÏíÏ"
 
-#: templates/prefs/trashselect.inc:24
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "ÇäÔÇÁ ãÌáÏ ãåãáÇÊ ÌÏíÏ"
 
-#: config/prefs.php.dist:53
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"ÅäÔÇÁ ÞæÇÚÏ ÝáÊÑÉ áÊÑÊíÈ ÇáÈÑíÏ ÇáæÇÑÏ ¡ ÊÕäíÝåÇ Ýí ÇáãÌáÏÇÊ  "
-"æÇáÛÇÁ ÇáÈÑíÏ ÇáÛíÑ ãÑÛæÈ."
+"ÅäÔÇÁ ÞæÇÚÏ ÝáÊÑÉ áÊÑÊíÈ ÇáÈÑíÏ ÇáæÇÑÏ ¡ ÊÕäíÝåÇ Ýí ÇáãÌáÏÇÊ  æÇáÛÇÁ ÇáÈÑíÏ "
+"ÇáÛíÑ ãÑÛæÈ."
+
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "ÅäÔÇÁ ãÌáÏ ÑÓÇÆá ãÑÓáÉ ÌÏíÏ"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
-#: config/prefs.php.dist:95
-msgid "Customize how you send mail and where drafts are saved."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
 msgstr ""
-"ÖÈØ ßíÝíÉ ÇÑÓÇáß ÇáÑÓÇÆá æÇíä íÊã ÍÝÙ ÇáãÓæÏÇÊ . "
-""
 
-#: config/prefs.php.dist:75
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
-"ÖÈØ ÚãáíÇÊ ÇáÕíÇäÉ ÇáÊí ÊÚãá ÚäÏ ÇáÏÎæá Çáì %s."
 
-#: config/prefs.php.dist:103
-#, c-format
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "ÖÈØ ßíÝíÉ ÇÑÓÇáß ÇáÑÓÇÆá æÇíä íÊã ÍÝÙ ÇáãÓæÏÇÊ . "
+
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "ÖÈØ ãåÇã áßí ÊÚãá ÚäÏ ÇáÏÎæá %s."
 
-#: templates/message/navbar.inc:52
-msgid "DOS charset"
-msgstr "ÊßæíÏ ÇáÏæÒ"
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "ÇáÊÇÑíÎ"
 
-#: templates/mailbox/message_headers.inc:13 templates/message/headers.inc:4
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "ÇáÊÇÑíÎ"
 
-#: search.php:66
-msgid "December"
-msgstr "ÏíÓãÈÑ"
-
-#: templates/prefs/identityselect.inc:5
-msgid "Default Identity"
-msgstr "ÇáåæíÉ ÇáÇÝÊÑÇÖíÉ"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "ãáÛí"
 
-#: config/prefs.php.dist:513
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "ÇáÛÇÁ"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "ÕíÛÉ ÇáÝåÑÓÉ ÇáÇÝÊÑÇÖíÉ :"
 
-#: config/prefs.php.dist:524
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "ÇÊÌÇå ÇáÝåÑÓÉ ÇáÇÝÊÑÇÖí :"
 
-#: templates/mailbox/actions.inc:9 templates/message/navbar.inc:7
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "ãáÛí"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "ÇáÛÇÁ"
 
-#: templates/folders/actions.inc:7
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "ÇáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
 
-#: templates/filters/list.inc:38
-msgid "Delete messages"
-msgstr "ÇáÛÇÁ ÑÓÇÆá"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "ÇáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "ÇáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
 
-#: config/prefs.php.dist:448
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "ÇáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "ÍÐÝ ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíã Ýí ÈÏÇíÉ ÇáÔåÑ ¿"
+
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "ÍÐÝ ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíã Ýí ÈÏÇíÉ ÇáÔåÑ ¿"
 
-#: templates/mailbox/navbar.inc:19 templates/mailbox/navbar.inc:37
-#: templates/mailbox/legend.inc:16 config/conf.php.dist:128
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "ÇáÛÇÁ ÑÓÇÆá"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "ãáÛí"
 
-#: compose.php:1027
-msgid "Deleted an attachment."
-msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
-
-#: templates/search/main.inc:181
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "ÑÓÇÆá ãÍÐæÝÉ"
 
-#: config/prefs.php.dist:67
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
+
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "ÇáÛÇÁ æÊÛííÑ ãæÞÚ ÑÓÇÆá"
 
-#: config/prefs.php.dist:523
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "ÊäÇÒáí"
 
-#: config/prefs.php.dist:598
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "ÊÚÊíã ÇáÊæÇÞíÚ ¿"
 
-#: templates/contacts/contacts.inc:65
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "ÚÜÑÖ"
 
-#: config/prefs.php.dist:85
-msgid "Display Options"
-msgstr "ÚÑÖ ÇáÎíÇÑÇÊ"
+#: config/prefs.php.dist:479
+#, fuzzy
+msgid "Display confirmation after sending a message?"
+msgstr ""
+"ÚÑÖ ÑÓÇáÉ ÊÇßíÏ ÈÚÏ ÇÑÓÇá ÑÓÇáÉ ¿ ( ÝÞØ ÚäÏ ÚÏã ÇÓÊÎÏÇã äÇÝÐÉ ãäÈËÞÉ áÇÑÓÇá "
+"ÇáÑÓÇáÉ )"
 
-#: config/prefs.php.dist:648
-msgid ""
-"Display confirmation after sending a message? (only when not using a pop-up "
-"compose window)"
-msgstr "ÚÑÖ ÑÓÇáÉ ÊÇßíÏ ÈÚÏ ÇÑÓÇá ÑÓÇáÉ ¿ ( ÝÞØ ÚäÏ ÚÏã ÇÓÊÎÏÇã äÇÝÐÉ ãäÈËÞÉ "
-"áÇÑÓÇá ÇáÑÓÇáÉ )"
-
-#: config/prefs.php.dist:340
-msgid "Display message when filters have been applied?"
-msgstr "ÚÑÖ ÑÓÇáÉ ÚäÏ ÊØÈíÞ ÇáÝáÇÊÑ ¿"
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-#: config/prefs.php.dist:733
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
+msgstr "ÚÑÖ ÑÓÇáÉ ãäÈËÞÉ ááÇÚáÇã Úä æÕæá ÑÓÇáÉ ÌÏíÏÉ ¿"
+
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "ÚÑÖ ÇáÎíÇÑÇÊ"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
 msgstr ""
-"ÚÑÖ ÑÓÇáÉ ãäÈËÞÉ ááÇÚáÇã Úä æÕæá ÑÓÇáÉ ÌÏíÏÉ ¿"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "áÇ ÊÞã ÈÇáÈÍË Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) Úä ÇáÑÓÇÆá ÇáÌÏíÏÉ"
 
-#: templates/folders/confirm.inc:3
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "åá ÊÑíÏ ÝÊÍ Ðáß ÇáãÌáÏ ¿"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Êã"
 
-#: lib/IMP.php:1057
-msgid "Download"
-msgstr "ÊÍãíá"
-
-#: lib/IMP.php:1056
-#, c-format
-msgid "Download %s"
-msgstr "Êã ÇáÊÍãíá %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
 
-#: templates/folders/actions.inc:16
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
+
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "ÊÍãíá ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
 
-#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:40
-#: config/conf.php.dist:136
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "ÊÍãíá ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
+
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "ãÓæÏÉ"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "ãÌáÏ ÇáãÓæÏÇÊ :"
+
 #: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "ãÌáÏ ÇáãÓæÏÇÊ :"
 
-#: templates/identities/manage.inc:27
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "ÊÍÑíÑ"
 
-#: config/prefs.php.dist:310
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "ãÑÔÍÇÊ ÇáÈÑíÏ"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "ÊÍÑíÑ ÞæÇÚÏ ÇáÝáÊÑÉ"
+
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "ÊÍÑíÑ ÞæÇÚÏ ÇáÝáÊÑÉ"
 
-#: config/prefs.php.dist:172
-msgid "Edit your identities"
-msgstr "ÊÍÑíÑ ÇáåæíÇÊ"
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "ÊÍÑíÑ ÞæÇÚÏ ÇáÝáÊÑÉ"
 
-#: templates/contacts/contacts.inc:68
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí"
 
-#: templates/folders/actions.inc:17
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "ãÌáÏ ( ãÌáÏÇÊ) ÝÇÑÛÉ"
 
-#: templates/menu/menu.inc:18
-msgid "Empty Trash"
-msgstr "ÓáÉ ÝÇÑÛÉ"
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "ãÌáÏ ( ãÌáÏÇÊ) ÝÇÑÛÉ"
 
-#: templates/mailbox/actions.inc:32
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
 
-#: compose.php:657
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "ÓáÉ ÝÇÑÛÉ"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
+msgstr "ÓáÉ ÝÇÑÛÉ"
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "ÇäåÇÁ ÇáÑÓÇÆá ÇáãÍæáÉ"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "ÇáÑÓÇÆá ÇáÞÏíãÉ"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "ÑÓÇáÉ ãÍæáÉ ãä %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "ÇÏÎá ÇÓã ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÇáÌÏíÏ"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "ÇÏÎá ÇÓã ãÌáÏ ÇáãÓæÏÇÊ ÇáÌÏíÏ"
 
-#: templates/identities/javascript.inc:128
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "ÇÏÎá ÇÓã ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÌÏíÏ"
 
@@ -658,796 +1483,2082 @@
 msgid "Enter the name for your new trash folder"
 msgstr "ÇÏÎá ÇÓã ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÇáÌÏíÏ"
 
-#: message.php:451
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "ÇÚÇÏÉ ÊæÌíå ÑÓÇáÉ"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Êã ÇÏÎÇá ÇáÓÌá \"%s\" ÈäÌÇÍ Ýí ÓÌá ÇáÚäÇæíä"
 
-#: status.php:35
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "ÎØÃ"
 
-#: config/prefs.php.dist:722
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "ßá 15 ÏÞíÞÉ"
 
-#: config/prefs.php.dist:719
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "ßá 30 ËÇäíÉ"
 
-#: config/prefs.php.dist:721
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "ßá 5 ÏÞÇÆÞ"
 
-#: config/prefs.php.dist:723
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "ßá äÕÝ ÓÇÚÉ"
 
-#: config/prefs.php.dist:720
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "ßá ÏÞíÞÉ"
 
-#: templates/folders/actions.inc:27
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "ÈÓØ Çáßá"
+
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "ÈÓØ Çáßá"
 
-#: templates/folders/actions.inc:26
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "ÈÓØ ÌãíÚ ÇáãÌáÏÇÊ"
 
-#: folders.php:379 folders.php:380
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "ÈÓØ ãÌáÏ"
 
-#: templates/compose/compose.inc:302
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "ÈÓØ ÇáÇÓãÇÁ"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "ÈÓØ ÔÌÑÉ ÇáãÌáÏÇÊ ÇáÍÇáíÉ ÈÔßá ÇÝÊÑÇÖí ÇËäÇÁ ÚÑÖ ÇáãÌáÏÇÊ ¿"
 
-#: search.php:56
-msgid "February"
-msgstr "ÝÈÑÇíÑ"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "ÈÓØ Çáßá"
 
-#: templates/filters/manage.inc:7
-msgid "Field"
-msgstr "ÍÞá"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "ÈÑíÏ ÌÏíÏ"
 
-#: templates/compose/compose.inc:433
-msgid "Filename"
-msgstr "ÇÓã ÇáãáÝ"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "ÈÑíÏ ÌÏíÏ"
 
-#: lib/IMP.php:1192
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "ÝÇÚáíÉ ÇáÊÑÔíÍ : Êã ÇáÛÇÁ ÇáÑÓÇáÉ \"%s\" ãä \"%s\" ."
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "ÇÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
 
-#: lib/IMP.php:1203
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"ÝÇÚáíÉ ÇáÊÑÔíÍ : Êã ÊÍæíá ÇáÑÓÇáÉ \"%s\" ãä \"%s\" Çáì ÇáãÌáÏ "
-"\"%s\"."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr " Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ ÇËäÇÁ ÇáÏÎæá ¿"
 
-#: lib/IMP.php:1190
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "ÑÓÇáÉ ãÍæáÉ ãä %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
-"ÝÇÚáíÉ ÇáÊÑÔíÍ : Êã ÊÍæíá ÇáÑÓÇáÉ \"%s\" ãä \"%s\" Çáì ãÌáÏ  "
-"ÓáÉ ÇáãåãáÇÊ."
 
-#: templates/filters/list.inc:10
-msgid "Filter Rules"
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "ÊæÌÏ áÏíß %s ÑÓÇáÉ ÌÏíÏÉ."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "ÇáãÑÔÍÇÊ"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "ÇáãÑÔÍÇÊ"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "ÎíÇÑÇÊ ÇÎÑì"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "ÞæÇÚÏ ÇáãÑÔÍ"
 
-#: config/prefs.php.dist:363
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "ÊÑÔíÍ ÇáãÍÊæíÇÊ ÇááÇÇÎáÇÞíÉ ááÑÓÇÆá ¿"
 
-#: config/prefs.php.dist:52
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "ÇáãÑÔÍÇÊ"
 
-#: templates/contacts/contacts.inc:18
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "ÌÏ"
 
-#: mailbox.php:458 mailbox.php:459 mailbox.php:465 mailbox.php:466
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "ÇáÕÝÍÉ ÇáÇæáì"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "ÇáÕÝÍÉ ÇáÇæáì"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "ÊÍæíá"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:5
-#: folders.php:283
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "ãÓÊßÔÝ ÇáãÌáÏ"
 
-#: templates/login/login.inc:130
-msgid "Folder Prefix"
-msgstr "ÈÇÏÆÉ ÇáãÌáÏ"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "ÝÈÑÇíÑ"
 
-#: templates/menu/menu.inc:22
-msgid "Folders"
-msgstr "ãÌáÏÇÊ"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
-#: templates/message/navbar.inc:11 compose.php:664
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "ÊÍæíá"
 
-#: compose.php:661
+#: compose.php:765
 msgid "Forward:"
 msgstr "ÊÍæíá :"
 
-#: compose.php:626
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "ÇäåÇÁ ÇáÑÓÇÆá ÇáãÍæáÉ"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "ÑÓÇáÉ ãÍæáÉ ãä %s"
 
-#: templates/search/main.inc:30 templates/compose/compose.inc:83
-#: templates/mailbox/message_headers.inc:17 templates/message/headers.inc:8
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "ãÚáæãÇÊ ÇáãÒæÏ"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "ãä"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "ãä"
 
-#: config/prefs.php.dist:509
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "ãä ÇáÚäæÇä"
 
-#: templates/filters/manage.inc:15 filters.php:141
-msgid "From:"
-msgstr "ãä :"
-
-#: compose.php:660 compose.php:663
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "ãÍæá:"
 
-#: templates/menu/menu.inc:41
-msgid "Help"
-msgstr "ãÓÇÚÏÉ"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "ãÍæá:"
 
-#: mailbox.php:516
-msgid "Hide Deleted"
-msgstr "ÇÎÝÇÁ ÇáãáÛí"
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "ÇäåÇÁ ÇáÑÓÇÆá ÇáãÍæáÉ"
 
-#: folders.php:274
-msgid "Hide Unsubscribed"
-msgstr "ÇÎÝÇÁ ÇáÛíÑ ãÔÊÑß"
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
 
-#: config/prefs.php.dist:630
-msgid "How to prefix quoted lines in a reply:"
-msgstr " ÊÍÏíÏ ÈÇÏÆÉ ÇáÇÓØÑ ÇáãÞÊÈÓÉ Ýí ÇáÑÏ :"
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
 
-#: templates/index/notconfigured.inc:4
-msgid "IMP is not properly configured"
-msgstr "áã íÊã ÖÈØ ÇáÜ IMP ÈÔßá ÕÍíÍ"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
 
-#: templates/menu/menu.inc:16 folders.php:354
-msgid "INBOX"
-msgstr "ÇáæÇÑÏ"
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "ÇáÑÓÇáÉ ÇáÊÇáíÉ"
 
-#: templates/message/navbar.inc:53
-msgid "ISO charset"
-msgstr "ÊÑãíÒ ISO"
-
-#: templates/identities/manage.inc:5 identities.php:140
-msgid "Identities"
-msgstr "ÇáåæíÇÊ"
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "ÇÖÝ Çáì ÓÌá ÇáÚäÇæíä (%s)"
 
-#: templates/compose/compose.inc:68
-msgid "Identity"
-msgstr "åæíÉ"
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
 
-#: templates/identities/manage.inc:47
-msgid "Identity's name:"
-msgstr "ÃÓãÇÁ ÇáåæíÇÊ :"
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
 
-#: templates/compose/spelling.inc:70
-msgid "Ignore"
-msgstr "ÊÌÇåá"
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
 
-#: templates/compose/spelling.inc:71
-msgid "Ignore All"
-msgstr "ÊÌÇåá Çáßá"
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
-#: templates/mailbox/legend.inc:14 config/conf.php.dist:134
-msgid "Important"
-msgstr "ãåã"
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
 
-#: templates/search/main.inc:167
-msgid "Important messages"
-msgstr "ÑÓÇÆá ãåãÉ"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
 
-#: config/prefs.php.dist:621
-msgid "Include original message in a reply?"
-msgstr "ÇÑÝÇÞ ÇáÑÓÇÆá ÇáÇÕáíÉ ÚäÏ ÇáÑÏ ¿"
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
 
-#: compose.php:678 compose.php:759
-msgid "Invalid character in e-mail address."
-msgstr "ÍÑæÝ ÛíÑ ãÞÈæáÉ Ýí ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí."
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "ÚÑÖ ÊÓáÓáí"
 
-#: search.php:55
-msgid "January"
-msgstr "íäÇíÑ"
-
-#: search.php:61
-msgid "July"
-msgstr "íæáíæ"
-
-#: search.php:60
-msgid "June"
-msgstr "íæäíæ"
-
-#: templates/message/navbar.inc:51
-msgid "KOI charset"
-msgstr "ÊÑãíÒ KOI"
+#: mailbox.php:367
+msgid "Hide Deleted"
+msgstr "ÇÎÝÇÁ ÇáãáÛí"
 
-#: templates/login/login.inc:140 config/prefs.php.dist:38
-msgid "Language"
-msgstr "ÇááÛÉ"
+#: folders.php:298
+msgid "Hide Unsubscribed"
+msgstr "ÇÎÝÇÁ ÇáÛíÑ ãÔÊÑß"
 
-#: mailbox.php:489 mailbox.php:490 mailbox.php:495 mailbox.php:496
-msgid "Last Page"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
+msgstr " ÊÍÏíÏ ÈÇÏÆÉ ÇáÇÓØÑ ÇáãÞÊÈÓÉ Ýí ÇáÑÏ :"
+
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
+msgid "INBOX"
+msgstr "ÇáæÇÑÏ"
+
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "ÌãíÚ ÇáÑÓÇÆá Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÓæÝ ÊÝÞÏ !"
+
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "ÊÌÇåá"
+
+#: templates/compose/spelling.inc:83
+msgid "Ignore All"
+msgstr "ÊÌÇåá Çáßá"
+
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "ãåã"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "ãåã"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "ãåã"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "ÑÓÇÆá ãåãÉ"
+
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
+msgid "Important"
+msgstr "ãåã"
+
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "ÑÓÇÆá ãåãÉ"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "ÇÑÝÇÞ ÇáÑÓÇÆá ÇáÇÕáíÉ ÚäÏ ÇáÑÏ ¿"
+
+#: config/prefs.php.dist:487
+msgid "Include original message in a reply?"
+msgstr "ÇÑÝÇÞ ÇáÑÓÇÆá ÇáÇÕáíÉ ÚäÏ ÇáÑÏ ¿"
+
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "ÊÌÇåá"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "áÇ ÔíÁ"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, fuzzy, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr "ÍÑæÝ ÛíÑ ãÞÈæáÉ Ýí ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí."
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
+msgid "Language"
+msgstr "ÇááÛÉ"
+
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "ÂÎÑ ÕÝÍÉ"
+
+#: mailbox.php:358
+msgid "Last Page"
 msgstr "ÂÎÑ ÕÝÍÉ"
 
-#: lib/IMP.php:347
-#, c-format
-msgid "Last login: %s"
-msgstr "ÂÎÑ ÏÎæá : %s"
-
-#: lib/IMP.php:345
-msgid "Last login: Never"
-msgstr "ÂÎÑ ÏÎæá : áÇ ÔíÆ"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "ãÑÝÞÇÊ"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
 
-#: templates/login/login.inc:147
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "ÅÌÑÇÁ"
+
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "ÏÎæá"
 
-#: lib/api.php:82
-#, c-format
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "ÏÎæá Çáì %s"
 
-#: config/prefs.php.dist:102
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
+msgstr "ÏÎæá"
+
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "ãåÇã ÇáÏÎæá"
 
-#: login.php:22
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: templates/compose/compose.inc:296
+msgid "Low"
 msgstr ""
-"ÝÔá ÇáÏÎæá áÓÈÈ ãÇ . ÛÇáÈÇ ãÇ íßæä ÎØÃ Ýí ÇÏÎÇá ÇÓã ÇáãÓÊÎÏã Ãæ  "
-"ßáãÉ ÇáãÑæÑ."
 
-#: templates/menu/menu.inc:54 templates/menu/menu.inc:56
-msgid "Logout"
-msgstr "ÎÑæÌ"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
 
-#: templates/message/navbar.inc:54
-msgid "MAC charset"
-msgstr "ÊÑãíÒ MAC"
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "ãÑÔÍÇÊ ÇáÈÑíÏ"
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: filters.php:131
-msgid "Mail Filters"
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
 msgstr "ãÑÔÍÇÊ ÇáÈÑíÏ"
 
-#: config/prefs.php.dist:51 config/prefs.php.dist:59 config/prefs.php.dist:66
-#: config/prefs.php.dist:73
-msgid "Mail Management"
-msgstr "ÅÏÇÑÉ ÇáÈÑíÏ"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
-#: folders.php:356 folders.php:358 folders.php:360
+#: folders.php:402
 msgid "Mailbox"
 msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: config/prefs.php.dist:74
-msgid "Maintenance Operations"
-msgstr "ÚãáíÇÊ ÇáÕíÇäÉ"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "ÚÑÖ ÇáÎíÇÑÇÊ"
 
-#: search.php:57
-msgid "March"
-msgstr "ãÇÑÓ"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:29
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Úáãå ßÜ :"
 
-#: config/prefs.php.dist:589
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
+msgstr "Úáã ÇáãÓÊæíÇÊ ÇáãÎÊáÝÉ ãä ÇáÇÞÊÈÇÓÇÊ ÈÇáæÇä ãÎÊáÝÉ ¿"
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
 msgstr ""
-"Úáã ÇáãÓÊæíÇÊ ÇáãÎÊáÝÉ ãä ÇáÇÞÊÈÇÓÇÊ ÈÇáæÇä ãÎÊáÝÉ ¿"
 
-#: search.php:59
-msgid "May"
-msgstr "ãÇíæ"
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "ãÑÝÞ"
 
-#: status.php:48
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "ãÚáæãÇÊ ÇáãÒæÏ"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "ãÌáÏ ãÝÊæÍ"
+
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "ÑÓÇáÉ"
 
-#: compose.php:430 compose.php:434 compose.php:1082 config/prefs.php.dist:94
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "ÈäíÉ ÇáÑÓÇáÉ"
 
-#: config/prefs.php.dist:508
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "ÊÇÑíÎ ÇáÑÓÇáÉ"
 
-#: search.php:22
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "ÑÓÇÆá Çáì"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "ÈÍË ÇáÑÓÇáÉ"
 
-#: config/prefs.php.dist:511
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "ÍÌã ÇáÑÓÇáÉ"
 
-#: templates/message/navbar.inc:17
+#: message.php:384
 msgid "Message Source"
 msgstr "ãßæäÇÊ ÇáÑÓÇáÉ"
 
-#: config/prefs.php.dist:60
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "ÚÑÖ ÇáÑÓÇáÉ"
 
-#: templates/search/main.inc:26
-msgid "Message fields"
-msgstr "ÍÞæá ÇáÑÓÇáÉ"
-
-#: templates/search/main.inc:129
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "ÇÚáÇã ÇáÑÓÇáÉ"
 
-#: templates/search/main.inc:197
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "ãÌáÏÇÊ ÇáÑÓÇáÉ"
 
-#: mailbox.php:125
-msgid "Message sent successfully"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "ãÌáÏÇÊ ÇáÑÓÇáÉ"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "ÍÞæá ÇáÑÓÇáÉ"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "ÍÞæá ÇáÑÓÇáÉ"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "ÊÇÑíÎ ÇáÑÓÇáÉ"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
+msgstr "Êã ÇÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
 msgstr "Êã ÇÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
 
-#: config/prefs.php.dist:533
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "Êã ÇÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "ÑÓÇáÉ áßá ÕÝÍÉ ÇËäÇÁ ÚÑÖ ÕäÏæÞ ÇáÑÓÇÆá."
 
-#: mailbox.php:346
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "ÑÓÇÆá Çáì"
 
-#: templates/compose/compose.inc:435
-msgid "Mime Type"
-msgstr "äæÚ ãÇíã"
-
-#: templates/filters/javascript.inc:67
-#: templates/filters/javascript.inc:108
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "ÊÚÏíá"
 
-#: templates/mailbox/navbar.inc:61 templates/message/navbar_aux_top.inc:19
-#: templates/message/navbar_aux_bottom.inc:5
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "ÇäÊÞá"
 
-#: templates/filters/list.inc:58
-msgid "Move Down"
-msgstr "ÇäÊÞá ááÇÓÝá"
-
-#: templates/filters/list.inc:59
-msgid "Move Up"
-msgstr "ÇäÊÞá ááÇÚáì"
-
-#: templates/filters/list.inc:40
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "ÇäÞá ÇáÑÓÇÆá Çáì ÇáãÌáÏ <b>%s</b> "
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "ÇäÊÞá Çáì ÇáÇÓÝá"
 
-#: templates/contacts/contacts.inc:67
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "ÇÎÊÑ ãÌáÏ"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "ÇäÊÞá Çáì ÇáÇÚáì"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "ÚÑÖ ÇáÑÓÇáÉ"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "ÇáÇÓã"
 
-#: config/prefs.php.dist:718
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "ÅÌÑÇÁ"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "ãØáÞÇ"
 
-#: templates/mailbox/legend.inc:8
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
+
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "ÌÏíÏ"
 
-#: lib/IMP.php:698
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "ãÌáÏ ÌÏíÏ"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "ÈÑíÏ ÌÏíÏ"
 
-#: templates/search/main.inc:143
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "ÇáÑÓÇáÉ ÇáÊÇáíÉ"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "ÑÓÇÆá ÌÏíÏÉ"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "ÇáÊÇáí"
 
-#: templates/message/navbar.inc:38
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "ÇáÑÓÇáÉ ÇáÊÇáíÉ"
 
-#: mailbox.php:486 mailbox.php:487 mailbox.php:493 mailbox.php:494
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "ÇáÕÝÍÉ ÇáÊÇáíÉ"
 
-#: config/prefs.php.dist:551
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "áÇ"
 
-#: mailbox.php:705
-msgid "No Subject"
-msgstr "áÇ íæÌÏ ãæÖæÚ"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "ÇáäÕ ÇáãÕÍÍ"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "ãÑÝÞÇÊ"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "áã íÊã ÇÎÊíÇÑ ãÌáÏ"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
 
-#: lib/Folder.php:412 lib/Folder.php:446 folders.php:200 folders.php:210
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "áã íÊã ÊÍÏíÏ ãÌáÏ"
 
-#: templates/mailbox/empty_mailbox.inc:4
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "áíÓÊ ÑÓÇÆá ãáÛíÉ"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "áíÓÊ ÑÓÇÆá ãáÛíÉ"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "ÇäÞá ÇáÑÓÇÆá Çáì"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "áÇ ÊæÌÏ ÑÓÇÆá ãØÇÈÞÉ áÈÍËß"
 
-#: spelling.php:208
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "áã íÊã ÊÚÑíÝ ÈÑäÇãÌ ÊÏÞíÞ ÇãáÇÆí."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "áÇ ÊæÌÏ ÇÎØÇÁ ÇãáÇÆíÉ"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "áÇ ÊæÌÏ ÇÞÊÑÇÍÇÊ"
 
-#: templates/prefs/sourceselect.inc:26 templates/mailbox/navbar.inc:11
-#: templates/identities/manage.inc:93
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "áã íÊã ÊÍÏíÏ ãÌáÏ"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "áÇ ÔíÁ"
 
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "áã íÊã ÇáÇáÛÇÁ"
 
-#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "áÇ ÊæÌÏ ãÓæÏÉ"
 
-#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "áíÓÊ ãåãå"
 
-#: templates/mailbox/navbar.inc:24
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "áíÓÊ ÔÎÕíå"
 
-#: templates/search/main.inc:185
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "áíÓÊ ÑÓÇÆá ãáÛíÉ"
 
-#: templates/search/main.inc:171
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "áíÓÊ ÑÓÇÆá ãåãÉ"
 
-#: search.php:65
-msgid "November"
-msgstr "äæÝãÈÑ"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "ÅÞÊÈÇÓ"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"ÚÏÏ ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ ÇáÊí íÌÈ ÇÈÞÇÄåÇ Ýí ÍÇá ÇáÇáÛÇÁ   ÇáÔåÑí."
+
+#: config/prefs.php.dist:359
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"ÚÏÏ ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ ÇáÊí íÌÈ ÇÈÞÇÄåÇ Ýí ÍÇá ÇáÇáÛÇÁ   ÇáÔåÑí."
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr "ãæÇÝÞ"
+
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "ÇáÑÓÇÆá ÇáÞÏíãÉ"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Êã ÇáÊÎáÕ ãä ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ."
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ ÝÞØ áåÐå ÇáÚãáíÉ."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "ãÌáÏ ãÝÊæÍ"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "ãÌáÏ ãÝÊæÍ"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "ÎíÇÑÇÊ ÇÎÑì"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "ÎíÇÑÇÊ ÇÎÑì"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "ÇáÛÇÁ ÇáÑÓÇáÉ"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "ÎØÃ"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "ÎíÇÑÇÊ"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Êã ÇäÔÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "ÇÑÓá ÑÓÇáÉ"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
 
-#: config/prefs.php.dist:457
-msgid "Number of old sent-mail folders to keep if deleting monthly."
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
-"ÚÏÏ ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ ÇáÊí íÌÈ ÇÈÞÇÄåÇ Ýí ÍÇá ÇáÇáÛÇÁ   "
-"ÇáÔåÑí."
 
-#: templates/contacts/contacts.inc:91
-msgid "OK"
-msgstr "ãæÇÝÞ"
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
 
-#: search.php:64
-msgid "October"
-msgstr "ÇßÊæÈÑ"
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
 
-#: templates/search/main.inc:139
-msgid "Old messages"
-msgstr "ÇáÑÓÇÆá ÇáÞÏíãÉ"
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
-msgid "Old sent-mail folders being purged."
-msgstr "Êã ÇáÊÎáÕ ãä ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ."
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
 
-#: templates/menu/menu.inc:68 templates/menu/menu.inc:74 folders.php:365
-msgid "Open Folder"
-msgstr "ãÌáÏ ãÝÊæÍ"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-#: templates/compose/compose.inc:291 templates/menu/menu.inc:25
-msgid "Options"
-msgstr "ÎíÇÑÇÊ"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-#: config/prefs.php.dist:84 config/prefs.php.dist:93 config/prefs.php.dist:101
-#: config/prefs.php.dist:108 config/prefs.php.dist:115
-msgid "Other Options"
-msgstr "ÎíÇÑÇÊ ÇÎÑì"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#: templates/mailbox/header.inc:26
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "ÇáÕÝÍÉ %d ãä %d"
 
-#: templates/message/headers.inc:32
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "ÌÒÁ (ÇÌÒÇÁ)"
 
-#: templates/login/login.inc:76
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "ßáãÉ ÇáãÑæÑ"
 
-#: config/prefs.php.dist:430
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "ÊÝÚíá ÚãáíÇÊ ÇáÕíÇäÉ ÚäÏ ÇáÏÎæá ¿"
 
-#: templates/mailbox/navbar.inc:23 config/conf.php.dist:138
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "ÔÎÕí"
 
-#: config/prefs.php.dist:24
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "ãÚáæãÇÊ ÔÎÕíÉ"
 
-#: templates/identities/manage.inc:82
+#: pgp.php:120
+#, fuzzy
+msgid "Personal PGP keypair generated successfully."
+msgstr "Êã ÇÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: pgp.php:127
+#, fuzzy
+msgid "Personal PGP keys deleted successfully."
+msgstr "Êã ÇÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "æÖÚ ÊæÞíÚß ÞÈá ÇáÑÏæÏ æ ÇáÊÍæíáÇÊ ¿"
 
-#: templates/mailbox/javascript.inc:81
-#: templates/message/javascript.inc:14
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "íÑÌì ÇÏÎÇá ÇÓã ááãÌáÏ ÇáÌÏíÏ :"
 
-#: templates/folders/javascript.inc:98
-#: templates/folders/javascript.inc:100
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "íÑÌì ÇÏÎÇá ÇÓã ÇáãÌáÏ ÇáÌÏíÏ :"
 
-#: templates/folders/javascript.inc:137
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "íÑÌì ÇÏÎÇá ÇáÇÓã ÇáÌÏíÏ :"
 
-#: templates/search/javascript.inc:61
-msgid "Please enter valid search criteria."
-msgstr "íÑÌì ÇÏÎÇá ãÊÛíÑÇÊ ÈÍË ãÞÈæáÉ."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "íÑÌì ÊæÝíÑ ÇÓã ÇáãÓÊÎÏã æßáãÉ ÇáãÑæÑ"
 
-#: templates/login/login.inc:17 templates/login/login.inc:21
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "íÑÌì ÊæÝíÑ ÇÓã ÇáãÓÊÎÏã æßáãÉ ÇáãÑæÑ"
 
-#: compose.php:229 compose.php:244
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "íÑÌì Íá ÇáÇáÊÈÇÓ Ãæ ÚÏã ÕáÇÍíÉ ÇáÚäÇæíä ."
 
-#: templates/folders/javascript.inc:53
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "ÇáÑÌÇÁ ÇÎíÇÑ ãÌáÏ ÞÈá ÇáÔÑæÚ Ýí Çí ÇÌÑÇÁ."
 
-#: templates/search/javascript.inc:38
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ Úáì ÇáÇÞá ááÈÍË."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ Úáì ÇáÇÞá ááÈÍË."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ ÝÞØ áåÐå ÇáÚãáíÉ."
 
-#: templates/compose/compose.inc:116 templates/compose/compose.inc:172
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "íÑÌì ÇÎÊíÇÑ Çæ ÊÍÑíÑ äÕ ÕÍíÍ :"
 
-#: templates/identities/manage.inc:77
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "ÇÓÊåá ÊæÞíÚß ÈÔÑØ ('-- ')"
 
-#: templates/message/navbar.inc:32
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "Êã ÇäÔÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "ÇáÕÝÍÉ ÇáÓÇÈÞÉ"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "ÇáÑÓÇáÉ ÇáÓÇÈÞÉ"
 
-#: mailbox.php:461 mailbox.php:462 mailbox.php:467 mailbox.php:468
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "ÇáÕÝÍÉ ÇáÓÇÈÞÉ"
 
-#: templates/message/navbar.inc:23
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "ØÈÇÚÉ"
 
-#: lib/IMP.php:1209
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "ãÔßáÉ ãÊÚáÞÉ ÈÞÇÚÏÉ ÇáãÑÔÍ %d : áã íÊã ÇÖÇÝÉ ÇáãÌáÏ : %s"
-
-#: templates/menu/menu.inc:33
-msgid "Problem?"
-msgstr "ãÔßáÉ ¿"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "ØÈÇÚÉ"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "ÊÎáÕ ãä ÇáãáÛí"
 
-#: templates/mailbox/actions.inc:26
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "ÊÎáÕ ãä ÇáãáÛí"
 
-#: config/prefs.php.dist:476
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "ÇáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "äÙÝ ÓáÉ ÇáãåãáÇÊ ßá ÝÊÑÉ :"
 
-#: config/prefs.php.dist:485
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "ÍÐÝ ÇáÑÓÇÆá Ýí ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÇáÇÞÏã ãä åÐÇ ÇáÚÏÏ ãä ÇáÇíÇã."
 
-#: config/prefs.php.dist:466
-msgid "Purge old message in the Trash folder?"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "ÍÐÝ ÇáÑÓÇÆá ÇáÞÏíãÉ ãä ãÌáÏ ÓáÉ ÇáãåãáÇÊ¿"
 
-#: lib/Maintenance/Task/purge_trash.php:66
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "ÍÐÝ %d ÑÓÇáÉ (ÑÓÇÆá) ãä ãÌáÏ ÓáÉ ÇáãåãáÇÊ."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "ÍÐÝ %d ÑÓÇáÉ (ÑÓÇÆá) ãä ãÌáÏ ÓáÉ ÇáãåãáÇÊ."
 
-#: compose.php:595
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "ÅÞÊÈÇÓ"
 
-#: templates/search/main.inc:110
-msgid "Received after"
-msgstr "ÇÓÊáãÊ ÈÚÏ"
-
-#: templates/search/main.inc:90
-msgid "Received before"
-msgstr "ÇÓÊáãÊ ÞÈá"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "ÇÓÊáãÊ Ýí"
+
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "ÇÓÊáãÊ Ýí"
 
-#: templates/search/main.inc:70
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "ÇÓÊáãÊ Ýí"
 
-#: templates/message/navbar.inc:12
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "ÇÚÇÏÉ ÊæÌíå"
+
+#: templates/message/navbar_actions.inc:16
 msgid "Redirect"
 msgstr "ÇÚÇÏÉ ÊæÌíå"
 
-#: templates/compose/bounce.inc:37
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "ÇÚÇÏÉ ÊæÌíå ÑÓÇáÉ"
 
-#: compose.php:1046
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "ÇÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
 
-#: compose.php:726
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "ÍÞá ÇÚÇÏÉ ÇáÊæÌíå."
 
-#: templates/mailbox/header.inc:19
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "ÇäÚÇÔ"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "ÇäÚÇÔ ÚÑÖ ÇáãÌáÏÇÊ :"
 
-#: templates/folders/head.inc:6 templates/folders/head.inc:7
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "ÇÚÇÏÉ ÊÍãíá ÇáÚÑÖ"
+
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "ÇÚÇÏÉ ÊÍãíá ÇáÚÑÖ"
 
-#: config/prefs.php.dist:553
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "ÊÐßÑ ÂÎÑ ÚÑÖ"
 
-#: templates/compose/compose.inc:458
-msgid "Remove Selected"
-msgstr "ÅÒÇáÉ ÇáãÎÊÇÑ"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: templates/folders/actions.inc:6
-msgid "Rename Folder"
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "ÇÒÇáÉ ÇáãÕÏÑ"
+
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "ÇÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ"
 
-#: config/prefs.php.dist:439
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "ÇÚÇÏÉ ÊÓãíÉ ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ Ýí ÈÏÇíÉ ÇáÔåÑ¿"
 
-#: lib/Folder.php:379
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "ÇÚÇÏÉ ÊÓãíÉ \"%s\" Çáì \"%s\" ÍÞá. åÐÇ ãÇ ÞÇáå ÇáãÒæÏ "
 
-#: templates/compose/spelling.inc:96
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "ÇáÑÏ Úáì Çáßá"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "ÇÓÊÈÏáå ÈÜ :"
 
-#: templates/message/navbar.inc:9
+#: templates/message/navbar_actions.inc:8
 msgid "Reply"
 msgstr "ÇáÑÏ"
 
-#: templates/message/navbar.inc:10
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "ÇáÑÏ Úáì"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "ÇáÑÏ Úáì Çáßá"
 
-#: compose.php:610
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "ÇáÑÏ Úáì Çáßá :"
-#: compose.php:638
-msgid "Reply-To: "
+
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "ÇáÑÏ Úáì Çáßá"
+
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "ÇáÑÏ Úáì Çáßá :"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "ÇáÑÏ Úáì Çáßá"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "ÇáÑÏ Úáì :"
 
-#: templates/message/headers.inc:24
-msgid "Reply-to"
-msgstr "ÇáÑÏ Úáì"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "ÇáÑÏ Úáì :"
 
-#: compose.php:608
+#: compose.php:731
 msgid "Reply:"
 msgstr "ÇáÑÏ :"
 
-#: templates/message/navbar.inc:25
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "ÇÈáÛ Úä ÑÓÇáÉ ÛíÑ ãÑÛæÈÉ"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "ÇÈáÛ Úä ÑÓÇáÉ ÛíÑ ãÑÛæÈÉ"
 
-#: templates/compose/compose.inc:351
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "ÇØáÈ æÕá ÞÑÇÁÉ"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "ÇØáÈ æÕá ÞÑÇÁÉ"
 
-#: templates/filters/manage.inc:76 templates/contacts/contacts.inc:73
-#: templates/identities/manage.inc:112 templates/search/main.inc:22
-#: templates/search/main.inc:222
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "ÇÓÊÚÇÏÉ ÇáÇÝÊÑÇÖí"
 
-#: templates/message/navbar.inc:20
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "ÇÓÊÃäÝ"
 
-#: config/prefs.php.dist:378
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "ÈäíÉ ÇáÑÓÇáÉ"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr "ÇÑÌÚ Çáì ÚÑÖ ÕäÇÏíÞ ÇáÈÑíÏ ÈÚÏ ÇáÛÇÁ ÊÍæíá Çæ äÓÎ  ÑÓÇáÉ ¿"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "ÎíÇÑÇÊ"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "ÇÑÓá ÑÓÇáÉ"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
 msgstr ""
-"ÇÑÌÚ Çáì ÚÑÖ ÕäÇÏíÞ ÇáÈÑíÏ ÈÚÏ ÇáÛÇÁ ÊÍæíá Çæ äÓÎ  "
-"ÑÓÇáÉ ¿"
 
-#: templates/filters/manage.inc:4
-msgid "Rule Definition"
-msgstr "ÊÚÑíÝ ÞÇÚÏÉ"
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "ÇáãæÖæÚ"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "ÇÍÝÙ äÓÎÉ Ýí "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "ÍÝÙ ßÜ"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "ÍÝÙ ßÜ"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
-#: templates/compose/compose.inc:41 templates/compose/compose.inc:377
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "ÍÝÙ ãÓæÏÉ"
 
-#: templates/compose/compose.inc:330
-msgid "Save a copy in "
-msgstr "ÇÍÝÙ äÓÎÉ Ýí "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "ÍÝÙ ßÜ"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "ÍÝÙ ãÓæÏÉ"
 
-#: templates/message/navbar.inc:22
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "ÍÝÙ ßÜ"
 
-#: templates/identities/manage.inc:87
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "ÍÝÙ ÇáÑÓÇáÉ ÇáãÑÓáÉ"
 
-#: compose.php:950
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "ÍÝÙ ÍÞá ÇáãÓæÏÉ. åÐÇ ãÇ ÞÇáå ÇáãÒæÏ : %s "
 
-#: templates/search/main.inc:8 templates/menu/menu.inc:27
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "ÈÍË"
 
-#: lib/IMP.php:480
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "ÈÍË"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "äÊÇÆÌ ÇáÈÍË"
 
-#: templates/mailbox/navbar.inc:13 templates/mailbox/navbar.inc:30
-#: templates/mailbox/legend.inc:10
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "äÙÑ"
 
@@ -1455,546 +3566,1161 @@
 msgid "Select"
 msgstr "ÇÎÊÑ"
 
-#: config/prefs.php.dist:117
-msgid "Select addressbook sources for adding and searching for addresses."
-msgstr ""
-"ÇÎÊÄ ãÕÏÑ ÓÌá ÇáÚäÇæíä áÇÖÇÝÉ æÇáÈÍË  "
-"Ýí ÇáÚäÇæíä."
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "ÇÎÊÑ áÇ ÔíÁ"
 
-#: templates/search/main.inc:202
-msgid "Select all"
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "ÇÎÊÑ åæíå "
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
 msgstr "ÇÎÊÑ Çáßá"
 
-#: templates/identities/manage.inc:12
-msgid "Select an identity"
-msgstr "ÇÎÊÑ åæíå "
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "ÇÎÊÑ áÇ ÔíÁ"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
+msgstr "ÇÎÊÄ ãÕÏÑ ÓÌá ÇáÚäÇæíä áÇÖÇÝÉ æÇáÈÍË  Ýí ÇáÚäÇæíä."
+
+#: templates/search/main.inc:88
+msgid "Select all"
+msgstr "ÇÎÊÑ Çáßá"
 
-#: templates/message/navbar.inc:48
-msgid "Select charset:"
-msgstr "ÇÎÊÑ ÊÑãíÒ :"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "ÇÎÊÑ ÇáÊÑÊíÈ ÇáÐí ÊÑíÏ Çä íÊã ÇáÈÍË Èå ÚäÏ ÝÊÍ ÓÌáÇÊ ÇáÚäÇæíä. "
+
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "ÇÎÊÑ áÇ ÔíÁ"
 
-#: templates/search/main.inc:203
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "ÇÎÊÑ áÇ ÔíÁ"
 
-#: config/prefs.php.dist:281
-msgid "Select your preferred language:"
-msgstr "ÇÎÊÑ áÛÊß ÇáãÝÖáÉ :"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:275
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "ÓÌáÇÊ ÇáÚäÇæíä ÇáãÎÊÇÑÉ :"
 
-#: templates/compose/compose.inc:39 templates/compose/compose.inc:375
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "ãÚáæãÇÊ ÇáãÒæÏ"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "ÇÑÓá ÑÓÇáÉ"
 
-#: templates/identities/manage.inc:91
-msgid "Sent mail folder:"
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
 msgstr "ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ :"
 
-#: search.php:63
-msgid "September"
-msgstr "ÓÈÊãÈÑ"
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ :"
 
-#: templates/login/login.inc:85 templates/login/login.inc:91
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "ÇáãÒæÏ"
 
-#: config/prefs.php.dist:31
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "ãÚáæãÇÊ ÇáãÒæÏ"
 
-#: config/prefs.php.dist:61
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "ÖÈØ ÇáÃÝÖáíÉ áÑÓÇÆá ÇáÊÑÔíÍ ÇáÎÇÕÉ ÈÇáãÍÊæíÇÊ ÛíÑ ÇáãÑÛæÈÉ."
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
+msgstr "ÇáãÒæÏ"
 
-#: config/prefs.php.dist:68
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
+msgstr "ÖÈØ ÇáÇÏÇÁ áãÇ ÓíÍÏË ÚäÏãÇ ÊÞæã ÈäÞá Çæ ÇáÛÇÁ  ÇáÑÓÇÆá."
+
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
 msgstr ""
-"ÖÈØ ÇáÇÏÇÁ áãÇ ÓíÍÏË ÚäÏãÇ ÊÞæã ÈäÞá Çæ ÇáÛÇÁ  "
-"ÇáÑÓÇÆá."
 
-#: config/prefs.php.dist:46
-msgid "Set the current time zone."
-msgstr "ÖÈØ äØÇÞ ÇáÊæÞíÊ ÇáÍÇáí."
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "ãÌáÏÇÊ"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ :"
 
-#: config/prefs.php.dist:39
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "ÖÈØ áÛÉ ÇÌÒÇÁ ÇáÞæÇÆã ¡ ÇáÊæÖíÍÇÊ¡ æÇáãÓÇÚÏÉ."
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
 
 #: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
+
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "åá íÌÈ ÇÛáÇÞ äÇÝÐÉ ÇÑÓÇá ÇáÑÓÇÆá ÈÚÏ ÍÝÙ ÇáãÓæÏÇÊ ¿"
 
-#: mailbox.php:514
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Øí ÌãíÚ ÇáãÌáÏÇÊ"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "ÚÑÖ ÇáãáÛí"
 
-#: folders.php:274
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "ãÚáæãÇÊ ÔÎÕíÉ"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "ÇáÇÔÊÑÇß Ýí ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "ÚÑÖ ÛíÑ ÇáãÔÊÑß"
 
-#: config/prefs.php.dist:684
-msgid "Show last login time when logging in?"
-msgstr "ÇÙåÇÑ ÂÎÑ æÞÊ ÏÎæá ÚäÏ ÇáÏÎæá ¿"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-#: config/prefs.php.dist:580
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "ÅÙåÇÑ ÎáÝíÇÊ ÇËÊÇÁ ÚÑÖ ÕäÏæÞ ÇáÈÑíÏ ¿"
 
-#: templates/compose/compose.inc:434 templates/mailbox/message_headers.inc:33
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "ÍÌã"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "ÍÌã"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "ÍÌã"
 
-#: templates/index/notconfigured.inc:13
-msgid "Some of IMP's configuration files are missing:"
-msgstr "ÈÚÖ ãáÝÇÊ ÖæÇÈØ ÇáÂí Çã Èí ãÝÞæÏÉ :"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
 
-#: templates/mailbox/message_headers.inc:8
-#: templates/mailbox/message_headers.inc:12
 #: templates/mailbox/message_headers.inc:16
-#: templates/mailbox/message_headers.inc:22
+msgid "Sort by Date"
+msgstr ""
+
 #: templates/mailbox/message_headers.inc:26
-#: templates/mailbox/message_headers.inc:32
-msgid "Sort Direction"
-msgstr "ÅÊÌÇå ÇáÝÑÒ"
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "ãä ÇáÚäæÇä"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "ÍÌã ÇáÑÓÇáÉ"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "áÇ íæÌÏ ãæÖæÚ"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "ÓáÓáÉ"
+
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "ãä ÇáÚäæÇä"
 
-#: message.php:424
-msgid "Spam Report from"
-msgstr "ÊÞÑíÑ ÑÓÇÆá ÛíÑ ãÑÛæÈÉ ãä"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "ÓáÉ ÇáãåãáÇÊ :"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "ÑãæÒ ÎÇÕÉ"
 
-#: templates/compose/compose.inc:305
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "ÊÏÞíÞ ÅãáÇÆí"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "ãÏÞÞ ÇãáÇÆí"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "ÇáÇäÊåÇÁ ãä ÇáÊÏÞíÞ ÇáÇãáÇÆí"
 
-#: config/prefs.php.dist:542
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "ÚÏÏ ÇáÇÎØÇÁ ÇáÇãáÇÆíÉ áßá ÔÇÔÉ ÇËäÇÁ ÇáÊÏÞíÞ ÇáÇãáÇÆí."
 
-#: templates/search/main.inc:54 templates/compose/compose.inc:273
-#: templates/mailbox/message_headers.inc:24
-#: templates/mailbox/message_headers.inc:27 templates/message/headers.inc:28
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "ãÑÝÞ"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "ÇáãæÖæÚ"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "ÇáãæÖæÚ"
 
-#: config/prefs.php.dist:510
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "ÍÞá ÇáãæÖæÚ"
 
-#: templates/filters/manage.inc:16 filters.php:142
-msgid "Subject:"
-msgstr "ÇáãæÖæÚ :"
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "ÇáãæÖæÚ"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "ÇáÇÔÊÑÇß Ýí ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
 
-#: status.php:39
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "äÌÇÍ"
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "ãÞÊÑÍÇÊ"
 
-#: templates/filters/manage.inc:30
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "äÕ"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "äÕ"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:97
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Êã ÍÝÙ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "ÓæÝ íÊã ÊÛííÑ ÇÓãÇÁ ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÇáÍÇáíÉ \"%s\" Çáì \"%s\"."
 
-#: lib/Folder.php:307
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "ÇáãÌáÏ \"%s\" ãæÌæÏ ãÓÈÞÇ"
 
-#: lib/Folder.php:140
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
 "ÇáãÌáÏ \"%s\" íÌÊæí Úáì ÑãæÒ ÛíÑ ãÞÈæáÉ Ýí ÇÓãå. ÞÏ íÄÏí Ðáß Çáì ãÔÇßá "
-"ÇáÑÌÇÁ ãÑÇÌÚÉ ãÏíÑ ÇáäÙÇã"
-"."
+"ÇáÑÌÇÁ ãÑÇÌÚÉ ãÏíÑ ÇáäÙÇã."
 
-#: lib/Folder.php:320
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Êã ÇäÔÇÁ ÇáãÌáÏ \"%s\" æáßä áã íÊã ÇÔÑÇßß Èå."
 
-#: lib/Folder.php:273
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" æáßä áã íÊã ÇáÛÇÁ ÇÔÊÑÇßß Èå."
 
-#: lib/Folder.php:313
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "áã íÊã ÇäÔÇÁ ÇáãÌáÏ \"%s\" . åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
 
-#: lib/Folder.php:267
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "áã íÊã ÇáÛÇÁ ÇáãÌáÏ \"%s\" . åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ"
 
-#: lib/Folder.php:325
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Êã ÇäÔÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
 
-#: lib/Folder.php:276
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
 
-#: lib/Folder.php:376
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Êã ÇÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ \"%s\" Çáì \"%s\"."
 
-#: identities.php:132
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "%s ÝÇÑÛ ãÓÈÞÇ."
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
+msgstr "Êã ÇÛáÇÞ ÇáÑÓÇáÉ ÇáÌÇÑí ÇäÔÇÄåÇ.  ÌÇÑí ÇáÎÑæÌ."
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
 
-#: identities.php:125
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "Êã ÍÝÙ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
 
-#: templates/contacts/javascript.inc:72
-msgid "The message being composed has been closed.  Exiting."
-msgstr "Êã ÇÛáÇÞ ÇáÑÓÇáÉ ÇáÌÇÑí ÇäÔÇÄåÇ.  ÌÇÑí ÇáÎÑæÌ."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
 
-#: templates/compose/javascript.inc:140
-msgid "The signature couldn't be replaced."
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "ÊÚÐÑ ÊÛííÑ ÇáÊæÞíÚ."
 
-#: templates/compose/javascript.inc:138
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
 
-#: templates/mailbox/empty_mailbox.inc:4
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Êã ÍÝÙ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Êã ÇáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "ÇáÛÇÁ ÑÓÇáÉ"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "ÇÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "áÇ ÊæÌÏ ÑÓÇÆá Ýí ÕäÏæÞ ÇáÈÑíÏ."
 
-#: mailbox.php:218
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "åäÇáß ãÔßáÉ äÚØá %s. åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
 
-#: mailbox.php:227
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "åäÇáß ãÔßáÉ ÊÚØá ÕäÏæÞ ÇáÈÑíÏ. åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
-
-#: mailbox.php:333
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "åäÇáß ãÔßáÉ ÊÚØá ÕäÏæÞ ÇáÈÑíÏ. åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ : %s"
 
-#: compose.php:973
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"åäÇáß ãÔßáÉ ãÊÚáÞÉ ÈÊÍãíá ÇáãáÝ. ÞÏ íßæä ÍÌã ÇáãáÝ ÇßÈÑ ãä  "
-"ÇáÍÏ ÇáÇÚáì ÇáãÓãæÍ Èå æåæ (%d ãíÌÇÈÇíÊ)."
-
-#: compose.php:998
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"åäÇáß ãÔßáÉ ãÊÚáÞÉ ÈÊÍãíá ÇáãáÝ. ÞÏ íßæä ÍÌã ÇáãáÝ ÇßÈÑ ãä  "
-"ÇáÍÏ ÇáÇÚáì ÇáãÓãæÍ Èå."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "åäÇáß ãÔßáÉ ÊÚØá ÕäÏæÞ ÇáÈÑíÏ. åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
 
-#: lib/Message.php:123
-#, c-format
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
-msgstr ""
-"åäÇáß ÎØÇ Ýí äÓÎ ÇáÑÓÇÆá Çáì  \"%s\". åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ"
-""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "åäÇáß ÎØÇ Ýí äÓÎ ÇáÑÓÇÆá Çáì  \"%s\". åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ"
 
-#: lib/Message.php:225
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÇáÛÇÁ ÇáÑÓÇÆá ãä ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÇÝÇÏ "
-"Èå ÇáãÒæÏ"
+msgstr "åäÇáß ÎØÃ Ýí ÇáÛÇÁ ÇáÑÓÇÆá ãä ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ"
 
-#: lib/Message.php:300
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÇáÛÇÁ ÇáÑÓÇÆá Ýí ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÇÝÇÏ  "
-"Èå ÇáãÒæÏ"
+msgstr "åäÇáß ÎØÃ Ýí ÇáÛÇÁ ÇáÑÓÇÆá Ýí ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÇÝÇÏ  Èå ÇáãÒæÏ"
 
-#: lib/Message.php:255 lib/Message.php:263
-msgid "There was an error deleting messages. This is what the server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÇáÛÇÁ ÇáÑÓÇÆá. åÐÇ ãÇ ÇÝÇÏ "
-"Èå ÇáãÒæÏ "
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "åäÇáß ÎØÃ Ýí ÇáÛÇÁ ÇáÑÓÇÆá. åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
+
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
 
-#: lib/MIME/Viewer/text.php:29 lib/MIME/Viewer/enriched.php:48
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "åäÇáß ÎØÃ Ýí ÚÑÖ åÐÇ ÇáÌÒÁ ãä ÇáÑÓÇáÉ"
 
-#: lib/Message.php:362 lib/Message.php:377
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÊÚáíã ÇáÑÓÇÆá Ýí ÇáãÌáÏ \"%s\". åÐÇ ãÇ ÇÝÇÏ  "
-"Èå ÇáãÒæÏ "
+msgstr "åäÇáß ÎØÃ Ýí ÊÚáíã ÇáÑÓÇÆá Ýí ÇáãÌáÏ \"%s\". åÐÇ ãÇ ÇÝÇÏ  Èå ÇáãÒæÏ "
 
-#: lib/Message.php:385
-msgid "There was an error flagging messages. This is what the server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÊÚáíã ÇáÑÓÇÆá. åÐÇ ãÇ ÇÝÇÏ  "
-"Èå ÇáãÒæÏ "
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "ÎØÃ Ýí ÍÝÙ ãÓæÏÉ."
+
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
 
-#: lib/Message.php:119
-#, c-format
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "åäÇáß ÎØÃ Ýí ÇÑÓÇá ÑÓÇáÊß : %s"
+
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "åäÇáß ÎØÃ Ýí äÞá ÇáÑÓÇÆá Çáì  \"%s\". åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
+
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "åäÇáß ÎØÃ Ýí ÚÑÖ åÐÇ ÇáÌÒÁ ãä ÇáÑÓÇáÉ"
+
+#: compose.php:1006
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr "åäÇáß ÎØÃ Ýí ÇÑÓÇá ÑÓÇáÊß : %s"
+
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "åäÇáß ÎØÃ Ýí ÇÑÓÇá ÑÓÇáÊß : %s"
+
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "åäÇáß ÎØÃ Ýí ÚÑÖ åÐÇ ÇáÌÒÁ ãä ÇáÑÓÇáÉ"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
 msgstr ""
-"åäÇáß ÎØÃ Ýí äÞá ÇáÑÓÇÆá Çáì  \"%s\". åÐÇ ãÇ ÇÝÇÏ "
-"Èå ÇáãÒæÏ "
 
-#: lib/Message.php:219 lib/Message.php:249
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
 msgstr ""
-"åäÇáß ÎØÃ Ýí äÞá ÇáÑÓÇÆá Çáì ÓáÉ ÇáãåãáÇÊ. "
-"åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
 
-#: compose.php:966
-msgid "There was an error saving a draft."
-msgstr "ÎØÃ Ýí ÍÝÙ ãÓæÏÉ."
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
 
-#: compose.php:886
-#, c-format
-msgid "There was an error sending your message: %s"
-msgstr "åäÇáß ÎØÃ Ýí ÇÑÓÇá ÑÓÇáÊß : %s"
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
 
-#: lib/Message.php:313
-msgid "There was an error undeleting messages. This is what the server said"
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
 msgstr ""
-"åäÇáß ÎØÃ- ÇáÊÑÇÌÚ Úä ÇáÛÇÁ ÇáÑÓÇÆá.   "
-"åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ"
 
-#: mailbox.php:151
-msgid "There was an error viewing the requested message."
-msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "ÞÏ íÓÊÛÑÞ åÐÇ ÈÚÖ ÇáæÞÊ.  åá ÇäÊ ãÊÇßÏ ãä ÑÛÈÊß Ýí ÇáÇÓÊãÑÇÑ¿"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
-#: templates/index/notconfigured.inc:32
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr ""
-"åÐÇ ÇáãáÝ íÊÍßã ÈÓæÇÞÇÊ ÇáÇã Âí Çã Åí ááÅí Çã Èí ¡ ÈÇáÖÈØ Çí äæÚ ãä  "
-"ÇáãÑÝÞÇÊ íãßä ÚÑÖå æ/Ãæ ÊÍãíáå."
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "%s áÇ íÙåÑ Çäå ÚäæÇä ÈÑíÏí ÕÇáÍ."
 
-#: templates/index/notconfigured.inc:39
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
 msgstr ""
-"åÐÇ ÇáãáÝ íÊÍßã Ýí ÇáÎíÇÑÇÊ ÇáÇÝÊÑÇÖíÉ ááÂí Çã Èí ¡ æíÊÍßã ÇíÖÇ ÈÇí ÎíÇÑÇÊ íãßä ááãÓÊÎÏã ÊÚÏíáåÇ "
-""
 
-#: templates/index/notconfigured.inc:46
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
-"åÐÇ ÇáãáÝ íÊÍßã Ýí ÇáÎíÇÑÇÊ ÇáÇÝÊÑÇÖíÉ ááÂí Çã Èí ¡ æíÚÑÝ ÇíÖÇ ÞÇÆãÉ  "
-"ÇáãÒæÏÇÊ ÇáãÊæÝÑÉ ÇÐÇ ßäÊ ÊÓÊÎÏã ÞÇÆãÉ ãÒæÏÇÊ."
 
-#: templates/index/notconfigured.inc:25
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
 msgstr ""
-"íÊÍßã åÐÇ ÇáãáÝ Ýí ÔÑÍÉ ÇáÓãÇÊ ÇáÊí ÊÓÊÎÏã áÖÈØ ÇáÇáæÇä æÇáÎØæØ ÈÇáÇÖÇÝÉ Çáì"
-" Çæ ÊÌÇåá ÇáÎíÇÑÇÊ ÇáÇÓÇÓíÉ áåæÑÏ."
 
-#: templates/index/notconfigured.inc:18
-msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
-"åÐÇ åæ ÇáãáÝ ÇáÑÆíÓí áÖæÇÈØ ÇáÂí Çãæ Èí .ÇäåÇ ÊÍæí ÇáãÓÇÑÇÊ  "
-"æÇáÎíÇÑÇÊ áÇßæÇÏ ÇáÂí Çã Èí."
 
-#: templates/folders/javascript.inc:7
-msgid "This may take some time. Are you sure you want to continue?"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
 msgstr ""
-"ÞÏ íÓÊÛÑÞ åÐÇ ÈÚÖ ÇáæÞÊ.  "
-"åá ÇäÊ ãÊÇßÏ ãä ÑÛÈÊß Ýí ÇáÇÓÊãÑÇÑ¿"
 
-#: message.php:435
-msgid "This message has been reported as spam to your system administrator."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
 msgstr ""
-"Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Çáì ãÏíÑ ÇáäÙÇã."
 
-#: message.php:457
+#: message.php:211
 msgid "This message to"
 msgstr "åÐå ÇáÑÓÇáÉ Çáì"
 
-#: prefs.php:105
-msgid "This number must be at least one."
-msgstr "íÌÈ Çä íßæä åÐÇ ÇáÑÞã æÇÍÏ Úáì ÇáÇÞá."
-
-#: prefs.php:103
-msgid "This value must be a number."
-msgstr "íÌÈ Çä Êßæä ÇáÞíãÉ ÚÈÇÑÉ Úä ÑÞã."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-#: templates/contacts/javascript.inc:78
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "íÌÈ äÏÇÁ åÐå ÇáäÇÝÐÉ ãä äÇÝÐÉ ÇäÔÇÁ ÇáÑÓÇÆá"
 
-#: templates/mailbox/message_headers.inc:23
-#: templates/mailbox/message_headers.inc:28
-msgid "Thread"
-msgstr "ÓáÓáÉ"
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "ÚÜÑÖ"
 
-#: config/prefs.php.dist:512
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "ÚÑÖ ÊÓáÓáí"
 
-#: config/prefs.php.dist:45
-msgid "Time Zone"
-msgstr "äØÇÞ ÇáÊæÞíÊ"
-
-#: templates/search/main.inc:38 templates/compose/compose.inc:106
-#: templates/compose/bounce.inc:28 templates/message/headers.inc:12
-#: mailbox.php:673
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Çáì"
 
-#: templates/filters/manage.inc:13 filters.php:139
-msgid "To:"
-msgstr "Çáì :"
-
-#: templates/compose/compose.inc:459
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "ãÌãæÚ ÇáÍÌã : %s ß È"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "ãä ÇáÚäæÇä"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "ãÑÝÞÇÊ"
+
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "ÓáÉ ÇáãåãáÇÊ :"
 
 #: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "ÓáÉ ÇáãåãáÇÊ :"
 
-#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "áã íÑÏ ÚáíåÇ"
 
-#: templates/search/main.inc:157
+#: templates/search/main.inc:35
 msgid "Unanswered messages"
 msgstr "ÑÓÇÆá áã íÊã ÇáÑÏ ÚáíåÇ"
 
-#: templates/mailbox/actions.inc:13 templates/message/navbar.inc:5
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "ÊÑÇÌÚ Úä ÇáÇáÛÇÁ"
 
-#: mailbox.php:671 message.php:101
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "ãÓÊáãíä ãÎÝííä"
 
-#: identities.php:74 identities.php:75
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "ãÓÊáãíä ãÎÝííä"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
+
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "áã ÊÓãì"
 
-#: config/conf.php.dist:130
-msgid "Unread"
-msgstr "áã ÊÞÑÃ"
-
-#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "áã ÊÑì"
 
-#: templates/folders/actions.inc:32
-msgid "Unseen Messages"
-msgstr "ÑÓÇÆá áã ÊÑì"
-
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "ÇáÛÇÁ ÇáÇÔÊÑÇß ãä ãÌáÏ (ãÌáÏÇÊ)"
 
-#: templates/prefs/sourceselect.inc:288
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "ÇÓÊÎÏã ÒÑ ÊÍßã/ÇÎÊíÇÑ+ÇáäÞÑ áÇÎÊíÇÑ ÍÞæá ãÊÚÏÏÉ"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
-#: templates/identities/manage.inc:94
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "ÇÓÊÎÏã ÇáÞíãÉ ÇáÇÝÊÑÇÖíÉ"
 
-#: config/prefs.php.dist:265
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "ÇÓÊÎÏã ÇÔÊÑÇßÇÊ ãÌáÏ Âí Çã Ãí Èí¿"
 
-#: prefs.php:285
-msgid "User Options"
-msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "ÇÓã ÇáãÓÊÎÏã"
 
-#: templates/login/login.inc:69
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "ÇÓã ÇáãÓÊÎÏã"
 
-#: lib/MIME/Viewer/text.php:110 lib/MIME/Viewer/enriched.php:184
-#: lib/IMP.php:1043
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "ÇÓã ÇáãÓÊÎÏã"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "ÚÑÖ %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "ÚÑÖ %s"
 
-#: folders.php:350
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "ÇÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "ÓáÓáÉ"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "ÇÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "ÇÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "ÚÑÖ ÇáÑÓÇÆá Ýí "
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "ãÙåÑ Çæ ÕäÏæÞ ÈÑíÏ ááÇÙåÇÑ ÈÚÏ ÇáÏÎæá :"
 
-#: templates/message/navbar.inc:50
-msgid "WIN charset"
-msgstr "ÊÑãíÒ ÇáæíäÏæÒ"
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "ÚÑÖ %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "ÚÑÖ ÇáÑÓÇÆá Ýí "
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "ÅäÔÇÁ ãÌáÏ"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
 
-#: status.php:43
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "ÊÍÐíÑ"
 
-#: templates/login/login.inc:63 login.php:164
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "ãÑÍÈÇ Èß Ýí %s"
 
-#: config/prefs.php.dist:389
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -2002,41 +4728,100 @@
 "ÚäÏ ÇáÛÇÁ ÑÓÇÆá ¡ Þã ÈäÞáåÇ Çáì ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÈÏáÇ ãä ÊÚáíãåä ßÑÓÇÆá "
 "ãáÛíÉ ¿"
 
-#: config/prefs.php.dist:612
-msgid "Wrap text at this many characters."
-msgstr "ÞíÏ ÇáäÕ ÈåÐÇ Çáßã ãä ÇáÍÑæÝ."
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
-#: config/prefs.php.dist:552
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "äÚã"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Çäß ÊÍÇæá ÇáÛÇÁ ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Çäß ÊÍÇæá ÇáÛÇÁ ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Çäß ÊÍÇæá ÇáÛÇÁ ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
 
-#: templates/mailbox/javascript.inc:81
-#: templates/message/javascript.inc:14
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Çäß ÊäÓÎ/ÊäÞá Çáì ãÌáÏ ÌÏíÏ."
 
-#: templates/folders/javascript.inc:98
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Çäß ÊÖíÝ ãÌáÏ ÝÑÚí Çáì "
 
-#: templates/folders/javascript.inc:100
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Çäß ÊäÔíÁ ãÌáÏ ÇÓÇÓí."
 
-#: templates/folders/javascript.inc:135
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Çäß ÊäÔíÁ ãÌáÏ ÇÓÇÓí."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Çäß ÊÚíÏ ÊÓãíÉ ÇáãÌáÏ : "
 
-#: identities.php:84
-msgid "You can not have the '\\' character in your full name."
-msgstr "áÇ íãßäß ÇÓÊÎÏÇã ÇáÑãÒ '\\' Ýí ÇÓãß ÇáßÇãá."
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Êã ÇáÛÇÁ ÇÔÊÑÇßß ÈäÌÇÍ ãä \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
 
 #: templates/mailbox/alert.inc:3
-#, c-format
+#, php-format
 msgid "You have %s new messages."
 msgstr "ÊæÌÏ áÏíß %s ÑÓÇáÉ ÌÏíÏÉ."
 
@@ -2044,219 +4829,387 @@
 msgid "You have 1 new message."
 msgstr "áÏíß ÑÓÇáÉ æÇÍÏÉ ÌÏíÏÉ."
 
-#: login.php:21
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "áÞÏ Êã ÇÎÑÇÌß .<br />äÔßÑß Úáì ÇÓÊÎÏÇãß ÇáäÙÇã."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "áÏíß ÑÓÇáÉ æÇÍÏÉ ÌÏíÏÉ."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
-#: templates/folders/confirm.inc:3
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "áÏíß ÈÑíÏ ÌÏíÏ Ýí ÇáãÌáÏ ÇáÊÇáí :"
 
-#: templates/folders/alert.inc:3
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "áÏíß ÈÑíÏ ÌÏíÏ Ýí ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
 
-#: templates/compose/javascript.inc:35
-msgid "You must first select the attachment(s) to delete."
-msgstr "íÌÈ Çä ÊÎÊÇÑ ÇáãÑÝÞÇÊ ÇáãÑÇÏ ÇáÛÇÄåÇ ÇæáÇ."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "íÌÈ Çä íßæä áÏíß ãÓÊÞÈá æÇÍÏ Úáì  ÇáÇÞá."
 
-#: templates/compose/javascript.inc:10
-msgid "You must first specify the file to attach."
-msgstr "íÌÈ ÇæáÇ ÊÍÏíÏ ÇáãáÝ ÇáãÑÇÏ ÇáÑÝÇÞå."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-#: compose.php:738
-msgid "You must have at least one recipient."
-msgstr "íÌÈ Çä íßæä áÏíß ãÓÊÞÈá æÇÍÏ Úáì  ÇáÇÞá."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
-#: templates/mailbox/javascript.inc:90
-#: templates/message/javascript.inc:23
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "íÌÈ Çä ÊÎÊÇÑ ÕäÏæÞ ÇáÈÑíÏ ÇáåÏÝ ÇæáÇ."
 
-#: templates/contacts/javascript.inc:56
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "íÌÈ Çä ÊÎÊÇÑ åæíÉ áíÊã ÇáÛÇÄåÇ."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "íÌÈ Çä ÊÎÊÇÑ ÚäæÇä ÇæáÇ."
 
-#: identities.php:134
-msgid "You must select an identity to be deleted."
-msgstr "íÌÈ Çä ÊÎÊÇÑ åæíÉ áíÊã ÇáÛÇÄåÇ."
-
-#: templates/mailbox/javascript.inc:21
-#: templates/mailbox/javascript.inc:97
-#: templates/mailbox/javascript.inc:108
-#: templates/mailbox/javascript.inc:155
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "íÌÈ Çä ÊÎÊÇÑ ÑÓÇáÉ æÇÍÏÉ Úáì ÇáÇÞá."
 
-#: templates/compose/bounce.inc:6
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "íÌÈ ÊÍÏíÏ ãÓÊáã."
 
-#: lib/Folder.php:403
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "íÌÈ ÇæáÇ ÊÍÏíÏ ÇáãáÝ ÇáãÑÇÏ ÇáÑÝÇÞå."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "ÇÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "ÇÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "áã Êßä ãÔÊÑßÇ ÈÜ \"%s\". åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
 
-#: lib/Folder.php:437
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "áã íÊã ÇáÛÇÁ ÇÔÊÑÇßß ãä  \"%s\".  åÐÇ ãÇ ÇÝÇÏ Èå ÇáãÒæÏ "
 
-#: lib/Folder.php:407
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Êã ÇÔÑÇßß ÈäÌÇÍ Ýí  \"%s\""
 
-#: lib/Folder.php:441
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Êã ÇáÛÇÁ ÇÔÊÑÇßß ÈäÌÇÍ ãä \"%s\""
 
-#: login.php:20
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr " ÌáÓÊ Úãáß %s ÇäÊåÊ. íÑÌì ÇáÏÎæá ãÑÉ ÇÎÑì."
-
-#: templates/identities/manage.inc:59
-msgid "Your From: address:"
-msgstr "ÇáÚäæÇä :  ãä :"
-
-#: config/prefs.php.dist:23 config/prefs.php.dist:30 config/prefs.php.dist:37
-#: config/prefs.php.dist:44
-msgid "Your Information"
-msgstr "ãÚáæãÇÊß"
-
-#: templates/identities/manage.inc:64
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "ÚäæÇä : ÇáÑÏ Çáì : <i>(ÇÎÊíÇÑí)</i>"
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "ÇÓãß ÇáßÇãá :"
 
-#: lib/MIME/Viewer/images.php:52
-msgid "Your browser does not support inline display of this image type"
-msgstr "áÇ íÏÚã ãÊÕÝÍß ÇáÚÑÖ ÇáÏÇÎáí áåÐÇ ÇáäæÚ ãä ÇáÕæÑ"
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
 msgstr ""
-"áÇ íÏÚã ãÊÕÝÍß ÎíÇÑ ÇáØÈÇÚÉ åÐÇ ÇÖÛØ ÒÑ  ÊÍßã + ÇáÍÑÝ Èí áßí  "
-"ÊÞæã ÈÇáØÈÇÚÉ."
 
-#: config/prefs.php.dist:297
-msgid "Your current time zone:"
-msgstr "äØÇÞ ÊæÞíÊß ÇáÍÇáí :"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "ÇÓãß ÇáßÇãá :"
 
-#: templates/prefs/identityselect.inc:14
-msgid "Your default identity:"
-msgstr "åæíÊß ÇáÇÎÊíÇÑíÉ :"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "ÚäæÇä : ÇáÑÏ Çáì : <i>(ÇÎÊíÇÑí)</i>"
 
-#: templates/identities/manage.inc:54
-msgid "Your full name:"
-msgstr "ÇÓãß ÇáßÇãá :"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
 
-#: templates/identities/manage.inc:10
-msgid "Your identities:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
 msgstr "åæíÇÊß :"
 
-#: prefs.php:253
-msgid "Your options have been updated."
-msgstr "Êã ÊÚÏíá ÎíÇÑÇÊß."
-
-#: templates/compose/javascript.inc:170
+#: config/prefs.php.dist:173
 msgid ""
-"Your session will expire in 1 minute. Do you want to reload the page to "
-"prevent losing your work?"
-msgstr "ÌáÓÊ Úãáß ÓæÝ ÊäÊåí ÎáÇá ÏÞíÞÉ æÇÍÏÉ. åá ÊÑíÏ ÇÚÇÏÉ ÊÍãíá ÇáÕÝÍÉ áÊÊÌäÈ  "
-"ÝÞÏÇä Úãáß ÇáÍÇáí ¿"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-#: templates/compose/javascript.inc:168
-msgid ""
-"Your session will expire in 5 minutes. Do you want to reload the page to "
-"prevent losing your work?"
-msgstr "ÌáÓÊ Úãáß ÓæÝ ÊäÊåí ÎáÇá 5 ÏÞÇÆÞ. åá ÊÑíÏ ÇÚÇÏÉ ÊÍãíá ÇáÕÝÍÉ áÊÊÌäÈ  "
-"ÝÞÏÇä Úãáß ÇáÍÇáí ¿"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr "áÇ íÏÚã ãÊÕÝÍß ÇáÚÑÖ ÇáÏÇÎáí áåÐÇ ÇáäæÚ ãä ÇáÕæÑ"
+
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Êã ÇáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
 
-#: templates/identities/manage.inc:69
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "ÊæÞíÚß :"
 
-#: lib/IMP.php:1190 lib/IMP.php:1192 lib/IMP.php:1203 message.php:510
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[áÇ íæÌÏ ãæÖæÚ]"
 
-#: templates/prefs/sourceselect.inc:269
-msgid "add source"
-msgstr "ÇÖÝ ÇáãÕÏÑ"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "ãÑÝÞ ãÎÝí"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
 
-#: filters.php:120
-msgid "cannot move past the beginning"
-msgstr "áÇ íãßä ÇáÚæÏÉ Çáì ÇáÈÏÇíÉ"
-
-#: filters.php:103
-msgid "cannot move past the end"
-msgstr "áÇ íãßä ÇáÚæÏÉ Çáì ÇáäåÇíÉ"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "äÓÎÉ"
 
-#: templates/filters/manage.inc:56
-msgid "delete message"
-msgstr "ÇáÛÇÁ ÑÓÇáÉ"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "ÇáÛÇÁ"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "ãÌáÏÇÊ"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "åæíÉ"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "ÎÑæÌ"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "ãßæäÇÊ ÇáÑÓÇáÉ"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "ØÈÇÚÉ"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
 
-#: templates/contacts/contacts.inc:21
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "ÇäÚÇÔ"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "ÇáÑÏ"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "ÈÍË"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "ÇÑÓá ÑÓÇáÉ"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "ÓáÓáÉ"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Çáì"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "ÊÑÇÌÚ Úä ÇáÇáÛÇÁ"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "ÓáÓáÉ"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "ãÑÝÞ"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "ãÑÝÞÇÊ"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "ãä"
 
-#: templates/prefs/sourceselect.inc:282
-msgid "move down"
-msgstr "ÇäÊÞá Çáì ÇáÇÓÝá"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-#: templates/filters/manage.inc:58
-msgid "move message to"
-msgstr "ÇäÞá ÇáÑÓÇÆá Çáì"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:280
-msgid "move up"
-msgstr "ÇäÊÞá Çáì ÇáÇÚáì"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-#: filters.php:45 filters.php:68
-msgid "no folder selected"
-msgstr "áã íÊã ÇÎÊíÇÑ ãÌáÏ"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
+
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: filters.php:79 filters.php:90 filters.php:107 filters.php:124
-msgid "no rule selected"
-msgstr "áã íÊã ÇÎÊíÇÑ ÞÇÚÏÉ"
-
-#: filters.php:75
-msgid "no text specified"
-msgstr "áã íÊã ÊÍÏíÏ äÕ"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "ÇáÇÓã"
 
-#: templates/compose/spelling.inc:64 templates/filters/list.inc:25
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "áÇ ÔíÁ"
 
-#: templates/compose/spelling.inc:94 filters.php:151
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "Ãæ"
 
-#: filters.php:53
-msgid "please fill in the text and choose a field and an action"
-msgstr "íÑÌì ÊÚÈÆÉ ÇáäÕ æÇÎÊÑ ÍÞá æÇÌÑÇÁ"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:271
-msgid "remove source"
-msgstr "ÇÒÇáÉ ÇáãÕÏÑ"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-#: filters.php:158
-msgid "select folder"
-msgstr "ÇÎÊÑ ãÌáÏ"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ÎØÃ ÇãáÇÆí"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ÇÎØÇÁ ÇãáÇÆíÉ"
 
-#: templates/filters/list.inc:42
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "ÈíäãÇ ÇáÍÞá  %s íÍÊæí <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "ÎØÃ ÇãáÇÆí"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/locale/en_US/help.xml
+++ mod/locale/en_US/help.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0'?>
-<!-- $Horde: imp/locale/en_US/help.xml,v 1.53.6.2 2005/03/01 16:26:44 jan Exp $ -->
+<!-- $Horde: imp/locale/en_US/help.xml,v 1.53.6.9 2006/03/30 10:15:31 selsky Exp $ -->
 <help>
 
 <entry id="compose-buttons">
     <title>Message Composition: Actions</title>
     <heading>Actions</heading>
     <para>
-    &quot;Send Message&quot; transmits your email message to the intended recipient(s). Make sure you do want to send your message as this action is final and can not be reversed.
+    &quot;Send Message&quot; transmits your email message to the intended recipient(s). Make sure you do want to send your message as this action is final and cannot be reversed.
     </para>
     <para>
     &quot;Save Draft&quot; places an unfinished message in a folder called &quot;Drafts&quot; accessible through the folder drop-down box at the top-right of your screen. You can then finish the message later by switching to the &quot;Drafts&quot; folder, clicking on the saved message to open it, and then clicking on &quot;Resume&quot;. Be sure to put a subject on the email before you save the draft so that you can easily identify which message you want within the Drafts folder.
@@ -101,8 +101,6 @@
     </para>
     <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
     </para>
-    <para>Step 3: Click the &quot;Attach&quot; button. The file name and size will be added to your list of Attachments.
-    </para>
     <tip>
     Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
     </tip>
@@ -161,6 +159,13 @@
     </para>
 </entry>
 
+<entry id="compose-link-attachments">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments cannot be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
+
 <entry id="search">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -638,6 +643,13 @@
 
 </entry>
 
+<entry id="prefs-default_msg_charset">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select &quot;Default&quot; to use the MIME defaults.
+    </para>
+</entry>
+
 <entry id="prefs-disposition_request_read">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -659,6 +671,22 @@
     </para>
 </entry>
 
+<entry id="prefs-delete_spam_after_report">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
+
 <entry id="prefs-html_image_replacement">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -692,4 +720,18 @@
      <para>* &quot;Never save attachments&quot; - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
 
+<entry id="virtual_inbox">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+
+<entry id="virtual_trash">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
+
 </help>


--- orig/recompose.php
+++ mod/recompose.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: imp/recompose.php,v 2.13.10.4 2005/07/20 19:31:20 selsky Exp $
+ * $Horde: imp/recompose.php,v 2.13.10.7 2006/01/01 21:28:52 jan Exp $
  *
- * Copyright 2003-2005 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 2003-2006 Charles J. Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -29,7 +29,6 @@
 $authentication = 'none';
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Session.php';
-require_once 'Horde/Menu.php';
 require IMP_BASE . '/config/servers.php';
 
 // If we somehow get to this page with a valid session, go immediately
@@ -100,6 +99,7 @@
 require IMP_TEMPLATES . '/common-header.inc';
 if (Auth::getProvider() == 'imp' || Auth::getAuth()) {
     $autologin = false;
+    require_once 'Horde/Menu.php';
     require IMP_TEMPLATES . '/login/login.inc';
 }
 require IMP_TEMPLATES . '/compose/recompose.inc';


--- orig/po/cs_CZ.po
+++ mod/po/cs_CZ.po
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0-cvs\n"
+"Project-Id-Version: IMP 4.0.3\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-12-22 10:04-0800\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date:  2001-07-26 14:56-0900\n"
-"Last-Translator: Pavel Chytil <pavel at chytil.tk>\n"
+"Last-Translator: Milos Wimmer <wimmer at zcu.cz>\n"
 "Language-Team: Czech <dev at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -17,171 +17,171 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Komu: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Komu: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Datum: "
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    Od: "
 
-#: mailbox.php:383
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
-msgstr " (Pøístupový Klíè %s)"
+msgstr " (Pøístupový klíè %s)"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Pøedmìt: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " v "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
-msgstr "èíslo"
+msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:180
-#, php-format
-msgid "%d message(s) have been deleted."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "®ádné zprávy"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
 msgstr "%d zpráv(a) bylo(a) vymazáno(a)."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
-"%d zpráv bylo nahlá¹eno Va¹emu systémovému adminstrátorovi jako chtìné "
+"%d zpráv bylo nahlá¹eno Va¹emu systémovému administrátorovi jako chtìné "
 "zprávy (ham)."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d zpráv bylo nahlá¹eno jako chtìné zprávy (ham)."
 
-#: lib/Spam.php:161
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
-"%d zpráv bylo nahlá¹eno Va¹emu systémovému adminstrátorovi jako nechtìné "
+"%d zpráv bylo nahlá¹eno Va¹emu systémovému administrátorovi jako nechtìné "
 "zprávy (spam)."
 
-#: lib/Spam.php:141
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d zpráv bylo nahlá¹eno jako nechtìné zprávy (spam)."
 
-#: mailbox.php:352
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
-msgstr "%d a¾ %d z %d Zpráv"
+msgstr "%d a¾ %d z %d zpráv"
 
-#: mailbox.php:591
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP Administrace"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME Administrace"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
-msgstr "%s u¾ existuje. Schránka %s nebyla pøejmenována."
+msgstr "%s u¾ existuje. Slo¾ka %s nebyla pøejmenována."
 
-#: lib/Message.php:643
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
-msgstr "%s není platná scránka."
+msgstr "%s není platná schránka."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
-msgstr "Na zaèátku mìsíce bude schránka %s pøejmenována."
+msgstr "Na zaèátku mìsíce bude slo¾ka %s pøejmenována."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr "%s pøijal(a)."
 
-#: lib/MIME/Viewer/itip.php:603
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
 msgstr "%s zru¹il(a) %s."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
 msgstr "%s odmítnul(a)."
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s odpovìdìl(a) na ¾ádost free/busy."
 
-#: lib/MIME/Viewer/itip.php:583
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s odpovìdìl(a) na pozvánku k %s."
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s zaslal(a) informaci o free/busy."
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s pøedbì¾nì pøijal(a)."
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s ¾ádá o informaci o free/busy."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s ¾ádá o Va¹i úèast na %s."
 
-#: lib/Message.php:398
-#, php-format
-msgid "%s was successfully added to %s."
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
 msgstr "%s byl(a) úspì¹nì pøidán(a) do %s."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr "%s si pøeje úpravu %s."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr "%s si pøeje Vás upozornit na %s."
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr "%s si pøeje obdr¾et aktuální informace o %s."
 
-#: message.php:278 message.php:283
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -191,85 +191,95 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;z&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aktivovat zmìny a pøesunout se na dal¹í stránku.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr ""
-"(Zru¹it v¹echny zmìny a pøesunout se na stránku, kde se vytváøí nový email.)"
+"(Zru¹it v¹echny zmìny a pøesunout se na stránku, kde se vytváøí nová zpráva.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+#, fuzzy
+msgid "(HTML)"
+msgstr "HTML"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Pøesuò se na stránku, kde se vytváøí nový email poté co se aktualizují "
-"v¹echny dosavadní zmìny.  Zmìny na souèasné stranì NEBUDOU aplikovány.)"
+"(Pøesuò se na stránku, kde se vytváøí nová zpráva poté co se aktualizují "
+"v¹echny dosavadní zmìny.  Zmìny na souèasné stránce NEBUDOU pou¾ity.)"
 
-#: spelling.php:274
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
 msgstr ""
 "(Poslat zprávu po aktivování v¹echny dosavadních zmìn. Zmìny na souèasné "
-"stranì NEBUDOU aplikovány.)"
+"stránce NEBUDOU pou¾ity.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Pøidat tyto kliknutím na OK *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Prosím vyberte emailovou(é) adresu(y) *"
 
-#: lib/Spam.php:171
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Zpráva byla vymazána."
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
-"1 zpráva byla nahlá¹ena Va¹emu systémovému adminstrátorovi jako chtìná "
+"1 zpráva byla nahlá¹ena Va¹emu systémovému administrátorovi jako chtìná "
 "zpráva (ham)."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
 msgstr "1 zpráva byla nahlá¹ena jako chtìná zpráva (ham)."
 
-#: lib/Spam.php:163
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr ""
-"1 zpráva byla nahlá¹ena Va¹emu systémovému adminstrátorovi jako nechtìná "
+"1 zpráva byla nahlá¹ena Va¹emu systémovému administrátorovi jako nechtìná "
 "zpráva (spam)."
 
-#: lib/Spam.php:143
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
 msgstr "1 zpráva byla nahlá¹ena jako nechtìná zpráva (spam)."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100 znakù"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000 znakù"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250 znakù"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500 znakù"
 
-#: lib/MIME/Viewer/itip.php:61
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>Data v kalendáøi jsou neplatná</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
-msgstr "Zpráva obsahuje velkou pøílohu ve formì velkého obrázku s názvem %s."
+msgstr "Zpráva obsahuje pøílohu ve formì velkého obrázku s názvem %s."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -279,120 +289,124 @@
 msgid "AND"
 msgstr "A"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr "Pøijmout po¾adavek"
 
-#: lib/MIME/Viewer/itip.php:739
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "Událost byla pøidána do Va¹eho kalendáøe."
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
-msgstr "Pøijmuto"
+msgstr "Pøijato"
 
-#: lib/IMP.php:895 lib/IMP.php:897
-msgid "Acco_unts"
-msgstr "Úè_ty"
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr "Pøijato:"
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
-msgstr "Název Úètu:"
+msgstr "Název úètu:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:716
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
-msgstr "Úkony"
+msgstr "Akce"
+
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Vlo¾it do adresáøe (%s)"
 
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Pøidat zdroj"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr "Pøidat tuto polo¾ku do kalendáøe"
 
-#: lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Vlo¾it do Kontaktù (%s)"
-
-#: compose.php:1141
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Pøidat \"%s\" jako pøílohu."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "Zobrazit dal¹í hlavièky pøi prohlí¾ení: <i>(nepovinné, vlo¾it ka¾dou "
 "hlavièku na nový øádek)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Dal¹í informace mohou být zobrazeny %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Dal¹í informaèní detaily"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Dal¹í detaily o zprávì"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Dal¹í detaily o zprávì mohou být zobrazeny %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
-msgstr "Dal¹í detaily o chybové hlá¹ení"
+msgstr "Dal¹í detaily o chybovém hlá¹ení"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
-msgstr "Dal¹í detaily o chybové hlá¹ení mohou být zobrazeny %s."
+msgstr "Dal¹í detaily o chybovém hlá¹ení mohou být zobrazeny %s."
 
-#: contacts.php:95 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
-msgstr "Kontakty"
+msgstr "Adresáø"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
-msgstr "Kontakty"
+msgstr "Adresáøe"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Emailové adresy pro BCC pro v¹echny zprávy: <i>(nepovinné, vlo¾it ka¾dou "
+"Emailové adresy pro Bcc pro v¹echny zprávy: <i>(nepovinné, vlo¾it ka¾dou "
 "hlavièku na nový øádek)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Emailové adresy patøící této identitì: <i>(nepovinné, vlo¾it ka¾dou hlavièku "
 "na nový øádek)</i>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "V¹e"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "V¹echny zprávy ve slo¾ce(kách) budou ztraceny!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "V¹echny zprávy v následující slo¾ce budou pøemístìny do jednoho MBOX souboru:"
 
-#: lib/Maintenance/Task/purge_trash.php:86
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -400,277 +414,289 @@
 msgstr ""
 "V¹echny zprávy ve Va¹í \"%s\" slo¾ce star¹í ne¾ %s dní budou trvale vymazány."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr ""
-"V¹echny staré nalinkované pøílohy, které jsou star¹í nì¾ %s mìsícù, budou "
+"V¹echny pøílohy ulo¾ené jako odkaz, které jsou star¹í nì¾ %s mìsícù, budou "
 "vymazány."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
-"V¹echny staré schránky s poslanou po¹tou, které jsou star¹í nì¾ %s mìsícù, "
-"budou vymazány."
+"V¹echny staré slo¾ky s odeslanou po¹tou star¹í nì¾ %s mìsícù budou vymazány."
 
 #: acl.php:85
-#, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr ""
+"V¹echna práva pro slo¾ku '%s' byla úspì¹nì odstranìna pro u¾ivatele '%s'."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
 msgstr ""
-"V¹echny práva pro schránku '%s' byla úspì¹nì odstranìna pro u¾ivatele '%s'."
 
-#: templates/filters/prefs.inc:55
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
-msgstr "Dovolit pou¾ití filtrovacích pravidel na jakou koliv scránku?"
+msgstr "Dovolit pou¾ití filtrovacích pravidel na jakoukoliv schránku?"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Alternativní èásti této sekce:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "V¾dy"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "V¾dy ulo¾it pøílohu."
 
-#: lib/Message.php:491
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
-"Nastala chyba pøi pokusu o odstranìní pøílohy ze zprávy. Zráva z IMAP "
+"Nastala chyba pøi pokusu o odstranìní pøílohy ze zprávy. Hlá¹ení z IMAP "
 "serveru: "
 
-#: compose.php:1016 message.php:185
-msgid "An unknown error occured adding the new entry."
-msgstr "Pøi vkládání nové pochránky do¹lo k neznámé chybì."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Pøi zakládání nového úkolu do¹lo k neznámé chybì."
 
-#: lib/Message.php:385
+#: lib/Message.php:387
 msgid "An unknown error occured while creating the new task."
-msgstr "Pøi zadkládání nového Úkolu do¹lo k neznámé chybì."
+msgstr "Pøi zakládání nového úkolu do¹lo k neznámé chybì."
 
-#: mailbox.php:661 message.php:492 templates/message/navbar_navigate.inc:9
-#: templates/mailbox/legend.inc:6 templates/mailbox/navbar.inc:18
-#: templates/mailbox/navbar.inc:35
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
-msgstr "Zodpovìzené"
+msgstr "Odpovìzené"
 
 #: templates/search/main.inc:31
 msgid "Answered messages"
-msgstr "Zodpovìzené zprávy"
+msgstr "Odpovìzené zprávy"
 
 #: templates/mailbox/header.inc:7
 msgid "Apply Filters"
-msgstr "Aplikovat Filtry"
+msgstr "Pou¾ít filtry"
 
 #: templates/mailbox/header.inc:7
 #, php-format
 msgid "Apply Filters to %s"
-msgstr "Pou¾ít Filtry na %s"
+msgstr "Pou¾ít filtry na %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
-msgstr "Pou¾ít filtrovací pravidla pøi pøihlá¹ení se do systému?"
+msgstr "Pou¾ít filtrovací pravidla pøi pøihlá¹ení do systému?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
-msgstr "Pou¾ít filtrovací pravidla kdykoliv je Pøíchozí Po¹ta zobrazena?"
+msgstr "Pou¾ít filtrovací pravidla v¾dy pøi zobrazení INBOXu?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Jste si JISTÍ, ¾e chcete pokraèovat?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Jste si absolutnì jistí, ¾e chcete pokraèovat?"
-
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
-msgstr "Jste si jistí, ¾e to chcete vymazat tento veøejný klíè?"
+msgstr "Jste si jistí, ¾e chcete vymazat tento veøejný klíè?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
-"Jste si jistí, ¾e to chcete vymazat tento klíèový pár? (Toto není doporuèeno "
+"Jste si jistí, ¾e chcete vymazat tento klíèový pár? (Toto není doporuèeno "
 "provádìt!)"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Jste si jistí, ¾e to chcete udìlat?"
 
-#: message.php:400 templates/mailbox/javascript.inc:63
-#: templates/folders/javascript.inc:73
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
-msgstr "Jste si jistí, ¾e si pøejete PERMANANTNÌ smazat tyto zprávy?"
+msgstr "Jste si jistí, ¾e chcete PERMANENTNÌ smazat tyto zprávy?"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:215
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
-msgstr "Jste si jistí, ¾e si pøejete PERMANANTNÌ smazat tuto pøílohu?"
+msgstr "Jste si jistí, ¾e si chcete PERMANENTNÌ smazat tuto pøílohu?"
 
 #: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
-msgstr "Jste si jistí, ¾e chcete vyprázdnit tuto schránku?"
+msgstr "Jste si jistí, ¾e chcete vyprázdnit tuto slo¾ku?"
 
-#: lib/IMP.php:886
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Jste si jistí, ¾e chcete vyprázdnit slo¾ku ko¹e?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
-msgstr "Jste si jistí, ¾e chcete vyprázdnit Ko¹?"
+msgstr "Jste si jistí, ¾e chcete vyprázdnit slo¾ku ko¹e?"
 
 #: templates/mailbox/actions.inc:8
 msgid "Are you sure you wish to permanently delete these messages?"
-msgstr "Jste si jistí, ¾e si pøejete PERMANANTNÌ smazat tyto zprávy?"
+msgstr "Jste si jistí, ¾e chcete PERMANANTNÌ smazat tyto zprávy?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Jste si jistí, ¾e chcete nahlásit tuto zprávu jako chtìnou (ham)?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Jste si jistí, ¾e chcete nahlásit tuto zprávu jako nechtìnou (spam)?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
-msgstr "Èas Doruèení"
+msgstr "Èas doruèení"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Vzestupnì"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Zeptat se"
 
-#: templates/compose/compose.inc:509
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Pøilo¾it"
 
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:475
 msgid "Attach Files"
-msgstr "Pøilo¾it Soubory"
+msgstr "Pøilo¾it soubory"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Pøilo¾it kopii Va¹eho PGP klíèe k zaslané zprávì?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
-msgstr "Pøilo¾it Soubor"
+msgstr "Pøilo¾it soubor"
 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
-"Pøilo¾ené soubory \"%s\" pøesahují povolený limit pro velokost pøíloh. "
+"Pøilo¾ené soubory \"%s\" pøesahují povolený limit pro velikost pøíloh. "
 "Soubor NEBYL pøilo¾en."
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Pøilo¾ena je odpovìï Va¹í ¾ádosti z kalendáøe."
 
-#: mailbox.php:695 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/attachments.js:98
-#: templates/compose/compose.inc:496
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Pøíloha"
 
-#: compose.php:966 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
 msgstr "Pøíloha odstranìna: Orignální typ pøílohy"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:990
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Pøílohy"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Úèastníci"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Pozor"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Nebyla nalezena po¾adovaná pøípona pro IMAP."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
 msgstr ""
-"Automaticky zobrazit obrázky v HTML zprávách, pokud je odesílatel v mých "
-"Kontaktech"
+"Automaticky zobrazit obrázky v HTML zprávách, pokud je odesílatel v mém "
+"adresáøi?"
 
 #: templates/prefs/sourceselect.inc:298
 msgid "Available Address books:"
-msgstr "Dostupné Kontakty:"
+msgstr "Dostupné adresáøe:"
 
-#: lib/MIME/Viewer/itip.php:704
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
-msgstr "Oèekávaná Odpovìï"
+msgstr "Oèekávaná odpovìï"
 
 #: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Zpì_t do %s"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Zpìt do %s"
 
-#: message.php:259 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Skrytá Kopie"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Ní¾e je uvedena doslovná informaèní zpráva o stavu."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
-msgstr "Èerná Listina"
+msgstr "Èerná listina"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Blokovat obrázky v HTML zprávách, pokud nejsou jinak ¾ádány?"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
-msgstr "Zpráva"
+msgstr "Tìlo"
 
 #: templates/search/main.inc:23 templates/search/main.inc:39
 #: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Oba"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
-msgstr "Oba, Seznam Hlavièek a Zprávu"
+msgstr "Obojí - seznam hlavièek a tìl zpráv"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "Z_naková Sada"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Kalendáø"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
-msgstr "Nelze se pøipojit k vzdálenému mail serveru"
+msgstr "Nelze se pøipojit ke vzdálenému po¹tovnímu serveru"
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
-msgstr "Nelze se pøipojit k vzdálenému mail serveru: "
+msgstr "Nelze se pøipojit ke vzdálenému po¹tovnímu serveru: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -679,429 +705,497 @@
 "Nelze zobrazit - bylo nalezeno pouze %s èástí z %s pro tuto zprávu v "
 "souèasné schránce."
 
-#: templates/smime/import_key.inc:85 templates/smime/passphrase.inc:22
-#: templates/pgp/import_key.inc:66 templates/pgp/passphrase.inc:32
-#: templates/folders/import.inc:21 templates/contacts/contacts.inc:253
-#: templates/compose/spelling.inc:106
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Zru¹it"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
-msgstr "Zru¹it Zprávu"
+msgstr "Zru¹it zprávu"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
-"Zru¹ení této zprávy bude mít za následek kompletní zrátu jejího obsahu."
+"Zru¹ení této zprávy bude mít za následek kompletní ztrátu jejího obsahu."
 
-#: message.php:258 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Kopie"
 
-#: lib/MIME/Viewer/itip.php:686
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
 msgstr "Pøedsedající"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Zmìnit"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
-msgstr "Zmìnit V¹e"
+msgstr "Zmìnit v¹e"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
-msgstr "Zmìnit Slo¾ku"
+msgstr "Zmìnit slo¾ku"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
-"Zmìòit vlastnosti zobrazení jako napøíklad kolik zpráv bude na jedné "
-"obrazovce a jak budou uspoøádány."
+"Nastavení vlastností zobrazení jako napø. kolik zpráv bude na jedné stránce "
+"a jak budou uspoøádány."
 
 #: config/prefs.php.dist:24
 msgid "Change mail server and folder settings."
-msgstr "Zmìnit nastavení Va¹eho mail serveru a nastavení schránek."
+msgstr "Nastavení Va¹eho po¹tovního serveru a slo¾ek."
 
 #: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr ""
-"Zmìnit jméno, emailovou adresu a signaturu. Tyto pochránky lidé uvidí, kdy¾ "
-"si ètou nebo odpovídají na Vá¹ email."
+"Nastavení jména, emailové adresy a signatury, které vidí pøíjemci Va¹ich "
+"zpráv."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
 msgstr "Znaky pro zobrazení:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
-msgstr "Zkontrolovat Novou Po¹tu ve Slo¾ce(Slo¾kách)"
+msgstr "Zkontrolovat novou po¹tu ve slo¾ce(slo¾kách)"
 
-#: templates/mailbox/message_headers.inc:65 templates/folders/actions.inc:2
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
-msgstr "Zkontrolovat _V¹e/®ádné"
+msgstr "Zkontrolovat _v¹e/¾ádné"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
-msgstr "Zkontrolovat v¹echny servery k zachycení nové po¹ty:"
+msgstr "Zkontrolovat v¹echny po¹tovní servery ke sta¾ení nové po¹ty:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
-msgstr "Zkontrolovat pravopis pøed zasláním zprávy?"
+msgstr "Zkontrolovat pravopis pøed odesláním zprávy?"
 
 #: templates/folders/actions.inc:4
 msgid "Choose Action:"
-msgstr "Vybrat Akci:"
+msgstr "Vybrat akci:"
 
-#: config/servers.php.dist:170
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
-msgstr "Vybrat mail server."
+msgstr "Vybrat po¹tovní server:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:717
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Prosím vyberte nebo upravte v boxu vpravo:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
-msgstr "Vybrát akci:"
+msgstr "Vybrat akci:"
 
-#: templates/prefs/sourceselect.inc:350
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
-msgstr "Vybrat Kontakty, které budou pou¾ity pro pøidávání adres."
+msgstr "Vybrat adresáø, který bude pou¾it pøi zadávání adres."
 
 #: templates/prefs/sourceselect.inc:293
 msgid "Choose the order of address books to search when expanding addresses."
-msgstr "Vybrat poøadí Kontaktù, jak budou prohledávány pøi expandování adres"
+msgstr ""
+"Vybrat poøadí adresáøù, v jakém budou prohledávány pøi expandování adres."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Kliknìte na %s pro konverzi obrázkového souboru na typ, který lze zobrazit."
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
-msgstr "Kliknìte na %s k downloadování obrázku."
+msgstr "Kliknìte na %s k sta¾ení obrázku."
 
-#: lib/Filter.php:103
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Kliknìte na %s pro pøechod na %s stránku s managementem."
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:116
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
-msgstr "Kliknìte na %s pro zobrazení HTML obsahu v separátní oknì."
+msgstr "Kliknìte na %s pro zobrazení HTML obsahu v novém oknì."
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr "Kliknìte na %s pro zobrazení thumbnail toho obrázku"
+msgstr "Kliknìte na %s pro zobrazení miniatury tohoto obrázku"
 
-#: lib/MIME/Viewer/pkcs7.php:404
+#: lib/MIME/Viewer/pkcs7.php:418
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
-msgstr "Kliknìte na %s pro zobrazení pøilohy v separátní oknì."
+msgstr "Kliknìte na %s pro zobrazení pøílohy v novém oknì."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Kliknìte na zde pro UKRYTÍ Obrázkù"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Kliknìte na %s pro zobrazení související èásti v novém oknì."
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
-msgstr "Kliknìte na zde pro ZOBRAZENÍ Obrázkù"
+msgstr "Kliknìte zde pro ZOBRAZENÍ obrázkù"
 
 #: templates/prefs/sourceselect.inc:321
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
-"Kliknìte na jeden z Va¹ich zdrojù Kontaktù a vyberte v¹echny pole, které se "
-"budou prohledávat."
+"Kliknìte na jeden z Va¹ich adresáøù a vyberte v¹echna pole, která se budou "
+"prohledávat."
 
-#: lib/MIME/Viewer/pgp.php:174
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
-msgstr "Kliknutím ulo¾íte PGP Veøejný Klíè do Kontaktù"
+msgstr "Kliknutím ulo¾íte PGP veøejný klíè do svého adresáøe"
 
-#: lib/MIME/Viewer/pkcs7.php:190
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
-msgstr "Kliknutím ulo¾íte S/MIME certifikát %s do Kontaktù"
+msgstr "Kliknutím ulo¾íte S/MIME certifikát %s do svého adresáøe"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
-msgstr "Kliknutím na adresu lze vytvoøit novou zprávu pro odesilatele"
+msgstr "Kliknutím na adresu lze vytvoøit novou zprávu pro odesílatele"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
 msgstr "Kliknutím na adresu lze zobrazit zprávu k pøeètení"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Uzavøít"
 
-#: compose.php:1032
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Uzavøít toto okno"
 
-#: folders.php:387
+#: folders.php:429
 msgid "Closed Folder"
-msgstr "Uzavøít Slo¾ku"
+msgstr "Uzavøít slo¾ku"
 
-#: folders.php:407
+#: folders.php:449
 msgid "Collapse"
 msgstr "Sklapnout"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
-msgstr "Sklapnout V¹e"
+msgstr "Sklapnout v¹e"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
-msgstr "Sklapnout V¹echny Schránky"
+msgstr "Sklapnout v¹echny slo¾ky"
 
-#: folders.php:407
+#: folders.php:449
 msgid "Collapse Folder"
-msgstr "Sklapnout Slo¾ku"
+msgstr "Sklapnout slo¾ku"
 
 #: templates/fetchmail/manage.inc:51
 msgid "Color Indicator: "
-msgstr "Indikátor Barev: "
+msgstr "Indikátor barev: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Poznámka"
 
-#: lib/MIME/Viewer/itip.php:755
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
 msgstr "Dokonèeno"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Vytvoøit"
-
-#: mailbox.php:725 lib/MIME/Headers.php:196
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Vytvoøit Zprávu (%s)"
-
-#: compose.php:1031
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Vytvoøit dal¹í zprávu"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
-msgstr "Vytvoøit zprávy v dal¹ím oknì?"
+msgstr "Vytvoøit zprávy v novém oknì?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
-"Implicitnì vytvoøit zprávy v HTML GUI (pokud prohlí¾eè podporuje tuto volbu)?"
+"Implicitnì vytváøet zprávy v HTML GUI (podporuje-li prohlí¾eè tuto volbu)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
-msgstr "Nastavit jak budou zprávy zobrazovány."
+msgstr "Nastavení zobrazení zpráv."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
-msgstr "Nastavit mo¾nosti pro ukázku zpráv."
+msgstr "Nastavit mo¾nosti pro náhled zpráv."
+
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Spojení se serverem selhalo"
 
-#: lib/Fetchmail/imap.php:237
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
-msgstr "Spojení se Severem selhalo"
+msgstr "Spojení se serverem selhalo"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Nastavení podpory PGP v %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Nastavení podpory S/MIME v %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"Nastavení pro kontrolu pøíchozích zpráv a zdali informovat o jejich pøíchodu."
+"Nastavení kontroly novì pøíchozích zpráv a zpùsobu informování o jejich "
+"pøíchodu."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
-msgstr "Konvertovat citové ikonky z textu do grafiky?"
+msgstr "Konvertovat ikonky s emocemi z textu do grafiky?"
 
 #: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
-msgstr "Kopírovat do schránky"
+msgstr "Kopírovat do slo¾ky"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Upravit"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
-msgstr "Upravený Text"
+msgstr "Upravený text"
+
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Nelze vytvoøit VFS backend: %s"
 
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Nelze vytvoøit VFS backend: %s"
 
-#: lib/Message.php:634
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
-msgstr "Nelze vymazat zprávy z %s. Toto je zpráva ze serveru: %s"
+msgstr "Nelze vymazat zprávy z %s. Toto je hlá¹ení ze serveru: %s"
 
-#: lib/Session.php:281
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
 msgstr "Nelze provést operace údr¾by."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
-msgstr "Nelze obdr¾et po¾adovaný soubor z pøílohy typu MS-TNEF."
+msgstr "Nelze získat po¾adovaný soubor z pøílohy typu MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
-msgstr "Nelze obdr¾et po¾adovaný soubor z pøílohy typu Zip."
+msgstr "Nelze získat po¾adovaný soubor z pøílohy typu Zip."
 
-#: search.php:351 templates/fetchmail/account_select.inc:26
-#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "Vytvoøit"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
-msgstr "Vytvoøit Slo¾ku"
+msgstr "Vytvoøit slo¾ku"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
-msgstr "Vytvoøit Klíèe"
+msgstr "Vytvoøit klíèe"
 
 #: templates/search/header.inc:14
 msgid "Create Virtual Folder"
-msgstr "Vytvoøit Virtuální Schránku"
+msgstr "Vytvoøit virtuální slo¾ku"
+
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Dal¹í po¹tovní úèty"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Vytvoøit novou slo¾ku pro ko¹"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
-msgstr "Vytvoøit novou schránku pro drafty"
+msgstr "Vytvoøit novou slo¾ku pro rozepsané zprávy"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
-msgstr "Vytvoøit novou schránku pro odeslané zprávy"
+msgstr "Vytvoøit novou slo¾ku pro odeslané zprávy"
 
 #: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Vytvoøit novou schránku pro ko¹"
+msgstr "Vytvoøit novou slo¾ku pro ko¹"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"Vytvoøit filtrovací pravidla pro organizování pøíchozích zpráv, jejich "
-"tøidìní a mazání nechtìných zpráv (spam)."
+"Filtrovací pravidla pro organizování pøíchozích zpráv, jejich tøídìní do "
+"slo¾ek a mazání nechtìných zpráv (spam)."
+
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Vytvoøit novou slo¾ku pro odeslané zprávy"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Souèasný pøístup do %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
-msgstr "Nastavit úèty pro zachycení zpráv z dal¹ích emailových úètù."
+msgstr "Nastavit úèty pro stahování zpráv z dal¹ích po¹tovních úètù."
 
 #: config/prefs.php.dist:51
 msgid "Customize how you send mail."
-msgstr "Nastavit jak se zasílají zprávy."
+msgstr "Nastavení zpùsobu odesílání zpráv."
 
 #: config/prefs.php.dist:40
 #, php-format
 msgid "Customize tasks to run upon logon to %s."
-msgstr "Nastavit úkoly, které se mají provést pøi pøihlá¹ení se do %s."
+msgstr "Nastavení úkolù provádìných pøi pøihlá¹ení do modulu %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Datu_m"
 
-#: message.php:255 thread.php:75
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Datum"
 
-#: lib/MIME/Viewer/itip.php:743
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Zamítnut"
 
-#: config/prefs.php.dist:894
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr "Zamítnut: "
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Smazat"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Výchozí tøídící kritéria:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Výchozí smìr tøídìní:"
 
-#: lib/MIME/Viewer/itip.php:751
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
 msgstr "Pøidìleno"
 
-#: folders.php:378 templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
-#: templates/mailbox/actions.inc:10 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:244 templates/compose/attachments.inc:28
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
-msgstr "Smazat %s Veøejný Klíè"
+msgstr "Smazat %s veøejný klíè"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
-msgstr "Smazat Souèasný Klíè"
+msgstr "Smazat souèasný klíè"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
-msgstr "Smazat Slo¾ku(y)"
+msgstr "Smazat slo¾ku(y)"
+
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Smazat slo¾ku(y)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Smazat virtuální slo¾ku"
 
-#: folders.php:378
+#: folders.php:419
 msgid "Delete Virtual Folder"
-msgstr "Smazat Virtuální Slo¾ku"
+msgstr "Smazat virtuální slo¾ku"
 
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
-msgstr "Smazat zachycené zprávy ze vzdáleného serveru?"
+msgstr "Smazat sta¾ené zprávy ze vzdáleného serveru?"
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
 msgstr "Smazat z mého kalendáøe"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
-msgstr "Smazat staré nalinkované pøílohy na zaèátku mìsíce?"
+msgstr "Smazat staré pøílohy ulo¾ené jako odkaz na zaèátku mìsíce?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
-msgstr "Smazat staré schránky s odeslanými zprávami na zaèátku mìsíce?"
+msgstr "Smazat staré schránky s odeslanou po¹tou na zaèátku mìsíce?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Smazat zprávy poté co byly nahlá¹eny jako nechtìné zprávy (spam)?"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Smazané zprávy"
 
-#: mailbox.php:685 message.php:495 templates/mailbox/legend.inc:8
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Smazáno"
 
@@ -1109,510 +1203,569 @@
 msgid "Deleted messages"
 msgstr "Smazané zprávy"
 
-#: compose.php:300
+#: compose.php:307
 #, php-format
 msgid "Deleted the attachment \"%s\"."
-msgstr "Smazaná Pøíloha \"%s\"."
+msgstr "Smazaná pøíloha \"%s\"."
 
 #: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
-msgstr "Smazání a Pøesouvání Zpráv"
+msgstr "Smazání a pøesouvání zpráv"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Zamítnout po¾adavek"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
 msgstr "Zamítnout po¾adavek na informaci o free/busy"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Sestupnì"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:656
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Popis"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Detaily"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Zastínit signatury?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Zobrazit"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
-msgstr "Zobrazit potvrzení o zaslání zprávy?"
+msgstr "Zobrazit potvrzení o odeslání zprávy?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Zobrazit v tìle zprávy"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Zobrazit upozornìní o nové zprávì?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Zobrazit ikonku 'Vyprázdnit Ko¹' v nabídkové li¹tì?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Zobrazit ikonu 'Vyprázdnit ko¹' v li¹tì menu?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Zobrazit ikonu 'Vyprázdnit ko¹' v li¹tì menu?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Dispozice"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "NESHODUJÍ se"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
-msgstr "Nekontrolovat Slo¾ku(y) zdali Obsahuje(í) Nové Zprávy"
+msgstr "Nekontrolovat slo¾ku(y) na nové zprávy"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
-msgstr "Negenerovat linky ve sloupci Od:"
+msgstr "Nevytváøet odkazy ve sloupci Od:"
 
-#: lib/IMP.php:988
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
-msgstr "Pøejete si otevøít tuto schránku?"
+msgstr "Chcete otevøít tuto slo¾ku?"
+
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
 
-#: templates/compose/spelling.inc:112
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Dokonèeno"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
-msgstr "Downloadovat %s v .zip Formátu"
+msgstr "Stahnout %s v .zip formátu"
 
 #: templates/message/headers.inc:52
 msgid "Download All Attachments (in .zip file)"
-msgstr "Downloadovat V¹echny Pøílohy (v .zip souboru)"
+msgstr "Stahovat v¹echny pøílohy (v .zip souboru)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
-msgstr "Naèíst Slo¾ku(y)"
+msgstr "Stahnout slo¾ku(y)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
-msgstr "Downloadovat Slo¾ku(y) [v .zip formátu]"
+msgstr "Stahovat slo¾ku(y) [v .zip formátu]"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
-msgstr "Downloadovat v .zip Formátu"
+msgstr "Stahovat v .zip formátu"
 
-#: mailbox.php:666 message.php:493 templates/message/navbar_navigate.inc:11
-#: templates/mailbox/legend.inc:9 templates/mailbox/navbar.inc:22
-#: templates/mailbox/navbar.inc:41
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
-msgstr "Rozepsaná po¹ta"
+msgstr "Rozepsaná zpráva"
 
-#: folders.php:358
+#: folders.php:392
 msgid "Draft folder"
-msgstr "Schránka s Rozepsanou po¹tou"
+msgstr "Slo¾ka pro rozepsané zprávy"
 
 #: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
-msgstr "Schránka s Rozepsanou po¹tou:"
+msgstr "Slo¾ka pro rozepsané zprávy:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
-msgstr "E-mailová Adresa"
+msgstr "E-mailová adresa"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "A"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
-msgstr "CHYBA: Nelze doruèit Va¹i zprávu."
+msgstr "CHYBA: Va¹í zprávu nelze doruèit."
 
-#: folders.php:379
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Upravit"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
-msgstr "Upravit Èernou Listinu"
+msgstr "Upravit èernou listinu"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
-msgstr "Upravit Filtrovací Pravidla"
+msgstr "Upravit filtrovací pravidla"
 
-#: folders.php:379 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:420 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
-msgstr "Upravit Virtuální Schránku"
+msgstr "Upravit virtuální slo¾ku"
 
 #: templates/mailbox/header.inc:13
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
-msgstr "Upravit Definici Virtuální Schránky pro %s"
+msgstr "Upravit definici virtuální slo¾ky pro %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
-msgstr "Upravit Bílou Listinu"
+msgstr "Upravit bílou listinu"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Upravit èernou listinu"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Upravit pravidla filtrování"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
-msgstr "Upravit nastavení pro pøístup k jiným emalovým úètùm."
+msgstr "Upravit nastavení pro pøístup k jiným po¹tovním úètùm."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Upravit bílou listinu"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
-msgstr "Emailová Adresa"
+msgstr "Emailová adresa"
 
-#: lib/Message.php:651
+#: lib/Message.php:657
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Vyprázdnit v¹echny zprávy od %s"
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
-msgstr "Vyprázdnit Slo¾ku(y)"
+msgstr "Vyprázdnit slo¾ku(y)"
+
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Vyprázdnit slo¾ku(y)"
 
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
-msgstr "Vyprázdit Ko¹"
+msgstr "Vyprázdit slo¾ku ko¹e"
+
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Vyprázdit _ko¹"
 
-#: lib/IMP.php:886
+#: lib/IMP.php:966
 msgid "Empty _Trash"
-msgstr "Vyprázdit _Ko¹"
+msgstr "Vyprázdit _ko¹"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Zapnout PGP?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Zapnout S/MIME?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
-msgstr "Umo¾nit ukázky zpráv?"
+msgstr "Umo¾nit náhledy zpráv?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
-msgstr "Mo¾nosti Kódo_vání"
+msgstr "Mo¾nosti ¹ifro_vání"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Konec"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Konec pøeposlané zprávy"
 
-#: lib/Compose.php:262
+#: lib/Compose.php:341
 msgid "End message"
-msgstr "Konec Zprávy"
+msgstr "Konec zprávy"
 
-#: lib/Compose.php:260
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
 msgstr "Konec zprávy od %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
-msgstr "Vlo¾te Heslo"
+msgstr "Zadejte heslo"
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Vlo¾te jméno nové slo¾ky pro ko¹"
 
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
-msgstr "Vlo¾te jméno nové schránky pro rozepsané zprávy"
+msgstr "Vlo¾te jméno nové slo¾ky pro rozepsané zprávy"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
-msgstr "Vlo¾te jméno nové schránky pro odeslané zprávy"
+msgstr "Vlo¾te jméno nové slo¾ky pro odeslané zprávy"
 
 #: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
-msgstr "Vlo¾te jméno Va¹í nové ko¹ové schránky"
+msgstr "Vlo¾te jméno nové slo¾ky pro ko¹"
+
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Pøesmìrovat zprávu"
 
-#: compose.php:1018 message.php:187
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
-msgstr "Pochránka \"%s\" byla úspì¹nì pøidána do Kontaktù"
+msgstr "Polo¾ka \"%s\" byla úspì¹nì pøidána do adresáøe"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pgp.php:390 lib/MIME/Viewer/pkcs7.php:361
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Chyba"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
-msgstr "Nastala chyba pøi zasílání odpovìdi: %s."
+msgstr "Nastala chyba pøi odesílání odpovìdi: %s."
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
 msgid "Event successfully deleted."
 msgstr "Událost byla úspì¹nì smazána."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Ka¾dých 15 minut"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Ka¾dých 30 sekund"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Ka¾dých 5 minut"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Ka¾dou pùl hodinu"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Ka¾dou minutu"
 
-#: folders.php:416
+#: folders.php:457
 msgid "Expand"
 msgstr "Rozbalit"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
-msgstr "Rozbalit V¹e"
+msgstr "Rozbalit v¹e"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
-msgstr "Rozbalit V¹echny Schránky"
+msgstr "Rozbalit v¹echny slo¾ky"
 
-#: folders.php:416
+#: folders.php:457
 msgid "Expand Folder"
-msgstr "Rozbalit Slo¾ku"
+msgstr "Rozbalit slo¾ku"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
-msgstr "Doplò Jména"
+msgstr "Doplò jména"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Automaticky doplnit jména pøi vytváøení zprávy?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
-msgstr "Implicitnì rozbalit celou strukturu schránek pøi jejich zobrazování?"
+msgstr "Implicitnì rozbalovat celou strukturu slo¾ek pøi jejich zobrazení?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Rozbaluji"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Stáhnout po¹tu"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
-msgstr "Zachytit Po¹tu"
+msgstr "Stáhnout po¹tu"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
-msgstr "Zachycení Po¹ty v dal¹ím oknì."
+msgstr "Stahovat po¹tu v novém oknì?"
 
 #: templates/fetchmail/manage.inc:46
 msgid "Fetch messages upon logging on?"
-msgstr "Zachycení Po¹ty pøi pøihlá¹ení se do systému?"
+msgstr "Stahovat po¹tu pøi pøihlá¹ení do systému?"
 
-#: lib/Fetchmail.php:306
-#, php-format
-msgid "Fetched %d message(s) from %s"
-msgstr "Zachyceno %d zpráv(a) od %s."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Sta¾eno %d zpráv(a) od %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Sta¾eno %d zpráv(a) od %s."
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
-msgstr "Zachycená Po¹ta:"
+msgstr "Sta¾ená po¹ta:"
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
-msgstr "Zachycená Po¹ta: ¾ádné nové zprávy."
+msgstr "Sta¾ená po¹ta: ¾ádné nové zprávy."
 
-#: lib/IMP.php:901
+#: lib/IMP.php:990
 msgid "Fi_lters"
 msgstr "Fi_ltry"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:492
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "Soubor"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
-msgstr "Mo¾nosti Filtrù"
+msgstr "Mo¾nosti filtrù"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
-msgstr "Nastavení Filtrù"
+msgstr "Nastavení filtrù"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
-msgstr "Odfiltrovat nevhodné slova ze zprávy?"
+msgstr "Odfiltrovat nevhodná slova ze zpráv?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
-msgstr "Tento systém neumo¾òuje Filtrování."
+msgstr "Tento systém neumo¾òuje filtrování."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtry"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
-msgstr "Filtry NEJSOU Aktivovány"
+msgstr "Filtry NEJSOU aktivovány"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtry: %s stránka managementu"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Vyhledat"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
-msgstr "První Stránka Schránky"
+msgstr "První stránka schránky"
 
-#: mailbox.php:324
+#: mailbox.php:345
 msgid "First Page"
-msgstr "První Stránka"
+msgstr "První stránka"
 
 #: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
 msgid "Fo_rward"
 msgstr "Pø_eposlat"
 
-#: folders.php:259 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:2
-msgid "Folder Navigator"
-msgstr "Schránkový Navigátor"
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Schránkový Prefix"
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
+msgid "Folder Navigator"
+msgstr "Navigátor slo¾ek"
 
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
-msgstr "Shrnutí Schránek"
+msgstr "Shrnutí slo¾ek"
 
 #: acl.php:24
 msgid "Folder sharing is not enabled."
-msgstr "Sdílení Schránek není umo¾nìno."
+msgstr "Sdílení slo¾ek není povoleno."
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
-msgstr "Pou¾ití schránek není aktivováno."
+msgstr "Pou¾ití slo¾ek není povoleno."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
-msgstr "Formát datumu pro pøíchozí zprávy, které nebyly obdr¾eny dnes"
+msgstr "Formát datumu v zobrazení schránky pro dne¹ní pøíchozí zprávy"
 
-#: compose.php:696 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Pøeposlat"
 
-#: compose.php:681
+#: compose.php:765
 msgid "Forward:"
 msgstr "Pøeposlat:"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Pøeposlaná zpráva"
 
-#: lib/Compose.php:288
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Pøeposlaná zpráva od %s"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
 msgstr "Informace o Free/Busy"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
-msgstr "Free/Busy Odpovìï"
+msgstr "Free/Busy odpovìï"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
-msgstr "Free/Busy ®ádost"
+msgstr "Free/Busy ¾ádost"
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
-msgstr "Free/Busy Odpovìï na ®ádost"
+msgstr "Free/Busy odpovìï na ¾ádost"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "O_d"
 
-#: message.php:256 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Od"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:918
 msgid "From Address"
-msgstr "Z Adresy"
+msgstr "Adresa Od"
 
-#: compose.php:693 compose.php:697
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Pøep:"
 
-#: compose.php:1173
+#: compose.php:1294
 msgid "Fwd: "
 msgstr "Pøep: "
 
-#: compose.php:1175
+#: compose.php:1296
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
-msgstr "Pøep: %u Pøeposlaných zpráv"
+msgstr "Pøep: %u pøeposlaných zpráv"
 
 #: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
 #: config/prefs.php.dist:38
 msgid "General Options"
-msgstr "V¹eobecné Mo¾nosti"
+msgstr "V¹eobecné mo¾nosti"
 
 #: templates/fetchmail/manage.inc:37
 msgid "Get only new messages? (IMAP only)"
-msgstr "Obdr¾et pouze nové zprávy? (pouze u IMAPu)"
+msgstr "Získat jen nové zprávy? (pouze u IMAPu)"
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
 
-#: thread.php:68
+#: thread.php:136
 msgid "Go to Message"
-msgstr "Jít na Zprávu"
+msgstr "Jít na zprávu"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Vlo¾it do adresáøe (%s)"
 
 #: templates/acl/acl.inc:135
 msgid "Grant access"
-msgstr "Povolit Pøístup"
+msgstr "Povolit pøístup"
 
-#: message.php:548 lib/Filter.php:102 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/notification.php:65
-#: lib/MIME/Viewer/notification.php:71 lib/MIME/Viewer/pgp.php:176
-#: lib/MIME/Viewer/pkcs7.php:404 lib/MIME/Viewer/status.php:123
-#: lib/MIME/Viewer/status.php:130
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "ZDE"
 
-#: lib/MIME/Viewer/html.php:118
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:251
+#: compose.php:256
 msgid "HTML Version of Message"
-msgstr "HTML Verze Zprávy"
+msgstr "HTML verze zprávy"
 
 #: templates/message/headers.inc:58
 msgid "Headers"
@@ -1620,148 +1773,172 @@
 
 #: templates/compose/recompose.inc:5
 msgid "Here is the message you were composing:"
-msgstr "Toto je zpráva, kterou jste skládali:"
+msgstr "Toto je zpráva, kterou jste napsali:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Ukrytý"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
-msgstr "Ukrytý v Zobrazení podle Souvislosti"
+msgstr "Ukrytý v zobrazení podle souvislosti"
 
-#: mailbox.php:346
+#: mailbox.php:367
 msgid "Hide Deleted"
-msgstr "Ukrýt Smazané"
+msgstr "Ukrýt smazané"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Hide Unsubscribed"
-msgstr "Ukrýt Neaktivní"
-
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Ukrýt Obrázky"
+msgstr "Ukrýt neaktivní"
 
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Vysoká"
 
-#: mailbox.php:671 message.php:290 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
-msgstr "Vysoká Dùle¾itost"
+msgstr "Vysoká dùle¾itost"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Nejvy¹í"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Jak si pøejete zobrazit pøílohy?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Jak oznaèit citace v odpovìdích"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
-msgstr "IMAP (Automatická Detekce Protokolu)"
+msgstr "IMAP (Automatická detekce protokolu)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP pøes SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
-msgstr "IMAP pøes SSL (s neoficiálním klíèem)"
+msgstr "IMAP pøes SSL (s neoficiálním certifikátem)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
-msgstr "IMAP pøes SSL (s neoficiálním klíèem)"
+msgstr "IMAP pøes SSL (s neoficiálním certifikátem)"
+
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Typ po¹tovního serveru pro pøipojení:"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, bez TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
-msgstr "IMAP/POP3 Emailové Servery"
+msgstr "IMAP/POP3 po¹tovní servery"
 
-#: folders.php:350
+#: lib/IMP.php:866
 msgid "INBOX"
-msgstr "Pøíchozí Zprávy"
+msgstr "INBOX"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "V¹echny zprávy ve slo¾ce(kách) budou ztraceny!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
-msgstr "Ignorovat V¹e"
+msgstr "Ignorovat v¹e"
+
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importovat"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
-msgstr "Importovat Klíè"
+msgstr "Importovat klíè"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
-msgstr "Importovat Klíèový Pár"
+msgstr "Importovat klíèový pár"
+
+#: templates/folders/actions.inc:27
+msgid "Import Messages"
+msgstr "Importovat zprávy"
 
 #: pgp.php:42
 msgid "Import PGP Key"
-msgstr "Importovat PGP Klíè"
+msgstr "Importovat PGP klíè"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Importovat Vá¹ Soukromý Certifikát"
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
+msgstr "Importovat Vá¹ osobní certifikát"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
-msgstr "Importovat Vá¹ Soukromý PGP Klíè"
+msgstr "Importovat Vá¹ osobní privátní PGP klíè"
 
 #: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
-msgstr "Importovat Vá¹ Veøejný PGP Klíè"
+msgstr "Importovat Vá¹ osobní veøejný PGP klíè"
 
 #: templates/smime/import_key.inc:4
 msgid "Import Personal S/MIME Certificates"
-msgstr "Importovat Vá¹ Soukromý S/MIME Certifikát"
+msgstr "Importovat Vá¹ osobní S/MIME certifikát"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
-msgstr "Importovat Veøejný Klíè"
+msgstr "Importovat veøejný klíè"
 
 #: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
-msgstr "Importovat Veøejný PGP Klíè"
+msgstr "Importovat veøejný PGP klíè"
 
 #: templates/smime/import_key.inc:8
 msgid "Import Public S/MIME Key"
-msgstr "Importovat Vá¹ Veøejný S/MIME Klíè"
+msgstr "Importovat Vá¹ veøejný S/MIME klíè"
 
 #: smime.php:16
 msgid "Import S/MIME Key"
-msgstr "Importovat S/MIME Klíè"
+msgstr "Importovat S/MIME klíè"
 
-#: templates/folders/actions.inc:25 templates/folders/import.inc:9
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
-msgstr "Importovat mbox Soubor"
+msgstr "Importovat mbox soubor"
 
 #: templates/folders/import.inc:16
 #, php-format
 msgid "Import mbox file %s into folder %s."
-msgstr "Importovat mbox soubor %s do schránky %s."
+msgstr "Importovat mbox soubor %s do slo¾ky %s."
 
-#: mailbox.php:679 message.php:494 templates/message/navbar_navigate.inc:7
-#: templates/mailbox/legend.inc:7 templates/mailbox/navbar.inc:16
-#: templates/mailbox/navbar.inc:33
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Dùle¾ité"
 
@@ -1769,131 +1946,153 @@
 msgid "Important messages"
 msgstr "Dùle¾ité zprávy"
 
-#: folders.php:157
+#: folders.php:167
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Importováno %d zpráv(a) od %s."
 
-#: lib/MIME/Viewer/itip.php:759
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
-msgstr "V Procesu"
+msgstr "V procesu"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
-msgstr "Pøíchozí Zprávy"
+msgstr "INBOX"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Zahrnout struèné shrnutí hlavièek do Va¹í odpovìdi?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
-msgstr "Zahrnout originální zprávu do Va¹í odpovìdi?"
+msgstr "Zahrnout pùvodní zprávu do Va¹í odpovìdi?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Informace"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
-msgstr "Informace o %s Veøejném Klíèi"
+msgstr "Informace o %s veøejném klíèi"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
-msgstr "Informace o Va¹em Osobním Klíèi"
+msgstr "Informace o Va¹em osobním privátním klíèi"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
-msgstr "Informace o Va¹em Veøejném Klíèi"
+msgstr "Informace o Va¹em osobním veøejném klíèi"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:497
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "Uvnitø"
 
 #: templates/smime/import_key.inc:9
 msgid "Insert Certificate Here"
-msgstr "Zde Vlo¾it Certifikát"
+msgstr "Zde vlo¾it certifikát"
 
 #: templates/pgp/import_key.inc:15
 msgid "Insert Personal Private PGP Key Here"
-msgstr "Zde Vlo¾it Vá¹ Soukromý PGP Klíè"
+msgstr "Zde vlo¾it Vá¹ osobní privátní PGP klíè"
 
 #: templates/pgp/import_key.inc:10
 msgid "Insert Personal Public PGP Key Here"
-msgstr "Zde Vlo¾it Vá¹ Veøejný PGP Klíè"
+msgstr "Zde vlo¾it Vá¹ osobní veøejný PGP klíè"
 
 #: templates/pgp/import_key.inc:5
 msgid "Insert Public PGP Key Here"
-msgstr "Zde Vlo¾it Veøejný PGP Klíè"
+msgstr "Zde vlo¾it veøejný PGP klíè"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
-msgstr "Byla vybrána nesprávná akce pro tento komponent."
+msgstr "Byla vybrána nesprávná akce pro tuto komponentu."
 
-#: mailbox.php:539 mailbox.php:580
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
-msgstr "Neplatná Adresa"
+msgstr "Neplatná adresa"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
-msgstr "Neplatná Vzdálená Schránka"
+msgstr "Neplatná vzdálená schránka"
 
-#: compose.php:141
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
-msgstr "Neplatný zhak v e-mailová adrese: %s."
+msgstr "Neplatný znak v e-mailové adrese: %s."
 
-#: pgp.php:16 smime.php:82
+#: smime.php:82 pgp.php:16
 msgid "Invalid key"
 msgstr "Neplatný klíè"
 
 #: pgp.php:196
 msgid "Invalid personal PGP private key."
-msgstr "Vá¹ soukromý PGP klíè je neplatný."
+msgstr "Vá¹ osobní privátní PGP klíè je neplatný."
 
 #: pgp.php:171
 msgid "Invalid personal PGP public key."
-msgstr "Vá¹ Veøejný PGP Klíè je neplatný."
+msgstr "Vá¹ osobní veøejný PGP klíè je neplatný."
 
 #: templates/mailbox/navbar.inc:12
 msgid "Invert"
 msgstr "Obrátit"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
-msgstr "Délka Klíèe"
+msgstr "Délka klíèe"
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
 
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
-msgstr "Klíè byl úspì¹nì zaslán na veøejný klíèový server."
+msgstr "Klíè byl úspì¹nì odeslán na veøejný klíèový server."
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Jazyk"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
-msgstr "Poslední Stránka Schránky"
+msgstr "Poslední stránka schránky"
 
-#: mailbox.php:337
+#: mailbox.php:358
 msgid "Last Page"
-msgstr "Poslední Stránka"
+msgstr "Poslední stránka"
 
-#: templates/compose/compose.inc:380
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
-msgstr "Li_nkované Pøílohy"
+msgstr "Li_nkované pøílohy"
 
-#: attachment.php:34 lib/Compose.php:980
+#: attachment.php:34 lib/Compose.php:1063
 msgid "Linked attachments are forbidden."
-msgstr "Linkované pøílohy nejsou povoleny."
+msgstr "Pøílohy ulo¾ené jako odkazy nejsou povoleny."
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Odkazy budou expirovat v %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1901,28 +2100,28 @@
 "Zobrazit seznam v¹ech kontaktù pøi prohlí¾ení kontaktù? (pokud neni "
 "aktivováno, uvidíte pouze kontakty, které jste zadali pro vyhledávání)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
-msgstr "Výpis v Hlavièce"
+msgstr "Výpis v hlavièce"
 
 #: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
-msgstr "Pøíchozí Lokální Po¹ta"
+msgstr "Lokální schránka po¹ty"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
 msgstr "Místo"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "Pøihlásit se"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "Pøihlásit se do %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "Pøihlásit se"
 
@@ -1930,55 +2129,55 @@
 msgid "Login Tasks"
 msgstr "Úkoly provádìné pøi pøihlá¹ení"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
-msgstr "Nizká"
+msgstr "Nízká"
 
-#: mailbox.php:674 message.php:292 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
-msgstr "Nízká Dùle¾itost"
+msgstr "Nízká dùle¾itost"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Nejni¾¹í"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
-msgstr "Soubor pochází z Macintosh"
+msgstr "Soubor pochází z Macintoshe"
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Po¹ta"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
-msgstr "Ukázky Po¹ty"
+msgstr "Náhledy po¹ty"
 
 #: templates/fetchmail/driver_select.inc:16
 msgid "Mail server type to connect to:"
-msgstr "Typ emailového serveru pro pøipojení:"
+msgstr "Typ po¹tovního serveru pro pøipojení:"
 
-#: folders.php:368
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
-msgstr "Mo¾nosti Zobrazení Schránek"
+msgstr "Mo¾nosti zobrazení schránek a slo¾ek"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
-msgstr "Oznaèit V¹echny Zprávy ve Schránce jako Prohlédnuté"
+msgstr "Oznaèit v¹echny zprávy ve slo¾ce jako prohlédnuté"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
-msgstr "Oznaèit V¹echny Zprávy ve Schránce jako Neprohlédnuté"
+msgstr "Oznaèit v¹echny zprávy ve slo¾ce jako neprohlédnuté"
 
 #: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Oznaèit jako:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Oznaèit rùzné úrovnì citátù rùznými barvami?"
 
@@ -1986,140 +2185,156 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Oznaèit zprávy jako prohlédnuté? (pouze IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
-msgstr "Oznaèit jednoduché oznaèení "
+msgstr "Oznaèit jednoduchou znaèkou?"
 
 #: templates/search/header.inc:46
 msgid "Match All Queries"
-msgstr "Zachytit V¹echny Dotazy"
+msgstr "Zachytit v¹echny dotazy"
 
 #: templates/search/header.inc:42
 msgid "Match Any Query"
-msgstr "Zachytit Jakýkoliv Dotaz"
+msgstr "Zachytit jakýkoliv dotaz"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
-msgstr "Maximální Velikost Pøílohy"
+msgstr "Maximální velikost pøílohy"
+
+#: lib/api.php:79
+#, fuzzy
+msgid "Maximum Number of Folders"
+msgstr "Byl dosa¾en maximální poèet pøíloh."
 
-#: templates/compose/compose.inc:484
+#: templates/compose/compose.inc:494
 msgid "Maximum number of attachments reached."
 msgstr "Byl dosa¾en maximální poèet pøíloh."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:489
 msgid "Maximum total attachment size reached."
 msgstr "Byla dosa¾ena maximální velikost pøíloh."
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
-msgstr "Zru¹ení Schùze"
+msgstr "Zru¹ení schùze"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
-msgstr "Informace o Schùzi"
+msgstr "Informace o schùzi"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
-msgstr "Navrh na Schùzi"
+msgstr "Návrh na schùzi"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
-msgstr "Odpovìï na Schùzi"
+msgstr "Odpovìï na schùzi"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
-msgstr "Aktualizace Schùze"
+msgstr "Aktualizace schùze"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
-msgstr "Po¾adavek na Aktualizaci Schùze"
+msgstr "Po¾adavek na aktualizaci schùze"
 
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
-msgstr "Menu pro Seznam Schránek"
+msgstr "Menu pro seznam slo¾ek"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Zpráva"
 
-#: compose.php:498 compose.php:525 compose.php:558 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
-msgstr "Vytvoøit Zprávu"
+msgstr "Vytvoøit zprávu"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:917
 msgid "Message Date"
-msgstr "Datum Zprávy"
+msgstr "Datum zprávy"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
-msgstr "Mo¾nosti Zpráv"
+msgstr "Mo¾nosti zpráv"
 
-#: search.php:349
+#: search.php:312
 msgid "Message Search"
-msgstr "Vyhledat Zprávu"
+msgstr "Vyhledat zprávu"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:921
 msgid "Message Size"
-msgstr "Velikost Zprávy"
+msgstr "Velikost zprávy"
 
-#: message.php:377
+#: message.php:384
 msgid "Message Source"
-msgstr "Zdrojový Kód Zprávy"
+msgstr "Zdrojový kód zprávy"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
-msgstr "Zobrazení Zprávy"
-
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Pole Zprávy"
+msgstr "Zobrazení zprávy"
 
 #: templates/search/main.inc:6
 msgid "Message flags"
-msgstr "Typ Zprávy"
+msgstr "Typ zprávy"
 
 #: templates/search/main.inc:83
 msgid "Message folders"
-msgstr "Schránky pro Zprávu"
+msgstr "Slo¾ky pro zprávu"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:329
 #, php-format
 msgid "Message from %s"
 msgstr "Zpráva od %s"
 
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Zpráva se shoduje"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Pole zprávy"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Pole zprávy"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Zpráva se shoduje"
 
-#: compose.php:740 compose.php:750
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
-msgstr "Zráva byla úspì¹nì pøesmìrována."
+msgstr "Zpráva byla úspì¹nì pøesmìrována."
 
-#: compose.php:983
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
-msgstr "Zpráva byla úspì¹nì odeoslána, ale nebyla ulo¾ena do %s"
+msgstr "Zpráva byla úspì¹nì odeslána, ale nebyla ulo¾ena do %s"
 
-#: compose.php:1027 compose.php:1042
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
-msgstr "Zpráva byla úspì¹nì odeoslána."
+msgstr "Zpráva byla úspì¹nì odeslána."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
-msgstr "Zpráv na stranu v zobrazení schránky."
+msgstr "Zpráv na stránku v zobrazení schránky."
 
-#: mailbox.php:301
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Zprávy do"
 
 #: templates/acl/acl.inc:29
 msgid "Modify"
-msgstr "Zmìòit"
+msgstr "Zmìnit"
 
 #: templates/compose/expand.inc:12
-#, php-format
-msgid "More than one address found for field '%s'."
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
 msgstr "Bylo nalezeno více adress pro pole '%s'."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2130,148 +2345,182 @@
 msgid "Move down"
 msgstr "Posunout dolù"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
-msgstr "Pøesunout do schránky"
+msgstr "Pøesunout do slo¾ky"
 
 #: templates/prefs/sourceselect.inc:314
 msgid "Move up"
 msgstr "Posunout nahoru"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Více èástí / alternativní"
 
-#: templates/smime/smime.inc:24 templates/pgp/pgp.inc:24
-#: templates/fetchmail/manage.inc:48
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Zobrazení zprávy"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "POZNÁMKA"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "POZNÁMKA"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:673
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Jméno"
 
 #: pgp.php:110
 msgid "Name and/or email can not be empty"
-msgstr "Nelze nechat jméno a/nebo email prázdný"
+msgstr "Nelze nechat jméno a/nebo email prázdné"
 
-#: lib/MIME/Viewer/itip.php:764
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
-msgstr "Potøebuje Zákrok"
+msgstr "Potøebuje akci"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Nikdy"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
-msgstr "Neukládat pøílohy."
+msgstr "Neukládat pøílohy"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Nová"
 
-#: lib/IMP.php:569
+#: lib/IMP.php:563
 msgid "New Folder"
-msgstr "Nová Schránka"
+msgstr "Nová slo¾ka"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
-msgstr "Nová Po¹ta"
+msgstr "Nová po¹ta"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Dal¹í zpráva"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Nové zprávy"
 
 #: templates/search/main.inc:19
 msgid "New messages"
-msgstr "Nové Zprávy"
+msgstr "Nové zprávy"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Dal¹í"
 
 #: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
-msgstr "Dal¹í Zpráva"
+msgstr "Dal¹í zpráva"
 
-#: mailbox.php:335
+#: mailbox.php:356
 msgid "Next Page"
-msgstr "Dal¹í Stránka"
+msgstr "Dal¹í stránka"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "Ne"
 
 #: smime.php:226
 msgid "No Certificate found"
-msgstr "Nebyl nalezen Certifikát"
+msgstr "Nebyl nalezen certifikát"
 
 #: templates/compose/encrypt_list.inc:5
 msgid "No Encryption"
-msgstr "Bez Kódování"
+msgstr "Bez ¹ifrování"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
-msgstr "®ádné Klíèe nejsou dostupné"
+msgstr "®ádné klíèe nejsou dostupné"
 
-#: mailbox.php:354
+#: mailbox.php:375
 #, php-format
 msgid "No Messages"
-msgstr "®ádné Zprávy"
+msgstr "®ádné zprávy"
 
 #: pgp.php:137
 msgid "No PGP public key imported."
 msgstr "®ádný veøejný PGP klíè nebyl importován."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
-msgstr "®ádný Soukromý Certifikát Nebyl Nalezen"
+msgstr "®ádný osobní certifikát nebyl nalezen"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Náhled"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
-msgstr "®ádný Veøejný Klíè Nebyl Nalezen"
+msgstr "®ádný veøejný klíè nebyl nalezen"
 
 #: smime.php:151
 msgid "No S/MIME public key imported."
-msgstr "®ádný Veøejných S/MIME klíè nebyl importován."
+msgstr "®ádný veøejný S/MIME klíè nebyl importován."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Pøíloha nebyla nalezena."
 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Informace o %s veøejném klíèi"
+
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
-msgstr "Nebyla vybrána ¾ádná schránka."
+msgstr "Nebyla vybrána ¾ádná slo¾ka."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
-msgstr "®ádná schránka není kontrolována zdali obsahuje nové zprávy."
+msgstr "®ádná slo¾ka není kontrolována na pøítomnost nových zpráv."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
-msgstr "®ádná schránka nebyla urèena"
+msgstr "®ádná slo¾ka nebyla urèena"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
-msgstr "®ádné schránky neobsahují nové zprávy"
+msgstr "®ádná slo¾ka neobsahuje nové zprávy"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
-msgstr "®ádné schránky neobsahují neprohlédnuté zprávy"
+msgstr "®ádná slo¾ka neobsahuje neprohlédnuté zprávy"
 
-#: lib/Compose.php:231
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "®ádný text ve zprávì"
 
-#: lib/Mailbox.php:1134
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
-msgstr "Va¹im vyhledávacím kritériím neodpovídá ¾adná zpráva."
+msgstr "Va¹im vyhledávacím kritériím neodpovídá ¾ádná zpráva."
 
 #: pgp.php:189
 msgid "No personal PGP private key imported."
-msgstr "®ádný z Va¹ich osobních PGP klíèù nebyl importován."
+msgstr "®ádný z Va¹ich osobních privátních PGP klíèù nebyl importován."
 
 #: pgp.php:165
 msgid "No personal PGP public key imported."
-msgstr "®ádný z Va¹ich veøejných PGP klíèù nebyl importován."
+msgstr "®ádný z Va¹ich osobních veøejných PGP klíèù nebyl importován."
 
 #: smime.php:201
 msgid "No personal S/MIME certificates imported."
@@ -2281,53 +2530,57 @@
 msgid "No spellchecking program configured."
 msgstr "®ádná kontrola pravopisu není k dispozici."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "®ádné pravopisné chyby"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "®ádné návrhy"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 msgid "No user specified."
 msgstr "Nebyl uveden ¾ádný u¾ivatel."
 
-#: lib/MIME/Viewer/itip.php:694
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
-msgstr "Není Úèastníkem"
+msgstr "Není úèastníkem"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/mailbox/navbar.inc:11 lib/MIME/Viewer/itip.php:651
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "®ádný"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normální"
 
 #: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
-msgstr "Nebylo Smazáno"
+msgstr "Nebylo smazáno"
 
 #: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
 #: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
-msgstr "®ádný Draft"
+msgstr "®ádná rozepsaná zpráva"
 
 #: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
 #: templates/mailbox/navbar.inc:34
 msgid "Not Important"
-msgstr "Není Dùle¾ité"
+msgstr "Není dùle¾ité"
 
 #: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
-msgstr "Není Osobní"
+msgstr "Není osobní"
 
-#: lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157 lib/Crypt/SMIME.php:166
-#: lib/Crypt/PGP.php:154
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
-msgstr "Neplatný veøejný klíè"
+msgstr "Neplatný veøejný klíè."
 
 #: templates/search/main.inc:67
 msgid "Not deleted messages"
@@ -2337,220 +2590,224 @@
 msgid "Not important messages"
 msgstr "Nedùle¾ité zprávy"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
-msgstr "Upozornìní: Tato operace mù¾e trvat dlouho."
+msgstr "Upozornìní: Tato operace mù¾e trvat dlouho"
+
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr ""
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
-"Poèet mìsícù po které budeme dr¾et nalinkované pøílohy po mìsíèních èi¹tìní."
+"Poèet mìsícù, po které budeme uchovávat pøílohy ulo¾ené jako odkazy pøi "
+"mìsíèních èi¹tìní."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
-"Poèet starých schránek s odeslanými zprávami, které by nemìly být vymazány "
+"Poèet starých slo¾ek s odeslanými zprávami, které by nemìly být vymazány "
 "(vymazávání mìsíènì)."
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:719
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-#: templates/smime/import_key.inc:47 templates/search/fields.inc:5
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "NEBO"
 
 #: templates/search/main.inc:15
 msgid "Old messages"
-msgstr "Staré Zprávy"
+msgstr "Staré zprávy"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
-msgstr "Staré schránky s poslanými zprávami, které se vyprazdòují."
+msgstr "Staré slo¾ky s odeslanou po¹tou, které se vyprazdòují."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
 msgid "Only display folders with unread messages in them?"
-msgstr "Zobrazit pouze schránky s neprohlédnutými zprávami?"
+msgstr "Zobrazit pouze slo¾ky s nepøeètenými zprávami?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
-msgstr "Tuto operaci lze provést pouze s jednou slo¾kou."
-
-#: templates/menu.inc:26 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "Ote_vøít Schránku"
+msgstr "Tuto akci lze provést pouze s jednou slo¾kou."
 
-#: templates/menu.inc:17 templates/menu.inc:20
-msgid "Open Folder"
-msgstr "Otevøít Schránku"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Otevøít slo¾ku"
 
-#: folders.php:385
+#: folders.php:427
 msgid "Opened Folder"
-msgstr "Schránka Otevøena"
+msgstr "Slo¾ka otevøena"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
-msgstr "Mo¾ní Úèastníci"
+msgstr "Mo¾ní úèastníci"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
-msgstr "Dal¹í Emailové Úèty"
+msgstr "Dal¹í po¹tovní úèty"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
-msgstr "Dal¹í Mo¾nosti"
+msgstr "Dal¹í mo¾nosti"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:294
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
 #: templates/compose/encrypt_list.inc:7
 msgid "PGP Encrypt Message"
-msgstr "PGP Kódování Zprávy"
+msgstr "PGP ¹ifrování zprávy"
 
-#: compose.php:351
+#: compose.php:358
 msgid "PGP Error: "
-msgstr "PGP Chyba: "
+msgstr "PGP chyba: "
 
-#: compose.php:330
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
-msgstr "PGP Chyba: Je potøeba heslo pro Vá¹ osobní klíè."
+msgstr "PGP chyba: Je potøeba heslo pro Vá¹ osobní privátní klíè."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP NENÍ Aktivováno"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "Mo¾nosti PGP"
 
 #: pgp.php:30
 msgid "PGP Passphrase Input"
-msgstr "Vlo¾it PGP Heslo"
+msgstr "Vlo¾it PGP heslo"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
-msgstr "Pou¾ití PGP klíèového páru vy¾aduje bezpeèného pøipojení (HTTPS)."
+msgstr ""
+"Pou¾ití PGP osobního klíèového páru vy¾aduje bezpeèné pøipojení (HTTPS)."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
-msgstr "Text Veøejného PGP Klíèe"
+msgstr "Text veøejného PGP klíèe"
 
 #: pgp.php:149
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr "Veøejný PGP Klíè pro \"%s (%s)\" byl úspì¹nì pøidán."
+msgstr "Veøejný PGP klíè pro \"%s (%s)\" byl úspì¹nì pøidán."
 
 #: pgp.php:245
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr "Veøejný PGP Klíè pro \"%s\" byl úspì¹nì vymazán."
+msgstr "Veøejný PGP klíè pro \"%s\" byl úspì¹nì vymazán."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
-msgstr "Veøejný PGP Svazek"
+msgstr "Veøejný svazek PGP klíèù"
 
 #: templates/compose/encrypt_list.inc:8
 msgid "PGP Sign Message"
-msgstr "Podepsat Zprávu Pomocí PGP"
+msgstr "Podepsat zprávu pomocí PGP"
 
 #: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
-msgstr "Podepsat/Kódovat Zprávu Pomocí PGP"
+msgstr "Podepsat/¹ifrovat zprávu pomocí PGP"
 
 #: pgp.php:202
 msgid "PGP private key successfully added."
-msgstr "PGP soukromý klíè byl úspì¹nì pøidán."
+msgstr "PGP privátní klíè byl úspì¹nì pøidán."
 
 #: pgp.php:177
 msgid "PGP public key successfully added."
 msgstr "PGP veøejný klíè byl úspì¹nì pøidán."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Tento systém nepodporuje PGP."
 
-#: lib/MIME/Viewer/pgp.php:212
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
-msgstr "PGP není aktivováno, digitální signaturu nelze ovìøit."
+msgstr "PGP není aktivováno, digitální podpis nelze ovìøit."
 
-#: lib/MIME/Viewer/pgp.php:299
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
-msgstr "PGP není aktivováno, zprávu nelze dekódovat."
+msgstr "PGP není aktivováno, zprávu nelze de¹ifrovat."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
+#, fuzzy
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "Podpora PGP potøebuje popup okna. Pokud Vá¹ prohlí¾eè zamezuje pou¾ití "
-"tìchto oken, je zapotøebí umo¾nit pou¾ití tìchto oken, jinak PGP nebude "
-"správnì pracovat."
+"tìchto oken, je zapotøebí umo¾nit jejich pou¾ití, jinak PGP nebude správnì "
+"pracovat."
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
-msgstr "POP3 (Automatické Detekce Protkolù)"
+msgstr "POP3 (Automatická detekce protokolù)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 pøes SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 pøes SSL (s neoficiálním certifikátem)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 pøes SSL (s neoficiálním certifikátem)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, bez TLS"
 
 #: templates/mailbox/header.inc:19
 #, php-format
 msgid "Page %d of %d"
-msgstr "Strana %d z %d"
+msgstr "Stránka %d z %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
-msgstr "Stránka s První Neprohlídnutou Zprávou"
+msgstr "Stránka s první neprohlédnutou zprávou"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
-msgstr "Stránka s Poslední Neprohlídnutou Zprávou"
+msgstr "Stránka s poslední neprohlédnutou zprávou"
 
 #: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Èást(i)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
-msgstr "Heslo (Opìt)"
+msgstr "Heslo (opìt)"
 
-#: pgp.php:310 smime.php:235
+#: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
-msgstr "Heslo bylo uspì¹nì poskytnuto."
+msgstr "Heslo bylo úspì¹nì poskytnuto."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Heslo:"
 
@@ -2562,61 +2819,68 @@
 msgid "Passphrases do not match"
 msgstr "Hesla se neshodují"
 
-#: templates/smime/import_key.inc:69 templates/login/login.inc:221
-#: templates/fetchmail/manage.inc:20
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Heslo"
 
 #: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
-msgstr "Provést operace údr¾by pøi pøihlá¹ení se do systému?"
+msgstr "Provést operace údr¾by pøi pøihlá¹ení do systému?"
 
 #: acl.php:76 acl.php:102
 msgid "Permissions for this user can not be changed."
-msgstr "Nelze zmìnit práva pro toho to u¾ivatele."
+msgstr "Nelze zmìnit práva pro toho u¾ivatele."
 
-#: mailbox.php:650 message.php:485 templates/mailbox/legend.inc:10
-#: templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Osobní"
 
 #: config/prefs.php.dist:14
 msgid "Personal Information"
-msgstr "Osobní Informace"
+msgstr "Osobní informace"
 
 #: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
-msgstr "Vá¹ PGP klíèový pár byl úspì¹nì vytvoøen."
+msgstr "Vá¹ osobní PGP klíèový pár byl úspì¹nì vytvoøen."
 
 #: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
-msgstr "Va¹e PGP klíèe byly úspì¹nì smazány."
+msgstr "Va¹e osobní PGP klíèe byly úspì¹nì smazány."
 
 #: smime.php:207
 msgid "Personal S/MIME certificates NOT imported: "
-msgstr "Osobních S/MIME certifikáty NEBYLY importovány:"
+msgstr "Osobní S/MIME certifikáty NEBYLY importovány:"
 
 #: smime.php:132
 msgid "Personal S/MIME keys deleted successfully."
-msgstr "Va¹e S/MIME klíèe byly úspì¹nì smazány."
+msgstr "Va¹e osobní S/MIME klíèe byly úspì¹nì smazány."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "Umístít Va¹i signaturu pøed pøeposlanou zprávou a také pøed odpovìdí?"
+msgstr "Umístít Va¹i signaturu pøed odpovìï a také pøed pøeposlanou zprávu?"
 
-#: compose.php:249
+#: compose.php:254
 msgid "Plaintext Version of Message"
-msgstr "Textová Verze Zprávy"
+msgstr "Textová verze zprávy"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
-msgstr "Prosím zadejte název nové schránky:"
+msgstr "Prosím zadejte název nové slo¾ky:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
-msgstr "Prosím zadejte název nové schránky:"
+msgstr "Prosím zadejte název nové slo¾ky:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Prosím zadejte nové jméno:"
 
@@ -2626,7 +2890,7 @@
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per %s session."
 msgstr ""
-"Prosím zadejte heslo k Va¹emu soukromému PGP klíèi. Heslo je nutné zadat "
+"Prosím zadejte heslo k Va¹emu privátnímu PGP klíèi. Heslo je nutné zadat "
 "pouze jednou za %s relaci."
 
 #: templates/smime/passphrase.inc:13
@@ -2635,91 +2899,86 @@
 "Please enter the passphrase for your S/MIME private key. You will only need "
 "to enter this passphrase once per %s session."
 msgstr ""
-"Prosím zadejte heslo k Va¹emu soukromému S/MIME klíèi. Heslo je nutné zadat "
+"Prosím zadejte heslo k Va¹emu privátnímu S/MIME klíèi. Heslo je nutné zadat "
 "pouze jednou za %s relaci."
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
 "log in again in your main window as well. This is to keep attackers from "
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
-"Prosím opìt se pøihla¹te, pokus si pøejete pokraèovat vytváøení zprávy. "
-"Pokud nepou¾íváte cookies A vytváøíte zprávu v popup oknì, bude ste se muset "
-"pøihlásit také ve Va¹em hlavním oknì. Takové to nastavení zabraòuje hackrùm "
+"Prosím opìt se pøihla¹te, pokud chcete pokraèovat ve vytváøení zprávy. Pokud "
+"nepou¾íváte cookies a vytváøíte zprávu v popup oknì, budete se muset "
+"pøihlásit také ve Va¹em hlavním oknì. Takovéto nastavení zabraòuje útoèníkùm "
 "zmocnit se Va¹í relaèní ID. Dìkujeme za pochopení."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Prosím zadejte Va¹e heslo."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Prosím zadejte Va¹e u¾ivatelské jméno."
 
-#: compose.php:79 lib/IMP.php:514
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Prosím opravte nejednoznaèné nebo neplatné adresy."
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
 msgstr ""
-"Prosím zkontrolujte následující informace a pak vyberte úkon z ní¾e "
+"Prosím zkontrolujte následující informace a pak vyberte akci z ní¾e "
 "uvedeného menu."
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Prosím vyberte nejdøíve slo¾ku a pak proveïte akci."
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
-msgstr "Prosím vyberte úkon z ní¾e uvedeného menu."
+msgstr "Prosím vyberte akci z ní¾e uvedeného menu."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Prosím vyberte nejménì jednu slo¾ku k prohledání."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Prosím vyberte pouze jednu slo¾ku pro tuto operaci."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Prosím vyberte nebo upravte v boxu vpravo:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Prosím vyberte nebo zmìòte dal¹í:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
-msgstr "Powered by Horde"
+msgstr "Zalo¾eno na Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Pøedcházet signaturu pomlèkami ('-- ')?"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Va¹e nastavení byla úspì¹nì ulo¾ena."
 
 #: templates/compose/attachments.inc:3
 msgid "Preview"
-msgstr "Ukázka"
+msgstr "Náhled"
 
 #: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
-msgstr "Pøedchozí Zpráva"
+msgstr "Pøedchozí zpráva"
 
-#: mailbox.php:326
+#: mailbox.php:347
 msgid "Previous Page"
-msgstr "Pøedchozí Stránka"
+msgstr "Pøedchozí stránka"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Tisk"
 
@@ -2727,94 +2986,93 @@
 msgid "Priority"
 msgstr "Dùle¾itost"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
-msgstr "Heslo pro Osobní Klíè"
+msgstr "Heslo pro privátní klíè"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
-msgstr "Zeptat se poka¾dé, kdyz se posílá pøíloha, implicitnì NE"
+msgstr "Zeptat se poka¾dé pøi posílání pøílohy, implicitnì NE"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
-msgstr "Zeptat se poka¾dé, kdyz se posílá pøíloha, implicitnì ANO"
+msgstr "Zeptat se poka¾dé pøi posílání pøílohy, implicitnì ANO"
 
 #: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
-msgstr "Podpora veøejných PGP serverù byla vypnutaa."
+msgstr "Podpora veøejných PGP klíèových serverù byla vypnuta."
 
 #: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Pur_ge Deleted"
-msgstr "Vyè_istit Smazané"
+msgstr "Vyè_istit smazané"
 
 #: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
-msgstr "Vyèistit Smazané"
+msgstr "Vyèistit smazané"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
-msgstr "Vyèistit Schránku(y)"
+msgstr "Vyèistit slo¾ku(y)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
-msgstr "Jak èasto vyprázdnit Ko¹:"
+msgstr "Jak èasto vyprazdòovat slo¾ku ko¹:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
-msgstr "Smazat zprávy z Ko¹e, které jsou star¹í ne¾ následující poèet dní."
+msgstr "Smazat ze slo¾ky ko¹e zprávy, které jsou star¹í ne¾ uvedený poèet dní."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
-msgstr "Smazat staré zprávy z Ko¹e?"
+msgstr "Smazat staré zprávy ze slo¾ky ko¹e?"
 
-#: lib/Maintenance/Task/purge_trash.php:63
-#, php-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Èistím %d zpráv(y) z Ko¹e."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Èistím %d zpráv(y) ze slo¾ky ko¹e."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Umístit následující text po @, kdy¾ zasálame zprávu a implicitní rozvinutí "
-"adres:"
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Èistím %d zpráv(y) ze slo¾ky ko¹e."
 
 #: templates/quota/quota.inc:17
 #, php-format
 msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
-msgstr "Stav Kvóty: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Stav kvóty: %.2fMB / %.2fMB  (%.2f%%)"
 
 #: templates/quota/quota.inc:21
 #, php-format
 msgid "Quota status: %.2fMB / NO LIMIT"
-msgstr "Stav Kvóty: %.2fMB / BEZ LIMITU"
+msgstr "Stav kvóty: %.2fMB / BEZ LIMITU"
 
 #: templates/quota/quota.inc:24
 #, php-format
 msgid "Quota status: NO LIMIT"
-msgstr "Stav Kvóty: BEZ LIMITU"
+msgstr "Stav kvóty: BEZ LIMITU"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
-msgid "Quoting %%f:"
-msgstr "Cituji %%f:"
+msgid "Quoting %f:"
+msgstr "Cituji %f:"
 
-#: templates/compose/compose.inc:377
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
-msgstr "®á_dost o Potvrzení Pøijetí"
+msgstr "®á_dost o potvrzení doruèení"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "Pøijato v"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Pøijato od"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Pøijato do"
 
@@ -2826,346 +3084,368 @@
 msgid "Redirect"
 msgstr "Pøesmìrovat"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
-msgstr "Pøesmìrovat Zprávu"
+msgstr "Pøesmìrovat zprávu"
 
-#: compose.php:703
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Pøesmìrovat tuto zprávu"
 
-#: compose.php:759
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Pøesmìrování selhalo."
 
-#: templates/compose/compose.inc:573
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
-msgstr "Obnovit Zobrazení Schránek:"
+msgstr "Obnovit zobrazení slo¾ek:"
 
-#: templates/mailbox/header.inc:4 templates/folders/head.inc:3
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "Obnovit"
 
 #: templates/folders/head.inc:3
 msgid "Reload View"
-msgstr "Obnovit Zobrazení"
+msgstr "Obnovit zobrazení"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
-msgstr "Zapamatovat si informaci o free/busy."
+msgstr "Zapomatovat si informaci o free/busy."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
-msgstr "Zapamatovat si poslední zobrazení"
+msgstr "Zapomatovat si poslední zobrazení"
 
 #: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
-msgstr "Vzdálená Schránka:"
+msgstr "Vzdálená schránka:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
-msgstr "Odstranit Pole s Vyhledávání"
+msgstr "Odstranit pole z vyhledávání"
 
 #: templates/prefs/sourceselect.inc:305
 msgid "Remove source"
 msgstr "Odstranit zdroj"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
-msgstr "Pøejmenovat Schránku(y)"
+msgstr "Pøejmenovat slo¾ku(y)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Pøejmenovat slo¾ku s odeslanými zprávami na zaèátku mìsíce?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "Pøejmenování \"%s\" na \"%s\" selhalo. Toto je zpráva od serveru"
+msgstr "Pøejmenování \"%s\" na \"%s\" selhalo. Toto je hlá¹ení od serveru"
 
 #: templates/message/navbar_actions.inc:10
 msgid "Repl_y to List"
-msgstr "Odpo_vìdìt Seznamu"
+msgstr "Odpo_vìdìt seznamu"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
-msgstr "Nahradit s:"
+msgstr "Nahradit:"
 
 #: templates/message/navbar_actions.inc:8
 msgid "Reply"
 msgstr "Odpovìdìt"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
-msgstr "Odpovìï Byla Zaslána."
+msgstr "Odpovìï byla odeslána."
 
 #: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
-msgstr "Odpovìdìt V¹em"
+msgstr "Odpovìdìt v¹em"
 
-#: compose.php:650
+#: compose.php:733
 msgid "Reply to All:"
-msgstr "Odpovìdìt V¹em:"
+msgstr "Odpovìdìt v¹em:"
 
 #: templates/message/navbar_actions.inc:10
 msgid "Reply to List"
-msgstr "Odpovìdìt Seznamu"
+msgstr "Odpovìdìt seznamu"
 
-#: compose.php:652
+#: compose.php:735
 msgid "Reply to List:"
-msgstr "Odpovìdìt Seznamu:"
+msgstr "Odpovìdìt seznamu:"
 
 #: templates/message/navbar_actions.inc:13
 msgid "Reply to _All"
-msgstr "Odpovìdìt _V¹em"
+msgstr "Odpovìdìt _v¹em"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
-msgstr "Odpovìï s Nestandardní Zprávou"
+msgstr "Odpovìï s nestandardní zprávou"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Odpovìdìt na free/busy na pøí¹tí 2 mìsíce."
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Odpovìdìt s po¾adovanou informací free/busy."
 
-#: message.php:260
+#: message.php:267
 msgid "Reply-To"
-msgstr "Odpovìdìt-komu: "
+msgstr "Odpovìdìt-komu"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Odpovìdìt-komu: "
 
-#: compose.php:648
+#: compose.php:731
 msgid "Reply:"
 msgstr "Odpovìï:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
-msgstr "Nahlásit jako Ham"
+msgstr "Nahlásit jako chtìné (ham)"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "Nahlásit jako Spam"
+msgstr "Nahlásit jako nechtìné (spam)"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
-msgstr "®ádost o _Potvrzení Pøijetí"
+msgstr "®ádost o _potvrzení pøeètení"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
-msgstr "®ádost o potvrzení pøijetí?"
+msgstr "®ádost o potvrzení doruèení?"
 
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
-msgstr "®ádost o Potvrzení Pøijetí"
+msgstr "®ádost o potvrzení pøeètení?"
 
-#: mailbox.php:187
+#: mailbox.php:189
 msgid "Requested message not found."
-msgstr "®ádná zpráva nebyla nalezena."
+msgstr "Po¾adovaná zpráva nebyla nalezena."
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
-msgstr "Po¾adovaní Úèastníci"
+msgstr "Po¾adovaní úèastníci"
 
-#: templates/search/header.inc:26 templates/search/main.inc:143
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
-msgstr "Vyèistit"
+msgstr "Výchozí nastavení"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
-msgstr "Byl Aktualizován Stav Odpovídajících."
+msgstr "Stav odpovídajících byl aktualizován."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Pokraèovat"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Pokraèovat v relaci"
 
-#: templates/fetchmail/account_select.inc:32
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Vytvoøit zprávu"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
-msgstr "Návrat k Zachycení Po¹ty"
+msgstr "Návrat ke stahování po¹ty"
 
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
-msgid "Return to Main Preferences Screen"
-msgstr "Návrat do Hlavního Nastavení"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
-msgstr "Návrat k Mo¾nostem"
-
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Návrat na Pøedchozí Stránku"
+msgstr "Návrat do mo¾ností"
 
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "Vrátit se do schránky po smazání, pøesunutí, nebo zkopírování zprávy?"
 
-#: lib/MIME/Viewer/itip.php:673
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Úloha"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:223
-#: lib/MIME/Viewer/pkcs7.php:405
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
 #: templates/compose/encrypt_list.inc:12
 msgid "S/MIME Encrypt Message"
-msgstr "S/MIME Kódovaná Zpráva"
+msgstr "S/MIME ¹ifrovaná zpráva"
 
-#: compose.php:387
+#: compose.php:394
 msgid "S/MIME Error: "
-msgstr "S/MIME Chyba: "
+msgstr "S/MIME chyba: "
 
-#: compose.php:366
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
-msgstr "S/MIME Chyba: Je potøeba hesla pro Vá¹ osobní klíè."
+msgstr "S/MIME chyba: Je potøeba heslo pro Vá¹ osobní privátní klíè."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME NENÍ Aktivováno"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "Mo¾nosti S/MIME"
 
 #: smime.php:49
 msgid "S/MIME Passphrase Input"
-msgstr "Vlo¾it S/MIME Heslo"
+msgstr "Vlo¾it S/MIME heslo"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
-"Je potøeba bezpeèného pøipojení k síti (HTTPS), aby jste mohli pou¾ít Vá¹ S/"
-"MIME klíèový pár"
+"Je potøeba bezpeèného pøipojení k síti (HTTPS), abyste mohli pou¾ít Vá¹ "
+"osobní S/MIME klíèový pár."
 
 #: smime.php:140
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
-msgstr "S/MIME Veøejný Klíè pro \"%s\" byl úspì¹nì smazán."
+msgstr "S/MIME veøejný klíè pro \"%s\" byl úspì¹nì smazán."
 
 #: smime.php:162
 msgid "S/MIME Public Key successfully added."
-msgstr "S/MIME Veøejný Klíè byl úspì¹nì pøidán."
+msgstr "S/MIME veøejný klíè byl úspì¹nì pøidán."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
-msgstr "S/MIME Veøejný Svazek"
+msgstr "S/MIME veøejný svazek klíèù"
 
 #: smime.php:211
 msgid "S/MIME Public/Private Keypair successfully added."
-msgstr "S/MIME Veøejný/Soukromý Klíèový Pár byl úspì¹nì pøidán."
+msgstr "S/MIME veøejný/privátní klíèový pár byl úspì¹nì pøidán."
 
 #: templates/compose/encrypt_list.inc:13
 msgid "S/MIME Sign Message"
-msgstr "S/MIME Oznaèená Zpráva"
+msgstr "S/MIME podepsaná zpráva"
 
 #: templates/compose/encrypt_list.inc:14
 msgid "S/MIME Sign/Encrypt Message"
-msgstr "S/MIME Oznaèená/Kódovaná Zpráva"
+msgstr "S/MIME podepsaná/¹ifrovaná zpráva"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Tento systém nepodporuje S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
-msgstr "Podpora S/MIME není aktivní, zprávu nelze dekódovat."
+msgstr "Podpora S/MIME není aktivována, zprávu nelze de¹ifrovat."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:173
+#, fuzzy
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr "Podpora S/MIME není aktivována, digitální podpis nelze ovìøit."
+
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
-msgstr "S/MIME není aktivováno, digitální signaturu nelze ovìøit."
+msgstr "Podpora S/MIME není aktivována, digitální podpis nelze ovìøit."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
+#, fuzzy
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "Podpora S/MIME potøebuje popup okna. Pokud Vá¹ prohlí¾eè zamezuje pou¾ití "
-"tìchto oken, je zapotøebí umo¾nit pou¾ití tìchto oken, jinak S/MIME nebude "
+"tìchto oken, je zapotøebí umo¾nit jejich pou¾ití, jinak S/MIME nebude "
 "správnì pracovat."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
-msgstr "P_øedmìt"
+msgstr "_Pøedmìt"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Ul_o¾it kopii do "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Ul_o¾it jako"
 
-#: search.php:353 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Ulo¾it"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
-msgstr "Ulo¾it Pøílohy se zprávou ve schránce pro odeslanou po¹tu?"
+msgstr "Ulo¾it pøílohy se zprávou ve slo¾ce pro odeslanou po¹tu?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
-msgstr "Ulo¾it Rozepsanou zprávu"
+msgstr "Ulo¾it rozepsanou zprávu"
+
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Ulo¾it jako"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:37
-#: templates/pgp/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/filters/prefs.inc:69
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
-msgstr "Mo¾nosti Ulo¾ení"
+msgstr "Ulo¾it mo¾nosti"
+
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Ulo¾it mo¾nosti"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
-msgstr "Ulo¾it _Rozepsanou zprávu"
+msgstr "Ulo¾it _rozepsanou zprávu"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Ulo¾it jako"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
-msgstr "Ulo¾it Rozepsanou zprávu jako neprohlédnutou zprávu?"
+msgstr "Ulo¾it rozepsanou zprávu jako neprohlédnutou?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
-msgstr "Ulo¾it automaticky pøíjemce do kontaktù?"
+msgstr "Ulo¾it automaticky pøíjemce do implicitního adresáøe?"
 
 #: templates/search/main.inc:127
 msgid "Save search as a virtual folder?"
-msgstr "Ulo¾it vyhledávání do virtuální schránky?"
+msgstr "Ulo¾it vyhledávání do virtuální slo¾ky?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Ulo¾it odeslanou po¹tu?"
 
-#: compose.php:1112
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
-msgstr "Nepodaøilo se ulo¾it rozepsanou zprávu. Toto je zpráva ze serveru: %s"
+msgstr "Nepodaøilo se ulo¾it rozepsanou zprávu. Toto je hlá¹ení ze serveru: %s"
 
-#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:197
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Vyhledávání"
 
@@ -3174,17 +3454,18 @@
 msgid "Search %s"
 msgstr "Vyhledávání %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Vyhledávání Po¹ty"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Ulo¾it mo¾nosti"
 
-#: search.php:306
+#: search.php:265
 msgid "Search Results"
-msgstr "Výsledky Vyhledávání"
+msgstr "Výsledky vyhledávání"
 
 #: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
-msgstr "Prohlídnuté"
+msgstr "Prohlédnuté"
 
 #: templates/mailbox/navbar.inc:9
 msgid "Select"
@@ -3192,9 +3473,9 @@
 
 #: templates/fetchmail/manage.inc:70
 msgid "Select Another Account"
-msgstr "Vybrat Jiný Úèet"
+msgstr "Vybrat jiný úèet"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Vybrat datum"
 
@@ -3202,9 +3483,14 @@
 msgid "Select a field"
 msgstr "Vybrat pole"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Vybrat datum"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
-msgstr "Vyberat zdroj Kontaktù pro pøidávaní a vyhledávání adres"
+msgstr "Volba zdrojù adresáøe pro pøidávaní a vyhledávání adres."
 
 #: templates/search/main.inc:88
 msgid "Select all"
@@ -3222,46 +3508,51 @@
 msgid "Select none"
 msgstr "Nevybráno"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
-msgstr "Vybrat typ serveru"
+msgstr "Vybrat typ po¹tovního serveru"
 
 #: templates/prefs/sourceselect.inc:309
 msgid "Selected Address books:"
-msgstr "Vybrané Kontakty:"
+msgstr "Vybraný zdroj adresáøù:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
-msgstr "Poslat Klíè Veøejnému Klíèovému serveru"
+msgstr "Poslat klíè veøejnému klíèovému serveru"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
-msgstr "Poslat Nejaktuálnìj¹í Informace"
+msgstr "Poslat nejaktuálnìj¹í informace"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Poslat MDN pokud je ¾ádáno odesílatelem?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
-msgstr "Zaslat Zprávu"
+msgstr "Odeslat zprávu"
 
-#: folders.php:363
+#: config/prefs.php.dist:703
+#, fuzzy
+msgid "Send read receipt when requested by the sender?"
+msgstr "Poslat MDN pokud je ¾ádáno odesílatelem?"
+
+#: folders.php:397
 msgid "Sent mail folder"
-msgstr "Schránka s odeslanou po¹tou"
+msgstr "Slo¾ka s odeslanou po¹tou"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
-msgstr "Schránka s odeslanou po¹tou:"
+msgstr "Slo¾ka s odeslanou po¹tou:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Server"
 
 #: config/prefs.php.dist:23
 msgid "Server and Folder Information"
-msgstr "Informace o serveru a schránkách"
+msgstr "Informace o serveru a slo¾kách"
 
 #: templates/fetchmail/manage.inc:23
 msgid "Server:"
@@ -3269,271 +3560,299 @@
 
 #: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
-msgstr "Nastavit akce provádìné pøi pøesouvání a mazání zpráv."
+msgstr "Nastavení akcí provádìných pøi pøesouvání a mazání zpráv."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Nastavit pøi vytváøení zpráv hlavièku X-Priority?"
 
 #: config/prefs.php.dist:31
 msgid "Share Folders"
-msgstr "Sdílené Schránky"
+msgstr "Sdílené slo¾ky"
 
 #: templates/acl/acl.inc:86
 msgid "Share mail folders"
-msgstr "Sdílet po¹tovní schránky"
+msgstr "Sdílet po¹tovní slo¾ky"
 
 #: config/prefs.php.dist:32
 msgid "Share your mail folders with other users."
-msgstr "Sdílet po¹tovní schránky s jiným u¾ivatelem."
+msgstr "Sdílet po¹tovní slo¾ky s jinými u¾ivateli."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
-"Jaké ma být implicitní nastavení pro velké bloky citovaního textu Ukryté "
-"nebo Zobrazené? Lze jednodu¹e pøepnou bez ohledu na výbìr."
+"Má být implicitní nastavení pro velké bloky citovaného textu zobrazené nebo "
+"ukryté? Lze jednodu¹e pøepnout bez ohledu na výbìr."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
-msgstr "Mají se hledat PGP Data v text/plain zprávì?"
+msgstr "Mají se hledat PGP data v tìle text/plain zpráv?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Má se okno pro vytvoøení zprávy uzavøít po ulo¾ení rozepsané zprávy?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
-msgstr "Má se Vá¹ veøejný PGP klíè implicitnì pøipojit k zaslaným zprávám?"
+msgstr "Má být Vá¹ veøejný PGP klíè implicitnì pøipojován k Va¹im zprávám?"
 
 #: templates/search/main.inc:92
 msgid "Show All Folders"
-msgstr "Zobrazit V¹echny Schránky"
+msgstr "Zobrazit v¹echny slo¾ky"
 
 #: templates/message/headers.inc:67
 msgid "Show All Headers"
-msgstr "Zobrazit V¹echny Hlavièky"
+msgstr "Zobrazit v¹echny hlavièky"
 
-#: mailbox.php:344
+#: mailbox.php:365
 msgid "Show Deleted"
-msgstr "Zobrazit Smazané"
+msgstr "Zobrazit smazané"
 
 #: templates/message/headers.inc:61
 msgid "Show Limited Headers"
-msgstr "Zobrazit Vybrané Hlavièky"
+msgstr "Zobrazit redukované hlavièky"
 
 #: templates/message/headers.inc:70
 msgid "Show Mailing List Information"
-msgstr "Zobrazit Informace o Konferenci"
+msgstr "Zobrazit informace o elektronické konferenci"
 
 #: templates/search/main.inc:92
 msgid "Show Only Subscribed Folders"
-msgstr "Zobrazit Pouze Aktivované Schránky"
+msgstr "Zobrazit pouze aktivované slo¾ky"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Show Unsubscribed"
-msgstr "Zobrazit Neaktivní"
+msgstr "Zobrazit neaktivní"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
-msgstr "Zobrazit ikonku pro odstranìní pøíloh ze zpráv?"
+msgstr "Zobrazit ikonu pro odstranìní pøíloh ze zpráv?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
-msgstr "Zobrazit legendu v pøíchozí po¹tì?"
+msgstr "Zobrazit legendu v zobrazení schránky?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
-msgstr "Zobrazit ukázky pouze pro neprohlédnuté zprávy?"
+msgstr "Zobrazit náhledy pouze pro nepøeètené zprávy?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
-msgstr "Zobrazit ukázky v tipech?"
+msgstr "Zobrazit náhledy v tipech?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
-msgstr "Zobrazit ikonku Zachytit Po¹tu v nabítkové li¹tì?"
+msgstr "Zobrazit ikonu stahování po¹ty v li¹tì menu?"
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:95
 msgid "Show the Images"
-msgstr "Zobrazit Obrázky"
+msgstr "Zobrazit obrázky"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
-msgstr "Zobrazit ikonku Filtrování v nabítkové li¹tì?"
+msgstr "Zobrazit ikonu filtrování v li¹tì menu?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
-msgstr "Zobrazit celkový poèet zpráv ve schránce"
+msgstr "Zobrazit celkový poèet zpráv ve slo¾ce?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "Ukázáno"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Ve_likost"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr "Registrovat se pokud jste se je¹tì neregistrovali"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
-msgstr "Potvrzená"
+msgstr "Podepsaná"
 
 #: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Velikost"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Smìr Tøídìní"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
-msgstr "Setøídit podle Poøadí Pøijetí"
+msgstr "Setøídit podle poøadí doruèení"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
-msgstr "Setøídit podle Data"
+msgstr "Setøídit podle data"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
-msgstr "Setøidit podle Adresy Odesílatele"
+msgstr "Setøídit podle adresy odesílatele"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
-msgstr "Setøidit podle Velikost Zprávy"
+msgstr "Setøídit podle velikosti zprávy"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
-msgstr "Setøidit podle Pøedmìtu"
+msgstr "Setøídit podle pøedmìtu"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
-msgstr "Setøidit podle Souvislosti"
+msgstr "Setøídit podle souvislosti"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
-msgstr "Setøidit podle Adresy Pøíjemce"
+msgstr "Setøídit podle adresy pøíjemce"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
-msgstr "Spamová schránka:"
+msgstr "Slo¾ka pro spam:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
-msgstr "Zvlá¹tní Znaky"
+msgstr "Zvlá¹tní znaky"
+
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
 
-#: templates/compose/compose.inc:334
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
-msgstr "Kontrola Pravopisu"
+msgstr "Kontrola pravopisu"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
-msgstr "Kontrolor Pravopisu"
+msgstr "Kontrolor pravopisu"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
-msgstr "Kontrola Pravopisu Dokonèena"
+msgstr "Kontrola pravopisu dokonèena"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Nalezené pravopisné chyby na stránce."
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr "Zaèátek"
 
-#: lib/MIME/Viewer/itip.php:673
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Stav"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:215
 msgid "Strip Attachment"
-msgstr "Odstranit Pøílohu"
+msgstr "Odstranit pøílohu"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
 msgstr "Odstranit øádkování?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Pøe_dmìt"
 
-#: message.php:261 search.php:157 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Pøedmìt"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:920
 msgid "Subject Field"
-msgstr "Pole Pøedmìt"
+msgstr "Pole pøedmìt"
 
-#: search.php:355 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Podat"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
-msgstr "Aktivovat Slo¾ku(y)"
+msgstr "Aktivovat slo¾ku(y)"
 
-#: lib/MIME/Viewer/pgp.php:393 lib/MIME/Viewer/pkcs7.php:364
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Úspì¹nì"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Návrhy"
 
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Shrnutí"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
-msgstr "Pøepnout Kompozièní Metodu"
+msgstr "Pøepnout kompozièní metodu"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
 msgstr "Pøepnout na HTML kompozici"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
 msgstr "Pøepnout na textovou kompozici"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr "Prozatímní: "
+
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
-msgstr "Prozatímnì Potvrzená ¾ádost"
+msgstr "Prozatímnì potvrzená ¾ádost"
 
-#: lib/MIME/Viewer/itip.php:747
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
-msgstr "Prozatímnì Potvrzeno"
+msgstr "Prozatímnì potvrzeno"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
-msgstr "conf.php neurèuje soubor definující podmínky pou¾ití"
+msgstr "Soubor definující podmínky pou¾ití není obsa¾en v conf.php"
+
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "Te_xt"
 
-#: config/prefs.php.dist:925
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
-msgstr "Sloupec Od: by mìl být linkován:"
+msgstr "Sloupec Od: by mìl být odkazován:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
-msgstr "Macintosh zdrojová vidlice"
+msgstr "Macintosh zdrojové rozdvojení"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
-msgstr "Macintosh zdrojová vidlice mù¾e být downloadována z %s."
+msgstr "Macintosh zdrojové rozdvojení mù¾e být sta¾eno z %s."
 
 #: fetchmailprefs.php:81
 #, php-format
@@ -3545,146 +3864,154 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Úèet \"%s\" byl ulo¾en."
 
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Adresa \"%s\" byla pøidána do %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Pøíloha nebyla nalezena."
 
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr "Data v kalendáøi jsou neplatná"
+
 #: templates/javascript/open_compose_win.js:37
 msgid ""
 "The compose window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
-"Okno pro vytváøení zpráv nelze otevøít. Zøejmì jste nastavili Vá¹ browser "
+"Okno pro vytváøení zpráv nelze otevøít. Zøejmì jste nastavili Vá¹ prohlí¾eè "
 "tak, aby blokoval popup okna?"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
-msgstr "Obsah soubory z Macintosh je ní¾e zobrazen."
+msgstr "Obsah souboru z Macintoshe je zobrazen ní¾e."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
-msgstr "Souèasná schránka(y) \"%s\" bude pøejmenována na \"%s\"."
+msgstr "Souèasná slo¾ka(y) \"%s\" bude pøejmenována na \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
-msgstr "Nelze obdr¾et seznam u¾ivatelù s pøístupem k této schránce"
+msgstr "Nelze získat seznam u¾ivatelù s pøístupem k této slo¾ce"
 
-#: compose.php:1121
+#: compose.php:1236
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
-msgstr "Rozepsaná zpráva byla ulo¾ena v \"%s\" schránce."
+msgstr "Rozepsaná zpráva byla ulo¾ena v \"%s\" slo¾ce."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
-msgstr "Událost byla pøidána na Vá¹ kalendáø."
+msgstr "Událost byla pøidána do Va¹eho kalendáøe."
 
 #: templates/compose/expand.inc:9
-#, php-format
-msgid "The field '%s' can't be expanded."
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
 msgstr "Pole '%s' nelze doplnit."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
-msgstr "Schránka \"%s\" u¾ existuje"
+msgstr "Slo¾ka \"%s\" u¾ existuje"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
-"Název Schránka \"%s\" obsahuje nepovolené znaky. Toto mù¾e zpùsobit "
-"problémy. Prosím kontaktujte svého systémového administrátora."
+"Název slo¾ky \"%s\" obsahuje nepovolené znaky. To mù¾e zpùsobit problémy. "
+"Prosím kontaktujte svého systémového administrátora."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr "Schránka \"%s\" byla vytvoøena, ale neni aktivována."
+msgstr "Slo¾ka \"%s\" byla vytvoøena, ale není aktivována."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "Schránka \"%s\" byla smazána, ale nebyla deaktivována."
+msgstr "Slo¾ka \"%s\" byla smazána, ale nebyla deaktivována."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "Schránka \"%s\" nebyla vytvoøena. Toto je zpráva ze serveru"
+msgstr "Slo¾ka \"%s\" nebyla vytvoøena. Toto je hlá¹ení serveru"
+
+#: lib/Folder.php:265
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "Slo¾ka \"%s\" nebyla smazána. Toto je hlá¹ení serveru"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
-msgstr "Schránka \"%s\" byla úspì¹nì vytvoøena."
+msgstr "Slo¾ka \"%s\" byla úspì¹nì vytvoøena."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
-msgstr "Schránka \"%s\" byla úspì¹nì smazána."
+msgstr "Slo¾ka \"%s\" byla úspì¹nì smazána."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
-msgstr "Schránka \"%s\" byla úspì¹nì pøejmenována na \"%s\"."
+msgstr "Slo¾ka \"%s\" byla úspì¹nì pøejmenována na \"%s\"."
 
-#: lib/Folder.php:373
-#, php-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "Schránka \"%s\" nebyla smazána. Toto je zpráva ze serveru"
-
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
-msgstr "Následující soubory byli pøilo¾eny k této èásti:"
+msgstr "Následující soubory byly pøilo¾eny k této èásti:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/open_saveimage_win.js:12
+#, fuzzy
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Okno pro vytváøení zpráv nelze otevøít. Zøejmì jste nastavili Vá¹ prohlí¾eè "
+"tak, aby blokoval popup okna?"
+
+#: lib/MIME/Viewer/html.php:97
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
-msgstr "Obrázek bude zobrazen, proto¾e odesílatel je ve Va¹ich kontaktech."
+msgstr "Obrázek bude zobrazen, proto¾e odesílatel je ve Va¹em adresáøi."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
-msgstr "Emailový server generoval následující chybové hlá¹ení:"
+msgstr "Po¹tovní server generoval následující chybové hlá¹ení:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
-msgstr "Emailový server generoval následující informaèní hlá¹ení:"
+msgstr "Po¹tovní server generoval následující informaèní hlá¹ení:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
-msgstr "Emailový server generoval následující hlá¹ení:"
+msgstr "Po¹tovní server generoval následující hlá¹ení:"
 
-#: lib/Message.php:645
+#: lib/Message.php:651
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Schránka %s je ji¾ prázdná."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
-"Zpráva \"%s\" od \"%s\" (%d bytù) pøekroèila limit pro zachycení po¹ty."
+"Zpráva \"%s\" od \"%s\" (%d bytù) pøekroèila limit pro stahování po¹ty."
 
 #: templates/contacts/contacts.inc:103
 msgid "The message being composed has been closed. Exiting."
 msgstr "Vytváøená zpráva byla uzavøena. Konèím."
 
-#: message.php:143
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Zpráva byla vymazána."
 
-#: lib/MIME/Viewer/pgp.php:397
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
 msgstr "Zpráva byla ovìøena."
 
-#: lib/MIME/Viewer/pkcs7.php:368
+#: lib/MIME/Viewer/pkcs7.php:384
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Zpráva byla ovìøena. Odesílatel: %s."
@@ -3694,198 +4021,220 @@
 "The passphrase window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
-"Nelze otevøít okno s heslem. Zøejmì jste nastavili Vá¹ browser tak, aby "
+"Nelze otevøít okno s heslem. Zøejmì jste nastavili Vá¹ prohlí¾eè tak, aby "
 "blokoval popup okna?"
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
-msgstr "Text PGP Veøejního Klíèe mù¾e být vzhlédnut %s."
+msgstr "Text PGP veøejného klíèe mù¾e být prohlédnut %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Po¾adovaný soubor v MS-TNEF pøíloze neexistuje."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
-msgstr "Po¾adovaný soubor v Zip pøíloze neexistuje."
+msgstr "Po¾adovaný soubor v zip pøíloze neexistuje."
 
-#: message.php:549
+#: message.php:547
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
 "from you when you have read this message. Please click %s to send the "
 "notification message."
 msgstr ""
-"Zasílatel této zprávy od Vás po¾aduje Message Disposition Notification a¾ si "
-"pøeètete zprávu. Prosím kliknìte %s pro zaslání této zprávy."
+"Odesílatel této zprávy od Vás po¾aduje potvrzení (Message Disposition "
+"Notification) po pøeètení zprávy. Prosím kliknìte %s pro odeslání této "
+"zprávy."
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "Server nebyl schopen vytvoøit miniaturu tohoto obrázku."
 
 #: templates/compose/compose.js:104
 msgid "The signature could not be replaced."
-msgstr "Nelze vymìnit signaturu."
+msgstr "Nelze nahradit signaturu."
 
 #: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
-msgstr "Signatura byla úspì¹nì vymìnìna."
+msgstr "Signatura byla úspì¹nì nahrazena."
 
 #: attachment.php:59
 msgid "The specified file does not exist."
 msgstr "Po¾adovaný soubor neexistuje."
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Úèet \"%s\" byl ulo¾en."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Úèet \"%s\" byl smazán."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Úèet \"%s\" byl smazán."
+
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
 msgstr "Úkol byl pøidán do Va¹eho seznamu úkolù."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Text zprávy"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
-msgstr "Text zprávy lze vzhlédnout %s."
+msgstr "Text zprávy lze prohlédnout %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Text navrácené zprávy"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
-msgstr "Text navrácené zprávy lze vzhlédnout %s."
+msgstr "Text navrácené zprávy lze prohlédnout %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Text zaslané zprávy"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
-msgstr "Text zaslané zprávy lze vzhlédnout %s."
+msgstr "Text zaslané zprávy lze prohlédnout %s."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "U¾ivatelova informace o free/busy byla úspì¹nì ulo¾ena."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
-msgstr "®ádné jiné èásti nelze zobrazit uvnitø zprávy."
+msgstr "®ádné jiné èásti nelze uvnitø zprávy zobrazit."
 
 #: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Tato schránka neobsahuje ¾adné zprávy."
 
-#: lib/Message.php:604
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "®ádné jiné èásti nelze uvnitø zprávy zobrazit."
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Pøi vyprazdòování %s do¹lo k chybì. Toto je zpráva ze serveru"
+msgstr "Pøi vyprazdòování %s do¹lo k chybì. Toto je hlá¹ení serveru"
 
-#: lib/Message.php:647
+#: lib/Message.php:653
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
-msgstr ""
-"Pøi vyprazdòování schránky do¹lo k chybì. Toto je zpráva ze serveru: %s"
+msgstr "Pøi vyprazdòování schránky do¹lo k chybì. Toto je hlá¹ení serveru: %s"
 
-#: lib/Message.php:613
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Pøi vyprazdòování schránky do¹lo k chybì. Toto je zpráva ze serveru"
+msgstr "Pøi vyprazdòování schránky do¹lo k chybì. Toto je hlá¹ení serveru"
 
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pøi kopírování zprávy z \"%s\" do \"%s\" do¹lo k chybì. Toto je zpráva ze "
+"Pøi kopírování zprávy z \"%s\" do \"%s\" do¹lo k chybì. Toto je hlá¹ení "
 "serveru"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Pøi mazání zpráv(y) ze schránky \"%s\" do¹lo k chybì. Toto je zpráva ze "
-"serveru"
+"Pøi mazání zpráv(y) ze slo¾ky \"%s\" do¹lo k chybì. Toto je hlá¹ení serveru"
 
-#: lib/Message.php:296
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pøi mazání zprávy ze schránky \"%s\" do¹lo k chybì. Toto je zpráva ze serveru"
+"Pøi mazání zprávy ze slo¾ky \"%s\" do¹lo k chybì. Toto je hlá¹ení serveru"
 
-#: lib/Message.php:230
+#: lib/Message.php:211
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
-msgstr "Pøi mazání zpráv do¹lo k chybì. Toto je zpráva ze serveru: %s"
+msgstr "Pøi mazání zpráv do¹lo k chybì. Toto je hlá¹ení serveru: %s"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:99
 #, php-format
 msgid "There was an error deleting the event: %s."
-msgstr "Nastala chyba pøi smázávání události: %s."
+msgstr "Nastala chyba pøi mazání události: %s."
 
-#: lib/MIME/Viewer/enriched.php:40 lib/MIME/Viewer/plain.php:55
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Do¹lo k chybì pøi zobrazování této èásti zprávy"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pøi oznaèování zpráv ve slo¾ce \"%s\" do¹lo k chybì. Toto je zpráva ze "
-"serveru"
+"Pøi oznaèování zpráv ve slo¾ce \"%s\" do¹lo k chybì. Toto je hlá¹ení serveru"
 
-#: folders.php:155
+#: folders.php:165
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Pøi importu %s do¹lo k chybì."
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Nastala chyba pøi importování události: %s."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Nastala chyba pøi importování úkolu: %s."
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "Nastala chyba pøi importování u¾ivatelovy informace o free/busy: %s."
 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pøi pøesunu zpráv z \"%s\" do \"%s\" do¹lo k chybì. Toto je zpráva ze serveru"
+"Pøi pøesunu zpráv z \"%s\" do \"%s\" do¹lo k chybì. Toto je hlá¹ení serveru"
 
-#: compose.php:1129
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
 msgstr "Pøi ukládání této rozepsané zprávy do¹lo k chybì."
 
-#: compose.php:905
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Pøi odesílání Va¹í zprávy: %s do¹lo k chybì"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Nastala chyba pøi aktualizaci události: %s."
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
-msgstr "Zpráva neobsahovala ¾ádný text"
+msgstr "Zpráva neobsahovala v této èásti ¾ádný text"
 
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
 msgstr "Tato HTML zpráva obsahuje obrázky."
 
@@ -3894,105 +4243,108 @@
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
-"Tato HTML zpráva obsahuje obrázky. Blokované obrazky vypadají následovnì:"
+"Tato HTML zpráva obsahuje obrázky. Blokované obrázky vypadají následovnì:"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
-msgstr "Tento Veøejný PGP Klíè byl pøilo¾en ke zprávì."
+msgstr "Tento veøejný PGP klíè byl pøilo¾en ke zprávì."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
-msgstr "Tento úkon není mo¾ný."
+msgstr "Tato akce není mo¾ná."
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
-msgstr "Tento úkon není je¹tì implementován..."
+msgstr "Tato akce není dosud implementována."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Toto mù¾e trvat nìkolik okam¾ikù. Jste si jistí, ¾e chcete pokraèovat?"
+msgstr "Toto mù¾e chvíli trvat. Jste si jistí, ¾e chcete pokraèovat?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
-msgstr "Tato zpráva obsahuje soubor z Macintosh."
+msgstr "Tato zpráva obsahuje soubor z Macintoshe."
 
-#: lib/MIME/Viewer/pkcs7.php:396
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
-msgstr ""
-"Tato zpráva obsahuje pøílohu, která je digitálnì oznaèená pomocí S/MIME."
+msgstr "Tato zpráva obsahuje pøílohu digitálnì podepsanou pomocí S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:400
+#: lib/MIME/Viewer/pkcs7.php:414
 msgid "This message contains an attachment that has been encrypted via S/MIME."
-msgstr "Tato zpráva obsahuje pøílohu, která je kódována pomocí S/MIME."
+msgstr "Tato zpráva obsahuje pøílohu ¹ifrovanou pomocí S/MIME."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
-"Tato zpráva obsahuje informaci o stavu doruèení, ale má neznámí formát."
+"Tato zpráva obsahuje informaci o stavu doruèení, ale má neznámý formát."
 
-#: lib/MIME/Viewer/pgp.php:319
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
-msgstr "Tato zpráva nevypadá jako správnì PGP kódovaná zpráva. Chyba: "
+msgstr "Tato zpráva nevypadá jako správnì PGP ¹ifrovaná zpráva. Chyba: "
 
-#: lib/MIME/Viewer/pgp.php:244 lib/MIME/Viewer/pgp.php:354
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Tato zpráva není ve správném PGP formátu (podle RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Tato zpráva není ve správném S/MIME formátu."
 
-#: lib/MIME/Viewer/pgp.php:209 lib/MIME/Viewer/pgp.php:420
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
-msgstr "Tato zpráva je digitálnì oznaèená pomocí PGP."
+msgstr "Tato zpráva je digitálnì podepsaná pomocí PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
-msgstr "Tato zpráva je digitálnì oznaèená pomocí S/MIME."
+msgstr "Tato zpráva je digitálnì podepsaná pomocí S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:224
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
-msgstr "Tato zpráva je kódována pomocí S/MIME."
+msgstr "Tato zpráva je ¹ifrovaná pomocí S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
-msgstr "Tato zpráva je kódována pomocí PGP"
+msgstr "Tato zpráva je ¹ifrovaná pomocí PGP"
 
-#: message.php:204
+#: message.php:211
 msgid "This message to"
 msgstr "Tato zpráva do"
 
 #: acl.php:46
 msgid "This server does not support sharing folders."
-msgstr "Tento server nepodporuje sdílení schránek."
+msgstr "Tento server nepodporuje sdílení slo¾ek."
 
 #: templates/contacts/contacts.inc:109
 msgid "This window must be called from a compose window."
-msgstr "Toto okno mu¾e být voláno pouze z okna vytvoøení zpráv"
+msgstr "Toto okno musí být voláno pouze z okna vytváøení zpráv."
+
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Zobrazit"
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
-msgstr "Zobrazení podle Souvislosti"
+msgstr "Zobrazení podle souvislosti"
 
-#: mailbox.php:560 message.php:257 search.php:145
-#: templates/mailbox/message_headers.inc:17
-#: templates/contacts/contacts.inc:221 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Komu"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:919
 msgid "To Address"
-msgstr "Na Adresu"
+msgstr "Na adresu"
 
 #: templates/prefs/sourceselect.inc:326
 msgid ""
@@ -4002,21 +4354,26 @@
 "Pokud si pøejete vybrat více polí, zmáèknìte a dr¾te klávesu Control (PC) "
 "nebo Command (Mac) a kliknìte na polo¾ku."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
-msgstr "Celková Velikost Pøíloh:"
+msgstr "Celková velikost pøíloh:"
 
-#: folders.php:354
+#: folders.php:388
 msgid "Trash folder"
-msgstr "Schránka Ko¹"
+msgstr "Slo¾ka ko¹e"
 
 #: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
-msgstr "Schránka Ko¹:"
+msgstr "Slo¾ka ko¹e:"
 
-#: lib/Quota/command.php:77 lib/Quota/courier.php:54 lib/Quota/cyrus.php:70
-#: lib/Quota/logfile.php:93 lib/Quota/mdaemon.php:51
-#: lib/Quota/mercury32.php:84
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Nelze zjistit kvótu"
 
@@ -4033,226 +4390,314 @@
 msgid "Undelete"
 msgstr "Obnovit smazané"
 
-#: mailbox.php:544 mailbox.php:556 lib/MIME/Headers.php:219
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
-msgstr "Utajení Pøíjemci"
+msgstr "Utajení pøíjemci"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Neovládáný komponent typu: %s"
 
-#: mailbox.php:521
+#: mailbox.php:565
 msgid "Unknown Date"
-msgstr "Neznámé Datum"
+msgstr "Neznámé datum"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
-msgstr "Neznámá Schùze"
+msgstr "Neznámá schùze"
 
-#: mailbox.php:572
+#: mailbox.php:618
 msgid "Unknown Recipient"
-msgstr "Neznámí Pøíjemce"
+msgstr "Neznámý pøíjemce"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
-msgstr "Unload Heslo"
+msgstr "Unload heslo"
 
 #: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Bezejmenné"
 
-#: mailbox.php:655 message.php:491 templates/message/navbar_navigate.inc:6
-#: templates/mailbox/legend.inc:5 templates/mailbox/navbar.inc:15
-#: templates/mailbox/navbar.inc:32
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Nepøeètené"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
-msgstr "Deaktivovat Schránku(y)"
+msgstr "Deaktivovat slo¾ku(y)"
 
-#: templates/compose/compose.inc:574
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
-msgstr "Aktualizovat Informace o Pøíloze"
+msgstr "Aktualizovat informace o pøíloze"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr "Aktualizovat stav odpovídajícího"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
-msgstr "Upload"
+msgstr "Pøenos"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
-msgstr "Pou¾ít Implicitní Hodnotu"
+msgstr "Pou¾ít implicitní hodnotu"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
-msgstr "Pou¾ít IMAP aktivaci schránek?"
+msgstr "Pou¾ít IMAP aktivaci slo¾ek?"
+
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Virtuální slo¾ky"
 
-#: templates/acl/acl.inc:140
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "U¾ivatel"
 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
-msgstr "U¾ivatel '%s' úspì¹nì poskytl zmínìná práva pro schránku '%s'."
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "U¾ivatel '%s' úspì¹nì poskytnul zmínìná práva pro slo¾ku '%s'."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:177
 msgid "Username"
-msgstr "U¾ivatelské Jméno"
+msgstr "U¾ivatelské jméno"
 
 #: templates/fetchmail/manage.inc:17
 msgid "Username:"
-msgstr "U¾ivatelské Jméno:"
+msgstr "U¾ivatelské jméno:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Zobrazit"
 
-#: lib/MIME/Viewer/tnef.php:112 lib/MIME/Viewer/zip.php:95
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
-msgstr "Zobrazit %s"
+msgstr "zobrazit %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
-msgstr "Zobrazit %s Veøejný Klíè"
+msgstr "Zobrazit %s veøejný klíè"
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:116
 msgid "View HTML content in a separate window"
-msgstr "Zobrazení HTML obsahu v dal¹ím oknì."
+msgstr "Zobrazení HTML obsahu v novém oknì"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Nové zprávy"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
-msgstr "Zobrazit Vá¹ Soukromý Klíè"
+msgstr "Zobrazit osobní privátní klíè"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
-msgstr "Zobrazit Vá¹ Veøejný Klíè"
+msgstr "Zobrazit osobní veøejný klíè"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
-msgstr "Zobrazit Souvislost"
+msgstr "Zobrazit souvislost"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
-msgstr "Zobrazit Thumbnail"
+msgstr "Zobrazit miniatury"
 
-#: lib/MIME/Viewer/pkcs7.php:404
+#: lib/MIME/Viewer/pkcs7.php:418
 msgid "View attachment in a separate window"
-msgstr "Zobrazení pøílohy v separátním oknì."
+msgstr "Zobrazení pøílohy v novém oknì"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Zobrazení obsahu v novém oknì"
+
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
 msgstr "Zobrazit událost"
 
-#: folders.php:346 mailbox.php:490
+#: folders.php:380 mailbox.php:534
 #, php-format
 msgid "View messages in %s"
 msgstr "Zobrazit zprávy v %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
-msgstr "Zobrazení schránek nebo pøíchozí po¹ty po pøihlá¹ení se do systému:"
+msgstr "Zobrazení schránek po pøihlá¹ení do systému:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
 msgstr "Zobrazit úkol"
 
-#: lib/MIME/Viewer/html.php:111
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
-msgstr "Zobrazit Obrázky"
+msgstr "Zobrazit obrázky"
 
-#: search.php:304
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
-msgstr "Virtuální Schránka \"%s\" byla úspì¹nì zalo¾ena."
+msgstr "Virtuální slo¾ka \"%s\" byla úspì¹nì zalo¾ena."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:118 lib/IMAP/Tree.php:308
-#: lib/IMAP/Tree.php:332 lib/IMAP/Tree.php:374
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
-msgstr "Virtuální Schránka"
+msgstr "Virtuální slo¾ky"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr "Virtuální slo¾ky vy¾adují oznaèení."
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "Virtuální slo¾ky"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Virtuální slo¾ky"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Virtuální slo¾ky"
 
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
-msgstr "Oznaèení virtuální schránky"
+msgstr "Oznaèení virtuální slo¾ky"
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr "Upozornìní"
 
-#: login.php:131
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
 msgstr "Vítejte v %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:619
+#, fuzzy
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "Smazat zprávy poté co byly nahlá¹eny jako nechtìné zprávy (spam)?"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr ""
-"Pøi mazání zpráv pøesunout zprávy do Ko¹e místo oznaèení jako vymazané?"
+"Pøi mazání zpráv pøesunout zprávy do slo¾ky ko¹e místo oznaèení jako "
+"vymazané?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
-msgstr "Pøi zobrazení nové schránky, na které stránce zaèít?"
+msgstr "Na které stránce zaèít pøi zobrazení nové schránky?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
-msgstr "Pøi ukládání odeslané po¹ty, mají se také ulo¾it pøílohy?"
+msgstr "Ukládat také pøílohy pøi ukládání odeslané po¹ty?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Bílá listina"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Zalomit text po tomto poètu znakù."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Ano"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
-msgstr "Sna¾íte se zachytit zprávy z následujících úètù:"
+msgstr "Sna¾íte se stáhnout zprávy z následujících úètù:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Pokou¹íte se smazat následující schránky:"
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Pokou¹íte se smazat následující slo¾ky:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Pokou¹íte se smazat následující slo¾ky:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
-msgstr "Kopírování/Pøesouvání do nové schránky."
+msgstr "Kopírování/pøesouvání do nové slo¾ky."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Vytváøíte podslo¾ku uvnitø "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Vytváøíte slo¾ku na nejvy¹¹í úrovni."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Vytváøíte slo¾ku na nejvy¹¹í úrovni."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Pøejmenováváte slo¾ku: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Úspì¹nì jste deaktivovali slo¾ku \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
 "Nesouhlasili jste z termíny pou¾ití toho to systému, proto se nemù¾ete "
-"pøihlásit so systému."
+"pøihlásit."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
-msgstr "Nedostateèná práva pro zmìnu pøístupových práv pro tuto schránku"
+msgstr "Nemáte oprávnìní pro zmìnu pøístupových práv pro tuto slo¾ku"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Tato zpráva byla pøeposlána v %%s následujícím pøíjemcùm: %s."
@@ -4266,55 +4711,60 @@
 msgid "You have 1 new message."
 msgstr "Máte 1 novou zprávu."
 
-#: templates/compose/attachments.js:116
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Máte 1 novou zprávu."
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
 msgstr ""
-"Máte alespoò jednu pøílohu, kterou jste jì¹t¹ neuploadovali. Jste si jistí, "
-"¾e chcete poslat tuto zprávu bez pøíloh?"
+"Máte alespoò jednu pøílohu, kterou jste dosud nepøenesli. Jste si jistí, ¾e "
+"chcete poslat tuto zprávu bez pøíloh?"
 
-#: lib/IMP.php:987
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Nová po¹ta v následující slo¾ce:"
 
-#: lib/IMP.php:992
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Nová po¹ta v následujících slo¾kách:"
 
-#: compose.php:136
+#: compose.php:153
 msgid "You must enter at least one recipient."
-msgstr "Musite udát alespoò jednoho pøíjemce."
+msgstr "Musíte zadat alespoò jednoho pøíjemce."
 
-#: lib/MIME/Viewer/pgp.php:306
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
-"Pokud chcete pøeèíst tuto zprávu, musíte zadat heslo Va¹eho soukromého PGP "
+"Chcete-li pøeèíst tuto zprávu, musíte zadat heslo Va¹eho privátního PGP "
 "klíèe."
 
-#: lib/MIME/Viewer/pkcs7.php:235
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
-"Pokud chcete pøeèíst tuto zprávu, musíte zadat heslo Va¹eho soukromého S/"
-"MIME klíèe."
+"Chcete-li pøeèíst tuto zprávu, musíte zadat heslo Va¹eho privátního S/MIME "
+"klíèe."
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
-msgstr "Musíte nejdøíve vybrat cílovou schránku."
+msgstr "Musíte nejprve vybrat cílovou schránku."
 
 #: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
-msgstr "Musíte vybrat, který úèet chcete smazat."
+msgstr "Musíte vybrat úèet, který chcete smazat."
 
 #: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
-msgstr "Musíte nejdøíve vybrat emailovou adresu."
+msgstr "Musíte nejprve vybrat emailovou adresu."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Musíte nejdøíve vybrat alespoò jednu zprávu."
 
@@ -4324,180 +4774,174 @@
 
 #: templates/compose/attachments.js:29
 msgid "You must specify at least one file to attach."
-msgstr "Musíte zadat alespoò jeden soubor, který chcete jako pøílohu."
+msgstr "Musíte zadat alespoò jeden soubor pøílohy."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Potøebujete aktivovat '%s' ve Va¹ich mo¾nostech pro operace údr¾by."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Tato zpráva byla pøesmìrována na %s v %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
-msgstr "Na tuto zprávu bulo odpovìzeno v %s."
+msgstr "Na tuto zprávu bylo odpovìzeno v %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
-msgstr "Schránka \"%s\" nebyla aktivována. Toto je zpráva ze serveru"
+msgstr "Slo¾ka \"%s\" nebyla aktivována. Toto je hlá¹ení serveru"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr "Schránka \"%s\" nebyla aktivována. Toto je zpráva ze serveru"
+msgstr "Slo¾ka \"%s\" nebyla deaktivována. Toto je hlá¹ení serveru"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Úspì¹nì jste aktivovali slo¾ku \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Úspì¹nì jste deaktivovali slo¾ku \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
-msgstr "Va¹e Jméno"
+msgstr "Va¹e jméno"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
-msgstr "Va¹e PGP Veøejné/Soukromé Klíèe"
+msgstr "Va¹e PGP veøejné/privátní klíèe"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
-msgstr "Vá¹ Soukromý Klíè"
+msgstr "Vá¹ privátní klíè"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
-msgstr "Vá¹ Veøejný Klíè"
+msgstr "Vá¹ veøejný klíè"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Va¹e Odpovìï-komu: adresa: <i>(nepoviné)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Va¹e adresa pro Odpovìï-komu: <i>(nepovinné)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
-msgstr "Va¹e S/MIME Veøejné/Soukromé Certifikáty"
+msgstr "Va¹e S/MIME veøejné/privátní certifikáty"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "Va¹e úèty:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr "Va¹e aliasové adresy: <i>(nepovinné, vlo¾it jednu adresu na øádek)</i>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
-msgstr ""
-"Vá¹ prohlí¾eè nepodporuje zobrazení toho to typu obrázku v tìle zprávy."
-
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Vá¹ prohlí¾eè neumo¾òuje tisk tímto zpùsobem. Tisk spustíte stisknutím Ctrl/"
-"Option + P."
+msgstr "Vá¹ prohlí¾eè nepodporuje zobrazení tohoto typu obrázku v tìle zprávy."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
-msgstr "Vá¹e implicitní mno¾ina znakù pro odesílání zpráv:"
+msgstr "Va¹e implicitní znaková sada pro odesílání zpráv:"
 
 #: templates/prefs/encryptselect.inc:1
 msgid "Your default encryption method for sending messages:"
-msgstr "Vá¹e implicitní metoda kódování pro odesílání zpráv:"
+msgstr "Va¹e implicitní metoda ¹ifrování pro odesílání zpráv:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Va¹e zpráva byla úspì¹nì doruèena."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Va¹e signatura:"
 
-#: compose.php:1163 mailbox.php:505 message.php:281 lib/Compose.php:731
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
-msgstr "[®ádný Pøedmìt]"
+msgstr "[®ádný pøedmìt]"
 
-#: templates/compose/compose.inc:216
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
-msgstr "_Skrytá Kopie"
+msgstr "_Skrytá kopie"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
-msgstr "_Èerná Listina"
+msgstr "Èe_rná listina"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Kopie"
 
-#: lib/IMP.php:888
-msgid "_Compose"
-msgstr "_Vytvoøit"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
-msgstr "_Smazat"
+msgstr "Smaza_t"
 
-#: lib/IMP.php:890
+#: lib/IMP.php:979
 msgid "_Folders"
-msgstr "_Schránky"
+msgstr "_Slo¾ky"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identita"
 
-#: lib/IMP.php:881
+#: lib/IMP.php:961
 msgid "_Inbox"
-msgstr "_Pøíchozí Po¹ta"
+msgstr "_Po¹ta"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "_Odhlá¹ení"
 
-#: message.php:377
+#: message.php:384
 msgid "_Message Source"
-msgstr "_Zdrojový Kód Zprávy"
+msgstr "_Zdrojový kód zprávy"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Nové zprávy"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Tisk"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "_Dùle¾itost"
 
-#: mailbox.php:379
+#: mailbox.php:418
 #, php-format
 msgid "_Refresh %s"
-msgstr "_Obnovit %s"
+msgstr "O_bnovit %s"
 
 #: templates/message/navbar_actions.inc:8
 msgid "_Reply"
 msgstr "_Odpovìdìt"
 
-#: lib/IMP.php:892
+#: lib/IMP.php:981
 msgid "_Search"
-msgstr "_Vyhledat"
+msgstr "Vy_hledat"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
-msgstr "_Zaslat Zprávu"
+msgstr "_Zaslat zprávu"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_Souvislost"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Komu"
 
@@ -4505,62 +4949,127 @@
 msgid "_Undelete"
 msgstr "_Obnovit smazané"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
-msgstr "_Zobrazit Souvislost"
+msgstr "_Zobrazit souvislost"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
-msgstr "_Bílá listina"
+msgstr "Bílá _listina"
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
 
-#: lib/Compose.php:344
+#: lib/Compose.php:440
 msgid "attachment"
 msgstr "pøíloha"
 
-#: view.php:102
+#: view.php:99
 msgid "attachments.zip"
 msgstr "prilohy.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "bytes"
 msgstr "bytù"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "od"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
 msgid "key"
 msgstr "klíè"
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
-msgstr "schránkový soubor"
+msgstr "soubor schránky"
 
-#: compose.php:966 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "jméno"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "¾ádný"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "nebo"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "chyba v pravopisu"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "chyby v pravopisu"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "chyba v pravopisu"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
 msgid "your blacklist"
-msgstr "Va¹e èerná Listina"
+msgstr "Va¹e èerná listina"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "Va¹e bílá listina"


--- orig/locale/ca_ES/help.xml
+++ mod/locale/ca_ES/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Horde: imp/locale/ca_ES/help.xml,v 1.10.6.1 2005/01/25 22:05:55 jan Exp $ -->
+<!-- $Horde: imp/locale/ca_ES/help.xml,v 1.10.6.5 2006/03/23 00:24:15 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Nou Missatge: Accions</title>
@@ -215,6 +215,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Cerca de Missatges</title>
     <heading>Criteri de la Cerca</heading>
@@ -668,6 +674,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -686,6 +698,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -715,4 +742,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/templates/message/navbar_actions.inc
+++ mod/templates/message/navbar_actions.inc
@@ -1,5 +1,5 @@
 <tr>
-<td align="left" colspan="3" class="control">
+<td colspan="3" class="control leftAlign">
 <?php if ($imp_headers->getFlag('deleted')): ?>
 <?php echo Horde::widget(Util::addParameter($self_link, 'actionID', 'undelete_message'), _("Undelete"), 'widget', '', '', _("Undelete"), true) ?>
 <?php else: ?>
@@ -14,7 +14,9 @@
 <?php endif; ?>
  | <?php echo Horde::widget(IMP::composeLink(array(), array('actionID' => 'forward', 'index' => $index, 'identity' => $identity, 'array_index' => $array_index)), _("Forward"), 'widget', '', '', _("Fo_rward"), true) ?>
  | <?php echo Horde::widget(IMP::composeLink(array(), array('actionID' => 'redirect_compose', 'index' => $index, 'array_index' => $array_index)), _("Redirect"), 'widget', '', '', _("Redirec_t"), true) ?>
+<?php if (isset($imp_search) && !$imp_search->searchMboxID()): ?>
  | <?php echo Horde::widget($thread_link, _("View Thread"), 'widget', '', '', _("_View Thread"), true) ?>
+<?php endif; ?>
 <?php if ($show_blacklist_link): ?>
  | <?php echo Horde::widget(Util::addParameter($self_link, 'actionID', 'blacklist'), _("Blacklist"), 'widget', '', '', _("_Blacklist"), true) ?>
 <?php endif; ?>
@@ -24,16 +26,16 @@
 <?php if (isset($source_link)): ?>
  | <?php echo $source_link . ' ' ?>
 <?php endif; ?>
-<?php if ($conf['user']['allow_resume_all'] || ($conf['user']['allow_resume_all_in_drafts'] && $imp['mailbox'] == IMP::preambleString() . $prefs->getValue('drafts_folder')) || ($imp_headers->getFlag('draft'))): ?>
- | <?php echo Horde::widget(IMP::composeLink(array(), array('actionID' => 'draft', 'mailbox' => $imp['mailbox'], 'index' => $index, 'array_index' => $array_index)), _("Resume"), 'widget', '', '', _("Resume"), true) ?>
+<?php if (!empty($conf['user']['allow_resume_all']) || (!empty($conf['user']['allow_resume_all_in_drafts']) && $mailbox_name == IMP::folderPref($prefs->getValue('drafts_folder'), true)) || ($imp_headers->getFlag('draft'))): ?>
+ | <?php echo Horde::widget(IMP::composeLink(array(), array('actionID' => 'draft', 'mailbox' => $mailbox_name, 'index' => $index, 'array_index' => $array_index)), _("Resume"), 'widget', '', '', _("Resume"), true) ?>
 <?php endif; ?>
  | <?php echo Horde::widget($save_link, _("Save as"), 'widget', '', '', _("Sa_ve as"), 2) ?>
- | <?php echo Horde::widget('', _("Print"), 'widget', '', "open_print_win('" . $print_link . "'); return false;", _("_Print"), true) ?>
-<?php if ($conf['spam']['reporting'] && $imp['mailbox'] != IMP::addPreambleString($prefs->getValue('spam_folder'))): ?>
- | <?php echo Horde::widget('', _("Report as Spam"), 'widget', '', "Submit('spam_report'); return false;", _("Report as Spam"), true) ?>
+ | <?php echo Horde::widget($print_link, _("Print"), 'widget', '_blank', 'popup(this.href); return false;', _("_Print"), true) ?>
+<?php if ($conf['spam']['reporting'] && ($conf['spam']['spamfolder'] || $mailbox_name != IMP::folderPref($prefs->getValue('spam_folder'), true))): ?>
+ | <?php echo Horde::widget('#', _("Report as Spam"), 'widget', '', "Submit('spam_report'); return false;", _("Report as Spam"), true) ?>
 <?php endif; ?>
-<?php if ($conf['notspam']['reporting'] &&  $imp['mailbox'] == IMP::addPreambleString($prefs->getValue('spam_folder'))): ?>
- | <?php echo Horde::widget('', _("Report as Innocent"), 'widget', '', "Submit('notspam_report'); return false;", _("Report as Innocent"), true) ?>
+<?php if ($conf['notspam']['reporting'] && (!$conf['notspam']['spamfolder'] || $mailbox_name == IMP::folderPref($prefs->getValue('spam_folder'), true))): ?>
+ | <?php echo Horde::widget('#', _("Report as Innocent"), 'widget', '', "Submit('notspam_report'); return false;", _("Report as Innocent"), true) ?>
 <?php endif; ?>
 </td>
 </tr>


--- orig/lib/Filter.php
+++ mod/lib/Filter.php
@@ -13,9 +13,9 @@
  *   mail/whitelistFrom
  *   mail/showWhitelist
  *
- * $Horde: imp/lib/Filter.php,v 1.56.10.5 2005/07/03 03:42:42 selsky Exp $
+ * $Horde: imp/lib/Filter.php,v 1.56.10.9 2006/02/04 19:09:51 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -27,17 +27,45 @@
 class IMP_Filter {
 
     /**
+     * Returns a reference to the global IMP_Filter object, only creating it
+     * if it doesn't already exist. This ensures that only one IMP_Filter
+     * instance is instantiated for any given session.
+     *
+     * This method must be invoked as:<code>
+     *   $imp_filter = &IMP_Filter::singleton();
+     * </code>
+     *
+     * @return IMP_Filter  The IMP_Filter instance.
+     */
+    function &singleton()
+    {
+        static $filter;
+
+        if (!isset($filter)) {
+            $filter = new IMP_Filter();
+        }
+
+        return $filter;
+    }
+
+    /**
      * Runs the filters if they are able to be applied manually.
      *
      * @param string $mbox  The mailbox to apply the filters to.
      */
     function filter($mbox)
     {
-        global $imp, $registry;
-
-        if ($imp['filteravail']) {
-            $params = array('imap' => $imp['stream'], 'mailbox' => IMP::serverString($mbox));
-            $registry->call('mail/applyFilters', array($params));
+        if ($_SESSION['imp']['filteravail']) {
+            if (isset($GLOBALS['imp_search']) &&
+                $GLOBALS['imp_search']->isSearchMbox($mbox)) {
+                $mbox_list = $GLOBALS['imp_search']->getSearchFolders($mbox);
+            } else {
+                $mbox_list = array($mbox);
+            }
+            foreach ($mbox_list as $val) {
+                $params = array('imap' => $GLOBALS['imp']['stream'], 'mailbox' => IMP::serverString($val));
+                $GLOBALS['registry']->call('mail/applyFilters', array($params));
+            }
         }
     }
 
@@ -48,7 +76,7 @@
      */
     function blacklistMessage($indices)
     {
-        IMP_Filter::_processBWlist($indices, _("your blacklist"), 'blacklistFrom', 'showBlacklist');
+        $this->_processBWlist($indices, _("your blacklist"), 'blacklistFrom', 'showBlacklist');
     }
 
     /**
@@ -58,7 +86,7 @@
      */
     function whitelistMessage($indices)
     {
-        IMP_Filter::_processBWlist($indices, _("your whitelist"), 'whitelistFrom', 'showWhitelist');
+        $this->_processBWlist($indices, _("your whitelist"), 'whitelistFrom', 'showWhitelist');
     }
 
     /**
@@ -75,8 +103,6 @@
      */
     function _processBWlist($indices, $descrip, $reg1, $reg2)
     {
-        global $notification, $registry;
-
         if (!($msgList = IMP::parseIndicesList($indices))) {
             return false;
         }
@@ -94,17 +120,16 @@
             foreach ($msgIndices as $msg) {
                 $imp_headers = &new IMP_Headers($msg);
                 $from = $imp_headers->getFromAddress();
-                $notification->push(sprintf(_("The address \"%s\" has been added to %s."), $from, $descrip));
                 $addr[] = $from;
             }
         }
 
-        $registry->call('mail/' . $reg1, array($addr));
+        $GLOBALS['registry']->call('mail/' . $reg1, array($addr));
 
         /* Add link to filter management page. */
-        if ($registry->hasMethod('mail/' . $reg2)) {
-            $manage_link = Horde::link(Horde::url($registry->link('mail/' . $reg2)), sprintf(_("Filters: %s management page"), $descrip)) . _("HERE") . '</a>';
-            $notification->push(sprintf(_("Click %s to go to %s management page."), $manage_link, $descrip), 'horde.message', array('content.raw'));
+        if ($GLOBALS['registry']->hasMethod('mail/' . $reg2)) {
+            $manage_link = Horde::link(Horde::url($GLOBALS['registry']->link('mail/' . $reg2)), sprintf(_("Filters: %s management page"), $descrip)) . _("HERE") . '</a>';
+            $GLOBALS['notification']->push(sprintf(_("Click %s to go to %s management page."), $manage_link, $descrip), 'horde.message', array('content.raw'));
         }
     }
 


--- orig/templates/mailbox/actions.inc
+++ mod/templates/mailbox/actions.inc
@@ -1,46 +1,46 @@
 <tr>
-    <td class="control" colspan="6">
+ <td class="control" colspan="6">
 
-<table border="0" width="100%">
-<tr>
-    <td align="left">
+<table width="100%">
+ <tr>
+  <td class="leftAlign">
 <?php if ($trashMbox): ?>
-        <?php echo Horde::widget('', _("Delete"), 'widget', '', "if (confirm('" . addslashes(_("Are you sure you wish to permanently delete these messages?")) . "')) { Submit('delete_messages'); } return false;", _("_Delete")); ?>
+   <?php echo Horde::widget('#', _("Delete"), 'widget', '', "if (confirm('" . addslashes(_("Are you sure you wish to permanently delete these messages?")) . "')) { Submit('delete_messages'); } return false;", _("_Delete")); ?>
 <?php else: ?>
-        <?php echo Horde::widget('', _("Delete"), 'widget', '', "Submit('delete_messages'); return false;", _("_Delete")); ?>
+   <?php echo Horde::widget('#', _("Delete"), 'widget', '', "Submit('delete_messages'); return false;", _("_Delete")); ?>
 <?php endif; ?>
-<?php if (!$use_trash && strstr($imp['protocol'], 'imap') && !$prefs->getValue('delhide')): ?> |
-            <?php echo Horde::widget('', _("Undelete"), 'widget', '', "Submit('undelete_messages'); return false;", _("_Undelete")); ?>
+<?php if ($showdelete['purge'] || !is_null($vtrash)): ?>
+   | <?php echo Horde::widget('#', _("Undelete"), 'widget', '', "Submit('undelete_messages'); return false;", _("_Undelete")); ?>
 <?php endif; ?>
 <?php if ($show_blacklist_link): ?>
-        | <?php echo Horde::widget('', _("Blacklist"), 'widget', '', "Submit('blacklist'); return false;", _("_Blacklist")); ?>
+   | <?php echo Horde::widget('#', _("Blacklist"), 'widget', '', "Submit('blacklist'); return false;", _("_Blacklist")); ?>
 <?php endif; ?>
 <?php if ($show_whitelist_link): ?>
-        | <?php echo Horde::widget('', _("Whitelist"), 'widget', '', "Submit('whitelist'); return false;", _("_Whitelist")); ?>
-<?php endif; ?>
-    | <?php echo Horde::widget('', _("Forward"), 'widget', '', "Submit('fwd_digest'); return false;", _("Fo_rward")) ?>
-<?php if ($conf['spam']['reporting']): ?>
-<?php if ($imp['mailbox'] != IMP::addPreambleString($prefs->getValue('spam_folder'))): ?>
-    | <?php echo Horde::widget('', _("Report as Spam"), 'widget', '', "Submit('spam_report'); return false;", _("Report as Spam")); ?>
-<?php else: ?>
-    | <?php echo Horde::widget('', _("Report as Innocent"), 'widget', '', "Submit('notspam_report'); return false;", _("Report as Innocent")); ?>
+   | <?php echo Horde::widget('#', _("Whitelist"), 'widget', '', "Submit('whitelist'); return false;", _("_Whitelist")); ?>
 <?php endif; ?>
-<?php endif; ?>
-    </td>
-    <td align="right">
-<?php if ($showdelete): ?>
+   | <?php echo Horde::widget('#', _("Forward"), 'widget', '', "Submit('fwd_digest'); return false;", _("Fo_rward")) ?>
+<?php if ($conf['spam']['reporting'] && ($conf['spam']['spamfolder'] || $imp['mailbox'] != IMP::folderPref($prefs->getValue('spam_folder'), true))): ?>
+   | <?php echo Horde::widget('#', _("Report as Spam"), 'widget', '', "Submit('spam_report'); return false;", _("Report as Spam")); ?>
+<?php endif; ?>
+<?php if ($conf['notspam']['reporting'] && (!$conf['notspam']['spamfolder'] || $imp['mailbox'] == IMP::folderPref($prefs->getValue('spam_folder'), true))): ?>
+   | <?php echo Horde::widget('#', _("Report as Innocent"), 'widget', '', "Submit('notspam_report'); return false;", _("Report as Innocent")); ?>
+<?php endif; ?>
+   | <?php echo Horde::widget('#', _("View Messages"), 'widget', '', "Submit('view_messages'); return false;", _("View Messages")); ?>
+  </td>
+  <td class="rightAlign">
+<?php if ($showdelete['purge']): ?>
 <?php $mailbox_link = Util::addParameter($mailbox_url, 'page', $pageOb->page); ?>
-<?php if (!$prefs->isLocked('delhide')): ?>
-        <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'hide_deleted'), $deleted_prompt, 'widget', '', '', $deleted_prompt); ?> |
+<?php if (isset($deleted_prompt)): ?>
+   <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'hide_deleted'), $deleted_prompt, 'widget', '', '', $deleted_prompt); ?> |
 <?php endif; ?>
-        <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'expunge_mailbox'), _("Purge Deleted"), 'widget', '', '', _("Pur_ge Deleted")); ?>
+   <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'expunge_mailbox'), _("Purge Deleted"), 'widget', '', '', _("Pur_ge Deleted")); ?>
 <?php endif; ?>
 <?php if ($trashMbox): ?>
-        <?php echo Horde::widget(Util::addParameter($mailbox_url, 'actionID', 'empty_mailbox'), _("Empty Trash folder"), 'widget', '', "return confirm('" . addslashes(_("Are you sure you wish to empty this folder?")) . "');", _("Empty Trash folder")); ?>
+   <?php echo Horde::widget(Util::addParameter($mailbox_url, 'actionID', 'empty_mailbox'), _("Empty Trash folder"), 'widget', '', "return confirm('" . addslashes(_("Are you sure you wish to empty this folder?")) . "');", _("Empty Trash folder")); ?>
 <?php endif; ?>
-    </td>
-</tr>
+  </td>
+ </tr>
 </table>
 
-    </td>
+ </td>
 </tr>


--- orig/templates/compose/compose_expand.js
+++ mod/templates/compose/compose_expand.js
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 var busyExpanding = false;
@@ -46,7 +46,8 @@
     url += '&form_name=' + _escape(field.form.name);
 
     var status = document.getElementById('expanding' + field.name);
-    status.style.visibility = "visible";
+    status.innerHTML = '<?php echo _("Expanding") ?>';
+    status.style.visibility = 'visible';
 
     doc.location.replace(url);
 <?php endif; ?>


--- orig/lib/MIME/Viewer/itip.php
+++ mod/lib/MIME/Viewer/itip.php
@@ -4,9 +4,9 @@
  * and provides an option to import the data into a calendar source,
  * if one is available.
  *
- * $Horde: imp/lib/MIME/Viewer/itip.php,v 1.37.2.17 2005/10/09 20:11:14 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/itip.php,v 1.37.2.20 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2002-2005 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 2002-2006 Chuck Hagenbuch <chuck at horde.org>
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
@@ -61,14 +61,15 @@
 
         // Extract the data.
         $data = $this->mime_part->getContents();
-        $this->_getHeaders($params[0]);
+        if (empty($this->_headers) && is_a($params[0], 'IMP_Contents')) {
+            $this->_headers = $params[0]->getHeaderOb();
+        }
 
         // Parse the iCal file.
         $vCal = &new Horde_iCalendar();
         if (!$vCal->parsevCalendar($data)) {
-            $html = '<b>' . _("The calendar data is invalid") .
-                '</b><br /><pre>' . htmlspecialchars($data) . '</pre>';
-            return $html;
+            return '<h1>' . _("The calendar data is invalid") . '</h1>' .
+                '<pre>' . htmlspecialchars($data) . '</pre>';
         }
 
         // Check if we got vcard data with the wrong vcalendar mime
@@ -448,7 +449,7 @@
             }
         }
 
-        // Need to work out if we are inline and acutally need this.
+        // Need to work out if we are inline and actually need this.
         $html .= '</form>';
         if (MIME_Contents::viewAsAttachment()) {
             $html .= Util::bufferOutput('require', $registry->get('templates', 'horde') . '/common-footer.inc');
@@ -457,12 +458,14 @@
         return $html;
     }
 
-    function _row($label, $value)
+    /**
+     * Return text/html as the content-type.
+     *
+     * @return string "text/html" constant
+     */
+    function getType()
     {
-        if (substr($label, 0, 2) == 'DT') {
-            $value = strftime("%x %X", $value);
-        }
-        return '<tr><td valign="top" class="item">' . $label . '</td><td valign="top" class="item">' . $value . "</td></tr>\n";
+        return 'text/html; charset=' . NLS::getCharset();
     }
 
     /**
@@ -472,53 +475,52 @@
     {
         global $registry, $prefs;
 
-        $html = '<table cellspacing="1">';
-
+        $html = '';
         $desc = '';
-        $title = '';
         $sender = $vfb->getName();
         switch ($this->_method) {
         case 'PUBLISH':
             $desc = _("%s has sent you free/busy information.");
-            $title = _("Free/Busy Information");
             break;
 
         case 'REQUEST':
-            $desc = _("%s requests your free/busy information.");
-            $title = _("Free/Busy Request");
             $sender = $this->_headers->getValue('From');
+            $desc = _("%s requests your free/busy information.");
             break;
 
         case 'REPLY':
             $desc = _("%s has replied to a free/busy request.");
-            $title = _("Free/Busy Reply");
             break;
         }
 
-        $desc = sprintf($desc, $sender);
-
-        $html .= '<tr><td colspan="2" class="header">' . $title . '</td></tr>' .
-            '<tr><td colspan="2" class="control">' . $desc . '<br />' .
-            _("Please select an action from the menu below.") . '</td></tr>';
+        $html .= '<h1 class="header">' . sprintf($desc, $sender) . '</h1>';
 
-        if (count($this->_msgs)) {
+        if ($this->_msgs) {
             foreach ($this->_msgs[$id] as $msg) {
-                $html .= '<tr><td colspan="2" class="notice"><strong>' . Horde::img('alerts/' . $msg[0] . '.png', '', null, $registry->getImageDir('horde')) . $msg[1] . '</strong></td></tr>';
+                $html .= '<p class="notice">' . Horde::img('alerts/' . $msg[0] . '.png', '', null, $registry->getImageDir('horde')) . $msg[1] . '</p>';
             }
         }
 
         $start = $vfb->getAttribute('DTSTART');
         if (!is_a($start, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;%s</td></tr>', _("Start"), strftime($prefs->getValue('date_format') . ' ' . $prefs->getValue('time_format'), $start));
+            if (is_array($start)) {
+                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year'])) . '</p>';
+            } else {
+                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format') . ' ' . $prefs->getValue('time_format'), $start) . '</p>';
+            }
         }
 
         $end = $vfb->getAttribute('DTEND');
         if (!is_a($end, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;%s</td></tr>', _("End"), strftime($prefs->getValue('date_format') . ' ' . $prefs->getValue('time_format'), $end));
+            if (is_array($end)) {
+                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year'])) . '</p>';
+            } else {
+                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime("%x %X", $end) . '</p>';
+            }
         }
 
-        $html .= '<tr><td colspan="2" class="control"><b>' . _("Actions") . ':</b><br />' .
-            _("Choose an action:") . "&nbsp;<select name='action[$id]'>";
+        $html .= '<h2 class="smallheader">' . _("Actions") . '</h2>' .
+            '<select name="action[' . $id . ']">';
 
         switch ($this->_method) {
         case 'PUBLISH':
@@ -549,10 +551,7 @@
             break;
         }
 
-        $html .= sprintf('</select>&nbsp;<input type="submit" class="button" value="%s" /><br />', _("OK")) .
-            '</td></tr>' .
-            '</table>';
-        return $html;
+        return $html . '</select> <input type="submit" class="button" value="' . _("Go") . '/>';
     }
 
     /**
@@ -562,17 +561,14 @@
     {
         global $registry, $prefs;
 
-        $html = '<table cellspacing="1">';
-
+        $html = '';
         $desc = '';
-        $title = '';
         $sender = $vevent->organizerName();
         $options = array();
 
         switch ($this->_method) {
         case 'PUBLISH':
-            $desc = _("%s wishes to make you aware of %s.");
-            $title = _("Meeting Information");
+            $desc = _("%s wishes to make you aware of \"%s\".");
             if ($registry->hasMethod('calendar/import')) {
                 $options[] = '<option value="import">' .   _("Add this to my calendar") . '</option>';
             }
@@ -581,11 +577,10 @@
 
         case 'REQUEST':
             // Check that you are one of the attendees here.
-            $desc = _("%s requests your presence at %s.");
-            $title = _("Meeting Proposal");
+            $desc = _("%s requests your presence at \"%s\".");
             if ($registry->hasMethod('calendar/import')) {
-                $options[] = '<option value="accept-import">' .   _("Accept request and add it to my calendar") . '</option>';
-                $options[] = '<option value="import">' .   _("Add this to my calendar") . '</option>';
+                $options[] = '<option value="accept-import">' .   _("Accept and add to my calendar") . '</option>';
+                $options[] = '<option value="import">' .   _("Add to my calendar") . '</option>';
             }
             $options[] = '<option value="accept">' . _("Accept request") . '</option>';
             $options[] = '<option value="tentative">' . _("Tentatively Accept request") . '</option>';
@@ -594,13 +589,11 @@
             break;
 
         case 'ADD':
-            $desc = _("%s wishes to ammend %s.");
-            $title = _("Meeting Update");
+            $desc = _("%s wishes to ammend \"%s\".");
             break;
 
         case 'REFRESH':
-            $desc = _("%s wishes to receive the latest information about %s.");
-            $title = _("Meeting Update Request");
+            $desc = _("%s wishes to receive the latest information about \"%s\".");
             $options[] = '<option value="send">' . _("Send Latest Information") . '</option>';
             if (!$found && $registry->hasMethod('calendar/eventFromGUID')) {
                 $existing_vevent = $registry->call('calendar/eventFromGUID', array('guid' => $vevent->getAttribute('UID')));
@@ -613,8 +606,7 @@
             break;
 
         case 'REPLY':
-            $desc = _("%s has replied to the invitation to %s.");
-            $title = _("Meeting Reply");
+            $desc = _("%s has replied to the invitation to \"%s\".");
             $sender = $this->_headers->getValue('From');
             if ($registry->hasMethod('calendar/updateAttendee')) {
                 $options[] = '<option value="update">' . _("Update respondent status") . '</option>';
@@ -622,8 +614,7 @@
             break;
 
         case 'CANCEL':
-            $desc = _("%s has cancelled %s.");
-            $title = _("Meeting Cancellation");
+            $desc = _("%s has cancelled \"%s\".");
             if ($registry->hasMethod('calendar/delete')) {
                 $options[] = '<option value="delete">' . _("Delete from my calendar") . '</option>';
             }
@@ -637,55 +628,59 @@
             $desc = sprintf($desc, $sender, $summary);
         }
 
-        $html .= '<tr><td colspan="2" class="header">' . $title . '</td></tr>' .
-            '<tr><td colspan="2" class="control">' . $desc . '<br />' .
-            _("Please review the following information, and then select an action from the menu below.") . '</td></tr>';
+        $html .= '<h2 class="header">' . $desc . '</h2>';
 
-        if (count($this->_msgs)) {
+        if ($this->_msgs) {
             foreach ($this->_msgs[$id] as $msg) {
-                $html .= '<tr><td colspan="2" class="notice"><strong>' . Horde::img('alerts/' . $msg[0] . '.png', '', null, $registry->getImageDir('horde')) . $msg[1] . '</strong></td></tr>';
+                $html .= '<p class="notice">' . Horde::img('alerts/' . $msg[0] . '.png', '', null, $registry->getImageDir('horde')) . $msg[1] . '</p>';
             }
         }
 
         $start = $vevent->getAttribute('DTSTART');
         if (!is_a($start, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;%s</td></tr>', _("Start"), strftime($prefs->getValue('date_format') . ' ' . $prefs->getValue('time_format'), $start));
+            if (is_array($start)) {
+                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $start['month'], $start['mday'], $start['year'])) . '</p>';
+            } else {
+                $html .= '<p><strong>' . _("Start") . ':</strong> ' . strftime($prefs->getValue('date_format') . ' ' . $prefs->getValue('time_format'), $start) . '</p>';
+            }
         }
 
         $end = $vevent->getAttribute('DTEND');
         if (!is_a($end, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;%s</td></tr>', _("End"), strftime("%x %X", $end));
+            if (is_array($end)) {
+                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime($prefs->getValue('date_format'), mktime(0, 0, 0, $end['month'], $end['mday'], $end['year'])) . '</p>';
+            } else {
+                $html .= '<p><strong>' . _("End") . ':</strong> ' . strftime("%x %X", $end) . '</p>';
+            }
         }
 
         $sum = $vevent->getAttribute('SUMMARY');
         if (!is_a($sum, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;%s</td></tr>', _("Summary"), $sum);
+            $html .= '<p><strong>' . _("Summary") . ':</strong> ' . htmlspecialchars($sum) . '</p>';
         } else {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;<i>%s</i></td></tr>', _("Summary"), _("None"));
+            $html .= '<p><strong>' . _("Summary") . ':</strong> <em>' . _("None") . '</em></p>';
         }
 
         $desc = $vevent->getAttribute('DESCRIPTION');
         if (!is_a($desc, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b><br />%s</td></tr>', _("Description"), preg_replace('/\\n/', '<br />', $desc));
+            $html .= '<p><strong>' . _("Description") . ':</strong> ' . nl2br(htmlspecialchars($desc)) . '</p>';
         }
 
         $loc = $vevent->getAttribute('LOCATION');
         if (!is_a($loc, 'PEAR_Error')) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b>&nbsp;%s</td></tr>', _("Location"), $loc);
+            $html .= '<p><strong>' . _("Location") . ':</strong>' . htmlspecialchars($loc) . '</p>';
         }
 
         $attendees = $vevent->getAttribute('ATTENDEE');
-        $params    = $vevent->getAttribute('ATTENDEE', true);
+        $params = $vevent->getAttribute('ATTENDEE', true);
 
         if (!is_a($attendees, 'PEAR_Error') && !empty($attendees)) {
-            $html .= sprintf('<tr><td colspan="2" class="item"><b>%s:</b><br />',
-                             _("Attendees"));
+            $html .= '<h2 class="smallheader">' . _("Attendees") . '</h2>';
             if (!is_array($attendees)) {
                 $attendees = array($attendees);
             }
 
-            $html .= sprintf('<table width="100%%"><tr><th align="left">%s</th><th align="left">%s</th><th align="left">%s</th></tr>',
-                             _("Name"), _("Role"), _("Status"));
+            $html .= '<table><thead class="leftAlign"><tr><th>' . _("Name") . '</th><th>' . _("Role") . '</th><th>' . _("Status") . '</th></tr></thead><tbody>';
             foreach ($attendees as $key => $attendee) {
                 $attendee = parse_url($attendee);
                 $attendee = $attendee['path'];
@@ -721,20 +716,18 @@
                     $status = $this->_partstatToString($params[$key]['PARTSTAT'], $status);
                 }
 
-                $html .= sprintf('<tr><td>%s</td><td>%s</td><td>%s</td></tr>', htmlspecialchars($attendee), htmlspecialchars($role), htmlspecialchars($status));
+                $html .= '<tr><td>' . htmlspecialchars($attendee) . '</td><td>' . htmlspecialchars($role) . '</td><td>' . htmlspecialchars($status) . '</td></tr>';
             }
-            $html .= '</table></td></tr>';
+            $html .= '</tbody></table>';
         }
 
-        if (count($options)) {
-            $html .= '<tr><td colspan="2" class="control"><b>' . _("Actions") . ':</b><br />' .
-                _("Choose an action:") . "&nbsp;<select name='action[$id]'>" .
+        if ($options) {
+            $html .= '<h2 class="smallheader">' . _("Actions") . '</h2>' .
+                '<select name="action[' . $id . ']">' .
                 implode("\n", $options) .
-                '</select>&nbsp;<input type="submit" class="button" value="' . _("OK") . '" /><br />' .
-                '</td></tr>';
+                '</select> <input type="submit" class="button" value="' . _("Go") . '" />';
         }
 
-        $html .= '</table>';
         return $html;
     }
 
@@ -779,32 +772,4 @@
         }
     }
 
-    /**
-     * Return text/html as the content-type.
-     *
-     * @return string "text/html" constant
-     */
-    function getType()
-    {
-        return 'text/html; charset=' . NLS::getCharset();
-    }
-
-    /**
-     * Get the headers of the message.
-     *
-     * @access private
-     *
-     * @param MIME_Contents &$contents  A MIME_Contents/IMP_Contents object.
-     */
-    function _getHeaders(&$contents)
-    {
-        if (empty($this->_headers)) {
-            if (!($this->_headers = $this->mime_part->getInformation('smime_headers'))) {
-                require_once IMP_BASE . '/lib/MIME/Headers.php';
-                $this->_headers = &new IMP_Headers($contents->getMessageIndex());
-                $this->_headers->buildHeaders();
-            }
-        }
-    }
-
 }


--- orig/templates/filters/notactive.inc
+++ mod/templates/filters/notactive.inc
@@ -1,14 +1,25 @@
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-<tr><td class="header" align="left"><b><?php echo _("Filters NOT Active") ?></b></td>
-<?php Prefs_UI::generateNavigationCell('filters') ?>
-</tr>
-</table>
+<div class="header">
+  <?php Prefs_UI::generateNavigationCell('filters') ?>
+  <?php echo _("Filters NOT Active") ?>
+</div>
 <table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
-<tr><td class="item"><table border="0"><tr valign="top"><td class="item">
-&nbsp;<b><?php echo _("Filter support is disabled on this system.") ?></b>
-</td></tr></table></td></tr></table>
-
+  <tr>
+    <td class="item">
+      <table border="0">
+        <tr valign="top">
+          <td class="item">
+            &nbsp;<strong><?php echo _("Filter support is disabled on this system.") ?></strong>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
 <br />
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap">
-<input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
-</td></tr></table>
+<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
+  <tr>
+    <td nowrap="nowrap">
+      <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
+    </td>
+  </tr>
+</table>


--- orig/templates/prefs/trashselect.inc
+++ mod/templates/prefs/trashselect.inc
@@ -1,5 +1,5 @@
-<?php if (!$prefs->isLocked('trash_folder')): ?>
-<script language="JavaScript" type="text/javascript">
+<?php if (!$prefs->isLocked('trash_folder') && !$prefs->getValue('use_vtrash')): ?>
+<script type="text/javascript">
 <!--
 
 function newTrashFolderName()
@@ -9,7 +9,7 @@
         var folder = window.prompt('<?php echo addslashes(_("Enter the name for your new trash folder")) ?>', document.prefs.trash_new.value ? document.prefs.trash_new.value : '');
         if (folder != '') {
             document.prefs.trash_new.value = folder;
-            document.prefs.trash[0].text = '<?php echo addslashes(_("Create a new trash folder")) ?> [' + document.prefs.trash_new.value + ']';
+            document.prefs.trash[1].text = '<?php echo addslashes(_("Create a new trash folder")) ?> [' + document.prefs.trash_new.value + ']';
         }
     }
     document.prefs.trash.onchange = newTrashFolderName;
@@ -21,7 +21,7 @@
 <table border="0">
  <tr>
   <td><?php echo _("Trash folder:") ?><br />
-   <select name="trash" onchange="newTrashFolderName();"><?php echo IMP::flistSelect(_("Create a new trash folder"), true, array('INBOX'), IMP::addPreambleString($prefs->getValue('trash_folder'))) ?></select>
+   <select name="trash" onchange="newTrashFolderName();"><option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(_("Create a new trash folder"), true, array('INBOX'), IMP::folderPref($prefs->getValue('trash_folder'), true)) ?></select>
    <input type="hidden" name="trash_new" value="" />
   </td>
  </tr>


--- orig/po/pl_PL.po
+++ mod/po/pl_PL.po
@@ -8,32 +8,32 @@
 msgstr ""
 "Project-Id-Version: Imp h3-4.0.3\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-08-20 22:11+0200\n"
-"PO-Revision-Date: 2005-08-20 22:27+0100\n"
+"POT-Creation-Date: 2005-11-24 20:35+0100\n"
+"PO-Revision-Date: 2005-11-24 20:45+0100\n"
 "Last-Translator: Krzysztof Kozlowski <kozik1 at o2.pl>\n"
 "Language-Team: Polish <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:266 lib/Compose.php:318
+#: lib/Compose.php:265 lib/Compose.php:317
 msgid "      To: "
 msgstr "      Do: "
 
-#: lib/Compose.php:254 lib/Compose.php:306
+#: lib/Compose.php:253 lib/Compose.php:305
 msgid "    Date: "
 msgstr "    Data: "
 
-#: lib/Compose.php:257 lib/Compose.php:309
+#: lib/Compose.php:256 lib/Compose.php:308
 msgid "    From: "
 msgstr "    Od: "
 
-#: mailbox.php:399
+#: mailbox.php:406 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr "(klucz dostêpu %s)"
 
-#: lib/Compose.php:263 lib/Compose.php:315
+#: lib/Compose.php:262 lib/Compose.php:314
 msgid " Subject: "
 msgstr " Temat: "
 
@@ -41,7 +41,7 @@
 msgid " in "
 msgstr " w "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
@@ -50,39 +50,39 @@
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:190
+#: mailbox.php:196
 #, php-format
-msgid "%d message(s) have been deleted."
-msgstr "%d wiadomo¶ci zosta³y usuniête"
+msgid "%d messages have been deleted."
+msgstr "%d wiadomo¶ci zosta³o usuniête."
 
-#: lib/Spam.php:182
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "%d wiadomo¶ci zosta³o zg³oszonych jako nie-spam do Twojego administratora."
 
-#: lib/Spam.php:162
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d wiadomo¶ci zosta³o zg³osoznych jako nie-spam."
 
-#: lib/Spam.php:174
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d wiadomo¶ci zosta³o zg³oszonych jako spam do Twojego administratora."
 
-#: lib/Spam.php:154
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d wiadomo¶ci zosta³o zg³oszonych jako spam"
 
-#: mailbox.php:362
+#: mailbox.php:369
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d do %d z %d wiadomo¶ci"
 
-#: mailbox.php:607
+#: mailbox.php:619
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
@@ -97,82 +97,87 @@
 msgid "%s S/MIME Administration"
 msgstr "%s Administracja S/MIME"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ju¿ istnienie. Nazwa folderu %s nie zosta³a zmieniona."
 
-#: lib/Message.php:633
+#: lib/Message.php:612
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "folder %s nie jest prawid³owy."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "folder %s zmieni nazwê na pocz±tku przysz³ego miesi±ca."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr "%s zaakceptowane."
 
-#: lib/MIME/Viewer/itip.php:581
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
 msgstr "%s skasowa³ %s"
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:262
+#, fuzzy, php-format
+msgid "%s has declined."
+msgstr "%s zaakceptowane."
+
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s odpowiedzia³ na zapytanie wolny/zajêty"
 
-#: lib/MIME/Viewer/itip.php:572
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s odpowiedzia³ na zaproszenie do %s"
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s wys³a³ Ci informacje."
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s  próbnie zaakceptowa³."
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s wys³a³ zapytanie do Ciebie o informacjê wolny/zajêty."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s pyta o Twoj± obecno¶æ na %s."
 
-#: lib/Message.php:388
+#: lib/Message.php:377
 #, php-format
 msgid "%s was successfully added to %s."
 msgstr "%s zosta³ poprawnie dodany do %s."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr "%s ¿yczy sobie %s."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr "%s chce Ciê poinformowaæ o %s."
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr "%s prosi o najnowsze informacje o %s."
 
-#: message.php:276 message.php:281
+#: message.php:269 message.php:274
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -190,7 +195,7 @@
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Anuluj wszystkie zmiany i wróc do okna edycji.)"
 
-#: spelling.php:273
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -198,7 +203,7 @@
 "(Powróæ do okna edycji po zastosowaniu dotychczasowych zmian.  Zmiany w "
 "bierz±cym oknie nie bêd± zastosowane.)"
 
-#: spelling.php:270
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -206,27 +211,31 @@
 "(Wy¶lij wiadomo¶æ po zastosowaniu wszystkich zmian.  Zmiany w bie¿±cym oknie "
 "nie bêd± zastosowane.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Dodaj poprzez klikniêcie OK *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Wybierz adres(y) *"
 
-#: lib/Spam.php:184
+#: mailbox.php:194
+msgid "1 message has been deleted."
+msgstr "1 wiadomo¶æ zosta³a usuniêta."
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "1 wiadomo¶æ zosta³a zg³oszona jako nie-spam do Twojego administratora."
 
-#: lib/Spam.php:164
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
 msgstr "1 wiadomo¶æ zosta³a zg³oszona jako nie-spam."
 
-#: lib/Spam.php:176
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 wiadomo¶æ zosta³a zg³oszona jako spam do Twojego administratora."
 
-#: lib/Spam.php:156
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
 msgstr "1 wiadomo¶æ zosta³a zg³oszona jako spam."
 
@@ -246,12 +255,12 @@
 msgid "500 characters"
 msgstr "500 znaków"
 
-#: lib/MIME/Viewer/images.php:159
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Du¿y obrazek %s jest do³±czony do tej wiadomo¶ci"
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -261,27 +270,28 @@
 msgid "AND"
 msgstr "I"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr "Akcetpuj ¿±danie"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "Wydarzenie zosta³o dodane do twojego kalendarza."
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr "Akceptuj"
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:257
 msgid "Accepted: "
 msgstr "Zaakceptowane: "
 
-#: lib/IMP.php:910 lib/IMP.php:912
-msgid "Acco_unts"
-msgstr "Konta (_u)"
-
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Nazwa konta:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
 msgstr "Akcje"
 
@@ -289,16 +299,16 @@
 msgid "Add source"
 msgstr "Dodaj ¼ród³o"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr "Dodaj do mojego kalendarza"
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
 #, php-format
 msgid "Add to Address book (%s)"
 msgstr "Dodaj do mojej ksi±¿ki adresowej (%s)"
 
-#: compose.php:1177
+#: compose.php:1191
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Plik \"%s\" dodany jako za³±cznik."
@@ -311,34 +321,34 @@
 "Dodatkowe nag³ówki wy¶wietlane podczas podgl±dania: <i>(opcjonalnie, "
 "wprowad¼ ka¿dy nag³ówek w nowej linii)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Dodatkowe informacje mog± byæ zawarte w %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Szczegó³y dotycz±ce dodatkowych informacji"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Szczegó³y dotycz±ce dodatkowej wiadomo¶ci"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Szczegó³y dotycz±ce dodatkowej wiadomo¶ci mog± byæ zawarte w %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Szczegó³owe informacje o b³êdzie"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Szczegó³owe informacje o b³êdzie mo¿na przegl±dn±æ w %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
+#: contacts.php:90 templates/contacts/contacts.inc:180
 #: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
 msgid "Address Book"
 msgstr "Ksi±¿ka adresowa"
@@ -368,17 +378,13 @@
 msgstr "Wszystko"
 
 #: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Wszystkie wiadomo¶ci w folderze(ach) zostan± utracone!"
-
-#: templates/folders/javascript.inc:6
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Wszystkie wiadomo¶ci w folderze(ach) bêd± ¶ci±gane do jednego pliku MBOX:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:81
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -387,13 +393,13 @@
 "Wszystkie wiadomo¶ci w folderze \"%s\", starsze ni¿ %s dni, zostan± "
 "bezpowrotnie skasowane."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:63
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr ""
 "Wszystkie stare linki za³±czników starsze ni¿ %s miesiêcy zostan± skasowane."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
@@ -402,19 +408,19 @@
 
 #: acl.php:85
 #, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
-"Wszystie uprawnienia folderu '%s' dla u¿ytkownika '%s' zosta³y usuniête"
+"Wszystie uprawnienia folderu \"%s\" dla u¿ytkownika \"%s\" zosta³y usuniête"
 
 #: templates/filters/prefs.inc:55
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Pozwoliæ na zastosowanie filtrów dla wszystkich skrzynek?"
 
-#: lib/MIME/Viewer/alternative.php:113
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Alternatywne czê¶ci dla tej sekcji:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:565 config/prefs.php.dist:577
 msgid "Always"
 msgstr "Zawsze"
 
@@ -422,7 +428,7 @@
 msgid "Always save attachments"
 msgstr "Zawsze zapisuj za³±czniki"
 
-#: lib/Message.php:481
+#: lib/Message.php:468
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -430,11 +436,11 @@
 "Wyst±pi³ b³±d podczas próby usuniêcia za³±cznika. Serwer IMAP zwróci³ "
 "odpowied¼:"
 
-#: lib/Message.php:375
+#: lib/Message.php:364
 msgid "An unknown error occured while creating the new task."
 msgstr "Wyst±pi³ nieznany b³±d podczas tworzenia nowego zadania."
 
-#: message.php:490 mailbox.php:677 templates/message/navbar_navigate.inc:9
+#: mailbox.php:693 message.php:484 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -461,14 +467,6 @@
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Zastosowaæ filtry podczas wy¶wietlanie Odebrane?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Czy chcesz na pewno kontynuowaæ?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Jeste¶ ca³kowicie pewien, ¿e chcesz kontynuowaæ?"
-
 #: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
 msgid "Are you sure you want to delete this public key?"
 msgstr "Czy chcesz usun±æ ten klucz publiczny?"
@@ -482,12 +480,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Czy chcesz na pewno to zrobiæ?"
 
-#: message.php:398 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:68
+#: message.php:391 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Czy chcesz usun±æ ca³kowicie te wiadomo¶ci?"
 
-#: lib/MIME/Contents.php:215
+#: lib/MIME/Contents.php:202
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Czy chcesz usun±æ ca³kowicie te za³±czniki?"
 
@@ -495,7 +492,7 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Czy chcesz opró¿niæ ten folder?"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:931
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Czy chcesz opró¿niæ kosz?"
 
@@ -503,11 +500,11 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Czy chcesz usun±æ ca³kowicie te wiadomo¶ci?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Czy chcesz zg³osiæ tê wiadomo¶æ jako nieszkodliw±?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Czy chcesz zg³osiæ tê wiadomo¶æ jako spam?"
 
@@ -519,7 +516,7 @@
 msgid "Ascending"
 msgstr "Wzrastaj±co"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:564 config/prefs.php.dist:576
 msgid "Ask"
 msgstr "Zapytaj"
 
@@ -535,11 +532,11 @@
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Za³±czyæ kopiê Twoja klucza publicznego PGP do wiadomo¶ci?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "Za³±czone pliki:"
 
-#: lib/Compose.php:366 lib/Compose.php:453
+#: lib/Compose.php:362 lib/Compose.php:447
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -547,46 +544,50 @@
 "Za³±czony plik \"%s\" przekracza limit rozmiaru za³±cznika. Plik "
 "nieza³±czony."
 
-#: mailbox.php:711 templates/mailbox/legend.inc:16
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: mailbox.php:729 templates/mailbox/legend.inc:16
 #: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
 #: templates/compose/attachments.js:98
 msgid "Attachment"
 msgstr "Za³±cznik"
 
-#: compose.php:987 lib/Message.php:442
+#: compose.php:1001 lib/Message.php:429
 msgid "Attachment stripped: Original attachment type"
 msgstr "Za³±cznik wymazany: Oryginalny typ za³±cznika"
 
 #: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:1009
+#: lib/Compose.php:984
 msgid "Attachments"
 msgstr "Za³±czniki"
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Uczestnictwa"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Uwaga"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Wymagane rozszerzenie IMAP nie znalezione."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:634
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
 msgstr ""
-"Automatycznie pokazywaæ zdjêcia w wiamomo¶ciach HTML od autora, "
-"któryznajduje siê w mojej ksi±¿ce adresowej?"
+"Automatycznie pokazywaæ zdjêcia w wiamomo¶ciach HTML od autora, który "
+"znajduje siê w mojej ksi±¿ce adresowej?"
 
 #: templates/prefs/sourceselect.inc:298
 msgid "Available Address books:"
 msgstr "Dostêpne ksi±¿ki adresowe:"
 
-#: lib/MIME/Viewer/itip.php:671
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr "Oczekuj±ce na odpowied¼"
 
@@ -595,17 +596,17 @@
 msgid "Bac_k to %s"
 msgstr "Powrót do %s (_k)"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:86 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Powrót do %s"
 
-#: message.php:257 search.php:153 templates/contacts/contacts.inc:224
+#: message.php:250 search.php:147 templates/contacts/contacts.inc:222
 #: templates/compose/recompose.inc:20
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Poni¿ej jest zwyk³y tekst z wiadomo¶ci informacyjnej."
 
@@ -613,11 +614,11 @@
 msgid "Blacklist"
 msgstr "Czarna lista"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:622
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Blokuj obrazki w wiadomo¶ciach HTML, chyba ¿e jest specjalna pro¶ba?"
 
-#: search.php:161
+#: search.php:155
 msgid "Body"
 msgstr "Tre¶æ"
 
@@ -626,7 +627,7 @@
 msgid "Both"
 msgstr "Oba"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:681
 msgid "Both Header Listing and Body of Message"
 msgstr "Nag³ówek i tre¶æ"
 
@@ -634,19 +635,19 @@
 msgid "C_harset"
 msgstr "Uk³ad znaków (_h)"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "B³±d po³±czenia ze zdalnym serwerem poczty."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "B³±d po³±czenia ze zdalnym serwerem poczty: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -655,10 +656,10 @@
 "Nie mogê wy¶wietliæ - znalaz³em tylko %s z %s czê¶ci tej wiadomo¶ci w "
 "skrzynce pocztowej."
 
-#: templates/contacts/contacts.inc:253 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:127 templates/pgp/passphrase.inc:32
-#: templates/pgp/import_key.inc:66
+#: folders.php:273 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
+#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
+#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -671,12 +672,12 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Anulowanie tej wiadomo¶ci usunie jej zawarto¶æ bezpowrotnie."
 
-#: message.php:256 search.php:149 templates/contacts/contacts.inc:223
+#: message.php:249 search.php:143 templates/contacts/contacts.inc:221
 #: templates/compose/recompose.inc:15
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:653
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
 msgstr "Naczelny"
 
@@ -720,7 +721,7 @@
 msgid "Check Folder(s) for New Mail"
 msgstr "Sprawdzaj folder(y) czy jest nowa poczta"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
 msgid "Check _All/None"
 msgstr "Z_aznacz Wszystko/Nic"
 
@@ -736,11 +737,17 @@
 msgid "Choose Action:"
 msgstr "Wybierz akcjê:"
 
-#: config/servers.php.dist:194
+#: config/servers.php.dist:195
 msgid "Choose a mail server:"
 msgstr "Wybierz serwer pocztowy:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:683
+#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
+#: templates/compose/compose.inc:228
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Wybierz lub edytuj w oknie:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
 msgstr "Wybierz operacjê:"
 
@@ -754,48 +761,48 @@
 "Wybierz kolejno¶æ przeszukiwania ksi±¿ek adresowych podczas rozszerzania "
 "adresów."
 
-#: lib/MIME/Viewer/images.php:109
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Kliknij %s, aby zmieniæ format obrazka na obs³ugiwany przez twoj± "
 "przegl±darkê."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Kliknij tutaj, aby zapisac obrazek %s."
 
-#: lib/Filter.php:113
+#: lib/Filter.php:107
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Kliknij %s, aby pój¶æ do strony zarz±dzania %s."
 
-#: lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/html.php:128
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Kliknij %s aby zobaczyæ zawarto¶æ HTML w osobnym oknie."
 
-#: lib/MIME/Viewer/images.php:160
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Kliknij %s aby zobaczyæ miniaturkê tego obrazka."
 
-#: lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/pkcs7.php:407
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Kliknij %s aby zobaczyæ za³±cznik w osobnym oknie."
 
-#: lib/MIME/Viewer/related.php:64
-#, fuzzy, php-format
+#: lib/MIME/Viewer/related.php:79
+#, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
-msgstr "Kliknij %s aby zobaczyæ za³±cznik w osobnym oknie."
+msgstr "Kliknij %s, aby zobaczyæ za³±cznik w osobnym oknie."
 
-#: lib/MIME/Viewer/html.php:103
+#: lib/MIME/Viewer/html.php:104
 msgid "Click here to HIDE the Images"
 msgstr "Kliknij tutaj aby ukryæ obrazki"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:108
 msgid "Click here to SHOW the Images"
 msgstr "Kliknij tutaj aby pokazaæ obrazki"
 
@@ -807,12 +814,12 @@
 "Kliknij na jednym z wybranych ksi±¿ek adresowych i okre¶l pola wed³ug "
 "których rozpocz±æ szukanie."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 "Kliknij tutaj, aby zachowaæ klucz publiczny PGP w Twojej ksi±¿ce adresowej"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:191
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
@@ -830,15 +837,15 @@
 msgid "Close"
 msgstr "Zamknij"
 
-#: compose.php:762 compose.php:1068
+#: compose.php:775 compose.php:1082
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: folders.php:383
+#: folders.php:416
 msgid "Closed Folder"
 msgstr "Folder zamkniêty"
 
-#: folders.php:403
+#: folders.php:436
 msgid "Collapse"
 msgstr "Zwiñ"
 
@@ -850,7 +857,7 @@
 msgid "Collapse All Folders"
 msgstr "Zwiñ wszystkie foldery"
 
-#: folders.php:403
+#: folders.php:436
 msgid "Collapse Folder"
 msgstr "Zwiñ folder"
 
@@ -862,7 +869,7 @@
 msgid "Comment"
 msgstr "Komentarz"
 
-#: lib/MIME/Viewer/itip.php:721
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
 msgstr "Ukoñczone"
 
@@ -870,12 +877,12 @@
 msgid "Compose"
 msgstr "Twórz"
 
-#: mailbox.php:741 lib/MIME/Headers.php:195
+#: mailbox.php:756 lib/MIME/Headers.php:192
 #, php-format
 msgid "Compose Message (%s)"
 msgstr "Twórz wiadomo¶æ (%s)"
 
-#: compose.php:761 compose.php:1067
+#: compose.php:774 compose.php:1081
 msgid "Compose another message"
 msgstr "Twórz inn± wiadomo¶æ"
 
@@ -890,7 +897,7 @@
 msgstr ""
 "Twórz domy¶lnie wiadomo¶ci z GUI HTML (je¶li Twoja przegl±darka obs³uguje)"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Konfiguruje sposób wy¶wietlania wiadomo¶ci."
 
@@ -898,7 +905,7 @@
 msgid "Configure mail preview options."
 msgstr "Konfiguruje opcje podgl±du listu."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Nie nawi±zano po³±czenia z serwerem"
 
@@ -920,7 +927,7 @@
 "Zarz±dzanie sprawdzaniem nowych wiadomo¶ci oraz informowaniem o ich "
 "nadej¶ciu."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:691
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Zamieniaæ tekstowe emotikony na graficzne?"
 
@@ -928,7 +935,7 @@
 msgid "Copy"
 msgstr "Kopia"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Kopiuj do folderu"
 
@@ -945,26 +952,25 @@
 msgid "Could not create the VFS backend: %s"
 msgstr "Nie mo¿liwe utworzenie wsparcia VFS: %s"
 
-#: lib/Message.php:624
+#: lib/Message.php:603
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nie mo¿liwe usuniêcie wiadomo¶ci z %s.Serwer zwróci³ odpowied¼: %s"
 
-#: lib/Session.php:294
+#: lib/Session.php:293
 msgid "Could not execute maintenance operations."
 msgstr "Nie mo¿liwe uruchomienie opcji konserwacji."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Nie mo¿liwe rozpakowanie pliku z za³±cznika MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Nie mo¿liwe rozpakowaæ plików z archiwum Zip."
 
-#: search.php:356 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: search.php:361 templates/acl/acl.inc:39 templates/acl/acl.inc:157
+#: templates/fetchmail/manage.inc:67
 msgid "Create"
 msgstr "Twórz"
 
@@ -980,6 +986,14 @@
 msgid "Create Virtual Folder"
 msgstr "Twórz wirtualny folder"
 
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Stwórz nowe konto"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Stwórz nowy folder na spam"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Tworzenie nowego folderu roboczego"
@@ -1018,22 +1032,26 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Wybierz zadania, które maj± byæ wykonane podczas logowania do %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
-msgstr "_Data"
+msgstr "Data (_e)"
 
-#: message.php:253 thread.php:75
+#: message.php:246 thread.php:92
 msgid "Date"
 msgstr "Data"
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:263
 msgid "Declined: "
 msgstr "Odrzucone: "
 
+#: config/prefs.php.dist:530
+msgid "Default"
+msgstr "Domy¶lne"
+
 #: config/prefs.php.dist:894
 msgid "Default sorting criteria:"
 msgstr "Domy¶lne kryteria sortowania:"
@@ -1042,14 +1060,14 @@
 msgid "Default sorting direction:"
 msgstr "Domy¶lny sposób sortowania:"
 
-#: lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
 msgstr "Oddelegowane"
 
-#: folders.php:374 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
-#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
+#: folders.php:407 templates/contacts/contacts.inc:244
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10 templates/smime/smime.inc:65
+#: templates/compose/attachments.inc:28 templates/fetchmail/manage.inc:68
 #: templates/pgp/pgp.inc:93
 msgid "Delete"
 msgstr "Usuñ"
@@ -1067,7 +1085,11 @@
 msgid "Delete Folder(s)"
 msgstr "Usuñ folder(y)"
 
-#: folders.php:374
+#: folders.php:274
+msgid "Delete Selected Folders"
+msgstr "Usuñ wybrane foldery"
+
+#: folders.php:407
 msgid "Delete Virtual Folder"
 msgstr "Usuñ wirtualny folder"
 
@@ -1075,7 +1097,7 @@
 msgid "Delete fetched messages from remote server?"
 msgstr "Usun±æ wiadomo¶ci pobrane ze zdalnego serwera?"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
 msgstr "Usuñ z mojego kalendarza"
 
@@ -1087,11 +1109,11 @@
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Czy usuwaæ stary folder poczty wys³anej na pocz±tku ka¿dego miesi±ca?"
 
-#: config/prefs.php.dist:621
+#: config/prefs.php.dist:612
 msgid "Delete spam messages after they have been reported as spam?"
 msgstr "Czy usuwaæ wiadomo¶ci spam po zg³oszeniu jako spam?"
 
-#: message.php:493 mailbox.php:701 templates/mailbox/navbar.inc:20
+#: mailbox.php:719 message.php:487 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Usuniête"
@@ -1100,7 +1122,7 @@
 msgid "Deleted messages"
 msgstr "Usuniête wiadomo¶ci"
 
-#: compose.php:292
+#: compose.php:280
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Usuniêto za³±cznik \"%s\"."
@@ -1109,11 +1131,11 @@
 msgid "Deleting and Moving Messages"
 msgstr "Usuwanie i przenoszenie wiadomo¶ci"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Odrzuæ zapytanie"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
 msgstr "Odrzuæ zapytanie o informacjê wolny/zajêty"
 
@@ -1121,7 +1143,7 @@
 msgid "Descending"
 msgstr "Malej±co"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:623
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Opis"
 
@@ -1131,11 +1153,11 @@
 msgid "Details"
 msgstr "Szczegó³y"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:671
 msgid "Dim signatures?"
 msgstr "Zas³oniæ podpisy?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Wy¶wietlanie"
 
@@ -1143,7 +1165,7 @@
 msgid "Display confirmation after sending a message?"
 msgstr "Wy¶wietlaæ potwierdzenie wys³anej wiadomo¶ci?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:680
 msgid "Display in Body of Message"
 msgstr "Wy¶wietlaj w tre¶ci wiadomo¶ci"
 
@@ -1159,7 +1181,7 @@
 msgid "Disposition"
 msgstr "Rozmieszczenie"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "Nie zgadza siê"
 
@@ -1171,7 +1193,7 @@
 msgid "Do not generate a link in the From: column"
 msgstr "Nie generuj linka w polu Od: kolumna"
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1031
 msgid "Do you want to open that folder?"
 msgstr "Czy chcesz otworzyæ ten folder?"
 
@@ -1179,7 +1201,7 @@
 msgid "Done"
 msgstr "Zrobiono"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:191
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Pobierz %s w formacie .zip"
@@ -1196,17 +1218,17 @@
 msgid "Download Folder(s) [.zip format]"
 msgstr "Pobierz folder(y) [format .zip]"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:191
 msgid "Download in .zip Format"
 msgstr "Pobierz w formacie .zip"
 
-#: message.php:491 mailbox.php:682 templates/message/navbar_navigate.inc:11
+#: mailbox.php:698 message.php:485 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Roboczy"
 
-#: folders.php:354
+#: folders.php:387
 msgid "Draft folder"
 msgstr "Folder roboczy"
 
@@ -1218,11 +1240,15 @@
 msgid "E-mail Address"
 msgstr "Adres e-mail"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:303
+msgid "END"
+msgstr "KONIEC"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "B³±d: Twoja wiadomo¶æ nie mo¿e byæ dostarczona."
 
-#: folders.php:375
+#: folders.php:408
 msgid "Edit"
 msgstr "Edytuj"
 
@@ -1234,7 +1260,7 @@
 msgid "Edit Filters"
 msgstr "Edytuj filtry"
 
-#: folders.php:375 templates/search/header.inc:16
+#: folders.php:408 templates/search/header.inc:16
 #: templates/mailbox/header.inc:13
 msgid "Edit Virtual Folder"
 msgstr "Edytuj folder virtualny"
@@ -1264,11 +1290,11 @@
 msgid "Edit your whitelist"
 msgstr "Edycja w³asnej bia³ej listy"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Adres email"
 
-#: lib/Message.php:641
+#: lib/Message.php:620
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Opró¼niono wszystkie wiadomo¶ci z %s."
@@ -1277,11 +1303,15 @@
 msgid "Empty Folder(s)"
 msgstr "Opró¿nij folder(y)"
 
+#: folders.php:275
+msgid "Empty Selected Folders"
+msgstr "Opró¿nij wybrane foldery"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Opró¿nij folder kosza"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:931
 msgid "Empty _Trash"
 msgstr "Opró¿nij kosz (_t)"
 
@@ -1301,19 +1331,19 @@
 msgid "Encr_yption Options"
 msgstr "Opcje kodowania (_y)"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:611
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Koniec"
 
-#: lib/Compose.php:331
+#: lib/Compose.php:330
 msgid "End forwarded message"
 msgstr "Koniec przekazanej wiadomo¶ci"
 
-#: lib/Compose.php:272
+#: lib/Compose.php:271
 msgid "End message"
 msgstr "Koniec wiadomo¶ci"
 
-#: lib/Compose.php:270
+#: lib/Compose.php:269
 #, php-format
 msgid "End message from %s"
 msgstr "Koniec wiadomo¶ci od %s"
@@ -1322,6 +1352,10 @@
 msgid "Enter Passphrase"
 msgstr "Wprowad¼ has³o"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Wprowad¼ nazwê dla twojego nowego folderu na spam"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Wprowad¼ nazwê dla twojego nowego folderu roboczego"
@@ -1334,23 +1368,27 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Wprowad¼ nazwê dla twojego nowego folderu kosza"
 
-#: message.php:185 compose.php:1054
+#: search.php:159
+msgid "Entire Message"
+msgstr "Ca³a wiadomo¶æ"
+
+#: compose.php:1068 message.php:178 thread.php:39
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Wpis \"%s\" zosta³ poprawnie dodany do Twojej ksi±¿ki adresowej"
 
 #: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:392
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "B³±d"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "B³±d wys³ania odpowiedzi: %s."
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
 msgid "Event successfully deleted."
 msgstr "Wydarzenie zosta³o usuniête."
 
@@ -1374,7 +1412,7 @@
 msgid "Every minute"
 msgstr "Co minutê"
 
-#: folders.php:412
+#: folders.php:445
 msgid "Expand"
 msgstr "Rozwiñ"
 
@@ -1386,7 +1424,7 @@
 msgid "Expand All Folders"
 msgstr "Rozwiñ wszystkie foldery"
 
-#: folders.php:412
+#: folders.php:445
 msgid "Expand Folder"
 msgstr "Rozwiñ folder"
 
@@ -1407,6 +1445,10 @@
 msgid "Expanding"
 msgstr "Rozwijanie"
 
+#: lib/IMP.php:940 lib/IMP.php:942
+msgid "F_etch Mail"
+msgstr "Pobierz pocztê (_f)"
+
 #: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
 msgid "Fetch Mail"
 msgstr "Pobierz pocztê"
@@ -1419,20 +1461,25 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Pobieraæ pocztê podczas logowania?"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:289
 #, php-format
-msgid "Fetched %d message(s) from %s"
+msgid "Fetched %d messages from %s"
 msgstr "Pobrano %d wiadomo¶ci z %s"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:287
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Pobrano 1 wiadomo¶æ z %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
 msgstr "Pobrano: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
 msgstr "Pobrano: brak nowych wiadomo¶ci."
 
-#: lib/IMP.php:916
+#: lib/IMP.php:946
 msgid "Fi_lters"
 msgstr "Fi_ltry"
 
@@ -1448,7 +1495,7 @@
 msgid "Filter Settings"
 msgstr "Ustawienia filtru"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:594
 msgid "Filter message content for profanity?"
 msgstr "Filtruj zawarto¶æ wiadomo¶ci ze wzglêdu na wulgarno¶æ?"
 
@@ -1464,12 +1511,12 @@
 msgid "Filters NOT Active"
 msgstr "Filtry NIE aktywne"
 
-#: lib/Filter.php:112
+#: lib/Filter.php:106
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtry: strona zarz±dzania %s"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Znajd¼"
 
@@ -1477,7 +1524,7 @@
 msgid "First Mailbox Page"
 msgstr "Pierwsza strona skrzynki pocztowej"
 
-#: mailbox.php:334
+#: mailbox.php:341
 msgid "First Page"
 msgstr "Pierwsza strona"
 
@@ -1485,13 +1532,17 @@
 msgid "Fo_rward"
 msgstr "Przeka¿ (_r)"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:255 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Czynno¶ci na katalogach - potwierdzenie"
+
+#: folders.php:292 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Nawigator folderów"
 
-#: templates/login/login.inc:199
+#: templates/login/login.inc:175
 msgid "Folder Prefix"
 msgstr "Prefix folderu"
 
@@ -1507,45 +1558,49 @@
 msgid "Folder use is not enabled."
 msgstr "U¿ycie folderu nie jest aktynwe."
 
-#: compose.php:714 templates/message/navbar_actions.inc:15
+#: config/prefs.php.dist:940
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:727 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Przeka¿"
 
-#: compose.php:699
+#: compose.php:712
 msgid "Forward:"
 msgstr "Przeka¿:"
 
-#: lib/Compose.php:300
+#: lib/Compose.php:299
 msgid "Forwarded message"
 msgstr "Przekazana wiadomo¶æ"
 
-#: lib/Compose.php:298
+#: lib/Compose.php:297
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Przekazana wiadomo¶æ od %s"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
 msgstr "Informacja wolny/zajêty"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr "Odpowied¼ wolny/zajêty"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
 msgstr "Zapytanie wolny/zajêty"
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
 msgstr "Odpowied¼ na zapytanie wolny/zajêty"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "Od (_m)"
 
-#: message.php:254 search.php:141 thread.php:76
+#: message.php:247 search.php:135 thread.php:93
 #: templates/compose/compose.inc:98
 msgid "From"
 msgstr "Od"
@@ -1554,15 +1609,15 @@
 msgid "From Address"
 msgstr "Adres od"
 
-#: compose.php:711 compose.php:715
+#: compose.php:724 compose.php:728
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1215
+#: compose.php:1229
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#: compose.php:1217
+#: compose.php:1231
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u przekazane wiadomo¶ci"
@@ -1576,29 +1631,34 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Pobieraj tylko nowe wiadomo¶ci (tylko IMAP)"
 
-#: thread.php:68
+#: thread.php:85
 msgid "Go to Message"
 msgstr "Id¼ do wiadomo¶ci"
 
+#: lib/IMP.php:553
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Id¼ do wpisu \"%s\" w ksi±¿ce adresowej"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr "Przyznaj dostêp"
 
-#: message.php:546 lib/Filter.php:112 lib/MIME/Viewer/images.php:98
-#: lib/MIME/Viewer/images.php:105 lib/MIME/Viewer/images.php:107
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/html.php:116
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/related.php:64 lib/MIME/Viewer/pkcs7.php:414
-#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:530 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "TUTAJ"
 
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:243
+#: compose.php:229
 msgid "HTML Version of Message"
 msgstr "Wiadomo¶æ w wersji HTML"
 
@@ -1610,23 +1670,23 @@
 msgid "Here is the message you were composing:"
 msgstr "Tutaj znajduje siê wiadomo¶æ, któr± tworzy³e¶:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:662
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:661
 msgid "Hidden in Thread View"
 msgstr "Ukryte w podgl±dzie w±tku"
 
-#: mailbox.php:356
+#: mailbox.php:363
 msgid "Hide Deleted"
 msgstr "Ukryj usuniête"
 
-#: folders.php:254
+#: folders.php:287
 msgid "Hide Unsubscribed"
 msgstr "Ukryj niesubskrybowane"
 
-#: lib/MIME/Viewer/html.php:103
+#: lib/MIME/Viewer/html.php:104
 msgid "Hide the Images"
 msgstr "Ukryj obrazki"
 
@@ -1634,7 +1694,7 @@
 msgid "High"
 msgstr "Wysoki"
 
-#: message.php:288 mailbox.php:687 templates/mailbox/legend.inc:12
+#: mailbox.php:703 message.php:281 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Wysoki priorytet"
 
@@ -1642,7 +1702,7 @@
 msgid "Highest"
 msgstr "Najwy¿szy"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:682
 msgid "How do you want to display attachments?"
 msgstr "Jak wy¶wietlaæ za³±czniki?"
 
@@ -1650,38 +1710,44 @@
 msgid "How to attribute quoted lines in a reply"
 msgstr "Jak przypisywaæ cytowane linie w odpowiedzi"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (automatyczna detekcja protoko³u)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: templates/login/login.inc:163 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "Po³±czenie SSL dla IMAP"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "Po³±czenie SSL dla IMAP (w³asny certyfikat)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:164
 msgid "IMAP over SSL (self-signed)"
 msgstr "Po³±czenie SSL dla IMAP (w³asny podpis)"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: templates/login/login.inc:162 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, bez TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "Serwery pocztowe IMAP/POP3"
 
-#: folders.php:346
+#: lib/IMP.php:886
 msgid "INBOX"
 msgstr "Odebrane"
 
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
+"Je¶li bêdziesz kontynuowa³, to wszystkie wiadomo¶ci w folderze(ach) zostan± "
+"utracone!"
+
 #: templates/compose/spelling.inc:88
 msgid "Ignore"
 msgstr "Ignoruj"
@@ -1751,7 +1817,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Importowanie pliku mbox %s do folderu %s."
 
-#: message.php:492 mailbox.php:695 templates/message/navbar_navigate.inc:7
+#: mailbox.php:713 message.php:486 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1766,11 +1832,12 @@
 msgid "Imported %d messages from %s."
 msgstr "Importowano %d wiadomo¶ci z %s."
 
-#: lib/MIME/Viewer/itip.php:725
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr "Aktywne"
 
-#: lib/Folder.php:248 lib/IMP.php:368
+#: folders.php:379 lib/IMP.php:358 lib/Folder.php:227 lib/IMAP/Tree.php:105
+#: lib/IMAP/Tree.php:204
 msgid "Inbox"
 msgstr "Odebrane"
 
@@ -1782,7 +1849,7 @@
 msgid "Include original message in a reply?"
 msgstr "Za³±czaæ oryginaln± wiadomo¶æ w odpowiedzi?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Info"
 
@@ -1820,19 +1887,19 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Wprowad¼ klucz publiczny PGP tutaj"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
 msgstr "Wybrano z³± opcjê dla tego komponentu."
 
-#: mailbox.php:555 mailbox.php:596
+#: mailbox.php:563 mailbox.php:605
 msgid "Invalid Address"
 msgstr "Niepoprawny adres"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Niepoprawna zdalna skrzynka pocztowa"
 
-#: compose.php:132
+#: compose.php:131
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Niepoprawny znak w adresie e-mail: %s."
@@ -1861,11 +1928,17 @@
 msgid "Key Length"
 msgstr "D³ugo¶æ klucza"
 
+#: templates/pgp/pgp.inc:252
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "Generowanie klucza mo¿e zaj±æ du¿o czasu. Kontunuowaæ?"
+
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr "Klucz wys³any pomy¶lnie na publiczny serwer kluczy."
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:199
 msgid "Language"
 msgstr "Jêzyk"
 
@@ -1873,7 +1946,7 @@
 msgid "Last Mailbox Page"
 msgstr "Ostatnia strona skrzynki"
 
-#: mailbox.php:347
+#: mailbox.php:354
 msgid "Last Page"
 msgstr "Ostatnia strona"
 
@@ -1881,11 +1954,11 @@
 msgid "Li_nk Attachments"
 msgstr "Li_nkuj za³±czniki"
 
-#: attachment.php:34 lib/Compose.php:999
+#: attachment.php:34 lib/Compose.php:974
 msgid "Linked attachments are forbidden."
 msgstr "Linkowanie za³±czników jest zabronione."
 
-#: lib/Compose.php:1016
+#: lib/Compose.php:991
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Odno¶niki stan± siê nieaktualne %s"
@@ -1898,7 +1971,7 @@
 "Pokazywaæ wszystkie kontakty podczas ³adowania okna kontaktów?(je¶li "
 "wy³±czone, widoczne bêd± jedynie poczukiwane konakty)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:679
 msgid "Listing in the Header"
 msgstr "Wy¶wietlanie w nag³ówku"
 
@@ -1906,11 +1979,11 @@
 msgid "Local Mailbox:"
 msgstr "Lokalna skrzynka:"
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:207
 msgid "Log in"
 msgstr "Zaloguj siê"
 
@@ -1919,7 +1992,7 @@
 msgid "Log in to %s"
 msgstr "Zaloguj siê do %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:136
 msgid "Login"
 msgstr "Nazwa u¿ytkownika"
 
@@ -1931,7 +2004,7 @@
 msgid "Low"
 msgstr "Niski"
 
-#: message.php:290 mailbox.php:690 templates/mailbox/legend.inc:13
+#: mailbox.php:706 message.php:283 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Niski priorytet"
 
@@ -1939,7 +2012,7 @@
 msgid "Lowest"
 msgstr "Najni¿szy"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Plik Macintosch"
 
@@ -1955,7 +2028,7 @@
 msgid "Mail server type to connect to:"
 msgstr "Typ po³±czenia z serwerem poczty:"
 
-#: folders.php:364
+#: folders.php:397
 msgid "Mailbox"
 msgstr "Skrzynka"
 
@@ -1975,7 +2048,7 @@
 msgid "Mark as:"
 msgstr "Zaznacz jako:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:644
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Oznaczaæ ró¿nymi kolorami poziomy priorytetów?"
 
@@ -1983,6 +2056,10 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Oznaczyæ wiadomo¶ci jako widziane? (tylko IMAP)"
 
+#: config/prefs.php.dist:652
+msgid "Mark simple markup?"
+msgstr ""
+
 #: templates/search/header.inc:46
 msgid "Match All Queries"
 msgstr "Wszystkie zapytania musz± pasowaæ"
@@ -2003,27 +2080,27 @@
 msgid "Maximum total attachment size reached."
 msgstr "Ca³kowity maksymalny rozmiar za³±cznika osi±gniêty."
 
-#: lib/MIME/Viewer/itip.php:582
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: lib/MIME/Viewer/itip.php:573
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Odpowied¼ odno¶nie spotkania"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
 msgstr "Zmiana spotkania"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
 msgstr "Zapytanie o zmianê spotkania"
 
@@ -2031,11 +2108,11 @@
 msgid "Menu Folder List"
 msgstr "Lista menu folderu"
 
-#: lib/Compose.php:247
+#: lib/Compose.php:246
 msgid "Message"
 msgstr "Wiadomo¶æ"
 
-#: compose.php:519 compose.php:546 compose.php:578 config/prefs.php.dist:50
+#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Tworzenie wiadomo¶ci"
 
@@ -2043,12 +2120,12 @@
 msgid "Message Date"
 msgstr "Data wiadomo¶ci"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
 #: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
 msgid "Message Options"
 msgstr "Opcje wiadomo¶ci"
 
-#: search.php:354
+#: search.php:359
 msgid "Message Search"
 msgstr "Szukanie wiadomo¶ci"
 
@@ -2056,11 +2133,11 @@
 msgid "Message Size"
 msgstr "Rozmiar wiadomo¶ci"
 
-#: message.php:375
+#: message.php:368
 msgid "Message Source"
 msgstr "¬ród³o wiadomo¶ci"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Wy¶wietlanie wiadomo¶ci"
 
@@ -2076,25 +2153,37 @@
 msgid "Message folders"
 msgstr "Folder wiadomo¶ci"
 
-#: lib/Compose.php:245
+#: lib/Compose.php:244
 #, php-format
 msgid "Message from %s"
 msgstr "Wiadomo¶æ od %s"
 
+#: mailbox.php:646
+msgid "Message has attachments"
+msgstr "Wiadomo¶æ ma za³±czniki"
+
+#: mailbox.php:637
+msgid "Message is encrypted"
+msgstr "Wiadomo¶æ jest zaszyfrowana"
+
+#: mailbox.php:632
+msgid "Message is signed"
+msgstr "Wiadomo¶æ jest podpisana"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Wiadomo¶æ pasuje"
 
-#: compose.php:758 compose.php:772
+#: compose.php:771 compose.php:785
 msgid "Message redirected successfully."
 msgstr "Wiadomo¶æ przekierowana prawid³owo."
 
-#: compose.php:1004
+#: compose.php:1018
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Wiadomo¶æ wys³ana, ale nie zapisana w %s"
 
-#: compose.php:1063 compose.php:1078
+#: compose.php:1077 compose.php:1092
 msgid "Message sent successfully."
 msgstr "Wiadomo¶æ wys³ana."
 
@@ -2102,7 +2191,7 @@
 msgid "Messages per page in the mailbox view."
 msgstr "Ilo¶æ wiadomo¶ci wy¶wietlanych na jednej stronie."
 
-#: mailbox.php:311
+#: mailbox.php:318
 msgid "Messages to"
 msgstr "Wiadomo¶ci do"
 
@@ -2112,8 +2201,8 @@
 
 #: templates/compose/expand.inc:12
 #, php-format
-msgid "More than one address found for field '%s'."
-msgstr "Wiêcej ni¿ jeden adres znaleziony w polu '%s'."
+msgid "More than one address found for field \"%s\"."
+msgstr "Wiêcej ni¿ jeden adres znaleziony dla pola \"%s\"."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
@@ -2123,7 +2212,7 @@
 msgid "Move down"
 msgstr "Przenie¶ w dó³"
 
-#: templates/message/navbar_navigate.inc:18
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Przenie¶ do folderu"
 
@@ -2131,16 +2220,16 @@
 msgid "Move up"
 msgstr "Przenie¶ w górê"
 
-#: lib/MIME/Viewer/alternative.php:130
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
+#: templates/smime/smime.inc:24 templates/fetchmail/manage.inc:48
 #: templates/pgp/pgp.inc:24
 msgid "NOTE"
 msgstr "NOTA"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:640
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nazwa"
 
@@ -2148,11 +2237,11 @@
 msgid "Name and/or email can not be empty"
 msgstr "Nazwa i/lub adres nie mog± byæ puste"
 
-#: lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
 msgstr "Wymaga wykonania"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
+#: config/prefs.php.dist:563 config/prefs.php.dist:575
 #: config/prefs.php.dist:754
 msgid "Never"
 msgstr "Nigdy"
@@ -2165,7 +2254,7 @@
 msgid "New"
 msgstr "Nowy"
 
-#: lib/IMP.php:578
+#: lib/IMP.php:615
 msgid "New Folder"
 msgstr "Nowy folder"
 
@@ -2185,7 +2274,7 @@
 msgid "Next Message"
 msgstr "Nastêpna wiadomo¶æ"
 
-#: mailbox.php:345
+#: mailbox.php:352
 msgid "Next Page"
 msgstr "Nastêpna strona"
 
@@ -2205,7 +2294,7 @@
 msgid "No Keys in Keyring"
 msgstr "Brak kluczy w zbiorze"
 
-#: mailbox.php:364
+#: mailbox.php:371
 #, php-format
 msgid "No Messages"
 msgstr "Brak wiadomo¶ci"
@@ -2218,6 +2307,10 @@
 msgid "No Personal Certificate Present"
 msgstr "Brak osobistego certyfikatu"
 
+#: lib/Mailbox.php:323
+msgid "No Preview Text"
+msgstr "Brak podgl±du"
+
 #: templates/smime/smime.inc:54
 msgid "No Public Keys Found"
 msgstr "Nie znaleziono publicznego klucza"
@@ -2226,10 +2319,15 @@
 msgid "No S/MIME public key imported."
 msgstr "Nie zaimportowano publicznego klucza S/MIME."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Nie znaleziono za³±czników."
 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Informacje o kluczu publicznym %s"
+
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
 msgstr "Nie wybrano foldera."
@@ -2238,7 +2336,7 @@
 msgid "No folders are being checked for new mail."
 msgstr "¯aden folder nie zosta³ wybrany do sprawdzania nowej poczty."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
 msgid "No folders were specified"
 msgstr "Nie zdefiniowano ¿adnych folderów"
 
@@ -2250,11 +2348,11 @@
 msgid "No folders with unseen messages"
 msgstr "Brak folderu z niewidzianymi wiadomo¶ciami"
 
-#: lib/Compose.php:241
+#: lib/Compose.php:240
 msgid "No message body text"
 msgstr "Brak tekstu w tre¶ci wiadomo¶ci"
 
-#: lib/Mailbox.php:368
+#: lib/Mailbox.php:365
 msgid "No messages matched your search."
 msgstr "Nie znaleziono wiadomo¶ci spe³niaj±cych kryteria wyszukiwania."
 
@@ -2270,7 +2368,7 @@
 msgid "No personal S/MIME certificates imported."
 msgstr "Osobisty certyfikat S/MIME niezaimportowany."
 
-#: spelling.php:213
+#: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Nie skonfigurowano programu sprawdzaj±cego pisowniê."
 
@@ -2286,13 +2384,13 @@
 msgid "No user specified."
 msgstr "Nie wybrano u¿ytkownika."
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr "Brak uczestnictwa"
 
 #: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:5
-#: lib/MIME/Viewer/itip.php:618
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "¯aden"
 
@@ -2318,8 +2416,7 @@
 msgid "Not Personal"
 msgstr "Nieosobiste"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:152 lib/Crypt/SMIME.php:158
-#: lib/Crypt/SMIME.php:167
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Z³y klucz publiczny."
 
@@ -2331,24 +2428,24 @@
 msgid "Not important messages"
 msgstr "Niewa¿ne wiadomo¶ci"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Ta operacja mo¿e trwaæ d³u¿sz± chwilê"
 
 #: config/prefs.php.dist:371
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
-"Ilo¶æ miesiêcy przez które maj± byæ zachowane stare linki za³±cznikówpoczas "
-"comiesiêcznego usuwania."
+"Ilo¶æ miesiêcy przez które maj± byæ zachowane stare linki za³±czników "
+"podczas comiesiêcznego usuwania."
 
 #: config/prefs.php.dist:353
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
-"Ilo¶æ starych folderów poczty wys³anej, która ma byæ zachowanapodczas "
+"Ilo¶æ starych folderów poczty wys³anej, która ma byæ zachowana podczas "
 "comiesiêcznego usuwania."
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:685
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
@@ -2361,7 +2458,7 @@
 msgid "Old messages"
 msgstr "Stare wiadomo¶ci"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Stare foldery sent-mail zostan± skasowane."
 
@@ -2369,7 +2466,7 @@
 msgid "Only display folders with unread messages in them?"
 msgstr "Wy¶wietliæ tylko foldery z nieczytanymi wiadomo¶ciami?"
 
-#: templates/folders/javascript.inc:78
+#: templates/folders/javascript.inc:71
 msgid "Only one folder should be selected for this action."
 msgstr "Mo¿e byæ wybrany tylko jeden folder dla tej akcji."
 
@@ -2377,15 +2474,15 @@
 msgid "Ope_n Folder"
 msgstr "Otwórz Folder (_n)"
 
-#: templates/menu.inc:24
+#: templates/menu.inc:23
 msgid "Open Folder"
 msgstr "Otwórz Folder"
 
-#: folders.php:381
+#: folders.php:414
 msgid "Opened Folder"
 msgstr "Folder otwarty"
 
-#: lib/MIME/Viewer/itip.php:657
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
 msgstr "Opcjonalne przynale¿no¶ci"
 
@@ -2400,8 +2497,8 @@
 msgid "Other Options"
 msgstr "Inne opcje"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
@@ -2409,11 +2506,11 @@
 msgid "PGP Encrypt Message"
 msgstr "Wiadomo¶æ kodowana PGP"
 
-#: compose.php:343
+#: compose.php:331
 msgid "PGP Error: "
 msgstr "B³±d PGP: "
 
-#: compose.php:322
+#: compose.php:310
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "B³±d PGP: Wymagane has³o dla osobistego klucza prywatnego."
 
@@ -2433,7 +2530,7 @@
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Obs³uga osobistego klucza PGP wymaga bezpiecznego po³±czenia www."
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
 msgstr "Tekstowy klucz publiczny PGP"
 
@@ -2471,7 +2568,7 @@
 msgid "PGP support is disabled on this system."
 msgstr "Obs³uga PGP jest wy³±czona na tym systemie."
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2479,7 +2576,7 @@
 "Obs³uga PGP nie zosta³a aktywowana dlatego cyfrowy podpis nie mo¿e byæ "
 "zweryfikowany."
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
@@ -2496,27 +2593,27 @@
 "masz wy³±czon± t± opcjê powiniene¶ to zmieniæ. W przeciwnym wypadku pewne "
 "fukncje PGP mog± nie funkcjonowaæ prawid³owo"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Automatyczne wykrywanie protoko³u)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 przez SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 przez SSL (w³asny podpis certyfikatem)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:166
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 przez SSL (w³asny podpis)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, bez TLS"
 
@@ -2561,8 +2658,8 @@
 msgid "Passphrases do not match"
 msgstr "Has³a nie zgadzaj± siê"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/smime/import_key.inc:69 templates/login/login.inc:193
+#: templates/fetchmail/manage.inc:20
 msgid "Password"
 msgstr "Has³o"
 
@@ -2574,7 +2671,7 @@
 msgid "Permissions for this user can not be changed."
 msgstr "Uprawnienia dla tego u¿ytkownika nie mog± byæ zmienione."
 
-#: message.php:483 mailbox.php:666 templates/mailbox/navbar.inc:24
+#: mailbox.php:682 message.php:477 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Osobiste"
@@ -2603,19 +2700,19 @@
 msgid "Place your signature before replies and forwards?"
 msgstr "Czy zamieszczaæ Twój podpis przed odpowiedziami i przekazaniami?"
 
-#: compose.php:241
+#: compose.php:227
 msgid "Plaintext Version of Message"
 msgstr "Wersja czytego tekstu wiadomo¶ci"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Proszê podaæ nazwê dla nowego folderu:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
 msgid "Please enter the name of the new folder:"
 msgstr "Proszê podaæ nazwê nowego folderu:"
 
-#: templates/folders/javascript.inc:146
+#: templates/folders/javascript.inc:129
 msgid "Please enter the new name:"
 msgstr "Proszê podaæ now± nazwê:"
 
@@ -2637,7 +2734,7 @@
 "Wprowad¼ has³o dla swojego prywatnego klucza S/MIME. Wprowadzenie has³a "
 "wymagane jest tylko raz dla %s sesji."
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2650,19 +2747,19 @@
 "Operacja ta wymagana jest ze wzglêdu na bezpieczeñstwo Twojej sesji. "
 "Przepraszamy za wszelkie niedogodno¶ci."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:72
 msgid "Please provide your password."
 msgstr "Proszê wprowadziæ has³o."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:68
 msgid "Please provide your username."
 msgstr "Proszê wprowadziæ nazwê u¿ytkownika."
 
-#: compose.php:80 lib/IMP.php:519
+#: compose.php:79 lib/IMP.php:509
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Popraw niejednoznaczny lub nieprawid³owy adres."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -2670,11 +2767,11 @@
 "Przegl±dnij poni¿sz± informacjê, a potem wybierz jedn± z opcji dostêpnych w "
 "menu."
 
-#: templates/folders/javascript.inc:56
+#: templates/folders/javascript.inc:53
 msgid "Please select a folder before you perform any actions."
 msgstr "Wybierz folder przed wykonaniem jakiejkolwiek akcji."
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
 msgstr "Wybierz opcjê z poni¿szego menu."
 
@@ -2690,11 +2787,6 @@
 msgid "Please select or edit in the box to the right:"
 msgstr "Wybierz lub edytuj w oknie:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Wybierz lub edytuj:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Napêdzane przez Horde"
@@ -2715,7 +2807,7 @@
 msgid "Previous Message"
 msgstr "Poprzednia wiadomo¶æ"
 
-#: mailbox.php:336
+#: mailbox.php:343
 msgid "Previous Page"
 msgstr "Poprzednia strona"
 
@@ -2743,7 +2835,7 @@
 msgid "Protocol:"
 msgstr "Protokó³:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Obs³uga serwera publicznych kluczy PGP zosta³a wy³±czona."
 
@@ -2771,14 +2863,14 @@
 msgid "Purge old messages in the Trash folder?"
 msgstr "Usun±æ star± wiadomo¶æ z Kosza?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
+#: lib/Maintenance/Task/purge_trash.php:66
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
+msgid "Purging %d messages from Trash folder."
 msgstr "Usuwanie %d wiadomo¶ci z Kosza."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "Umieszczaj to za @ gdy wysy³ana poczta i domy¶lny adres rozwijany:"
+#: lib/Maintenance/Task/purge_trash.php:64
+msgid "Purging 1 message from Trash folder."
+msgstr "Usuwanie 1 wiadomo¶ci z Kosza."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2804,15 +2896,15 @@
 msgid "Re_quest Delivery Confirmation"
 msgstr "Wymagaj potwierdzenia odebrania (_q)"
 
-#: search.php:165
+#: search.php:163
 msgid "Received On"
 msgstr "Otrzymane"
 
-#: search.php:173
+#: search.php:171
 msgid "Received Since"
 msgstr "Otrzymane pzed"
 
-#: search.php:169
+#: search.php:167
 msgid "Received Until"
 msgstr "Otrzymane do"
 
@@ -2828,11 +2920,11 @@
 msgid "Redirect Message"
 msgstr "Przekieruj wiadomo¶æ"
 
-#: compose.php:721
+#: compose.php:734
 msgid "Redirect this message"
 msgstr "Przekieruj t± wiadomo¶æ"
 
-#: compose.php:781
+#: compose.php:794
 msgid "Redirecting failed."
 msgstr "Przekierowanie nieudane."
 
@@ -2844,7 +2936,7 @@
 msgid "Refresh Folder Views:"
 msgstr "Od¶wie¿ widok foldera:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "Prze³aduj"
 
@@ -2852,7 +2944,7 @@
 msgid "Reload View"
 msgstr "Prze³aduj widok"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
 msgstr "Pamiêtaj o informacji wolny/zajêty."
 
@@ -2864,7 +2956,7 @@
 msgid "Remote Mailbox:"
 msgstr "Zdalna skrzynka"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Usuñ pole z szukania"
 
@@ -2881,7 +2973,7 @@
 msgstr ""
 "Zmieniaæ nazwê foldera wiadomo¶ci wys³anych na pocz±tku ka¿dego miesi±ca?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:440
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Zmiana nazwy z \"%s\" na \"%s\" nie udana. Serwer zwróci³ odpowied¼"
@@ -2898,7 +2990,7 @@
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
 msgstr "Odpowied¼ wys³ana."
 
@@ -2906,7 +2998,7 @@
 msgid "Reply to All"
 msgstr "Odpowiedz wszystkim"
 
-#: compose.php:670
+#: compose.php:680
 msgid "Reply to All:"
 msgstr "Odpowied¼ do wszystkich:"
 
@@ -2914,7 +3006,7 @@
 msgid "Reply to List"
 msgstr "Odpowiedz grupie"
 
-#: compose.php:672
+#: compose.php:682
 msgid "Reply to List:"
 msgstr "Odpowied¼ do grupy:"
 
@@ -2922,28 +3014,28 @@
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystkim (_a)"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
 msgstr "Odpowied¼ zawiera nie obs³ugiwany format wiadomo¶ci"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Odpowiadaj przez kolejne dwa miesi±ce (wolny/zajêty)"
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Odpowiadaj ¿±dan± informacj± wolny/zajêty."
 
-#: message.php:258
+#: message.php:251
 msgid "Reply-To"
 msgstr "Odpowiedz-Do"
 
-#: lib/Compose.php:260 lib/Compose.php:312
+#: lib/Compose.php:259 lib/Compose.php:311
 msgid "Reply-To: "
 msgstr "Odpowiedz-Do:"
 
-#: compose.php:668
+#: compose.php:678
 msgid "Reply:"
 msgstr "Odpowiedz:"
 
@@ -2953,13 +3045,13 @@
 
 #: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
 msgid "Report as Spam"
-msgstr "Raprtuj jako spam"
+msgstr "Raportuj jako spam"
 
 #: templates/compose/compose.inc:374
 msgid "Request a _Read Receipt"
 msgstr "¯±daj potwie_rdzenia z zapoznaniem siê z tre¶ci± wiadomo¶ci"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:578
 msgid "Request delivery confirmation?"
 msgstr "¯adaæ potwierdzenia dostarczenia?"
 
@@ -2967,11 +3059,11 @@
 msgid "Request read receipts?"
 msgstr "¯±daæ potwierdzenia zapoznania siê z tre¶ci±?"
 
-#: mailbox.php:197
+#: mailbox.php:204
 msgid "Requested message not found."
 msgstr "Wymagana wiadomo¶æ nieznaleziona."
 
-#: lib/MIME/Viewer/itip.php:649
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
@@ -2980,7 +3072,7 @@
 msgid "Reset"
 msgstr "Reset"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
 msgstr "Status odpowiadaj±cego uaktualniony"
 
@@ -2988,7 +3080,7 @@
 msgid "Resume"
 msgstr "Wznów"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Wznów swoj± sesjê"
 
@@ -2998,18 +3090,12 @@
 msgstr "Powrót do opcji pobierania poczty"
 
 #: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Powrót do ekranu g³ównych ustawieñ"
-
+#: templates/smime/smime.inc:158 templates/smime/notactive.inc:33
 #: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/pgp/pgp.inc:268 templates/pgp/notactive.inc:33
 msgid "Return to Options"
 msgstr "Powrót do opcji"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Powrót do poprzedniego ekranu"
-
 #: config/prefs.php.dist:714
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
@@ -3017,12 +3103,12 @@
 "Powrót do widoku skrzynki po skasowaniu, przeniesieniu lub skopiowaniu "
 "wiadomo¶ci?"
 
-#: lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Rola"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:415
+#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
+#: lib/MIME/Viewer/pkcs7.php:408
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3030,11 +3116,11 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Wiadomo¶æ kodowana kluczem S/MIME"
 
-#: compose.php:379
+#: compose.php:367
 msgid "S/MIME Error: "
 msgstr "B³±d S/MIME: "
 
-#: compose.php:358
+#: compose.php:346
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "B³ad S/MIME: Wymagane has³o dla osobistego klucza prywatnego."
 
@@ -3083,7 +3169,7 @@
 msgid "S/MIME support is disabled on this system."
 msgstr "Obs³uga S/MIME jest wy³±czona na tym systemie."
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:230
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3091,7 +3177,7 @@
 "Obs³uga S/MIME nie zosta³a aktywowana dlatego wiadomo¶æ nie mo¿e zostaæ "
 "zdekodowana."
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:162
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message can not "
 "be displayed."
@@ -3099,7 +3185,7 @@
 "Obs³uga S/MIME nie zosta³a aktywowana dlategozawarto¶æ tej podpisanej "
 "wiadomo¶ci nie mo¿e zostaæ wy¶wietlona."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:135
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3129,7 +3215,7 @@
 msgid "Sa_ve as"
 msgstr "Zapisz jako (_v)"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:363 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Zapisz"
 
@@ -3171,12 +3257,13 @@
 msgid "Save sent mail?"
 msgstr "Zapisywaæ wys³an± wiadomo¶c?"
 
-#: compose.php:1148
+#: compose.php:1162
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Zapiszanie szkicu nieudane. Serwer zwróci³ odpowied¼: %s"
 
-#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:50
 msgid "Search"
 msgstr "Szukaj"
 
@@ -3185,11 +3272,7 @@
 msgid "Search %s"
 msgstr "Szukaj %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Szukaj poczty"
-
-#: search.php:311
+#: search.php:316
 msgid "Search Results"
 msgstr "Wyniki wyszukiwania"
 
@@ -3205,7 +3288,7 @@
 msgid "Select Another Account"
 msgstr "Wybierz inne konto"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Wybierz datê"
 
@@ -3221,6 +3304,10 @@
 msgid "Select all"
 msgstr "Wybierz wszystko"
 
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr "Wybierz wszystkie pola do przeszukiwania podczas rozszerzania adresów."
+
 #: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
 msgstr "Wybierz konto"
@@ -3241,19 +3328,19 @@
 msgid "Send Key to Public Keyserver"
 msgstr "Wy¶lij klucz do publicznego serwera kluczy"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
 msgstr "Wy¶lij naj¶wie¿sz± informacjê"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Wysy³aæ MDN kiedy wymagane przez nadawcê?"
-
 #: templates/compose/compose.inc:66 templates/compose/compose.inc:422
 msgid "Send Message"
 msgstr "Wy¶lij wiadomo¶æ"
 
-#: folders.php:359
+#: config/prefs.php.dist:698
+msgid "Send read receipt when requested by the sender?"
+msgstr "Wysy³aæ potwierdzenie przeczytania kiedy za¿yczone przez nadawcê?"
+
+#: folders.php:392
 msgid "Sent mail folder"
 msgstr "Folder poczty wys³anej"
 
@@ -3261,8 +3348,8 @@
 msgid "Sent mail folder:"
 msgstr "Folder poczty wys³anej:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Serwer"
 
@@ -3276,7 +3363,7 @@
 
 #: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
-msgstr "Ustaw preferencje przesuwania i usuwania wiadomo¶ci."
+msgstr "Ustaw preferencje przenoszenia i usuwania wiadomo¶ci."
 
 #: config/prefs.php.dist:522
 msgid "Set the X-Priority header when composing messages?"
@@ -3295,7 +3382,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Udostêpniaj foldery pocztowe dla innych u¿ytkowników."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:663
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3323,7 +3410,7 @@
 msgid "Show All Headers"
 msgstr "Poka¿ wszystkie nag³ówki"
 
-#: mailbox.php:354
+#: mailbox.php:361
 msgid "Show Deleted"
 msgstr "Poka¿ usuniête"
 
@@ -3339,11 +3426,11 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Poka¿ tylko subskrybowane foldery"
 
-#: folders.php:254
+#: folders.php:287
 msgid "Show Unsubscribed"
 msgstr "Poka¿ niesubskrybowane"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:603
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Pokazywaæ ikonê pozwalaj±c± na pobieranie za³±czników z wiadomo¶ci?"
 
@@ -3363,7 +3450,7 @@
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Wy¶wietlaæ informacjê o nowej poczcie na pasku zadañ?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:108
 msgid "Show the Images"
 msgstr "Poka¿ obrazy"
 
@@ -3375,15 +3462,15 @@
 msgid "Show total number of mails in folder?"
 msgstr "Wy¶wietlaæ ca³kowit± liczbê wiadomo¶ci w folderze?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:660
 msgid "Shown"
 msgstr "Pokazane"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Ro_zmiar"
 
-#: templates/login/login.inc:241
+#: templates/login/login.inc:213
 msgid "Sign up if not registered"
 msgstr "Zarejestruj siê, je¶li jeszcze tego nie zrobi³e¶"
 
@@ -3395,39 +3482,39 @@
 msgid "Size"
 msgstr "Rozmiar"
 
-#: templates/mailbox/message_headers.inc:71
+#: templates/mailbox/message_headers.inc:81
 msgid "Sort Direction"
 msgstr "Sposób sortowania"
 
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Sortuj wg czasu przybycia"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Sortuj wg daty"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Sortuj wg pola nadawcy"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Sortuj wg rozmiaru wiadomo¶ci"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Sortuj wg tematu"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Sortuj wg w±tku"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Sortuj wg pola adresata"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Folder spamu:"
 
@@ -3451,15 +3538,15 @@
 msgid "Spelling errors per screen when spell checking."
 msgstr "B³êdów pisowni na ekran podczas sprawdzania pisowni."
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr "Start"
 
-#: lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Status"
 
-#: lib/MIME/Contents.php:215
+#: lib/MIME/Contents.php:202
 msgid "Strip Attachment"
 msgstr "Pobierz za³±cznik"
 
@@ -3467,11 +3554,11 @@
 msgid "Strip linebreaks?"
 msgstr "Usun±æ przerwy?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Temat (_j)"
 
-#: message.php:259 search.php:157 templates/compose/recompose.inc:25
+#: message.php:252 search.php:151 templates/compose/recompose.inc:25
 msgid "Subject"
 msgstr "Temat"
 
@@ -3479,7 +3566,7 @@
 msgid "Subject Field"
 msgstr "Pole tematu"
 
-#: search.php:360 templates/smime/passphrase.inc:21
+#: search.php:365 templates/smime/passphrase.inc:21
 #: templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Wy¶lij"
@@ -3488,8 +3575,8 @@
 msgid "Subscribe to Folder(s)"
 msgstr "Przeno¶ subskrypcjê do folderu(ów)"
 
-#: lib/MIME/Viewer/pkcs7.php:374 lib/MIME/Viewer/pgp.php:395
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Pomy¶lnie"
 
@@ -3497,7 +3584,7 @@
 msgid "Suggestions"
 msgstr "Sugestie"
 
-#: lib/MIME/Viewer/itip.php:616 lib/MIME/Viewer/itip.php:618
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Podsumowanie"
 
@@ -3517,20 +3604,20 @@
 msgid "Te_xt"
 msgstr "Tekst (_x)"
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:269
 #, fuzzy
 msgid "Tentative: "
 msgstr "Próbnie zaakceptowane"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
 msgstr "Próbna akceptacja ¿±dania"
 
-#: lib/MIME/Viewer/itip.php:713
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
 msgstr "Próbnie zaakceptowane"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Plik ToS (Warunki korzystania) nie zdefiniowany w conf.php"
@@ -3539,6 +3626,15 @@
 msgid "The From: column of the message should be linked:"
 msgstr "Pole Od: kolumna wiadomo¶ci powinna byæ po³±czona:"
 
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
 #: fetchmailprefs.php:81
 #, php-format
 msgid "The account \"%s\" has been deleted."
@@ -3549,7 +3645,7 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Konto \"%s\" zosta³o zapisane."
 
-#: lib/Filter.php:103
+#: lib/Filter.php:97
 #, php-format
 msgid "The address \"%s\" has been added to %s."
 msgstr "Adres \"%s\" zosta³ dodany do %s."
@@ -3558,7 +3654,7 @@
 msgid "The attachment was not found."
 msgstr "Za³±cznik nie zosta³ znaleziony."
 
-#: lib/MIME/Viewer/itip.php:61
+#: lib/MIME/Viewer/itip.php:69
 msgid "The calendar data is invalid"
 msgstr "Data w kalendarzu jest nieprawid³owa"
 
@@ -3570,11 +3666,11 @@
 "Okienko tworzenia wiadomo¶ci nie mo¿e zostaæ otwarte. Czy¿by twoja "
 "przegl±darka blokowa³a wyskakuj±ce okienka?"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Zawarto¶æ pliku Macintosh jest poni¿ej."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Nazwa obecnego foldera(ów) \"%s\" zostanie zmieniona na \"%s\"."
@@ -3585,26 +3681,26 @@
 msgstr ""
 "Obecna lista u¿ytkowników z dostêpem do tego foldera nie mo¿e byæ odtworzona"
 
-#: compose.php:1157
+#: compose.php:1171
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Szkic zosta³ zapisany do foldera \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr "Wydarzenie zosta³o dodane do twojego kalendarza."
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
-msgstr "Pola '%s' nie mo¿e zostaæ poszerzone."
+msgid "The field \"%s\" can't be expanded."
+msgstr "Pole \"%s\" nie mo¿e zostaæ rozwiniête."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:328
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Istnieje ju¿ folder o nazwie \"%s\"."
 
-#: lib/Folder.php:192
+#: lib/Folder.php:171
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3613,47 +3709,47 @@
 "Nazwa foldera \"%s\" zawiera nie prawid³owe znaki. Mo¿e byæ to ¼ród³em "
 "pó¼niejszych problemów. Zobacz swój panel administracyjny."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:347
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr ""
 "Folder \"%s\" zosta³ utworzony, ale nie zosta³e¶ do niego subskrybowany."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:285
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Folder \"%s\" zosta³ skasowany, ale nie usuniêto Twojej subskrypcji."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:334
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Folder \"%s\" nie zosta³ utworzony. Serwer zwróci³ odpowied¼"
 
-#: lib/Folder.php:373
+#: lib/Folder.php:278
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Folder \"%s\" nie zosta³ usuniety. Oto co odpowiedzia³ serwer"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:350
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Folder \"%s\" zosta³ utworzony."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:288
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Folder \"%s\" zosta³ usuniêty."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:438
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Zmieniono nazwê foldera \"%s\" na \"%s\" pomy¶lnie."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
 msgstr "Nastêpuj±ce pliki zosta³y do³±czone do tej czê¶ci:"
 
-#: lib/MIME/Viewer/html.php:95
+#: lib/MIME/Viewer/html.php:96
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3661,24 +3757,24 @@
 "Obrazki bêd± wy¶wietlane poniewa¿ nadawca znajduje siê w twojej ksi±¿ce "
 "adresowej."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "Serwer pocztowy wygenerowa³ nastêpuj±c± wiadomo¶æ z b³êdem:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "Serwer pocztowy wygenerowa³ nastêpuj±c± wiadomo¶æ informacyjn±:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "Serwer pocztowy wygenerowa³ nastêpuj±c± wiadomo¶æ:"
 
-#: lib/Message.php:635
+#: lib/Message.php:614
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Skrzynka %s jest ju¿ pusta."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr "Wiadomo¶æ \"%s\" od \"%s\" (%d bajtów) przekracza limit rozmiaru."
@@ -3691,11 +3787,11 @@
 msgid "The message has been deleted."
 msgstr "Wiadomo¶æ zosta³a usuniêta."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
 msgstr "Wiadomo¶æ zosta³a zweryfikowana."
 
-#: lib/MIME/Viewer/pkcs7.php:378
+#: lib/MIME/Viewer/pkcs7.php:373
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Wiadomo¶æ zosta³a zweryfikowana. Nadawca: %s."
@@ -3708,20 +3804,20 @@
 "Okno z has³em nie mo¿e zostaæ otwarte. Czy¿by twoja przegl±darka blokowa³a "
 "wyskakuj±ce okienka?"
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "¬ród³owy tekst klucza publicznego PGP mo¿e byæ widziany %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "¯±dany plik nie wystêpuje w za³±czniku MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "¯±dany plik nie wystêpuje w za³±czniku Zip."
 
-#: message.php:547
+#: message.php:531
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3731,7 +3827,7 @@
 "Nadawca tej wiadom¶ci wymaga potwierdzenia pzeczytania tej wiadmo¶ci. "
 "Kliknij %s aby wys³aæ wiadomo¶æ z zawiadomieniem."
 
-#: lib/MIME/Viewer/images.php:72
+#: lib/MIME/Viewer/images.php:69
 msgid "The server was not able to create a thumbnail of this image."
 msgstr "Serwer nie potrafi³ stworzyæ miniaturki tego obrazka."
 
@@ -3747,42 +3843,42 @@
 msgid "The specified file does not exist."
 msgstr "Okre¶lony plik nie istnieje."
 
-#: lib/MIME/Viewer/itip.php:159
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
 msgstr "Zadanie zosta³o dodane do twojej listy zadañ."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Tekst wiadomo¶ci"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Tekst wiadomo¶ci mo¿e byæ wy¶wietlony %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Zwrócono odpowied¼"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Zwrócona odpowied¼ mo¿e byæ wy¶wietlona %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Wiadomo¶æ wys³ana"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Wiadomo¶æ wys³ana mo¿e byæ wy¶wietlona %s."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Informacja o u¿ytkowniku (wolny/zajêty) zosta³a zachowana."
 
-#: lib/MIME/Viewer/alternative.php:89
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "Nie ma ¿adnych alternatywnych czê¶ci, które mog³yby zostaæ pokazane."
 
@@ -3790,24 +3886,29 @@
 msgid "There are no messages in this mailbox."
 msgstr "Nie ma nowych wiadomo¶ci."
 
-#: lib/Message.php:594
+#: thread.php:69
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Nie ma ¿adnych alternatywnych czê¶ci, które mog³yby zostaæ pokazane."
+
+#: lib/Message.php:575
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Wyst±pi³ problem podczas wymazywania %s. Oto co odpowiedzia³ serwer"
 
-#: lib/Message.php:637
+#: lib/Message.php:616
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 "Wyst±pi³ problem podczas wymazywania skrzynki. Serwer zwróci³ odpowied¼: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:584
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
 "Wyst±pi³ problem podczas wymazywania skrzynki pocztowej. Oto co powiedzia³ "
 "serwer"
 
-#: lib/Message.php:97
+#: lib/Message.php:92
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3816,7 +3917,7 @@
 "Wyst±pi³ b³±d podczas kopiowania wiadomo¶ci z \"%s\" do \"%s\". Serwer "
 "zwróci³ odpowied¼"
 
-#: lib/Message.php:207 lib/Message.php:222
+#: lib/Message.php:200 lib/Message.php:215
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3825,7 +3926,7 @@
 "Wyst±pi³ b³±d podczas usuwania wiadomo¶ci z foldera \"%s\". Serwer zwróci³ "
 "odpowied¼"
 
-#: lib/Message.php:286
+#: lib/Message.php:277
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3834,17 +3935,23 @@
 "Wyst±pi³ b³±d podczas usuwania wiadomo¶ci w folderze \"%s\". Serwer zwróci³ "
 "odpowied¼"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/Message.php:213
+#, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr ""
+"Wyst±pi³ b³±d podczas usuwania wiadomo¶ci. Serwer zwróci³ odpowied¼: %s"
+
+#: lib/MIME/Viewer/itip.php:99
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr ""
 "Wyst±pi³ b³±d podczas usuwania wiadomo¶ci. Serwer zwróci³ odpowied¼: %s"
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Wyst±pi³ b³±d podczas wy¶wietlania tej czê¶ci wiadomo¶ci"
 
-#: lib/Message.php:523 lib/Message.php:565
+#: lib/Message.php:508 lib/Message.php:548
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3858,24 +3965,24 @@
 msgid "There was an error importing %s."
 msgstr "Wyst±pi³ b³±d podczas importowania %s."
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Wyst±pi³ b³±d podczas importowania zdarzenia %s."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Wyst±pi³ b³±d podczas importowania zadania %s."
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Wyst±pi³ b³±d podczas importowania informacji (wolny/zajêty) o u¿ytkowniku: %"
 "s."
 
-#: lib/Message.php:92
+#: lib/Message.php:87
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3884,29 +3991,29 @@
 "Wyst±pi³ b³±d podczas przenoszenia wiadomo¶ci z folderu \"%s\" do \"%s\". "
 "Serwer zwróci³ odpowied¼"
 
-#: compose.php:1165
+#: compose.php:1179
 msgid "There was an error saving this message as a draft."
 msgstr "Wyst±pi³ b³±d podczas zapisywania szkicu."
 
-#: compose.php:927
+#: compose.php:940
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Wyst±pi³ b³±d podczas wysy³ania wiadomo¶ci :%s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Wyst±pi³ b³ad podczas aktualizacji zdarzenia: %s."
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "Brak tekstu w polu wiadomo¶ci"
 
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:94
 msgid "This HTML message has images embedded in it."
 msgstr "Wiadomo¶æ w formacie HTML zawiera pliki graficzne."
 
-#: lib/MIME/Viewer/html.php:89
+#: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -3914,39 +4021,39 @@
 "Wiadomo¶æ w formacie HTML zawiera pliki graficzne. Blokowane obrazki podobno "
 "do: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Twój publiczny klucz PGP zosta³ za³±czony do wiadomo¶ci."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr "Ta operacja nie jest obs³ugiwana."
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr "Ta opcja nie jest jeszcze za³±czona."
 
-#: templates/folders/javascript.inc:7
+#: templates/folders/javascript.inc:6
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "To mo¿e zaj±æ trochê czasu. Chcesz kontynuowaæ?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "To jest wiadomo¶æ zawieraj±ca plik Macintosh."
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:399
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr "Ta wiadomo¶æ zawiera za³±cznik, który jest podpisany przez S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:403
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Ta wiadomo¶æ zawiera za³±cznik, który jest zakodowany przez S/MIME."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -3954,39 +4061,39 @@
 "Ta wiadmo¶æ zawiera wiadomo¶æ informacyjn± o statusie dostarczenia (delivery "
 "status information), ale format wiadomo¶ci jest nieznany."
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 "Ta wiadomo¶c nie wygl±da na poprawn± wiadomo¶æ kodowan± przez PGP. B³±d: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Ta wiadmo¶æ nie wygl±da na poprawny format PGP (zgodnie z RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:159
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Ta wiadomo¶æ nie wygl±da na poprawny format S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Ta wiadomo¶æ zosta³a podpisana cyfrowo za pomoc± PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:132
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Ta wiadomo¶æ zosta³a podpisana cyfrowo za pomoc± S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
 msgid "This message has been encrypted via S/MIME."
 msgstr "Ta wiadomo¶æ zosta³a zakodowana za pomoc± S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
 msgstr "Ta wiadomo¶c zosta³a zakodowana za pomoc± PGP."
 
-#: message.php:202
+#: message.php:195
 msgid "This message to"
 msgstr "Wiadomo¶æ do"
 
@@ -3998,13 +4105,13 @@
 msgid "This window must be called from a compose window."
 msgstr "To okno musi zostaæ wywo³ane przez okno kompozytora wiadomo¶ci."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
 msgid "Thread View"
 msgstr "Podgl±d w±tku"
 
-#: message.php:255 mailbox.php:576 search.php:145
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
+#: mailbox.php:585 message.php:248 search.php:139
+#: templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
 #: templates/compose/recompose.inc:10
 msgid "To"
 msgstr "Do"
@@ -4025,7 +4132,7 @@
 msgid "Total Attachments Size:"
 msgstr "Rozmiar wszystkich za³±czników:"
 
-#: folders.php:350
+#: folders.php:383
 msgid "Trash folder"
 msgstr "Folder kosza"
 
@@ -4033,8 +4140,8 @@
 msgid "Trash folder:"
 msgstr "Folder kosza:"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Nie mo¿liwe sprawdzenie pojemno¶ci konta"
 
@@ -4051,24 +4158,24 @@
 msgid "Undelete"
 msgstr "Odtwórz"
 
-#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:218
+#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Nieujawnieni adresaci"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Nie obs³ugiwany komponent typu: %s"
 
-#: mailbox.php:537
+#: mailbox.php:544
 msgid "Unknown Date"
 msgstr "Nieznana data"
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
 msgstr "Nieznane spotkanie"
 
-#: mailbox.php:588
+#: mailbox.php:597
 msgid "Unknown Recipient"
 msgstr "Nieznany adresat"
 
@@ -4080,7 +4187,7 @@
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: message.php:489 mailbox.php:671 templates/message/navbar_navigate.inc:6
+#: mailbox.php:687 message.php:483 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
@@ -4094,7 +4201,7 @@
 msgid "Update Attachment Information"
 msgstr "Uaktualnij informacje o za³±czniku"
 
-#: lib/MIME/Viewer/itip.php:576
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr "Uaktualnij status odpowiadaj±cego"
 
@@ -4116,10 +4223,12 @@
 
 #: acl.php:87
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
-msgstr "U¿ytkownik '%s' prawid³owo zdefiniowa³ prawa dostêpu do foldera '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+"U¿ytkownik \"%s\" prawid³owo zdefiniowa³ prawa dostêpu do foldera \"%s\"."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:181
 msgid "Username"
 msgstr "Nazwa u¿ytkownika"
 
@@ -4133,7 +4242,7 @@
 msgid "View"
 msgstr "Widok"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
 msgstr "Widok %s"
@@ -4143,7 +4252,7 @@
 msgid "View %s Public Key"
 msgstr "Wy¶wietl %s klucz publiczny"
 
-#: lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/html.php:128
 msgid "View HTML content in a separate window"
 msgstr "Wy¶wietl zawarto¶æ HTML w osobnym oknie"
 
@@ -4159,23 +4268,23 @@
 msgid "View Thread"
 msgstr "Wy¶wietl w±tek"
 
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
 msgstr "Wy¶wietl miniaturkê"
 
-#: lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/pkcs7.php:407
 msgid "View attachment in a separate window"
 msgstr "Wy¶wietl za³±cznik w osobnym oknie"
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "Wy¶wietl zawarto¶æ w osobnym oknie"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
 msgstr "Wy¶wietl zdarzenie"
 
-#: folders.php:342 mailbox.php:506
+#: folders.php:375 mailbox.php:513
 #, php-format
 msgid "View messages in %s"
 msgstr "Wy¶wietlenie wiadomo¶ci w %s"
@@ -4184,26 +4293,26 @@
 msgid "View or mailbox to display after login:"
 msgstr "Widok lub skrzynka do pokazania po logowaniu:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
 msgstr "Wy¶wietl zadanie"
 
-#: lib/MIME/Viewer/html.php:110
+#: lib/MIME/Viewer/html.php:113
 msgid "View the Images"
 msgstr "Pokazuj pliki graficzne"
 
-#: search.php:309
+#: search.php:314
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Wirtualny folder \"%s\" zosta³ utworzony."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:125 lib/IMAP/Tree.php:138
-#: lib/IMAP/Tree.php:140 lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:145
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:353 lib/IMAP/Tree.php:395
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
+#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
+#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: search.php:291
+#: search.php:296
 msgid "Virtual Folders require a label."
 msgstr "Wirtualne foldery wymagaj± etykiety."
 
@@ -4211,11 +4320,11 @@
 msgid "Virtual folder label"
 msgstr "Etykieta wirtualnego folderu"
 
-#: lib/MIME/Viewer/pkcs7.php:368
+#: lib/MIME/Viewer/pkcs7.php:363
 msgid "Warning"
 msgstr "Ostrze¿enie"
 
-#: login.php:131
+#: login.php:130
 #, php-format
 msgid "Welcome to %s"
 msgstr "Witamy w %s"
@@ -4237,6 +4346,12 @@
 msgstr ""
 "Kiedy zapisujesz w wiadomo¶ci-wys³ane, powinienem zapisywaæ za³±czniki?"
 
+#: config/prefs.php.dist:421
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
 #: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Bia³a lista"
@@ -4249,31 +4364,42 @@
 msgid "Yes"
 msgstr "Tak"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Pobierasz wiadomo¶ci z nastêpuj±cych kont:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Próbujesz usun±æ nastêpuj±ce foldery:"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Próbujesz usun±æ wszystkie wiadomo¶ci w nastêpuj±cych folderach."
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Próbujesz usun±æ nastêpuj±ce foldery."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Kopiujesz/przenosisz do nowego folderu."
 
-#: templates/folders/javascript.inc:101
+#: templates/folders/javascript.inc:94
 msgid "You are creating a sub-folder to "
 msgstr "Tworzysz nowy podfolder w "
 
-#: templates/folders/javascript.inc:103
+#: templates/folders/javascript.inc:96
 msgid "You are creating a top-level folder."
 msgstr "Tworzysz folder wy¿szy."
 
-#: templates/folders/javascript.inc:144
+#: templates/folders/javascript.inc:127
 msgid "You are renaming the folder: "
 msgstr "Zmieniasz nazwê folderowi: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:537
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Twoja subskrypcja zosta³a usuniêta z \"%s\""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
@@ -4283,7 +4409,7 @@
 msgid "You do not have permission to change access to this folder"
 msgstr "Nie masz praw aby zmieniæ uprawnienia dla tego foldera"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Przekazujesz t± wiadomo¶æ %%s do nastêpuj±cych adresatów: %s."
@@ -4305,26 +4431,26 @@
 "Masz wybrany przynajmniej jeden za³±cznik, ale jeszcze ¿adnego nie "
 "do³±czy³e¶. Wys³aæ tê wiadomo¶æ bez za³±czników?"
 
-#: lib/IMP.php:1002
+#: lib/IMP.php:1030
 msgid "You have new mail in the following folder:"
 msgstr "Masz now± pocztê w nastêpuj±cym folderze:"
 
-#: lib/IMP.php:1007
+#: lib/IMP.php:1035
 msgid "You have new mail in the following folders:"
 msgstr "Masz now± pocztê w nastêpuj±cych folderach:"
 
-#: compose.php:127
+#: compose.php:126
 msgid "You must enter at least one recipient."
 msgstr "Musisz wprowadziæ przynajmniej jednego adresata."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Musisz wprowadziæ has³o dla swojego pryatnego klucza PGP aby wy¶wietliæ t± "
 "wiadomo¶æ"
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:238
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4332,7 +4458,7 @@
 "Musisz wprowadziæ has³o dla swojego pryatnego klucza S/MIME aby wy¶wietliæ "
 "t± wiadomo¶æ"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Musisz najpierw wybraæ docelow± skrzynkê."
 
@@ -4344,8 +4470,8 @@
 msgid "You must select an address first."
 msgstr "Musisz najpierw wybraæ adres."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Musisz najpierw wybraæ przynajmniej jedn± wiadomo¶æ."
 
@@ -4358,38 +4484,38 @@
 msgstr "Musisz zdefiniowaæ przynajmniej jeden plik do do³±czenia."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Musisz w³±czyæ '%s' w w opcjach konserwacji."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Przekierowa³e¶ wiadomo¶æ do %s na %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Odpowiedzia³e¶ na tê wiadomo¶æ dnia %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:487
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
 "Twoja subskrypcja w \"%s\" nie zosta³a aktywowana. Serwer zwróci³ odpowied¼"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:539
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 "Twoja subskrypcja w \"%s\" nie zosta³a anulowana. Serwer zwróci³ odpowied¼"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:490
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Zosta³e¶ subskrybowany do \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:542
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Twoja subskrypcja zosta³a usuniêta z \"%s\""
@@ -4428,7 +4554,7 @@
 msgstr ""
 "Twoje aliasy adresu: <i>(opcjonalnie, wprowad¼ ka¿dy adres w nowej lini)</i>"
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "Twoja przegl±darka nie obs³uguje wy¶wietlania plików graficznych tego typu."
@@ -4449,7 +4575,7 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Domy¶lna metoda kodowania wysy³anych wiadomo¶ci:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Twoja wiadomo¶æ zosta³a dostarczona."
 
@@ -4457,7 +4583,7 @@
 msgid "Your signature:"
 msgstr "Twój podpis:"
 
-#: message.php:279 compose.php:1205 mailbox.php:521 lib/Compose.php:742
+#: mailbox.php:528 compose.php:1219 message.php:272 lib/Compose.php:729
 msgid "[No Subject]"
 msgstr "[brak tematu]"
 
@@ -4473,7 +4599,7 @@
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:903
+#: lib/IMP.php:933
 msgid "_Compose"
 msgstr "Twórz (_c)"
 
@@ -4482,7 +4608,7 @@
 msgid "_Delete"
 msgstr "Usuñ (_d)"
 
-#: lib/IMP.php:905
+#: lib/IMP.php:935
 msgid "_Folders"
 msgstr "_Foldery"
 
@@ -4490,15 +4616,15 @@
 msgid "_Identity"
 msgstr "To¿samo¶æ (_i)"
 
-#: lib/IMP.php:896
+#: lib/IMP.php:926
 msgid "_Inbox"
 msgstr "Odebrane (_i)"
 
-#: lib/IMP.php:946
+#: lib/IMP.php:976
 msgid "_Log out"
 msgstr "Wy_loguj"
 
-#: message.php:375
+#: message.php:368
 msgid "_Message Source"
 msgstr "¬ród³o wiado_mo¶ci"
 
@@ -4510,7 +4636,7 @@
 msgid "_Priority"
 msgstr "_Priorytet"
 
-#: mailbox.php:395
+#: mailbox.php:402
 #, php-format
 msgid "_Refresh %s"
 msgstr "Od¶wie¿ %s (_r)"
@@ -4519,7 +4645,7 @@
 msgid "_Reply"
 msgstr "Odpowiedz (_r)"
 
-#: lib/IMP.php:907
+#: lib/IMP.php:937
 msgid "_Search"
 msgstr "_Szukaj"
 
@@ -4527,7 +4653,7 @@
 msgid "_Send Message"
 msgstr "Wy¶lij wiadomo¶æ"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "W±_tek"
 
@@ -4547,11 +4673,11 @@
 msgid "_Whitelist"
 msgstr "Bia³a lista (_w)"
 
-#: lib/Compose.php:355
+#: lib/Compose.php:351
 msgid "attachment"
 msgstr "za³±cznik"
 
-#: view.php:102
+#: view.php:99
 msgid "attachments.zip"
 msgstr "za³±czniki.zip"
 
@@ -4559,7 +4685,7 @@
 msgid "bytes"
 msgstr "bajtów"
 
-#: templates/contacts/contacts.inc:187
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "od"
 
@@ -4571,7 +4697,7 @@
 msgid "mailbox file"
 msgstr "plik skrzynki"
 
-#: compose.php:987 lib/Message.php:442
+#: compose.php:1001 lib/Message.php:429
 msgid "name"
 msgstr "nazwa"
 
@@ -4591,10 +4717,10 @@
 msgid "spelling errors"
 msgstr "b³êdy pisowni"
 
-#: lib/Filter.php:55
+#: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "twoja czarna lista"
 
-#: lib/Filter.php:67
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "twoja bia³a lista"


--- orig/lib/MIME/Viewer/rfc822.php
+++ mod/lib/MIME/Viewer/rfc822.php
@@ -6,9 +6,9 @@
  * The IMP_MIME_Viewer_rfc822 class renders out messages from
  * message/rfc822 content types.
  *
- * $Horde: imp/lib/MIME/Viewer/rfc822.php,v 1.26.10.3 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/rfc822.php,v 1.26.10.10 2006/02/10 16:50:31 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -32,7 +32,8 @@
         $contents = &$params[0];
 
         /* Get the entire body part of the message/rfc822 contents. */
-        if (is_a($contents, 'IMP_Contents')) {
+        if (is_a($contents, 'IMP_Contents') &&
+            $this->mime_part->getMIMEId()) {
             $this->mime_part = &$contents->getDecodedMIMEPart($this->mime_part->getMIMEId(), true);
         }
 
@@ -51,8 +52,14 @@
     {
         $contents = &$params[0];
 
-        if (is_a($contents, 'IMP_Contents')) {
-            $this->mime_part = &$contents->getDecodedMIMEPart($this->mime_part->getMIMEId(), true);
+        if (is_a($contents, 'IMP_Contents') &&
+            !$this->mime_part->getContents()) {
+            $id = $this->mime_part->getMIMEId();
+            $hdr_id = substr($id, -2);
+            if ($hdr_id != '.0') {
+                $id .= '.0';
+            }
+            $this->mime_part = &$contents->getDecodedMIMEPart($id);
         }
 
         return parent::renderAttachmentInfo();


--- orig/lib/MIME/Contents.php
+++ mod/lib/MIME/Contents.php
@@ -8,9 +8,9 @@
  * all functions related to handling the content and output of mail messages
  * in IMP.
  *
- * $Horde: imp/lib/MIME/Contents.php,v 1.153.4.18 2005/09/26 22:04:26 jan Exp $
+ * $Horde: imp/lib/MIME/Contents.php,v 1.153.4.41 2006/03/23 05:33:03 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -29,6 +29,13 @@
     var $_body = '';
 
     /**
+     * The MIME part id of the message body.
+     *
+     * @var integer
+     */
+    var $_body_id;
+
+    /**
      * The text of various MIME body parts.
      *
      * @var array
@@ -43,6 +50,13 @@
     var $_index;
 
     /**
+     * The mailbox of the current message.
+     *
+     * @var string
+     */
+    var $_mailbox;
+
+    /**
      * Should attachment stripping links be generated?
      *
      * @var boolean
@@ -59,7 +73,14 @@
      * This method must be invoked as:
      *   $imp_contents = &IMP_Contents::singleton($index);
      *
-     * @param integer $index  The IMAP message index.
+     * @param string $index  The IMAP message mailbox/index. The index should
+     *                       be in the following format:
+     * <pre>
+     * msg_id IMP_IDX_SEP msg_folder
+     *   msg_id      = Message index of the message
+     *   IMP_IDX_SEP = IMP constant used to separate index/folder
+     *   msg_folder  = The full folder name containing the message index
+     * </pre>
      *
      * @return IMP_Contents  The IMP_Contents object or null.
      */
@@ -83,18 +104,21 @@
     /**
      * Constructor
      *
-     * @param mixed $in  Either the IMAP message index of the message to
-     *                   process, or a MIME_Message object.
+     * @param mixed $in  Either an index string (see IMP_Contents::singleton()
+     *                   for the format) or a MIME_Message object.
      */
     function IMP_Contents($in)
     {
         if (is_a($in, 'MIME_Message')) {
             $ob = $in;
         } else {
-            $this->_index = $in;
+            list($this->_index, $this->_mailbox) = explode(IMP_IDX_SEP, $in);
 
-            /* Get the MIME_Message object for the given index. */
-            $structure = @imap_fetchstructure($_SESSION['imp']['stream'], $in, FT_UID);
+            /* Get the MIME_Structure object for the given index. */
+            require_once IMP_BASE . '/lib/IMAP.php';
+            $imp_imap = &IMP_IMAP::singleton();
+            $imp_imap->changeMbox($this->_mailbox);
+            $structure = @imap_fetchstructure($_SESSION['imp']['stream'], $this->_index, FT_UID);
             if (!is_object($structure)) {
                 return;
             }
@@ -127,7 +151,8 @@
     function getBody()
     {
         if (empty($this->_body)) {
-            $this->_body = @imap_body($_SESSION['imp']['stream'], $this->_index, FT_UID);
+            $this->_body = @imap_body($_SESSION['imp']['stream'], $this->_index, FT_UID | FT_PEEK);
+            $this->_body = str_replace("\r\n", "\n", $this->_body);
         }
 
         return $this->_body;
@@ -143,7 +168,8 @@
     function getBodyPart($id)
     {
         if (!isset($this->_bodypart[$id])) {
-            $this->_bodypart[$id] = @imap_fetchbody($_SESSION['imp']['stream'], $this->_index, $id, FT_UID);
+            $this->_bodypart[$id] = @imap_fetchbody($_SESSION['imp']['stream'], $this->_index, $id, FT_UID | FT_PEEK);
+            $this->_bodypart[$id] = str_replace("\r\n", "\n", $this->_bodypart[$id]);
         }
 
         return isset($this->_bodypart[$id]) ? $this->_bodypart[$id] : '';
@@ -168,7 +194,8 @@
      * @return array  See MIME_Contents::partSummary().
      *                Adds the following key to that return:
      *                [6] = Compressed Download Link
-     *                [7] = Strip Attachment Link (if allowed)
+     *                [7] = Image Save link (if allowed)
+     *                [8] = Strip Attachment Link (if allowed)
      */
     function partSummary(&$mime_part, $guess = false)
     {
@@ -193,6 +220,18 @@
             $summary[] = null;
         }
 
+        /* Display the image save link if the required registry calls are
+         * present. */
+        if (($mime_part->getPrimaryType() == 'image') &&
+            $registry->hasMethod('images/selectGalleries') &&
+            ($image_app = $registry->hasMethod('images/saveImage'))) {
+            Horde::addScriptFile('popup.js');
+            $url = Util::addParameter(Horde::applicationUrl('saveimage.php'), array('index' => $this->_index, 'id' => $mime_part->getMIMEId()));
+            $summary[] = Horde::link('#', _("Save Image in Gallery"), null, null, "popup_imp('" . $url . "',450,200); return false;") . '<img src="' . $registry->get('icon', $image_app) . '" alt="' . _("Save Image in Gallery") . '" title="' . _("Save Image in Gallery") . '" /></a>';
+        } else {
+            $summary[] = null;
+        }
+
         /* Strip the Attachment? */
         if ($this->_strip &&
             !$mime_part->getInformation('rfc822_part')) {
@@ -224,7 +263,7 @@
         require_once IMP_BASE . '/lib/Search.php';
 
         /* Add the necessary local parameters. */
-        $params = array_merge($params, IMP_Search::getSearchParameters(IMP::getThisMailbox()));
+        $params = array_merge($params, IMP::getSearchParameters($_SESSION['imp']['thismailbox']));
         $params['index'] = $this->_index;
         if (!isset($params['mailbox'])) {
             $params['mailbox'] = $_SESSION['imp']['mailbox'];
@@ -261,7 +300,7 @@
 
         /* If download attachment, add the 'thismailbox' param. */
         if ($actionID == 'download_attach') {
-            $params['viewparams']['thismailbox'] = IMP::getThisMailbox();
+            $params['viewparams']['thismailbox'] = $_SESSION['imp']['thismailbox'];
         }
 
         if ($mime_part->getInformation('viewparams')) {
@@ -274,47 +313,25 @@
     }
 
     /**
-     * Returns the full message text for a given message/mailbox.
-     *
-     * @param integer $index  The index/mailbox of the message. If empty, will
-     *                        use the current message index.
+     * Returns the full message text.
      *
      * @return string  The full message text.
      */
-    function fullMessageText($index = null)
+    function fullMessageText()
     {
-        $imp_headers = &$this->getHeaderOb($index);
+        $imp_headers = &$this->getHeaderOb();
         return $imp_headers->getHeaderText() . $this->getBody();
     }
 
     /**
-     * Returns the header object for the given message.
-     *
-     * @param integer $index  The index/mailbox of the message. If empty, will
-     *                        use the current message index.
+     * Returns the header object.
      *
      * @return IMP_Headers  The IMP_Headers object.
      */
-    function &getHeaderOb($index = null)
+    function &getHeaderOb()
     {
-        if (is_null($index)) {
-            $index = $this->_index;
-        } elseif ($index != $this->_index) {
-            if (strstr($index, IMP_IDX_SEP)) {
-                require_once IMP_BASE . '/lib/base.php';
-                $imp_imap = &IMP_IMAP::singleton();
-                list($index, $mailbox) = explode(IMP_IDX_SEP, $index);
-                $imp_imap->changeMbox($mailbox);
-            }
-            if ($index != $this->_index) {
-                $this->_body = '';
-                $this->_index = $index;
-            }
-        }
-
         require_once IMP_BASE . '/lib/MIME/Headers.php';
-        $imp_headers = &new IMP_Headers($index);
-
+        $imp_headers = &new IMP_Headers($this->_index);
         return $imp_headers;
     }
 
@@ -330,6 +347,12 @@
 
     /**
      * Rebuild the MIME_Part structure of a message from IMAP data.
+     * This will store IMAP data in all parts of the message - for example,
+     * all data for a multipart/mixed part will be stored in the base part,
+     * and each part will contain its own data.  Note that if you want to
+     * build a message string from the MIME_Part data after calling
+     * rebuildMessage(), you should use IMP_Contents::toString() instead of
+     * MIME_Part::toString().
      *
      * @return MIME_Message  A MIME_Message object with all of the body text
      *                       stored in the individual MIME_Parts.
@@ -347,28 +370,25 @@
      *
      * @access private
      *
-     * @param MIME_Part &$part  A MIME_Part object.
+     * @param MIME_Part $part  A MIME_Part object.
      */
-    function _rebuildMessage(&$part)
+    function _rebuildMessage($part)
     {
         $id = $part->getMIMEId();
 
+        $mime_part = $this->getMIMEPart($id);
+        $this->_setContents($mime_part, true);
+        if ($this->_message->getPart($id) === $this->_message) {
+            $this->_message = &$mime_part;
+        } else {
+            $this->_message->alterPart($id, $mime_part);
+        }
+
         if ($part->getPrimaryType() == 'multipart') {
             /* Recursively process any subparts. */
             foreach ($part->getParts() as $mime) {
                 $this->_rebuildMessage($mime);
             }
-        } elseif ($part->getType() == 'message/rfc822') {
-            $part->setContents($this->getBodyPart(substr($id, 0, strrpos($id, '.'))));
-            $this->_message->alterPart($id, $part);
-        } else {
-            $mime_part = &$this->getMIMEPart($id);
-            $mime_part->setContents($this->getBodyPart($id));
-            if ($this->_message->getPart($id) === $this->_message) {
-                $this->_message = &$mime_part;
-            } else {
-                $this->_message->alterPart($id, $mime_part);
-            }
         }
     }
 
@@ -381,10 +401,7 @@
      */
     function renderMIMEPart(&$mime_part)
     {
-        if (!$mime_part->getContents()) {
-            $mime_part->setContents($this->getBodyPart($mime_part->getMIMEId()));
-        }
-
+        $this->_setContents($mime_part);
         $text = parent::renderMIMEPart($mime_part);
 
         /* Convert textual emoticons into graphical ones - but only for
@@ -392,7 +409,7 @@
         if (($mime_part->getPrimaryType() == 'text') &&
             $GLOBALS['prefs']->getValue('emoticons')) {
             require_once 'Horde/Text/Filter.php';
-            $text = Text_Filter::filter($text, 'emoticons', array(true));
+            $text = Text_Filter::filter($text, 'emoticons', array('entities' => true));
         }
 
         return $text;
@@ -405,12 +422,31 @@
      */
     function _addCacheShutdown()
     {
-        /* Don't save the cached $_body or $_bodypart arrays since we most
-           likely will not use them in the cached object (since the cache
-           will generally be used to view parts that _weren't* displayed
-           originally. */
+        /* Don't cache the $_bodypart array since we most likely will not use
+         * them in the cached object (since the cache will generally be used
+         * to view parts that weren't displayed originally).
+         * However, we will lose the benefit of not having to
+         * make calls to the mail server on subsequent page loads, so allow
+         * users to change this behavior.  Only cache small messages as
+         * storing large messages will make the session size too large and
+         * will tax storage and performance on the server. */
+        if (empty($GLOBALS['conf']['server']['cache_msgbody'])) {
+            $this->_bodypart = array();
+        } else {
+            $size = 0;
+            foreach ($this->_bodypart as $key => $val) {
+                $part_size = strlen($val);
+                if (($size + $part_size) < 10240) {
+                    $size += $part_size;
+                } else {
+                    unset($this->_bodypart[$key]);
+                }
+            }
+        }
+
+        /* Never cache the full body part as we use this item much less
+         * often than specific message body parts. */
         $this->_body = null;
-        $this->_bodypart = array();
 
         parent::_addCacheShutdown();
     }
@@ -439,42 +475,44 @@
     function getDownloadAllList($forward = false)
     {
         $downloads = array();
-        $rfc822 = null;
 
-        /* Here is what we don't consider 'downloadable':
-           Any 'multipart/*' part
-           All 'message/*' parts except for 'message/rfc822'
-           The first viewable part
-           PGP or S/MIME signature information */
+        $bodyid = $this->findBody();
+
+        /* Here is what we consider 'forwardable':
+         * All parts > 0
+         * Part 0 if not multipart/mixed
+         * NOT the body part (if one exists)
+         *
+         * Here is what we consider 'downloadable':
+         * All parts not 'multipart/*' and 'message/*' except for
+         *  'message/rfc822'
+         * All parts that are not PGP or S/MIME signature information
+         * NOT the body part (if one exists) */
         foreach ($this->_message->contentTypeMap() as $key => $val) {
-            if (($key == 0) && (strpos($val, 'multipart/') === false)) {
-                break;
+            if ($key == $bodyid) {
+                continue;
             }
 
-            if ($forward && !is_null($rfc822)) {
-                if (strpos($key, $rfc822) === 0) {
-                    continue;
-                } else {
-                    $rfc822 = null;
+            if ($forward) {
+                if ($key == 0) {
+                    if ($val != 'multipart/mixed') {
+                        $downloads[] = $key;
+                        break;
+                    }
+                } elseif (strpos($key, '.') === false) {
+                    $downloads[] = $key;
                 }
-            }
-
-            if (strpos($val, 'message/') === 0) {
-                /* If we are forwarding, only forward the message/rfc822 - not
-                 * its constituent parts. */
-                if (strpos($val, 'message/rfc822') === 0) {
-                    if ($forward) {
-                        $rfc822 = substr($key, 0, strrpos($key, '.'));
+            } else {
+                if (strpos($val, 'message/') === 0) {
+                    if (strpos($val, 'message/rfc822') === 0) {
+                        $downloads[] = $key;
                     }
+                } elseif (((intval($key) != 1) && (strpos($val, '1.') === false)) &&
+                          ((strpos($val, 'multipart/') === false)) &&
+                          (strpos($val, 'application/x-pkcs7-signature') === false) &&
+                          (strpos($val, 'application/pkcs7-signature') === false)) {
                     $downloads[] = $key;
                 }
-            } elseif (($forward ||
-                       (intval($key) != 1) && (strpos($val, '1.') === false)) &&
-                      ((strpos($val, 'multipart/') === false) ||
-                       ($forward && (strpos($val, 'multipart/related') === 0))) &&
-                      (strpos($val, 'application/x-pkcs7-signature') === false) &&
-                      (strpos($val, 'application/pkcs7-signature') === false)) {
-                $downloads[] = $key;
             }
         }
 
@@ -528,12 +566,17 @@
      */
     function findBody()
     {
+        if (isset($this->_body_id)) {
+            return $this->_body_id;
+        }
+
         /* Look for potential body parts. */
         $part = $this->_message->getBasePart();
         $primary_type = $part->getPrimaryType();
         if (($primary_type == MIME::type(TYPEMULTIPART)) ||
             ($primary_type == MIME::type(TYPETEXT))) {
-            return $this->_findBody($part);
+            $this->_body_id = $this->_findBody($part);
+            return $this->_body_id;
         }
 
         return null;
@@ -546,7 +589,7 @@
      *
      * @return string  The MIME ID of the main "body" part.
      */
-    function _findBody(&$mime_part)
+    function _findBody($mime_part)
     {
         if (intval($mime_part->getMIMEId()) < 2 ||
             $mime_part->getInformation('alternative') === 0) {
@@ -588,4 +631,80 @@
         return md5(implode('|', array($index, $_SESSION['imp']['thismailbox'])));
     }
 
+    /**
+     * Make sure the contents of the current part are set from IMAP server
+     * data.
+     *
+     * @access private
+     * @since IMP 3.1
+     *
+     * @param MIME_Part &$mime_part  The MIME_Part object to work with.
+     * @param boolean $all           Download the entire parts contents?
+     */
+    function _setContents(&$mime_part, $all = false)
+    {
+        if (!$mime_part->getInformation('imp_contents_set') &&
+            !$mime_part->getContents()) {
+            $id = $mime_part->getMIMEId();
+            if ($all && ($mime_part->getType() == 'message/rfc822')) {
+                $id = substr($mime_part->getMIMEId(), 0, -2);
+            }
+            $mime_part->setContents($this->getBodyPart($id));
+        }
+        $mime_part->setInformation('imp_contents_set', true);
+    }
+
+    /**
+     * Fetch part of a MIME message.
+     *
+     * @since IMP 3.1
+     *
+     * @param integer $id   The MIME ID of the part requested.
+     * @param boolean $all  If this is a header part, should we return all text
+     *                      in the body?
+     *
+     * @return MIME_Part  The MIME_Part.
+     */
+    function &getRawMIMEPart($id, $all = false)
+    {
+        $mime_part = $this->getMIMEPart($id);
+        if (!is_a($mime_part, 'MIME_Part')) {
+            $mime_part = null;
+            return $mime_part;
+        }
+        $this->_setContents($mime_part, true);
+        return $mime_part;
+    }
+
+    /**
+     * Create a message string from a MIME message that has used
+     * rebuildMessage() to build the data from the IMAP server.
+     *
+     * @since IMP 4.1
+     *
+     * @param MIME_Message $message  A MIME_Message object.
+     * @param boolean $canonical     Return a canonical string?
+     *
+     * @return string  The contents of the MIME_Message object.
+     */
+    function toString($message, $canonical = false)
+    {
+        $text = '';
+
+        $part = $message->getBasePart();
+        foreach ($part->contentTypeMap() as $key => $val) {
+            if (($key != 0) && (strpos($val, 'multipart/') === 0)) {
+                $old = $part->getPart($key);
+                $old->setContents('');
+                $part->alterPart($key, $old);
+            }
+        }
+
+        if ($message->getMIMEId() == 0) {
+            $part->setContents('');
+        }
+
+        return ($canonical) ? $part->toCanonicalString() : $part->toString();
+    }
+
 }


--- orig/message.php
+++ mod/message.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/message.php,v 2.560.4.14 2005/09/26 09:39:17 selsky Exp $
+ * $Horde: imp/message.php,v 2.560.4.36 2006/04/11 03:28:02 slusarz Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -37,11 +37,10 @@
 require_once IMP_BASE . '/lib/MIME/Headers.php';
 require_once IMP_BASE . '/lib/Mailbox.php';
 require_once IMP_BASE . '/lib/Search.php';
-require_once 'Horde/MIME.php';
 require_once 'Horde/Identity.php';
 
 /* Make sure we have a valid index. */
-$imp_mailbox = &new IMP_Mailbox(Util::getFormData('index'));
+$imp_mailbox = &IMP_Mailbox::singleton(Util::getFormData('index'));
 if (!$imp_mailbox->isValidIndex()) {
     _returnToMailbox(null, 'message_missing');
     require IMP_BASE . '/mailbox.php';
@@ -61,13 +60,15 @@
 $actionID = Util::getFormData('actionID');
 switch ($actionID) {
 case 'blacklist':
-    require_once IMP_BASE . '/lib/Filter.php';
-    IMP_Filter::blacklistMessage(array($imp_mailbox->getIndex()));
-    break;
-
 case 'whitelist':
     require_once IMP_BASE . '/lib/Filter.php';
-    IMP_Filter::whitelistMessage(array($imp_mailbox->getIndex()));
+    $imp_filter = &IMP_Filter::singleton();
+    $idx = $imp_mailbox->getIMAPIndex();
+    if ($actionID == 'blacklist') {
+        $imp_filter->blacklistMessage(array($idx['index']));
+    } else {
+        $imp_filter->whitelistMessage(array($idx['index']));
+    }
     break;
 
 case 'print_message':
@@ -75,20 +76,19 @@
     IMP::printMode(true);
     break;
 
-case 'undelete_message':
-    require_once IMP_BASE . '/lib/Message.php';
-    $imp_message = &new IMP_Message();
-    $imp_message->undelete($imp_mailbox);
-    break;
-
 case 'delete_message':
+case 'undelete_message':
     require_once IMP_BASE . '/lib/Message.php';
-    $imp_message = &new IMP_Message();
-    $imp_message->delete($imp_mailbox);
-    if ($prefs->getValue('mailbox_return')) {
-        _returnToMailbox($imp_mailbox->getMessageIndex());
-        require IMP_BASE . '/mailbox.php';
-        exit;
+    $imp_message = &IMP_Message::singleton();
+    if ($actionID == 'undelete_message') {
+        $imp_message->undelete($imp_mailbox);
+    } else {
+        $imp_message->delete($imp_mailbox);
+        if ($prefs->getValue('mailbox_return')) {
+            _returnToMailbox($imp_mailbox->getMessageIndex());
+            require IMP_BASE . '/mailbox.php';
+            exit;
+        }
     }
     break;
 
@@ -96,7 +96,7 @@
 case 'copy_message':
     if (($targetMbox = Util::getFormData('targetMbox')) !== null) {
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
 
         $action = ($actionID == 'move_message') ? IMP_MESSAGE_MOVE : IMP_MESSAGE_COPY;
 
@@ -104,11 +104,16 @@
             (strpos($targetMbox, '_tasklist_') === 0)) {
             /* If the target is a tasklist, handle the move/copy specially. */
             $tasklist = str_replace('_tasklist_', '', $targetMbox);
-            $imp_message->createTasks($tasklist, $action, $imp_mailbox);
+            $imp_message->createTasksOrNotes($tasklist, $action, $imp_mailbox, 'task');
+        } elseif ($conf['notepad']['use_notepad'] &&
+            (strpos($targetMbox, '_notepad_') === 0)) {
+            /* If the target is a notepad, handle the move/copy specially. */
+            $notepad = str_replace('_notepad_', '', $targetMbox);
+            $imp_message->createTasksOrNotes($notepad, $action, $imp_mailbox, 'note');
         } else {
             /* Otherwise, the target is a standard mailbox. */
             if (Util::getFormData('newMbox', 0) == 1) {
-                $new_mailbox = IMP::addPreambleString(String::convertCharset($targetMbox, NLS::getCharset(), 'UTF7-IMAP'));
+                $new_mailbox = String::convertCharset(IMP::folderPref($targetMbox, true), NLS::getCharset(), 'UTF7-IMAP');
                 require_once IMP_BASE . '/lib/Folder.php';
                 $imp_folder = &IMP_Folder::singleton();
                 if ($imp_folder->create($new_mailbox, $prefs->getValue('subscribe'))) {
@@ -135,9 +140,10 @@
     $imp_spam->reportSpam($imp_mailbox, $action);
 
     /* Delete spam after report. */
-    if (($action == 'spam') && $prefs->getValue('delete_spam_after_report')) {
+    $delete_spam = $prefs->getValue('delete_spam_after_report');
+    if ($action == 'spam' && ($delete_spam == 1)) {
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->delete($imp_mailbox);
         $notification->push(_("The message has been deleted."), 'horde.message');
         if ($prefs->getValue('mailbox_return')) {
@@ -145,6 +151,16 @@
             require IMP_BASE . '/mailbox.php';
             exit;
         }
+    } elseif ($delete_spam == 2) {
+        $targetMbox = ($action == 'spam') ? IMP::folderPref($prefs->getValue('spam_folder'), true) : 'INBOX';
+        require_once IMP_BASE . '/lib/Message.php';
+        $imp_message = &IMP_Message::singleton();
+        $imp_message->copy($targetMbox, IMP_MESSAGE_MOVE, $imp_mailbox);
+        if ($prefs->getValue('mailbox_return')) {
+            _returnToMailbox($imp_mailbox->getMessageIndex());
+            require IMP_BASE . '/mailbox.php';
+            exit;
+        }
     }
     break;
 
@@ -159,7 +175,7 @@
             $set = true;
         }
         require_once IMP_BASE . '/lib/Message.php';
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_message->flag($flag, $imp_mailbox, $set);
         if ($prefs->getValue('mailbox_return')) {
             _returnToMailbox($imp_mailbox->getMessageIndex());
@@ -181,8 +197,7 @@
 
 case 'strip_attachment':
     require_once IMP_BASE . '/lib/Message.php';
-
-    $imp_message = &new IMP_Message();
+    $imp_message = &IMP_Message::singleton();
     $result = $imp_message->stripPart($imp_mailbox, Util::getFormData('imapid'));
     if (is_a($result, 'PEAR_Error')) {
         $notification->push($result, 'horde.error');
@@ -192,7 +207,7 @@
 }
 
 if ($conf['user']['allow_folders']) {
-    $options = IMP::flistSelect(_("This message to"), true, array(null, $imp['mailbox']), null, true, true);
+    $options = IMP::flistSelect(_("This message to"), true, array(), null, true, true, false, true);
 }
 
 /* We may have done processing that has taken us past the end of the
@@ -206,7 +221,9 @@
 
 /* Now that we are done processing the messages, get the index and
  * array index of the current message. */
-$index = $imp_mailbox->getIndex();
+$index_array = $imp_mailbox->getIMAPIndex();
+$index = $index_array['index'];
+$mailbox_name = $index_array['mailbox'];
 $array_index = $imp_mailbox->getArrayIndex();
 
 /* If we grab the headers before grabbing body parts, we'll see when a
@@ -217,8 +234,14 @@
 $imp_headers_copy = &Util::cloneObject($imp_headers);
 
 /* Parse MIME info and create the body of the message. */
-if (!isset($imp_contents)) {
-    $imp_contents = &IMP_Contents::singleton($index);
+$imp_contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $mailbox_name);
+
+/* Update the message flag, if necessary. */
+$use_pop = ($imp['base_protocol'] == 'pop3');
+if (!$use_pop && !$imp_headers->getFlag('seen')) {
+    require_once IMP_BASE . '/lib/Message.php';
+    $imp_message = &IMP_Message::singleton();
+    $imp_message->flag('\\SEEN', $imp_mailbox, true);
 }
 
 /* Determine if we should generate the attachment strip links or
@@ -278,9 +301,9 @@
 if (($priority = $imp_headers->getValue('x-priority'))) {
     if (preg_match("/\s*(\d+)\s*/", $priority, $matches)) {
         if (($matches[1] == '1') || ($matches[1] == '2')) {
-            $imp_headers->addHeader('Priority', Horde::img('mail_priority_high.png', _("High Priority"), 'align="absmiddle"') . '&nbsp;' . $priority);
+            $imp_headers->addHeader('Priority', Horde::img('mail_priority_high.png', _("High Priority")) . '&nbsp;' . $priority);
         } elseif (($matches[1] == '4') || ($matches[1] == '5')) {
-            $imp_headers->addHeader('Priority', Horde::img('mail_priority_low.png', _("Low Priority"), 'align="absmiddle"') . '&nbsp;' . $priority);
+            $imp_headers->addHeader('Priority', Horde::img('mail_priority_low.png', _("Low Priority")) . '&nbsp;' . $priority);
         }
     }
 }
@@ -323,22 +346,26 @@
     }
 }
 
+/* Generate the list of search parameters. */
+$search_params = IMP::getSearchParameters($mailbox_name, $index);
+
 /* For the self URL link, we can't trust the index in the query string as it
  * may have changed if we deleted/copied/moved messages. We may need other
  * stuff in the query string, so we need to do an add/remove of 'index'. */
 $selfURL = Util::removeParameter(Horde::selfUrl(true), array('index', 'actionID'));
 $selfURL = Util::addParameter($selfURL, 'index', $index);
-$headersURL = Util::removeParameter($selfURL, array('show_all_headers', 'show_list_headers'));
+$headersURL = Util::removeParameter($selfURL, array('show_all_headers', 'show_list_headers', 'mailbox', 'thismailbox'));
+$headersURL = Util::addParameter($headersURL, $search_params);
 
 /* Determine previous message index. */
-if (($prev_msg = $imp_mailbox->messageIndices(-1))) {
-    $prev_url = IMP_Search::generateSearchUrl('message.php', $prev_msg['mailbox']);
+if (($prev_msg = $imp_mailbox->getIMAPIndex(-1))) {
+    $prev_url = IMP::generateSearchUrl('message.php', $prev_msg['mailbox']);
     $prev_url = Util::addParameter($prev_url, 'index', $prev_msg['index']);
 }
 
 /* Determine next message index. */
-if (($next_msg = $imp_mailbox->messageIndices(1))) {
-    $next_url = IMP_Search::generateSearchUrl('message.php', $next_msg['mailbox']);
+if (($next_msg = $imp_mailbox->getIMAPIndex(1))) {
+    $next_url = IMP::generateSearchUrl('message.php', $next_msg['mailbox']);
     $next_url = Util::addParameter($next_url, 'index', $next_msg['index']);
 }
 
@@ -350,47 +377,38 @@
 /* Generate the mailbox link. */
 $mailbox_url = Util::addParameter(Horde::applicationUrl('mailbox.php'), 'start', $msgindex);
 
-/* Get the current mailbox name. */
-$mailbox_name = IMP::getThisMailbox($array_index);
-
 /* Generate the view link. */
-$view_link = IMP_Search::generateSearchUrl('view.php', $mailbox_name);
+$view_link = IMP::generateSearchUrl('view.php', $mailbox_name);
 $view_link = Util::addParameter($view_link, 'index', $index);
 
 /* Generate the Save Message link. */
-$search_params = IMP_Search::getSearchParameters($mailbox_name);
 $save_link_array = array_merge(array('actionID' => 'save_message', 'index' => $index), $search_params);
 $save_link = Horde::downloadUrl($subject, $save_link_array);
 
 /* Generate the Message Source link. */
-if ($conf['user']['allow_view_source']) {
+if (!empty($conf['user']['allow_view_source'])) {
     $base_part = $imp_contents->getMIMEMessage();
     $source_link = $imp_contents->linkViewJS($base_part, 'view_source', _("_Message Source"), _("Message Source"), 'widget', array(), true);
 }
 
 /* Generate the link to ourselves. */
-$self_link = IMP_Search::generateSearchUrl('message.php', $mailbox_name);
+$self_link = IMP::generateSearchUrl('message.php', $mailbox_name);
 $self_link = Util::addParameter($self_link, array('index' => $index, 'start' => $msgindex));
 
 /* Generate the print link. */
-$print_link = '';
 $print_params = array('actionID' => 'print_message', 'index' => $index);
-foreach (array_merge($print_params, $search_params) as $key => $val) {
-    $print_link = Util::addParameter($print_link, $key, $val);
-}
-if (substr($print_link, 0, 1) == '?') {
-    $print_link = substr($print_link, 1);
-}
-$print_link = $browser->escapeJSCode($print_link);
+$print_link = Horde::applicationUrl('message.php');
+$print_link = Util::addParameter($print_link, array_merge($print_params, $search_params));
 
 /* Generate the thread view link. */
 $thread_link = Util::addParameter(Horde::applicationUrl('thread.php'), array('index' => $index, 'start' => $msgindex));
 
 $delete_warning = '';
-if ($imp['base_protocol'] == 'pop3') {
+if ($use_pop) {
     $delete_warning = "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete these messages?")) . "');";
 }
 
+Horde::addScriptFile('popup.js', 'horde', true);
 Horde::addScriptFile('keybindings.js', 'horde');
 require IMP_TEMPLATES . '/common-header.inc';
 
@@ -467,15 +485,16 @@
 $addresses = array_keys($user_identity->getAllFromAddresses(true));
 $identity = null;
 $status = '';
-if ($imp['base_protocol'] != 'pop3') {
+if (!$use_pop) {
     if (count($msgAddresses)) {
         $identity = $user_identity->getMatchingIdentity($msgAddresses);
+        if (!is_null($identity) ||
+            $user_identity->getMatchingIdentity($msgAddresses, false) !== null) {
+            $status .= Horde::img('mail_personal.png', _("Personal"));
+        }
         if (is_null($identity)) {
             $identity = $user_identity->getDefault();
         }
-        if ($user_identity->getMatchingIdentity($msgAddresses, false) !== null) {
-            $status .= Horde::img('mail_personal.png', _("Personal"));
-        }
     }
 
     /* Set status flags. */
@@ -555,10 +574,6 @@
         }
     }
 
-    if ($browser->hasFeature('javascript')) {
-        require_once IMP_TEMPLATES . '/javascript/open_print_win.js';
-    }
-
     require IMP_TEMPLATES . '/message/navbar_top.inc';
     $nav_id = 1;
     require IMP_TEMPLATES . '/message/navbar_navigate.inc';
@@ -568,9 +583,7 @@
     require IMP_TEMPLATES . '/message/navbar_actions.inc';
     $actions_output = ob_get_contents();
     ob_end_clean();
-    echo $actions_output;
-
-    echo '</table>';
+    echo $actions_output . '</table>';
 }
 
 /* Generate some variables needed for the templates. */
@@ -582,8 +595,7 @@
 require IMP_TEMPLATES . '/message/message.inc';
 
 if (!$printer_friendly) {
-    echo '<table border="0" align="center" width="100%" cellspacing="0" cellpadding="2">';
-    echo $actions_output;
+    echo '<table width="100%" cellspacing="0">' . $actions_output;
     $nav_id = 2;
     require IMP_TEMPLATES . '/message/navbar_navigate.inc';
     echo '</table></form>';


--- orig/locale/ko_KR/help.xml
+++ mod/locale/ko_KR/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/ko_KR/help.xml,v 1.16.6.1 2005/01/25 22:05:52 jan Exp $ -->
+<!-- $Horde: imp/locale/ko_KR/help.xml,v 1.16.6.5 2006/03/23 00:24:10 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/lib/Mailbox.php
+++ mod/lib/Mailbox.php
@@ -12,9 +12,9 @@
  * The IMP_Mailbox:: class contains all code related to handling mailbox
  * access.
  *
- * $Horde: imp/lib/Mailbox.php,v 1.76.10.17 2005/08/12 03:46:09 slusarz Exp $
+ * $Horde: imp/lib/Mailbox.php,v 1.76.10.56 2006/03/22 00:53:12 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -26,13 +26,6 @@
 class IMP_Mailbox {
 
     /**
-     * The current message index.
-     *
-     * @var integer
-     */
-    var $_index = null;
-
-    /**
      * The location in the sorted array we are at.
      *
      * @var integer
@@ -63,25 +56,11 @@
     /**
      * The threading information for the current mailbox.
      *
-     * @var IMAP_Thread
+     * @var IMP_Thread
      */
     var $_thread = null;
 
     /**
-     * Are we updating the message index?
-     *
-     * @var boolean
-     */
-    var $_indexset = false;
-
-    /**
-     * Has a sort already been done?
-     *
-     * @var boolean
-     */
-    var $_sortdone = false;
-
-    /**
      * Should we show Hide/purge deleted message links?
      *
      * @var boolean
@@ -138,6 +117,38 @@
     var $_previews = array();
 
     /**
+     * The 'no_newmail_popup' flag.
+     *
+     * @var boolean
+     */
+    var $_no_newmail_popup = false;
+
+    /**
+     * Attempts to return a reference to a concrete IMP_Mailbox instance.
+     * It will only create a new instance if no IMP_Mailbox instance with
+     * the same parameters currently exists.
+     *
+     * This method must be invoked as: $var = &IMP_Mailbox::singleton();
+     *
+     * @param integer $index  See IMP_Mailbox constructor.
+     * @param boolean $force  Force the creation of a new instance.
+     *
+     * @return mixed  The created concrete IMP_Mailbox instance, or false
+     *                on error.
+     */
+    function &singleton($index = null, $force = false)
+    {
+        static $instances = array();
+
+        $signature = serialize($index);
+        if ($force || !isset($instances[$signature])) {
+            $instances[$signature] = new IMP_Mailbox($index);
+        }
+
+        return $instances[$signature];
+    }
+
+    /**
      * Constructor.
      *
      * @param integer $index  The index of the current message. This will cause
@@ -146,22 +157,34 @@
      */
     function IMP_Mailbox($index = null)
     {
-        global $imp, $prefs;
-
         if (!is_null($index)) {
             $this->setNewIndex($index);
         }
 
-        if ($imp['base_protocol'] == 'pop3') {
+        if ($GLOBALS['imp']['base_protocol'] == 'pop3') {
             $this->_usepop = true;
         }
 
-        /* Default sort field for this mailbox. */
-        $this->_sortby = $prefs->getValue('sortby');
-
         /* Determine whether we're hiding deleted messages; let the
            trash folder take precedence. */
-        $this->_delhide = ($prefs->getValue('delhide') && !$prefs->getValue('use_trash'));
+        if ($GLOBALS['prefs']->getValue('use_vtrash')) {
+            $this->_delhide = !$GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox']) || ($GLOBALS['imp']['search']['label'] != _("Virtual Trash"));
+        } else {
+            $this->_delhide = ($GLOBALS['prefs']->getValue('delhide') &&
+                               !$GLOBALS['prefs']->getValue('use_trash') &&
+                               ($GLOBALS['imp_search']->isSearchMbox() ||
+                               ($GLOBALS['prefs']->getValue('sortby') != SORTTHREAD)));
+        }
+    }
+
+    /**
+     * Sets the value of the 'no_newmail_popup' flag.
+     *
+     * @param boolean $nopopup  The value to set the flag.
+     */
+    function setNoNewmailPopup($nopopup)
+    {
+        $this->_no_newmail_popup = (bool) $nopopup;
     }
 
     /**
@@ -171,9 +194,8 @@
      */
     function setNewIndex($index)
     {
-        $this->_setIndex($index);
         $this->_setSorted();
-        $this->_setArrayIndex();
+        $this->_setArrayIndex($index, 'uid');
     }
 
     /**
@@ -183,24 +205,22 @@
      */
     function showPreviews()
     {
-        global $conf, $prefs;
-
         if (!empty($this->_previews)) {
             return true;
         }
 
-        if (!$conf['mailbox']['show_preview'] ||
-            !$prefs->getValue('preview_enabled')) {
+        if (!$GLOBALS['conf']['mailbox']['show_preview'] ||
+            !$GLOBALS['prefs']->getValue('preview_enabled')) {
             return false;
         }
 
-        $this->_previews['unread'] = $prefs->getValue('preview_show_unread');
-        $this->_previews['maxlen'] = $prefs->getValue('preview_maxlen');
+        $this->_previews['unread'] = $GLOBALS['prefs']->getValue('preview_show_unread');
+        $this->_previews['maxlen'] = $GLOBALS['prefs']->getValue('preview_maxlen');
         if ($this->_previews['maxlen'] != -1) {
             $this->_previews['maxlen'] = max(5, $this->_previews['maxlen'] - 3);
         }
-        $this->_previews['strip'] = $prefs->getValue('preview_strip_nl');
-        $this->_previews['tooltip'] = $prefs->getValue('preview_show_tooltip');
+        $this->_previews['strip'] = $GLOBALS['prefs']->getValue('preview_strip_nl');
+        $this->_previews['tooltip'] = $GLOBALS['prefs']->getValue('preview_show_tooltip');
 
         return true;
     }
@@ -208,17 +228,12 @@
     /**
      * Build the array of message information.
      *
-     * @param integer $begin       The beginning message number.
-     * @param integer $beginIndex  The beginning index.
-     * @param integer $end         The ending message number.
-     * @param array $sorted        The list of sorted UIDs.
-     * @param array $sortedMbox    The list of mailboxes associated with UIDs.
-     *                             If empty, UIDS will be associated with the
-     *                             current mailbox.
+     * @param integer $begin  The beginning message number.
+     * @param integer $end    The ending message number.
      *
      * @return array  An array with information on the requested messages.
      * <pre>
-     * Key: array index in original $sorted array
+     * Key: array index in current sorted mailbox array
      * 'header'     --  Header information from imap_fetch_overview().
      * 'mbox'       --  Name of the mailbox.
      * 'preview'    --  The message preview (if the 'show_preview' preference
@@ -227,11 +242,8 @@
      *                  configuration option is active).
      * </pre>
      */
-    function buildMailboxArray($begin, $beginIndex, $end, $sorted,
-                               $sortedMbox = array())
+    function buildMailboxArray($begin, $end)
     {
-        global $conf, $imp;
-
         $this->_showdelete = false;
 
         $mboxes = array();
@@ -239,21 +251,21 @@
         $show_preview = $this->showPreviews();
 
         /* Build the list of mailboxes and messages. */
-        for ($i = $begin - 1, $j = $beginIndex; $i < $end; $i++, $j++) {
+        for ($i = $begin - 1; $i < $end; $i++) {
             /* Make sure that the index is actually in the slice of messages
                we're looking at. If we're hiding deleted messages, for
                example, there may be gaps here. */
-            if (isset($sorted[$i])) {
-                if (isset($sortedMbox[$i])) {
-                    $mboxname = $sortedMbox[$i];
+            if (isset($this->_sorted[$i])) {
+                if (isset($this->_sortedMbox[$i])) {
+                    $mboxname = $this->_sortedMbox[$i];
                 } else {
-                    $mboxname = $imp['mailbox'];
+                    $mboxname = $GLOBALS['imp']['mailbox'];
                 }
 
                 if (!isset($mboxes[$mboxname])) {
                     $mboxes[$mboxname] = array();
                 }
-                $mboxes[$mboxname][$sorted[$i]] = $i;
+                $mboxes[$mboxname][$this->_sorted[$i]] = $i;
             }
         }
 
@@ -263,7 +275,7 @@
         /* Retrieve information from each mailbox. */
         foreach ($mboxes as $mbox => $ids) {
             $imp_imap->changeMbox($mbox, OP_READONLY);
-            $imapOverview = @imap_fetch_overview($imp['stream'], implode(',', array_keys($ids)), FT_UID);
+            $imapOverview = @imap_fetch_overview($GLOBALS['imp']['stream'], implode(',', array_keys($ids)), FT_UID);
             foreach ($imapOverview as $header) {
                 $key = $ids[$header->uid];
                 $overview[$key] = array();
@@ -272,8 +284,8 @@
                     $this->_showdelete = true;
                 }
 
-                if ($conf['fetchmail']['show_account_colors']) {
-                    $hdr = @imap_fetchheader($imp['stream'], $header->uid, FT_UID);
+                if ($GLOBALS['conf']['fetchmail']['show_account_colors']) {
+                    $hdr = @imap_fetchheader($GLOBALS['imp']['stream'], $header->uid, FT_UID);
                     if (preg_match("/X-color:(.*)\n/", $hdr, $color)) {
                         $overview[$key]['color'] = trim($color[1]);
                     }
@@ -287,9 +299,10 @@
                      !$header->seen ||
                      $header->recent)) {
                     require_once IMP_BASE . '/lib/MIME/Contents.php';
-                    $imp_contents = &IMP_Contents::singleton($header->uid);
+                    $imp_contents = &IMP_Contents::singleton($header->uid . IMP_IDX_SEP . $mbox);
                     if (($mimeid = $imp_contents->findBody(false)) !== null) {
                         $pmime = &$imp_contents->getDecodedMIMEPart($mimeid);
+                        if (is_null($pmime)) pre_dump($header->uid, $mimeid);
                         $ptext = $pmime->getContents();
                         $ptext = String::convertCharset($ptext, $pmime->getCharset());
                         if ($pmime->getType() == 'text/html') {
@@ -304,20 +317,17 @@
                             }
                         }
 
-                        $ptext = str_replace("\r", "\n", $ptext);
                         if ($this->_previews['strip'] &&
                             !$this->_previews['tooltip']) {
+                            $ptext = str_replace("\r", "\n", $ptext);
                             $ptext = preg_replace('/\n/', ' ', $ptext);
                             $ptext = preg_replace('/(\s)+/', '$1', $ptext);
                         } else {
-                            $ptext = preg_replace('/\n(\s*\n)+/', "\n", $ptext);
+                            $ptext = str_replace("\r", '', $ptext);
                         }
                         if (!$this->_previews['tooltip']) {
                             require_once 'Horde/Text/Filter.php';
                             $ptext = Text_Filter::filter($ptext, 'text2html', array('parselevel' => TEXT_HTML_NOHTML, 'charset' => '', 'class' => ''));
-                            if (!$this->_previews['tooltip']) {
-                                $ptext = str_replace(' ', '&nbsp;', $ptext);
-                            }
                         }
                     } else {
                         $ptext = '[[' . _("No Preview Text") . ']]';
@@ -327,7 +337,7 @@
                     $overview[$key]['preview'] = $ptext;
                 } else {
                     require_once 'Horde/MIME/Structure.php';
-                    $overview[$key]['structure'] = ($conf['mailbox']['show_attachments']) ? MIME_Structure::parse(@imap_fetchstructure($imp['stream'], $header->uid, FT_UID)) : null;
+                    $overview[$key]['structure'] = ($GLOBALS['conf']['mailbox']['show_attachments']) ? MIME_Structure::parse(@imap_fetchstructure($GLOBALS['imp']['stream'], $header->uid, FT_UID)) : null;
                     $overview[$key]['preview'] = null;
                 }
             }
@@ -342,35 +352,36 @@
     /**
      * Builds the list of messages in the mailbox.
      *
+     * @access private
+     *
      * @return array  The sorted index.
      */
-    function buildMailbox()
+    function _buildMailbox()
     {
         $this->_newmsgs = 0;
 
-        if ($GLOBALS['imp']['mailbox'] == IMP_SEARCH_MBOX) {
-            require_once IMP_BASE . '/lib/Search.php';
-
+        if ($GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
             $query = null;
             if ($this->_delhide) {
-                require_once 'Horde/IMAP/Search.php';
-                $query = &new IMAP_Search_Query();
+                require_once IMP_BASE . '/lib/IMAP/Search.php';
+                $query = &new IMP_IMAP_Search_Query();
                 $query->deleted(false);
             }
-            $sorted = IMP_Search::runSearch($query);
+            $sorted = $GLOBALS['imp_search']->runSearch($query, $GLOBALS['imp']['mailbox']);
 
             /* Return to the search page if this is not a virtual folder. */
             if (empty($sorted) &&
-                empty($_SESSION['imp']['search']['vfolder_id'])) {
+                !$GLOBALS['imp_search']->isVFolder($GLOBALS['imp']['mailbox'])) {
                 $GLOBALS['notification']->push(_("No messages matched your search."), 'horde.warning');
                 header('Location: ' . Util::addParameter(Horde::applicationUrl('search.php', true), 'no_match', 1));
                 exit;
             }
         } else {
             $this->_getSortedIndex();
-            if (($sorted = $this->getSorted()) &&
-                ($GLOBALS['prefs']->getValue('nav_popup') &&
-                 !Util::getFormData('no_newmail_popup'))) {
+            if (!empty($this->_sorted) &&
+                (($GLOBALS['prefs']->getValue('nav_popup') ||
+                  $GLOBALS['prefs']->getValue('nav_audio')) &&
+                 !$this->_no_newmail_popup)) {
                 $newQuery = 'RECENT';
                 if ($this->_delhide) {
                     $newQuery .= ' UNDELETED';
@@ -379,6 +390,7 @@
                     $this->_newmsgs = count($new);
                 }
             }
+            $sorted = $this->_sorted;
         }
 
         /* Store the sorted range in IMP_Message. */
@@ -390,6 +402,8 @@
     /**
      * The number of new messages in the mailbox (IMAP RECENT flag,
      * with UNDELETED if we're hiding deleted messages).
+     *
+     * @return integer The number of new messages in the mailbox.
      */
     function newMessageCount()
     {
@@ -397,56 +411,41 @@
     }
 
     /**
-     * The number of new messages in the mailbox (IMAP UNSEEN flag).
+     * Get the list of unseen messages in the mailbox (IMAP UNSEEN flag).
+     *
+     * @return array  The list of unseen messages.
      */
-    function unseenMessageCount()
+    function unseenMessages()
     {
-        global $imp;
-
         $newQuery = 'UNSEEN';
         if ($this->_delhide) {
             $newQuery .= ' UNDELETED';
         }
-        if (($new = @imap_search($imp['stream'], $newQuery))) {
-            return count($new);
-        } else {
-            return false;
-        }
+        $ret = @imap_search($GLOBALS['imp']['stream'], 'ALL ' . $newQuery, SE_UID);
+        return (empty($ret)) ? array() : $ret;
     }
 
     /**
      * Should delete message links be shown? Only show if the
      * configuration requires it, or deleted messages exist in the
      * current mailbox.
+     *
+     * @return array  An array with the following elements:
+     * <pre>
+     * 'hide'  - Whether show/hide delete message links should be shown.
+     * 'purge' - Whether purge delete links should be shown.
+     * </pre>
      */
     function showDeleteLinks()
     {
-        global $imp, $prefs;
+        $ret_array = array('hide' => false, 'purge' => false);
 
-        if (!$prefs->getValue('use_trash') &&
-            strstr($imp['protocol'], 'imap')) {
-            return true;
-        } else {
-            return $this->_showdelete;
-        }
-    }
-
-    /**
-     * Returns the current message index.
-     *
-     * @param boolean $mbox  Append the mailbox information to the data (in
-     *                       IMP_Message format)?
-     *
-     * @return integer  The message index.
-     */
-    function getIndex($mbox = false)
-    {
-        if ($mbox) {
-            $data = $this->messageIndices(0);
-            return $data['index'] . IMP_IDX_SEP . $data['mailbox'];
-        } else {
-            return $this->_index;
+        if (!$GLOBALS['prefs']->getValue('use_trash') &&
+            !$GLOBALS['prefs']->getValue('use_vtrash') &&
+            !$GLOBALS['imp_search']->isVINBOXFolder()) {
+            $ret_array = array('hide' => true, 'purge' => true);
         }
+        return $ret_array;
     }
 
     /**
@@ -499,47 +498,19 @@
     function isValidIndex()
     {
         $this->_sortIfNeeded();
-
-        if (is_null($this->_index) || is_null($this->_arrayIndex)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Returns the sorted list of messages.
-     *
-     * @return array  The sorted list of messages.
-     */
-    function getSorted()
-    {
-        return $this->_sorted;
-    }
-
-    /**
-     * Returns the sorted list of mailboxes associated with the sorted list
-     * of messages.
-     *
-     * @return array  The sorted list of mailboxes.
-     */
-    function getSortedMbox()
-    {
-        return $this->_sortedMbox;
+        return !is_null($this->_arrayIndex);
     }
 
     /**
-     * Returns information on a message offset from the current message.
+     * Returns IMAP mbox/UID information on a message.
      *
      * @param integer $offset  The offset from the current message.
      *
      * @return array  'index'   -- The message index.
      *                'mailbox' -- The mailbox.
      */
-    function messageIndices($offset)
+    function getIMAPIndex($offset = 0)
     {
-        global $imp;
-
         $return_array = array();
         $index = $this->_arrayIndex + $offset;
 
@@ -549,31 +520,16 @@
         }
 
         $return_array['index'] = $this->_sorted[$index];
-        if ($imp['mailbox'] == IMP_SEARCH_MBOX) {
+        if ($GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
             $return_array['mailbox'] = $this->_sortedMbox[$index];
         } else {
-            $return_array['mailbox'] = $imp['mailbox'];
+            $return_array['mailbox'] = $GLOBALS['imp']['mailbox'];
         }
 
         return $return_array;
     }
 
     /**
-     * Move current pointer to the next index.
-     */
-    function moveNext()
-    {
-        if (($nextindex = $this->messageIndices(1))) {
-            $this->_setIndex($nextindex['index']);
-        } else {
-            $this->_index = null;
-        }
-
-        $this->_setArrayIndex();
-        $this->_setLastValidIndex();
-    }
-
-    /**
      * Update the current mailbox if an action has been performed on the
      * current message index.
      *
@@ -582,16 +538,10 @@
      */
     function updateMailbox($action, $success = true)
     {
-        global $imp, $prefs;
-
-        if (!$this->_indexset) {
-            return;
-        }
-
         switch ($action) {
         case IMP_MAILBOX_COPY:
             /* Just move to the next message. */
-            $this->_incrementIndex();
+            $this->moveNext();
 
             /* Determine if we need to resort. */
             $this->_sortIfNeeded();
@@ -602,7 +552,9 @@
             /* If we are using POP, we need to resort every time. */
             if ($success && $this->_usepop) {
                 $this->_getSortedIndex();
-            } elseif ($success && ($this->_delhide || $prefs->getValue('use_trash'))) {
+            } elseif ($success &&
+                      ($this->_delhide ||
+                       $GLOBALS['prefs']->getValue('use_trash'))) {
                 /* Nuke message from sorted list if sent to trash or
                    hidden. */
                 $this->_removeCurrent();
@@ -610,7 +562,7 @@
                 /* Either we failed, or the message is still in the
                    mailbox and has been marked as deleted - just move
                    to the next message. */
-                $this->_incrementIndex();
+                $this->moveNext();
 
                 /* Determine if we need to resort. */
                 $this->_sortIfNeeded();
@@ -618,13 +570,13 @@
             break;
 
         case IMP_MAILBOX_UNDELETE:
-            $this->_incrementIndex();
+            $this->moveNext();
             break;
 
         case IMP_MAILBOX_EXPUNGE:
         case IMP_MAILBOX_EMPTY:
         case IMP_MAILBOX_UPDATE:
-            if ($imp['mailbox'] != IMP_SEARCH_MBOX) {
+            if (!$GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
                 $this->_getSortedIndex();
             }
             break;
@@ -653,13 +605,11 @@
      */
     function buildMailboxPage($page = 0, $start = 0)
     {
-        global $imp, $prefs;
-
-        $sorted = $this->buildMailbox();
+        $sorted = $this->_buildMailbox();
         $msgcount = $this->getMessageCount();
 
-        $maxmsgs = $prefs->getValue('max_msgs');
-        $sortdir = $prefs->getValue('sortdir');
+        $maxmsgs = $GLOBALS['prefs']->getValue('max_msgs');
+        $sortdir = $GLOBALS['prefs']->getValue('sortdir');
 
         $this->_determineSort();
 
@@ -672,7 +622,7 @@
                     /* Messages set this when returning to a mailbox. */
                     $page = ceil($start / $maxmsgs);
                 } else {
-                    $startpage = $prefs->getValue('mailbox_start');
+                    $startpage = $GLOBALS['prefs']->getValue('mailbox_start');
                     switch ($startpage) {
                     case IMP_MAILBOXSTART_FIRSTPAGE:
                         $page = 1;
@@ -685,20 +635,13 @@
                     case IMP_MAILBOXSTART_FIRSTUNSEEN:
                     case IMP_MAILBOXSTART_LASTUNSEEN:
                         if (!$this->aboveSortLimit() &&
-                            ($imp['mailbox'] != IMP_SEARCH_MBOX)) {
-                            /* Use imap_search() to find unread messages. */
-                            $search = 'UNSEEN';
-                            if ($this->_delhide) {
-                                $search .= ' UNDELETED';
-                            }
-                            $query = @imap_search($imp['stream'], $search, SE_UID);
-                            if (!empty($query)) {
-                                $sortednew = array_keys(array_intersect($sorted, $query));
-                                $first_new = ($startpage == IMP_MAILBOXSTART_FIRSTUNSEEN) ?
-                                    array_shift($sortednew) :
-                                    array_pop($sortednew);
-                                $page = ceil(($first_new + 1) / $maxmsgs);
-                            }
+                            !$GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox']) &&
+                            ($query = $this->unseenMessages())) {
+                            $sortednew = array_keys(array_intersect($sorted, $query));
+                            $first_new = ($startpage == IMP_MAILBOXSTART_FIRSTUNSEEN) ?
+                                array_shift($sortednew) :
+                                array_pop($sortednew);
+                            $page = ceil(($first_new + 1) / $maxmsgs);
                         }
                         break;
                     }
@@ -718,7 +661,7 @@
                 $page = 1;
             }
 
-            $begin = intval((($page - 1) * $maxmsgs) + 1);
+            $begin = (($page - 1) * $maxmsgs) + 1;
             $end = $begin + $maxmsgs - 1;
             if ($end > $msgcount) {
                 $end = $msgcount;
@@ -730,7 +673,7 @@
             $pageCount = 1;
         }
 
-        if ($imp['mailbox'] == IMP_SEARCH_MBOX) {
+        if ($GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
             $beginIndex = $begin - 1;
         } else {
             $beginIndex = $this->getArrayIndex();
@@ -739,8 +682,9 @@
         /* If there are no viewable messages, check for deleted messages in
            the mailbox. */
         $anymsg = true;
-        if (($msgcount == 0) && ($imp['mailbox'] != IMP_SEARCH_MBOX)) {
-            $status = @imap_status($imp['stream'], IMP::serverString($imp['mailbox']), SA_MESSAGES);
+        if (($msgcount == 0) &&
+            !$GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
+            $status = @imap_status($GLOBALS['imp']['stream'], IMP::serverString($GLOBALS['imp']['mailbox']), SA_MESSAGES);
             if (is_object($status) && ($status->messages == 0)) {
                 $anymsg = false;
             }
@@ -765,6 +709,19 @@
      */
     function sortby()
     {
+        static $orig_sort;
+
+        $sortpref = $GLOBALS['prefs']->getValue('sortby');
+        if (!isset($this->_sortby) || ($orig_sort != $sortpref)) {
+            $this->_sortby = $orig_sort = $sortpref;
+
+            /* The search mailbox doesn't support thread sort. */
+            if ($GLOBALS['imp_search']->isSearchMbox($_SESSION['imp']['mailbox']) &&
+                ($this->_sortby == SORTTHREAD)) {
+                $this->_sortby = SORTDATE;
+            }
+        }
+
         return $this->_sortby;
     }
 
@@ -786,65 +743,31 @@
     function isSpecialFolder()
     {
         if (is_null($this->_specialFolder)) {
-            global $imp, $prefs;
-
             /* Get the identities. */
             require_once 'Horde/Identity.php';
             $identity = &Identity::singleton(array('imp', 'imp'));
 
-            $preamble = IMP::preambleString();
-            $this->_specialFolder = (($imp['mailbox'] == $preamble . $prefs->getValue('drafts_folder')) || (in_array($imp['mailbox'], $identity->getAllSentmailFolders())));
+            $this->_specialFolder = (($GLOBALS['imp']['mailbox'] == IMP::folderPref($GLOBALS['prefs']->getValue('drafts_folder'), true)) || (in_array($GLOBALS['imp']['mailbox'], $identity->getAllSentmailFolders())));
         }
 
         return $this->_specialFolder;
     }
 
     /**
-     * Sets the private index variable.
-     *
-     * @access private
-     *
-     * @param integer $index  The index of the current message. If empty, will
-     *                        update the current index to the current array
-     *                        index value.
-     */
-    function _setIndex($index = null)
-    {
-        if (empty($index)) {
-            if (!is_null($this->_arrayIndex)) {
-                if (!empty($this->_sorted[$this->_arrayIndex])) {
-                    $this->_index = $this->_sorted[$this->_arrayIndex];
-                } else {
-                    $this->_index = null;
-                }
-            }
-        } else {
-            if (strstr($index, IMP_IDX_SEP)) {
-                list($this->_index,) = explode(IMP_IDX_SEP, $index);
-            } else {
-                $this->_index = $index;
-            }
-        }
-        $this->_indexset = true;
-    }
-
-    /**
      * Updates the sorted messages array.
      *
      * @access private
      */
     function _setSorted()
     {
-        global $imp;
-
         $this->_sorted = array();
         $this->_sortedMbox = array();
 
-        if (empty($imp['msgl'])) {
+        if (empty($GLOBALS['imp']['msgl'])) {
             $this->_sorted = array();
         } else {
-            $msglist = explode(IMP_MSG_SEP, $imp['msgl']);
-            if ($imp['mailbox'] == IMP_SEARCH_MBOX) {
+            $msglist = explode(IMP_MSG_SEP, $GLOBALS['imp']['msgl']);
+            if ($GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
                 foreach ($msglist as $val) {
                     list($idx, $mbox) = explode(IMP_IDX_SEP, $val);
                     $this->_sorted[] = $idx;
@@ -861,45 +784,44 @@
      *
      * @access private
      *
-     * @param integer $offset  The number of messages to increase array index
-     *                         by. If null, sets array index to the value of
-     *                         the current message index, if any.
-     */
-    function _setArrayIndex($offset = null)
-    {
-        global $imp;
-
-        if (is_null($this->_index)) {
-            $this->_arrayIndex = null;
-        } else {
-            if (!is_null($offset)) {
-                $this->_lastArrayIndex = $this->_arrayIndex;
-                $this->_arrayIndex += $offset;
-                if (empty($this->_sorted[$this->_arrayIndex])) {
-                    $this->_arrayIndex = null;
+     * @param integer $data  If $type is 'offset', the number of messages to
+     *                       increase array index by.  If type is 'uid',
+     *                       sets array index to the value of the current
+     *                       current message index.
+     * @param string $type   Either 'offset' or 'uid'.
+     */
+    function _setArrayIndex($data, $type)
+    {
+        if ($type == 'offset') {
+            $this->_lastArrayIndex = $this->_arrayIndex;
+            $this->_arrayIndex += $data;
+            if (empty($this->_sorted[$this->_arrayIndex])) {
+                $this->_arrayIndex = null;
+            }
+        } elseif ($type == 'uid') {
+            if ($GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
+                /* Need to compare both mbox name and message UID to
+                   obtain the correct array index since there may be
+                   duplicate UIDs. */
+                $this->_arrayIndex = null;
+                foreach (array_keys($this->_sorted, $data) as $key) {
+                    if ($this->_sortedMbox[$key] == $_SESSION['imp']['thismailbox']) {
+                        $this->_arrayIndex = $key;
+                        break;
+                    }
                 }
-                $this->_setIndex();
             } else {
-                if ($imp['mailbox'] == IMP_SEARCH_MBOX) {
-                    /* Need to compare both mbox name and message UID to
-                       obtain the correct array index since there may be
-                       duplicate UIDs. */
+                /* array_search() returns false on no result. We will
+                   set an unsuccessful result to NULL. */
+                if (($this->_arrayIndex = array_search($data, $this->_sorted)) === false) {
                     $this->_arrayIndex = null;
-                    foreach (array_keys($this->_sorted, $this->_index) as $key) {
-                        if ($this->_sortedMbox[$key] == $imp['thismailbox']) {
-                            $this->_arrayIndex = $key;
-                            break;
-                        }
-                    }
-                } else {
-                    /* array_search() returns false on no result. We will
-                       set an unsuccessful result to NULL. */
-                    if (($this->_arrayIndex = array_search($this->_index, $this->_sorted)) === false) {
-                        $this->_arrayIndex = null;
-                    }
                 }
-                $this->_lastArrayIndex = $this->_arrayIndex;
             }
+            $this->_lastArrayIndex = $this->_arrayIndex;
+        }
+
+        if (is_null($this->_arrayIndex) && !empty($this->_lastArrayIndex)) {
+            $this->_lastArrayIndex--;
         }
     }
 
@@ -910,7 +832,7 @@
      * vs. 'imap').
      *
      * The following variables are updated by this method:
-     *   $imp['msgl']
+     *   msgl
      *
      * @access private
      */
@@ -921,11 +843,11 @@
 
         $this->_determineSort(true);
 
-        if ($this->_sortby == SORTTHREAD) {
+        if ($this->sortby() == SORTTHREAD) {
             $sorted = $this->_threadSort((bool)$sortdir);
         } else {
             $delhidecmd = (!$this->_usepop && $this->_delhide) ? 'UNDELETED' : '';
-            if ($this->_sortby == SORTARRIVAL) {
+            if ($this->sortby() == SORTARRIVAL) {
                 $sorted = imap_search($GLOBALS['imp']['stream'], ($delhidecmd) ? $delhidecmd : 'ALL', SE_UID);
                 if ($sorted === false) {
                     return;
@@ -934,11 +856,16 @@
                     $sorted = array_reverse($sorted);
                 }
             } else {
-                $cmd = array($GLOBALS['imp']['stream'], $this->_sortby, $sortdir, SE_UID);
+                require_once IMP_BASE . '/lib/IMAP/Search.php';
+                $imap_search = &IMP_IMAP_Search::singleton(array('pop3' => $this->_usepop));
+                $query = &new IMP_IMAP_Search_Query();
                 if ($delhidecmd) {
-                    $cmd[] = $delhidecmd;
+                    $query->deleted(false);
+                }
+                $sorted = $imap_search->searchSortMailbox($query, $_SESSION['imp']['stream'], $_SESSION['imp']['mailbox'], $this->sortby(), $sortdir);
+                if (is_a($sorted, 'PEAR_Error')) {
+                    $sorted = array();
                 }
-                $sorted = @call_user_func_array('imap_sort', $cmd);
             }
         }
 
@@ -947,8 +874,8 @@
 
     /**
      * Sets the current page of messages based on the current index.
-     * The following variables are updated by this method:
-     *   $imp['msgl']
+     * The following session variables are updated by this method:
+     *   'msgl'
      *
      * @access private
      *
@@ -956,22 +883,14 @@
      */
     function _setRange($arr)
     {
-        global $imp;
-
-        $imp['msgl'] = implode(IMP_MSG_SEP, $arr);
+        $GLOBALS['imp']['msgl'] = implode(IMP_MSG_SEP, $arr);
 
         /* Set the new sorted message list. */
         $this->_setSorted();
 
-        /* Update the internal indices, if necessary. */
-        if ($this->_indexset) {
-            /* Update the current array index to its new position in
-               the message array. */
-            $this->_setArrayIndex();
-        }
-
-        /* Set the _sortdone flag. */
-        $this->_sortdone = true;
+        /* Update the current array index to its new position in the message
+         * array. */
+        $this->_setArrayIndex(0, 'offset');
     }
 
     /**
@@ -986,29 +905,20 @@
      */
     function _threadSort($new)
     {
-        global $imp;
-
-        $ref_array = @imap_thread($imp['stream'], SE_UID);
+        $ref_array = @imap_thread($GLOBALS['imp']['stream'], SE_UID);
         if (!is_array($ref_array)) {
-            require_once IMP_BASE . '/lib/IMAP.php';
-            $imp_imap = &IMP_IMAP::singleton();
-            $imp_imap->reopenIMAPStream();
-            $ref_array = @imap_thread($imp['stream'], SE_UID);
-            if (!is_array($ref_array)) {
-                return array();
-            }
+            return array();
         }
 
-        require_once 'Horde/IMAP/Thread.php';
-        $delete_list = ($this->_delhide) ? @imap_search($imp['stream'], 'DELETED', SE_UID) : array();
-        $this->_thread = &new IMAP_Thread($ref_array, $delete_list);
+        require_once IMP_BASE . '/lib/IMAP/Thread.php';
+        $this->_thread = &new IMP_Thread($ref_array);
         return $this->_thread->messageList($new);
     }
 
     /**
-     * Get the IMAP_Thread object for the current mailbox.
+     * Get the IMP_Thread object for the current mailbox.
      *
-     * @return IMAP_Thread  The IMAP_Thread object for the current mailbox.
+     * @return IMP_Thread  The IMP_Thread object for the current mailbox.
      */
     function getThreadOb()
     {
@@ -1031,35 +941,17 @@
      *   + A sort has not already occurred by some method in this class
      *
      * @access private
-     *
-     * @param boolean $uidcheck  Whether to check imap_status() results to
-     *                           determine if a resort is needed.
      */
-    function _sortIfNeeded($uidcheck = false)
+    function _sortIfNeeded()
     {
-        global $imp;
-
         /* If array index is null, we have reached the beginning/end
            of the mailbox so we shouldn't sort anything. There is also
            no need to sort the search results. */
-        if ($this->_indexset &&
-            !is_null($this->_arrayIndex) &&
-            ($imp['mailbox'] != IMP_SEARCH_MBOX)) {
-            if ($uidcheck) {
-                /* Intialize IMAP_Cache object. */
-                require_once 'Horde/IMAP/Cache.php';
-                $imap_cache = &IMAP_Cache::singleton();
-
-                /* Check to see if mailbox has changed since we last
-                   accessed it. */
-                if (!$imap_cache->checkCache($imp['stream'], IMP::serverString($imp['mailbox']), true)) {;
-                    $this->_getSortedIndex();
-                }
-            }
-
-            if (!$this->messageIndices(1)) {
-                $this->_getSortedIndex();
-            }
+        if (!is_null($this->_arrayIndex) &&
+            ($this->_arrayIndex != $this->_lastArrayIndex) &&
+            !$GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox']) &&
+            !$this->getIMAPIndex(1)) {
+            $this->_getSortedIndex();
         }
     }
 
@@ -1072,19 +964,9 @@
      */
     function _removeCurrent()
     {
-        global $imp;
-
-        /* We need to set index to the next index (if any) in the currently
-           sorted list. */
-        if (($nextindex = $this->messageIndices(1))) {
-            $this->_setIndex($nextindex['index']);
-        } else {
-            $this->_index = null;
-        }
-
         /* Remove the current entry and recalculate the range. */
         unset($this->_sorted[$this->_arrayIndex]);
-        if ($imp['mailbox'] == IMP_SEARCH_MBOX) {
+        if ($GLOBALS['imp_search']->isSearchMbox($GLOBALS['imp']['mailbox'])) {
             unset($this->_sortedMbox[$this->_arrayIndex]);
             $arr = array_map(create_function('$a, $b', 'return $a . IMP_IDX_SEP . $b;'), array_values($this->_sorted), array_values($this->_sortedMbox));
         } else {
@@ -1092,32 +974,6 @@
         }
 
         $this->_setRange($arr);
-        $this->_setArrayIndex();
-        $this->_setLastValidIndex();
-    }
-
-    /**
-     * Increment the internal indices by one message.
-     *
-     * @access private
-     */
-    function _incrementIndex()
-    {
-        $this->_setArrayIndex(1);
-        $this->_setIndex();
-    }
-
-    /**
-     * If array index is null, we have deleted the last message. If this
-     * is the case, set index to the last valid index.
-     *
-     * @access private
-     */
-    function _setLastValidIndex()
-    {
-        if (is_null($this->_arrayIndex) && !empty($this->_lastArrayIndex)) {
-            $this->_lastArrayIndex--;
-        }
     }
 
     /**
@@ -1129,12 +985,11 @@
      */
     function _determineSort($check = false)
     {
-        global $conf, $imp;
-
+        $sortby = $this->sortby();
         if ($check &&
-            ($this->_sortby != SORTARRIVAL) &&
-            !empty($conf['server']['sort_limit']) &&
-            (@imap_num_msg($imp['stream']) > $conf['server']['sort_limit'])) {
+            ($sortby != SORTARRIVAL) &&
+            !empty($GLOBALS['conf']['server']['sort_limit']) &&
+            (@imap_num_msg($GLOBALS['imp']['stream']) > $GLOBALS['conf']['server']['sort_limit'])) {
             $this->_sortLimit = true;
             $this->_sortby = SORTARRIVAL;
         } else {
@@ -1144,13 +999,21 @@
             if ($this->isSpecialFolder()) {
                 /* If the preference is to sort by From Address, when we are
                    in the Drafts or Sent folders, sort by To Address. */
-                if ($this->_sortby == SORTFROM) {
+                if ($sortby == SORTFROM) {
                     $this->_sortby = SORTTO;
                 }
-            } elseif ($this->_sortby == SORTTO) {
+            } elseif ($sortby == SORTTO) {
                 $this->_sortby = SORTFROM;
             }
         }
     }
 
+    /**
+     * Move current pointer to the next index.
+     */
+    function moveNext()
+    {
+        $this->_setArrayIndex(1, 'offset');
+    }
+
 }


--- orig/templates/search/header.inc
+++ mod/templates/search/header.inc
@@ -1,24 +1,27 @@
 <form method="post" name="search" action="<?php echo Horde::applicationUrl('search.php') ?>">
 <input type="hidden" name="actionID" value="update_search" />
 <input type="hidden" name="delete_field_id" value="" />
-<?php if ($search['mbox']): ?>
-<input type="hidden" name="mailbox" value="<?php echo $search['mbox'] ?>" />
+<?php if ($edit_query_id): ?>
+<input type="hidden" name="edit_query_id" value="<?php echo $edit_query_id ?>" />
+<?php endif; ?>
+<?php if (!empty($search['mbox'])): ?>
+<input type="hidden" name="mbox" value="<?php echo $search['mbox'] ?>" />
 <?php elseif ($subscribe): ?>
 <input type="hidden" name="show_subscribed_only" value="<?php echo $shown ?>" />
 <?php endif; ?>
 <div align="center">
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
  <tr>
-  <td align="left" class="header">
-<?php if ($create_vfolder): ?>
-   <b><?php echo _("Create Virtual Folder") ?></b>
-<?php elseif ($edit_vfolder): ?>
-   <b><?php echo _("Edit Virtual Folder") ?></b>
+  <td class="header leftAlign">
+<?php if ($edit_query_vfolder): ?>
+   <strong><?php echo _("Edit Virtual Folder") ?></strong>
+<?php elseif ($edit_query_id): ?>
+   <strong><?php echo _("Edit Search Query") ?></strong>
 <?php else: ?>
-   <b><?php echo sprintf(_("Search %s"), $search['mbox'] ? ' ' . htmlspecialchars($search['mbox']) : '') ?></b>
+   <strong><?php printf(_("Search %s"), (!empty($search['mbox'])) ? htmlspecialchars(IMP::displayFolder($search['mbox'])) : '') ?></strong>
 <?php endif; ?>
   </td>
-  <td align="right" class="header"><?php echo Help::link('imp', 'search') ?></td>
+  <td class="header rightAlign"><?php echo Help::link('imp', 'search') ?></td>
  </tr>
  <tr>
   <td valign="top" colspan="2">
@@ -30,20 +33,20 @@
  <tr><td colspan="2"></td></tr>
 
  <tr>
-  <td class="smallheader" colspan="2" align="left"><b><?php echo _("Message matches") ?></b></td>
+  <td class="smallheader leftAlign" colspan="2"><?php echo _("Message matches") ?></td>
  </tr>
 
  <tr>
   <td class="item" colspan="2">
    <table cellspacing="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" name="search_match" id="search_match_or" value="or"<?php if ($search['field_end'] > 0) echo ' onchange="document.search.submit();return true;" onclick="document.search.submit();return true;"'; if ($search['match'] == 'or') echo ' checked="checked"'; ?> />
-      <i><?php echo Horde::label('search_match_or', _("Match Any Query")) ?></i>
+      <em><?php echo Horde::label('search_match_or', _("Match Any Query")) ?></em>&nbsp;
      </td>
-     <td class="item1" align="left" nowrap="nowrap">
+     <td class="item1 leftAlign" nowrap="nowrap">
       <input type="radio" name="search_match" id="search_match_and" value="and"<?php if ($search['field_end'] > 0) echo ' onchange="document.search.submit();return true;" onclick="document.search.submit();return true;"'; if (is_null($search['match']) || ($search['match'] == 'and')) echo ' checked="checked"'; ?> />
-      <i><?php echo Horde::label('search_match_and', _("Match All Queries")) ?></i>
+      <em><?php echo Horde::label('search_match_and', _("Match All Queries")) ?></em>
      </td>
      <td class="item1" width="100%">&nbsp;</td>
     </tr>
@@ -52,9 +55,5 @@
  </tr>
 
  <tr>
-  <td class="smallheader" colspan="2" align="left"><b><?php echo Horde::label('field_0', _("Message fields")) ?></b></td>
- </tr>
-
- <tr>
-  <td class="item0" align="left" colspan="2">
+  <td class="item0 leftAlign" colspan="2">
    <table border="0" cellpadding="1" cellspacing="1" width="100%">


--- orig/po/lt_LT.po
+++ mod/po/lt_LT.po
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-11-24 16:44+0200\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2004-11-29 18:38+0200\n"
 "Last-Translator: Vilius Sumskas <vilius at lnk.lt>\n"
 "Language-Team: Lithuanian <vilius at lnk.lt>\n"
@@ -16,167 +16,167 @@
 "Content-Type: text/plain; charset=ISO-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Kam: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Kam: "
 
-#: lib/Compose.php:241 lib/Compose.php:293
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Data: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    Nuo: "
 
-#: mailbox.php:400
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Mygtukas %s)"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Tema: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " eilutëje "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:72
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:197
-#, php-format
-msgid "%d message(s) have been deleted."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "Laiðkø nëra"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
 msgstr "Iðtrinta %d laiðkas(ai, ø)."
 
-#: lib/Spam.php:168
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "%d laiðkai(ø) nusiøsta administratoriui kaip ne nepageidaujami (spam)."
 
-#: lib/Spam.php:148
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d laiðkai(ø) paskelbti ne nepageidaujamais (spam)."
 
-#: lib/Spam.php:160
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d laiðkai(ø) nusiøsta administratoriui kaip nepageidaujami (spam)."
 
-#: lib/Spam.php:140
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d laiðkai(ø) paskelbti nepageidaujamais (spam)."
 
-#: mailbox.php:369
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "Laiðkai nuo %d iki %d ið %d"
 
-#: mailbox.php:607
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP administravimas"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME administravimas"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s jau egzistuoja. Jûsø katalogas %s nepervardintas."
 
-#: lib/Message.php:643
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "Panaðu, kad katalogo %s nëra."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s katalogas pervadinamas mënesio pradþioje."
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr "%s priimtas."
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
 msgstr "%s nutraukë %s."
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
 msgstr "%s baigësi."
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s atsakë á uþimtumo uþklausà."
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s atsakë á pakvietimà á %s."
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s atsiuntë uþimtumo informacijà."
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s laikinai priimtas."
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s praðo jûsø uþimtumo informacijos."
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s praðo jus dalyvauti %s."
 
-#: lib/Message.php:398
-#, php-format
-msgid "%s was successfully added to %s."
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
 msgstr "Sëkmingai pridëtas %s á %s."
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr "%s nori papildyti %s."
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr "%s nori praneðti Jums apie artëjantá %s."
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr "%s nori gauti naujausià informacijà apie %s."
 
-#: message.php:278 message.php:283
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -186,15 +186,24 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;ið&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Atlikti ðiuos pakeitimus ir pereiti prie kito lango.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Atðaukti visus pakeitimus ir gráþti á raðymo langà.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+#, fuzzy
+msgid "(HTML)"
+msgstr "HTML"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -202,7 +211,7 @@
 "(Gráþti á raðymo langà po visø pakeitimø atlikimo. Pakeitimai esamame lange "
 "nebus atlikti.)"
 
-#: spelling.php:274
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -214,52 +223,53 @@
 msgid "* Add these by clicking OK *"
 msgstr "* Norëdami pridëtá spauskite OK *"
 
-#: templates/contacts/contacts.inc:207
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Pasirinkite adresà(us) *"
 
-#: lib/Spam.php:170
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Laiðkas iðtrintas."
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "1 laiðkas nusiøstas administratoriui kaip ne nepageidaujamas (spam)."
 
-#: lib/Spam.php:150
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
 msgstr "1 laiðkas paskelbtas kaip ne nepageidaujamas (spam)."
 
-#: lib/Spam.php:162
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 laiðkas nusiøstas administratoriui kaip nepageidaujamas (spam)."
 
-#: lib/Spam.php:142
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
 msgstr "1 laiðkas paskelbtas kaip nepageidaujamas (spam)."
 
-#: config/prefs.php.dist:787
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100 simboliø"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000 simboliø"
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250 simboliø"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500 simboliø"
 
-#: lib/MIME/Viewer/itip.php:62
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>Kalendoriaus duomenys neteisingi</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Prie ðio laiðko prikabintas didelis paveikslëlis pavadinimu %s."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -269,112 +279,117 @@
 msgid "AND"
 msgstr "IR"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr "Priimti uþklausà"
 
-#: lib/MIME/Viewer/itip.php:740
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "Ávykis áraðytas á jûsø kalendoriø."
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr "Priimta"
 
-#: lib/IMP.php:886 lib/IMP.php:888
-msgid "Acco_unts"
-msgstr "Pai_mti laiðkus"
+#: lib/MIME/Viewer/itip.php:257
+#, fuzzy
+msgid "Accepted: "
+msgstr "Priimta"
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Paðto dëþutës pavadinimas:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
 msgstr "Veiksmai"
 
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Pridëti á adresø knygelæ (%s)"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Pridëti ðaltiná"
 
-#: lib/MIME/Viewer/itip.php:535 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr "Áraðyti tai á mano kalendoriø"
 
-#: lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Pridëti á adresø knygelæ (%s)"
-
-#: compose.php:1127
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Failas \"%s\" prikabintas."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "Papildomos antraðtës: <i>(nebûtina, kiekvienà antraðtæ raðykite naujoje "
 "eilutëje)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Papildomos informacijos perþiûra %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Papildoma informacija detaliau"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Papildoma laiðko informacija"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Papildomos informacijos perþiûra %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Detali informacija apie klaidà"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Papildomos informacijos apie klaidà perþiûra %s."
 
-#: contacts.php:95 templates/compose/compose.inc:334
-#: templates/compose/redirect.inc:55 templates/contacts/contacts.inc:174
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adresø knygelë"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adresø knygelës"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "BCC adresai: <i>(nebûtina, kiekvienà adresà raðykite naujoje eilutëje)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Paðto adresai susijæ su ðiuo apraðu: <i>(nebûtina, kiekvienà adresà raðykite "
 "naujoje eilutëje)"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:791
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "Viskà"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Visi laiðkai kataloge(uose) bus iðtrinti!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -382,59 +397,64 @@
 "Visi laiðkai sekanèiame(iuose) kataloge(uose) bus perkelti á vienà MBOX "
 "failà:"
 
-#: lib/Maintenance/Task/purge_trash.php:86
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr "Visi laiðkai kataloge \"%s\" ir senesni nei %s dienø bus iðtrinti."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "Visi senesni nei %s mënesiai susijæ prikabinti failai bus iðtrinti."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "Visi senesni nei %s mënesiai siøstø laiðkø katalogai bus iðtrinti."
 
 #: acl.php:85
-#, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Visos katalogo '%s' teisës vartotojui '%s' iðtrintos."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Leisti taikyti filtrus bet kuriame kataloge?"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Kitos dalys:"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "Visada"
 
-#: config/prefs.php.dist:549
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Visada iðsaugoti prikabintus failus"
 
-#: lib/Message.php:491
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr "Klaida bandant iðtinti prikabintà failà. IMAP serverio klaida:"
 
-#: compose.php:1006 message.php:185
-msgid "An unknown error occured adding the new entry."
-msgstr "Pridedant naujà áraðà ávyko klaida."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Pridedant naujà darbà ávyko klaida."
 
-#: lib/Message.php:385
+#: lib/Message.php:387
 msgid "An unknown error occured while creating the new task."
 msgstr "Pridedant naujà darbà ávyko klaida."
 
-#: message.php:493 mailbox.php:677 templates/message/navbar_navigate.inc:9
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -445,44 +465,41 @@
 msgstr "Atsakyti laiðkai"
 
 #: templates/mailbox/header.inc:7
-msgid "Apply Filters on"
+#, fuzzy
+msgid "Apply Filters"
 msgstr "Panaudoti filtrus katalogui"
 
-#: templates/filters/prefs.inc:43
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
+msgstr "Panaudoti filtrus katalogui"
+
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Ar filtruoti laiðkus prisijungimo metu?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Ar filtruoti laiðkus kiekvienà kartà kai parodomas INBOX?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Ar TIKRAI norite tæsti?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Ar Jûs tikrai ásitikinæ kad norite tæsti?"
-
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Ar tikrai norite iðtrinti ðá vieðàjá raktà?"
 
-#: templates/pgp/pgp.inc:169 templates/smime/smime.inc:128
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "Ar tikrai norite iðtrinti savo raktø porà? (NEREKOMENDUOJAMA!)"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Ar tikrai norite tai padaryti?"
 
-#: message.php:401 templates/mailbox/javascript.inc:63
-#: templates/folders/javascript.inc:73
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Ar tikrai norite IÐTRINTI ðiuos laiðkus?"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:215
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Ar tikrai norite IÐTRINTI prikabintà failà?"
 
@@ -490,7 +507,12 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Ar tikrai norite iðvalyti ðá katalogà?"
 
-#: lib/IMP.php:877
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Ar tikrai norite iðvalyti ðiukðliadëþæ?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Ar tikrai norite iðvalyti ðiukðliadëþæ?"
 
@@ -498,80 +520,79 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Ar tikrai norite IÐTRINTI ðiuos laiðkus?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Ar tikrai norite paskelbti ðá laiðkà kaip ne nepageidaujamà?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Ar tikrai norite paskelbti ðá laiðkà kaip nepageidaujamà?"
 
-#: config/prefs.php.dist:886
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Gauta"
 
-#: config/prefs.php.dist:901
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Didëjimo tvarka"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Klausti"
 
-#: templates/compose/compose.inc:513
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Prikabinti"
 
-#: templates/compose/compose.inc:470
+#: templates/compose/compose.inc:475
 msgid "Attach Files"
 msgstr "Prikabinti failus"
 
-#: templates/compose/compose.inc:451
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Ar prikabinti jûsø vieðàjá PGP raktà prie laiðko?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "Prikabinta:"
 
-#: lib/Compose.php:352 lib/Compose.php:439
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr "Failas \"%s\" virðyjo leistinà dydá. Failas NEPRIKABINTAS."
 
-#: lib/MIME/Viewer/itip.php:342
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Prikabintas failas yra atsakymas á jûsø iCalendar uþklausà."
 
-#: mailbox.php:711 templates/compose/attachments.inc:14
-#: templates/compose/attachments.js:98 templates/compose/compose.inc:500
-#: templates/mailbox/legend.inc:16
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Failas"
 
-#: compose.php:956 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
 msgstr "Prikabintas failas iðtrintas: failo tipas"
 
-#: templates/compose/compose.inc:344 templates/compose/compose.inc:468
-#: lib/Compose.php:987
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Prikabinti failai"
 
-#: lib/MIME/Viewer/itip.php:669
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Susijæ þmonës"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Dëmesio"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: nerastas reikalingas IMAP modulis."
 
-#: config/prefs.php.dist:642
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -583,39 +604,52 @@
 msgid "Available Address books:"
 msgstr "Galimos adresø knygelës:"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr "Laukiama atsakymo"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Gráþ_ti á %s"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Gráþti á %s"
 
-#: message.php:259 search.php:153 templates/compose/recompose.inc:20
-#: templates/contacts/contacts.inc:223
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "Detalus laiðko tekstas"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Blokuoti"
 
-#: config/prefs.php.dist:630
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Blokuoti paveikslëlius HTML laiðkuose, nebent buvo pareikalauta kitaip?"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Laiðko turinys"
 
@@ -624,27 +658,27 @@
 msgid "Both"
 msgstr "Abu"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
 msgstr "Ir antraðtës ir laiðko tekstas"
 
-#: templates/compose/compose.inc:287
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "K_oduotë"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "Nepavyko prisijungti prie nutolusio paðto serverio."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "Nepavyko prisijungti prie nutolusio paðto serverio: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
@@ -652,44 +686,51 @@
 msgstr ""
 "Nepavyko parodyti ðio laiðko - ðioje dëþutëje rasta tik %s dalis ið %s."
 
-#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
-#: templates/compose/spelling.inc:106 templates/smime/passphrase.inc:22
-#: templates/smime/import_key.inc:80 templates/folders/import.inc:21
-#: templates/contacts/contacts.inc:252
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: templates/compose/compose.inc:74 templates/compose/compose.inc:430
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Atsisakyti laiðko"
 
-#: templates/compose/compose.js:6 templates/compose/redirect.inc:5
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Atsisakydami laiðko jûs prarasite visà jo turiná."
 
-#: message.php:258 search.php:149 templates/compose/recompose.inc:15
-#: templates/contacts/contacts.inc:222
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:687
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
 msgstr "Vadovas"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Pakeisti"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Pakeisti visus"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Pakeisti katalogà"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -709,23 +750,23 @@
 "Vardo, adreso ir paraðo, kuriuos matys þmonës, skaitantys ir atsakinëjantys "
 "á Jûsø laiðkus nustatymai."
 
-#: config/prefs.php.dist:792
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
 msgstr "Rodyti:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Tikrinti ar yra naujø laiðkø"
 
-#: templates/mailbox/message_headers.inc:65 templates/folders/actions.inc:2
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "Pa_þymëti visus/nieko"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Pasirinkite serverius ið kuriø norite paimti laiðkus:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Tikrinti klaidas prieð iðsiunèiant laiðkà?"
 
@@ -733,15 +774,21 @@
 msgid "Choose Action:"
 msgstr "Pasirinkite veiksmà:"
 
-#: config/servers.php.dist:165
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Pasirinkite paðto serverá:"
 
-#: lib/MIME/Viewer/itip.php:479 lib/MIME/Viewer/itip.php:718
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Pasirinkite arba redaguokite laukà deðinëje:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
 msgstr "Pasirinkite veiksmà:"
 
-#: templates/prefs/sourceselect.inc:350
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Pasirinkite adresø knygelæ, kurià naudosite pridëdami adresus."
 
@@ -749,38 +796,44 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Pasirinkite adresø knygeliø tvarkà, naudojamà adresø patikrinimui."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Norëdami pakeisti paveikslëlá á formatà, kurá supranta jûsø narðyklë, "
 "spauskite %s."
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Norëdami atsiøsti paveikslëlá, spauskite %s."
 
-#: lib/Filter.php:103
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Spauskite %s, norëdami patekti á %s valdymo puslapá."
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:116
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Norëdami pamatyti HTML turiná atskirame lange, spauskite %s."
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Norëdami pamatyti maþesná paveikslëlá, spauskite %s."
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Click here to HIDE the Images"
-msgstr "PASLËPTI paveikslëlius"
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Norëdami pamatyti HTML turiná atskirame lange, spauskite %s."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Norëdami pamatyti HTML turiná atskirame lange, spauskite %s."
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
 msgstr "PARODYTI paveikslëlius"
 
@@ -792,47 +845,48 @@
 "Pele paþymëkite vienà ið Jûsø adresø knygeliø, o po to pasirinkite laukus "
 "paieðkai."
 
-#: lib/MIME/Viewer/pgp.php:174
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Spauskite èia jei norite iðsaugoti PGP vieðàjá raktà adresø knygelëje"
 
-#: lib/MIME/Viewer/pkcs7.php:182
-msgid "Click to Save S/MIME certificate in your Address book"
+#: lib/MIME/Viewer/pkcs7.php:202
+#, fuzzy, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "Spauskite èia jei norite iðsaugoti S/MIME sertifikatà adresø knygelëje"
 
-#: config/prefs.php.dist:920
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Paspaudæ ant adreso, sukursite naujà laiðkà adresatui"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
 msgstr "Paspaudæ ant adreso, atidarysite laiðkà skaitymui"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Uþdaryti"
 
-#: templates/compose/success.inc:4
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Uþdaryti ðá langà"
 
-#: folders.php:383
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Uþdarytas katalogas"
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse"
 msgstr "Suskleisti"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Suskleisti viskà"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Suskleisti visus katalogus"
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Suskleisti katalogà"
 
@@ -840,66 +894,66 @@
 msgid "Color Indicator: "
 msgstr "Spalvos indikatorius: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Komentaras"
 
-#: lib/MIME/Viewer/itip.php:756
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
 msgstr "Atlikta"
 
-#: lib/Block/tree_folders.php:42 lib/Block/summary.php:19
-msgid "Compose"
-msgstr "Raðyti naujà"
-
-#: mailbox.php:741 lib/MIME/Headers.php:196
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Raðyti laiðkà (%s)"
-
-#: templates/compose/success.inc:3
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Raðyti dar vienà laiðkà"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Raðyti laiðkus atskirame lange?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr "Raðyti laiðkus HTML formatu (jeigu narðyklë palaiko ðià funkcijà)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Laiðkø rodymo nustatymai."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Iðankstinës laiðkø perþiûros nustatymai."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Nepavyko prisijungti prie serverio"
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Nepavyko prisijungti prie serverio"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "%s PGP palaikymo valdymas."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "%s S/MIME palaikymo valdymas."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "Naujo paðto tikrinimo ir praneðimø apie tai nustatymai."
 
-#: config/prefs.php.dist:699
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Konvertuoti tekstines ðypsenëles á grafines?"
 
@@ -907,51 +961,59 @@
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Kopijuoti á katalogà"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Taisyti"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Taisytas tekstas"
 
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Nepavyko sukurti VFS posistemës: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Nepavyko sukurti VFS posistemës: %s"
 
-#: lib/Message.php:634
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nepavyko iðtrinti laiðkø ið %s. Serverio klaida: %s"
 
-#: lib/Session.php:271
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
 msgstr "Nepavyko atlikti profilaktikos veiksmø."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Nepavyko iðarchyvuoti nurodyto failo ið MS-TNEF formato."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Nepavyko iðarchyvuoti Zip archyvo."
 
-#: search.php:351 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "Sukurti"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Sukurti katalogà"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Sukurti raktus"
 
@@ -959,11 +1021,21 @@
 msgid "Create Virtual Folder"
 msgstr "Sukurti virtualø katalogà"
 
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Kitos paðto dëþutës"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Sukurti naujà ðiukðliadëþæ"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Sukurti naujà paruoðiniø katalogà"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Sukurti naujà siøstø laiðkø katalogà"
 
@@ -971,7 +1043,7 @@
 msgid "Create a new trash folder"
 msgstr "Sukurti naujà ðiukðliadëþæ"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -979,12 +1051,21 @@
 "Filtravimo taisykliø sukurimas, ateinanèio paðto tvarkymas, iðrûðiuojant já "
 "á katalogus ir iðtrinant nepageidaujamus."
 
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Sukurti naujà siøstø laiðkø katalogà"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Dabartinës teisës á %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Laiðkø paëmimo ið kitø paðto dëþuèiø nustatymai."
 
@@ -997,52 +1078,76 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Veiksmø, atliekamø prisijungus prie %s, nustatymai."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "D_ata"
 
-#: message.php:255 thread.php:72
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Data"
 
-#: lib/MIME/Viewer/itip.php:744
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Atmestas"
 
-#: config/prefs.php.dist:893
+#: lib/MIME/Viewer/itip.php:263
+#, fuzzy
+msgid "Declined: "
+msgstr "Atmestas"
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Iðtrinti"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Rûðiuoti pagal:"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Rûðiavimo kryptis:"
 
-#: lib/MIME/Viewer/itip.php:752
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
 msgstr "Atstovaujamas"
 
-#: folders.php:374 templates/message/navbar_actions.inc:6
-#: templates/pgp/pgp.inc:93 templates/fetchmail/manage.inc:68
-#: templates/compose/attachments.inc:28 templates/mailbox/actions.inc:8
-#: templates/mailbox/actions.inc:10 templates/smime/smime.inc:65
-#: templates/contacts/contacts.inc:243
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Iðtrinti"
 
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Iðtrinti %s vieðàjá raktà"
 
-#: templates/pgp/pgp.inc:169 templates/smime/smime.inc:128
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Iðtrinti dabartinius raktus"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Iðtrinti katalogà(us)"
 
-#: folders.php:374
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Iðtrinti katalogà(us)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Iðtrinti virtualø katalogà"
+
+#: folders.php:419
 msgid "Delete Virtual Folder"
 msgstr "Iðtrinti virtualø katalogà"
 
@@ -1050,24 +1155,24 @@
 msgid "Delete fetched messages from remote server?"
 msgstr "Iðtrinti paimtus laiðkus ið nutolusio serverio?"
 
-#: lib/MIME/Viewer/itip.php:607
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
 msgstr "Iðtrinti ið mano kalendoriaus"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Iðtrinti senus susijusius prikabintus failus mënesio pradþioje?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Iðtrinti senus siøstø laiðkø katalogus mënesio pradþioje?"
 
-#: config/prefs.php.dist:620
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr ""
-"Iðtrinti laiðkus, po to kai jie buvo paþymëti kaip nepageidaujami (spam)?"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Iðtrinti laiðkai"
 
-#: message.php:496 mailbox.php:701 templates/mailbox/navbar.inc:20
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Iðtrinti"
@@ -1076,7 +1181,7 @@
 msgid "Deleted messages"
 msgstr "Iðtrinti laiðkai"
 
-#: compose.php:290
+#: compose.php:307
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Failas \"%s\" iðtrintas."
@@ -1085,29 +1190,28 @@
 msgid "Deleting and Moving Messages"
 msgstr "Laiðkø trynimas ir perkëlimas"
 
-#: lib/MIME/Viewer/itip.php:549
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Uþdrausti uþklausà"
 
-#: lib/MIME/Viewer/itip.php:498
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
 msgstr "Uþdrausti uþklausà dël uþimtumo informacijos"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Maþëjimo tvarka"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:657
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Apraðymas"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
-#: templates/smime/smime.inc:113
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Smulkiau"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Blukinti paraðus?"
 
@@ -1115,47 +1219,57 @@
 msgid "Display"
 msgstr "Rodyti"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Rodyti iðsiøsto laiðko patvirtinimà?"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Rodyti laiðko tekste"
 
-#: config/prefs.php.dist:767
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Rodyti iððokantá praneðimà apie gautà naujà laiðkà?"
 
-#: config/prefs.php.dist:732
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Rodyti 'Iðvalyti ðiukðliadëþæ' mygtukà meniu?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Rodyti 'Iðvalyti ðiukðliadëþæ' mygtukà meniu?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Iðsidëstymas"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "NEATITINKA"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Netikrinti naujø laiðkø"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
 msgstr "Negeneruoti nuorodos laukelyje Nuo:"
 
-#: lib/IMP.php:979
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Ar norite atidaryti ðá katalogà?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Atlikta"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Atsisiøsti %s .zip formatu"
@@ -1164,25 +1278,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Atsisiøsti visus prikabintus failus (.zip faile)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Atsisiøsti katalogà(us)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Atsisiøsti katalogà(us) [.zip formatas]"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
 msgstr "Atsisiøsti .zip formatu"
 
-#: message.php:494 mailbox.php:682 templates/message/navbar_navigate.inc:11
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Paruoðiniai"
 
-#: folders.php:354
+#: folders.php:392
 msgid "Draft folder"
 msgstr "Paruoðiniø katalogas"
 
@@ -1190,27 +1304,32 @@
 msgid "Drafts folder:"
 msgstr "Paruoðiniø katalogas:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "El. paðto adresas"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "IR"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "KLAIDA: Jûsø laiðkas nepasiekë adresato."
 
-#: folders.php:375
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Redaguoti"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Redaguoti juodàjá sàraðà"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Redaguoti filtrus"
 
-#: folders.php:375 templates/search/header.inc:16
+#: folders.php:420 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
 msgstr "Redaguoti virtualø katalogà"
 
@@ -1219,23 +1338,23 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Redaguoti %s virtualaus katalogo apraðymà"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Redaguoti baltàjá sàraðà"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Redaguoti juodàjá sàraðà"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Redaguoti filtravimo taisykles"
 
-#: config/prefs.php.dist:829
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Redaguoti kitø el. paðto dëþuèiø nustatymus."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Redaguoti baltàjá sàraðà"
 
@@ -1243,65 +1362,80 @@
 msgid "Email Address"
 msgstr "El. paðto adresas"
 
-#: lib/Message.php:651
+#: lib/Message.php:657
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Katalogas %s iðvalytas."
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Iðvalyti katalogà(us)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Iðvalyti katalogà(us)"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Iðvalyti ðiukðliø katalogà"
 
-#: lib/IMP.php:877
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Ið_valyti ðiukðliadëþæ"
+
+#: lib/IMP.php:966
 msgid "Empty _Trash"
 msgstr "Ið_valyti ðiukðliadëþæ"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Ájungti PGP galimybes?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Ájungti S/MIME galimybes?"
 
-#: config/prefs.php.dist:779
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
 msgstr "Ájungti laiðkø iðankstiná perþiûrëjimà?"
 
-#: templates/compose/compose.inc:437
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
 msgstr "Ko_davimo parametrai"
 
-#: lib/MIME/Viewer/itip.php:475 lib/MIME/Viewer/itip.php:645
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Pabaiga"
 
-#: lib/Compose.php:318
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Persiøsto laiðko pabaiga"
 
-#: lib/Compose.php:259
+#: lib/Compose.php:341
 msgid "End message"
 msgstr "Laiðko pabaiga"
 
-#: lib/Compose.php:257
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
 msgstr "Laiðko nuo %s pabaiga"
 
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Áveskite slaptàjà frazæ"
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Áveskite naujos ðiukðliadëþës pavadinimà"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Áveskite naujo paruoðiniø katalogo pavadinimà"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Áveskite naujo siøstø laiðkø katalogo pavadinimà"
 
@@ -1309,84 +1443,99 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Áveskite naujos ðiukðliadëþës pavadinimà"
 
-#: compose.php:1008 message.php:187
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Nukreipti laiðkà"
+
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Áraðas \"%s\" sëkmingai áraðytas á adresø knygelæ"
 
-#: templates/pgp/pgp.inc:84 templates/smime/smime.inc:58
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
-#: lib/MIME/Viewer/pgp.php:390 lib/MIME/Viewer/pkcs7.php:336
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Klaida"
 
-#: lib/MIME/Viewer/itip.php:278 lib/MIME/Viewer/itip.php:371
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Klaida siunèiant atsakymà: %s."
 
-#: lib/MIME/Viewer/itip.php:93
+#: lib/MIME/Viewer/itip.php:101
 msgid "Event successfully deleted."
 msgstr "Ávykis sëkmingai iðtrintas."
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Kas 15 minuèiø"
 
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Kas 30 sekundþiø"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Kas 5 minutes"
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Kas 30 minuèiø"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Kas minutæ"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand"
 msgstr "Iðskleisti"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Iðskleisti viskà"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Iðskleisti visus katalogus"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Iðskleisti katalogà"
 
-#: templates/compose/compose.inc:335 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Adresø iðskleidimas"
 
-#: config/prefs.php.dist:1045
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Automatiðkai iðskleisti adresus laiðko raðymo lange?"
 
-#: config/prefs.php.dist:975
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Katalogø sàraðe rodyti iðskleistà katalogø medá?"
 
-#: templates/compose/compose.inc:159 templates/compose/compose.inc:209
-#: templates/compose/compose.inc:260 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Iðskleidþiama"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Paimti laiðkus"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Paimti laiðkus"
 
-#: config/prefs.php.dist:838
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "Paimti laiðkus atskirame lange?"
 
@@ -1394,65 +1543,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Paimti laiðkus prisijungimo metu?"
 
-#: lib/Fetchmail.php:306
-#, php-format
-msgid "Fetched %d message(s) from %s"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Paimta %d laiðkas(ai) ið %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
 msgstr "Paimta %d laiðkas(ai) ið %s."
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
 msgstr "Paimti laiðkai: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
 msgstr "Paimti laiðkai: nëra."
 
-#: lib/IMP.php:892
+#: lib/IMP.php:990
 msgid "Fi_lters"
 msgstr "_Filtrai"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:496
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "Failas"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Filtrø parametrai"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Filtrø nustatymai"
 
-#: config/prefs.php.dist:602
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "Filtruoti neðvankius laiðkus?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Filtrai ðioje sistemoje iðjungti."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtrai"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filtrai NEAKTYVÛS"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtrai: %s valdymo puslapis"
 
-#: templates/contacts/contacts.inc:182
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Ieðkoti"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
 msgstr "Pirmasis paðto dëþutës puslapis"
 
-#: mailbox.php:341
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Pirmas puslapis"
 
@@ -1460,15 +1614,16 @@
 msgid "Fo_rward"
 msgstr "_Persiøsti"
 
-#: folders.php:255 templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Katalogø narðyklë"
 
-#: templates/login/login.inc:195
-msgid "Folder Prefix"
-msgstr "Katalogø prefiksas"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Trumpas turinys"
@@ -1477,75 +1632,70 @@
 msgid "Folder sharing is not enabled."
 msgstr "Katalogø dalijimasis iðjungtas."
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
 msgstr "Katalogai iðjungti."
 
-#: config/prefs.php.dist:964
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Ðiandien gautø laiðkø datos formatas"
 
-#: config/prefs.php.dist:949
-msgid ""
-"Format of message dates in the mailbox view for messages not dated today"
-msgstr "Ne ðiandien gautø laiðkø datos formatas"
-
-#: compose.php:686 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Persiøsti"
 
-#: compose.php:671
+#: compose.php:765
 msgid "Forward:"
 msgstr "Persiøsti:"
 
-#: lib/Compose.php:287
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Persiøstas laiðkas"
 
-#: lib/Compose.php:285
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Persiøstas laiðkas nuo %s"
 
-#: lib/MIME/Viewer/itip.php:443
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
 msgstr "Uþimtumo informacija"
 
-#: lib/MIME/Viewer/itip.php:454
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr "Atsakymas apie uþimtumà"
 
-#: lib/MIME/Viewer/itip.php:448
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
 msgstr "Praðymas uþimtumo informacijai"
 
-#: lib/MIME/Viewer/itip.php:365
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
 msgstr "Atsakymas uþimtumo informacijos uþklausai"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "N_uo"
 
-#: message.php:256 search.php:141 thread.php:73
-#: templates/compose/compose.inc:102 templates/contacts/contacts.inc:186
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Nuo"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "Nuo ko"
 
-#: compose.php:683 compose.php:687
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1159
+#: compose.php:1294
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#: compose.php:1161
+#: compose.php:1296
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u persiøsti laiðkai"
@@ -1559,28 +1709,39 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Paimti tik naujus laiðkus? (tik IMAP)"
 
-#: thread.php:65
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Rodytá laiðkà"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Pridëti á adresø knygelæ (%s)"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr "Suteikti teises"
 
-#: message.php:549 lib/Filter.php:102 lib/MIME/Viewer/status.php:123
-#: lib/MIME/Viewer/status.php:130 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/html.php:114 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/pgp.php:176
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "ÈIA"
 
-#: lib/MIME/Viewer/html.php:115
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:241
+#: compose.php:256
 msgid "HTML Version of Message"
 msgstr "Laiðko HTML versija"
 
@@ -1592,104 +1753,129 @@
 msgid "Here is the message you were composing:"
 msgstr "Laiðkas kurá raðëte iðsaugotas èia:"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Paslëpti"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
 msgstr "Paslëpti vaizduojant gijà (thread)"
 
-#: mailbox.php:363
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Paslëpti iðtrintus"
 
-#: folders.php:250
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Paslëpti atsisakytus"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Hide the Images"
-msgstr "Paslëpti paveikslëlius"
-
-#: templates/compose/compose.inc:309
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Svarbu"
 
-#: message.php:290 mailbox.php:687 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Svarbu"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Labai svarbu"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Kaip norite perþiûrëti prikabintus failus?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Kaip paþymëti cituojamà tekstà atsakyme"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Automatinis protokolo atpaþinimas)"
 
-#: templates/login/login.inc:170 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP per SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP per SSL (be CA sertifikato)"
 
-#: templates/login/login.inc:171
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP per SSL (be CA paraðo)"
 
-#: templates/login/login.inc:169 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Paðto serverio prisijungimo tipas:"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, be TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 paðto serveriai"
 
-#: folders.php:346
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Visi laiðkai kataloge(uose) bus iðtrinti!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignoruoti"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignoruoti visus"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Ákelti"
 
-#: templates/pgp/import_key.inc:65 templates/smime/import_key.inc:79
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Ákelti raktà"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Ákelti raktø porà"
 
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "Svarbûs laiðkai"
+
 #: pgp.php:42
 msgid "Import PGP Key"
 msgstr "Ákelti PGP raktà"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
 msgstr "Ákelti asmeniná sertifikatà"
 
 #: templates/pgp/import_key.inc:14
@@ -1704,7 +1890,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Ákelti asmeniná S/MIME sertifikatà"
 
-#: templates/pgp/pgp.inc:107 templates/smime/smime.inc:79
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Ákelti vieðàjá raktà"
 
@@ -1720,7 +1906,7 @@
 msgid "Import S/MIME Key"
 msgstr "Ákelti S/MIME raktà"
 
-#: templates/folders/import.inc:9 templates/folders/actions.inc:25
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "Ákelti mbox failà"
 
@@ -1729,7 +1915,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Ákelti mbox failà %s á katalogà %s."
 
-#: message.php:495 mailbox.php:695 templates/message/navbar_navigate.inc:7
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1739,46 +1925,47 @@
 msgid "Important messages"
 msgstr "Svarbûs laiðkai"
 
-#: folders.php:157
+#: folders.php:167
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Ákelta %d laiðkø ið %s."
 
-#: lib/MIME/Viewer/itip.php:760
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr "Atliekama"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
 msgstr "Inbox"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Ar atsakant áterpti laiðko pagrindines antraðtes?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Ar atsakant áterpti laiðko tekstà?"
 
-#: lib/MIME/Viewer/status.php:133 lib/MIME/Viewer/notification.php:64
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Informacija"
 
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Informacija apie %s vieðàjá raktà"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Informacija apie asmeniná slaptàjá raktà"
 
-#: templates/pgp/pgp.inc:147 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Informacija apie asmeniná vieðàjá raktà"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:501
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "Kaip tekstà"
 
@@ -1798,20 +1985,21 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Ákelti vieðàjá PGP raktà èia"
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
 msgstr "Pasirinktas neteisingas veiksmas ðiam komponentui."
 
-#: mailbox.php:555 mailbox.php:596
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
 msgstr "Neteisinga adresø knygelë."
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Neteisinga nutolusi paðto dëþutë"
 
-#: compose.php:131
-msgid "Invalid character in e-mail address."
+#: compose.php:158
+#, fuzzy, php-format
+msgid "Invalid character in e-mail address: %s."
 msgstr "Neleistinas simbolis el. paðto adrese."
 
 #: smime.php:82 pgp.php:16
@@ -1830,39 +2018,60 @@
 msgid "Invert"
 msgstr "Apversti"
 
-#: templates/compose/compose.inc:571
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Rakto ilgis"
 
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr "Raktas sëkmingai nusiøstas á vieðøjø raktø serverá."
 
-#: templates/login/login.inc:223
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Kalba"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
 msgstr "Paskutinis paðto dëþutës puslapis"
 
-#: mailbox.php:354
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Paskutinis puslapis"
 
-#: templates/compose/compose.inc:384
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
 msgstr "Susieti prikabintus _failus"
 
-#: attachment.php:34 lib/Compose.php:977
+#: attachment.php:34 lib/Compose.php:1063
 msgid "Linked attachments are forbidden."
 msgstr "Susieti prikabinti failai draudþiami."
 
-#: config/prefs.php.dist:1064
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
+
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1870,7 +2079,7 @@
 "Rodyti visus adresus, adresø knygelëje? (jeigu iðjungsite, matysite tik "
 "adresus, kuriø ieðkojote)"
 
-#: config/prefs.php.dist:687
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Antraðèiø sàraðas"
 
@@ -1878,20 +2087,20 @@
 msgid "Local Mailbox:"
 msgstr "Vietinë paðto dëþutë:"
 
-#: lib/MIME/Viewer/itip.php:662
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
 msgstr "Vieta"
 
-#: templates/login/login.inc:231
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: lib/Block/summary.php:118
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "Prisijungti prie %s"
 
-#: templates/login/login.inc:138
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "Prisijungti"
 
@@ -1899,27 +2108,27 @@
 msgid "Login Tasks"
 msgstr "Prisijungimo darbai"
 
-#: templates/compose/compose.inc:311
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Nesvarbu"
 
-#: message.php:292 mailbox.php:690 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Nesvarbûs"
 
-#: templates/compose/compose.inc:312
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Visiðkai nesvarbu"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Machintosh failas"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Paðto"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Iðankstinë laiðkø perþiûra"
 
@@ -1927,19 +2136,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Paðto serverio prisijungimo tipas:"
 
-#: folders.php:364
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Katalogas"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Paðto dëþutës ir katalogø vaizdavimo nustatymai"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Paþymëti visus laiðkus kaip skaitytus"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Paþymëti visus laiðkus kaip neskaitytus"
 
@@ -1947,7 +2156,7 @@
 msgid "Mark as:"
 msgstr "Paþymëti kaip:"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Cituojamà tekstà spalvinti skirtingomis spalvomis?"
 
@@ -1955,7 +2164,7 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Paþymëti laiðkus kaip skaitytus? (tik IMAP)"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
 msgstr "Suþymëti paprastai?"
 
@@ -1967,39 +2176,44 @@
 msgid "Match Any Query"
 msgstr "Atitinka bet kurá þodþá"
 
-#: templates/compose/compose.inc:507
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
 msgstr "Maksimalus prikabintø failø dydis"
 
-#: templates/compose/compose.inc:488
+#: lib/api.php:79
+#, fuzzy
+msgid "Maximum Number of Folders"
+msgstr "Pasiektas maksimalus prikabintø failø skaièius."
+
+#: templates/compose/compose.inc:494
 msgid "Maximum number of attachments reached."
 msgstr "Pasiektas maksimalus prikabintø failø skaièius."
 
-#: templates/compose/compose.inc:483
+#: templates/compose/compose.inc:489
 msgid "Maximum total attachment size reached."
 msgstr "Pasiektas maksimalus prikabintø failø dydis."
 
-#: lib/MIME/Viewer/itip.php:605
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
 msgstr "Susirinkimo nutraukimas"
 
-#: lib/MIME/Viewer/itip.php:533
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
 msgstr "Susirinkimo informacija"
 
-#: lib/MIME/Viewer/itip.php:543
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
 msgstr "Susirinkimo pasiûlymas"
 
-#: lib/MIME/Viewer/itip.php:585
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Atsakymas apie susirinkimà"
 
-#: lib/MIME/Viewer/itip.php:555
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
 msgstr "Susirinkimo atnaujinimas"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
 msgstr "Susirinkimo atnaujinimo uþklausa"
 
@@ -2007,43 +2221,39 @@
 msgid "Menu Folder List"
 msgstr "Meniu katalogø sàraðas"
 
-#: lib/Compose.php:234
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Laiðkas"
 
-#: compose.php:488 compose.php:515 compose.php:548 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Laiðko raðymas"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Laiðko data"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Laiðko nustatymai"
 
-#: search.php:349
+#: search.php:312
 msgid "Message Search"
 msgstr "Laiðko paieðka"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Laiðko dydis"
 
-#: message.php:378
+#: message.php:384
 msgid "Message Source"
 msgstr "Laiðko kodas"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Laiðko perþiûra"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Laiðko laukai"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Laiðko þymës"
@@ -2052,33 +2262,48 @@
 msgid "Message folders"
 msgstr "Laiðkø katalogai"
 
-#: lib/Compose.php:232
+#: lib/Compose.php:329
 #, php-format
 msgid "Message from %s"
 msgstr "Laiðkas nuo %s"
 
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Laiðkas atitinka"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Laiðko laukai"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Laiðko laukai"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Laiðkas atitinka"
 
-#: compose.php:730 compose.php:740
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
 msgstr "Laiðkas persiøstas sëkmingai."
 
-#: compose.php:973
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Laiðkas iðsiøstas sëkmingai, taèiau neiðsaugotas á %s"
 
-#: compose.php:1017 compose.php:1028
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "Laiðkas iðsiøstas sëkmingai."
 
-#: config/prefs.php.dist:911
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Laiðkø skaièius katalogo puslapyje."
 
-#: mailbox.php:318
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "laiðkus á"
 
@@ -2087,8 +2312,8 @@
 msgstr "Keisti"
 
 #: templates/compose/expand.inc:12
-#, php-format
-msgid "More than one address found for field '%s'."
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
 msgstr "Laukui '%s' rastas daugiau nei vienas adresas."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2099,7 +2324,11 @@
 msgid "Move down"
 msgstr "Perkelti þemyn"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Perkelti á katalogà"
 
@@ -2107,16 +2336,26 @@
 msgid "Move up"
 msgstr "Perkelti aukðtyn"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Kitos dalys"
 
-#: templates/pgp/pgp.inc:24 templates/fetchmail/manage.inc:48
-#: templates/smime/smime.inc:24
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Laiðko perþiûra"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "PASTABA"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "PASTABA"
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:674
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Vardas"
 
@@ -2124,36 +2363,46 @@
 msgid "Name and/or email can not be empty"
 msgstr "Vardas ir/arba el. paðto adresas negali bûti tuðti"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
 msgstr "Reikalingas veiksmas"
 
-#: config/prefs.php.dist:562 config/prefs.php.dist:583
-#: config/prefs.php.dist:753
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Niekada"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Niekada neiðsaugoti prikabintø failø"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Naujas"
 
-#: lib/IMP.php:569
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Naujas katalogas"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Naujas paðtas"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Sekantis laiðkas"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Nauji laiðkai"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nauji laiðkai"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Sekantis"
 
@@ -2161,11 +2410,11 @@
 msgid "Next Message"
 msgstr "Sekantis laiðkas"
 
-#: mailbox.php:352
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Sekantis puslapis"
 
-#: templates/compose/compose.inc:536 config/prefs.php.dist:972
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "Ne"
 
@@ -2177,11 +2426,11 @@
 msgid "No Encryption"
 msgstr "Kodavimo nëra"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Saugykloje nëra raktø"
 
-#: mailbox.php:371
+#: mailbox.php:375
 #, php-format
 msgid "No Messages"
 msgstr "Laiðkø nëra"
@@ -2190,47 +2439,57 @@
 msgid "No PGP public key imported."
 msgstr "Neákelti jokie PGP vieðieji raktai."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Nëra asmeninio sertifikato"
 
-#: templates/smime/smime.inc:54
-msgid "No Public Keys Found"
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Perþiûra"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
 msgstr "Nëra vietøjø raktø"
 
 #: smime.php:151
 msgid "No S/MIME public key imported."
 msgstr "Neákelti jokie S/MIME vieðieji raktai."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Prikabintø failø nëra."
 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Informacija apie %s vieðàjá raktà"
+
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
 msgstr "Nepasirinktas katalogas."
 
-#: lib/Block/summary.php:131
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
 msgstr "Nei vienas katalogas nenustatytas tikrinti naujus laiðkus."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Nenurodytas joks katalogas"
 
-#: lib/Block/summary.php:137
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
 msgstr "Naujø laiðkø nëra"
 
-#: lib/Block/summary.php:134
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
 msgstr "Neperskaitytø laiðkø nëra"
 
-#: lib/Compose.php:228
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "Laiðke nëra turinio"
 
-#: lib/Mailbox.php:1134
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
 msgstr "Nerastas nei vienas laiðkas atitinkantis jûsø paieðkà."
 
@@ -2250,28 +2509,33 @@
 msgid "No spellchecking program configured."
 msgstr "Klaidø tikrinimo programa nesukonfigûruota."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Raðybos klaidø nëra"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Pasiûlymø nëra"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 msgid "No user specified."
 msgstr "Nepasirinktas vartotojas."
 
-#: lib/MIME/Viewer/itip.php:695
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr "Nedalyvis"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 lib/MIME/Viewer/itip.php:652
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Nieko"
 
-#: templates/compose/compose.inc:310
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normalu"
 
@@ -2293,8 +2557,7 @@
 msgid "Not Personal"
 msgstr "Ne asmeniniai"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
-#: lib/Crypt/SMIME.php:166
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Netinkamas vieðasis raktas."
 
@@ -2306,27 +2569,32 @@
 msgid "Not important messages"
 msgstr "Nesvarbûs laiðkai"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Tai gali uþtrukti"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Cituojama:"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Kiek mënesiø laikyti susijusius prikabintus failus jeigu trinama kas mënesá."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Senø siøstø laiðkø katalogø skaièius iðsaugomas jei trinama kas mënesá."
 
-#: templates/contacts/contacts.inc:251 lib/MIME/Viewer/itip.php:510
-#: lib/MIME/Viewer/itip.php:720
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-#: templates/pgp/import_key.inc:48 templates/search/fields.inc:5
-#: templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "ARBA"
 
@@ -2334,47 +2602,48 @@
 msgid "Old messages"
 msgstr "Seni laiðkai"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Seni siøstø laiðkø katalogai bus iðvalyti."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
 msgid "Only display folders with unread messages in them?"
 msgstr "Rodyti tik katalogus su neperskaitytais laiðkais?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
 msgstr "Pasirinkite tik vienà katalogà ðiam veiksmui."
 
-#: templates/menu.inc:26 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "Ati_daryti katalogà"
-
-#: templates/menu.inc:17 templates/menu.inc:20
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Atidaryti katalogà"
 
-#: folders.php:381
+#: folders.php:427
 msgid "Opened Folder"
 msgstr "Atidarytas katalogas"
 
-#: lib/MIME/Viewer/itip.php:691
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
 msgstr "Pagalbiniai dalyviai"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Kitos paðto dëþutës"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Kiti nustatymai"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:294
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
@@ -2382,19 +2651,15 @@
 msgid "PGP Encrypt Message"
 msgstr "PGP uþkoduoti"
 
-#: compose.php:341
+#: compose.php:358
 msgid "PGP Error: "
 msgstr "PGP klaida: "
 
-#: compose.php:320
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP klaida: asmeniniam slaptam raktui reikalinga slapta frazë."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP NEAKTYVUOTA"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP nustatymai"
 
@@ -2402,11 +2667,11 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP slaptos frazës ávedimas"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "PGP raktø poros operacijos reikalauja saugaus prisijungimo."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
 msgstr "PGP vieðojo rakto tekstas"
 
@@ -2420,7 +2685,7 @@
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "PGP vieðasis raktas \"%s\" buvo sëkmingai iðtrintas."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP vieðøjø raktø saugykla"
 
@@ -2440,52 +2705,53 @@
 msgid "PGP public key successfully added."
 msgstr "PGP vieðasis raktas sëkmingai prijungtas."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP palaikymas iðjungtas."
 
-#: lib/MIME/Viewer/pgp.php:212
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr "Patikrinti skaitmeninio paraðo negalima, nes iðjungta PGP galimybë."
 
-#: lib/MIME/Viewer/pgp.php:299
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr "Atkoduoti laiðko negalima, nes iðjungta PGP galimybë."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
+#, fuzzy
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "PGP galimybë reikalauja iððokanèio lango. Jeigu jûsø narðyklë nustatyta "
 "blokuoti iððokanèius langus, jûs turite iðjungti ðià funkcijà. Prieðingu "
 "atveju PGP veiks neteisingai"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Automatinis protokolo atpaþinimas)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 per SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 per SSL (be CA sertifikato)"
 
-#: templates/login/login.inc:173
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 per SSL (be CA paraðo)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, be TLS"
 
@@ -2494,11 +2760,11 @@
 msgid "Page %d of %d"
 msgstr "Puslapis %d ið %d"
 
-#: config/prefs.php.dist:873
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
 msgstr "Puslapis su pirma neperskaityta þinute"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
 msgstr "Puslapis su paskutine neperskaityta þinute"
 
@@ -2506,11 +2772,11 @@
 msgid "Part(s)"
 msgstr "Dalis(ys)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Slapta frazë"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Slapta frazë (dar kartà)"
 
@@ -2518,7 +2784,7 @@
 msgid "Passphrase successfully unloaded."
 msgstr "Slapta frazë sëkmingai atjungta."
 
-#: templates/pgp/passphrase.inc:29 templates/smime/passphrase.inc:19
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Slapta frazë:"
 
@@ -2530,8 +2796,8 @@
 msgid "Passphrases do not match"
 msgstr "Slaptos frazës nesutampa"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:217
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Slaptaþodis"
 
@@ -2543,7 +2809,7 @@
 msgid "Permissions for this user can not be changed."
 msgstr "Keisti teisiø ðiam vartotojui negalima."
 
-#: message.php:486 mailbox.php:666 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Asmeniniai"
@@ -2568,23 +2834,30 @@
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Asmeniniai S/MIME raktai sëkmingai iðtrinti."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Pridëti paraðà prieð tekstà atsakinëjant ir persiunèiant?"
 
-#: compose.php:239
+#: compose.php:254
 msgid "Plaintext Version of Message"
 msgstr "Tekstinë laiðko versija"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Áveskite naujo katalogo pavadinimà:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Áveskite naujo katalogo pavadinimà:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Áveskite naujà vardà:"
 
@@ -2606,7 +2879,7 @@
 "Áveskite S/MIME rakto slaptàjà frazæ. Jà reikës ávedinëti tik kartà per %s "
 "sesijà."
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2618,19 +2891,19 @@
 "pagrindiname lange. Taip daroma, norint apsaugoti jûsø sesijos ID nuo galimø "
 "ásilauþëliø. Atsipraðome uþ nepatogumus."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Nurodykite savo slaptaþodá."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Nurodykite savo vartotojo vardà."
 
-#: compose.php:73 lib/IMP.php:514
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Iðtaisykite neteisingus adresus."
 
-#: lib/MIME/Viewer/itip.php:632
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
@@ -2638,11 +2911,11 @@
 "Perskaitykite informacijà ir ið þemiau esanèio meniu pasirinkite norimà "
 "veiksmà."
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Pasirinkite katalogà prieð atlikdami bent kokius veiksmus."
 
-#: lib/MIME/Viewer/itip.php:462
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
 msgstr "Pasirinkite veiksmà ið meniu þemiau."
 
@@ -2650,28 +2923,23 @@
 msgid "Please select at least one folder to search."
 msgstr "Pasirinkite bent vienà katalogà paieðkai."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Pasirinkite tik vienà katalogà ðiam veiksmui."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Pasirinkite arba redaguokite laukà deðinëje:"
 
-#: templates/compose/compose.inc:131 templates/compose/compose.inc:181
-#: templates/compose/compose.inc:232
-msgid "Please select or edit right next:"
-msgstr "Pasirinkite arba redaguokite tai:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Serveryje veikia Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Pradëti paraðà brûkðneliais ('-- ')?"
 
-#: smime.php:241 filterprefs.php:40 pgp.php:257
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Nustatymai sëkmingai atnaujinti."
 
@@ -2683,11 +2951,11 @@
 msgid "Previous Message"
 msgstr "Ankstesnis laiðkas"
 
-#: mailbox.php:343
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Ankstesnis puslapis"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Spausdinti"
 
@@ -2695,11 +2963,16 @@
 msgid "Priority"
 msgstr "Svarba"
 
-#: config/prefs.php.dist:551
+#: templates/smime/import_key.inc:76
+#, fuzzy
+msgid "Private Key Password"
+msgstr "Jûsø slaptasis raktas"
+
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Klausti kiekvienà kartà kai siunèiamas prikabintas failas; pradinis NE"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr ""
 "Klausti kiekvienà kartà kai siunèiamas prikabintas failas; pradinis TAIP"
@@ -2708,42 +2981,43 @@
 msgid "Protocol:"
 msgstr "Protokolas:"
 
-#: lib/Crypt/PGP.php:451
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Vieðosios PGP raktø saugyklos palaikymas iðjungtas."
 
-#: templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Pur_ge Deleted"
 msgstr "I_ðvalyti iðtrintus"
 
-#: templates/mailbox/actions_deleted.inc:9 templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Iðvalyti iðtrintus"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Iðvalyti katalogà(us)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Ðiukðliadëþës valymo daþnumas:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Iðtrinti laiðkus ið ðiukðliadëþës senesnius nei tiek dienø."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Iðtrinti senus laiðkus ðiukðliadëþëje?"
 
-#: lib/Maintenance/Task/purge_trash.php:63
-#, php-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
 msgstr "Iðvalyta %d laiðkø ið ðiukðliadëþës."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "Pridëti tai po @ kai siunèiami laiðkai arba iðpleèiami vardai:"
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Iðvalyta %d laiðkø ið ðiukðliadëþës."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2760,23 +3034,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Naudojama vieta: NEAPRIBOTA"
 
-#: config/prefs.php.dist:492
-msgid "Quoting"
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Cituojama:"
 
-#: templates/compose/compose.inc:381
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
 msgstr "Reikalauti pristatymo patvirtinimo"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "Gauta"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Gauta nuo"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Gauta iki"
 
@@ -2788,35 +3063,40 @@
 msgid "Redirect"
 msgstr "Nukreipti"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Nukreipti laiðkà"
 
-#: compose.php:693
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Laiðko nukreipimas"
 
-#: compose.php:749
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Nukreipimas nepavyko."
 
-#: templates/compose/compose.inc:577
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Atnaujinti katalogo vaizdà:"
 
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Atnaujinti vaizdà"
+
 #: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Atnaujinti vaizdà"
 
-#: lib/MIME/Viewer/itip.php:484 lib/MIME/Viewer/itip.php:503
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
 msgstr "Prisiminti uþimtumo informacijà."
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Prisiminti paskutiná vaizdà"
 
@@ -2824,7 +3104,7 @@
 msgid "Remote Mailbox:"
 msgstr "Nutolusi paðto dëþutë:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Paðalinti laukus ið paieðkos"
 
@@ -2832,15 +3112,15 @@
 msgid "Remove source"
 msgstr "Panaikinti ðaltiná"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Pervardinti katalogà(us)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Pervardinti siøstø laiðkø katalogà mënesio pradþioje?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Pervadinimas ið \"%s\" á \"%s\" nepavyko. Serverio praneðimas toks"
@@ -2849,7 +3129,7 @@
 msgid "Repl_y to List"
 msgstr "Atsakyti á konferen_cijà"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Sukeisti su:"
 
@@ -2857,7 +3137,7 @@
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: lib/MIME/Viewer/itip.php:280 lib/MIME/Viewer/itip.php:373
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
 msgstr "Atsakymas iðsiøstas."
 
@@ -2865,7 +3145,7 @@
 msgid "Reply to All"
 msgstr "Atsakyti visiems"
 
-#: compose.php:640
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Atsakyti visiems:"
 
@@ -2873,7 +3153,7 @@
 msgid "Reply to List"
 msgstr "Atsakyti á konferencijà"
 
-#: compose.php:642
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "Atsakyti á konferencijà:"
 
@@ -2881,105 +3161,104 @@
 msgid "Reply to _All"
 msgstr "Atsakyti visiems"
 
-#: lib/MIME/Viewer/itip.php:486 lib/MIME/Viewer/itip.php:495
-#: lib/MIME/Viewer/itip.php:505
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
 msgstr "Atsakymo laiðko tipas nepalaikomas"
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Atsakyti su uþimtumo informacija sekantiems 2 mënesiams."
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Atsakyti su uþimtumo informacija."
 
-#: message.php:260
+#: message.php:267
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: compose.php:638
+#: compose.php:731
 msgid "Reply:"
 msgstr "Atsakymas:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Ne nepageidaujamas (spam)"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Nepageidaujamas (spam)"
 
-#: templates/compose/compose.inc:378
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "Reikalauti perskaitymo patvirtinimo"
 
-#: config/prefs.php.dist:586
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
 msgstr "Reikalauti pristatymo patvirtinimo?"
 
-#: config/prefs.php.dist:565
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Reikalauti perskaitymo patvirtinimo?"
 
-#: mailbox.php:204
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr "Nurodytas laiðkas nerastas."
 
-#: lib/MIME/Viewer/itip.php:683
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
 msgstr "Reikalingas dalyvis"
 
-#: templates/acl/acl.inc:158 templates/search/header.inc:26
-#: templates/search/main.inc:143
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Iðvalyti"
 
-#: lib/MIME/Viewer/itip.php:107
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
 msgstr "Atsakovo statusas atnaujintas."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Redaguoti"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Tæsti jûsø sesijà"
 
-#: templates/fetchmail/manage.inc:69 templates/fetchmail/account_select.inc:32
-#: templates/fetchmail/driver_select.inc:31
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Laiðko raðymas"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "Gráþti á laiðkø paëmimà"
 
-#: templates/pgp/pgp.inc:268 templates/filters/prefs.inc:70
-#: templates/filters/notactive.inc:13 templates/smime/smime.inc:158
-msgid "Return to Main Preferences Screen"
-msgstr "Gráþti á pagrindiná nustatymø langà"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
 msgstr "Gráþti á nustatymus"
 
-#: templates/pgp/notactive.inc:33 templates/smime/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Gráþti á ankstesná langà"
-
-#: config/prefs.php.dist:713
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "Gráþti á paðto dëþutæ po laiðko trynimo, perkëlimo ar kopijavimo?"
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Rolë"
 
-#: lib/MIME/Viewer/pkcs7.php:127 lib/MIME/Viewer/pkcs7.php:180
-#: lib/MIME/Viewer/pkcs7.php:205
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -2987,19 +3266,15 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Uþkoduoti laiðkà S/MIME raktu"
 
-#: compose.php:377
+#: compose.php:394
 msgid "S/MIME Error: "
 msgstr "S/MIME klaida: "
 
-#: compose.php:356
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME klaida: asmeniniam slaptam raktui reikalinga slapta frazë."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME NEAKTYVUOTA"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME nustatymai"
 
@@ -3007,7 +3282,7 @@
 msgid "S/MIME Passphrase Input"
 msgstr "S/MIME slaptos frazës ávedimas"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "S/MIME raktø poros operacijos reikalauja saugaus prisijungimo."
 
@@ -3020,7 +3295,7 @@
 msgid "S/MIME Public Key successfully added."
 msgstr "S/MIME vieðasis raktas sëkmingai pridëtas."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "S/MIME vieðøjø raktø saugykla"
 
@@ -3036,75 +3311,101 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME pasiraðyti ir uþkoduoti"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "S/MIME galimybë iðjungta."
 
-#: lib/MIME/Viewer/pkcs7.php:209
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr "Atkoduoti laiðko negalima, nes S/MIME galimybë iðjungta."
 
-#: lib/MIME/Viewer/pkcs7.php:131
+#: lib/MIME/Viewer/pkcs7.php:173
+#, fuzzy
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr "Patikrinti skaitmeninio paraðo negalima, nes S/MIME galimybë iðjungta."
+
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr "Patikrinti skaitmeninio paraðo negalima, nes S/MIME galimybë iðjungta."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
+#, fuzzy
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME galimybë reikalauja iððokanèio lango. Jeigu jûsø narðyklë nustatyta "
 "blokuoti iððokanèius langus, jûs turite iðjungti ðià funkcijà. Prieðingu "
 "atveju S/MIME veiks neteisingai"
 
-#: templates/compose/compose.inc:270
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "_Tema"
 
-#: templates/compose/compose.inc:358
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Iðsau_goti kopijà kataloge "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Iðsaug_oti kaip"
 
-#: search.php:353 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Iðsaugoti"
 
-#: templates/compose/compose.inc:532
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Iðsaugoti prikabintus failus kartu su laiðku siøstø laiðkø kataloge?"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Iðsaugoti paruoðiná"
 
-#: templates/pgp/pgp.inc:64 templates/pgp/notactive.inc:23
-#: templates/filters/prefs.inc:69 templates/smime/notactive.inc:23
-#: templates/smime/smime.inc:37
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Iðsaugoti kaip"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Iðsaugoti nustatymus"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Iðsaugoti nustatymus"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
 msgstr "Iðsaugoti _paruoðiná"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Iðsaugoti kaip"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Iðsaugoti paruoðiná kaip neperskaitytà?"
 
-#: config/prefs.php.dist:1054
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "Iðsaugoti gavëjus automatiðkai á adresø knygelæ?"
 
@@ -3112,29 +3413,31 @@
 msgid "Save search as a virtual folder?"
 msgstr "Iðsaugoti paieðkos rezultatus virtualiame kataloge?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Iðsaugoti iðsiøstus laiðkus?"
 
-#: compose.php:1098
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Iðsaugoti paruoðinio nepavyko. Serverio praneðimas toks: %s"
 
-#: templates/contacts/contacts.inc:196
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Ieðkoti"
 
-#: templates/mailbox/header.inc:11 templates/search/header.inc:18
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Ieðkoti kataloge %s"
 
-#: lib/Block/tree_folders.php:170
-msgid "Search Mail"
-msgstr "Ieðkoti laiðkø"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Iðsaugoti nustatymus"
 
-#: search.php:306
+#: search.php:265
 msgid "Search Results"
 msgstr "Paieðkos rezultatai"
 
@@ -3150,7 +3453,7 @@
 msgid "Select Another Account"
 msgstr "Pasirinkite kità sàskaità"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Pasirinkite datà"
 
@@ -3158,7 +3461,12 @@
 msgid "Select a field"
 msgstr "Pasirinkite laukelá"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Pasirinkite datà"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Pasirinkite adresø knygelæ adresø paieðkai ir pridëjimui."
 
@@ -3178,6 +3486,10 @@
 msgid "Select none"
 msgstr "Nepaþymëti nieko"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Pasirinkite paðto serverio tipà"
@@ -3186,32 +3498,33 @@
 msgid "Selected Address books:"
 msgstr "Pasirinktos adresø knygelës:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Nusiøsti raktà á raktø saugyklà"
 
-#: lib/MIME/Viewer/itip.php:561
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
 msgstr "Siøsti naujausià informacijà"
 
-#: config/prefs.php.dist:574
-msgid "Send MDN when requested by the sender?"
-msgstr "Siøsti MDN kai siuntëjas to praðo?"
-
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Siøsti laiðkà"
 
-#: folders.php:359
+#: config/prefs.php.dist:703
+#, fuzzy
+msgid "Send read receipt when requested by the sender?"
+msgstr "Siøsti MDN kai siuntëjas to praðo?"
+
+#: folders.php:397
 msgid "Sent mail folder"
 msgstr "Siøstø laiðkø katalogas"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Siøstø laiðkø katalogas:"
 
-#: templates/login/login.inc:134 templates/login/login.inc:148
-#: templates/login/login.inc:155
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Serveris"
 
@@ -3227,7 +3540,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Kas bus vykdoma su jûsø laiðkais kai jie trinami arba perkeliami."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Ar naudoti svarbos antraðtæ siunèiant laiðkus?"
 
@@ -3243,21 +3556,21 @@
 msgid "Share your mail folders with other users."
 msgstr "Dalintis paðto katalogais su kitais vartotojais."
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr "Ar dideli citatos blokai standartiðkai turi bûti rodomi ar paslëpti?"
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Ar norite laiðko tekste ieðkoti PGP informacijos?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Ar raðymo langas turi uþsidaryti po paruoðinio iðsaugojimo?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 "Ar norite prie kiekvieno siunèiamo laiðko prikabinti savo PGP vieðàjá raktà?"
@@ -3270,7 +3583,7 @@
 msgid "Show All Headers"
 msgstr "Rodyti visas antraðtes"
 
-#: mailbox.php:361
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Rodyti iðtrintus"
 
@@ -3286,54 +3599,50 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Rodyti tik uþsiprenumeruotus katalogus"
 
-#: folders.php:250
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Rodyti neuþprenumeruotus"
 
-#: config/prefs.php.dist:611
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Rodyti trynimo piktogramà prie kiekvieno prikabinto failo laiðke?"
 
-#: config/prefs.php.dist:998
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Laiðkø sàraðe rodyti spalvø reikðmes?"
 
-#: config/prefs.php.dist:808
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
 msgstr "Iðankstinis perþiûrëjimas tik neperskaitytoms þinutëms?"
 
-#: config/prefs.php.dist:816
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
 msgstr "Alternatyvus naujo paðto perþiûrëjimas?"
 
-#: config/prefs.php.dist:847
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Rodyti 'Paimti laiðkus' mygtukà meniu?"
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:95
 msgid "Show the Images"
 msgstr "Parodyti paveikslëlius"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Rodyti filtrø mygtukà meniu?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
 msgstr "Rodyti bendrà laiðkø skaièiø kataloge?"
 
-#: config/prefs.php.dist:668
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "Rodyti"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Dydis"
 
-#: templates/login/login.inc:237
-msgid "Sign up if not registered"
-msgstr "Jeigu neuþsiregistravote, padarykite tai"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Pasiraðyti"
@@ -3342,150 +3651,183 @@
 msgid "Size"
 msgstr "Dydis"
 
-#: templates/mailbox/message_headers.inc:3
-msgid "Sort Direction"
-msgstr "Rûðiavimo kryptis"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Rûðiuoti pagal gavimo datà"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Rûðiuoti pagal paraðymo datà"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Rûðiuoti pagal siuntëjà"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Rûðiuoti pagal laiðko dydá"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Rûðiuoti pagal pavadinimà"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Rûðiuoti pagal temà"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Rûðiuoti pagal adresatà"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Nepageidaujamø (spam) laiðkø katalogas:"
 
-#: templates/compose/compose.inc:341
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Specialûs simboliai"
 
-#: templates/compose/compose.inc:338
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Klaidø tikrinimas"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Klaidø tikrinimas"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Klaidø tikrinimas baigtas"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Klaidø skaièius puslapyje raðybos tikrinimo metu."
 
-#: lib/MIME/Viewer/itip.php:470 lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr "Pradëti"
 
-#: lib/MIME/Viewer/itip.php:674
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Statusas"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:215
 msgid "Strip Attachment"
 msgstr "Iðtrinti prikabintà failà"
 
-#: config/prefs.php.dist:800
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
 msgstr "Iðvalyti tuðèias eilutes?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Tema"
 
-#: message.php:261 search.php:157 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Tema"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "Temos laukas"
 
-#: search.php:355 templates/pgp/passphrase.inc:31
-#: templates/smime/passphrase.inc:21
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Ávesti"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Prenumeruoti katalogà(us)"
 
-#: lib/MIME/Viewer/status.php:90 lib/MIME/Viewer/pgp.php:393
-#: lib/MIME/Viewer/pkcs7.php:339
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Sëkminga"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Pasiûlymai"
 
-#: lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Turinys"
 
-#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
 msgstr "Laiðko raðymo bûdo perjungimas"
 
-#: templates/compose/compose.inc:399
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
 msgstr "Perjungti á HTML"
 
-#: templates/compose/compose.inc:399
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
 msgstr "Perjungti á paprastà tekstà"
 
-#: templates/compose/compose.inc:414
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "T_ekstas"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:269
+#, fuzzy
+msgid "Tentative: "
+msgstr "Laikinai priimtas"
+
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
 msgstr "Laikinai priimti uþklausà"
 
-#: lib/MIME/Viewer/itip.php:748
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
 msgstr "Laikinai priimtas"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Registracijos sàlygos nenurodytos conf.php faile"
 
-#: config/prefs.php.dist:924
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "T_ekstas"
+
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
 msgstr "Laiðko Nuo: laukelis turi bûti susietas:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintoch resursai"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Macintosh resursai gali bûti atsiøsti ið %s."
@@ -3500,56 +3842,56 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Sàskaita \"%s\" iðsaugota."
 
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Adresas \"%s\" pridëtas prie %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Prikabintas failas nerastas."
 
-#: templates/javascript/open_compose_win.js:34
+#: lib/MIME/Viewer/itip.php:69
+#, fuzzy
+msgid "The calendar data is invalid"
+msgstr "<b>Kalendoriaus duomenys neteisingi</b>"
+
+#: templates/javascript/open_compose_win.js:37
 msgid ""
 "The compose window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
 "Nepavyko atidaryti raðymo lango. Galbût jûsø narðyklë blokuoja naujus langus?"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Macintosh failo turinys iðdëstytas apaèioje."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Esamas(i) katalogas(ai) \"%s\" bus pervardintas(i) á \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr "Nepavyko gauti vartotojø teisiø ðiam katalogui"
 
-#: compose.php:1107
+#: compose.php:1236
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Paruoðinys iðsaugotas kataloge \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr "Ávykis áraðytas á jûsø kalendoriø."
 
 #: templates/compose/expand.inc:9
-#, php-format
-msgid "The field '%s' can't be expanded."
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
 msgstr "Laukas '%s' negali bûti iðskleistas."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Katalogas \"%s\" jau egzistuoja"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3558,69 +3900,77 @@
 "Katalogo \"%s\" pavadinime yra neleistinø simboliø. Tai gali sukelti "
 "nesklandumø. Kreipkitës á sistemos administratoriø."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Katalogas \"%s\" sukurtas, taèiau neaktyvuotas."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Katalogas \"%s\" iðtrintas, taèiau jis vis dar uþprenumeruotas."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Katalogas \"%s\" nesukurtas. Serverio praneðimas toks"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:265
+#, fuzzy, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "Katalogas '%s' neiðtrintas. Serverio praneðimas toks"
+
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Katalogas \"%s\" sukurtas."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Katalogas \"%s\" iðtrintas."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Katalogas \"%s\" pervardintas á \"%s\"."
 
-#: lib/Folder.php:373
-#, php-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "Katalogas '%s' neiðtrintas. Serverio praneðimas toks"
-
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
 msgstr "Prie ðios dalies prikabinti ðie failai:"
 
-#: lib/MIME/Viewer/html.php:93
+#: templates/javascript/open_saveimage_win.js:12
+#, fuzzy
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Nepavyko atidaryti raðymo lango. Galbût jûsø narðyklë blokuoja naujus langus?"
+
+#: lib/MIME/Viewer/html.php:97
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr "Paveikslëliai bus parodyti, bes siuntëjas yra jûsø adresø knygelëje."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "Paðto serverio klaida:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "Paðto serverio informacija:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "Paðto serverio þinutë:"
 
-#: lib/Message.php:645
+#: lib/Message.php:651
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Katalogas %s jau tuðèias."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr "Laiðkas \"%s\" nuo \"%s\" (%d baitai) virðyja paimamø laiðkø dydá."
@@ -3629,15 +3979,20 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Raðomas laiðkas uþdarytas. Iðeinu."
 
-#: message.php:143
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Laiðkas iðtrintas."
 
-#: lib/MIME/Viewer/pgp.php:397 lib/MIME/Viewer/pkcs7.php:343
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
 msgstr "Laiðkas patikrintas."
 
-#: templates/pgp/open_pgp_win.js:10 templates/smime/open_smime_win.js:10
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Laiðkas patikrintas."
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
 "The passphrase window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
@@ -3645,20 +4000,20 @@
 "Nepavyko atidaryti slaptaþodþio lango. Galbût jûsø narðyklë blokuoja naujus "
 "langus."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Neapdirbtas PGP vieðojo rakto tekstas gali bûti perþiûrëtas %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Ðio failo nëra MS-TNEF prikabintoje dalyje."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Ðios bylos nëra Zip archyve."
 
-#: message.php:550
+#: message.php:547
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3668,6 +4023,11 @@
 "Laiðko siuntëjas reikalauja atsakymo apie laiðko gavimà, kai tik já "
 "perskaitysite. Norëdami taip padaryti, spauskite %s."
 
+#: lib/MIME/Viewer/images.php:69
+#, fuzzy
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "Norëdami pamatyti maþesná paveikslëlá, spauskite %s."
+
 #: templates/compose/compose.js:104
 msgid "The signature could not be replaced."
 msgstr "Nepavyko pakeisti paraðo."
@@ -3680,42 +4040,57 @@
 msgid "The specified file does not exist."
 msgstr "Nurodytas failas neegzistuoja."
 
-#: lib/MIME/Viewer/itip.php:160
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Sàskaita \"%s\" iðsaugota."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Sàskaita \"%s\" iðtrinta."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Sàskaita \"%s\" iðtrinta."
+
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
 msgstr "Uþduotis áraðyta á jûsø darbø sàraðà."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Laiðko tekstas"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "Laiðko tekstas gali bûti perþiûrëtas %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Graþinto laiðko tekstas"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "Graþinto laiðko tekstas gali bûti perþiûrëtas %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Nusiøsto laiðko tekstas"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Nusiøsto laiðko tekstas gali bûti perþiûrëtas %s."
 
-#: lib/MIME/Viewer/itip.php:145
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Vartotojo uþimtumo informacija sëkmingai iðsaugota."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "Kitø daliø, kurias galima bûtø rodyti tekste, nëra."
 
@@ -3723,21 +4098,26 @@
 msgid "There are no messages in this mailbox."
 msgstr "Ðiame kataloge nëra laiðkø."
 
-#: lib/Message.php:604
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Kitø daliø, kurias galima bûtø rodyti tekste, nëra."
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Nepavyko iðvalyti %s. Serverio praneðimas toks"
 
-#: lib/Message.php:647
+#: lib/Message.php:653
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Nepavyko iðvalyti katalogo. Serverio praneðimas: %s"
 
-#: lib/Message.php:613
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr "Nepavyko iðvalyti katalogo. Serverio praneðimas toks"
 
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3745,120 +4125,132 @@
 msgstr ""
 "Klaida kopijuojant laiðkus ið \"%s\" á \"%s\". Serverio praneðimas toks"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "Klaida trinant laiðkus ið katalogo \"%s\". Serverio praneðimas toks"
 
-#: lib/Message.php:296
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Klaida trinant laiðkus kataloge \"%s\". Serverio praneðimas toks"
 
-#: lib/Message.php:230
+#: lib/Message.php:211
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Klaida trinant laiðkus. Serverio klaida: %s"
 
-#: lib/MIME/Viewer/itip.php:91
+#: lib/MIME/Viewer/itip.php:99
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Klaida iðtrinant ávyká: %s."
 
-#: lib/MIME/Viewer/enriched.php:40 lib/MIME/Viewer/plain.php:55
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Nepavyko parodyti ðios laiðko dalies"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Klaida paþymint laiðkus kataloge \"%s\". Serverio praneðimas toks"
 
-#: folders.php:155
+#: folders.php:165
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Klaida ákeliant %s."
 
-#: lib/MIME/Viewer/itip.php:127
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Klaida ákeliant ávykio duomenis: %s."
 
-#: lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Klaida ákeliant darbà: %s."
 
-#: lib/MIME/Viewer/itip.php:143
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "Klaida ákeliant vartotojo uþimtumo informacijà: %s."
 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "Klaida perkeliant laiðkus ið \"%s\" á \"%s\". Serverio praneðimas toks"
 
-#: compose.php:1115
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
 msgstr "Klaida iðsaugant laiðkà kaip paruoðiná."
 
-#: compose.php:895
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Klaida siunèiant laiðkà: %s"
 
-#: lib/MIME/Viewer/itip.php:105
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Klaida atnaujinant ávyká: %s."
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "Ðioje laiðko dalyje nëra teksto"
 
-#: lib/MIME/Viewer/html.php:91
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
 msgstr "Ðiame HTML laiðke yra paveikslëliø."
 
-#: lib/MIME/Viewer/html.php:87
+#: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
 "Ðiame HTML laiðke yra paveikslëliø. Uþblokuoti paveikslëliai rodomi kaip: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Ðis PGP vieðasis raktas buvo prikabintas prie laiðko."
 
-#: lib/MIME/Viewer/itip.php:96 lib/MIME/Viewer/itip.php:110
-#: lib/MIME/Viewer/itip.php:134 lib/MIME/Viewer/itip.php:148
-#: lib/MIME/Viewer/itip.php:164 lib/MIME/Viewer/itip.php:283
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr "Veiksmas nepalaikomas."
 
-#: lib/MIME/Viewer/itip.php:170 lib/MIME/Viewer/itip.php:383
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr "Ðis veiksmas dar nerealizuotas."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Tai gali uþtrukti. Ar jûs tikrai norite testi?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Laiðkas turi prikabintà Machintosh failà."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/pkcs7.php:410
+#, fuzzy
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr "Ðis laiðkas yra pasiraðytas S/MIME paraðu."
+
+#: lib/MIME/Viewer/pkcs7.php:414
+#, fuzzy
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Ðis laiðkas yra uþkoduotas su S/MIME."
+
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
@@ -3866,43 +4258,38 @@
 "Ðiame laiðke yra informacija apie laiðkø pristatymà, taèiau neþinomas jos "
 "formatas."
 
-#: lib/MIME/Viewer/pgp.php:319
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Atrodo, kad tai netvarkingas PGP raktu uþkoduotas laiðkas. Klaida: "
 
-#: lib/MIME/Viewer/pkcs7.php:225
-msgid ""
-"This message does not appear to be a valid S/MIME encrypted message. Error: "
-msgstr "Atrodo, kad tai netvarkingas S/MIME raktu uþkoduotas laiðkas. Klaida: "
-
-#: lib/MIME/Viewer/pgp.php:244 lib/MIME/Viewer/pgp.php:354
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Laiðkas neatitinka teisingo PGP RFC2015 formato."
 
-#: lib/MIME/Viewer/pkcs7.php:163
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Laiðkas neatitinka teisingo S/MIME formato."
 
-#: lib/MIME/Viewer/pgp.php:209 lib/MIME/Viewer/pgp.php:420
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Ðis laiðkas yra pasiraðytas PGP paraðu."
 
-#: lib/MIME/Viewer/pkcs7.php:128
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Ðis laiðkas yra pasiraðytas S/MIME paraðu."
 
-#: lib/MIME/Viewer/pkcs7.php:124 lib/MIME/Viewer/pkcs7.php:206
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Ðis laiðkas yra uþkoduotas su S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
 msgstr "Ðis laiðkas yra uþkoduotas su PGP."
 
-#: message.php:204
+#: message.php:211
 msgid "This message to"
 msgstr "ðá laiðkà á"
 
@@ -3914,18 +4301,22 @@
 msgid "This window must be called from a compose window."
 msgstr "Ðá langà reikia atidarinëti ið laiðko raðymo lango."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:892
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Rodyti"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Grupuojami laiðkai"
 
-#: message.php:257 search.php:145 mailbox.php:576
-#: templates/compose/redirect.inc:64 templates/compose/recompose.inc:10
-#: templates/mailbox/message_headers.inc:17
-#: templates/contacts/contacts.inc:220
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Kam"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:919
 msgid "To Address"
 msgstr "Adresatas"
 
@@ -3937,11 +4328,17 @@
 "Norëdami pasirinkti keletà reikðmiø, laikykite Control (PC) arba Command "
 "(Mac) klaviðà, ir pasirinkite pele."
 
-#: templates/compose/compose.inc:571
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
 msgstr "Visas prikabintø failø dydis:"
 
-#: folders.php:350
+#: folders.php:388
 msgid "Trash folder"
 msgstr "Ðiukðliadëþë"
 
@@ -3949,9 +4346,8 @@
 msgid "Trash folder:"
 msgstr "Ðiukðliadëþë:"
 
-#: lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
-#: lib/Quota/cyrus.php:70
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Nepavyko apskaièiuoti naudojamos vietos"
 
@@ -3968,28 +4364,33 @@
 msgid "Undelete"
 msgstr "Atstatyti iðtrintus"
 
-#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:219
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Adresatai nerodomi"
 
-#: lib/MIME/Viewer/itip.php:409
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Nepalaikomas komponento tipas: %s"
 
-#: mailbox.php:537
+#: mailbox.php:565
 msgid "Unknown Date"
 msgstr "Data neþinoma"
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
 msgstr "Neþinomas susirinkimas"
 
-#: mailbox.php:588
+#: mailbox.php:618
 msgid "Unknown Recipient"
 msgstr "Neþinomas adresatas"
 
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Atjungti slaptà frazæ"
 
@@ -3997,46 +4398,52 @@
 msgid "Unnamed"
 msgstr "Neávardintas"
 
-#: message.php:492 mailbox.php:671 templates/message/navbar_navigate.inc:6
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Neskaityti"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Nebeprenumeruoti katalogo(ø)"
 
-#: templates/compose/compose.inc:578
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
 msgstr "Atnaujinti prikabintus failus"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr "Atnaujinti atsakovø statusà"
 
-#: templates/pgp/import_key.inc:56 templates/smime/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Nusiøsti"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Naudoti standartinæ reikðmæ"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Naudoti IMAP katalogø prenumeratà?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Virtualûs katalogai"
+
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "Vartotojas"
 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr "Vartotojui '%s' sëkmingai suteiktos teisës katalogui '%s'."
 
-#: templates/login/login.inc:205
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Vartotojo vardas"
 
@@ -4044,83 +4451,136 @@
 msgid "Username:"
 msgstr "Vartotojo vardas:"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
-#: templates/smime/smime.inc:113 templates/smime/smime.inc:117
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Rodyti"
 
-#: lib/MIME/Viewer/tnef.php:112 lib/MIME/Viewer/zip.php:95
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
 msgstr "Rodyti %s"
 
-#: templates/pgp/pgp.inc:93 templates/smime/smime.inc:65
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Rodyti %s vieðàjá raktà"
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:116
 msgid "View HTML content in a separate window"
 msgstr "Rodyti HTML turiná atskirame lange"
 
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:117
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Nauji laiðkai"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Rodyti slaptàjá raktà"
 
-#: templates/pgp/pgp.inc:147 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Rodyti vieðàjá raktà"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Rodyti grupæ"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
 msgstr "Rodyti paveikslëlius"
 
-#: lib/MIME/Viewer/itip.php:131
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Rodyti HTML turiná atskirame lange"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Rodyti HTML turiná atskirame lange"
+
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
 msgstr "Perþiûrëti ávyká"
 
-#: mailbox.php:506 folders.php:342
+#: folders.php:380 mailbox.php:534
 #, php-format
 msgid "View messages in %s"
 msgstr "Perþiûrëti laiðkus kataloge %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Prisijungus rodyti ðá katalogà:"
 
-#: lib/MIME/Viewer/itip.php:161
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
 msgstr "Perþiûrëti darbà"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
 msgstr "Rodyti paveikslëlius"
 
-#: search.php:304
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Virtualus katalogas \"%s\" sukurtas sëkmingai."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:117 lib/IMAP/Tree.php:305
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:371
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtualûs katalogai"
 
+#: search.php:245
+#, fuzzy
+msgid "Virtual Folders require a label."
+msgstr "Virtualaus katalogo pavadinimas"
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "Virtualûs katalogai"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Virtualûs katalogai"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Virtualûs katalogai"
+
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "Virtualaus katalogo pavadinimas"
 
-#: login.php:141
+#: lib/MIME/Viewer/pkcs7.php:374
+#, fuzzy
+msgid "Warning"
+msgstr "Iðskleidþiama"
+
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
 msgstr "Sveiki atvykæ á %s"
 
-#: config/prefs.php.dist:723
+#: config/prefs.php.dist:619
+#, fuzzy
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Iðtrinti laiðkus, po to kai jie buvo paþymëti kaip nepageidaujami (spam)?"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4128,61 +4588,93 @@
 "Kai laiðkas iðtrinamas, jis perkeliamas á ðiukðliadëþæ, o ne þymimas kaip "
 "iðtrintas?"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Kurá puslapá norite matyti, atidarius paðto dëþutæ?"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Kai iðsaugome iðsiøstà laiðkà, ar iðsaugoti ir prikabintus failus?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Visada leisti"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Perkelti tekstà po tiek simboliø."
-
-#: templates/compose/compose.inc:535 config/prefs.php.dist:973
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Taip"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
 msgstr "Jûs bandote paimti laiðkus ið ðios(iø) sàskaitos(ø):"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Jûs bandote iðtrinti ðiuos katalogus:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Jûs bandote iðtrinti ðiuos katalogus:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Jûs kopijuojate/perkeliate á kità katalogà."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Jûs kuriate pakatologá kataloge "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Jûs kuriate katalogà."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Jûs kuriate katalogà."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Jûs pervardinate katalogà: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Jûs sëkmingai atsiprenumeravote \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr "Jûs nesutikote su registracijos sàlygomis, todël prisijungti negalite."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
 msgstr "Neturite teisiø keisti teisiø á ðá katalogà."
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "%%s jûs persiuntëte ðá laiðkà ðiems adresatams: %s."
@@ -4196,7 +4688,12 @@
 msgid "You have 1 new message."
 msgstr "Jûs gavote 1 naujà laiðkà."
 
-#: templates/compose/attachments.js:116
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Jûs gavote 1 naujà laiðkà."
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
@@ -4204,32 +4701,32 @@
 "Jûs pasirinkote bent vienà failà, kurio dar neprikabinote. Ar tikrai norite "
 "siøsti ðá laiðkà be ðiø failø?"
 
-#: lib/IMP.php:978
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Jûs turite naujø laiðkø ðiame kataloge:"
 
-#: lib/IMP.php:983
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Jûs turite naujø laiðkø ðiuose kataloguose:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Turite nurodyti bent vienà gavëjà."
 
-#: lib/MIME/Viewer/pgp.php:306
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Norëdami perþiûrëti ðá laiðkà, áveskite PGP privataus rakto slaptàjà frazæ"
 
-#: lib/MIME/Viewer/pkcs7.php:217
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
 "Norëdami perþiûrëti ðá laiðkà, áveskite S/MIME privataus rakto slaptàjà frazæ"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Primiausia reikia nurodyti katalogà."
 
@@ -4241,8 +4738,8 @@
 msgid "You must select an address first."
 msgstr "Visø pirma reikia nurodyti adresà."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Reikia pasirinkti bent vienà laiðkà."
 
@@ -4255,61 +4752,62 @@
 msgstr "Turite prikabinti bent vienà failà."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Savo profilaktiniø veiksmø nustatymuose turite ájungti '%s'."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Jûs nukreipëte ðá laiðkà %s %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Jûs atsakëte á ðá laiðkà %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Jûs neuþsiprenumeravote \"%s\". Serverio praneðimas toks"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Jûs neatsiprenumeravote \"%s\". Serverio praneðimas toks"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Jûs sëkmingai uþsiprenumeravote \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Jûs sëkmingai atsiprenumeravote \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Jûsø vardas/pavardë"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Jûsø PGP vieðieji/spaltieji raktai"
 
-#: templates/pgp/pgp.inc:150 templates/smime/smime.inc:116
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Jûsø slaptasis raktas"
 
-#: templates/pgp/pgp.inc:146 templates/smime/smime.inc:112
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Jûsø vieðasis raktas"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Reply-To: adresas: <i>(nebûtina)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Jûsø S/MIME vieðieji/slaptieji sertifikatai"
 
@@ -4317,26 +4815,19 @@
 msgid "Your accounts:"
 msgstr "Jûsø sàskaitos:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
 "Kiti jûsø adresai: <i>(nebûtina, kiekvienà adresà raðykite naujoje eilutëje)"
 "</i>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
 msgstr "Jûsø narðyklë negali parodyti ðio paveikslëlio laiðko tekste."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Jûsø narðyklë nepalaiko ðio spausdinimo nuostatymo. Norëdami atspausdinti "
-"spauskite Control/Option + P."
-
-#: config/prefs.php.dist:531
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Standartinë koduotë siunèiamiems laiðkais:"
 
@@ -4344,68 +4835,69 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Standartinis kodavimo metodas siunèiamiems laiðkais:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Laiðkas sëkmingai pristatytas."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Jûsø paraðas:"
 
-#: compose.php:1149 message.php:281 mailbox.php:521 lib/Compose.php:728
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[be pavadinimo]"
 
-#: templates/compose/compose.inc:220
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "_Blokuoti"
 
-#: templates/compose/compose.inc:169
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:879
-msgid "_Compose"
-msgstr "_Raðyti naujà"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Iðtrinti"
 
-#: lib/IMP.php:881
+#: lib/IMP.php:979
 msgid "_Folders"
 msgstr "_Katalogai"
 
-#: templates/compose/compose.inc:84
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "Ap_raðas"
 
-#: lib/IMP.php:872
+#: lib/IMP.php:961
 msgid "_Inbox"
 msgstr "Inbo_x"
 
-#: lib/IMP.php:922
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "Atsi_jungti"
 
-#: message.php:378
+#: message.php:384
 msgid "_Message Source"
 msgstr "Laiðko kodas"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Nauji laiðkai"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Spausdinti"
 
-#: templates/compose/compose.inc:287 templates/compose/compose.inc:304
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "S_varba"
 
-#: mailbox.php:396
+#: mailbox.php:418
 #, php-format
 msgid "_Refresh %s"
 msgstr "Atnaujinti %s"
@@ -4414,19 +4906,19 @@
 msgid "_Reply"
 msgstr "Atsak_yti"
 
-#: lib/IMP.php:883
+#: lib/IMP.php:981
 msgid "_Search"
 msgstr "I_eðkoti"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
 msgstr "_Siøsti laiðkà"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "Grupës"
 
-#: templates/compose/compose.inc:119
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Kam"
 
@@ -4434,58 +4926,128 @@
 msgid "_Undelete"
 msgstr "Atstatyti"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "Rodyti grupæ"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Visada _leisti"
 
-#: lib/Compose.php:341
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
 msgid "attachment"
 msgstr "failas"
 
-#: view.php:102
+#: view.php:99
 msgid "attachments.zip"
 msgstr "prikabinti_failai.zip"
 
-#: templates/compose/compose.inc:507
+#: templates/compose/compose.inc:513
 msgid "bytes"
 msgstr "baitai"
 
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
+#, fuzzy
+msgid "from"
+msgstr "Nuo"
+
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
 #: smime.php:29 pgp.php:69
 msgid "key"
 msgstr "raktas"
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
 msgstr "katalogo failas"
 
-#: compose.php:956 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "vardas"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "nëra"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "arba"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "raðybos klaida"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "raðybos klaidos"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "raðybos klaida"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "jûsø juodasis sàraðas"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "jûsø baltasis sàraðas"


--- orig/templates/message/javascript.inc
+++ mod/templates/message/javascript.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 // Set up left (37) and right (39) arrows to go to the previous/next
@@ -25,7 +25,7 @@
     return true;
 }
 
-<?php if (!strstr($imp['protocol'], 'pop3')): ?>
+<?php if ($_SESSION['imp']['base_protocol'] != 'pop3'): ?>
 function flagMessage(form)
 {
     if ((form == 1 && document.messages.flag1.options[document.messages.flag1.selectedIndex].value != "") ||


--- orig/view.php
+++ mod/view.php
@@ -17,11 +17,11 @@
  *                 objects
  *   'zip'      -- Download in .zip format?
  *
- * $Horde: imp/view.php,v 2.199.4.4 2005/09/24 09:09:11 jan Exp $
+ * $Horde: imp/view.php,v 2.199.4.10 2006/03/21 01:01:01 jan Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -30,7 +30,7 @@
 /* We can't register this session as 'readonly' if we are doing a
  * 'view_attach' since some MIME_Drivers may need to create temporary cache
  * files to correctly generate links. */
-if (isset($_GET['actionID']) && ($_GET['actionID'] != 'view_attach')) {
+if (isset($_GET['actionID']) && $_GET['actionID'] != 'view_attach') {
     $session_control = 'readonly';
 }
 
@@ -75,12 +75,10 @@
         if (empty($index)) {
             exit;
         }
-        $contents = &IMP_Contents::singleton($index);
+        $contents = &IMP_Contents::singleton($index . IMP_IDX_SEP . $_SESSION['imp']['thismailbox']);
     }
 
-    if (($actionID != 'download_all') &&
-        ($actionID != 'save_message') &&
-        ($actionID != 'view_source')) {
+    if (!in_array($actionID, array('download_attach', 'download_all', 'save_message', 'view_source'))) {
         $mime = $contents->getDecodedMIMEPart($id);
         if (($ctype = Util::getFormData('ctype'))) {
             $mime->setType($ctype);
@@ -94,7 +92,7 @@
     $tosave = array();
     $headers = &$contents->getHeaderOb();
     $headers->buildHeaders();
-    $zipfile = trim($headers->getValue('subject'));
+    $zipfile = trim(preg_replace('/[^\w-+_\. ]/', '_', $headers->getValue('subject')), ' _');
     if (empty($zipfile)) {
         $zipfile = _("attachments.zip");
     } else {
@@ -104,6 +102,9 @@
         $mime = $contents->getDecodedMIMEPart($val);
         $tosave[] = array('data' => $mime->getContents(), 'name' => $mime->getName(true, true));
     }
+    if (is_a($contents, 'PEAR_Error')) {
+        Horde::fatal($contents, __FILE__, __LINE__);
+    }
 
     require_once 'Horde/Compress.php';
     $horde_compress = &Horde_Compress::singleton('zip');


--- orig/locale/nb_NO/help.xml
+++ mod/locale/nb_NO/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/nb_NO/help.xml,v 1.16.6.1 2005/01/25 22:05:52 jan Exp $ -->
+<!-- $Horde: imp/locale/nb_NO/help.xml,v 1.16.6.5 2006/03/23 00:24:10 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/templates/fetchmail/driver_select.inc
+++ mod/templates/fetchmail/driver_select.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 var loading;
 function driverSubmit()
@@ -17,7 +17,7 @@
 <form name="fm_driver" action="<?php echo $fetch_url ?>">
 <?php Util::pformInput() ?>
 <input type="hidden" name="actionID" value="fetchmail_create" />
-<select name="fm_driver" class="fixed" onchange="javascript:driverSubmit()">
+<select name="fm_driver" onchange="javascript:driverSubmit()">
   <option value=""><?php echo _("Select the mail server type") ?></option>
 <?php foreach (IMP_Fetchmail::listDrivers() as $key => $val): ?>
   <option value="<?php echo $key ?>"><?php echo htmlspecialchars($val) ?></option>


--- orig/scripts/custom_login.php
+++ mod/scripts/custom_login.php
@@ -1,5 +1,5 @@
 <?php
-// $Horde: imp/scripts/custom_login.php,v 1.6.10.1 2005/01/11 16:26:27 jan Exp $
+// $Horde: imp/scripts/custom_login.php,v 1.6.10.2 2005/10/18 12:14:06 jan Exp $
 
 // CUSTOMIZE THIS
 define('IMP_BASE', '..');
@@ -20,8 +20,6 @@
 $server_value = $servers[$server_key]['server'];
 $protocol_value = $servers[$server_key]['protocol'];
 $port_value = $servers[$server_key]['port'];
-$folders_value = $servers[$server_key]['folders'];
-$namespace_value = $servers[$server_key]['namespace'];
 $maildomain_value = $servers[$server_key]['maildomain'];
 $realm_value = $servers[$server_key]['realm'];
 $url = '/';
@@ -36,8 +34,6 @@
 <input type="hidden" name="server" value="<?php echo $server_value ?>" />
 <input type="hidden" name="protocol" value="<?php echo $protocol_value ?>" />
 <input type="hidden" name="port" value="<?php echo $port_value ?>" />
-<input type="hidden" name="folders" value="<?php echo $folders_value ?>" />
-<input type="hidden" name="namespace" value="<?php echo $namespace_value ?>" />
 <input type="hidden" name="maildomain" value="<?php echo $maildomain_value ?>" />
 <input type="hidden" name="realm" value="<?php echo $realm_value ?>" />
 <input type="hidden" name="url" value="<?php echo $url ?>" />


--- orig/lib/api.php
+++ mod/lib/api.php
@@ -5,7 +5,7 @@
  * This file defines IMP's external API interface. Other applications
  * can interact with IMP through this API.
  *
- * $Horde: imp/lib/api.php,v 1.94.10.10 2005/08/13 17:15:55 slusarz Exp $
+ * $Horde: imp/lib/api.php,v 1.94.10.13 2006/03/20 04:39:45 slusarz Exp $
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -13,6 +13,10 @@
  * @package IMP
  */
 
+$_services['perms'] = array(
+    'args' => array(),
+    'type' => '{urn:horde}stringArray');
+
 $_services['authenticate'] = array(
     'args' => array('userID' => 'string', 'credentials' => '{urn:horde}hash', 'params' => '{urn:horde}hash'),
     'checkperms' => false,
@@ -30,7 +34,7 @@
 );
 
 $_services['batchCompose'] = array(
-    'args' => array('args', 'extra'),
+    'args' => array('args' => '{urn:horde}hash', 'extra' => '{urn:horde}hash'),
     'type' => 'string'
 );
 
@@ -44,6 +48,11 @@
     'type' => 'string'
 );
 
+$_services['server'] = array(
+    'args' => array(),
+    'type' => 'string'
+);
+
 if (!empty($_SESSION['imp']['admin'])) {
     $_services['userList'] = array(
         'type' => '{urn:horde}stringArray'
@@ -59,6 +68,20 @@
 }
 
 
+function _imp_perms()
+{
+    $perms = array();
+
+    $perms['tree']['imp']['create_folders'] = false;
+    $perms['title']['imp:create_folders'] = _("Allow Folder Creation?");
+    $perms['type']['imp:create_folders'] = 'boolean';
+    $perms['tree']['imp']['max_folders'] = false;
+    $perms['title']['imp:max_folders'] = _("Maximum Number of Folders");
+    $perms['type']['imp:max_folders'] = 'int';
+
+    return $perms;
+}
+
 /**
  * TODO
  *
@@ -76,7 +99,7 @@
     if (!empty($params['server'])) {
         $server = $params['server'];
     } else {
-        require_once IMP_BASE . '/config/servers.php';
+        require IMP_BASE . '/config/servers.php';
         foreach ($servers as $key => $curServer) {
             if (!isset($server) && substr($key, 0, 1) != '_') {
                 $server = $key;
@@ -182,7 +205,7 @@
 
     if (IMP::checkAuthentication(OP_HALFOPEN, true) === true) {
         if ($_SESSION['imp']['base_protocol'] == 'pop3') {
-            
+
             $result = array('INBOX' => array('val' => 'INBOX', 'label' => 'INBOX', 'abbrev' => 'INBOX'));
         } else {
             require_once IMP_BASE . '/lib/Folder.php';
@@ -208,16 +231,27 @@
     require_once dirname(__FILE__) . '/base.php';
     require_once IMP_BASE . '/lib/Folder.php';
 
-    $foldername = IMP::addPreambleString($folder);
     $result = false;
 
     if (IMP::checkAuthentication(OP_HALFOPEN, true) === true) {
         $imp_folder = &IMP_Folder::singleton();
-        $result = $imp_folder->create($foldername,
-                                      $GLOBALS['prefs']->getValue('subscribe'));
+        $result = $imp_folder->create($folder, $GLOBALS['prefs']->getValue('subscribe'));
     }
 
-    return (empty($result)) ? '' : $foldername;
+    return (empty($result)) ? '' : $folder;
+}
+
+/**
+ * Returns the currently logged on IMAP server.
+ *
+ * @return string  The server hostname.  Returns null if the user has not
+ *                 authenticated into IMP yet.
+ */
+function _imp_server()
+{
+    $GLOBALS['authentication'] = 'none';
+    require_once dirname(__FILE__) . '/base.php';
+    return (IMP::checkAuthentication(OP_HALFOPEN, true) === true) ? $_SESSION['imp']['server'] : null;
 }
 
 /**


--- orig/lib/Search.php
+++ mod/lib/Search.php
@@ -1,11 +1,49 @@
 <?php
+
+/* Defines used to determine what kind of field query we are dealing with. */
+define('IMP_SEARCH_HEADER', 1);
+define('IMP_SEARCH_BODY', 2);
+define('IMP_SEARCH_DATE', 3);
+define('IMP_SEARCH_TEXT', 4);
+
+/* Defines used to identify the flag input. */
+define('IMP_SEARCH_FLAG_SEEN', 1);
+define('IMP_SEARCH_FLAG_ANSWERED', 2);
+define('IMP_SEARCH_FLAG_FLAGGED', 3);
+define('IMP_SEARCH_FLAG_DELETED', 4);
+
+/* Defines used to identify whether to show unsubscribed folders. */
+define('IMP_SEARCH_SHOW_UNSUBSCRIBED', 0);
+define('IMP_SEARCH_SHOW_SUBSCRIBED_ONLY', 1);
+
 /**
- * The IMP_Search:: class contains all functions related to handling
- * searching mailboxes in IMP.
+ * The IMP_Search:: class contains all code related to mailbox searching
+ * in IMP.
+ *
+ * The class uses the $_SESSION['imp']['search'] variable to store information
+ * across page accesses. The format of that entry is as follows:
+ *
+ * $_SESSION['imp']['search'] = array(
+ *     'q' => array(
+ *         'id_1' => array(
+ *             'query' => IMAP_Search_Query object (serialized),
+ *             'folders' => array (List of folders to search),
+ *             'uiinfo' => array (Info used by search.php to render page),
+ *             'label' => string (Description of search),
+ *             'vfolder' => boolean (True if this is a Virtual Folder)
+ *         ),
+ *         'id_2' => array(
+ *             ....
+ *         ),
+ *         ....
+ *     ),
+ *     'vtrash_id' => string (The Virtual Trash query ID),
+ *     'vinbox_id' => string (The Virtual Inbox query ID)
+ * );
  *
- * $Horde: imp/lib/Search.php,v 1.37.10.8 2005/07/31 05:52:44 slusarz Exp $
+ * $Horde: imp/lib/Search.php,v 1.37.10.28 2006/03/22 21:12:50 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -17,85 +55,127 @@
 class IMP_Search {
 
     /**
+     * The ID of the current search query in use.
+     *
+     * @var string
+     */
+    var $_id = null;
+
+    /**
+     * The IMP_Tree:: object to update.
+     *
+     * @var object
+     */
+    var $_imptree;
+
+    /**
+     * Save Virtual Folder information when adding entries?
+     *
+     * @var boolean
+     */
+    var $_saveVFolder = true;
+
+    /**
+     * Constructor.
+     *
+     * @param array $params  Available parameters:
+     * <pre>
+     * 'id'  --  The ID of the search query in use.
+     * </pre>
+     */
+    function IMP_Search($params = array())
+    {
+        if (!empty($params['id'])) {
+            $this->_id = $this->_strip($params['id']);
+        }
+    }
+
+    /**
+     * Set up IMP_Search variables for the current session.
+     */
+    function sessionSetup()
+    {
+        if (!isset($_SESSION['imp']['search'])) {
+            $_SESSION['imp']['search'] = array('q' => array());
+        }
+        foreach ($this->_getVFolderList() as $key => $val) {
+            if (!empty($val['vfolder']) &&
+                !$this->isVTrashFolder($key) &&
+                !$this->isVINBOXFolder($key)) {
+                $_SESSION['imp']['search']['q'][$key] = $val;
+                $this->_updateIMPTree('add', $key, $val['label']);
+            }
+        }
+        $this->createVINBOXFolder();
+        $this->createVTrashFolder();
+    }
+
+    /**
      * Run a search.
      *
      * @param IMAP_Search_Query &$ob  An optional search query to add (via
      *                                'AND') to the active search.
+     * @param string $id              The search query id to use (by default,
+     *                                will use the current ID set in the
+     *                                object).
      *
      * @return array  The sorted list.
      */
-    function runSearch(&$ob)
+    function runSearch(&$ob, $id = null)
     {
-        global $imp, $prefs;
-
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
         $mbox = '';
         $sorted = array();
-        $use_pop3 = ($imp['base_protocol'] == 'pop3');
+        $use_pop3 = ($_SESSION['imp']['base_protocol'] == 'pop3');
 
-        if (empty($imp['search']['query']) ||
-            empty($imp['search']['folders'])) {
-            return array();
+        if (empty($_SESSION['imp']['search']['q'][$id])) {
+            return $sorted;
+        }
+        $search = &$_SESSION['imp']['search']['q'][$id];
+
+        $charset = NLS::getCharset();
+        $search_params = array('pop3' => $use_pop3, 'charset' => $charset);
+
+        /* Check if the IMAP server supports searches in the current
+         * charset. */
+        if (empty($_SESSION['imp']['imap_server']['search_charset'][$charset])) {
+            $search_params['no_imap_charset'] = true;
         }
 
-        require_once 'Horde/IMAP/Search.php';
-        $imap_search = &IMAP_Search::singleton(array('pop3' => $use_pop3,
-                                                     'charset' => NLS::getCharset()));
+        require_once IMP_BASE . '/lib/IMAP/Search.php';
+        $imap_search = &IMP_IMAP_Search::singleton($search_params);
 
         /* Prepare the search query. */
         if (!empty($ob)) {
-            $old_query = unserialize($imp['search']['query']);
-            $query = &new IMAP_Search_Query();
+            $old_query = unserialize($search['query']);
+            $query = &new IMP_IMAP_Search_Query();
             $query->imapAnd(array($ob, $old_query));
         } else {
-            $query = unserialize($imp['search']['query']);
+            $query = unserialize($search['query']);
         }
 
         /* How do we want to sort results? */
-        $sortby = $prefs->getValue('sortby');
+        $sortby = $GLOBALS['prefs']->getValue('sortby');
         if ($sortby == SORTTHREAD) {
             $sortby = SORTDATE;
         }
-        $sortdir = $prefs->getValue('sortdir');
+        $sortdir = $GLOBALS['prefs']->getValue('sortdir');
 
-        /* Prepare the IMAP string. */
-        if ($use_pop3) {
-            $stream = &$imp['stream'];
-        } else {
-            require_once IMP_BASE . '/lib/IMAP.php';
-            $imp_imap = &IMP_IMAP::singleton();
-            $stream = $imp_imap->openIMAPStream(null, OP_READONLY);
-        }
-
-        if (!$stream) {
-            return $sorted;
-        }
-
-        for ($i = 0; $i < count($imp['search']['folders']); $i++) {
-            if (!$use_pop3) {
-                $mbox = IMP::serverString($imp['search']['folders'][$i]);
-            }
-
-            $results = $imap_search->searchSortMailbox($query, $stream, $mbox,
-                                                       $sortby, $sortdir);
+        foreach ($search['folders'] as $val) {
+            $results = $imap_search->searchSortMailbox($query, $_SESSION['imp']['stream'], $val, $sortby, $sortdir);
 
             if (is_array($results)) {
-                for ($j = 0; $j < count($results); $j++) {
-                    $sorted[] = $results[$j] . IMP_IDX_SEP .
-                        $imp['search']['folders'][$i];
+                foreach ($results as $val2) {
+                    $sorted[] = $val2 . IMP_IDX_SEP . $val;
                 }
             }
         }
 
-        /* Close connection if not POP3. */
-        if (!$use_pop3) {
-            @imap_close($stream);
-        }
-
         return $sorted;
     }
 
     /**
-     * Sets the IMAP search query in the IMP session.
+     * Creates the IMAP search query in the IMP session.
      *
      * @param IMAP_Search_Query $query  The search query object.
      * @param array $folders            The list of folders to search.
@@ -103,83 +183,477 @@
      *                                  search UI screen.
      * @param string $label             The label to use for the search
      *                                  results.
-     * @param string $id                The virtual folder id.
+     * @param string $id                The query id to use (or else one is
+     *                                  automatically generated).
+     *
+     * @return string  Returns the search query id.
      */
     function createSearchQuery($query, $folders, $search, $label, $id = null)
     {
-        $_SESSION['imp']['search'] = array(
+        $id = (is_null($id)) ? base_convert(microtime() . mt_rand(), 16, 36) : $this->_strip($id);
+        $_SESSION['imp']['search']['q'][$id] = array(
             'query' => serialize($query),
             'folders' => $folders,
-            'uiinfo' => serialize($search),
+            'uiinfo' => $search,
             'label' => $label,
-            'vfolder_id' => $id
+            'vfolder' => false
         );
+        return $id;
+    }
+
+    /**
+     * Deletes an IMAP search query.
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return string  Returns the search query id.
+     */
+    function deleteSearchQuery($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        $is_vfolder = !empty($_SESSION['imp']['search']['q'][$id]['vfolder']);
+        unset($_SESSION['imp']['search']['q'][$id]);
+
+        if ($is_vfolder) {
+            $vfolders = $this->_getVFolderList();
+            unset($vfolders[$id]);
+            $this->_saveVFolderList($vfolders);
+            $this->_updateIMPTree('delete', $id);
+        }
     }
 
     /**
      * Retrieves the previously stored search UI information.
      *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
      * @return array  The array necessary to rebuild the search UI page.
      */
-    function retrieveUIQuery()
+    function retrieveUIQuery($id = null)
     {
-        return (isset($GLOBALS['imp']['search']['uiinfo']))
-            ? unserialize($GLOBALS['imp']['search']['uiinfo'])
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return (isset($_SESSION['imp']['search']['q'][$id]['uiinfo']))
+            ? $GLOBALS['imp']['search']['q'][$id]['uiinfo']
             : array();
     }
 
     /**
      * Generates the label to use for search results.
      *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
      * @return string  The search results label.
      */
-    function searchLabel()
+    function getLabel($id = null)
     {
-        return $GLOBALS['imp']['search']['label'];
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return (isset($_SESSION['imp']['search']['q'][$id]['label']))
+            ? $GLOBALS['imp']['search']['q'][$id]['label']
+            : '';
     }
 
     /**
-     * Generates a URL with any necessary information required for handling a
-     * search mailbox added to the parameters.
+     * Obtains the list of virtual folders for the current user.
      *
-     * @param string $page     Page name to link to.
-     * @param string $mailbox  The mailbox to use on the linked page.
+     * @access private
      *
-     * @return string  URL to $page with any necessary search information
-     *                 added to the parameter list of the URL.
+     * @return array  The list of virtual folders.
      */
-    function generateSearchUrl($page, $mailbox)
+    function _getVFolderList()
     {
-        $link = Horde::applicationUrl($page);
+        $vfolder = $GLOBALS['prefs']->getValue('vfolder');
+        if (empty($vfolder)) {
+            return array();
+        }
 
-        foreach (IMP_Search::getSearchParameters($mailbox) as $key => $val) {
-            $link = Util::addParameter($link, $key, $val);
+        $vfolder = @unserialize($vfolder);
+        if (!is_array($vfolder)) {
+            return array();
         }
 
-        return $link;
+        $elt = reset($vfolder);
+        if (!isset($elt['ob'])) {
+            // Already in 4.1+ format.
+            return $vfolder;
+        }
+
+        // Convert from 4.0 format to 4.1+ format, if necessary
+        $convert = array();
+        foreach ($vfolder as $key => $val) {
+            $convert[$key] = array(
+                'query' => $val['ob'],
+                'folders' => $val['search']['folders'],
+                'uiinfo' => $val['search'],
+                'label' => $val['search']['vfolder_label'],
+                'vfolder' => true
+            );
+            unset($convert[$key]['search']['folders'], $convert[$key]['search']['vfolder_label']);
+        }
+        return $convert;
+    }
+
+    /**
+     * Saves the list of virtual folders for the current user.
+     *
+     * @access private
+     *
+     * @param array  The virtual folder list.
+     */
+    function _saveVFolderList($vfolder)
+    {
+        $GLOBALS['prefs']->setValue('vfolder', serialize($vfolder));
     }
 
     /**
-     * Returns a list of parameters necessary for handling a search mailbox.
+     * Add a virtual folder for the current user.
      *
-     * @param string $mailbox  The mailbox to use on the linked page.
+     * @param IMAP_Search_Query $query  The search query object.
+     * @param array $folders            The list of folders to search.
+     * @param array $search             The search array used to build the
+     *                                  search UI screen.
+     * @param string $label             The label to use for the search
+     *                                  results.
+     * @param string $id                The virtual folder id.
      *
-     * @return array  The list of parameters needed for handling a search
-     *                mailbox (may be empty if not currently in a search
-     *                mailbox).
+     * @return string  The virtual folder ID.
      */
-    function getSearchParameters($mailbox)
+    function addVFolder($query, $folders, $search, $label, $id = null)
     {
-        global $imp;
+        $id = $this->createSearchQuery($query, $folders, $search, $label, $id);
+        $_SESSION['imp']['search']['q'][$id]['vfolder'] = true;
+        if ($this->_saveVFolder) {
+            $vfolders = $this->_getVFolderList();
+            $vfolders[$id] = $_SESSION['imp']['search']['q'][$id];
+            $this->_saveVFolderList($vfolders);
+        }
+        $this->_updateIMPTree('add', $id, $label);
+        return $id;
+    }
 
-        $params = array();
+    /**
+     * Add a virtual trash folder for the current user.
+     */
+    function createVTrashFolder()
+    {
+        /* Delete the current Virtual Trash folder, if it exists. */
+        $vtrash_id = $GLOBALS['prefs']->getValue('vtrash_id');
+        if (!empty($vtrash_id)) {
+            $this->deleteSearchQuery($vtrash_id);
+        }
 
-        if ($imp['mailbox'] == IMP_SEARCH_MBOX) {
-            $params['thismailbox'] = $mailbox;
-            $params['mailbox'] = $imp['mailbox'];
+        if (!$GLOBALS['prefs']->getValue('use_vtrash')) {
+            return;
+        }
+
+        /* Create Virtual Trash with new folder list. */
+        require_once IMP_BASE . '/lib/Folder.php';
+        $imp_folder = &IMP_Folder::singleton();
+        $fl = $imp_folder->flist_IMP();
+        $flist = array();
+        foreach ($fl as $mbox) {
+            if (!empty($mbox['val'])) {
+                $flist[] = $mbox['val'];
+            }
         }
+        array_unshift($flist, 'INBOX');
 
-        return $params;
+        require_once IMP_BASE . '/lib/IMAP/Search.php';
+        $query = &new IMP_IMAP_Search_query();
+        $query->deleted(true);
+        $label = _("Virtual Trash");
+
+        $this->_saveVFolder = false;
+        if (empty($vtrash_id)) {
+            $vtrash_id = $this->addVFolder($query, $flist, array(), $label);
+            $GLOBALS['prefs']->setValue('vtrash_id', $vtrash_id);
+        } else {
+            $this->addVFolder($query, $flist, array(), $label, $vtrash_id);
+        }
+        $this->_saveVFolder = true;
+        $_SESSION['imp']['search']['vtrash_id'] = $vtrash_id;
+    }
+
+    /**
+     * Determines whether a virtual folder ID is the Virtual Trash Folder.
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return boolean  True if the virutal folder ID is the Virtual Trash
+     *                  folder.
+     */
+    function isVTrashFolder($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return ($id == $GLOBALS['prefs']->getValue('vtrash_id'));
+    }
+
+    /**
+     * Add a virtual INBOX folder for the current user.
+     */
+    function createVINBOXFolder()
+    {
+        /* Initialize IMP_Tree. */
+        require_once IMP_BASE . '/lib/IMAP/Tree.php';
+        $imptree = &IMP_Tree::singleton();
+
+        /* Delete the current Virtual Trash folder, if it exists. */
+        $vinbox_id = $GLOBALS['prefs']->getValue('vinbox_id');
+        if (!empty($vinbox_id)) {
+            $this->deleteSearchQuery($vinbox_id);
+        }
+
+        /* Create Virtual INBOX with nav_poll list. */
+        $fl = $imptree->getPollList();
+        $flist = array();
+        foreach (array_keys($fl) as $mbox) {
+            $flist[] = $mbox;
+        }
+
+        require_once IMP_BASE . '/lib/IMAP/Search.php';
+        $query = &new IMP_IMAP_Search_query();
+        $query->seen(false);
+        $query->deleted(false);
+        $label = _("Virtual INBOX");
+
+        $this->_saveVFolder = false;
+        if (empty($vinbox_id)) {
+            $vinbox_id = $this->addVFolder($query, $flist, array(), $label);
+            $GLOBALS['prefs']->setValue('vinbox_id', $vinbox_id);
+        } else {
+            $this->addVFolder($query, $flist, array(), $label, $vinbox_id);
+        }
+        $this->_saveVFolder = true;
+        $_SESSION['imp']['search']['vinbox_id'] = $vinbox_id;
+    }
+
+    /**
+     * Determines whether a virtual folder ID is the Virtual INBOX Folder.
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return boolean  True if the virutal folder ID is the Virtual INBOX
+     *                  folder.
+     */
+    function isVINBOXFolder($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return ($id == $GLOBALS['prefs']->getValue('vinbox_id'));
+    }
+
+    /**
+     * Is the current active folder an editable Virtual Folder?
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return boolean  True if the current folder is both a virtual folder
+     *                  and can be edited.
+     */
+    function isEditableVFolder($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return ($this->isVFolder($id) && !$this->isVTrashFolder($id) && !$this->isVINBOXFolder($id));
+    }
+
+    /**
+     * Return a list of IDs and query labels, sorted by the label.
+     *
+     * @param boolean $vfolder  If true, only return Virtual Folders?
+     *
+     * @return array  An array with the folder IDs as the key and the labels
+     *                as the value.
+     */
+    function listQueries($vfolder = false)
+    {
+        $vfolders = array();
+
+        foreach ($_SESSION['imp']['search']['q'] as $key => $val) {
+            if (!$vfolder || !empty($val['vfolder'])) {
+                $vfolders[$key] = $this->getLabel($key);
+            }
+        }
+        natcasesort($vfolders);
+
+        return $vfolders;
+    }
+
+    /**
+     * Get the list of searchable folders for the given search query.
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return array  The list of searchable folders.
+     */
+    function getSearchFolders($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return (isset($_SESSION['imp']['search']['q'][$id]['folders'])) ? $_SESSION['imp']['search']['q'][$id]['folders'] : array();
+    }
+
+    /**
+     * Returns a link to edit a given search query.
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @rerturn string  The URL to the search page.
+     */
+    function editURL($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return Util::addParameter(Horde::applicationUrl('search.php'), array('edit_query' => $id));
+    }
+
+    /**
+     * Returns a link to delete a given search query.
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return string  The URL to allow deletion of the search query.
+     */
+    function deleteURL($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return Util::addParameter(Horde::applicationUrl('folders.php'), array('actionID' => 'delete_search_query', 'queryid' => $id));
+    }
+
+    /**
+     * Is the given mailbox a search mailbox?
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return boolean  Whether the given mailbox name is a search mailbox.
+     */
+    function isSearchMbox($id = null)
+    {
+        return (is_null($id)) ? !empty($this->_id) : isset($_SESSION['imp']['search']['q'][$this->_strip($id)]);
+    }
+
+    /**
+     * Is the given mailbox a virtual folder?
+     *
+     * @param string $id  The search query id to use (by default, will use
+     *                    the current ID set in the object).
+     *
+     * @return boolean  Whether the given mailbox name is a virtual folder.
+     */
+    function isVFolder($id = null)
+    {
+        $id = (is_null($id)) ? $this->_id : $this->_strip($id);
+        return (!empty($_SESSION['imp']['search']['q'][$id]['vfolder']));
+    }
+
+    /**
+     * Get the ID for the search mailbox, if we are currently in a search
+     * mailbox.
+     *
+     * @return mixed  The search ID if in a mailbox, else false.
+     */
+    function searchMboxID()
+    {
+        return (!is_null($this->_id)) ? $this->_id : false;
+    }
+
+    /**
+     * Strip the identifying label from a mailbox ID.
+     *
+     * @access private
+     *
+     * @param string $id  The mailbox query ID.
+     *
+     * @return string  The virtual folder ID, with any IMP specific identifying
+     *                 information stripped off.
+     */
+    function _strip($id)
+    {
+        return (strpos($id, IMP_SEARCH_MBOX) === 0) ? substr($id, strlen(IMP_SEARCH_MBOX)) : $id;
+    }
+
+    /**
+     * Return the base search fields.
+     *
+     * @return array  The base search fields.
+     */
+    function searchFields()
+    {
+        return array(
+            'from' => array(
+                'label' => _("From"),
+                'type' => IMP_SEARCH_HEADER
+            ),
+            'to' => array(
+                'label' => _("To"),
+                'type' => IMP_SEARCH_HEADER
+            ),
+            'cc' => array(
+                'label' => _("Cc"),
+                'type' => IMP_SEARCH_HEADER
+            ),
+            'bcc' => array(
+                'label' => _("Bcc"),
+                'type' => IMP_SEARCH_HEADER
+            ),
+            'subject' => array(
+                'label' => _("Subject"),
+                'type' => IMP_SEARCH_HEADER
+            ),
+            'body' => array(
+               'label' => _("Body"),
+               'type' => IMP_SEARCH_BODY
+            ),
+            'text' => array(
+               'label' => _("Entire Message"),
+               'type' => IMP_SEARCH_TEXT
+            ),
+            'received_on' => array(
+                'label' => _("Received On"),
+                'type' => IMP_SEARCH_DATE
+            ),
+            'received_until' => array(
+                'label' => _("Received Until"),
+                'type' => IMP_SEARCH_DATE
+            ),
+            'received_since' => array(
+                'label' => _("Received Since"),
+                'type' => IMP_SEARCH_DATE
+            )
+        );
+    }
+
+    /**
+     * Update IMAP_Tree object.
+     *
+     * @access private
+     *
+     * @param string $action  Either 'delete' or 'add'.
+     * @param string $id      The query ID to update.
+     * @param string $label   If $action = 'add', the label to use for the
+     *                        query ID.
+     */
+    function _updateIMPTree($action, $id, $label = null)
+    {
+        if (empty($this->_imptree)) {
+            require_once IMP_BASE . '/lib/IMAP/Tree.php';
+            $this->_imptree = &IMP_Tree::singleton();
+        }
+
+        switch ($action) {
+        case 'delete':
+            $this->_imptree->delete($id);
+            break;
+
+        case 'add':
+            $this->_imptree->insertVFolders(array($id => $label));
+            break;
+        }
     }
 
 }


--- orig/redirect.php
+++ mod/redirect.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/redirect.php,v 1.116.2.6 2005/09/01 12:06:54 jan Exp $
+ * $Horde: imp/redirect.php,v 1.116.2.11 2006/02/03 19:20:11 slusarz Exp $
  *
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -29,10 +29,10 @@
         /* Force the initial page to IMP if we're logging in to compose a
          * message. */
         if ($actionID == 'login_compose') {
-            $url = Util::addParameter($url, 'url', IMP::getInitialUrl('login_compose', false));
+            $url = Util::addParameter($url, 'url', IMP_Session::getInitialUrl('login_compose', false));
         }
     } else {
-        $url = IMP::getInitialUrl($actionID, false);
+        $url = IMP_Session::getInitialUrl($actionID, false);
         if ($isLogin) {
             /* Don't show popup window in initial page. */
             $url = Util::addParameter($url, 'no_newmail_popup', 1, false);
@@ -64,6 +64,7 @@
 $authentication = 'none';
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Session.php';
+require_once 'Horde/Maintenance.php';
 
 $actionID = (Util::getFormData('action') == 'compose') ? 'login_compose' : Util::getFormData('actionID');
 $autologin = Util::getFormData('autologin');
@@ -72,43 +73,41 @@
 $isLogin = IMP::loginTasksFlag();
 
 /* If we are returning from Maintenance processing. */
-if (!$isLogin) {
-    require_once 'Horde/Maintenance.php';
-    if (Util::getFormData(MAINTENANCE_DONE_PARAM)) {
-        /* Finish up any login tasks we haven't completed yet. */
-        IMP_Session::loginTasks();
+if (Util::getFormData(MAINTENANCE_DONE_PARAM)) {
+    /* Finish up any login tasks we haven't completed yet. */
+    IMP_Session::loginTasks();
 
-        _redirect(_framesetUrl(_newSessionUrl($actionID, $isLogin)));
-    }
+    _redirect(_framesetUrl(_newSessionUrl($actionID, $isLogin)));
 }
 
 /* If we already have a session: */
 if (isset($_SESSION['imp']) && is_array($_SESSION['imp'])) {
     /* Make sure that if a username was specified, it is the current
      * username. */
-    if ((is_null($imapuser) || ($imapuser == $_SESSION['imp']['user'])) &&
-        (is_null($pass) || ($pass == Secret::read(Secret::getKey('imp'), $_SESSION['imp']['pass'])))) {
-
-        IMP_Session::loginTasks();
-
-        $url = Util::getFormData('url');
-        if (empty($url)) {
-            $url = IMP::getInitialUrl($actionID, false);
-        } elseif (!empty($actionID)) {
-            $url = Util::addParameter($url, 'actionID', $actionID, false);
-        }
-
-        /* Don't show popup window in initial page. */
-        if ($isLogin) {
-            $url = Util::addParameter($url, 'no_newmail_popup', 1, false);
-        }
+    if (($imapuser !== null && ($imapuser == $_SESSION['imp']['user'])) &&
+        ($pass !== null && ($pass == Secret::read(Secret::getKey('imp'), $_SESSION['imp']['pass'])))) {
 
-        _redirect(_framesetUrl($url));
-    } else {
         /* Disable the old session. */
         unset($_SESSION['imp']);
         _redirect(Auth::addLogoutParameters(IMP::logoutUrl(), AUTH_REASON_FAILED));
     }
+
+    /* Finish up any login tasks we haven't completed yet. */
+    IMP_Session::loginTasks();
+
+    $url = Util::getFormData('url');
+    if (empty($url)) {
+        $url = IMP_Session::getInitialUrl($actionID, false);
+    } elseif (!empty($actionID)) {
+        $url = Util::addParameter($url, 'actionID', $actionID, false);
+    }
+
+    /* Don't show popup window in initial page. */
+    if ($isLogin) {
+        $url = Util::addParameter($url, 'no_newmail_popup', 1, false);
+    }
+
+    _redirect(_framesetUrl($url));
 }
 
 /* Create a new session if we're given the proper parameters. */
@@ -127,17 +126,20 @@
         $sessArray = $servers[$server_key];
     }
 
+    /* If we're not using hordeauth get parameters altered from the defaults
+     * from the form data. */
     if (empty($autologin)) {
-        foreach (array('server', 'port', 'protocol', 'folders') as $val) {
+        foreach (array('server', 'port', 'protocol', 'folders', 'smtphost', 'smtpport') as $val) {
             $data = Util::getFormData($val);
             if (!empty($data)) {
                 $sessArray[$val] = $data;
             }
         }
     } else {
-        if (!empty($sessArray['hordeauth']) &&
-            strcasecmp($sessArray['hordeauth'], 'full') == 0) {
-            $imapuser = Auth::getAuth();
+        if (!empty($sessArray['hordeauth'])) {
+            if (strcasecmp($sessArray['hordeauth'], 'full') == 0) {
+                $imapuser = Auth::getAuth();
+            }
         } else {
             $entry = sprintf('Invalid server key "%s" from client [%s]', $server_key, $_SERVER['REMOTE_ADDR']);
             Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO);
@@ -165,9 +167,7 @@
         $url = Auth::addLogoutParameters(IMP::logoutUrl());
     }
 
-    $url = _framesetUrl($url);
-
-    _redirect($url);
+    _redirect(_framesetUrl($url));
 }
 
 /* No session, and no login attempt. Just go to the login page. */


--- orig/test.php
+++ mod/test.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * $Horde: imp/test.php,v 1.33.6.4 2005/04/11 14:37:22 chuck Exp $
+ * $Horde: imp/test.php,v 1.33.6.9 2006/02/26 22:40:44 slusarz Exp $
  *
- * Copyright 2002-2005 Brent J. Nordquist <bjn at horde.org>
- * Copyright 1999-2005 Charles J. Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 2002-2006 Brent J. Nordquist <bjn at horde.org>
+ * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (LGPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
@@ -104,6 +104,10 @@
     'HTTP_Request' => array(
         'path' => 'HTTP/Request.php',
         'error' => 'The HTML composition mode requires HTTP_Request.'
+    ),
+    'Auth_SASL' => array(
+        'path' => 'Auth/SASL.php',
+        'error' => 'If your IMAP server uses CRAM-MD5 or DIGEST-MD5 authentication, this module is required.'
     )
 );
 
@@ -135,7 +139,7 @@
     <?php echo $pear_output ?>
 </ul>
 
-<h1>PHP IMAP Support Test</h1>
+<h1>PHP Mail Server Support Test</h1>
 <?php
 
 $server = isset($_POST['server']) ? $_POST['server'] : '';
@@ -178,11 +182,19 @@
                 echo '<font color="green">SUCCESS</font> - INBOX has ', $minfo->Nmsgs, ' messages (' . $minfo->Unread, ' new ', $minfo->Recent, ' recent)';
                 $success[] = array('server' => $server, 'protocol' => $key, 'port' => $server_port);
             } else {
-                echo '<font color="red">ERROR</font> - The server returned the following error message:' . "\n" . '<pre>'; print_r(imap_errors()); echo '</pre>';
+                echo '<font color="red">ERROR</font> - The server returned the following error message:' . "\n" . '<pre>';
+                foreach (imap_errors() as $error) {
+                    echo wordwrap($error);
+                }
+                echo '</pre>';
             }
             @imap_close($mbox);
         } else {
-            echo '<font color="red">ERROR</font> - The server returned the following error message:' . "\n" . '<pre>'; print_r(imap_errors()); echo '</pre>';
+            echo '<font color="red">ERROR</font> - The server returned the following error message:' . "\n" . '<pre>';
+            foreach (imap_errors() as $error) {
+                echo wordwrap($error);
+            }
+            echo '</pre>';
         }
         echo "</blockquote>\n</li></ul>\n";
     }
@@ -191,14 +203,55 @@
         echo "<strong>The following configurations were successful and may be used in your imp/config/servers.php file:</strong>\n";
         $i = 1;
         foreach ($success as $val) {
-            echo "<blockquote><em>Configuration " . $i++ . "</em><pre>";
+            echo "<blockquote><em>Configuration " . $i++ . "</em><blockquote><pre>";
             foreach ($val as $key => $entry) {
                 echo "'" . $key . "' => '" . $entry . "'\n";
             }
-            echo "</pre></blockquote>\n";
+            echo "</blockquote></pre></blockquote>\n";
+        }
+
+        if ($type == 'imap') {
+            echo "<strong>The following IMAP server information was discovered from the remote server:</strong>\n";
+            $config = reset($success);
+            require_once './lib/IMAP/Client.php';
+            $imapclient = &new IMP_IMAPClient($config['server'], $config['port'], $config['protocol']);
+            $use_tls = $imapclient->useTLS();
+            if (!is_a($use_tls, 'PEAR_Error')) {
+                $res = $imapclient->login($user, $passwd);
+            }
+            if (isset($res) && !is_a($res, 'PEAR_Error')) {
+                echo "<blockquote><em>Namespace Information</em><pre><blockquote>";
+                $namespace = $imapclient->namespace();
+                if (is_array($namespace)) {
+                    foreach ($namespace as $val) {
+                        echo "NAMESPACE: \"" . $val['name'] . "\"\n";
+                        echo "DELIMITER: " . $val['delimiter'] . "\n";
+                        echo "TYPE: " . $val['type'] . "\n\n";
+                    }
+                } else {
+                    echo "Could not retrieve namespace information from IMAP server.\n";
+                }
+                echo "</blockquote></pre></blockquote>\n";
+
+                echo "<blockquote><em>IMAP CHILDREN support:</em><pre><blockquote>";
+                echo ($imapclient->queryCapability('CHILDREN')) ? 'SUPPORTED' : 'Not supported';
+                echo "</blockquote></pre></blockquote>\n";
+
+                echo "<blockquote><em>IMAP Charset Search Support:</em><pre><blockquote>";
+                $charset = NLS::getCharset();
+                if ($imapclient->searchCharset($charset)) {
+                    echo "Server supports searching with the $charset character set.\n";
+                } else {
+                    echo "Server does not support searching with the $charset character set.\n";
+                }
+                echo "</blockquote></pre></blockquote>\n";
+                $imapclient->logout();
+            } else {
+                echo "<blockquote><em>Could not retrieve IMAP information from the remote server.</em></blockquote>";
+            }
         }
     } else {
-        echo "<strong>Could not determine a successful connection protocol.  Make sure your IMAP server is running and you have specified the correct port.</strong>\n";
+        echo "<strong>Could not determine a successful connection protocol.  Make sure your mail server is running and you have specified the correct port.</strong>\n";
     }
 } else {
     ?>


--- orig/contacts.php
+++ mod/contacts.php
@@ -1,30 +1,26 @@
 <?php
 /**
- * $Horde: imp/contacts.php,v 2.67.10.3 2005/05/12 20:19:36 chuck Exp $
+ * $Horde: imp/contacts.php,v 2.67.10.6 2006/04/10 05:03:42 slusarz Exp $
  *
- * Copyright 2002-2005 Marcus I. Ryan <marcus at riboflavin.net>
+ * Copyright 2002-2006 Marcus I. Ryan <marcus at riboflavin.net>
  *
  * See the enclosed file COPYING for license information (GPL).  If you did
  * not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
 @define('IMP_BASE', dirname(__FILE__));
+$authentication = 'horde';
 require_once IMP_BASE . '/lib/base.php';
 
 /* Get the lists of address books through the API. */
 $source_list = $registry->call('contacts/sources');
 
-/* If we self-submitted, use that source. Otherwise, choose a good source. */
-if (!($source = Util::getFormData('source'))) {
-    /* The most likely personal address book is the one we add to. */
-    $source = $prefs->getValue('add_source');
-    if (!$source) {
-        /* If we can't/don't add, do we search?  If so take the first. */
-        $search_sources = $prefs->getValue('search_sources');
-        $source = (!empty($search_sources)) ? $search_sources[0] : '';
-    }
-}
+/* If we self-submitted, use that source. Otherwise, choose a good
+ * source. */
+$source = Util::getFormData('source');
 if (empty($source) || !isset($source_list[$source])) {
+    /* We don't just pass the second argument to getFormData() because
+     * we want to trap for invalid sources, not just no source. */
     $source = key($source_list);
 }
 


--- orig/locale/hu_HU/help.xml
+++ mod/locale/hu_HU/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- $Horde: imp/locale/hu_HU/help.xml,v 1.8.6.1 2005/01/25 22:05:53 jan Exp $ -->
+<!-- $Horde: imp/locale/hu_HU/help.xml,v 1.8.6.5 2006/03/23 00:24:11 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Levélírás: funkciógombok</title>
@@ -335,6 +335,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Keresés a levelek között</title>
     <heading>A keresés módja</heading>
@@ -819,6 +825,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -837,6 +849,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this.
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -866,4 +893,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/lib/Folder.php
+++ mod/lib/Folder.php
@@ -3,10 +3,10 @@
  * The IMP_Folder:: class provides a set of methods for dealing with folders,
  * accounting for subscription, errors, etc.
  *
- * $Horde: imp/lib/Folder.php,v 1.130.10.12 2005/09/14 15:54:14 jan Exp $
+ * $Horde: imp/lib/Folder.php,v 1.130.10.37 2006/03/28 22:25:05 slusarz Exp $
  *
- * Copyright 2000-2005 Chuck Hagenbuch <chuck at horde.org>
- * Copyright 2000-2005 Jon Parise <jon at csh.rit.edu>
+ * Copyright 2000-2006 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 2000-2006 Jon Parise <jon at csh.rit.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you did not
  * receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -74,39 +74,35 @@
      *                associative array containing three values: 'val', with
      *                entire folder name after the server specification;
      *                'label', with the full-length folder name meant for
-     *                display ($prefix has been stripped off, etc); and
-     *                'abbrev', containing a shortened (26 characters max)
-     *                label for display in situations where space is short.
+     *                display and 'abbrev', containing a shortened (26
+     *                characters max) label for display in situations where
+     *                space is short.
      */
     function flist($sub = false, $filter = array())
     {
-        global $conf, $imp, $notification;
+        global $conf, $notification;
 
-        $list = array();
-
-        $prefix = $imp['folders'];
-        $hierarchies = $imp['hierarchies'];
-        $namespace = $imp['namespace'];
+        $inbox_entry = array('INBOX' => array('val' => 'INBOX', 'label' => _("Inbox"), 'abbrev' => _("Inbox")));
 
-        /* Make sure we're requesting all folders. */
-        $folders = $prefix . '*';
+        if ($_SESSION['imp']['base_protocol'] == 'pop3') {
+            return $inbox_entry;
+        }
 
-        /* Figure out which list command to use. */
-        $listcmd = ($sub) ? 'imap_lsub' : 'imap_list';
+        $list = array();
+        $subidx = intval($sub);
 
         /* Compute values that will uniquely identify this list. */
-        $signature = md5(serialize(array($listcmd, $folders)));
-        $full_signature = md5(serialize(array($listcmd, $prefix, $filter, $hierarchies, $namespace)));
+        $full_signature = md5(serialize(array($subidx, $filter)));
 
         /* Either get the list from the cache, or go to the IMAP server to
            obtain it. */
         if ($conf['server']['cache_folders']) {
             require_once 'Horde/SessionObjects.php';
             $sessionOb = &Horde_SessionObjects::singleton();
-            if (!isset($imp['cache']['folder_cache'])) {
-                $imp['cache']['folder_cache'] = array();
+            if (!isset($_SESSION['imp']['cache']['folder_cache'])) {
+                $_SESSION['imp']['cache']['folder_cache'] = array();
             }
-            $folder_cache = &$imp['cache']['folder_cache'];
+            $folder_cache = &$_SESSION['imp']['cache']['folder_cache'];
             if (isset($folder_cache[$full_signature])) {
                 $data = $sessionOb->query($folder_cache[$full_signature]);
                 if ($data) {
@@ -115,116 +111,64 @@
             }
         }
 
-        if (isset($this->_listCache[$signature])) {
-            $mailboxes = $this->_listCache[$signature];
+        if (isset($this->_listCache[$subidx])) {
+            $maildelim = $this->_listCache[$subidx]['d'];
+            $mailsort = $this->_listCache[$subidx]['s'];
         } else {
-            $server = IMP::serverString();
-            if (!($mailboxes = $listcmd($imp['stream'], $server, $folders))) {
-                $mailboxes = array();
-            }
-
-            if (is_array($hierarchies)) {
-                foreach ($hierarchies as $val) {
-                    $hboxes = $listcmd($imp['stream'], $server, $val . '*');
-                    if (is_array($hboxes)) {
-                        $mailboxes = array_merge($mailboxes, $hboxes);
-                    }
+            $maildelim = $mailsort = array();
+            foreach ($this->_listFolders($sub) as $val) {
+                /* Strip off the prefix only if we are dealing with a personal
+                 * namespace. */
+                $label = $stripped = substr($val, strpos($val, '}') + 1);
+                $ns_info = IMP::getNamespace($label);
+                if ($ns_info['type'] == 'personal') {
+                    $label = substr($label, strlen($ns_info['name']));
                 }
-            }
-
-            /* Strip the server prefix from the list of mailboxes. */
-            if (!empty($mailboxes)) {
-                $new_mboxes = array();
-                $namespace_len = strlen($namespace);
-                $prefix_len = strlen($prefix);
-                $pos = strpos($mailboxes[0], '}') + 1;
-
-                foreach ($mailboxes as $val) {
-                    $label = $stripped = substr($val, $pos);
-                    if (substr($label, 0, $prefix_len) == $prefix) {
-                        $label = substr($label, $prefix_len);
-                    }
-                    if (substr($label, 0, $namespace_len) == $namespace) {
-                        $label = substr($label, $namespace_len);
-                    }
-                    $new_mboxes[$label] = $stripped;
+                if (strcasecmp('INBOX', $label) == 0) {
+                    continue;
                 }
-
-                $mailboxes = $new_mboxes;
+                $maildelim[$stripped] = $ns_info['delimiter'];
+                $mailsort[$stripped] = $label;
             }
-            $this->_listCache[$signature] = $mailboxes;
+            $this->_listCache[$subidx] = array('d' => $maildelim, 's' => $mailsort);
         }
 
-        if ($imp['base_protocol'] != 'pop3' && !empty($mailboxes)) {
-            $parents = $seen = array();
-
-            require_once 'Horde/IMAP/Sort.php';
-            $imap_mailboxes = &new IMAP_Sort($GLOBALS['imp']['delimiter']);
-            $imap_mailboxes->sortMailboxesByKey($mailboxes);
-
-            foreach ($mailboxes as $label => $mailbox) {
-                if (empty($seen[$mailbox])) {
-                    $seen[$mailbox] = true;
-
-                    if (!($decoded_mailbox = String::convertCharset($mailbox, 'UTF7-IMAP'))) {
-                        if (empty($this->_errorCache[$mailbox])) {
-                            $notification->push(sprintf(_("The folder \"%s\" contains illegal characters in its name. It may cause problems. Please see your system administrator."), $label), 'horde.warning');
-                            $this->_errorCache[$mailbox] = true;
-                        }
-                    }
-
-                    /* Ignore INBOX, since we always tack it on first. */
-                    if (strcmp($prefix . 'INBOX', $mailbox) != 0) {
-                        $parts = explode($imp['delimiter'], $label);
-                        $subfolder = array_pop($parts);
-                        $parentparts = $parts;
-                        $pstack = array();
-
-                        while ($i = count($parentparts)) {
-                            $parent = implode($imp['delimiter'], $parentparts);
-                            if (!empty($parent) &&
-                                ($parent != 'INBOX') &&
-                                !isset($list[$parent]) &&
-                                !isset($list[$prefix . $namespace . $parent]) &&
-                                !isset($parents[$parent])) {
-                                $parents[$parent] = true;
-                                $plabel = str_repeat(' ', 4 * ($i - 1)) . String::convertCharset($parts[($i - 1)], 'UTF7-IMAP');
-                                if (strlen($plabel) > 26) {
-                                    $pabbrev = String::substr($plabel, 0, 10) . '...' . String::substr($plabel, -13, 13);
-                                } else {
-                                    $pabbrev = $plabel;
-                                }
-                                $pstack[$parent] = array('val' => '', 'label' => $plabel, 'abbrev' => $pabbrev);
-                            }
-                            array_pop($parentparts);
-                        }
-
-                        if (count($pstack)) {
-                            $pstack = array_reverse($pstack);
-                            foreach ($pstack as $pkey => $pval) {
-                                $list[$pkey] = $pval;
-                            }
-                        }
-
-                        $folded = str_repeat(' ', 4 * count($parts)) . String::convertCharset($subfolder, 'UTF7-IMAP');
+        if (!empty($mailsort)) {
+            // TODO: Fix use of delimiter here
+            require_once IMP_BASE . '/lib/IMAP/Sort.php';
+            $delimiter = reset($_SESSION['imp']['namespace']);
+            $imap_sort = &new IMP_IMAP_Sort($delimiter['delimiter']);
+            $imap_sort->sortMailboxes($mailsort, true, true);
+
+            foreach ($mailsort as $mbox_name => $label) {
+                if (in_array($mbox_name, $filter)) {
+                    continue;
+                }
 
-                        if (strlen($folded) > 26) {
-                            $abbrev = String::substr($folded, 0, 10) . '...' . String::substr($folded, -13, 13);
-                        } else {
-                            $abbrev = $folded;
-                        }
+                if (!($decoded_mailbox = String::convertCharset($mbox_name, 'UTF7-IMAP')) &&
+                    empty($this->_errorCache[$mbox_name])) {
+                    $notification->push(sprintf(_("The folder \"%s\" contains illegal characters in its name. It may cause problems. Please see your system administrator."), $label), 'horde.warning');
+                    $this->_errorCache[$mbox_name] = true;
+                }
 
-                        if (($imp['dotfiles'] || (strlen($label) > 0 && ($label[0] != '.' && !strstr($label, $imp['delimiter'] . '.'))))
-                            && !in_array($mailbox, $filter)) {
-                            $list[$mailbox] = array('val' => $mailbox, 'label' => $folded, 'abbrev' => $abbrev);
+                $parts = ($maildelim[$mbox_name]) ? explode($maildelim[$mbox_name], $label) : array($label);
+                $partcount = count($parts);
+                for ($i = 1; $i <= $partcount; $i++) {
+                    $item = implode($maildelim[$mbox_name], array_slice($parts, 0, $i));
+                    if (!isset($list[$item])) {
+                        $abbrev = $folded = str_repeat(' ', 4 * ($i - 1)) . String::convertCharset($parts[($i - 1)], 'UTF7-IMAP');
+                        if (strlen($abbrev) > 26) {
+                            $abbrev = String::substr($abbrev, 0, 10) . '...' . String::substr($abbrev, -13, 13);
                         }
+                        $list[$item] = array('val' => ($i == $partcount) ? $mbox_name : '', 'label' => $folded, 'abbrev' => $abbrev);
                     }
                 }
             }
         }
 
+        /* Add the INBOX on top of list if not in the filter list. */
         if (!in_array('INBOX', $filter)) {
-            array_unshift($list, array('val' => 'INBOX', 'label' => _("Inbox"), 'abbrev' => _("Inbox")));
+            $list = $inbox_entry + $list;
         }
 
         /* Save in cache, if needed. */
@@ -263,25 +207,25 @@
      */
     function delete($folder_array, $subscribe)
     {
-        global $conf, $imp, $notification;
+        global $conf, $notification;
 
         $server = IMP::serverString();
         $return_value = true;
         $deleted = array();
 
         if ($subscribe) {
-            $subscribed_folders = imap_listsubscribed($imp['stream'], $server, '*');
+            $sub_folders = $this->_listFolders(true);
         }
 
         foreach ($folder_array as $folder) {
-            if (!imap_deletemailbox($imp['stream'], $server . $folder)) {
+            if (!imap_deletemailbox($_SESSION['imp']['stream'], $server . $folder)) {
                 $notification->push(sprintf(_("The folder \"%s\" was not deleted. This is what the server said"), IMP::displayFolder($folder)) .
                                     ': ' . imap_last_error(), 'horde.error');
                 $return_value = false;
             } else {
                 if ($subscribe &&
-                    in_array($server . $folder, $subscribed_folders) &&
-                    !imap_unsubscribe($imp['stream'], $server . $folder)) {
+                    in_array($server . $folder, $sub_folders) &&
+                    !imap_unsubscribe($_SESSION['imp']['stream'], $server . $folder)) {
                     $notification->push(sprintf(_("The folder \"%s\" was deleted but you were not unsubscribed from it."), IMP::displayFolder($folder)), 'horde.warning');
                     $return_value = false;
                 } else {
@@ -289,21 +233,25 @@
                 }
 
                 $deleted[] = $folder;
+                unset($this->_existsResults[$folder]);
             }
         }
 
         if (!empty($deleted)) {
-            /* Update the IMP_Tree cache. */
+            /* Update the IMAP_Tree cache. */
             require_once IMP_BASE . '/lib/IMAP/Tree.php';
-            $imptree = &IMP_Tree::singleton();
-            if ($imptree) {
-                $imptree->delete($deleted);
+            $imaptree = &IMP_Tree::singleton();
+            if ($imaptree) {
+                $imaptree->delete($deleted);
             }
 
             /* Reset the folder cache. */
             if ($conf['server']['cache_folders']) {
-                unset($imp['cache']['folder_cache']);
+                unset($_SESSION['imp']['cache']['folder_cache']);
             }
+
+            /* Recreate Virtual Folders. */
+            $GLOBALS['imp_search']->sessionSetup();
         }
 
         return $return_value;
@@ -321,16 +269,33 @@
      */
     function create($folder, $subscribe)
     {
-        global $conf, $imp, $notification;
+        global $conf, $notification;
+
+        /* Check permissions. */
+        if (!IMP::hasPermission('create_folders')) {
+            $message = @htmlspecialchars(_("You are not allowed to create folders."), ENT_COMPAT, NLS::getCharset());
+            if (!empty($conf['hooks']['permsdenied'])) {
+                $message = Horde::callHook('_perms_hook_denied', array('imp:create_folders'), 'horde', $message);
+            }
+            $notification->push($message, 'horde.error', array('content.raw'));
+            return false;
+        } elseif (!IMP::hasPermission('max_folders')) {
+            $message = @htmlspecialchars(sprintf(_("You are not allowed to create more than %d folders."), IMP::hasPermission('max_folders', true)), ENT_COMPAT, NLS::getCharset());
+            if (!empty($conf['hooks']['permsdenied'])) {
+                $message = Horde::callHook('_perms_hook_denied', array('imp:max_folders'), 'horde', $message);
+            }
+            $notification->push($message, 'horde.error', array('content.raw'));
+            return false;
+        }
 
         /* Make sure we are not trying to create a duplicate folder */
-        if ($this->exists($imp['stream'], $folder)) {
+        if ($this->exists($folder)) {
             $notification->push(sprintf(_("The folder \"%s\" already exists"), IMP::displayFolder($folder)), 'horde.warning');
             return false;
         }
 
         /* Attempt to create the mailbox */
-        if (!imap_createmailbox($imp['stream'], IMP::serverString($folder))) {
+        if (!imap_createmailbox($_SESSION['imp']['stream'], IMP::serverString($folder))) {
             $notification->push(sprintf(_("The folder \"%s\" was not created. This is what the server said"), IMP::displayFolder($folder)) .
                             ': ' . imap_last_error(), 'horde.error');
             return false;
@@ -338,42 +303,53 @@
 
         /* Reset the folder cache. */
         if ($conf['server']['cache_folders']) {
-            unset($imp['cache']['folder_cache']);
+            unset($_SESSION['imp']['cache']['folder_cache']);
         }
 
         /* If the user uses SUBSCRIBE, then add to the subscribe list */
         if ($subscribe &&
-            !imap_subscribe($imp['stream'], IMP::serverString($folder))) {
+            !imap_subscribe($_SESSION['imp']['stream'], IMP::serverString($folder))) {
             $notification->push(sprintf(_("The folder \"%s\" was created but you were not subscribed to it."), IMP::displayFolder($folder)), 'horde.warning');
         } else {
             /* The folder creation has been successful */
             $notification->push(sprintf(_("The folder \"%s\" was successfully created."), IMP::displayFolder($folder)), 'horde.success');
         }
 
-        /* Update the IMP_Tree object. */
+        /* Update the IMAP_Tree object. */
         require_once IMP_BASE . '/lib/IMAP/Tree.php';
-        $imptree = &IMP_Tree::singleton();
-        if ($imptree) {
-            $imptree->insert($folder);
+        $imaptree = &IMP_Tree::singleton();
+        if ($imaptree) {
+            $imaptree->insert($folder);
         }
 
+        /* Recreate Virtual Folders. */
+        $GLOBALS['imp_search']->sessionSetup();
+
         return true;
     }
 
     /**
      * Finds out if a specific folder exists or not.
      *
-     * @param string $folder    The full utf encoded folder name to be checked.
-     * @param boolean $recheck  Should we recheck the folder?
+     * @param string $folder  The full utf encoded folder name to be checked.
      *
      * @return boolean  Whether or not the folder exists.
      */
-    function exists($folder, $recheck = false)
+    function exists($folder)
     {
-        if ($recheck || !isset($this->_existsResults[$folder])) {
-            $path = IMP::serverString($folder);
-            $res = imap_list($GLOBALS['imp']['stream'], '', $path);
-            $this->_existsResults[$folder] = ($res ? in_array($path, $res) : false);
+        /* Try the IMAP_Tree object first. */
+        require_once IMP_BASE . '/lib/IMAP/Tree.php';
+        $imaptree = &IMP_Tree::singleton();
+        if ($imaptree) {
+            $elt = $imaptree->get($folder);
+            if ($elt && !$imaptree->isContainer($elt)) {
+                return true;
+            }
+        }
+
+        if (!isset($this->_existsResults[$folder])) {
+            $res = @imap_list($_SESSION['imp']['stream'], IMP::serverString(), $folder);
+            $this->_existsResults[$folder] = is_array($res);
         }
 
         return $this->_existsResults[$folder];
@@ -390,25 +366,32 @@
      */
     function rename($old, $new)
     {
-        global $conf, $imp, $notification;
+        global $conf, $notification;
 
+        $namespace_info = IMP::getNamespace($old);
         $server = IMP::serverString();
         $success = true;
         $deleted = $inserted = array();
 
         /* Get list of any folders that are underneath this one. */
         $all_folders = array($server . $old);
-        $folder_list = imap_list($imp['stream'], $server, $old . $imp['delimiter'] . '*');
+        $folder_list = imap_list($_SESSION['imp']['stream'], $server, $old . $namespace_info['delimiter'] . '*');
         if (is_array($folder_list)) {
             $all_folders = array_merge($folder_list, $all_folders);
-        }
 
-        /* Get subscribed status. */
-        $subscribed_folders = @imap_lsub($imp['stream'], $server, $old . '*');
-        if (!$subscribed_folders) {
-            $subscribed_folders = array();
+            /* Sort the folders in reverse order because some IMAP servers
+             * will automatically rename all folders when the base folder is
+             * renamed which will result in error messages if we rename from
+             * the bottom up. */
+            require_once IMP_BASE . '/lib/IMAP/Sort.php';
+            $ns_new = IMP::getNamespace($new);
+            $imap_sort = &new IMP_IMAP_Sort($ns_new['delimiter']);
+            $imap_sort->sortMailboxes($all_folders);
+            $all_folders = array_reverse($all_folders);
         }
 
+        $sub_folders = $this->_listFolders(true);
+
         foreach ($all_folders as $folder_old) {
             $subscribe = false;
 
@@ -422,20 +405,22 @@
             $name_new = substr($folder_new, strpos($folder_new, '}') + 1);
 
             /* Unsubscribe from current folder. */
-            if (in_array($folder_old, $subscribed_folders)) {
+            if (in_array($folder_old, $sub_folders)) {
                 $subscribe = true;
-                imap_unsubscribe($imp['stream'], $folder_old);
+                imap_unsubscribe($_SESSION['imp']['stream'], $folder_old);
             }
 
-            if (imap_renamemailbox($imp['stream'], $folder_old, $folder_new)) {
+            if (imap_renamemailbox($_SESSION['imp']['stream'], $folder_old, $folder_new)) {
                 if ($subscribe) {
-                    imap_subscribe($imp['stream'], $folder_new);
+                    imap_subscribe($_SESSION['imp']['stream'], $folder_new);
                 }
 
                 $deleted[] = $name_old;
                 $inserted[] = $name_new;
 
                 $notification->push(sprintf(_("The folder \"%s\" was successfully renamed to \"%s\"."), IMP::displayFolder($name_old), IMP::displayFolder($name_new)), 'horde.success');
+
+                unset($this->_existsResults[$name_old]);
             } else {
                 $notification->push(sprintf(_("Renaming \"%s\" to \"%s\" failed. This is what the server said"), IMP::displayFolder($name_old), IMP::displayFolder($name_new)) . ': ' . imap_last_error(), 'horde.error');
                 $success = false;
@@ -445,16 +430,18 @@
         if (!empty($deleted)) {
             /* Update the IMP_Tree cache. */
             require_once IMP_BASE . '/lib/IMAP/Tree.php';
-            $imptree = &IMP_Tree::singleton();
-            if ($imptree) {
-                $imptree->delete($deleted);
-                $imptree->insert($inserted);
+            $imaptree = &IMP_Tree::singleton();
+            if ($imaptree) {
+                $imaptree->rename($deleted, $inserted);
             }
 
             /* Reset the folder cache. */
             if ($conf['server']['cache_folders']) {
-                unset($imp['cache']['folder_cache']);
+                unset($_SESSION['imp']['cache']['folder_cache']);
             }
+
+            /* Recreate Virtual Folders. */
+            $GLOBALS['imp_search']->sessionSetup();
         }
 
         return $success;
@@ -471,19 +458,19 @@
      */
     function subscribe($folder_array)
     {
-        global $conf, $imp, $notification;
+        global $conf, $notification;
 
         $return_value = true;
         $subscribed = array();
 
         if (!is_array($folder_array)) {
-            $notification->push(_("No folders were specified"), 'horde.message');
+            $notification->push(_("No folders were specified"), 'horde.warning');
             return false;
         }
 
         foreach ($folder_array as $folder) {
             if ($folder != ' ') {
-                if (!imap_subscribe($imp['stream'], IMP::serverString($folder))) {
+                if (!imap_subscribe($_SESSION['imp']['stream'], IMP::serverString($folder))) {
                     $notification->push(sprintf(_("You were not subscribed to \"%s\". Here is what the server said"), IMP::displayFolder($folder)) . ': ' . imap_last_error(), 'horde.error');
                     $return_value = false;
                 } else {
@@ -494,16 +481,16 @@
         }
 
         if (!empty($subscribed)) {
-            /* Initialize the IMP_Tree object. */
+            /* Initialize the IMAP_Tree object. */
             require_once IMP_BASE . '/lib/IMAP/Tree.php';
-            $imptree = &IMP_Tree::singleton();
-            if ($imptree) {
-                $imptree->subscribe($subscribed);
+            $imaptree = &IMP_Tree::singleton();
+            if ($imaptree) {
+                $imaptree->subscribe($subscribed);
             }
 
             /* Reset the folder cache. */
             if ($conf['server']['cache_folders']) {
-                unset($imp['cache']['folder_cache']);
+                unset($_SESSION['imp']['cache']['folder_cache']);
             }
         }
 
@@ -521,7 +508,7 @@
      */
     function unsubscribe($folder_array)
     {
-        global $conf, $imp, $notification;
+        global $conf, $notification;
 
         $return_value = true;
         $unsubscribed = array();
@@ -534,8 +521,8 @@
         foreach ($folder_array as $folder) {
             if ($folder != ' ') {
                 if (strcasecmp($folder, 'INBOX') == 0) {
-                    $notification->push(sprintf(_("You can not unsubscribe from \"%s\"."), IMP::displayFolder($folder)), 'horde.error');
-                } elseif (!imap_unsubscribe($imp['stream'], IMP::serverString($folder))) {
+                    $notification->push(sprintf(_("You cannot unsubscribe from \"%s\"."), IMP::displayFolder($folder)), 'horde.error');
+                } elseif (!imap_unsubscribe($_SESSION['imp']['stream'], IMP::serverString($folder))) {
                     $notification->push(sprintf(_("You were not unsubscribed from \"%s\". Here is what the server said"), IMP::displayFolder($folder)) . ': ' . imap_last_error(), 'horde.error');
                     $return_value = false;
                 } else {
@@ -546,16 +533,16 @@
         }
 
         if (!empty($unsubscribed)) {
-            /* Initialize the IMP_Tree object. */
+            /* Initialize the IMAP_Tree object. */
             require_once IMP_BASE . '/lib/IMAP/Tree.php';
-            $imptree = &IMP_Tree::singleton();
-            if ($imptree) {
-                $imptree->unsubscribe($unsubscribed);
+            $imaptree = &IMP_Tree::singleton();
+            if ($imaptree) {
+                $imaptree->unsubscribe($unsubscribed);
             }
 
             /* Reset the folder cache. */
             if ($conf['server']['cache_folders']) {
-                unset($imp['cache']['folder_cache']);
+                unset($_SESSION['imp']['cache']['folder_cache']);
             }
         }
 
@@ -585,9 +572,9 @@
             $imp_imap = &IMP_IMAP::singleton();
             foreach ($folder_list as $folder) {
                 $imp_imap->changeMbox($folder, OP_READONLY);
-                $count = imap_num_msg($GLOBALS['imp']['stream']);
+                $count = imap_num_msg($_SESSION['imp']['stream']);
                 for ($i = 1; $i <= $count; $i++) {
-                    $h = imap_header($GLOBALS['imp']['stream'], $i);
+                    $h = imap_header($_SESSION['imp']['stream'], $i);
                     $from = '<>';
                     if (isset($h->from[0])) {
                         if (isset($h->from[0]->mailbox) && isset($h->from[0]->host)) {
@@ -599,8 +586,8 @@
                        require a space in front of single digit days. */
                     $date = sprintf('%s %2s %s', date('D M', $h->udate), date('j', $h->udate), date('H:i:s Y', $h->udate));
                     $body .= 'From ' . $from . ' ' . $date . "\n";
-                    $body .= imap_fetchheader($GLOBALS['imp']['stream'], $i, FT_PREFETCHTEXT);
-                    $body .= imap_body($GLOBALS['imp']['stream'], $i) . "\n";
+                    $body .= imap_fetchheader($_SESSION['imp']['stream'], $i, FT_PREFETCHTEXT);
+                    $body .= imap_body($_SESSION['imp']['stream'], $i, FT_PEEK) . "\n";
                 }
             }
         }
@@ -629,13 +616,13 @@
         while (!feof($fd)) {
             $line = fgets($fd, 4096);
 
-            if (preg_match('/From .+ at .+/A', $line)) {
+            if (preg_match('/From (.+ at .+|- )/A', $line)) {
                 if (!empty($message)) {
                     // Make absolutely sure there are no bare newlines.
                     $message = preg_replace("|([^\r])\n|", "\\1\r\n", $message);
                     $message = str_replace("\n\n", "\n\r\n", $message);
 
-                    if (imap_append($GLOBALS['imp']['stream'], $target, $message)) {
+                    if (imap_append($_SESSION['imp']['stream'], $target, $message)) {
                         $msgcount++;
                     }
                 }
@@ -651,7 +638,7 @@
             $message = preg_replace("|([^\r])\n|", "\\1\r\n", $message);
             $message = str_replace("\n\n", "\n\r\n", $message);
 
-            if (imap_append($GLOBALS['imp']['stream'], $target, $message)) {
+            if (imap_append($_SESSION['imp']['stream'], $target, $message)) {
                 $msgcount++;
             }
         }
@@ -659,4 +646,34 @@
         return ($msgcount > 0) ? $msgcount : false;
     }
 
+    /**
+     * Get a list of all folders on the server (including any folders in
+     * hidden namespaces).
+     *
+     * @access private
+     *
+     * @param boolean $sub  List only subscribed folders?
+     *
+     * @return array  An array of folders names.
+     */
+    function _listFolders($sub = false)
+    {
+        $list = array();
+        $listcmd = ($sub) ? 'imap_lsub' : 'imap_list';
+        $server = IMP::serverString();
+
+        /* According to RFC 3501 [6.3.8], the '*' wildcard doesn't
+         * necessarily match all visible mailboxes.  So we have to go
+         * through each namespace separately, even though we may duplicate
+         * mailboxes. */
+        foreach ($_SESSION['imp']['namespace'] as $val) {
+            $hiddenboxes = $listcmd($_SESSION['imp']['stream'], $server, $val['name'] . '*');
+            if (is_array($hiddenboxes)) {
+                $list = array_unique(array_merge($list, $hiddenboxes));
+            }
+        }
+
+        return array_values($list);
+    }
+
 }


--- orig/templates/menu.inc
+++ mod/templates/menu.inc
@@ -3,56 +3,54 @@
                $prefs->getValue('use_trash') &&
                ($prefs->getValue('trash_folder') !== null) &&
                $prefs->getValue('empty_trash_menu'));
+$menu_spam = (($imp['base_protocol'] != 'pop3') &&
+               ($prefs->getValue('spam_folder') !== null) &&
+               $prefs->getValue('empty_spam_menu'));
 $menu_view = $prefs->getValue('menu_view');
-$accesskey = $prefs->getValue('widget_accesskey') ? Horde::getAccessKey(_("Ope_n Folder")) : '';
+$accesskey = $prefs->getValue('widget_accesskey') ? Horde::getAccessKey(_("Open Fo_lder")) : '';
 ?>
-<form action="mailbox.php" method="get" name="menu">
+<form action="mailbox.php" method="get" name="menuform">
 <?php echo Util::formInput() ?>
 <div id="menu">
 <?php if (($imp['base_protocol'] != 'pop3') && $conf['user']['allow_folders']): ?>
- <span style="float:right">
+ <div class="rightFloat">
   <input type="hidden" name="no_newmail_popup" value="1" />
   <label for="mailbox" accesskey="<?php echo $accesskey ?>">
    <select id="mailbox" name="mailbox" onchange="folderSubmit()">
     <?php echo IMP::flistSelect('', true, array(), $imp['mailbox'], false, false, true) ?>
    </select>
   </label>
- </span>
- <span style="float:right">
+ </div>
+ <div class="rightFloat">
   <?php
-   $link = Horde::link('#', _("Open Folder"), '', '', 'folderSubmit(true); return false;');
+   $link = Horde::link('#', '', '', '', 'folderSubmit(true); return false;');
    printf('<ul><li>%s%s<br />%s</a></li></ul>',
           $link,
           ($menu_view != 'text') ? Horde::img('folders/folder_open.png') : '',
-          ($menu_view != 'icon') ? Horde::highlightAccessKey(_("Ope_n Folder"), $accesskey) : '');
+          ($menu_view != 'icon') ? Horde::highlightAccessKey(_("Open Fo_lder"), $accesskey) : '');
   ?>
- </span>
+ </div>
  <?php endif; ?>
- <?php echo IMP::getMenu('string') ?>
+ <div class="leftFloat">
+  <?php echo IMP::getMenu('string') ?>
+ </div>
  <br class="clear" />
 </div>
 </form>
 
-<?php if ($menu_trash || $conf['user']['allow_folders']): ?>
-<script language="JavaScript" type="text/javascript">
-<!--
-<?php if ($menu_trash): ?>
-var menu_trash_confirmed = 0;
-var menu_trash_cvalue = 0;
-<?php endif; ?>
 <?php if ($conf['user']['allow_folders']): ?>
+<script type="text/javascript">
+<!--
 var loading;
 function folderSubmit(clear)
 {
-    if (document.menu.mailbox[document.menu.mailbox.selectedIndex].value != '') {
+    if (document.menuform.mailbox[document.menuform.mailbox.selectedIndex].value != '') {
         if ((loading == null) || (clear != null)) {
             loading = true;
-            document.menu.submit();
+            document.menuform.submit();
         }
     }
 }
 // -->
 </script>
 <?php endif; ?>
-<?php endif; ?>
-<br id="menuSpacer" />


--- orig/lib/Maintenance/Task/purge_trash.php
+++ mod/lib/Maintenance/Task/purge_trash.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * $Horde: imp/lib/Maintenance/Task/purge_trash.php,v 1.23.10.6 2005/08/13 17:15:55 slusarz Exp $
+ * $Horde: imp/lib/Maintenance/Task/purge_trash.php,v 1.23.10.9 2006/02/04 19:13:13 slusarz Exp $
  *
  * Maintenance module that purges old messages in the Trash folder.
  *
- * Copyright 2001-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2001-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -26,12 +26,11 @@
 
         /* If we aren't using a Trash folder or if there is no Trash
            folder set, just return. */
-        if (!$prefs->getValue('use_trash') ||
-            !$prefs->getValue('trash_folder')) {
+        $trash_folder = IMP::folderPref($prefs->getValue('trash_folder'), true);
+        if (!$prefs->getValue('use_trash') || !$trash_folder) {
             return false;
         }
 
-        $trash_folder = IMP::addPreambleString($prefs->getValue('trash_folder'));
         /* Make sure the Trash folder exists. */
         require_once IMP_BASE . '/lib/Folder.php';
         $imp_folder = &IMP_Folder::singleton();
@@ -49,7 +48,7 @@
         require_once IMP_BASE . '/lib/IMAP.php';
         require_once IMP_BASE . '/lib/Message.php';
         $imp_imap = &IMP_IMAP::singleton();
-        $imp_message = &new IMP_Message();
+        $imp_message = &IMP_Message::singleton();
         $imp_imap->changeMbox($trash_folder);
         $msg_ids = @imap_search($imp['stream'], "BEFORE \"$del_time\"", SE_UID);
         if (empty($msg_ids)) {
@@ -79,7 +78,7 @@
     function describeMaintenance()
     {
         return sprintf(_("All messages in your \"%s\" folder older than %s days will be permanently deleted."),
-                       $GLOBALS['prefs']->getValue('trash_folder'),
+                       IMP::displayFolder(IMP::folderPref($GLOBALS['prefs']->getValue('trash_folder'), true)),
                        $GLOBALS['prefs']->getValue('purge_trash_keep'));
     }
 


--- orig/lib/MIME/Viewer/multipart.php
+++ mod/lib/MIME/Viewer/multipart.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_multipart class handles multipart messages not
  * rendered by any specific MIME_Viewer.
  *
- * $Horde: imp/lib/MIME/Viewer/multipart.php,v 1.13.10.4 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/multipart.php,v 1.13.10.6 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/templates/pgp/import_key.inc
+++ mod/templates/pgp/import_key.inc
@@ -26,17 +26,17 @@
 
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
  <tr>
-  <td align="left" class="header" nowrap="nowrap"><b><?php echo $title ?></b></td>
+  <td class="header leftAlign" nowrap="nowrap"><?php echo $title ?></td>
  </tr>
 
  <tr>
-  <td class="item" align="left">
+  <td class="item leftAlign">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left"><b><?php echo $insert_text ?>:</b></td>
+     <td class="item leftAlign"><strong><?php echo $insert_text ?>:</strong></td>
     </tr>
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <textarea name="import_key" rows="6" cols="80" class="fixed"></textarea>
      </td>
     </tr>
@@ -45,15 +45,15 @@
  </tr>
 
  <tr>
-  <td class="item" align="left"><font color="red"><b>--<?php echo _("OR") ?>--</b></font></td>
+  <td class="item leftAlign"><font color="red"><strong>--<?php echo _("OR") ?>--</strong></font></td>
  </tr>
 
  <tr>
-  <td class="item" align="left">
+  <td class="item leftAlign">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left">
-      <b><?php echo _("Upload") ?>:</b>&nbsp;<input name="upload_key" type="file" size="40" class="fixed" />
+     <td class="item leftAlign">
+      <strong><?php echo _("Upload") ?>:</strong>&nbsp;<input name="upload_key" type="file" size="40" class="fixed" />
      </td>
     </tr>
    </table>


--- orig/templates/compose/spelling.inc
+++ mod/templates/compose/spelling.inc
@@ -40,112 +40,109 @@
         }
     }
 ?>
-<table width="100%" border="0" cellspacing="0" cellpadding="1">
-  <tr class="header">
-    <td colspan="8" class="header">
-      <b>
+
+<h1 class="header">
 <?php if ($errorsleft > 0): ?>
-        <?php echo _("Spell Checker") ?> - <i><?php echo $errorsleft ?> <?php echo ($errorsleft > 1) ? _("spelling errors") : _("spelling error"); ?></i>
+ <?php echo _("Spell Checker") ?> - <em><?php echo $errorsleft ?> <?php echo ($errorsleft > 1) ? _("spelling errors") : _("spelling error"); ?></em>
 <?php else: ?>
-        <?php echo _("Spell check complete") ?> - <?php echo _("No spelling errors") ?>
+ <?php echo _("Spell check complete") ?> - <?php echo _("No spelling errors") ?>
 <?php endif; ?>
-      </b>
-    </td>
-  </tr>
+</h1>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="1">
 <?php
-while (($count < $prefs->getValue('num_words')) && ($i < $numerrors)) {
-    if (!isset($error) || !is_array($error)) {
-        echo _("Spell check complete");
-        break;
-    }
+    while (($count < $prefs->getValue('num_words')) && ($i < $numerrors)) {
+        if (!isset($error) || !is_array($error)) {
+            echo _("Spell check complete");
+            break;
+        }
 
-    if (!in_array(String::lower($error[$i][0], true), $ignoreall)):
+        if (!in_array(String::lower($error[$i][0], true), $ignoreall)) {
 ?>
-
-  <tr class="item">
-    <td class="item"><?php echo _("Correct") ?></td>
-    <td colspan="3" nowrap="nowrap">
+ <tr class="item">
+  <td class="item"><?php echo _("Correct") ?></td>
+  <td colspan="3" nowrap="nowrap">
 <?php
-
-    $offset = $error[$i][1];
-    $word = $error[$i][0];
-    $alt = $error[$i][2];
-    echo '<span style="color:#ff0000">"' . htmlspecialchars($word) . '"</span>';
-    echo _(" in ");
-    $context = _highlightError(htmlspecialchars($word), htmlspecialchars($f_currmsg), htmlspecialchars($offset));
-
-    if (!empty($context)) {
-        echo "<span class=\"fixed\">$context</span>";
-    } else {
-        echo _("none");
-    }
-
+            $offset = $error[$i][1];
+            $word = $error[$i][0];
+            $alt = $error[$i][2];
+            echo '<span style="color:#ff0000">"' . htmlspecialchars($word) . '"</span>';
+            echo _(" in ");
+            $context = _highlightError(htmlspecialchars($word), htmlspecialchars($f_currmsg), htmlspecialchars($offset));
+
+            if (!empty($context)) {
+                echo "<span class=\"fixed\">$context</span>";
+            } else {
+                echo _("none");
+            }
 ?>
-
-    </td>
-    <td><b><i><?php echo _("Change"); ?></i></b></td>
-    <td><b><i><?php echo _("Change All"); ?></i></b></td>
-    <td><?php echo _("Ignore") ?></td>
-    <td><?php echo _("Ignore All") ?></td>
-  </tr>
-  <tr>
-    <td class="item"><b><?php echo _("Suggestions") ?></b></td>
-    <td class="item">
-      <input type="hidden" name="oldword[<?php echo $count ?>]" value="<?php echo htmlspecialchars($word) ?>" />
-      <input type="hidden" name="wordoffset[<?php echo $count ?>]" value="<?php echo htmlspecialchars($offset) ?>" />
-      <select name="subs[<?php echo $count ?>]" onchange="change_selected(<?php echo $count ?>);">
+  </td>
+  <td><strong><em><?php echo _("Change"); ?></em></strong></td>
+  <td><strong><em><?php echo _("Change All"); ?></em></strong></td>
+  <td><?php echo _("Ignore") ?></td>
+  <td><?php echo _("Ignore All") ?></td>
+ </tr>
+ <tr>
+  <td class="item"><strong><?php echo _("Suggestions") ?></strong></td>
+  <td class="item">
+   <input type="hidden" name="oldword[<?php echo $count ?>]" value="<?php echo htmlspecialchars($word) ?>" />
+   <input type="hidden" name="wordoffset[<?php echo $count ?>]" value="<?php echo htmlspecialchars($offset) ?>" />
+    <select name="subs[<?php echo $count ?>]" onchange="change_selected(<?php echo $count ?>);">
+<?php
+            if (!empty($alt)) {
+                $checkedval = 3;
+                $altwords = explode(', ', $alt);
+                for ($j = 0; $j < count($altwords); $j++) {
+                    echo '<option value="' . htmlspecialchars($altwords[$j]) . '">' . htmlspecialchars($altwords[$j]) . '</option>';
+                }
+            } else {
+                $checkedval = 3;
+                echo '<option value="0">' . _("No suggestions") . '</option>';
+            }
+?>
+   </select>
+  </td>
+  <td class="item"><strong><?php echo (!empty($alt)) ? _("or") : _("Replace with:"); ?></strong></td>
+  <td class="item"><input type="text" name="subtext[<?php echo $count ?>]" size="12" onchange="change_selected(<?php echo $count ?>);" /></td>
+  <td class="item"><input type="radio" value="1" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 1) echo 'checked="checked"'; ?> /></td>
+  <td class="item"><input type="radio" value="2" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 2) echo 'checked="checked"'; ?> /></td>
+  <td class="item"><input type="radio" value="3" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 3) echo 'checked="checked"'; ?> /></td>
+  <td class="item"><input type="radio" value="4" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 4) echo 'checked="checked"'; ?> /></td>
+ </tr>
 <?php
-    if (!empty($alt)) {
-        $checkedval = 3;
-        $altwords = explode(', ', $alt);
-        for ($j = 0; $j < count($altwords); $j++) {
-            echo '<option value="' . htmlspecialchars($altwords[$j]) . '">' . htmlspecialchars($altwords[$j]) . '</option>';
+            $count++;
         }
-    } else {
-        $checkedval = 3;
-        echo '<option value="0">' . _("No suggestions") . '</option>';
+        $i++;
     }
-
-?></select>
-    </td>
-    <td class="item"><b><?php echo (!empty($alt)) ? _("or") : _("Replace with:"); ?></b></td>
-    <td class="item"><input type="text" name="subtext[<?php echo $count ?>]" size="12" onchange="change_selected(<?php echo $count ?>);" /></td>
-    <td class="item"><input type="radio" value="1" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 1) echo 'checked="checked"'; ?> /></td>
-    <td class="item"><input type="radio" value="2" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 2) echo 'checked="checked"'; ?> /></td>
-    <td class="item"><input type="radio" value="3" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 3) echo 'checked="checked"'; ?> /></td>
-    <td class="item"><input type="radio" value="4" name="opt[<?php echo $count ?>]" <?php if ($checkedval == 4) echo 'checked="checked"'; ?> /></td>
-  </tr>
-<?php
-    $count++;
-    endif;
-
-    $i++;
-}
 ?>
-  <tr class="item">
-    <td colspan="8" class="item">
-      <input type="button" class="button" onclick="document.compose.actionID.value='spell_check_cancel'; document.compose.submit();" value="<?php echo _("Cancel") ?>" /><i>&nbsp;<?php echo _("(Discard all changes and return to the compose screen.)") ?></i>
-    </td>
-  </tr>
+ <tr class="item">
+  <td colspan="8" class="item">
+   <input type="button" class="button" onclick="document.compose.actionID.value='spell_check_cancel'; document.compose.submit();" value="<?php echo _("Cancel") ?>" /><em>&nbsp;<?php echo _("(Discard all changes and return to the compose screen.)") ?></em>
+  </td>
+ </tr>
 <?php if (($actionID == 'spell_check_forward') || ($errorsleft == 0)): ?>
-  <tr class="item">
-    <td colspan="8" class="item">
-      <input type="button" class="button" onclick="document.compose.actionID.value='<?php echo $spell_check_done_action; ?>'; document.compose.submit();" value="<?php echo _("Done") ?>" /><i>&nbsp;<?php echo $spell_check_done_caption; ?></i>
-    </td>
-  </tr>
+ <tr class="item">
+  <td colspan="8" class="item">
+   <input type="button" class="button" onclick="document.compose.actionID.value='<?php echo $spell_check_done_action; ?>'; document.compose.submit();" value="<?php echo _("Done") ?>" /><em>&nbsp;<?php echo $spell_check_done_caption; ?></em>
+  </td>
+ </tr>
 <?php endif; ?>
 <?php if ($errorsleft > 0): ?>
-  <tr class="item">
-    <td colspan="8" class="item">
-      <input type="button" class="button" onclick="document.compose.actionID.value='spell_check_forward'; document.compose.submit();" value="<?php echo _("Next") ?>" /><i>&nbsp;<?php echo _("(Apply these changes and move to next screen.)") ?></i>
-    </td>
-  </tr>
+ <tr class="item">
+  <td colspan="8" class="item">
+   <input type="button" class="button" onclick="document.compose.actionID.value='spell_check_forward'; document.compose.submit();" value="<?php echo _("Next") ?>" /><em>&nbsp;<?php echo _("(Apply these changes and move to next screen.)") ?></em>
+  </td>
+ </tr>
 <?php endif; ?>
-  <tr><td colspan="8">&nbsp;</td></tr>
-  <tr class="header"><td colspan="8" class="header"><b><?php echo _("Corrected Text") ?></b></td></tr>
-  <tr><td colspan="8" class="item">
-    <div class="fixed"><?php echo $display_msg ?></div>
-  </td></tr>
+ <tr><td colspan="8">&nbsp;</td></tr>
 </table>
+<h1 class="header">
+ <?php echo _("Corrected Text") ?>
+</h1>
+<div class="item">
+ <span class="fixed" style="white-space:pre">
+  <?php echo $display_msg ?>
+ </span>
+</div>
 
 </form>


--- orig/lib/MIME/Viewer/plain.php
+++ mod/lib/MIME/Viewer/plain.php
@@ -6,10 +6,10 @@
  * The IMP_MIME_Viewer_plain class renders out text/plain MIME parts
  * with URLs made into hyperlinks.
  *
- * $Horde: imp/lib/MIME/Viewer/plain.php,v 1.58.8.9 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/plain.php,v 1.58.8.13 2006/02/13 20:49:53 jan Exp $
  *
- * Copyright 1999-2005 Anil Madhavapeddy <anil at recoil.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at horde.org>
+ * Copyright 1999-2006 Anil Madhavapeddy <anil at recoil.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -43,7 +43,7 @@
         if ($contents->viewAsAttachment()) {
             // Check for 'flowed' text data.
             if ($flowed) {
-                $text = $this->_formatFlowed($text, 90);
+                $text = $this->_formatFlowed($text, 90, null, $this->mime_part->getContentTypeParameter('delsp'));
             }
             return $text;
         }
@@ -54,9 +54,8 @@
 
         // Trim extra whitespace in the text.
         $text = rtrim($text);
-
         if ($text == '') {
-            return $contents->formatStatusMsg(_("There was no text in this message part"));
+            return '';
         }
 
         // If requested, scan the message for PGP data.
@@ -78,7 +77,7 @@
 
         // Check for 'flowed' text data.
         if ($flowed) {
-            $text = $this->_formatFlowed($text, 90, (IMP::printMode()) ? 0 : null);
+            $text = $this->_formatFlowed($text, 90, (IMP::printMode()) ? 0 : null, $this->mime_part->getContentTypeParameter('delsp'));
         }
 
         // Build filter stack. Starts with HTML markup and tab expansion.
@@ -88,7 +87,6 @@
                                      'charset' => $this->mime_part->getCharset()),
                                array());
 
-
         /* A "From" located at the beginning of a line in the body text will
          * be escaped with a '>' by the IMAP server.  Remove this escape
          * character or else the line will display as being quoted. */
@@ -134,7 +132,7 @@
         if ($text{0} == ' ') {
             $text = '&nbsp;' . substr($text, 1);
         }
-        $text = '<div class="fixed">' . "\n" . $text . '</div>';
+        $text = '<div class="fixed leftAlign">' . "\n" . $text . '</div>';
 
         // Replace UUencoded data with links now.
         if ($this->getConfigParam('uuencode') && !empty($files)) {


--- orig/po/nb_NO.po
+++ mod/po/nb_NO.po
@@ -4,76 +4,200 @@
 # Oystein Steimler <oystein at rexta.net>, 2001.
 # Torstein S. Hansen <huleboer at techbee.no>, 2002.
 # Andreas Gunleikskaas <andreas at gunleikskaas.no>, 2003.
+# Geir O. Hogberg <horde at skydiver.no>, 2005-05-13.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 3.2.1\n"
-"POT-Creation-Date: 2003-03-06 01:00+0100\n"
-"PO-Revision-Date: 2004-05-18 23:37+0200\n"
-"Last-Translator: Andreas Gunleikskaas <andreas at gunleikskaas.no>\n"
+"Project-Id-Version: IMP 4.0.3\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-05-13 23:16+0200\n"
+"PO-Revision-Date: 2005-05-18 23:37+0200\n"
+"Last-Translator: Geir O. Hogberg <horde at skydiver.no>\n"
 "Language-Team: Norwegian (Bokmal) <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:266 lib/Compose.php:318
 msgid "      To: "
 msgstr "     Til: "
 
+#: lib/Compose.php:254 lib/Compose.php:306
 msgid "    Date: "
 msgstr "    Dato: "
 
+#: lib/Compose.php:257 lib/Compose.php:309
 msgid "    From: "
 msgstr "     Fra: "
 
-msgid " - $nm new message"
-msgstr " - $nm ny melding"
-
-msgid " - $nm new messages"
-msgstr " - $nm nye meldinger"
+#: mailbox.php:399
+#, php-format
+msgid " (Accesskey %s)"
+msgstr " (hurtigtast %s)"
 
+#: lib/Compose.php:263 lib/Compose.php:315
 msgid " Subject: "
 msgstr "    Emne: "
 
+#: templates/compose/spelling.inc:74
 msgid " in "
 msgstr " i "
 
+#: templates/mailbox/message_headers.inc:7
 msgid "#"
 msgstr "#"
 
-#, c-format
-msgid "%d of %d Messages"
-msgstr "%d av %d meldinger"
+#: lib/Block/summary.php:71
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr "%.2fMB / %.2fMB  (%2f%%)"
+
+#: mailbox.php:190
+#, php-format
+msgid "%d message(s) have been deleted."
+msgstr "%d meddelande(n) har blitt slettet."
+
+#: lib/Spam.php:182
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+"%d meldinger har blitt rapportert som ikke-spam til systemadministratoren."
+
+#: lib/Spam.php:162
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "%d meldinger har blitt rapportert som ikke-spam."
+
+#: lib/Spam.php:174
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "%d meldinger har blitt rapportert som spam til systemadministratoren."
+
+#: lib/Spam.php:154
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "%d meldinger er blitt rapportert som spam."
 
-#, c-format
+#: mailbox.php:362
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d - %d av %d meldinger"
 
-#, c-format
+#: mailbox.php:607
+#, php-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: pgp.php:332
+#, php-format
+msgid "%s PGP Administration"
+msgstr "%s PGP administrasjon"
+
+#: smime.php:254
+#, php-format
+msgid "%s S/MIME Administration"
+msgstr "%s S/MIME administrasjon"
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
-msgstr "%s finnes allerede. Mappen %s ble ikke gitt nytt navn."
+msgstr "%s finnes allerede. Navnet på mappen %s ble ikke endret."
 
-#, c-format
+#: lib/Message.php:633
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
-msgstr "%s ser ikke ut som er en gyldig postboks"
+msgstr "%s ser ikke ut som en gyldig postboks."
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mappen '%s' blir gitt nytt navn i begynnelsen av måneden."
 
-#, c-format
-msgid "%s is already empty."
-msgstr "%s er allerede tom"
+#: lib/MIME/Viewer/itip.php:226
+#, php-format
+msgid "%s has accepted."
+msgstr "%s har godtatt."
+
+#: lib/MIME/Viewer/itip.php:581
+#, php-format
+msgid "%s has cancelled %s."
+msgstr "%s har kansellert %s."
+
+#: lib/MIME/Viewer/itip.php:232
+#, php-format
+msgid "%s has declined."
+msgstr "%s har avslått."
+
+#: lib/MIME/Viewer/itip.php:452
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr "%s har besvart en forespørsel om informasjon angående ledig/opptatt."
+
+#: lib/MIME/Viewer/itip.php:572
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr "%s har svart på invitasjonen til %s."
+
+#: lib/MIME/Viewer/itip.php:441
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr "%s har sendt deg informasjon om ledig/opptatt."
+
+#: lib/MIME/Viewer/itip.php:238
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr "%s har foreløpig godtatt."
+
+#: lib/MIME/Viewer/itip.php:446
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s forespør informasjon om når du er ledig/opttatt."
+
+#: lib/MIME/Viewer/itip.php:541
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr "%s forespør din deltagelse på %s."
+
+#: lib/Message.php:388
+#, php-format
+msgid "%s was successfully added to %s."
+msgstr "%s ble lagt til %s."
+
+#: lib/MIME/Viewer/itip.php:553
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr "%s ønsker å endre %s."
+
+#: lib/MIME/Viewer/itip.php:531
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr "%s ønsker å gjøre deg oppmerksom på %s."
+
+#: lib/MIME/Viewer/itip.php:558
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr "%s ønsker å motta den sist oppdaterte informasjonen om %s."
+
+#: message.php:276 message.php:281
+#, php-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#, c-format
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;of&nbsp;%d)"
 
+#: templates/compose/spelling.inc:140
 msgid "(Apply these changes and move to next screen.)"
-msgstr "(Bruk disse rettingene, og gå til neste side.)"
+msgstr "(Bruk disse endringene, og gå til neste side.)"
 
+#: templates/compose/spelling.inc:127
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Forkast alle endringer, og returner til meldingen.)"
 
+#: spelling.php:273
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -81,47 +205,188 @@
 "(Returnere til meldingen etter at endringene så langt er gjort. Endringene i "
 "dette bildet vil IKKE bli gjort.)"
 
+#: spelling.php:270
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Returnere til meldingen etter at endringene så langt er gjort. Endringene i "
+"dette bildet vil IKKE bli gjort.)"
+
+#: templates/contacts/contacts.inc:228
 msgid "* Add these by clicking OK *"
 msgstr "* Legg til disse ved å klikke OK *"
 
+#: templates/contacts/contacts.inc:208
 msgid "* Please select address(es) *"
 msgstr "* Vennligst velg adresse(ne) *"
 
-#, c-format
-msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+#: lib/Spam.php:184
+msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
-"<p><i>Denne meldingen var skrevet i et annet tegnsett enn ditt eget. Hvis "
-"den ikke vises riktig, %s klikk her</a> for å åpne den i et nytt vindu</i></"
-"p>\n"
+"1 melding har blitt rapportert som ikke-spam til systemadministratoren."
+
+#: lib/Spam.php:164
+msgid "1 message has been reported as not spam."
+msgstr "1 melding har blitt rapportert som ikke-spam."
+
+#: lib/Spam.php:176
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "1 melding har blitt rapportert som spam til systemadministratoren."
+
+#: lib/Spam.php:156
+msgid "1 message has been reported as spam."
+msgstr "1 melding har blitt rapportert som spam."
+
+#: config/prefs.php.dist:788
+msgid "100 characters"
+msgstr "100 tegn"
+
+#: config/prefs.php.dist:791
+msgid "1000 characters"
+msgstr "1000 tegn"
+
+#: config/prefs.php.dist:789
+msgid "250 characters"
+msgstr "250 tegn"
+
+#: config/prefs.php.dist:790
+msgid "500 characters"
+msgstr "500 tegn"
+
+#: lib/MIME/Viewer/images.php:159
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr "Et stort bilde (%s) er vedlagt meldingen."
+
+#: lib/MIME/Viewer/notification.php:53
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr "Du har fått leveringsbekreftelse på en melding du har sendt."
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr "OG"
+
+#: lib/MIME/Viewer/itip.php:546
+msgid "Accept request"
+msgstr "Godkjenn forespørsel"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Accepted"
+msgstr "Godtatt"
+
+#: lib/MIME/Viewer/itip.php:227
+msgid "Accepted: "
+msgstr "Godtatt: "
+
+#: lib/IMP.php:910 lib/IMP.php:912
+msgid "Acco_unts"
+msgstr "Kon_toer"
 
-msgid "Action"
-msgstr "Handling"
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr "Kontoens navn:"
+
+#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:682
+msgid "Actions"
+msgstr "Handlinger"
+
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "Legg til kilde"
+
+#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+msgid "Add this to my calendar"
+msgstr "Legg til i min kalender"
+
+#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
+#, php-format
+msgid "Add to Address book (%s)"
+msgstr "Legg til i adressebok (%s)"
+
+#: compose.php:1177
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr "La til %s som ett vedlegg."
 
-#, c-format
-msgid "Add to Addressbook (%s)"
-msgstr "Legg til i addressebok (%s)"
+#: config/prefs.php.dist:190
+msgid ""
+"Additional headers to display when viewing: <i>(optional, enter each header "
+"on a new line)</i>"
+msgstr ""
+"Ytterligere meldingshoder å vise: <i>(valgfritt, angi hvert meldingshode på "
+"hver linje)</i>"
 
-msgid "Added an attachment."
-msgstr "La til et vedlegg."
+#: lib/MIME/Viewer/notification.php:65
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr "Mer informasjon vises %s."
+
+#: lib/MIME/Viewer/notification.php:65
+msgid "Additional information details"
+msgstr "Fler detaljer"
+
+#: lib/MIME/Viewer/status.php:96
+msgid "Additional message details"
+msgstr "Mer detaljer om meldingen"
+
+#: lib/MIME/Viewer/status.php:95
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr "Mer detaljer om meldingen vises %s."
+
+#: lib/MIME/Viewer/status.php:81
+msgid "Additional message error details"
+msgstr "Fler feilmeldings-detaljer"
+
+#: lib/MIME/Viewer/status.php:80
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr "Fler feilmeldings-detaljer vises %s."
 
+#: contacts.php:90 templates/contacts/contacts.inc:175
+#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
 msgid "Address Book"
-msgstr "Addressebøker"
+msgstr "Adressebok"
+
+#: config/prefs.php.dist:126
+msgid "Address Books"
+msgstr "Adressebøker"
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to BCC all messages: <i>(optional, enter each address on a new "
+"line)</i>"
+msgstr ""
+"Adresser som skal BCC's til alle meldinger: <i>(valgfritt, en adresse per "
+"linje)</i>"
+
+#: config/prefs.php.dist:173
+msgid ""
+"Addresses to explicitly tie to this identity: <i>(optional, enter each "
+"address on a new line)</i>"
+msgstr ""
+"Adresser koblet til denne identiteten: <i>(valgfritt, en adresse per linje)</"
+"i>"
 
-msgid "Addressbooks"
-msgstr "Addressebøker"
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+msgid "All"
+msgstr "Alle"
 
+#: templates/folders/javascript.inc:5
 msgid "All messages in the folder(s) will be lost!"
 msgstr "Alle meldinger i denne mappen(e) vil bli slettet!"
 
+#: templates/folders/javascript.inc:6
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Alle meldingene i følgende mappe(r) vil bli lastet ned i én MBOX-fil:"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:83
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
@@ -129,130 +394,320 @@
 "Alle meldingene i \"%s\"-mappen som er eldre enn %s dager, vil bli slettet "
 "permanent."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:63
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "Alle lenkede vedlegg eldre enn %s måneder, vil bli slettet."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "Mapper med sente meldinger eldre enn %s måneder, vil bli slettet."
+msgstr "Alle mapper med sente meldinger eldre enn %s måneder, vil bli slettet."
 
-msgid "All"
-msgstr "Alle"
+#: acl.php:85
+#, php-format
+msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgstr "Alle rettigheter på mappen '%s' ble fjernet for brukeren '%s'."
+
+#: templates/filters/prefs.inc:55
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr "Tillat at filter-regler legges til i alle postbokser?"
 
+#: lib/MIME/Viewer/alternative.php:113
 msgid "Alternative parts for this section:"
 msgstr "Alternative deler for denne seksjonen:"
 
-msgid "An illegal value was specified."
-msgstr "En ugyldig verdi ble valgt."
+#: config/prefs.php.dist:565 config/prefs.php.dist:586
+msgid "Always"
+msgstr "Alltid"
+
+#: config/prefs.php.dist:550
+msgid "Always save attachments"
+msgstr "Alltid lagre vedlegg"
 
-msgid "An unknown error occured adding the new entry."
-msgstr "En ukjent feil oppstod ved innlegging av den nye oppføringen."
+#: lib/Message.php:481
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr "En feil oppstod ved fjerning av vedlegget. IMAP-serveren sa: "
 
-msgid "Answered messages"
-msgstr "Besvarte meldinger"
+#: lib/Message.php:375
+msgid "An unknown error occured while creating the new task."
+msgstr "En ukjent feil oppstod ved innlegging av den nye oppføringen."
 
+#: message.php:490 mailbox.php:677 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Besvart"
 
-msgid "Apply All Rules"
-msgstr "Bruk alle regler"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Besvarte meldinger"
 
-msgid "Apply Filters on"
-msgstr "Bruk filtre på"
+#: templates/mailbox/header.inc:7
+msgid "Apply Filters"
+msgstr "Bruk filtre"
+
+#: templates/mailbox/header.inc:7
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "Bruk filtre på %s"
 
+#: templates/filters/prefs.inc:43
 msgid "Apply filter rules upon logging on?"
 msgstr "Bruk filterregler ved pålogging."
 
-msgid "Apply filter rules when mailbox is refreshed?"
-msgstr "Bruk filterregler ved oppdatering av postboks."
-
-msgid "April"
-msgstr "april"
+#: templates/filters/prefs.inc:49
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr "Bruk filterregler ved oppdatering av innboks."
 
+#: templates/folders/javascript.inc:9
 msgid "Are you SURE you want to continue?"
 msgstr "Er du SIKKER på at du ønsker å fortsette?"
 
+#: templates/folders/javascript.inc:5
 msgid "Are you completely sure you wish to continue?"
 msgstr "Er du SIKKER på at du ønsker å fortsette?"
 
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+msgid "Are you sure you want to delete this public key?"
+msgstr "Er du SIKKER på at du ønsker å slette denne offentlige nøkkelen?"
+
+#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr "Er du sikker på at du vil slette nøkkelparet ditt? (IKKE anbefalt!)"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
-msgstr "Er du SIKKER på at du ønsker å fortsette?"
+msgstr "Er du SIKKER?"
 
+#: message.php:398 templates/folders/javascript.inc:73
+#: templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
-msgstr "Er du sikker på at du vil slette denne meldingen FOR GODT"
+msgstr "Er du sikker på at du vil slette disse meldingene FOR GODT?"
+
+#: lib/MIME/Contents.php:215
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Er du sikker på at du vil slette dette vedlegget FOR GODT?"
 
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
-msgstr "Er du sikker på at du vil slette denne meldingen FOR GODT"
+msgstr "Er du sikker på at du vil tømme denne mappen?"
 
+#: lib/IMP.php:901
 msgid "Are you sure you wish to empty your trash folder?"
-msgstr "Er du sikker på at du vil slette denne meldingen FOR GODT"
+msgstr "Er du sikker på at du vil tømme søppelkassen?"
 
+#: templates/mailbox/actions.inc:8
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Er du sikker på at du vil slette disse meldingene FOR GODT?"
+
+#: templates/mailbox/javascript.inc:86
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Er du sikker på at du vil rapportere denne meldingen som uskyldig?"
+
+#: templates/mailbox/javascript.inc:77
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Er du sikker på at du vil rapportere denne meldingen som spam?"
+
+#: config/prefs.php.dist:887
 msgid "Arrival Time"
 msgstr "Ankomsttid"
 
+#: config/prefs.php.dist:902
 msgid "Ascending"
 msgstr "Stigende"
 
+#: config/prefs.php.dist:564 config/prefs.php.dist:585
+msgid "Ask"
+msgstr "Spør"
+
+#: templates/compose/compose.inc:509
 msgid "Attach"
 msgstr "Legg ved"
 
+#: templates/compose/compose.inc:466
+msgid "Attach Files"
+msgstr "Vedlegg filer"
+
+#: templates/compose/compose.inc:447
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "Vedlegge en kopi av din offentlige PGP-nøkkel til meldigen?"
+
+#: lib/MIME/Viewer/tnef.php:113
+msgid "Attached File:"
+msgstr "Legg ved fil:"
+
+#: lib/Compose.php:366 lib/Compose.php:453
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+"Vedlagt fil \"%s\" overskider maxstørrelsen for vedlegg. Filen vedlegges "
+"IKKE."
+
+#: lib/MIME/Viewer/itip.php:341
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "Vedlegger svar på kalender-forespørselen du sendte."
+
+#: mailbox.php:711 templates/mailbox/legend.inc:16
+#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
+#: templates/compose/attachments.js:98
 msgid "Attachment"
 msgstr "Vedlegg"
 
+#: compose.php:987 lib/Message.php:442
+msgid "Attachment stripped: Original attachment type"
+msgstr "Vedlegg fjernet: Vedleggstype"
+
+#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
+#: lib/Compose.php:1009
 msgid "Attachments"
 msgstr "Vedlegg"
 
-msgid "August"
-msgstr "august"
+#: lib/MIME/Viewer/itip.php:635
+msgid "Attendees"
+msgstr "Deltagere"
+
+#: lib/MIME/Viewer/notification.php:56
+msgid "Attention"
+msgstr "Observer"
+
+#: lib/Auth/imp.php:49
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr "Auth_imp: Kan ikke finne den nødvendige IMAP utvidelsen."
+
+#: config/prefs.php.dist:643
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
+"Vise bilder i HTML-meldinger automatisk når avsenderen finnes i adresseboken?"
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
 msgstr "Tilgjengelige adressebøker:"
 
-msgid "Back to %s"
-msgstr "Tilbake til %s"
+#: lib/MIME/Viewer/itip.php:671
+msgid "Awaiting Response"
+msgstr "Venter på svar"
 
+#: templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Bac_k to %s"
+msgstr "Tilba_ke til %s"
+
+#: thread.php:69 templates/message/navbar_navigate.inc:26
+#, php-format
+msgid "Back to %s"
 msgstr "Tilbake til %s"
 
+#: message.php:257 search.php:153 templates/contacts/contacts.inc:224
+#: templates/compose/recompose.inc:20
 msgid "Bcc"
-msgstr "Skjult kopi til"
+msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:168
+msgid "Below is the raw text of the status information message."
+msgstr "Nedenfor finnes den opprinnelige teksten fra stautsmeldingen."
+
+#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Svarteliste"
 
-msgid "_Blacklist"
-msgstr "Svartelist avsender"
+#: config/prefs.php.dist:631
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr "Blokkere bilder i HTML-meldinger om de ikke er spesielt forespurt?"
 
+#: search.php:161
 msgid "Body"
 msgstr "Meldingstekst"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Begge"
 
-msgid "Cancel Message"
-msgstr "Avbryt melding"
+#: config/prefs.php.dist:690
+msgid "Both Header Listing and Body of Message"
+msgstr "Både i meldingshode og meldingstekst"
 
+#: templates/compose/compose.inc:283
+msgid "C_harset"
+msgstr "T_egnsett"
+
+#: templates/search/fields.inc:35
+msgid "Calendar"
+msgstr "Kalender"
+
+#: lib/Fetchmail/imap.php:204
+msgid "Can not connect to the remote mail server."
+msgstr "Kan ikke kontakte den eksterne e-post tjeneren."
+
+#: lib/Fetchmail/imap.php:202
+msgid "Can not connect to the remote mail server: "
+msgstr "Kan ikke kontakte den eksterne e-post tjeneren: "
+
+#: lib/MIME/Viewer/partial.php:53
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+"Kan ikke vise - fant bare %s av %s deler av meldingen i den aktuelle "
+"postboksen."
+
+#: templates/contacts/contacts.inc:253 templates/folders/import.inc:21
+#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
+#: templates/compose/spelling.inc:127 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Avbryt"
 
+#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/redirect.inc:116
+msgid "Cancel Message"
+msgstr "Avbryt melding"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
-msgstr "Hvis du avbryter denne meldingen, mister du innholdet."
+msgstr "Hvis du avbryter denne meldingen, mister du alt innholdet."
 
+#: message.php:256 search.php:149 templates/contacts/contacts.inc:223
+#: templates/compose/recompose.inc:15
 msgid "Cc"
-msgstr "Kopi til"
+msgstr "Cc"
+
+#: lib/MIME/Viewer/itip.php:653
+msgid "Chair Person"
+msgstr "Ordstyrer"
 
-msgid "Cc:"
-msgstr "Kopi:"
+#: templates/compose/spelling.inc:86
+msgid "Change"
+msgstr "Endre"
 
+#: templates/compose/spelling.inc:87
 msgid "Change All"
 msgstr "Endre alt"
 
+#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+msgid "Change Folder"
+msgstr "Endre mappe"
+
+#: config/prefs.php.dist:111
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
 "Endre visningsvalg som antallet meldinger per side og meldingssortering."
 
-msgid "Change mail server settings."
-msgstr "Endre e-postserver instillinger."
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr "Endre e-postserver og mappe instillinger."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -260,115 +715,282 @@
 "Endre navn, adresse og signatur som folk ser når de leser og svarer på "
 "posten din."
 
-msgid "Change"
-msgstr "Endre"
+#: config/prefs.php.dist:793
+msgid "Characters to display:"
+msgstr "Antall tegn som skal vises:"
 
+#: templates/folders/actions.inc:13
 msgid "Check Folder(s) for New Mail"
 msgstr "Se etter ny post i mappen(e)"
 
-msgid "Checkbox"
-msgstr "Avkrysningsboks"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+msgid "Check _All/None"
+msgstr "Velg _Alle/Ingen"
+
+#: templates/fetchmail/fetchmail.inc:14
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr "Velg alle servere du vil hente e-post fra:"
 
+#: config/prefs.php.dist:454
+msgid "Check spelling before sending a message?"
+msgstr "Benytte stavekontroll før melding sendes?"
+
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Velg handling:"
 
+#: config/servers.php.dist:194
 msgid "Choose a mail server:"
 msgstr "Velg en e-postserver:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:683
+msgid "Choose an action:"
+msgstr "Velg handling:"
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
 msgstr "Velg adresseboken som skal brukes ved valg av adresser."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr ""
 "Velg rekkefølgen blant adressebøkene som brukes til utvidelse av adresser."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Videresendt melding fra %s."
+#: lib/MIME/Viewer/images.php:109
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr "Klikk %s for å konvertere bildet til et format din nettleser kan vise."
+
+#: lib/MIME/Viewer/images.php:98
+#, php-format
+msgid "Click %s to download the image."
+msgstr "Trykk %s for å laste ned bildet."
+
+#: lib/Filter.php:113
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr "Klikk %s for å gå til %s-administrasjonssiden."
 
-msgid "Click here for Secure HTTPS"
-msgstr "Trykk her for Sikker HTTPS"
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Trykk %s for å vise HTML-innhold i et eget vindu."
 
-msgid "Click here for Standard HTTP"
-msgstr "Trykk her for Standard HTTP"
+#: lib/MIME/Viewer/images.php:160
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr "Klikk %s for å vise en mindre versjon av dette bildet."
+
+#: lib/MIME/Viewer/pkcs7.php:414
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Trykk %s for å vise vedlegget i et eget vindu."
+
+#: lib/MIME/Viewer/related.php:64
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Trykk %s for å vise multipart/related i et eget vindu."
 
+#: lib/MIME/Viewer/html.php:103
 msgid "Click here to HIDE the Images"
 msgstr "Trykk her for å SKJULE bildene"
 
+#: lib/MIME/Viewer/html.php:106
 msgid "Click here to SHOW the Images"
 msgstr "Trykk her for å VISE bildene"
 
-msgid "Click %s to view HTML content in a separate window."
-msgstr "Trykk %s for å vise HTML-innhold i et eget vindu."
-
+#: templates/prefs/sourceselect.inc:321
 msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
+"Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
 "Klikk på en av dine valgte adressebøker, og velg feltene som det skal søkes "
 "i."
 
+#: lib/MIME/Viewer/pgp.php:176
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr "Klikk for å lagre den offentlige PGP-nøkkelen i din adressebok."
+
+#: lib/MIME/Viewer/pkcs7.php:194
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr "Klikk for å lagre S/MIME sertifikatet for %s i din adressebok"
+
+#: config/prefs.php.dist:921
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr "Om du klikker på adressen åpner du en ny melding til avsenderen"
+
+#: config/prefs.php.dist:922
+msgid "Clicking on the address will open the message to be read"
+msgstr "Om du klikker på adressen åpnes meldingen"
+
+#: templates/fetchmail/fetchmail.inc:30
+msgid "Close"
+msgstr "Lukk"
+
+#: compose.php:762 compose.php:1068
+msgid "Close this window"
+msgstr "Lukk vinduet"
+
+#: folders.php:383
 msgid "Closed Folder"
 msgstr "Lukket mappe"
 
-msgid "Collapse All Folders"
-msgstr "Slå sammen alle mappene"
+#: folders.php:403
+msgid "Collapse"
+msgstr "Slå sammen"
 
+#: templates/folders/actions.inc:34
 msgid "Collapse All"
 msgstr "Slå sammen alle"
 
+#: templates/folders/actions.inc:34
+msgid "Collapse All Folders"
+msgstr "Slå sammen alle mappene"
+
+#: folders.php:403
 msgid "Collapse Folder"
 msgstr "Slå sammen mappe"
 
-#, c-format
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr "Fargeindikator: "
+
+#: templates/pgp/pgp.inc:191
+msgid "Comment"
+msgstr "Kommentar"
+
+#: lib/MIME/Viewer/itip.php:721
+msgid "Completed"
+msgstr "Ferdig"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
+msgid "Compose"
+msgstr "Ny melding"
+
+#: mailbox.php:741 lib/MIME/Headers.php:195
+#, php-format
 msgid "Compose Message (%s)"
 msgstr "Skriv melding (%s)"
 
-msgid "Compose a message"
-msgstr "Skriv en melding"
+#: compose.php:761 compose.php:1067
+msgid "Compose another message"
+msgstr "Skriv en ny melding"
 
+#: config/prefs.php.dist:429
 msgid "Compose messages in a separate window?"
-msgstr "Lag ny melding i et eget vindu."
-
-msgid "Compose"
-msgstr "Ny melding"
+msgstr "Skrive ny melding i et eget vindu?"
 
-msgid "_Compose"
-msgstr "Ny melding"
+#: config/prefs.php.dist:446
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+"Skrive melding med et HTML GUI som standard (hvis nettleseren støtter "
+"funksjonen)?"
 
-msgid "Contact List"
-msgstr "Kontakter"
+#: config/prefs.php.dist:70
+msgid "Configure how messages are displayed."
+msgstr "Innstillinger for meldingsvisning."
+
+#: config/prefs.php.dist:96
+msgid "Configure mail preview options."
+msgstr "Innstillinger for forhåndsvisning."
+
+#: lib/Fetchmail/imap.php:237
+msgid "Connection to server failed"
+msgstr "Koblingen til tjeneren mislyktes"
+
+#: config/prefs.php.dist:135
+#, php-format
+msgid "Control PGP support for %s."
+msgstr "Sjekk PGP støtte for %s."
+
+#: config/prefs.php.dist:144
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr "Sjekk S/MIME støtte for %s"
 
+#: config/prefs.php.dist:88
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
 "Sett hvor ofte det skal sjekkes etter ny post, og om du ønsker varsling."
 
+#: config/prefs.php.dist:700
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "Konvertere følelsesikoner i tekstformat til grafiske?"
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Kopier"
 
+#: templates/message/navbar_navigate.inc:19
+msgid "Copy to folder"
+msgstr "Kopier til mappe"
+
+#: templates/compose/spelling.inc:66
 msgid "Correct"
 msgstr "Korrekt"
 
+#: templates/compose/spelling.inc:145
 msgid "Corrected Text"
 msgstr "Rettet tekst"
 
-msgid "Could not delete messages from %s: %s"
-msgstr "Ikke slettede melding"
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr "Kunne ikke lage VFS-backend: %s"
+
+#: lib/Message.php:624
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "Kunne ikke slette meldingen fra %s. Serveren sa: %s"
+
+#: lib/Session.php:294
+msgid "Could not execute maintenance operations."
+msgstr "Kunne ikke utføre vedlikeholdsoperasjoner"
+
+#: lib/MIME/Viewer/tnef.php:56
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr "Kunne ikke hente ut den forespurte filen fra MS-TNEF vedlegget."
+
+#: lib/MIME/Viewer/zip.php:61
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "Kunne ikke hente ut den forespurte filen fra Zip arkivet."
+
+#: search.php:356 templates/fetchmail/manage.inc:67
+#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:157
+msgid "Create"
+msgstr "Opprett"
 
+#: templates/folders/actions.inc:5
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
+#: templates/pgp/pgp.inc:252
+msgid "Create Keys"
+msgstr "Opprett nøkler"
+
+#: templates/search/header.inc:14
+msgid "Create Virtual Folder"
+msgstr "Opprett virtuell mappe"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
-msgstr "Lag ny kladdemappe"
+msgstr "Opprett ny kladdemappe"
 
+#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
 msgid "Create a new sent mail folder"
-msgstr "Lag en ny 'Sendte elementer'-mappe"
+msgstr "Opprett ny 'Sendte elementer'-mappe"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Lag ny søppelmappe"
+msgstr "Opprett ny søppelmappe"
 
+#: config/prefs.php.dist:120
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -376,917 +998,2631 @@
 "Lag filtre for å organisere innkommende post, fordele den i mapper, og for å "
 "slette spam."
 
-msgid "Create"
-msgstr "Opprett"
-
-msgid "Customize how you send mail and where drafts are saved."
-msgstr ""
-"Tilpass hvordan du sender post, og hvor kladder og sendte meldinger blir "
-"lagret."
-
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Tilpass vedlikeholdsoperasjoner som kjøres ved login til IMP."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr "Nåværende rettigheter for %s"
+
+#: config/prefs.php.dist:104
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr "Tilpass kontoer for henting av meldinger fra andre kontoer."
+
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr "Tilpass hvordan du sender post."
 
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Tilpass oppgaver som kjøres ved innlogging til %s."
 
+#: templates/mailbox/message_headers.inc:12
+msgid "Dat_e"
+msgstr "Dat_o"
+
+#: message.php:253 thread.php:75
 msgid "Date"
 msgstr "Dato"
 
-msgid "December"
-msgstr "desember"
-
-msgid "Default Identity"
-msgstr "Din standardidentitet:"
+#: lib/MIME/Viewer/itip.php:709
+msgid "Declined"
+msgstr "Avslått"
+
+#: lib/MIME/Viewer/itip.php:233
+msgid "Declined: "
+msgstr "Avslått: "
 
+#: config/prefs.php.dist:894
 msgid "Default sorting criteria:"
-msgstr "Standard sorteringskriteier:"
+msgstr "Standard sorteringskriteie:"
 
+#: config/prefs.php.dist:904
 msgid "Default sorting direction:"
 msgstr "Standard sorteringsrekkefølge:"
 
+#: lib/MIME/Viewer/itip.php:717
+msgid "Delegated"
+msgstr "Delegert"
+
+#: folders.php:374 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:93
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#, php-format
+msgid "Delete %s Public Key"
+msgstr "Slette offentlig nøkkel for %s"
+
+#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+msgid "Delete Current Keys"
+msgstr "Slett nåværende nøkler"
+
+#: templates/folders/actions.inc:7
 msgid "Delete Folder(s)"
 msgstr "Slett mappen(e)"
 
-msgid "Delete messages"
-msgstr "Slett meldinger"
+#: folders.php:374
+msgid "Delete Virtual Folder"
+msgstr "Slett virtuell mappe"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr "Slett meldinger hentet fra ekstern tjener?"
+
+#: lib/MIME/Viewer/itip.php:584
+msgid "Delete from my calendar"
+msgstr "Slett fra kalenderen min"
+
+#: config/prefs.php.dist:362
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Slett lenkede vedlegg i begynnelsen av måneden?"
 
+#: config/prefs.php.dist:344
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Slett gamle mapper med sendte meldinger på begynnelsen av måneden?"
 
-msgid "Delete"
-msgstr "Slett"
-
-msgid "_Delete"
-msgstr "Slett"
+#: config/prefs.php.dist:621
+msgid "Delete spam messages after they have been reported as spam?"
+msgstr "Slette spam meldinger når de er rapportert som spam?"
 
-msgid "Deleted an attachment."
-msgstr "Slettet et vedlegg."
+#: message.php:493 mailbox.php:701 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Slettet"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Slettede meldinger"
 
-msgid "Deleted"
-msgstr "Slettet"
+#: compose.php:292
+#, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Slettet vedlegget \"%s\"."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Slette og flytte meldinger"
 
+#: lib/MIME/Viewer/itip.php:548
+msgid "Deny request"
+msgstr "Avslå forespørsel"
+
+#: lib/MIME/Viewer/itip.php:497
+msgid "Deny request for free/busy information"
+msgstr "Avslå forespørsel for ledig/opptatt-informasjon"
+
+#: config/prefs.php.dist:903
 msgid "Descending"
 msgstr "Synkende"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:623
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:151
+msgid "Details"
+msgstr "Detaljer"
+
+#: config/prefs.php.dist:680
 msgid "Dim signatures?"
 msgstr "Skyggelegg signatur?"
 
-msgid "Display Options"
-msgstr "Visningsvalg"
+#: templates/contacts/contacts.inc:237
+msgid "Display"
+msgstr "Vis"
 
-msgid ""
-"Display confirmation after sending a message? (only when not using a pop-up "
-"compose window)"
+#: config/prefs.php.dist:470
+msgid "Display confirmation after sending a message?"
 msgstr ""
 "Vis bekreftelse etter å ha sendt en melding? (gjelder kun om nye meldinger "
 "ikke blir skrevet i en pop-up boks)"
 
-msgid "Display message when filters have been applied?"
-msgstr "Vis melding når filtrene er i bruk?"
+#: config/prefs.php.dist:689
+msgid "Display in Body of Message"
+msgstr "Vise i meldingskroppen"
 
+#: config/prefs.php.dist:768
 msgid "Display pop-up notification of new mail?"
 msgstr "Varsle ny post med pop-up melding?"
 
-msgid "Display"
-msgstr "Vis"
+#: config/prefs.php.dist:733
+msgid "Display the 'Empty Trash' link in the menubar?"
+msgstr "Vise 'Tøm søppelkurv' i menyen?"
+
+#: templates/compose/attachments.inc:11
+msgid "Disposition"
+msgstr "Plassering"
+
+#: templates/search/fields.inc:25
+msgid "Do NOT match"
+msgstr "IKKE tilfredsstill"
 
+#: templates/folders/actions.inc:14
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Ikke se etter ny post i mappen(e)"
 
+#: config/prefs.php.dist:923
+msgid "Do not generate a link in the From: column"
+msgstr "Ikke generer en link fra From:-kolonnen"
+
+#: lib/IMP.php:1003
 msgid "Do you want to open that folder?"
 msgstr "Vil du åpne den mappen?"
 
+#: templates/compose/spelling.inc:133
 msgid "Done"
 msgstr "Ferdig"
 
-#, c-format
-msgid "Download %s"
-msgstr "Last ned %s"
+#: lib/MIME/Contents.php:204
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr "Last ned %s som en zip-fil"
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr "Last ned alle vedlegg (som en zip-fil)"
 
+#: templates/folders/actions.inc:18
 msgid "Download Folder(s)"
 msgstr "Last ned mappen(e)"
 
-msgid "Download"
-msgstr "Last ned"
-
+#: templates/folders/actions.inc:19
+msgid "Download Folder(s) [.zip format]"
+msgstr "Last ned mappen(e) (som en zip-fil)"
+
+#: lib/MIME/Contents.php:204
+msgid "Download in .zip Format"
+msgstr "Last ned i .zip-format"
+
+#: message.php:491 mailbox.php:682 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Kladd"
 
+#: folders.php:354
+msgid "Draft folder"
+msgstr "Kladdemappe"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Kladdemappe:"
 
-msgid "Edit your filter rules"
-msgstr "Endre mine filterregler"
+#: templates/pgp/pgp.inc:196
+msgid "E-mail Address"
+msgstr "E-postadresse"
 
-msgid "Edit your identities"
-msgstr "Rediger identitetene dine"
+#: lib/MIME/Viewer/status.php:77
+msgid "ERROR: Your message could not be delivered."
+msgstr "FEIL: Meldingen kunne ikke leveres."
 
+#: folders.php:375
 msgid "Edit"
 msgstr "Rediger"
 
+#: templates/filters/prefs.inc:21
+msgid "Edit Blacklist"
+msgstr "Redigere sperrede adresser"
+
+#: templates/filters/prefs.inc:16
+msgid "Edit Filters"
+msgstr "Redigere postfiltre"
+
+#: folders.php:375 templates/search/header.inc:16
+#: templates/mailbox/header.inc:13
+msgid "Edit Virtual Folder"
+msgstr "Rediger virtuell mappe"
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr "Rediger definisjonen for den virituelle mappen %s"
+
+#: templates/filters/prefs.inc:26
+msgid "Edit Whitelist"
+msgstr "Redigere betrodde adresser"
+
+#: templates/filters/prefs.inc:21
+msgid "Edit your blacklist"
+msgstr "Redigere mine sperrede adresser"
+
+#: templates/filters/prefs.inc:16
+msgid "Edit your filter rules"
+msgstr "Redigere mine filterregler"
+
+#: config/prefs.php.dist:830
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr "Endre innstillinger for tilgang til andre e-post kontoer."
+
+#: templates/filters/prefs.inc:26
+msgid "Edit your whitelist"
+msgstr "Redigere min liste over betrodde adresser"
+
+#: templates/contacts/contacts.inc:240
 msgid "Email Address"
 msgstr "E-postadresse"
 
+#: lib/Message.php:641
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "Slettet alle meldinger fra %s."
+
+#: templates/folders/actions.inc:20
 msgid "Empty Folder(s)"
-msgstr "Slett mappen(e)"
+msgstr "Tømme mappen(e)"
 
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
-msgstr "Søppelmappe:"
-
-msgid "Empty Trash"
 msgstr "Tøm søppelkurven"
 
+#: lib/IMP.php:901
+msgid "Empty _Trash"
+msgstr "Tøm _søppelkurven"
+
+#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+msgid "Enable PGP functionality?"
+msgstr "Aktivere PGP-funksjonalitet?"
+
+#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+msgid "Enable S/MIME functionality?"
+msgstr "Aktivere S/MIME-funksjonalitet?"
+
+#: config/prefs.php.dist:780
+msgid "Enable message previews?"
+msgstr "Aktivere forhåndsvisning?"
+
+#: templates/compose/compose.inc:433
+msgid "Encr_yption Options"
+msgstr "Kryp_teringsinstillinger"
+
+#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:611
+msgid "End"
+msgstr "Slutt"
+
+#: lib/Compose.php:331
 msgid "End forwarded message"
 msgstr "Slutt på videresendt melding"
 
+#: lib/Compose.php:272
+msgid "End message"
+msgstr "Slutt på meldingen"
+
+#: lib/Compose.php:270
+#, php-format
+msgid "End message from %s"
+msgstr "Slutt på melding fra %s"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+msgid "Enter Passphrase"
+msgstr "Angi passphrase"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Navngi den nye kladdemappen din"
 
+#: templates/prefs/sentmailselect.inc:24
 msgid "Enter the name for your new sent mail folder"
 msgstr "Navngi den nye 'Sendte elementer'-mappen din"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Navngi den nye søppelmappen din"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: message.php:185 compose.php:1054
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Oppføringen \"%s\" ble lagt til adresseboken"
 
+#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
+#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:392
+#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
 msgid "Error"
 msgstr "Feil"
 
+#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#, php-format
+msgid "Error sending reply: %s."
+msgstr "Feil ved sending av svar: %s"
+
+#: lib/MIME/Viewer/itip.php:92
+msgid "Event successfully deleted."
+msgstr "Hendelsen ble slettet."
+
+#: config/prefs.php.dist:758
 msgid "Every 15 minutes"
 msgstr "Hvert 15. minutt"
 
+#: config/prefs.php.dist:755
 msgid "Every 30 seconds"
 msgstr "Hvert 30. sekund"
 
+#: config/prefs.php.dist:757
 msgid "Every 5 minutes"
 msgstr "Hvert 5. minutt"
 
+#: config/prefs.php.dist:759
 msgid "Every half hour"
 msgstr "Hver halvtime"
 
+#: config/prefs.php.dist:756
 msgid "Every minute"
 msgstr "Hvert minutt"
 
-msgid "Expand All Folders"
-msgstr "Utvid alle mappene"
+#: folders.php:412
+msgid "Expand"
+msgstr "Utvid"
 
+#: templates/folders/actions.inc:33
 msgid "Expand All"
 msgstr "Utvid alle"
 
+#: templates/folders/actions.inc:33
+msgid "Expand All Folders"
+msgstr "Utvid alle mappene"
+
+#: folders.php:412
 msgid "Expand Folder"
 msgstr "Utvid mappe"
 
+#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
 msgid "Expand Names"
 msgstr "Utvid navn"
 
+#: config/prefs.php.dist:1021
+msgid "Expand names in the compose window automatically in the background?"
+msgstr "Utvid navn i 'skriv ny melding' automatisk i bakgrunnen?"
+
+#: config/prefs.php.dist:951
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Utvid hele mappetreet som standdard i mappevisningen?"
 
-msgid "February"
-msgstr "februar"
-
-msgid "Field"
-msgstr "Felt"
-
-msgid "Filename"
-msgstr "Filnavn"
-
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Filtrering: Meldingen \"%s\" fra \"%s\" har blitt slettet."
-
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"Filtrering: Meldingen \"%s\" fra \"%s\" har blitt flyttet til mappen \"%s\"."
+#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
+#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+msgid "Expanding"
+msgstr "Utvider"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr ""
-"Filtrering: Meldingen \"%s\" fra \"%s\" har blitt flyttet til søplekassen."
+#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+msgid "Fetch Mail"
+msgstr "Hent e-post"
 
-msgid "Filter Rules"
-msgstr "Filterregler"
+#: config/prefs.php.dist:839
+msgid "Fetch Mail in a separate window?"
+msgstr "Hente nye meldinger i et eget vindu?"
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "Hente nye meldinger ved pålogging."
+
+#: lib/Fetchmail.php:306
+#, php-format
+msgid "Fetched %d message(s) from %s"
+msgstr "Hentet %d melding(er) fra %s."
+
+#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+msgid "Fetchmail: "
+msgstr "Fetchmail: "
+
+#: lib/Fetchmail.php:308
+msgid "Fetchmail: no new messages."
+msgstr "Fetchmail: ingen nye meldinger."
+
+#: lib/IMP.php:916
+msgid "Fi_lters"
+msgstr "Fi_ltre"
+
+#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+msgid "File"
+msgstr "Fil"
+
+#: templates/filters/prefs.inc:35
+msgid "Filter Options"
+msgstr "Filterinnstillinger"
+
+#: templates/filters/prefs.inc:8
+msgid "Filter Settings"
+msgstr "Filterinnstillinger"
 
+#: config/prefs.php.dist:603
 msgid "Filter message content for profanity?"
 msgstr "Filtrer vulgært meldingsinnhold."
 
+#: templates/filters/notactive.inc:8
+msgid "Filter support is disabled on this system."
+msgstr "Filterstøtte er avslått i dette systemet."
+
+#: config/prefs.php.dist:119
 msgid "Filters"
 msgstr "Filtre"
 
+#: templates/filters/notactive.inc:2
+msgid "Filters NOT Active"
+msgstr "Filtere er IKKE aktive"
+
+#: lib/Filter.php:112
+#, php-format
+msgid "Filters: %s management page"
+msgstr "Filtere: %s administrasjons side"
+
+#: templates/contacts/contacts.inc:183
 msgid "Find"
 msgstr "Søk"
 
+#: config/prefs.php.dist:876
+msgid "First Mailbox Page"
+msgstr "Første postboks side"
+
+#: mailbox.php:334
 msgid "First Page"
 msgstr "Første side"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+msgid "Fo_rward"
+msgstr "Vi_deresend"
+
+#: folders.php:259 templates/folders/head.inc:2
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Mappenavigatør"
 
+#: templates/login/login.inc:199
 msgid "Folder Prefix"
 msgstr "Mappeprefiks"
 
-msgid "Folders"
-msgstr "Mapper"
-
-msgid "_Folders"
-msgstr "Mapper"
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "Mappesammendrag"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr "Mappedeling er ikke tilgjengelig."
+
+#: folders.php:52
+msgid "Folder use is not enabled."
+msgstr "Mappebruk er ikke tilgjengelig."
+
+#: config/prefs.php.dist:940
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr "Datoformatet i postboksvisningen for meldinger datert i dag"
 
+#: compose.php:714 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Videresend"
 
+#: compose.php:699
 msgid "Forward:"
 msgstr "Videresend:"
 
-msgid "Fo_rward"
-msgstr "Videresend"
+#: lib/Compose.php:300
+msgid "Forwarded message"
+msgstr "Videresendt melding"
 
-#, c-format
+#: lib/Compose.php:298
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Videresendt melding fra %s"
 
-msgid "From Address"
-msgstr "Fra-adresse"
+#: lib/MIME/Viewer/itip.php:442
+msgid "Free/Busy Information"
+msgstr "Ledig/opptatt-informasjon"
+
+#: lib/MIME/Viewer/itip.php:453
+msgid "Free/Busy Reply"
+msgstr "Ledig/opptatt svar"
+
+#: lib/MIME/Viewer/itip.php:447
+msgid "Free/Busy Request"
+msgstr "Ledig/opptatt forespørsel"
+
+#: lib/MIME/Viewer/itip.php:364
+msgid "Free/Busy Request Response"
+msgstr "Svar på ledig/opptatt forespørsel"
 
+#: templates/mailbox/message_headers.inc:22
+msgid "Fro_m"
+msgstr "Avsende_r"
+
+#: message.php:254 search.php:141 thread.php:76
+#: templates/compose/compose.inc:98
 msgid "From"
 msgstr "Fra"
 
-msgid "From:"
-msgstr "Fra:"
+#: config/prefs.php.dist:889
+msgid "From Address"
+msgstr "Fra-adresse"
 
+#: compose.php:711 compose.php:715
 msgid "Fwd:"
 msgstr "Fwd:"
 
+#: compose.php:1215
+msgid "Fwd: "
+msgstr "Fwd: "
+
+#: compose.php:1217
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Fwd: %u videresendt melding"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "Generelle innstillinger"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "Hente kun nye meldinger? (Kun IMAP)"
+
+#: thread.php:68
+msgid "Go to Message"
+msgstr "Gå til melding"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr "Gi tilgang"
+
+#: message.php:546 lib/Filter.php:112 lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:105 lib/MIME/Viewer/images.php:107
+#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/related.php:64 lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
 msgid "HERE"
 msgstr "HER"
 
-msgid "Help"
-msgstr "Hjelp"
+#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+msgid "HTML"
+msgstr "HTML"
+
+#: compose.php:243
+msgid "HTML Version of Message"
+msgstr "HTML-versjon av meldingen"
 
-msgid "_Help"
-msgstr "Hjelp"
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr "Meldingshoder"
 
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr "Her er meldingen du skrev på:"
+
+#: config/prefs.php.dist:671
+msgid "Hidden"
+msgstr "Skjult"
+
+#: config/prefs.php.dist:670
+msgid "Hidden in Thread View"
+msgstr "Skjult i trådvisning"
+
+#: mailbox.php:356
 msgid "Hide Deleted"
 msgstr "Skjul slettede elementer"
 
+#: folders.php:254
 msgid "Hide Unsubscribed"
 msgstr "Skjul uabonnerte"
 
-msgid "How to prefix quoted lines in a reply:"
-msgstr "Hvordan skal siterte linjer i et svar rykkes inn:"
-
-msgid "IMP is not properly configured"
-msgstr "IMP er ikke konfigurert skikkelig"
+#: lib/MIME/Viewer/html.php:103
+msgid "Hide the Images"
+msgstr "Skjul bilder"
+
+#: templates/compose/compose.inc:305
+msgid "High"
+msgstr "Høy"
+
+#: message.php:288 mailbox.php:687 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr "Høy prioritet"
+
+#: templates/compose/compose.inc:304
+msgid "Highest"
+msgstr "Høyest"
+
+#: config/prefs.php.dist:691
+msgid "How do you want to display attachments?"
+msgstr "Hvordan vil du vise vedlegg?"
+
+#: config/prefs.php.dist:496
+msgid "How to attribute quoted lines in a reply"
+msgstr "Hvordan skal siterte linjer i et svar rykkes inn"
+
+#: lib/Fetchmail/imap.php:137
+msgid "IMAP"
+msgstr "IMAP"
+
+#: lib/Fetchmail/imap.php:132
+msgid "IMAP (Auto Detect Protocols)"
+msgstr "IMAP (Detekter protokoll automatisk)"
 
-msgid "INBOX"
-msgstr "INNBOKS"
-
-msgid "_INBOX"
-msgstr "Innboks"
+#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+msgid "IMAP over SSL"
+msgstr ""
 
-msgid "Inbox"
-msgstr "Innboks"
+#: lib/Fetchmail/imap.php:155
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "_Inbox"
-msgstr "Innboks"
+#: templates/login/login.inc:175
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
 
-msgid "Identities"
-msgstr "Identiteter"
+#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+msgid "IMAP, no TLS"
+msgstr ""
 
-msgid "Identity"
-msgstr "Identitet"
+#: lib/Fetchmail/imap.php:50
+msgid "IMAP/POP3 Mail Servers"
+msgstr "IMAP/POP3 e-post tjenere"
 
-msgid "_Identity"
-msgstr "Identitet"
+#: folders.php:346
+msgid "INBOX"
+msgstr "INNBOKS"
 
-msgid "Identity's name:"
-msgstr "Identitetens navn:"
+#: templates/compose/spelling.inc:88
+msgid "Ignore"
+msgstr "Ignorér"
 
+#: templates/compose/spelling.inc:89
 msgid "Ignore All"
 msgstr "Ignorér alt"
 
-msgid "Ignore"
-msgstr "Ignorér"
-
-msgid "Important messages"
-msgstr "Viktige meldinger"
+#: templates/folders/import.inc:20
+msgid "Import"
+msgstr "Viktig"
 
+#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+msgid "Import Key"
+msgstr "Importer nøkkel"
+
+#: templates/pgp/pgp.inc:254
+msgid "Import Keypair"
+msgstr "Importer nøkkelpar"
+
+#: templates/folders/actions.inc:25
+msgid "Import Messages"
+msgstr "Importer meldinger"
+
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr "Importer PGP-nøkler"
+
+#: templates/smime/smime.inc:148
+msgid "Import Personal Certificates"
+msgstr "Importer personlig sertifikat"
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr "Importer personlig privat PGP-nøkkel"
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr "Importer personlig offentlig PGP-nøkkel"
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr "Importer personlig S/MIME sertifikater"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+msgid "Import Public Key"
+msgstr "Importer offentlig nøkkel"
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr "Importer offentlig PGP-nøkkel"
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr "Importer offentlig S/MIME nøkkel"
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr "Importer S/MIME nøkkel"
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr "Importer mbox-fil"
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr "Importer mbox-filen %s til mappen %s."
+
+#: message.php:492 mailbox.php:695 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Viktig"
 
-msgid "Include original message in a reply?"
-msgstr "Innkluder orginal melding i svar?"
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Viktige meldinger"
+
+#: folders.php:157
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr "Importerte %d meldinger fra %s."
+
+#: lib/MIME/Viewer/itip.php:725
+msgid "In Process"
+msgstr "Under arbeid"
 
-msgid "Invalid character in e-mail address."
-msgstr "Ulovlig tegn i e-post adressen."
+#: lib/Folder.php:248 lib/IMP.php:368
+msgid "Inbox"
+msgstr "Innboks"
 
-msgid "January"
-msgstr "januar"
+#: config/prefs.php.dist:484
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Innkluder et kort sammendrag av meldingshoder i svar?"
 
-msgid "July"
-msgstr "juli"
+#: config/prefs.php.dist:478
+msgid "Include original message in a reply?"
+msgstr "Innkluder orginal melding i svar?"
 
-msgid "June"
-msgstr "juni"
+#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+msgid "Info"
+msgstr "Info"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#, php-format
+msgid "Information on %s Public Key"
+msgstr "Informasjon om offentlig nøkkel for %s"
+
+#: templates/pgp/pgp.inc:151
+msgid "Information on Personal Private Key"
+msgstr "Informasjon om personlig privat nøkkel"
+
+#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+msgid "Information on Personal Public Key"
+msgstr "Informasjon om personlig offentlig nøkkel"
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
+#: templates/compose/attachments.js:99
+msgid "Inline"
+msgstr "Inline"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr "Sett inn sertifikat her"
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Sett inn personlig privat PGP-nøkkel her"
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Sett inn personlig offentlig PGP-nøkkel her"
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr "Sett inn offentlig PGP-nøkkel her"
+
+#: lib/MIME/Viewer/itip.php:375
+msgid "Invalid Action selected for this component."
+msgstr "Ugyldig handling got frnnr komponenten."
+
+#: mailbox.php:555 mailbox.php:596
+msgid "Invalid Address"
+msgstr "Ugyldig e-postadresse"
+
+#: lib/Fetchmail/imap.php:312
+msgid "Invalid Remote Mailbox"
+msgstr "Ugyldig ekstern postboks"
+
+#: compose.php:132
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr "Ulovlig tegn i e-post adressen: %s"
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr "Ugyldig nøkkel"
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr "Ugyldig personlig privat PGP-nøkkel."
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr "Ugyldig personlig offentlig PGP-nøkkel."
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr "Inverter"
+
+#: templates/compose/compose.inc:567
+msgid "KB"
+msgstr "KB"
+
+#: templates/pgp/pgp.inc:201
+msgid "Key Length"
+msgstr "Nøkkel lengde"
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr "Sending av nøkkel til den offentlige nøkkelserveren var vellykket."
 
+#: templates/login/login.inc:227
 msgid "Language"
 msgstr "Språk"
 
+#: config/prefs.php.dist:877
+msgid "Last Mailbox Page"
+msgstr "Siste postboks side"
+
+#: mailbox.php:347
 msgid "Last Page"
 msgstr "Siste side"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Siste innlogging: %s"
+#: templates/compose/compose.inc:380
+msgid "Li_nk Attachments"
+msgstr "Li_nk vedlegg"
+
+#: attachment.php:34 lib/Compose.php:999
+msgid "Linked attachments are forbidden."
+msgstr "Linket vedlegg er ikke tillatt."
+
+#: lib/Compose.php:1016
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Linker vil utløpe %s"
+
+#: config/prefs.php.dist:1040
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+"Vise alle kontakter når du henter fram kontaktvisningen? (hvis avslått vil "
+"du kun se kontakter du spesifikt søker etter)"
 
-msgid "Last login: Never"
-msgstr "Siste innloging: Aldri"
+#: config/prefs.php.dist:688
+msgid "Listing in the Header"
+msgstr "Vise i meldingshodet"
+
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "Lokal postboks:"
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Location"
+msgstr "Lokasjon"
+
+#: templates/login/login.inc:235
+msgid "Log in"
+msgstr "Logg inn"
 
-#, c-format
+#: lib/Block/summary.php:117
+#, php-format
 msgid "Log in to %s"
 msgstr "Logg inn på %s"
 
-msgid "Log in"
+#: templates/login/login.inc:142
+msgid "Login"
 msgstr "Logg inn"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Innloggingsoppgaver"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr ""
-"Innloggingen feilet av en eller annen grunn. Mest sannsynlig har du skrevet "
-"feil brukernavn/passord."
-
-msgid "Logout"
-msgstr "Logg ut"
-
-msgid "Mail Filters"
-msgstr "Postfiltre"
-
-msgid "Mail Management"
-msgstr "Posthåndtering"
+#: templates/compose/compose.inc:307
+msgid "Low"
+msgstr "Lav"
+
+#: message.php:290 mailbox.php:690 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr "Lav prioritet"
+
+#: templates/compose/compose.inc:308
+msgid "Lowest"
+msgstr "Lavest"
+
+#: lib/MIME/Viewer/appledouble.php:46
+msgid "Macintosh File"
+msgstr "Macintoshfil"
+
+#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "E-post"
+
+#: config/prefs.php.dist:95
+msgid "Mail Previews"
+msgstr "Forhåndsvisning"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr "Type e-post tjener å koble til:"
 
+#: folders.php:364
 msgid "Mailbox"
 msgstr "Postboks"
 
-msgid "Maintenance Operations"
-msgstr "Vedlikeholdsoperasjoner"
-
-msgid "March"
-msgstr "mars"
+#: config/prefs.php.dist:110
+msgid "Mailbox and Folder Display Options"
+msgstr "Visningsvalg for meldinger i postboks og mapper"
+
+#: templates/folders/actions.inc:16
+msgid "Mark All Messages in Folder as Seen"
+msgstr "Merk alle meldingene i mappen som lest"
+
+#: templates/folders/actions.inc:17
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "Merk alle meldingene i mappen som ulest"
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Marker som:"
 
+#: config/prefs.php.dist:653
 msgid "Mark different levels of quoting with different colors?"
-msgstr "Merk forskjellige nivåer av svarmeldinger med forskjellige farger?"
+msgstr "Merke forskjellige nivåer av svarmeldinger med forskjellige farger?"
 
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "Merke meldinger som lest? (Kun IMAP)"
+
+#: config/prefs.php.dist:661
+msgid "Mark simple markup?"
+msgstr "Håndtere enkel tekstmerking?"
+
+#: templates/search/header.inc:46
 msgid "Match All Queries"
-msgstr "Tilfredsstill alle kriterier"
+msgstr "Samtlige"
 
+#: templates/search/header.inc:42
 msgid "Match Any Query"
-msgstr "Tilfredsstill ett kriterium"
+msgstr "Minst en"
 
-msgid "May"
-msgstr "mai"
+#: templates/compose/compose.inc:503
+msgid "Maximum Attachment Size"
+msgstr "Maks størrelse på vedlegg"
 
-msgid "Message Composition"
-msgstr "Skriv melding"
+#: templates/compose/compose.inc:484
+msgid "Maximum number of attachments reached."
+msgstr "Maks antall vedlegg nådd"
 
+#: templates/compose/compose.inc:479
+msgid "Maximum total attachment size reached."
+msgstr "Maks total størrelse på vedlegg nådd"
+
+#: lib/MIME/Viewer/itip.php:582
+msgid "Meeting Cancellation"
+msgstr "Møteavlysning"
+
+#: lib/MIME/Viewer/itip.php:532
+msgid "Meeting Information"
+msgstr "Møteinformasjon"
+
+#: lib/MIME/Viewer/itip.php:542
+msgid "Meeting Proposal"
+msgstr "Møteinnkallelse"
+
+#: lib/MIME/Viewer/itip.php:573
+msgid "Meeting Reply"
+msgstr "Møtesvar"
+
+#: lib/MIME/Viewer/itip.php:554
+msgid "Meeting Update"
+msgstr "Møteoppdatering"
+
+#: lib/MIME/Viewer/itip.php:559
+msgid "Meeting Update Request"
+msgstr "Foresørsel om møteoppdatering"
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr "Meny mappeliste"
+
+#: lib/Compose.php:247
+msgid "Message"
+msgstr "Melding"
+
+#: compose.php:519 compose.php:546 compose.php:578 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr "Skriv melding"
+
+#: config/prefs.php.dist:888
 msgid "Message Date"
 msgstr "Meldingsdato"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
+#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+msgid "Message Options"
+msgstr "Meldinger til"
+
+#: search.php:354
 msgid "Message Search"
 msgstr "Søk etter melding"
 
+#: config/prefs.php.dist:892
 msgid "Message Size"
 msgstr "Meldingsstørrelse"
 
+#: message.php:375
 msgid "Message Source"
 msgstr "Meldingskilde"
 
+#: config/prefs.php.dist:69
 msgid "Message Viewing"
 msgstr "Meldingsvisning"
 
+#: templates/search/header.inc:55
 msgid "Message fields"
 msgstr "Meldingsfelt"
 
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Meldingsflagg"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Meldingsmapper"
 
+#: lib/Compose.php:245
+#, php-format
+msgid "Message from %s"
+msgstr "Melding fra %s"
+
+#: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Melding tilfredsstiller"
 
-msgid "Message sent successfully"
-msgstr "Meldingen er sendt"
-
-msgid "Message sent successfully, but not saved to"
-msgstr "Meldingen er sendt, men ble ikke lagret i"
+#: compose.php:758 compose.php:772
+msgid "Message redirected successfully."
+msgstr "Meldingen videresendt"
+
+#: compose.php:1004
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Meldingen er sendt, men ble ikke lagret i %s"
 
-msgid "Message"
-msgstr "Melding"
+#: compose.php:1063 compose.php:1078
+msgid "Message sent successfully."
+msgstr "Meldingen er sendt"
 
+#: config/prefs.php.dist:912
 msgid "Messages per page in the mailbox view."
 msgstr "Antall meldinger pr. side når postboksen vises."
 
+#: mailbox.php:311
 msgid "Messages to"
 msgstr "Meldinger til"
 
-msgid "Mime Type"
-msgstr "Mime Type"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Endre"
 
-msgid "Move Down"
-msgstr "Flytt ned"
-
-msgid "Move Up"
-msgstr "Flytt opp"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Flytt meldingene til mappen <b>%s</b>"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field '%s'."
+msgstr "Fler enn en adresse er funnet for feltet '%s'."
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Flytt"
 
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr "flytt ned"
+
+#: templates/message/navbar_navigate.inc:18
+msgid "Move to folder"
+msgstr "Flytt til mappe"
+
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr "flytt opp"
+
+#: lib/MIME/Viewer/alternative.php:130
+msgid "Multipart/alternative"
+msgstr "Multipart/alternative"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
+#: templates/pgp/pgp.inc:24
+msgid "NOTE"
+msgstr "Noter"
+
+#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:640
 msgid "Name"
 msgstr "Navn"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr "Navn og/eller e-post kan ikke være tomt"
+
+#: lib/MIME/Viewer/itip.php:730
+msgid "Needs Action"
+msgstr "Trenger handling"
+
+#: config/prefs.php.dist:563 config/prefs.php.dist:584
+#: config/prefs.php.dist:754
 msgid "Never"
 msgstr "Aldri"
 
+#: config/prefs.php.dist:553
+msgid "Never save attachments"
+msgstr "Aldri lagre vedlegg"
+
+#: templates/acl/acl.inc:126
+msgid "New"
+msgstr "Ny"
+
+#: lib/IMP.php:578
 msgid "New Folder"
 msgstr "Ny mappe"
 
+#: config/prefs.php.dist:87
 msgid "New Mail"
 msgstr "Ny post"
 
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nye meldinger"
 
-msgid "New"
-msgstr "Ny"
+#: templates/compose/spelling.inc:140
+msgid "Next"
+msgstr "Neste"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Neste melding"
 
+#: mailbox.php:345
 msgid "Next Page"
 msgstr "Neste side"
 
-msgid "Next"
-msgstr "Neste"
+#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+msgid "No"
+msgstr "Nei"
 
-msgid "No Subject"
-msgstr "Intet emne"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr "Intet sertifkat funnet"
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr "Ingen kryptering"
+
+#: templates/pgp/pgp.inc:80
+msgid "No Keys in Keyring"
+msgstr "Ingen nøkler i nøkkelringen"
+
+#: mailbox.php:364
+#, php-format
+msgid "No Messages"
+msgstr "Ingen meldinger"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr "Ingen offentlig PGP-nøkkel importert."
+
+#: templates/smime/smime.inc:140
+msgid "No Personal Certificate Present"
+msgstr "Intet personlig sertifikat tilgjengelig."
+
+#: templates/smime/smime.inc:54
+msgid "No Public Keys Found"
+msgstr "Ingen offentlige nøkler funnet"
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr "Ingen offentlig S/MIME nøkkel importert."
+
+#: lib/MIME/Viewer/tnef.php:94
+msgid "No attachments found."
+msgstr "Ingen vedlegg funnet."
 
+#: acl.php:72 acl.php:98
+msgid "No folder selected."
+msgstr "ingen mappe valgt"
+
+#: lib/Block/summary.php:130
+msgid "No folders are being checked for new mail."
+msgstr "Ingen mapper sjekkes for ny mail."
+
+#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
 msgid "No folders were specified"
-msgstr "Ingen mappe er valgt"
+msgstr "Ingen mapper er valgt"
+
+#: lib/Block/summary.php:136
+msgid "No folders with new messages"
+msgstr "Ingen mapper med nye meldinger"
+
+#: lib/Block/summary.php:133
+msgid "No folders with unseen messages"
+msgstr "Ingen mapper med uleste meldinger"
+
+#: lib/Compose.php:241
+msgid "No message body text"
+msgstr "Ingen tekst i meldingskroppen"
 
-msgid "No messages matched your search"
+#: lib/Mailbox.php:368
+msgid "No messages matched your search."
 msgstr "Søket passet ikke med noen meldinger"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr "Ingen personlig privat PGP-nøkkel importert."
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr "Ingen personlig offentlig PGP-nøkkel importert."
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr "Ingen personlige S/MIME sertifikater importert."
+
+#: spelling.php:213
+msgid "No spellchecking program configured."
+msgstr "Det er ikke konfigurert noe program for stavekontroll."
+
+#: templates/compose/spelling.inc:50
 msgid "No spelling errors"
 msgstr "Ingen stavefeil"
 
+#: templates/compose/spelling.inc:106
 msgid "No suggestions"
 msgstr "Ingen forslag"
 
-msgid "No"
-msgstr "Nei"
-
+#: acl.php:68 acl.php:94
+msgid "No user specified."
+msgstr "Ingen bruker valgt."
+
+#: lib/MIME/Viewer/itip.php:661
+msgid "Non Participant"
+msgstr "Ikke deltager"
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:5
+#: lib/MIME/Viewer/itip.php:618
 msgid "None"
 msgstr "Ingen"
 
+#: templates/compose/compose.inc:306
+msgid "Normal"
+msgstr "Normal"
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Ikke slettet"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Ikke kladd"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Uviktig"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Ikke personlig"
 
+#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:152 lib/Crypt/SMIME.php:158
+#: lib/Crypt/SMIME.php:167
+msgid "Not a valid public key."
+msgstr "Ikke en gyldig offentlig nøkkel."
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Ikke slettede meldinger"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Uviktige meldinger"
 
-msgid "November"
-msgstr "november"
+#: lib/Maintenance/Task/fetchmail_login.php:76
+msgid "Note that this can take some time"
+msgstr "Merk at dette kan ta noe tid"
+
+#: config/prefs.php.dist:371
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Antall måneder du ønsker å beholde gamle lenkede vedlegg ved månedlig "
+"sletting."
 
+#: config/prefs.php.dist:353
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Antall gamle mapper med sendte elementer som skal beholdes ved månedtlig "
 "sletting"
 
+#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:685
 msgid "OK"
 msgstr "OK"
 
-msgid "October"
-msgstr "oktober"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr "ELLER"
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Gamle meldinger"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
 msgid "Old sent-mail folders being purged."
 msgstr "Gamle mapper med sendte elementer blir fjernet."
 
+#: lib/Block/summary.php:27
+msgid "Only display folders with unread messages in them?"
+msgstr "Vise kun mapper med uleste meldinger?"
+
+#: templates/folders/javascript.inc:78
+msgid "Only one folder should be selected for this action."
+msgstr "Vennligst velg bare én mappe for denne operasjonen."
+
+#: templates/menu.inc:7 templates/menu.inc:27
+msgid "Ope_n Folder"
+msgstr "Åpn_e mappe"
+
+#: templates/menu.inc:24
 msgid "Open Folder"
 msgstr "Åpne mappe"
 
-msgid "Options"
-msgstr "Valg"
+#: folders.php:381
+msgid "Opened Folder"
+msgstr "Åpnet mappe"
+
+#: lib/MIME/Viewer/itip.php:657
+msgid "Optional Participant"
+msgstr "Valgfri deltager"
 
-msgid "_Options"
-msgstr "Valg"
+#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr "Andre mailkontoer"
 
+#: config/prefs.php.dist:109 config/prefs.php.dist:118
+#: config/prefs.php.dist:125 config/prefs.php.dist:133
+#: config/prefs.php.dist:142
 msgid "Other Options"
 msgstr "Andre valg"
 
-#, c-format
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
+#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+msgid "PGP"
+msgstr "PGP"
+
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr "PGP-krypter melding"
+
+#: compose.php:343
+msgid "PGP Error: "
+msgstr "PGP Feil: "
+
+#: compose.php:322
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr "PGP Feil: Trenger passphrase for personlig privat nøkkel."
+
+#: templates/pgp/notactive.inc:6
+msgid "PGP NOT Active"
+msgstr "PGP er IKKE aktiv"
+
+#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+msgid "PGP Options"
+msgstr "Valg"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr "Sett inn PGP passphrase"
+
+#: templates/pgp/pgp.inc:128
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr "Søtte for personlig PGP nøkkelpar krever en sikker web-tilkobling."
+
+#: lib/MIME/Viewer/pgp.php:178
+msgid "PGP Public Key Text"
+msgstr "Offentlig PGP-nøkkel tekst"
+
+#: pgp.php:149
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Offentlig PGP-nøkkel for \"%s (%s)\" ble lagt til."
+
+#: pgp.php:245
+#, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Offentlig PGP-nøkkel for \"%s\" ble slettet."
+
+#: templates/pgp/pgp.inc:72
+msgid "PGP Public Keyring"
+msgstr "Offentlig PGP-nøkkelring"
+
+#: templates/compose/encrypt_list.inc:8
+msgid "PGP Sign Message"
+msgstr "PGP-signer melding"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr "PGP signer/krypter melding"
+
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr "Privat PGP-nøkkel ble lagt til."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr "Offentlig PGP-nøkkel ble lagt til."
+
+#: templates/pgp/notactive.inc:11
+msgid "PGP support is disabled on this system."
+msgstr "PGP støtte er avslått på dette systemet."
+
+#: lib/MIME/Viewer/pgp.php:214
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+"Den digitale signaturen kan ikke verifiseres da PGP-støtte ikke er aktivert."
+
+#: lib/MIME/Viewer/pgp.php:301
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr "Meldingen kan ikke dekrypteres da PGP-støtte ikke er aktivert."
+
+#: templates/pgp/pgp.inc:24
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly"
+msgstr ""
+"PGP-støtte krever bruk av popup-vinduer. Hvis nettleseren din er konfigurert "
+"for å blokkere popup-vinduer må du endre på dette for at PGP-støtte skal "
+"fungere."
+
+#: lib/Fetchmail/imap.php:108
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:103
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:120
+msgid "POP3 over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:126
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:177
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:114
+msgid "POP3, no TLS"
+msgstr ""
+
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
+#: config/prefs.php.dist:874
+msgid "Page with the First Unseen Message"
+msgstr "Side med den første uleste meldingen"
+
+#: config/prefs.php.dist:875
+msgid "Page with the Last Unseen Message"
+msgstr "Side med den siste uleste meldingen"
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Del(er)"
 
+#: templates/pgp/pgp.inc:211
+msgid "Passphrase"
+msgstr "Passphrase"
+
+#: templates/pgp/pgp.inc:216
+msgid "Passphrase (Again)"
+msgstr "Passephrase (igjen)"
+
+#: smime.php:235 pgp.php:310
+msgid "Passphrase successfully unloaded."
+msgstr "Passphrase ble fjernet."
+
+#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr "Passphrase:"
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr "Passphrase kan ikke være tom"
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr "Passphrase stemmer ikke overens"
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
+#: templates/login/login.inc:221
 msgid "Password"
 msgstr "Passord"
 
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "Utfør vedlikeholdsoperasjoner ved innlogging?"
 
-msgid "Personal Information"
-msgstr "Personlig informasjon"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr "Kan ikke endre rettigheter for denne brukeren."
 
+#: message.php:483 mailbox.php:666 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Personlig"
 
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "Personlig informasjon"
+
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr "Personlig PGP-nøkkelpar generert."
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr "Personlig PGP-nøkkler slettet."
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Personlig S/MIME sertifikater IKKE importert: "
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "Personlig S/MIME nøkler slettet."
+
+#: config/prefs.php.dist:214
 msgid "Place your signature before replies and forwards?"
-msgstr "Legge til signaturen din forran svar og videresending?"
+msgstr "Legge til signaturen din foran svar og videresending?"
+
+#: compose.php:241
+msgid "Plaintext Version of Message"
+msgstr "Ren-tekst versjon av meldingen"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
 msgid "Please enter a name for the new folder:"
 msgstr "Vennligst skriv inn navnet på den nye mappen:"
 
+#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
 msgid "Please enter the name of the new folder:"
 msgstr "Vennligst skriv inn navnet på den nye mappen:"
 
+#: templates/folders/javascript.inc:146
 msgid "Please enter the new name:"
 msgstr "Vennligst skriv inn det nye navnet:"
 
-msgid "Please enter valid search criteria."
-msgstr "Vennligst skriv inn gyldig søkekriterium."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+"Vennligst skriv inn passphrase for din private PGP-nøkkel. Du trenger kun å "
+"skrive inn denne en gang per %s sesjon."
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+"Vennligst skriv inn passphrase for din private S/MIME-nøkkel. Du trenger kun "
+"å skrive inn denne en gang per %s sesjon."
 
-msgid "Please provide your username and password"
-msgstr "Vennligst oppgi brukernavn og passord"
+#: recompose.php:88
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+"Vennligst logg inn på nytt for å fortsette å skrive på meldingen. Hvis du "
+"IKKE bruker cookies OG du skriver nye meldinger i popup-vinduer, må du logge "
+"inn på nytt i hovedvinduet også. Dette er for å beskytte deg mot at "
+"utenforstående kan ta over din sesjon. Vi beklager bryet."
+
+#: templates/login/login.inc:81
+msgid "Please provide your password."
+msgstr "Vennligst oppgi passord."
+
+#: templates/login/login.inc:77
+msgid "Please provide your username."
+msgstr "Vennligst oppgi brukernavn."
 
+#: compose.php:80 lib/IMP.php:519
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Vennligst rett tvetydige eller ugyldige adresser."
 
+#: lib/MIME/Viewer/itip.php:598
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+"Vennligst se over den følgende informasjonen, velg så en handling fra menyen "
+"nedenunder."
+
+#: templates/folders/javascript.inc:56
 msgid "Please select a folder before you perform any actions."
 msgstr "Vennligst velg en mappe før du utfører noen handlinger."
 
+#: lib/MIME/Viewer/itip.php:461
+msgid "Please select an action from the menu below."
+msgstr "Vennligst velg en handling fra menyen nedenunder."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Vennligst velg minst én mappe å søke i."
 
+#: templates/folders/javascript.inc:4
 msgid "Please select only one folder for this operation."
 msgstr "Vennligst velg bare én mappe for denne operasjonen."
 
 # HUH?!
+#: templates/compose/redirect.inc:76
+msgid "Please select or edit in the box to the right:"
+msgstr "Vennligst velg eller endre i vinduet til høyre:"
+
+# HUH?!
+#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
+#: templates/compose/compose.inc:228
 msgid "Please select or edit right next:"
-msgstr "Vennligst velg eller endre høyre:"
+msgstr "Vennligst velg eller endre neste:"
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr "Powered by Horde"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/prefs.php.dist:206
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Legg til streker over signaturen din ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+msgid "Preferences successfully updated."
+msgstr "Innstillingene ble oppdatert."
+
+#: templates/compose/attachments.inc:3
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Forrige melding"
 
+#: mailbox.php:336
 msgid "Previous Page"
 msgstr "Forrige side"
 
+#: templates/message/navbar_actions.inc:31
 msgid "Print"
 msgstr "Skriv ut"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problem med filter regel %d: mappen eksistere ikke: %s"
-
-msgid "Problem?"
-msgstr "Problem?"
+#: templates/message/headers.inc:38
+msgid "Priority"
+msgstr "Prioritet"
+
+#: templates/smime/import_key.inc:74
+msgid "Private Key Password"
+msgstr "Passord for privat nøkkel"
+
+#: config/prefs.php.dist:552
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr "Be om bekreftelse hver gang et vedlegg blir sendt; standard NEI"
+
+#: config/prefs.php.dist:551
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr "Be om bekreftelse hver gang et vedlegg blir sendt; standard JA"
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: lib/Crypt/PGP.php:461
+msgid "Public PGP keyserver support has been disabled."
+msgstr "Støtte for offentlig PGP-nøkkeltjener er ikke aktiv."
 
-msgid "_Problem?"
-msgstr "Problem?"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+msgid "Pur_ge Deleted"
+msgstr "Fje_rn slettede elementer"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Fjern slettede elementer"
 
-msgid "Pur_ge Deleted"
-msgstr "Fjern slettede elementer"
+#: templates/folders/actions.inc:22
+msgid "Purge Folder(s)"
+msgstr "Slett mappen(e)"
 
+#: config/prefs.php.dist:390
 msgid "Purge Trash how often:"
-msgstr "Hvor ofte skal Søppelet fjernes: "
+msgstr "Hvor ofte skal Søppelet fjernes:"
 
+#: config/prefs.php.dist:399
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Fjern meldinger i Søppelet som er eldre enn dette antall dager."
 
-msgid "Purge old message in the Trash folder?"
+#: config/prefs.php.dist:380
+msgid "Purge old messages in the Trash folder?"
 msgstr "Fjern gamle meldinger i Søppelet?"
 
+#: lib/Maintenance/Task/purge_trash.php:67
+#, php-format
 msgid "Purging %d message(s) from Trash folder."
-msgstr "Fjerner %d gamle meldinger fra Søppelet"
+msgstr "Fjerner %d melding(er) fra Søppelet."
+
+#: config/prefs.php.dist:421
+msgid "Put this after @ when sending mail and default address expansion:"
+msgstr "Legg til dette etter @ hvis det ikke er skrevet noe domene:"
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Quota status: %.2fMB / %.2fMB  (%2f%%)"
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "Quota status: %.2fMB / INGEN BEGRENSNING"
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr "Quota status: INGEN BEGRENSNING"
+
+#: config/prefs.php.dist:492
+#, php-format
+msgid "Quoting %f:"
+msgstr "Siterer %f:"
+
+#: templates/compose/compose.inc:377
+msgid "Re_quest Delivery Confirmation"
+msgstr "Be om leveringsbekreftelse"
+
+#: search.php:165
+msgid "Received On"
+msgstr "Mottatt"
 
-msgid "Quoting"
-msgstr "Sitat"
+#: search.php:173
+msgid "Received Since"
+msgstr "Mottatt siden"
 
-msgid "Received after"
-msgstr "Mottatt etter:"
+#: search.php:169
+msgid "Received Until"
+msgstr "Mottatt frem til"
 
-msgid "Received before"
-msgstr "Mottat før:"
+#: templates/message/navbar_actions.inc:16
+msgid "Redirec_t"
+msgstr "Omadressé_r"
 
-msgid "Received on"
-msgstr "Mottatt:"
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Omadressér"
 
+#: templates/compose/redirect.inc:115
 msgid "Redirect Message"
 msgstr "Omadressér melding"
 
+#: compose.php:721
 msgid "Redirect this message"
 msgstr "Omadressér denne meldingen"
 
-msgid "Redirect"
-msgstr "Omadressér"
-
+#: compose.php:781
 msgid "Redirecting failed."
 msgstr "Omadressering feilet."
 
+#: templates/compose/compose.inc:573
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: config/prefs.php.dist:760
 msgid "Refresh Folder Views:"
 msgstr "Oppdater mappevisning:"
 
-msgid "Refresh"
+#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+msgid "Reload"
 msgstr "Oppdater"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Last visning på nytt"
 
+#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+msgid "Remember the free/busy information."
+msgstr "Husk ledig/opptatt-informasjon."
+
+#: config/prefs.php.dist:950
 msgid "Remember the last view"
 msgstr "Husk siste visning"
 
-msgid "Remove Selected"
-msgstr "Fjern valgte"
-
-msgid "Rename Folder"
-msgstr "Gi nytt navn til mappen"
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr "Ekstern postboks:"
+
+#: templates/search/fields.inc:40
+msgid "Remove Field From Search"
+msgstr "Fjern fra søkefeltet"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "Fjern kilde"
+
+#: templates/folders/actions.inc:6
+msgid "Rename Folder(s)"
+msgstr "Gi nytt navn til mappen(e)"
 
+#: config/prefs.php.dist:335
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Gi 'Sendte elementer' nytt navn på begynnelsen av måneden"
 
-#, c-format
+#: lib/Folder.php:542
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Kunne ikke gi \"%s\" navnet \"%s\". Melding fra serveren"
 
+#: templates/message/navbar_actions.inc:10
+msgid "Repl_y to List"
+msgstr "Sva_r til listen"
+
+#: templates/compose/spelling.inc:111
 msgid "Replace with:"
 msgstr "Erstatt med:"
 
-msgid "Reply to All"
-msgstr "Svar til alle"
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Svar"
 
-msgid "Reply to _All"
+#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+msgid "Reply Sent."
+msgstr "Svar sendt."
+
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to All"
 msgstr "Svar til alle"
 
+#: compose.php:670
 msgid "Reply to All:"
 msgstr "Svar til alle:"
 
-msgid "Reply"
-msgstr "Svar"
+#: templates/message/navbar_actions.inc:10
+msgid "Reply to List"
+msgstr "Svar til listen"
+
+#: compose.php:672
+msgid "Reply to List:"
+msgstr "Svar til listen:"
 
-msgid "_Reply"
-msgstr "_Svar"
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to _All"
+msgstr "Svar til _alle"
 
-msgid "Reply-To: "
-msgstr "Svar-til: "
+#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
+#: lib/MIME/Viewer/itip.php:504
+msgid "Reply with Not Supported Message"
+msgstr "Svar at meldingen ikke støttes"
+
+#: lib/MIME/Viewer/itip.php:492
+msgid "Reply with free/busy for next 2 months."
+msgstr "Svar med ledig/opptatt for de neste to månedene."
+
+#: lib/MIME/Viewer/itip.php:491
+msgid "Reply with requested free/busy information."
+msgstr "Svar med den forespurte ledig/opptatt-informasjonen."
 
-msgid "Reply-to"
+#: message.php:258
+msgid "Reply-To"
 msgstr "Svar-til"
 
+#: lib/Compose.php:260 lib/Compose.php:312
+msgid "Reply-To: "
+msgstr "Svar-til: "
+
+#: compose.php:668
 msgid "Reply:"
 msgstr "Svar:"
 
-msgid "_Reply:"
-msgstr "Svar:"
+#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+msgid "Report as Innocent"
+msgstr "Rapporter som uskyldig"
 
+#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
 msgid "Report as Spam"
 msgstr "Rapporter som spam"
 
-msgid "Request a Return Receipt"
-msgstr "Be om kvittering"
+#: templates/compose/compose.inc:374
+msgid "Request a _Read Receipt"
+msgstr "Be om le_sebekreftelse"
+
+#: config/prefs.php.dist:587
+msgid "Request delivery confirmation?"
+msgstr "Be om leveringsbekreftelse?"
+
+#: config/prefs.php.dist:566
+msgid "Request read receipts?"
+msgstr "Be om lesebekreftelse"
+
+#: mailbox.php:197
+msgid "Requested message not found."
+msgstr "Forespurt melding ble ikke funnet."
+
+#: lib/MIME/Viewer/itip.php:649
+msgid "Required Participant"
+msgstr "Obligatorisk deltager"
 
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:158
 msgid "Reset"
 msgstr "Nullstill"
 
+#: lib/MIME/Viewer/itip.php:106
+msgid "Respondent Status Updated."
+msgstr "Svarstatus oppdatert."
+
+#: templates/message/navbar_actions.inc:28
 msgid "Resume"
 msgstr "Gjenoppta"
 
+#: recompose.php:89
+msgid "Resume your session"
+msgstr "Gjenoppta sesjon"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr "Retrner til Fetch Mail"
+
+#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
+#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
+msgid "Return to Main Preferences Screen"
+msgstr "Returner til vindu for hovedinnstillinger"
+
+#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+msgid "Return to Options"
+msgstr "Returner til innstillinger"
+
+#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
+msgid "Return to Previous Screen"
+msgstr "Returner til forrige vindu"
+
+#: config/prefs.php.dist:714
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Gå tilbake til postbokslisten etter å ha slettet, flyttet eller kopiert en "
 "melding?"
 
-msgid "Rule Definition"
-msgstr "Regeldefinisjon"
+#: lib/MIME/Viewer/itip.php:640
+msgid "Role"
+msgstr "Rolle"
+
+#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
+#: lib/MIME/Viewer/pkcs7.php:415
+msgid "S/MIME"
+msgstr ""
 
-msgid "Save Draft"
-msgstr "Lagre kladd"
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr "Krypter med S/MIME"
+
+#: compose.php:379
+msgid "S/MIME Error: "
+msgstr "S/MIME Feil: "
+
+#: compose.php:358
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "S/MIME Feil: Trenger passphrase for personlig privat nøkkel."
+
+#: templates/smime/notactive.inc:6
+msgid "S/MIME NOT Active"
+msgstr "S/MIME IKKE aktiv"
+
+#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+msgid "S/MIME Options"
+msgstr "Innstillinger for S/MIME"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr "Sett inn S/MIME Passphrase"
+
+#: templates/smime/smime.inc:100
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr "Støtte for personlig S/MIME-nøkkelpar krever en sikker webtilkobling."
+
+#: smime.php:140
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Offentlig S/MIME nøkkel for \"%s\" ble slettet."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr "Offentlig S/MIME-nøkkel lagt til."
+
+#: templates/smime/smime.inc:45
+msgid "S/MIME Public Keyring"
+msgstr "Offentlig S/MIME-nøkkelring"
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "Offentlig/Privat S/MIME-nøkkelpar lagt til."
+
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr "Signer meldingen med S/MIME"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "Signer/krypter meldingen med S/MIME"
+
+#: templates/smime/notactive.inc:11
+msgid "S/MIME support is disabled on this system."
+msgstr "Støtte for S/MIME er ikke aktivert på dette systemet."
 
-msgid "Save search as a virtual folder?"
-msgstr "Lagre søk som en virtuell mappe?"
+#: lib/MIME/Viewer/pkcs7.php:233
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+"Støtte for S/MIME er ikke aktivert for øyeblikket, så meldingen kan ikke bli "
+"dekryptert."
+
+#: lib/MIME/Viewer/pkcs7.php:165
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+"Støtte for S/MIME er ikke aktivert, så innholdet av denne signerte meldingen "
+"kan ikke vises."
+
+#: lib/MIME/Viewer/pkcs7.php:138
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"Støtte for S/MIME er ikke aktivert, så den digitale signaturen kan ikke "
+"verifiseres."
+
+#: templates/smime/smime.inc:24
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly"
+msgstr ""
+"S/MIME-støtte krever bruk av popup-vinduer. Hvis nettleseren din er "
+"konfigurert for å blokkere popup-vinduer må du endre på dette for at S/MIME-"
+"støtte skal fungere."
+
+#: templates/compose/compose.inc:266
+msgid "S_ubject"
+msgstr "E_mne"
 
-msgid "Save a copy in "
-msgstr "Lagre en kopi i "
+#: templates/compose/compose.inc:354
+msgid "Sa_ve a copy in "
+msgstr "La_gre kopi i "
 
+#: templates/message/navbar_actions.inc:30
 msgid "Sa_ve as"
+msgstr "La_gre som"
+
+#: search.php:358 templates/fetchmail/manage.inc:67
+msgid "Save"
+msgstr "Lagre som"
+
+#: templates/compose/compose.inc:528
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr "Lagre vedlegg sammen med melding i 'Sendte elementer'?"
+
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+msgid "Save Draft"
+msgstr "Lagre kladd"
+
+#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
+#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
+#: templates/pgp/notactive.inc:23
+msgid "Save Options"
+msgstr "Lagre innstillinger"
+
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+msgid "Save _Draft"
+msgstr "Lagre _kladd"
+
+#: templates/message/navbar_actions.inc:30
+msgid "Save as"
 msgstr "Lagre som"
 
-msgid "Save sent mail"
-msgstr "Lagre sendt post"
+#: config/prefs.php.dist:513
+msgid "Save drafts as unseen?"
+msgstr "Lagre kladd som ulest?"
+
+#: config/prefs.php.dist:1030
+msgid "Save recipients automatically to the default address book?"
+msgstr "Lagre mottakere automatisk til standard adressebok?"
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr "Lagre søk som en virtuell mappe?"
+
+#: config/prefs.php.dist:223
+msgid "Save sent mail?"
+msgstr "Lagre sendt e-post?"
 
-#, c-format
+#: compose.php:1148
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Lagre kladd feilet. Melding fra serveren: %s"
 
-msgid "Search Results"
-msgstr "Søkeresultat"
-
+#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
 msgid "Search"
 msgstr "Søk"
 
-msgid "_Search"
-msgstr "Søk"
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, php-format
+msgid "Search %s"
+msgstr "Søk %s"
 
+#: lib/Block/tree_folders.php:169
+msgid "Search Mail"
+msgstr "Søk etter mail"
+
+#: search.php:311
+msgid "Search Results"
+msgstr "Søkeresultat"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Lest"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Velg"
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "Velg en annen konto"
+
+#: templates/search/fields.inc:35
+msgid "Select a date"
+msgstr "Velg en dato"
+
+#: templates/search/fields.inc:10
+msgid "Select a field"
+msgstr "Velg et felt"
+
+#: config/prefs.php.dist:127
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Velg adressebok-kilder for å legge til og å søke etter adresser."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Velg alle"
 
-msgid "Select an identity"
-msgstr "Velg en identitet"
-
-msgid "Select charset:"
-msgstr "Velg karaktersett:"
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr "Velg alle felter som det skal søkes i ved utvidelse av adresser."
+
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "Velg en konto"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Velg ingen"
 
-msgid "Select your preferred language:"
-msgstr "Velg ditt foretrukne språk:"
-
-msgid "Select"
-msgstr "Velg"
-
-msgid "Selected Addressbooks:"
-msgstr "Velg adressebøker:"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr "Velg e-post tjenertype"
+
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
+msgstr "Valgte adressebøker:"
+
+#: templates/pgp/pgp.inc:147
+msgid "Send Key to Public Keyserver"
+msgstr "Send nøkkel til offentlig nøkkeltjener"
+
+#: lib/MIME/Viewer/itip.php:560
+msgid "Send Latest Information"
+msgstr "Send siste informasjon"
+
+#: config/prefs.php.dist:575
+msgid "Send MDN when requested by the sender?"
+msgstr "Sende leveringsbekreftelse når senderen ber om dette?"
 
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
 msgid "Send Message"
 msgstr "Send melding"
 
+#: folders.php:359
+msgid "Sent mail folder"
+msgstr "Sendte elementer"
+
+#: templates/prefs/sentmailselect.inc:39
 msgid "Sent mail folder:"
 msgstr "Sendte elementer:"
 
-msgid "September"
-msgstr "september"
-
-msgid "Server Information"
-msgstr "Serverinformasjon"
-
+#: templates/login/login.inc:138 templates/login/login.inc:152
+#: templates/login/login.inc:159
 msgid "Server"
-msgstr "Server"
+msgstr "Tjener"
+
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr "Tjener og mappe informasjon"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Innstillinger for filtrering av uønsket innhold."
+#: templates/fetchmail/manage.inc:23
+msgid "Server:"
+msgstr "Tjener:"
 
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Innstillnger for hva som skjer når du flytter og sletter meldinger."
 
-msgid "Set the current time zone."
-msgstr "Sett gjeldende tidssone."
+#: config/prefs.php.dist:522
+msgid "Set the X-Priority header when composing messages?"
+msgstr "Angi X-Priority meldingshode når du skriver ny melding?"
+
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr "Del Mapper"
+
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr "Del postbokser"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr "Del dine postbokser med andre brukere."
+
+#: config/prefs.php.dist:672
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+"Skal store bolker med tekst skjules eller vises som standard? Dette kan lett "
+"endres tilbake ved ønske."
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Velg språk på menyer, forklaringer og hjelp."
+#: templates/pgp/pgp.inc:52
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr "Ønsker du å søke etter PGP data i text/plain-meldinger?"
 
+#: config/prefs.php.dist:505
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 "Skal vinduet 'Ny melding' lukkes etter at meldingen er lagret som kladd?"
 
+#: templates/pgp/pgp.inc:40
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+"Ønsker du å legge ved din offentlige PGP-nøkkel til meldinger som standard?"
+
+#: templates/search/main.inc:92
+msgid "Show All Folders"
+msgstr "Vis alle mapper"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr "Vis alle meldingshoder"
+
+#: mailbox.php:354
 msgid "Show Deleted"
 msgstr "Vis slettede elementer"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr "Vis begrensete meldingshoder"
+
+#: templates/message/headers.inc:70
+msgid "Show Mailing List Information"
+msgstr "Vis mailliste informasjon"
+
+#: templates/search/main.inc:92
+msgid "Show Only Subscribed Folders"
+msgstr "Vis kun abonnérte mappe(r)"
+
+#: folders.php:254
 msgid "Show Unsubscribed"
 msgstr "Vis uabonnerte"
 
-msgid "Show last login time when logging in?"
-msgstr "Vis 'Sist innlogget'-tid ved innlogging"
+#: config/prefs.php.dist:612
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr "Vise et ikon for å fjerne vedlegg fra meldinger?"
 
+#: config/prefs.php.dist:974
 msgid "Show legend in the mailbox view?"
 msgstr "Vis fargeforklaringer når postlisten vises?"
 
-msgid "Size"
-msgstr "Størrelse"
+#: config/prefs.php.dist:809
+msgid "Show previews for unread messages only?"
+msgstr "Kun forhåndsvise uleste meldinger?"
+
+#: config/prefs.php.dist:817
+msgid "Show previews in tooltips?"
+msgstr "Forhåndsvisning i verktøytips?"
+
+#: config/prefs.php.dist:848
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr "Vise Fetch Mail ikonet i menyen?"
+
+#: lib/MIME/Viewer/html.php:106
+msgid "Show the Images"
+msgstr "Vis bildene"
+
+#: templates/filters/prefs.inc:61
+msgid "Show the filter icon on the menubar?"
+msgstr "Vise filterikonet i menyen?"
+
+#: lib/Block/summary.php:30
+msgid "Show total number of mails in folder?"
+msgstr "Vise totalt antall meldinger i mappen?"
+
+#: config/prefs.php.dist:669
+msgid "Shown"
+msgstr "Vist"
 
+#: templates/mailbox/message_headers.inc:37
 msgid "Si_ze"
-msgstr "Størrelse"
+msgstr "Stø_rrelse"
+
+#: templates/login/login.inc:241
+msgid "Sign up if not registered"
+msgstr "Registrer deg om ikke registrert"
+
+#: templates/mailbox/legend.inc:17
+msgid "Signed"
+msgstr "Signert"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Noen av IMP's konfigurasjonsfiler mangler:"
+#: templates/compose/attachments.inc:3
+msgid "Size"
+msgstr "Størrelse"
 
+#: templates/mailbox/message_headers.inc:71
 msgid "Sort Direction"
 msgstr "Sorteringsrekkefølge"
 
-msgid "Spam Report from"
-msgstr "Spamrapport fra"
+#: templates/mailbox/message_headers.inc:6
+msgid "Sort by Arrival"
+msgstr "Sorter etter ankomst"
+
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Date"
+msgstr "Sorter etter dato"
+
+#: templates/mailbox/message_headers.inc:21
+msgid "Sort by From Address"
+msgstr "Sorter etter Fra-adresse"
+
+#: templates/mailbox/message_headers.inc:36
+msgid "Sort by Message Size"
+msgstr "Sorter etter meldingsstørrelse"
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Subject"
+msgstr "Sorter etter emne"
+
+#: templates/mailbox/message_headers.inc:26
+msgid "Sort by Thread"
+msgstr "Sorter etter tråd"
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by To Address"
+msgstr "Sorter etter Til-adresse"
+
+#: templates/prefs/spamselect.inc:4
+msgid "Spam folder:"
+msgstr "Spammappe:"
 
+#: templates/compose/compose.inc:337
 msgid "Special Characters"
 msgstr "Spesialtegn"
 
+#: templates/compose/compose.inc:334
 msgid "Spell Check"
 msgstr "Stavekontroll"
 
+#: templates/compose/spelling.inc:48
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
+#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
 msgid "Spell check complete"
 msgstr "Stavekontrollen er fullført"
 
+#: config/prefs.php.dist:462
 msgid "Spelling errors per screen when spell checking."
 msgstr "Stavefeil pr. side under stavekontroll."
 
-msgid "Subject Field"
-msgstr "Emnefelt"
+#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:606
+msgid "Start"
+msgstr "Start"
+
+#: lib/MIME/Viewer/itip.php:640
+msgid "Status"
+msgstr "Status"
+
+#: lib/MIME/Contents.php:215
+msgid "Strip Attachment"
+msgstr "Fjern vedlegg"
+
+#: config/prefs.php.dist:801
+msgid "Strip linebreaks?"
+msgstr "Fjerne linjeskift?"
 
+#: templates/mailbox/message_headers.inc:32
+msgid "Sub_ject"
+msgstr "Em_ne"
+
+#: message.php:259 search.php:157 templates/compose/recompose.inc:25
 msgid "Subject"
 msgstr "Emne"
 
-msgid "Subject:"
-msgstr "Emne:"
+#: config/prefs.php.dist:891
+msgid "Subject Field"
+msgstr "Emnefelt"
 
+#: search.php:360 templates/smime/passphrase.inc:21
+#: templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Send"
 
+#: templates/folders/actions.inc:9
 msgid "Subscribe to Folder(s)"
 msgstr "Abonnér på mappe(r)"
 
+#: lib/MIME/Viewer/pkcs7.php:374 lib/MIME/Viewer/pgp.php:395
+#: lib/MIME/Viewer/status.php:90
 msgid "Success"
 msgstr "Suksess"
 
+#: templates/compose/spelling.inc:92
 msgid "Suggestions"
 msgstr "Forslag"
 
+#: lib/MIME/Viewer/itip.php:616 lib/MIME/Viewer/itip.php:618
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+msgid "Switch Composition Method"
+msgstr "Bytt editor"
+
+#: templates/compose/compose.inc:395
 msgid "Switch to HTML composition"
 msgstr "Bytt til HTML editor"
 
+#: templates/compose/compose.inc:395
 msgid "Switch to plain text composition"
 msgstr "Bytt til vanlig teksteditor"
 
-msgid "Text"
-msgstr "Tekst"
+#: templates/compose/compose.inc:410
+msgid "Te_xt"
+msgstr "Te_kst"
 
-#, c-format
-msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
-msgstr "Mappen(e) \"%s\" vil nå hete \"%s\"."
+#: lib/MIME/Viewer/itip.php:239
+msgid "Tentative: "
+msgstr "Foreløpig: "
+
+#: lib/MIME/Viewer/itip.php:547
+msgid "Tentatively Accept request"
+msgstr "Godta forespørsel foreløpig"
+
+#: lib/MIME/Viewer/itip.php:713
+msgid "Tentatively Accepted"
+msgstr "Godta foreløpig"
+
+#: lib/Maintenance/Task/tos_agreement.php:54
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr "Fil med avtalevilår er ikke antgitt i conf.php"
+
+#: config/prefs.php.dist:925
+msgid "The From: column of the message should be linked:"
+msgstr "Fra-kolonnen av meldingen kunne ikke linkes til:"
+
+#: lib/MIME/Viewer/appledouble.php:43
+msgid "The Macintosh resource fork"
+msgstr "Macintosh ressurs-strøm"
+
+#: lib/MIME/Viewer/appledouble.php:43
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr "Macintosh ressurs-strømmen kan lastes ned %s."
+
+#: fetchmailprefs.php:81
+#, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Identiteten \"%s\" ble slettet."
 
-#, c-format
-msgid "The folder \"%s\" already exists"
-msgstr "Mappen \"%s\" finnes allerede"
+#: fetchmailprefs.php:74
+#, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Identiteten \"%s\" ble lagret."
 
-#, c-format
+#: lib/Filter.php:103
+#, php-format
+msgid "The address \"%s\" has been added to %s."
+msgstr "Adressen \"%s\" ble lagret i %s."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "Vedlegget ble ikke funnet."
+
+#: lib/MIME/Viewer/itip.php:61
+msgid "The calendar data is invalid"
+msgstr "Kalenderdata er ugyldig"
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"Kan ikke åpne vinduet for 'ny melding'. Det kan hende du har satt "
+"nettleseren din til å blokkere popup-vinduer"
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "The contents of the Macintosh file are below."
+msgstr "Innholdet av Macintosh-filen finnes nedenfor."
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#, php-format
+msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
+msgstr "Mappen(e) \"%s\" vil nå hete \"%s\"."
+
+#: templates/acl/acl.inc:112
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr "Kunne ikke hente listen over brukere med tilgang til denne mappen"
+
+#: compose.php:1157
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "Kladden har blitt lagret til \"%s\" mappen."
+
+#: lib/MIME/Viewer/itip.php:129
+msgid "The event was added to your calendar."
+msgstr "Hendelsen ble lagt til i din kalender."
+
+#: templates/compose/expand.inc:9
+#, php-format
+msgid "The field '%s' can't be expanded."
+msgstr "Feltet '%s' kunne ikke bil utvidet."
+
+#: lib/Folder.php:426
+#, php-format
+msgid "The folder \"%s\" already exists"
+msgstr "Mappen \"%s\" finnes allerede"
+
+#: lib/Folder.php:192
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1294,90 +3630,209 @@
 "Mappen \"%s\" inneholder ugyldige tegn i navnet. Dette kan skape problemer. "
 "Vennligst snakk med systemadministratoren din."
 
-#, c-format
+#: lib/Folder.php:445
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Mappen \"%s\" ble laget, men du abonnerer ikke på den."
 
-#, c-format
+#: lib/Folder.php:380
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Mappen \"%s\" ble slettet, men du hadde ikke sagt opp abonnementet."
 
-#, c-format
+#: lib/Folder.php:432
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Mappen \"%s\" ble ikke laget. Melding fra serveren"
 
-#, c-format
+#: lib/Folder.php:373
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Mappen \"%s\" ble ikke slettet. Melding fra serveren"
 
-#, c-format
+#: lib/Folder.php:448
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mappen \"%s\" ble opprettet."
 
-#, c-format
+#: lib/Folder.php:383
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Mappen \"%s\" ble slettet."
 
-#, c-format
+#: lib/Folder.php:540
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mappen \"%s\" heter nå \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "Identiteten \"%s\" ble slettet."
+#: lib/MIME/Viewer/tnef.php:96
+msgid "The following files were attached to this part:"
+msgstr "Følgende filer ble vedlagt denne delen:"
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "Identiteten \"%s\" ble lagret."
+#: lib/MIME/Viewer/html.php:95
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr "Bildene vil vises da senderen finnes i din adressebok."
+
+#: lib/MIME/Viewer/status.php:78
+msgid "The mail server generated the following error message:"
+msgstr "E-post tjeneren genererte følgende feilmelding:"
+
+#: lib/MIME/Viewer/notification.php:54
+msgid "The mail server generated the following informational message:"
+msgstr "E-post tjeneren genererte følgende infomelding:"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "The mail server generated the following message:"
+msgstr "E-post tjeneren genererte følgende melding:"
+
+#: lib/Message.php:635
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "Postboksen %s er allerede tom"
+
+#: lib/Fetchmail.php:262
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+"Meldingen \"%s\" fra \"%s\" (%d bytes) overgår størrelse for meldinger som "
+"skal hentes."
 
-msgid "The message being composed has been closed.  Exiting."
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
 msgstr "Meldingen som har blitt skrevet har blitt stengt. Avslutter."
 
-msgid "The signature couldn't be replaced."
+#: message.php:142
+msgid "The message has been deleted."
+msgstr "Meldingen ble slettet."
+
+#: lib/MIME/Viewer/pgp.php:399
+msgid "The message has been verified."
+msgstr "Meldingen er bekreftet."
+
+#: lib/MIME/Viewer/pkcs7.php:378
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Meldingen er bekreftet. Sender: %s."
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"Passphrase vinduet kan ikke åpnes. Det kan hende du har satt nettleseren din "
+"til å blokkere popup-vinduer"
+
+#: lib/MIME/Viewer/pgp.php:178
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr "Råtekst for PGP-nøkkelen vises %s."
+
+#: lib/MIME/Viewer/tnef.php:62
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "Den forespurte filen finnes ikke i MS-TNEF vedlegget."
+
+#: lib/MIME/Viewer/zip.php:67
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "Den forespurte filen finnes ikke i Zip vedlegget."
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+"Senderen av denne meldingen forespør leveringsbekreftelse når du har lest "
+"meldingen. Vennligst klikk %s for å sende leveringsbekreftelse."
+
+#: lib/MIME/Viewer/images.php:72
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "Serveren kunne ikke lage minibilde av dette bildet."
+
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
 msgstr "Signaturen kunne ikke erstattes."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Signaturen ble erstattet."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr "Den spesifiserte filen eksisterer ikke."
+
+#: lib/MIME/Viewer/itip.php:159
+msgid "The task has been added to your tasklist."
+msgstr "Handlingen har blitt lagt til din liste over handlinger."
+
+#: lib/MIME/Viewer/status.php:98
+msgid "The text of the message"
+msgstr "Meldingstekst"
+
+#: lib/MIME/Viewer/status.php:97
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr "Meldingsteksten kan leses %s."
+
+#: lib/MIME/Viewer/status.php:83
+msgid "The text of the returned message"
+msgstr "Tekst for returnert melding"
+
+#: lib/MIME/Viewer/status.php:82
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr "Teksten for den returnerte meldingen kan leses %s."
+
+#: lib/MIME/Viewer/notification.php:71
+msgid "The text of the sent message"
+msgstr "Teksten for den sendte meldingen"
+
+#: lib/MIME/Viewer/notification.php:71
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr "Teksten for den sendte meldingen kan leses %s."
+
+#: lib/MIME/Viewer/itip.php:144
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Brukerens ledig/opptatt informasjon ble lagret."
+
+#: lib/MIME/Viewer/alternative.php:89
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Det er ingen alternative deler som kan vises inline."
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Det er ingen meldinger i denne postboksen."
 
-#, c-format
+#: lib/Message.php:594
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Det oppstod et problem under slettingen av %s. Melding fra serveren"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
+#: lib/Message.php:637
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
-"Det oppstod et problem ved fjerning av postboksen. Melding fra serveren"
+"Det oppstod et problem ved fjerning av postboksen. Melding fra serveren: %s"
 
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:603
+msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr ""
 "Det oppstod et problem ved fjerning av postboksen. Melding fra serveren"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"Det oppstod et problem med filopplastingen. Filen var muligens større ennden "
-"maksimalt tilatte størrelsen (%d MB)."
-
+#: lib/Message.php:97
+#, php-format
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"Det oppstod et problem med filopplastingen. Filen var muligens større ennden "
-"maksimalt tilatte størrelsen."
-
-#, c-format
-msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Det oppstod en feil under kopieringen av meldingen til \"%s\". Melding fra "
-"serveren"
+"Det oppstod en feil under kopieringen av meldingen fra \"%s\" til \"%s\". "
+"Melding fra serveren"
 
-#, c-format
+#: lib/Message.php:207 lib/Message.php:222
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
@@ -1385,7 +3840,8 @@
 "Det oppstod en feil under sletting av meldinger fra mappen \"%s\". Melding "
 "fra serveren"
 
-#, c-format
+#: lib/Message.php:286
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
@@ -1393,13 +3849,23 @@
 "Det oppstod en feil ved sletting av beskjeder fra mappen \"%s\". Melding fra "
 "serveren"
 
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "Det oppstod en feil under sletting av meldinger. Melding fra serveren"
+#: lib/Message.php:220
+#, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr ""
+"Det oppstod en feil under sletting av meldinger. Melding fra serveren: %s"
+
+#: lib/MIME/Viewer/itip.php:90
+#, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Det oppstod en feil under visning av forespurt melding: %s."
 
+#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
 msgid "There was an error displaying this message part"
 msgstr "Det oppstod en feil under forsøk på å vise denne meldingsdelen"
 
-#, c-format
+#: lib/Message.php:523 lib/Message.php:565
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
@@ -1407,179 +3873,373 @@
 "Det oppstod en feil ved flagging av meldinger i mappen \"%s\". Melding fra "
 "serveren"
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Det oppstod en feil ved flagging av meldinger. Melding fra serveren"
-
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
+#: folders.php:155
+#, php-format
+msgid "There was an error importing %s."
+msgstr "Det oppstod en feil ved importering av %s."
+
+#: lib/MIME/Viewer/itip.php:126
+#, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Det oppstod en feil under importering av hendelsen: %s."
+
+#: lib/MIME/Viewer/itip.php:156
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Det oppstod en feil ved importering av hendelsen: %s."
+
+#: lib/MIME/Viewer/itip.php:142
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
-"Det oppstod en feil under flyttingen av meldingen til \"%s\". Melding fra "
-"serveren"
+"Det oppstod en feil ved importering av brukerens ledig/opptatt-informasjon: %"
+"s"
 
+#: lib/Message.php:92
+#, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
-msgstr "Det oppstod en feil ved sletting av meldingene. Melding fra serveren"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"Det oppstod en feil under flyttingen av meldingen fra \"%s\" til \"%s\". "
+"Melding fra serveren"
 
-msgid "There was an error saving a draft."
-msgstr "Det oppstod en feil under lagring av kladd."
+#: compose.php:1165
+msgid "There was an error saving this message as a draft."
+msgstr "Det oppstod en feil ved lagring av melding som kladd."
 
+#: compose.php:927
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Det oppstod en feil under sending av meldingen: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr ""
-"Det oppstod en feil under gjenoppretting av meldinger. Melding fra serveren"
+#: lib/MIME/Viewer/itip.php:104
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Det oppstod en feil under oppdatering av hendelsen: %s"
+
+#: lib/MIME/Viewer/plain.php:62
+msgid "There was no text in this message part"
+msgstr "Det er ingen tekst i denne meldingsdelen"
 
-msgid "There was an error viewing the requested message."
-msgstr "Det oppstod en feil under visning av forespurt melding."
+#: lib/MIME/Viewer/html.php:93
+msgid "This HTML message has images embedded in it."
+msgstr "Denne HTML-meldingen har bilder i seg."
 
+#: lib/MIME/Viewer/html.php:89
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr ""
-"Denne filen kontrollerer lokale MIME-drivere for IMP, spesiellt hvilke typer "
-"vedlegg som er visbare og/eller nedlastbare."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr "Denne HTML meldingen har bilder i seg. Blokkerte bilder vises slik:"
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
-msgstr ""
-"Denne filen kontrollerer standardinstillingene til IMP. Den kontrollerer "
-"også hvilke instillinger brukerne kan endre."
+#: lib/MIME/Viewer/pgp.php:171
+msgid "This PGP Public Key was attached to the message."
+msgstr "Denne offentlige PGP-nøkkelen var vedlagt meldingen."
+
+#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
+#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
+#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+msgid "This action is not supported."
+msgstr "Den forespurte oppgaven er ikke stottet."
+
+#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+msgid "This action is not yet implemented."
+msgstr "Den forespurte oppgaven er ikke implementert."
+
+#: templates/folders/javascript.inc:7
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Dette kan ta litt tid. Er du sikker på at du vil fortsette?"
 
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "This message contains a Macintosh file."
+msgstr "Denne meldingen inneholder en Macintosh-fil."
+
+#: lib/MIME/Viewer/pkcs7.php:406
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
 msgstr ""
-"Denne filen kontrollerer standardinstillinger for IMP. Den definerer også "
-"listen over tilgjengelige servere hvis du fortsatt bruker serverlisten."
+"Denne meldingen inneholder et vedlegg som er digitalt signert med S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Denne meldingen inneholder ett vedlegg som er kryptert med S/MIME."
 
+#: lib/MIME/Viewer/status.php:167
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"Denne filen kontrolerer stilarkene som definerer farger og skrifttyper i "
-"tillegg til å overstyre Horde-standardverdiene."
-
-msgid "This HTML message has images embedded in it."
-msgstr "Denne HTML-meldingen har bilder i seg."
+"Denne meldingen inneholder leveringsinformasjon, men formatet på meldingen "
+"er ukjent."
 
+#: lib/MIME/Viewer/pgp.php:321
 msgid ""
-"This HTML message has images embedded in it. Blocked images appear like "
-"this: "
-msgstr "Denne HTML meldingen har bilder i seg. Blokkerte bilder vises slik:"
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "Meldingen ser ikke ut som en gyldig PGP-kryptert melding. Feil: "
 
+#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
 msgstr ""
-"Dette er hoved-konfigurasjonsfilen til IMP. Den inneholder stier og valg for "
-"IMP-skriptene."
+"Denne meldingen ser ikke ut til å være i riktig PGP-format (i henhold til "
+"RFC 2015)."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Dette kan ta litt tid. Er du sikker på at du vil fortsette?"
-
-msgid "This message has been reported as spam to your system administrator."
-msgstr ""
-"Denne meldingen er blitt rapportert som spam til systemadministratoren."
+#: lib/MIME/Viewer/pkcs7.php:162
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr "Denne meldingen ser ikke ut til å være i riktig S/MIME format."
+
+#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+msgid "This message has been digitally signed via PGP."
+msgstr "Denne meldingen er digitalt signert med PGP."
+
+#: lib/MIME/Viewer/pkcs7.php:135
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Denne meldingen er digitalt signert med S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+msgid "This message has been encrypted via S/MIME."
+msgstr "Denne meldingen er kryptert med S/MIME."
+
+#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+msgid "This message has been encrypted with PGP."
+msgstr "Denne meldingen er kryptert med PGP."
 
+#: message.php:202
 msgid "This message to"
 msgstr "Denne meldingen til"
 
-msgid "This number must be at least one."
-msgstr "Dette nummeret må være minst én."
-
-msgid "This value must be a number."
-msgstr "Denne verdien må være et nummer."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr "Denne tjeneren støtter ikke deling av mapper."
 
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
 msgstr "Dette vinduet må bli åpnet fra 'Ny melding' vinduet"
 
+#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
 msgid "Thread View"
 msgstr "Trådvisning"
 
-msgid "Thread"
-msgstr "Tråd"
-
-msgid "Time Zone"
-msgstr "Tidssone"
-
+#: message.php:255 mailbox.php:576 search.php:145
+#: templates/contacts/contacts.inc:221
+#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
+#: templates/compose/recompose.inc:10
 msgid "To"
 msgstr "Til"
 
-msgid "To:"
-msgstr "Til:"
+#: config/prefs.php.dist:890
+msgid "To Address"
+msgstr "Til-adresse"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+"For å velge flere, hold nede Control (PC) eller Command (Mac) mens du klikker"
+
+#: templates/compose/compose.inc:567
+msgid "Total Attachments Size:"
+msgstr "Total størrelse på vedlegg:"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Total størrelse: %s KB"
+#: folders.php:350
+msgid "Trash folder"
+msgstr "Søpplemappe"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Søpplemappe:"
 
-msgid "Unanswered messages"
-msgstr "Ubesvarte meldinger"
+#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
+#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+msgid "Unable to retrieve quota"
+msgstr "Klarte ikke å hente informasjon om kvote"
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Ubesvart"
 
-msgid "Undelete"
-msgstr "Gjenopprett"
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Ubesvarte meldinger"
 
-msgid "_Undelete"
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
+msgid "Undelete"
 msgstr "Gjenopprett"
 
+#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:218
 msgid "Undisclosed Recipients"
 msgstr "Skjulte mottakere"
 
+#: lib/MIME/Viewer/itip.php:408
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr "Uhåndtert komponent av typen: %s"
+
+#: mailbox.php:537
+msgid "Unknown Date"
+msgstr "Ukjent dato"
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Unknown Meeting"
+msgstr "Ukjent møte"
+
+#: mailbox.php:588
+msgid "Unknown Recipient"
+msgstr "Ukjent mottaker"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+msgid "Unload Passphrase"
+msgstr "Fjern passphrase"
+
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Uten navn"
 
-msgid "Unread"
-msgstr "Ulest"
-
-msgid "Unseen Messages"
-msgstr "Uleste meldinger"
-
+#: message.php:489 mailbox.php:671 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Ulest"
 
+#: templates/folders/actions.inc:10
 msgid "Unsubscribe from Folder(s)"
 msgstr "Si opp abonnement på mappe(r)"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Bruk Ctrl/Opsjon + klikk for å velge flere felt"
+#: templates/compose/compose.inc:574
+msgid "Update Attachment Information"
+msgstr "Oppdater informasjon om vedlegg"
+
+#: lib/MIME/Viewer/itip.php:576
+msgid "Update respondent status"
+msgstr "Oppdater status på avsendere"
+
+#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr "Last opp"
 
+#: templates/prefs/sentmailselect.inc:42
 msgid "Use Default Value"
 msgstr "Bruk standard verdi"
 
+#: config/prefs.php.dist:250
 msgid "Use IMAP folder subscriptions?"
-msgstr "Bruk IMAP mappeabonnement"
+msgstr "Bruke IMAP mappeabonnement?"
 
-msgid "User Options"
-msgstr "Andre valg"
+#: templates/acl/acl.inc:140
+msgid "User"
+msgstr "Brukernavn"
+
+#: acl.php:87
+#, php-format
+msgid "User '%s' successfully given the specified rights for the folder '%s'."
+msgstr "Brukeren '%s' ble gitt de forespurte rettighetene for mappen '%s'."
 
+#: templates/login/login.inc:209
 msgid "Username"
 msgstr "Brukernavn"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
+#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+msgid "View"
+msgstr "Vis"
+
+#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#, php-format
 msgid "View %s"
 msgstr "Vis %s"
 
-msgid "View messages in "
-msgstr "Vis melding i "
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#, php-format
+msgid "View %s Public Key"
+msgstr "Vis offentlig nøkkel for %s"
+
+#: lib/MIME/Viewer/html.php:116
+msgid "View HTML content in a separate window"
+msgstr "Vise HTML-innhold i et eget vindu."
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+msgid "View Personal Private Key"
+msgstr "Vis personlig, privat nøkkel"
+
+#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+msgid "View Personal Public Key"
+msgstr "Vis personlig, offentlig nøkkel"
+
+#: templates/message/navbar_actions.inc:17
+msgid "View Thread"
+msgstr "Se tråd"
+
+#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/images.php:162
+msgid "View Thumbnail"
+msgstr "Se minibilde"
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "View attachment in a separate window"
+msgstr "Vis vedlegg i et eget vindu"
+
+#: lib/MIME/Viewer/related.php:64
+msgid "View content in a separate window"
+msgstr "Vise innhold i et eget vindu."
+
+#: lib/MIME/Viewer/itip.php:130
+msgid "View event"
+msgstr "Vis hendelse"
+
+#: folders.php:342 mailbox.php:506
+#, php-format
+msgid "View messages in %s"
+msgstr "Vis meldinger i %s"
 
+#: templates/prefs/initialpageselect.inc:26
 msgid "View or mailbox to display after login:"
 msgstr "Visning eller postboks som skal vises etter innlogging:"
 
+#: lib/MIME/Viewer/itip.php:160
+msgid "View task"
+msgstr "Vis handlinger"
+
+#: lib/MIME/Viewer/html.php:110
+msgid "View the Images"
+msgstr "Vis bildene "
+
+#: search.php:309
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Virituell mappe \"%s\" ble opprettet."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:125 lib/IMAP/Tree.php:138
+#: lib/IMAP/Tree.php:140 lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:145
+#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:353 lib/IMAP/Tree.php:395
+msgid "Virtual Folders"
+msgstr "Virtuelle mapper"
+
+#: search.php:291
+msgid "Virtual Folders require a label."
+msgstr "Virtuelle mapper krever navn."
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr "Navn på virtuell mappe"
+
+#: lib/MIME/Viewer/pkcs7.php:368
 msgid "Warning"
 msgstr "Advarsel"
 
-#, c-format
+#: login.php:131
+#, php-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
+#: config/prefs.php.dist:724
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -1587,110 +4247,207 @@
 "Ved sletting av meldinger, flytt dem til Søppelmappen istedet for å markere "
 "dem som slettet?"
 
+#: config/prefs.php.dist:878
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr "Hvilken side vil du starte på ved åpning av en ny postboks?"
+
+#: config/prefs.php.dist:554
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr "Ønsker du å lagre vedlegg ved lagring av sendte elementer?"
+
+#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "Betrodde adresser"
+
+#: config/prefs.php.dist:437
 msgid "Wrap text at this many characters."
 msgstr "Bryt tekst ved så mange tegn."
 
+#: templates/compose/compose.inc:531 config/prefs.php.dist:949
 msgid "Yes"
 msgstr "Ja"
 
+#: lib/Maintenance/Task/fetchmail_login.php:63
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Du prøver å hente e-post fra følgende konto(er):"
+
+#: templates/folders/javascript.inc:8
 msgid "You are attempting to delete the following folders:"
 msgstr "Du prøver å slette følgende mapper:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
 msgid "You are copying/moving to a new folder."
 msgstr "Du kopierer/flytter til en ny mappe."
 
+#: templates/folders/javascript.inc:101
 msgid "You are creating a sub-folder to "
 msgstr "Du lager en undermappe i "
 
+#: templates/folders/javascript.inc:103
 msgid "You are creating a top-level folder."
 msgstr "Du lager en toppnivåmappe."
 
-msgid "You are currently using Secure HTTPS<br/>"
-msgstr "Du er tilkoblet med sikker HTTPS</br/>"
-
-msgid "You are currently using Standard HTTP<br/>"
-msgstr "Du er tilkoblet med vanlig HTTP<br/>"
-
+#: templates/folders/javascript.inc:144
 msgid "You are renaming the folder: "
 msgstr "Du gir nytt navn til mappen: "
 
-msgid "You can not have the '\\' character in your full name."
-msgstr "Du kan ikke ha en '\\' i navnet ditt."
+#: lib/Maintenance/Task/tos_agreement.php:37
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr "Du kan ikke logge inn da du ikke godtok avtalevilkårene."
+
+#: templates/acl/acl.inc:165
+msgid "You do not have permission to change access to this folder"
+msgstr "Du har ikke rettigheter til å endre tilgang til denne mappen"
+
+#: lib/Maillog.php:132
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr "Du videresendte denne meldingen på %%s til følgende mottakere: %s."
 
-#, c-format
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Du har %s nye meldinger!"
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Du har 1 ny melding!"
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Du er nå logget ut. Takk for at du brukte systemet."
+#: templates/compose/attachments.js:116
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
+"Du har minst ett vedlegg valgt som du ikke har lastet opp enda. Er du sikker "
+"på at du ønsker å sende denne meldingen uten disse vedleggene?"
 
+#: lib/IMP.php:1002
 msgid "You have new mail in the following folder:"
 msgstr "Du har ny post i følgende mappe:"
 
+#: lib/IMP.php:1007
 msgid "You have new mail in the following folders:"
 msgstr "Du har ny post i følgende mapper:"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Du må først velge vedlegg som skal slettes."
+#: compose.php:127
+msgid "You must enter at least one recipient."
+msgstr "Du må ha minst én mottaker."
 
-msgid "You must first specify the file to attach."
-msgstr "Du må først spesifisere filen som skal legges ved."
+#: lib/MIME/Viewer/pgp.php:308
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+"Du må skrive inn passphrase for din private PGP-nøkkel for å vise denne "
+"meldingen"
 
-msgid "You must have at least one recipient."
-msgstr "Du må ha minst én mottaker."
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+"Du må skrive inn passphrase for din private S/MIME-nøkke for å vise denne "
+"meldingen"
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
 msgid "You must select a target mailbox first."
 msgstr "Du må velge en mål-postboks først."
 
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr "Du må velge en identitet som skal slettes."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Du må velge en adresse først."
 
-msgid "You must select an identity to be deleted."
-msgstr "Du må velge en identitet som skal slettes."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
+#: templates/mailbox/javascript.inc:271
 msgid "You must select at least one message first."
 msgstr "Du må velge minst én melding først."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Du må spesifisere en mottaker."
 
-#, c-format
+#: templates/compose/attachments.js:29
+msgid "You must specify at least one file to attach."
+msgstr "Du må først spesifisere filen som skal legges ved."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have '%s' enabled in your maintenance options."
+msgstr "Du må aktivere '%s' i instillinger for vedlikehold."
+
+#: lib/Maillog.php:140
+#, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Du omdirigerte denne meldingen til %s på %%s."
+
+#: lib/Maillog.php:144
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "Du svarte på denne meldingen på %s."
+
+#: lib/Folder.php:590
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Du fikk ikke abonnere på \"%s\". Melding fra serveren"
 
-#, c-format
+#: lib/Folder.php:641
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Du fikk ikke si opp abonnementet på \"%s\". Melding fra serveren"
 
-#, c-format
+#: lib/Folder.php:593
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Du abonnerer nå på \"%s\""
 
-#, c-format
+#: lib/Folder.php:644
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Du sa opp abonnementet på \"%s\""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "%søkten din er utløpt. Vennligst logg inn på nytt."
-
-msgid "Your From: address:"
-msgstr "Din fra-adresse:"
-
-msgid "Your Information"
-msgstr "Din informasjon"
+#: templates/pgp/pgp.inc:186
+msgid "Your Name"
+msgstr "Fullt navn"
+
+#: templates/pgp/pgp.inc:119
+msgid "Your PGP Public/Private Keys"
+msgstr "Dine offentlige/private PGP-nøkler"
+
+#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+msgid "Your Private Key"
+msgstr "Din private nøkkel"
+
+#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+msgid "Your Public Key"
+msgstr "Din offentlige nøkkel"
 
+#: config/prefs.php.dist:157
 msgid "Your Reply-to: address: <i>(optional)</i>"
 msgstr "Din svaradresse: <i>(valgfri)</i>"
 
-msgid "Your browser does not support inline display of this image type"
-msgstr ""
-"Nettleseren din støtter ikke denne utskiftsoperasjonen. Trykk Kontroll/"
-"Opsjon + P for å skrive ut."
+#: templates/smime/smime.inc:91
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "Dine offentlige/private S/MIME-sertifikater"
+
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr "Dine kontoer:"
 
+#: config/prefs.php.dist:165
+msgid ""
+"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+msgstr "Dine alias-adresser: <i>(valgfritt, en adresse per linje)</i>"
+
+#: lib/MIME/Viewer/images.php:95
+msgid "Your browser does not support inline display of this image type."
+msgstr "Nettleseren din støtter ikke visning av denne type bilder inline."
+
+#: templates/message/print.inc:27
 msgid ""
 "Your browser does not support this print option. Press Control/Option + P to "
 "print."
@@ -1698,236 +4455,160 @@
 "Nettleseren din støtter ikke denne utskiftsoperasjonen. Trykk Kontroll/"
 "Opsjon + P for å skrive ut."
 
-msgid "Your current time zone:"
-msgstr "Din gjeldende tidssone:"
-
-msgid "Your default identity:"
-msgstr "Din standardidentitet:"
-
-msgid "Your full name:"
-msgstr "Fullt navn:"
-
-msgid "Your identities:"
-msgstr "Dine identiteter:"
-
-msgid "Your options have been updated."
-msgstr "Valgene dine er oppdatert."
-
-msgid ""
-"Your session will expire in 1 minute. Do you want to reload the page to "
-"prevent losing your work?"
-msgstr ""
-"Din forbindelse vil gå ut om 1 minutt. Ønsker du å oppdatere siden for å "
-"unngå å miste arbeidet ditt?"
-
-msgid ""
-"Your session will expire in 5 minutes. Do you want to reload the page to "
-"prevent losing your work?"
-msgstr ""
-"Din forbindelse vil gå ut om 5 minutter. Ønsker du å oppdatere siden forå "
-"unngå å miste arbeidet ditt?"
+#: config/prefs.php.dist:532
+msgid "Your default charset for sending messages:"
+msgstr "Ditt standard tegnsett for sending av meldinger:"
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr "Din standard krypteringsmetode for sending av meldinger:"
+
+#: lib/MIME/Viewer/status.php:92
+msgid "Your message was successfully delivered."
+msgstr "Meldingen ble levert."
 
+#: config/prefs.php.dist:198
 msgid "Your signature:"
 msgstr "Din signatur:"
 
+#: message.php:279 compose.php:1205 mailbox.php:521 lib/Compose.php:742
 msgid "[No Subject]"
 msgstr "[Intet emne]"
 
-msgid "add source"
-msgstr "legg til kilde"
-
-msgid "cannot move past the beginning"
-msgstr "kan ikke flytte til før begynnelsen"
-
-msgid "cannot move past the end"
-msgstr "kan ikke flytte forbi slutten"
-
-msgid "delete message"
-msgstr "slett melding"
-
-msgid "from"
-msgstr "fra"
-
-msgid "move down"
-msgstr "flytt ned"
-
-msgid "Whitelist"
-msgstr "Hvitlistet"
-
-msgid "_Whitelist"
-msgstr "Hvitlist avsender"
-
-msgid "move message to"
-msgstr "flytt meldingen til"
-
-msgid "move up"
-msgstr "flytt opp"
-
-msgid "no folder selected"
-msgstr "ingen mappe valgt"
-
-msgid "no rule selected"
-msgstr "ingen regel valgt"
-
-msgid "no text specified"
-msgstr "ingen tekst valgt"
-
-msgid "none"
-msgstr "ingen"
-
-msgid "or"
-msgstr "eller"
-
-msgid "please fill in the text and choose a field and an action"
-msgstr "vennligst fyll inn teksten og velg et felt og en oppgave"
-
-msgid "remove source"
-msgstr "fjern kilde"
-
-msgid "select folder"
-msgstr "velg mappe"
-
-msgid "spelling error"
-msgstr "stavefeil"
-
-msgid "spelling errors"
-msgstr "stavefeil"
-
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "hvor feltene %s inneholder <b>%s</b>"
-
-msgid "_Accounts"
-msgstr "Kontoer"
+#: templates/compose/compose.inc:216
+msgid "_Bcc"
+msgstr "_Blind kopi"
 
-msgid "Search Mail"
-msgstr "Søk etter mail"
+#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+msgid "_Blacklist"
+msgstr "_Sperre adresser"
 
-msgid "Fro_m"
-msgstr "Avsender"
+#: templates/compose/compose.inc:165
+msgid "_Cc"
+msgstr "_Kopi til"
 
-msgid "Sub_ject"
-msgstr "Emne"
+#: lib/IMP.php:903
+msgid "_Compose"
+msgstr "_Ny melding"
 
-msgid "_Thread"
-msgstr "Tråd"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+msgid "_Delete"
+msgstr "_Slett"
 
-msgid "Dat_e"
-msgstr "Dato"
+#: lib/IMP.php:905
+msgid "_Folders"
+msgstr "_Mapper"
 
-msgid "Ope_n Folder"
-msgstr "Åpne mappe"
+#: templates/compose/compose.inc:80
+msgid "_Identity"
+msgstr "_Identitet"
 
-msgid "Acco_unts"
-msgstr "Kontoer"
+#: lib/IMP.php:896
+msgid "_Inbox"
+msgstr "_Innboks"
 
+#: lib/IMP.php:946
 msgid "_Log out"
-msgstr "Logg ut"
-
-msgid "_View Thread"
-msgstr "Se tråd"
+msgstr "_Logg ut"
 
+#: message.php:375
 msgid "_Message Source"
-msgstr "Meldingskilde"
+msgstr "_Meldingskilde"
 
+#: templates/message/navbar_actions.inc:31
 msgid "_Print"
 msgstr "_Skriv ut"
 
-msgid "Redirec_t"
-msgstr "Rediriger"
-
-msgid "_To"
-msgstr "Til"
-
-msgid "_Cc"
-msgstr "Kopi til"
-
-msgid "_Bcc"
-msgstr "Blind kopi"
-
-msgid "S_ubject"
-msgstr "Emne"
-
-msgid "C_harset"
-msgstr "Tegnsett"
-
-msgid "Te_xt"
-msgstr "Tekst"
-
-msgid "Sa_ve a copy in "
-msgstr "Lagre kopi i "
-
-msgid "Request a _Read Receipt"
-msgstr "Be om lesebekreftelse"
-
-msgid "Re_quest Delivery Confirmation"
-msgstr "Be om leveringsbekreftelse"
-
-msgid "Li_nk Attachments"
-msgstr "Link vedlegg"
-
-msgid "Maximum Attachment Size"
-msgstr "Maks størrelse på vedlegg"
-
-msgid "Maximum number of attachments reached."
-msgstr "Maks antall vedlegg nådd"
-
-msgid "Maximum total attachment size reached."
-msgstr "Maks total størrelse på vedlegg nådd"
+#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+msgid "_Priority"
+msgstr "_Prioritet"
+
+#: mailbox.php:395
+#, php-format
+msgid "_Refresh %s"
+msgstr "_Oppdater %s"
 
-msgid "Basic Search"
-msgstr "Standard søk"
+#: templates/message/navbar_actions.inc:8
+msgid "_Reply"
+msgstr "_Svar"
 
-msgid "_Basic Search"
-msgstr "Standard søk"
+#: lib/IMP.php:907
+msgid "_Search"
+msgstr "_Søk"
 
-msgid "Virtual Folders"
-msgstr "Virtuelle mapper"
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+msgid "_Send Message"
+msgstr "_Send melding"
 
-msgid "Virtual folder label"
-msgstr "Navn på virtuell mappe"
-
-msgid "Received On"
-msgstr "Mottatt dato"
+#: templates/mailbox/message_headers.inc:27
+msgid "_Thread"
+msgstr "_Tråd"
 
-msgid "Received Since"
-msgstr "Mottatt siden"
+#: templates/compose/compose.inc:115
+msgid "_To"
+msgstr "_Til"
 
-msgid "Received Until"
-msgstr "Mottatt frem til"
+#: templates/mailbox/actions.inc:13
+msgid "_Undelete"
+msgstr "_Gjenopprett"
 
-msgid "Select a field"
-msgstr "Velg et felt"
+#: templates/message/navbar_actions.inc:17
+msgid "_View Thread"
+msgstr "_Se tråd"
 
-msgid "Search %s"
-msgstr "Søk %s"
+#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr "_Betrodde avsender"
 
-msgid "Do NOT match"
-msgstr "IKKE tilfredsstill"
+#: lib/Compose.php:355
+msgid "attachment"
+msgstr "vedlegg"
 
-msgid "Other Mail Accounts"
-msgstr "Andre mailkontoer"
+#: view.php:102
+msgid "attachments.zip"
+msgstr "vedlegg.zip"
 
-msgid "Check all mail servers you want to fetch mail from:"
-msgstr "Velg alle servere du vil hente e-post fra:"
+#: templates/compose/compose.inc:503
+msgid "bytes"
+msgstr "bytes"
 
-msgid "Fetch Mail"
-msgstr "Hent e-post"
+#: templates/contacts/contacts.inc:187
+msgid "from"
+msgstr "fra"
 
-msgid "Close"
-msgstr "Lukk"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr "nøkkel"
+
+#: folders.php:151
+msgid "mailbox file"
+msgstr "postboks-fil"
+
+#: compose.php:987 lib/Message.php:442
+msgid "name"
+msgstr "navn"
 
-msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr "Du videresendte denne meldingen på %%s til følgende mottakere: %s."
+#: templates/compose/spelling.inc:80
+msgid "none"
+msgstr "ingen"
 
-msgid "You replied to this message on %s."
-msgstr "Du svarte på denne meldingen på %s."
+#: templates/compose/spelling.inc:111
+msgid "or"
+msgstr "eller"
 
-msgid "Headers"
-msgstr "Meldingshoder"
+#: templates/compose/spelling.inc:48
+msgid "spelling error"
+msgstr "stavefeil"
 
-msgid "Show All Headers"
-msgstr "Vis alle meldingshoder"
+#: templates/compose/spelling.inc:48
+msgid "spelling errors"
+msgstr "stavefeil"
 
-msgid "Show Limited Headers"
-msgstr "Vis begrensete meldingshoder"
+#: lib/Filter.php:55
+msgid "your blacklist"
+msgstr "dine sperrede adresser"
+
+#: lib/Filter.php:67
+msgid "your whitelist"
+msgstr "dine betrodde adresser"


--- orig/po/da_DK.po
+++ mod/po/da_DK.po
@@ -1,16 +1,16 @@
 # Danish translations for IMP package
 # Danske oversættelser for pakke IMP.
 # Copyright (C) 2005 Horde Project
-# This file is distributed under the same license as the FRAMEWORK package.
+# This file is distributed under the same license as the IMP package.
 # Martin List-Petersen <martin at list-petersen.dk>, 2001.
 # Brian Truelsen <horde+i18n at briantruelsen.dk>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0.4\n"
+"Project-Id-Version: H3 (4.1.1-cvs)\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-08 16:03+0200\n"
-"PO-Revision-Date: 2005-10-09 21:41+0200\n"
+"POT-Creation-Date: 2006-03-11 12:07+0100\n"
+"PO-Revision-Date: 2006-03-11 17:25+0100\n"
 "Last-Translator: Brian Truelsen <horde+i18n at briantruelsen.dk>\n"
 "Language-Team: i18n at lists.horde.org\n"
 "MIME-Version: 1.0\n"
@@ -18,28 +18,32 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "      Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "      Til: "
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "    Dato: "
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "    Fra: "
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:408 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Accesskey %s)"
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr " Emne: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " i "
 
@@ -47,166 +51,169 @@
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:196
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d beskeder"
+
+#: mailbox.php:175
 #, php-format
 msgid "%d messages have been deleted."
 msgstr "%d beskeder er blevet slettet."
 
-#: lib/Spam.php:178
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "%d beskeder er blevet sendt ind som ej-spam til din systemadministrator."
 
-#: lib/Spam.php:158
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d beskeder er blevet indberettet som spam."
 
-#: lib/Spam.php:170
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
 "%d beskeder er blevet indberettet som spam til din systemadministrator."
 
-#: lib/Spam.php:150
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d beskeder er blevet indberettet som spam."
 
-#: mailbox.php:369
+#: mailbox.php:358
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d til %d af %d beskeder"
 
-#: mailbox.php:619
+#: mailbox.php:635
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP-administration"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME-administration"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s findes allerede. Mappen %s blev ikke omdøbt."
 
-#: lib/Message.php:612
+#: lib/Message.php:685
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s synes ikke at være en gyldig brevbakke."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mappen %s vil blive omdøbt i starten af hver måned."
 
-#: lib/MIME/Viewer/itip.php:256
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s har accepteret."
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s har aflyst %s."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s har aflyst \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:262
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s har nægtet."
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s har svaret på en ledig/optaget-anmodning."
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s har svaret på invitation til %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s har svaret på invitation til \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:482
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s har sendt ledig/optaget-information til dig."
 
-#: lib/MIME/Viewer/itip.php:268
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s har accepteret tentativt."
 
-#: lib/MIME/Viewer/itip.php:487
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s anmoder om dine ledig/optaget-informationer."
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s anmoder om din tilstedeværelse den %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s anmoder om din tilstedeværelse ved \"%s\"."
 
-#: lib/Message.php:377
+#: lib/Message.php:461
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s er blevet tilføjet til %s."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s er succesfuldt blevet tilføjet til \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:597
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s ønsker at justere %s."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s ønsker at justere \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:574
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s ønsker at gøre dig opmærksom på %s."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s ønsker at gøre dig opmærksom på \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:602
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s ønsker at modtage seneste information om %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s ønsker at modtage seneste information om \"%s\"."
 
-#: message.php:269 message.php:274
+#: message.php:292 message.php:297
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;af&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Godkend ændringerne og gå til næste skærm.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Annuller alle ændringer og gå tilbage til besked-skrivning.)"
+msgstr "(Annuller alle ændringer og gå tilbage til skrivningsvinduet.)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Ren tekst)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Gå tilbage til besked-skrivning efter at have gemt ændringer lavet indtil "
+"(Gå tilbage til skrivningsvinduet efter at have gemt ændringer lavet indtil "
 "nu. Ændringer på den aktuelle side vil ikke blive gemt.)"
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -214,52 +221,52 @@
 "(Send besked efter at have gemt ændringer lavet indtil nu. Ændringer på den "
 "aktuelle side vil ikke blive gemt.)"
 
-#: templates/contacts/contacts.inc:222
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Tilføj disse ved at clicke OK *"
 
-#: templates/contacts/contacts.inc:201
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Vælg venligst adresse(r) *"
 
-#: mailbox.php:194
+#: mailbox.php:173
 msgid "1 message has been deleted."
 msgstr "1 besked er blevet slettet."
 
-#: lib/Spam.php:180
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 "1 besked er blevet indberettet som ej-spam til din systemadministrator."
 
-#: lib/Spam.php:160
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "1 besked er blevet indberettet som ej-spam."
 
-#: lib/Spam.php:172
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 besked er blevet indberettet som spam til din systemadministrator."
 
-#: lib/Spam.php:152
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "1 besked er blevet indberettet som spam."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 tegn"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 tegn"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 tegn"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 tegn"
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Et stor billede benævnt %s er hæftet ved denne besked."
@@ -276,19 +283,19 @@
 msgid "AND"
 msgstr "OG"
 
-#: lib/MIME/Viewer/itip.php:590
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Acceptér anmodning og tilføj til min kalender"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Acceptér anmodning"
 
-#: lib/MIME/Viewer/itip.php:587
-msgid "Accept request and add it to my calendar"
-msgstr "Acceptér anmodning og tilføj til kalender"
-
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: lib/MIME/Viewer/itip.php:257
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "Accepteret: "
 
@@ -296,35 +303,39 @@
 msgid "Account's name:"
 msgstr "Navn på konto:"
 
-#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Handlinger"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Tilføj %s til mit adressekartotek"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Tilføj kilde"
 
-#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Føj til kalender"
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Tilføj til adressekartotek (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Føj til min kalender"
 
-#: compose.php:1191
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Tilføjet \"%s\" som vedhæftelse."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Yderligere felter der vises under læsning: <i>(valgfri, et felt pr. linie)</"
-"i>"
+"Yderligere felter der vises under læsning: <em>(valgfri, et felt pr. linie)</"
+"em>"
 
 #: lib/MIME/Viewer/notification.php:62
 #, php-format
@@ -353,42 +364,43 @@
 msgid "Additional message error details can be viewed %s."
 msgstr "Yderligere detaljer om besked-fejl can ses %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adressekartotek"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adressekartoteker"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"BCC alle beskeder til disse adresser: <i>(valgfri, én adresse pr. linie)</i>"
+"BCC alle beskeder til disse adresser: <em>(valgfri, én adresse pr. linie)</"
+"em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Adresser, som eksplicit knyttes til denne identitet: <i>(valgfri, én adresse "
-"pr. linie)</i>"
+"Adresser, som eksplicit knyttes til denne identitet: <em>(valgfri, én "
+"adresse pr. linie)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "Alle"
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Alle beskeder i de følgende mappe(r) vil blive gemt i en enkelt MBOX fil:"
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -407,14 +419,18 @@
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
-"Alle gamle sendte beskeder, der er ældre end %s måneder, vil blive slettet."
+"Alle gamle, sendte beskeder, der er ældre end %s måneder, vil blive slettet."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Alle rettigheder til mappen \"%s\" er blev fjernet for bruger \"%s\"."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Tillad oprettelse af mapper?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Tillad at filter-regler påføres vilkårlige brevbakker?"
 
@@ -422,15 +438,15 @@
 msgid "Alternative parts for this section:"
 msgstr "Alternative dele til dette afsnit:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "Altid"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Gem altid vedhæftelser."
 
-#: lib/Message.php:468
+#: lib/Message.php:551
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -438,11 +454,15 @@
 "En fejl opstod under forsøget på at skrælle vedhæftelsen af. IMAP-serveren "
 "meldte: "
 
-#: lib/Message.php:364
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
+msgstr "Der skete en ukendt fejl under tilføjelsen af det nye notits."
+
+#: lib/Message.php:434
 msgid "An unknown error occured while creating the new task."
 msgstr "Der skete en ukendt fejl under tilføjelsen af det nye opgave."
 
-#: mailbox.php:693 message.php:484 templates/message/navbar_navigate.inc:9
+#: mailbox.php:708 message.php:503 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/legend.inc:6 templates/mailbox/navbar.inc:18
 #: templates/mailbox/navbar.inc:35
 msgid "Answered"
@@ -461,19 +481,23 @@
 msgid "Apply Filters to %s"
 msgstr "Påfør \"%s\" filtre"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Påfør filtre, når du logger ind."
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Påfør filterregler, når din indbakke bliver vist."
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Er du sikker på, at du vil slette denne Virtuel Mappe-definition?"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Er du sikker på, at du vil slette denne offentlige nøgle?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:83
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -483,11 +507,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Er du SIKKER, at du vil fortsætte?"
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Er du sikker, at du vil slette disse beskeder PERMANENT?"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Er du sikker, at du vil PERMANENT slette denne vedhæftelser?"
 
@@ -495,7 +519,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Er du sikker, at du vil tømme denne mappe?"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:951
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Er du sikker, at du vil tømme din spam-mappe?"
+
+#: lib/IMP.php:944
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Er du sikker, at du vil tømme din skraldespand?"
 
@@ -511,61 +539,65 @@
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Er du sikker, at du vil indberettet denne besked som spam?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Modtaget"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Stigende"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Spørg"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Vedhæft"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:470
 msgid "Attach Files"
 msgstr "Vedhæft filer"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:451
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Hæft en kopi af din offentlige PGP-nøgle ved din besked?"
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Vedhæftet fil:"
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 "Størrelse af filen \"%s\" overstiger begrænsningen. Filen IKKE vedhæftet."
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Der er vedhæftet et svar til en kalender-anmodning, som du har sendt."
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/attachments.js:98
-#: templates/compose/compose.inc:496
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/attachments.js:55 templates/compose/compose.inc:498
 msgid "Attachment"
 msgstr "Vedhæftelse"
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Vedhæftelse %s slettet."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Information om vedhæftelse"
+
+#: compose.php:1105 lib/Message.php:513
 msgid "Attachment stripped: Original attachment type"
 msgstr "Vedhæftelsen taget af: Oprindelig type af vedhæng"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Vedhæftelser"
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "Deltagere"
 
@@ -577,7 +609,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Krævet IMAP udviddelse ikke fundet."
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -589,7 +621,7 @@
 msgid "Available Address books:"
 msgstr "Adressekartoteker, der står til rådighed:"
 
-#: lib/MIME/Viewer/itip.php:719
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Afventer reaktion"
 
@@ -598,13 +630,36 @@
 msgid "Bac_k to %s"
 msgstr "Tilbage til %s"
 
-#: thread.php:86 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Tilbage til %s"
 
-#: message.php:250 search.php:147 templates/contacts/contacts.inc:217
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Tilbage til oversigtsvisning"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Tilbage til tråd-visning"
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "Forkert brugernavn eller kodeord."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Dårlig eller ringe formuleret anmodning. Serveren reagerede med: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Dårlig anmodning: %s."
+
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -612,15 +667,15 @@
 msgid "Below is the raw text of the status information message."
 msgstr "Nedenfor forefindes råteksten af status beskeden."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
-msgstr "Negativliste"
+msgstr "Blackliste"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Blokér billeder i HTML-beskeder med mindre de anmodes specifikt?"
 
-#: search.php:155
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Besked"
 
@@ -629,11 +684,15 @@
 msgid "Both"
 msgstr "Begge"
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Både beskedens felt-liste og brødtekst"
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr "CRAM-MD5 eller DIGEST-MD5 kræver, at Auth_SASL pakker er installeret."
+
+#: templates/compose/compose.inc:270
 msgid "C_harset"
 msgstr "Tegnsæt"
 
@@ -658,15 +717,16 @@
 "Kan ikke vises - har kun funder %s af %s dele af denne besked i den aktuelle "
 "brevbakke."
 
-#: folders.php:273 templates/smime/import_key.inc:85
-#: templates/smime/passphrase.inc:22 templates/pgp/import_key.inc:66
-#: templates/pgp/passphrase.inc:32 templates/folders/import.inc:21
-#: templates/contacts/contacts.inc:250 templates/compose/spelling.inc:127
+#: folders.php:270 templates/saveimage/saveimage.inc:19
+#: templates/smime/import_key.inc:86 templates/smime/passphrase.inc:21
+#: templates/pgp/import_key.inc:66 templates/pgp/passphrase.inc:32
+#: templates/folders/import.inc:21 templates/contacts/contacts.inc:255
+#: templates/compose/spelling.inc:120
 msgid "Cancel"
 msgstr "Annuller"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Annuller besked"
 
@@ -674,28 +734,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Hvis du annullerer denne besked, mister du indholdet permanent."
 
-#: message.php:249 search.php:143 templates/contacts/contacts.inc:216
-#: templates/compose/recompose.inc:15
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:701
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Import af certifikat ikke mulig. Hentning af filer er ikke slået til på "
+"denne server."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Mødeleder"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Ændre"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Ændre alle"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Skift mappe"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -715,23 +783,23 @@
 "Her kan du ændre navn, adresse og den signatur, som andre ser, når de læser "
 "og svarer på dine e-mail."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Tegn til visning:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Kontroller mappe(r) for nye e-mail"
 
-#: templates/mailbox/message_headers.inc:71 templates/folders/actions.inc:2
+#: templates/mailbox/message_headers.inc:75 templates/folders/actions.inc:2
 msgid "Check _All/None"
 msgstr "Hak alle/ingen af"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Har alle mail-serveren, som du vil hente e-mail fra, af:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Kontrollér stavning før afsendelse af besked?"
 
@@ -739,19 +807,15 @@
 msgid "Choose Action:"
 msgstr "Vælg handling:"
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Vælg mail-server:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
 msgid "Choose a match or edit the address to the right:"
 msgstr "Vælg en pasning eller ret adressen til højre:"
 
-#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
-msgid "Choose an action:"
-msgstr "Vælg handling:"
-
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Vælg den adressekartotek, som der skal kunne tilføjes adresser til."
@@ -762,33 +826,33 @@
 "Vælg den rækkefølge som adressekartoteker bliver gennemsøgt i, når du slår "
 "adresser op."
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Click %s for at omsætte billedfilen til et format, som din browser kan vise."
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Click %s for at hente billedet."
 
-#: lib/Filter.php:107
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Click %s for at komme til %s vedligeholdelsessiden."
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Click %s for at se HTML indhold i et separat vindue."
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Click %s for at se en frimærkeudgave af billedet."
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:424
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Click %s for at se vedhæftelsen i et separat vindue."
@@ -799,11 +863,7 @@
 msgstr ""
 "Click %s for at se denne <em>multipart/related</em> del i et separat vindue."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Click her for at SKJULE billederne"
-
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Click her for at VISE billederne"
 
@@ -815,48 +875,48 @@
 "Klik på en af de valgte adressekartoteker og vælg de felter, der skal søges "
 "i."
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Click for at gemme offentlig PGP-nøgle i dit adressekartotek"
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "Click for at gemme S/MIME-certifikat for %s i dit adressekartotek"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Skriv et nyt brev til afsenderen ved at clicke på adressen"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Beskeden vil bliver åbnet til læsning ved at clicke på adressen"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Luk"
 
-#: compose.php:775 compose.php:1082
+#: compose.php:418
 msgid "Close this window"
 msgstr "Luk vindue"
 
-#: folders.php:416
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Lukket mappe"
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse"
 msgstr "Luk alle"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Luk alle"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Fold alle mapper sammen"
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Fold mappe sammen"
 
@@ -864,32 +924,23 @@
 msgid "Color Indicator: "
 msgstr "Farveindikator: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:101
 msgid "Comment"
 msgstr "Kommentar"
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Afsluttet"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Skriv"
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Skriv besked (%s)"
-
-#: compose.php:774 compose.php:1081
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Skriv en anden besked"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Skriv beskeder i et seperat vindue?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -901,33 +952,41 @@
 msgid "Configure how messages are displayed."
 msgstr "Indstil hvordan beskeder skal vises."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Konfigurér indstillinger af forhåndsvisning."
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Forbindelsen blev afbrudt af IMAP-server."
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Forbindelse til server fejlede"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Kontrollér PGP-understøttelse for %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Kontrollér S/MIME understøttelse for %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Kontrollér indstillinger vedrørende søgning af beskeder."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"Indstil hvornår der checkes for ny e-mail, samt om du skal opmærksom herpå, "
-"når det ankommer."
+"Indstil hvornår der checkes for ny e-mail, samt om du skal informeres, når "
+"disse er ankommet."
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Omsæt tekst-<em>smileys</em> til grafiske?"
 
@@ -939,25 +998,30 @@
 msgid "Copy to folder"
 msgstr "Kopiér til mappe"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Korriger"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Korrigeret tekst"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Kunne ikke fuldføre anmodning. Årsag: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Kunne ikke oprette <em>VFS backend:</em> %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:676
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Kunne ikke slette beskeder fra \"%s\". Serveren meldte: %s"
 
-#: lib/Session.php:293
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Kunne ikke udføre vedligeholdelsesopgaver."
 
@@ -969,23 +1033,28 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Kunne ikke uddrage den anmodede file fra Zip-arkivet."
 
-#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Kunne ikke åbne sikker forbindelse til IMAP serveren. %s : %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Kunne ikke indhente <em>namespace</em>-information fra IMAP-serveren."
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Opret"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Opret mappe"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:135
 msgid "Create Keys"
 msgstr "Opret nøgler"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Opret virtuel mappe"
-
 #: templates/fetchmail/account_select.inc:26
 msgid "Create a New Account"
 msgstr "Opret en ny konto"
@@ -998,7 +1067,7 @@
 msgid "Create a new drafts folder"
 msgstr "Opret en ny mappe til kladder"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Opret en ny mappe til afsendte beskeder"
 
@@ -1006,7 +1075,7 @@
 msgid "Create a new trash folder"
 msgstr "Opret en ny skraldespand til slettede beskeder"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1014,12 +1083,24 @@
 "Opret filterregler, der sorterer nye e-mails, flytter dem i mapper og "
 "sletter spam."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Opret en nyt brevpapir"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Opret brevpapir og formular-svar."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Aktuel adgang til %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:979
+msgid "Current expanded status in the folders view"
+msgstr "Aktuel ekspanderingstilstand i mappevisning"
+
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Tilret konti til hentning af e-mail fra andre konti."
 
@@ -1036,83 +1117,96 @@
 msgid "Dat_e"
 msgstr "Dato"
 
-#: message.php:246 thread.php:92
+#: message.php:269 thread.php:153
 msgid "Date"
 msgstr "Dato"
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "Afvist"
 
-#: lib/MIME/Viewer/itip.php:263
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
 msgstr "Afvist: "
 
-#: config/prefs.php.dist:530
+#: config/prefs.php.dist:537
 msgid "Default"
 msgstr "Standard"
 
-#: config/prefs.php.dist:894
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Standard søgefelt"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Standard sorteringskriterie:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Standard sorteringsretning:"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Delegeret"
 
-#: folders.php:407 templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: folders.php:400 templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:239 templates/compose/attachments.inc:28
+#: templates/contacts/contacts.inc:244 templates/compose/attachments.inc:28
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Slet %s offentlige nøgle"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:83
 msgid "Delete Current Keys"
 msgstr "Slet aktuel nøgle"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Slet mappe(r)"
 
-#: folders.php:274
+#: folders.php:271
 msgid "Delete Selected Folders"
 msgstr "Slet valgte mapper"
 
-#: folders.php:407
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Slet brevpapir"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Slet virtuel mappe"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Slet virtuel mappe definition for %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Slet hentede beskeder fra fjern server?"
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Slet fra min kalender"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Slet gamle refererede vedhæftelser i starten af måneden?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Slet gamle mapper for afsendte beskeder i starten af måneden?"
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Slet spam beskeder efter at de er blevet indrapporteret som spam?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Slet spam-beskeder"
 
-#: mailbox.php:719 message.php:487 templates/mailbox/legend.inc:8
+#: mailbox.php:734 message.php:506 templates/mailbox/legend.inc:8
 #: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
 msgid "Deleted"
 msgstr "Slettet"
@@ -1121,60 +1215,68 @@
 msgid "Deleted messages"
 msgstr "Slettede beskeder"
 
-#: compose.php:280
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Vedhæftelsen \"%s\" slettet."
 
 #: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
-msgstr "Slette og flytte beskeder"
+msgstr "Sletter og flytter beskeder"
 
-#: lib/MIME/Viewer/itip.php:592
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Afvis anmodning"
 
-#: lib/MIME/Viewer/itip.php:540
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Afvis anmodning om ledig/optaget-information"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Faldende"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:70 templates/pgp/pgp.inc:75
 msgid "Details"
 msgstr "Detaljer"
 
-#: config/prefs.php.dist:671
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "Vedhæftede ikke \"%s\", da filen er tom."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Slør signaturer?"
 
-#: templates/contacts/contacts.inc:231
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Vis"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Vis bekræftelse efter afsendelse af en besked?"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Vis i brødtekst af besked"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Vis et popup vindue ved nye e-mail."
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Vis en henvisning til 'Tøm Skraldespand' i menulinien?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Vis \"Tøm spam\" henvisningen i menulinien?"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Vis \"Tøm skraldespand\" henvisningen i menulinien?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
@@ -1184,23 +1286,27 @@
 msgid "Do NOT match"
 msgstr "Pas IKKE til"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
-msgstr "Undlad at checke mappe(r) for nye e-mail"
+msgstr "Undlad at checke mappe(r) for ny e-mail"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "Generér ikke henvisning i Fra: kolonnen"
 
-#: lib/IMP.php:1031
+#: lib/IMP.php:1055
 msgid "Do you want to open that folder?"
 msgstr "Vil du åbne denne mappe?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Har du ikke nogen konto? Meld dig til."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Færdig"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Hent %s i .zip-format"
@@ -1209,25 +1315,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Hent alle vedhæftelser (i .zip-fil)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Hent mappe(r)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Hent mappe(r) [.zip udgave]"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Hent i .zip-format"
 
-#: mailbox.php:698 message.php:485 templates/message/navbar_navigate.inc:11
+#: mailbox.php:713 message.php:504 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/legend.inc:9 templates/mailbox/navbar.inc:22
 #: templates/mailbox/navbar.inc:41
 msgid "Draft"
 msgstr "Kladde"
 
-#: folders.php:387
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Kladder"
 
@@ -1235,11 +1341,11 @@
 msgid "Drafts folder:"
 msgstr "Mappe til kladder:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:106
 msgid "E-mail Address"
 msgstr "E-mail-adresse"
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:316
 msgid "END"
 msgstr "SLUT"
 
@@ -1247,20 +1353,23 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr "FEJL: Din besked kunne ikke afleveres."
 
-#: folders.php:408
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Rediger"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Ændre negativliste"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Ændre filtre"
 
-#: folders.php:408 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Ændre søgetekst"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Ændre virtuel mappe"
 
@@ -1269,40 +1378,44 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Ændre virtuel mappe definitionen for %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Ændre positivliste"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Ændre din nagetivliste"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Ændre dine filterregler"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Ændre dine præferencer vedrørende tilgang til andre e-mail-konti."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Ændre din positivliste"
 
-#: templates/contacts/contacts.inc:234
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "e-mail-adresse"
 
-#: lib/Message.php:620
+#: lib/Message.php:693
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Alle beskeder fjernet fra %s"
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Har slettet alle beskeder fra Virtuel Skraldespand."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Tøm mappe(r)"
 
-#: folders.php:275
+#: folders.php:272
 msgid "Empty Selected Folders"
 msgstr "Tøm valgte mapper"
 
@@ -1310,44 +1423,53 @@
 msgid "Empty Trash folder"
 msgstr "Tøm skraldespand"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:951
+msgid "Empty _Spam"
+msgstr "Tøm spam"
+
+#: lib/IMP.php:944
 msgid "Empty _Trash"
 msgstr "Tøm skraldespand"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/notactive.inc:6 templates/pgp/pgp.inc:1
 msgid "Enable PGP functionality?"
 msgstr "Aktivér PGP-funktionalitet?"
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/notactive.inc:6 templates/smime/smime.inc:1
 msgid "Enable S/MIME functionality?"
 msgstr "Aktivér S/MIME-funktionalitet?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Aktivér forhåndsvisning?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:437
 msgid "Encr_yption Options"
 msgstr "Krypteringsindstillinger"
 
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Krypteret"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Slut"
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Slutning af videresendt besked"
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Afslut besked"
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Afslut besked fra %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:75
 msgid "Enter Passphrase"
 msgstr "Indtast løsen"
 
@@ -1359,7 +1481,7 @@
 msgid "Enter the name for your new drafts folder"
 msgstr "Indtast navnet på den nye mappe til kladder"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Indtast navnet på den nye mappe til afsendt e-mail"
 
@@ -1367,92 +1489,102 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Indtast navnet på den nye skraldespand"
 
-#: search.php:159
+#: lib/Search.php:613
 msgid "Entire Message"
 msgstr "Hele beskeden"
 
-#: compose.php:1068 message.php:178 thread.php:39
+#: compose.php:1172 message.php:194 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" blev tilføjet til adressekartoteket"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pgp.php:386 lib/MIME/Viewer/pkcs7.php:365
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pgp.php:390 lib/MIME/Viewer/pkcs7.php:381
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Fejl"
 
-#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Kunne ikke forbinde til IMAP server. %s : %s"
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Fejl ved svarforsendelse: %s."
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Hændelsen slettet."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Hver kvarter"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Hver halve minut"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Hver 5. minut"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Hver halve time"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Hver minut"
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand"
 msgstr "Udvid"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Åben alle"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Fold alle mapper ud"
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Fold mappe up"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Lav et opslag på navnene"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Ekspandér automatisk navne i skrivningsvinduet bag tæppet?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Åben alle mapper i oversigten som standard."
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: config/prefs.php.dist:980
+msgid "Expand the entire folder tree by default in the sidebar?"
+msgstr "Ekspandér hele mappe-træet i sidepanelet som standard?"
+
+#: templates/compose/compose.inc:142 templates/compose/compose.inc:192
+#: templates/compose/compose.inc:243 templates/compose/compose_expand.js:49
+#: templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Udvidder"
 
-#: lib/IMP.php:940 lib/IMP.php:942
+#: lib/IMP.php:962 lib/IMP.php:964
 msgid "F_etch Mail"
 msgstr "Hent e-mail"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Hent e-mail"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "Hent besked i et seperat vindue?"
 
@@ -1460,70 +1592,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Hent beskeder, når du logger ind?"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
 #, php-format
 msgid "Fetched %d messages from %s"
 msgstr "%d beskeder hentet fra %s"
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr "1 besked hentet fra %s"
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Fetchmail: "
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: ingen nye beskeder."
 
-#: lib/IMP.php:946
+#: lib/IMP.php:968
 msgid "Fi_lters"
 msgstr "Filtre"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:492
+#: templates/compose/attachments.js:40 templates/compose/compose.inc:494
 msgid "File"
 msgstr "Fil"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Filter-indstillinger"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Filter-opsætning"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Filtrer beskedens indhold for stærke ord."
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Filter-understøttelse er slået fra på dette system."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtre"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filtre IKKE aktiverede"
 
-#: lib/Filter.php:106
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filtre: %s håndteringsside"
 
-#: templates/contacts/contacts.inc:181
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Find"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Første side"
 
-#: mailbox.php:341
+#: mailbox.php:330
 msgid "First Page"
 msgstr "Første side"
 
@@ -1531,66 +1663,50 @@
 msgid "Fo_rward"
 msgstr "Videresend"
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:252 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
 msgstr "Mappe-handlinger - Bekræftelse"
 
-#: folders.php:292 templates/prefs/initialpageselect.inc:6
+#: folders.php:289 templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:9
 msgid "Folder Navigator"
 msgstr "Mappenavigator"
 
-#: templates/login/login.inc:175
-msgid "Folder Prefix"
-msgstr "Præfiks for foldere"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Opsummering af mappe"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "Deling af mapper ikke aktiveret."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "Anvendelse af mapper er ikke aktiveret."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Formatet af datoer i brevbakke-visning for beskeder dateret i dag"
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Videresend"
 
-#: compose.php:712
+#: compose.php:805
 msgid "Forward:"
 msgstr "Videresend:"
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Videresendt besked fra %s"
 
-#: lib/MIME/Viewer/itip.php:483
-msgid "Free/Busy Information"
-msgstr "Fri/optaget-information"
-
-#: lib/MIME/Viewer/itip.php:494
-msgid "Free/Busy Reply"
-msgstr "Ledig/optaget-svar"
-
-#: lib/MIME/Viewer/itip.php:488
-msgid "Free/Busy Request"
-msgstr "Ledig/optaget-anmodning"
-
-#: lib/MIME/Viewer/itip.php:401
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Ledig/optaget-anmodnings-svar"
 
@@ -1598,24 +1714,24 @@
 msgid "Fro_m"
 msgstr "Fra"
 
-#: message.php:247 search.php:135 thread.php:93
-#: templates/compose/compose.inc:98
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
 msgstr "Fra"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "Fra adresse"
 
-#: compose.php:724 compose.php:728
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1229
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "VS: "
 
-#: compose.php:1231
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "VS: %u videresendte beskeder"
@@ -1629,34 +1745,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Hent kun nye beskeder? (Kun IMAP)"
 
-#: thread.php:85
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Udfør"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Næste besked"
 
-#: lib/IMP.php:553
+#: lib/IMP.php:502
 #, php-format
 msgid "Go to address book entry of \"%s\""
 msgstr "Vis \"%s\" i adressekartotek"
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Tildel adgang"
 
-#: message.php:530 lib/Filter.php:106 lib/MIME/Viewer/appledouble.php:41
-#: lib/MIME/Viewer/html.php:128 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/notification.php:62
-#: lib/MIME/Viewer/notification.php:68 lib/MIME/Viewer/pgp.php:173
-#: lib/MIME/Viewer/pkcs7.php:407 lib/MIME/Viewer/related.php:79
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/appledouble.php:41
+#: lib/MIME/Viewer/html.php:119 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/notification.php:62
+#: lib/MIME/Viewer/notification.php:68 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/pkcs7.php:424 lib/MIME/Viewer/related.php:79
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "HER"
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:80
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML-udgave af besked"
 
@@ -1668,43 +1790,39 @@
 msgid "Here is the message you were composing:"
 msgstr "Her er beskeden, som du skrev:"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Skjult"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Skjult i tråd-visning"
 
-#: mailbox.php:363
+#: mailbox.php:352
 msgid "Hide Deleted"
 msgstr "Skjul slettede"
 
-#: folders.php:287
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Skjul deaktiverede"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Skjul billeder"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr "Høj"
 
-#: mailbox.php:703 message.php:281 templates/mailbox/legend.inc:12
+#: mailbox.php:718 message.php:304 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Høj prioritet"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:291
 msgid "Highest"
 msgstr "Højst"
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Hvordan vil du vise vedhæftelser?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Hvilket præfiks sættes foran den citerede tekst i et svar:"
 
@@ -1716,7 +1834,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (opdag protokoller automatisk)"
 
-#: templates/login/login.inc:163 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP-server lukkede forbindelsen. Server svarede: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
 
@@ -1724,11 +1847,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP over SSL (selv-signeret certifikat)"
 
-#: templates/login/login.inc:164
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP over SSL (selv-signeret)"
 
-#: templates/login/login.inc:162 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP-server lukkede forbindelsen."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, ingen TLS"
 
@@ -1736,45 +1863,50 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 mail-servere"
 
-#: lib/IMP.php:886
-msgid "INBOX"
-msgstr "Indbakke"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Hvis SSL eller TLS benyttes, skal du have PHP openssl udviddelsen læsset."
 
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
 msgstr "Hvis du fortsætter, vil du miste alle beskeder i mappen/mapperne!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorer alt"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Billede"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importér"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importér nøgle"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:137
 msgid "Import Keypair"
 msgstr "Importér nøglepar"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Importér beskeder"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "Importér PGP-nøgle"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Importér egne certifikater"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Importér eget certifikat"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1788,7 +1920,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Importér egne S/MIME certifikater"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:41
 msgid "Import Public Key"
 msgstr "Importér offentlig nøgle"
 
@@ -1813,7 +1945,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Importér mbox-fil %s ind i mappe %s."
 
-#: mailbox.php:713 message.php:486 templates/message/navbar_navigate.inc:7
+#: mailbox.php:728 message.php:505 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/legend.inc:7 templates/mailbox/navbar.inc:16
 #: templates/mailbox/navbar.inc:33
 msgid "Important"
@@ -1823,25 +1955,25 @@
 msgid "Important messages"
 msgstr "Vigtige beskeder"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d beskeder importeret fra %s."
 
-#: lib/MIME/Viewer/itip.php:773
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "Processen kører"
 
-#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:85
+#: lib/IMP.php:832 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Medtag en kort sammendrag af brevhoveder i en besvarelse?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Medtag oprindelig besked i en besvarelse?"
 
@@ -1849,21 +1981,21 @@
 msgid "Info"
 msgstr "Info"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Information om %s offentlig nøgle"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:75
 msgid "Information on Personal Private Key"
 msgstr "Information om egen, private nøgle"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:70
 msgid "Information on Personal Public Key"
 msgstr "Information om egen, offentlig nøgle"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:497
+#: templates/compose/attachments.inc:15 templates/compose/attachments.js:56
+#: templates/compose/compose.inc:499
 msgid "Inline"
 msgstr "Indlejret"
 
@@ -1883,11 +2015,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Indsæt offentlig PGP-nøgle her"
 
-#: lib/MIME/Viewer/itip.php:412
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Ugyldig handling valgt for denne komponent."
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:574 mailbox.php:621
 msgid "Invalid Address"
 msgstr "Ugyldig adresse"
 
@@ -1895,20 +2027,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr "Ugyldig fjern brevbakke"
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Ugyldigt tegn i e-mail-adresse: %s."
 
-#: pgp.php:16 smime.php:82
+#: pgp.php:16 smime.php:78
 msgid "Invalid key"
 msgstr "Ugyldig nøgle"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Ugyldig egen, privat PGP-nøgle."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Ugyldig egen, offentlig PGP-nøgle."
 
@@ -1916,51 +2048,65 @@
 msgid "Invert"
 msgstr "Invertér"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:111
 msgid "Key Length"
 msgstr "Nøglelængde"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:135
 msgid ""
 "Key generation may take a long time to complete.  Continue with key "
 "generation?"
 msgstr ""
 "Nøgle-generering kan tage meget lang tid.  Fortsæt med nøgle-generering?"
 
-#: pgp.php:318
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:36
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Nøgle-importering ikke tilgængelig.  Hentning af filer er ikke aktiveret på "
+"denne server."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:38
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Nøgle-importering ikke tilgængelig. Du har ikke defineret noget "
+"adressekartotek, hvor dine kontakter til tilføjes."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Nøgle er sendt til offentlig nøgle-server."
 
-#: templates/login/login.inc:199
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Sprog"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Sidste e-mail side"
 
-#: mailbox.php:354
+#: mailbox.php:343
 msgid "Last Page"
 msgstr "Sidste side"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "Referér vedhæftelser"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "Henvis til vedhæftelser?"
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "Refererede vedhæftelser er forbudt."
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Henvisninger udløber den %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1968,7 +2114,7 @@
 "List alle kontakter, når kontakt-siden hentes? (hvis slået fra vil du kun se "
 "de kontakter, som du søger efter)"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Fortegnelse iblandt brevhovederne"
 
@@ -1976,20 +2122,20 @@
 msgid "Local Mailbox:"
 msgstr "Lokal postkasse"
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Sted"
 
-#: templates/login/login.inc:207
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Log ind"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Log ind på %s"
 
-#: templates/login/login.inc:136
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Log ind"
 
@@ -1997,15 +2143,15 @@
 msgid "Login Tasks"
 msgstr "Login-opgaver"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr "Lav"
 
-#: mailbox.php:706 message.php:283 templates/mailbox/legend.inc:13
+#: mailbox.php:721 message.php:306 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Lav prioritet"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:295
 msgid "Lowest"
 msgstr "Laveste"
 
@@ -2013,31 +2159,31 @@
 msgid "Macintosh File"
 msgstr "Macintosh-fil"
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "E-mail"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
-msgstr "E-mail forhåndsvisning"
+msgstr "Forhåndsvisning af e-mail"
 
 #: templates/fetchmail/driver_select.inc:16
 msgid "Mail server type to connect to:"
 msgstr "Type af mail-server at forbinde til:"
 
-#: folders.php:397
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Mailbox"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Indstillingerne for e-mail- og mappe-visning"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Markér alle beskeder i mappe som set"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Markér alle beskeder i mappe som ulæst"
 
@@ -2045,7 +2191,7 @@
 msgid "Mark as:"
 msgstr "Marker som:"
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Markér forskellige citat-niveauer med forskellige farver?"
 
@@ -2053,84 +2199,64 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Markér besked som set? (Kun IMAP)"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Markér simplificeret opmærkning?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Passer til alle forespørgsler"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Passer til nogen af forespørgslerne"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "Maximum Attachment Size"
 msgstr "Størrelse på største vedhæftelse"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Maksimalt antal mapper"
+
+#: templates/compose/compose.inc:487
 msgid "Maximum number of attachments reached."
 msgstr "Maksimalt antal vedhæftelser nået."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:483
 msgid "Maximum total attachment size reached."
 msgstr "Maksimalt total størrelse af vedhæftelse nået."
 
-#: lib/MIME/Viewer/itip.php:626
-msgid "Meeting Cancellation"
-msgstr "Aflysning af møde"
-
-#: lib/MIME/Viewer/itip.php:575
-msgid "Meeting Information"
-msgstr "Møde-information"
-
-#: lib/MIME/Viewer/itip.php:585
-msgid "Meeting Proposal"
-msgstr "Møde-forslag"
-
-#: lib/MIME/Viewer/itip.php:617
-msgid "Meeting Reply"
-msgstr "Møde-svar"
-
-#: lib/MIME/Viewer/itip.php:598
-msgid "Meeting Update"
-msgstr "Møde-opdatering"
-
-#: lib/MIME/Viewer/itip.php:603
-msgid "Meeting Update Request"
-msgstr "Anmodning om opdatering af møde"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Menu-mappe-liste"
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
-msgstr "Meddelelse"
+msgstr "Besked"
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Skrivning af ny besked"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Dato"
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Besked-indstillinger"
 
-#: search.php:359
+#: search.php:302
 msgid "Message Search"
 msgstr "Søgning"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Størrelse"
 
-#: message.php:368
+#: message.php:391
 msgid "Message Source"
 msgstr "Oprindelse"
 
@@ -2138,10 +2264,6 @@
 msgid "Message Viewing"
 msgstr "Visning"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Felter"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Markeringer"
@@ -2150,45 +2272,45 @@
 msgid "Message folders"
 msgstr "Beskedmapper"
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Besked fra %s"
 
-#: mailbox.php:646
+#: mailbox.php:662
 msgid "Message has attachments"
 msgstr "Besked har vedhæftelser"
 
-#: mailbox.php:637
+#: mailbox.php:653
 msgid "Message is encrypted"
 msgstr "Besked er krypteret"
 
-#: mailbox.php:632
+#: mailbox.php:648
 msgid "Message is signed"
 msgstr "Besked er signeret"
 
-#: templates/search/header.inc:33
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Besked passer"
 
-#: compose.php:771 compose.php:785
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Besked omadresseret."
 
-#: compose.php:1018
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Beskeden blev sendt, men kunne ikke gemmes i %s"
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Beskeden er sendt."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Beskeder per side i brevbakkevisningen."
 
-#: mailbox.php:318
+#: mailbox.php:310
 msgid "Messages to"
 msgstr "Beskeder til"
 
@@ -2196,7 +2318,7 @@
 msgid "Modify"
 msgstr "Ændre"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
 msgid "More than one address found for field \"%s\"."
 msgstr "Der blev fundet flere end én adresse for feltet \"%s\"."
@@ -2209,6 +2331,10 @@
 msgid "Move down"
 msgstr "Flyt ned"
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "Flyt spam-beskeder til spam-mappe og ordentlige beskeder til Indbakke"
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Vælg mappe"
@@ -2221,49 +2347,66 @@
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/smime/smime.inc:24 templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Visningi med multiple beskeder"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "INGEN"
+
+#: templates/smime/smime.inc:2 templates/pgp/pgp.inc:2
 #: templates/fetchmail/manage.inc:48
 msgid "NOTE"
 msgstr "BEMÆRK"
 
-#: templates/contacts/contacts.inc:233 lib/MIME/Viewer/itip.php:688
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Navn"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "Navn og/eller e-mail kan ikke være tomme"
 
-#: lib/MIME/Viewer/itip.php:778
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Handling nødvendig"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Aldrig"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Gem aldrig vedhæftelser"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Ny"
 
-#: lib/IMP.php:615
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Ny e-mail"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Ny besked"
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Nye beskeder til %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nye beskeder"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Næste"
 
@@ -2271,15 +2414,16 @@
 msgid "Next Message"
 msgstr "Næste besked"
 
-#: mailbox.php:352
+#: mailbox.php:341
 msgid "Next Page"
 msgstr "Næste side"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966 config/prefs.php.dist:977
 msgid "No"
 msgstr "Nej"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Intet certifikat fundet"
 
@@ -2287,36 +2431,36 @@
 msgid "No Encryption"
 msgstr "Ingen kryptering"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Ingen nøgler i nøglering"
 
-#: mailbox.php:371
+#: mailbox.php:360
 #, php-format
 msgid "No Messages"
 msgstr "Ingen beskeder"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Ingen offentlig PGP-nøgle importeret."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Eget certifikat forefindes ikke"
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:333
 msgid "No Preview Text"
 msgstr "Ingen tekst til forhåndsvisning"
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Ingen offentlige nøgler fundet"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Ingen offentlige S/MIME-nøgler importeret."
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Ingen vedhæftelser fundet."
 
@@ -2324,73 +2468,88 @@
 msgid "No email information located in the public key."
 msgstr "Ingen e-mail-information lokaliseret i offentlig nøgle."
 
-#: acl.php:72 acl.php:98
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Ingen mappe valgt."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "Ingen mapper bliver checket for ny post."
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
 msgid "No folders were specified"
 msgstr "Ingen mapper angivet"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "Ingen mapper med nye beskeder"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "Ingen mapper med ulæste beskeder"
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "Ingen brødtekst"
 
-#: lib/Mailbox.php:365
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Ingen besked returneret."
+
+#: lib/Mailbox.php:375
 msgid "No messages matched your search."
 msgstr "Din søgning gav ingen beskeder"
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Ingen egen, privat PGP-nøgle importeret."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Ingen egen, offentlig PGP-nøgle importeret."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Intet eget S/MIME-certificat importeret."
 
+#: lib/MIME/Viewer/pgp.php:299 lib/MIME/Viewer/pkcs7.php:246
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Der findes ingen personlig, privat nøgle, så beskeden kan ikke dekrypteres."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Der er ikke konfigureret noget program til stavekontrol."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Ingen stavefejl"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Ingen forslag"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr "Ingen understøttet IMAP ægtningsmetode fundet."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Ingen bruger angivet."
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Ej deltager"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/prefs/spamselect.inc:24 templates/mailbox/navbar.inc:11
-#: lib/MIME/Viewer/itip.php:664
+#: templates/prefs/folderselect.inc:24 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: templates/prefs/trashselect.inc:24 templates/mailbox/navbar.inc:11
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Ingen"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:293
 msgid "Normal"
 msgstr "Normal"
 
@@ -2418,33 +2577,40 @@
 
 #: templates/search/main.inc:67
 msgid "Not deleted messages"
-msgstr "Ikke-slettede beskeder"
+msgstr "Uslettede beskeder"
 
 #: templates/search/main.inc:51
 msgid "Not important messages"
-msgstr "Ikke-vigtige beskeder"
+msgstr "Uvigtige beskeder"
 
 #: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Bemærk at dette kan tage sin tid"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Ingenting"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Notits: Henvist vedhæftelse nedtaget"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Antal måneder refererede vedhæftelser skal gemmes, når der slettes månedligt."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Antal af gamle mapper for sendt e-mail, der skal beholdes, når der slettes "
 "månedlig."
 
-#: templates/contacts/contacts.inc:249 lib/MIME/Viewer/itip.php:552
-#: lib/MIME/Viewer/itip.php:733
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/smime/import_key.inc:47 templates/search/fields.inc:5
+#: templates/smime/import_key.inc:49 templates/search/fields.inc:5
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "ELLER"
@@ -2457,43 +2623,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr "Gamle mapper med afsendt e-mail bliver fjernet."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Vis kun mapper med ulæste besked?"
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Vælg venligst kun en mappe for denne handling."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
 msgstr "Åben mappe"
 
-#: templates/menu.inc:23
-msgid "Open Folder"
-msgstr "Åben folder"
-
-#: folders.php:414
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Åbnet mappe"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/fetchmail.inc:6
+#: templates/fetchmail/top.inc:3
 msgid "Other Mail Accounts"
 msgstr "Andre mail-konti"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Andre indstillinger"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Udgående server"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2501,19 +2667,15 @@
 msgid "PGP Encrypt Message"
 msgstr "PGP-kryptér besked"
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP-fejl: "
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP-fejl: Behøver løsen for egen, privat nøgle."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP IKKE aktiv"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP-indstillinger"
 
@@ -2521,25 +2683,25 @@
 msgid "PGP Passphrase Input"
 msgstr "Indtastning af PGP-løsen"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:53
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Understøttelse af egne PGP-nøglesæt kræver sikker web-forbindelse."
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Offentlig PGP-nøgletekst"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Offentlig PGP-nøgle for \"%s (%s)\" tilføjet."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Offentlig PGP-nøgle for \"%s\" tilføjet."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Offentlig PGP-nøglering"
 
@@ -2551,19 +2713,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "PGP-signér/kryptér besked"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Private PGP-nøgle tilføjet."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Offentlig PGP-nøgle tilføjet."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Understøttelse af PGP er slået fra på dette system."
 
-#: lib/MIME/Viewer/pgp.php:208
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2571,21 +2733,21 @@
 "Understøttelse af PGP er i øjeblikket slået fra så den digitale signatur kan "
 "ikke verificeres."
 
-#: lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "PGP-understøttelse er ikke aktiveret, så beskeden kan ikke dekrypteres."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
-"Understøttelse af PGP kræver brug af popup-vinduer.  Hvis din browser er sat "
-"til at blokkere popup-vinduer, bliver du nødt til at ændre indstilling; "
-"ellers vi PGP funktioner ikke virke korrekt"
+"Understøttelse af PGP kræver anvendelse af popup-vinduer.  Hvis din browser "
+"er sat til at forhindre popup-vinduer bliver du nødt til at ændre opsætning "
+"for at PGP-faciliteterne kan virker korrekt."
 
 #: lib/Fetchmail/imap.php:105
 msgid "POP3"
@@ -2603,7 +2765,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 over SSL (selv-signeret certifikat)"
 
-#: templates/login/login.inc:166
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 over SSL (selv-signeret)"
 
@@ -2611,16 +2773,16 @@
 msgid "POP3, no TLS"
 msgstr "POP3, ingen TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Side med første ulæste besked"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Side med sidste ulæste besked"
 
@@ -2628,31 +2790,31 @@
 msgid "Part(s)"
 msgstr "Del(e)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:121
 msgid "Passphrase"
 msgstr "Løsen"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:126
 msgid "Passphrase (Again)"
 msgstr "Løsen (igen)"
 
-#: pgp.php:310 smime.php:235
+#: pgp.php:306 smime.php:231
 msgid "Passphrase successfully unloaded."
 msgstr "Løsen fjernet."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Løsen:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
-msgstr "Løsen kan ikke være tomt"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "Løsener kan ikke være tomme"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Løsenerne skal være ens"
 
-#: templates/smime/import_key.inc:69 templates/login/login.inc:193
+#: templates/smime/import_key.inc:71 templates/login/login.inc:191
 #: templates/fetchmail/manage.inc:20
 msgid "Password"
 msgstr "Kodeord"
@@ -2661,11 +2823,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Udfør vedligeholdelse ved log ind?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "Tilladelserne for denne bruger kan ikke ændres."
 
-#: mailbox.php:682 message.php:477 templates/mailbox/legend.inc:10
+#: mailbox.php:697 message.php:493 templates/mailbox/legend.inc:10
 #: templates/mailbox/navbar.inc:24
 msgid "Personal"
 msgstr "Personlig"
@@ -2674,39 +2836,49 @@
 msgid "Personal Information"
 msgstr "Profiler"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Egen PGP-nøglepar genereret med succes."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Egne PGP-nøgler slettet."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Egne S/MIME-certifikater IKKE importeret: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Egne S/MIME-nøgler slettet."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Sæt din signatur foran svar og videresendelser?"
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Rentekst-udgave af besked"
 
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Afspil lyd ved ny besked? Dette kræver, at din browser understøtter "
+"indlejrede lyd-filer.  Omtrent alle gør under Windows og Mac, men andre "
+"platforme kræver et plugin."
+
 #: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Indtast venligst et navn til den nye mappe:"
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Indtast venligst navnet til den nye mappe:"
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Angiv venligst det nye navn:"
 
@@ -2728,7 +2900,7 @@
 "Indtast et løsen til din private S/MIME-nøgle.  Du vil kun skulle indtaste "
 "dette løsen én gang pr %s session."
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2740,41 +2912,31 @@
 "Dette er nødvendigt for at forhindre angribere i at kabre dit session-ID. Vi "
 "beklager påførte ulemper."
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Indtast venligst dit kodeord."
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Indtast venligst dit brugernavn."
 
-#: compose.php:79 lib/IMP.php:509
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
-msgstr "Ret venligst utydige eller ugyldige adresser."
-
-#: lib/MIME/Viewer/itip.php:642
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr "Gennemgå følgende information og vælg en handling fra menuen nedenfor."
+msgstr "Ret venligst tvetydige eller ugyldige adresser."
 
-#: templates/folders/javascript.inc:53
-msgid "Please select a folder before you perform any actions."
-msgstr "Du skal vælge en mappe, før du kan udføre en handling."
-
-#: lib/MIME/Viewer/itip.php:502
-msgid "Please select an action from the menu below."
-msgstr "Vælg venligst en handling fra menuen nedenfor."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Du skal vælge en mappe, før du kan udføre denne handling."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Vælg mindst en mappe, som du vil søge i."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
-msgstr "Vælg venligst kun en mappe for denne handling."
+msgstr "Vælg venligst kun én mappe for denne handling."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Vælg venligst eller rediger i boksen til højre:"
 
@@ -2782,27 +2944,27 @@
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Sæt bindestreger ('-- ') foran din signatur?"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: filterprefs.php:39 pgp.php:253 smime.php:237
 msgid "Preferences successfully updated."
 msgstr "Præferencerne opdateret."
 
 #: templates/compose/attachments.inc:3
 msgid "Preview"
-msgstr "Forhåndsvisning"
+msgstr "Glimt"
 
 #: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Forrige besked"
 
-#: mailbox.php:343
+#: mailbox.php:332
 msgid "Previous Page"
 msgstr "Forrige side"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Udskriv"
 
@@ -2810,15 +2972,15 @@
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Kodeord til privat nøgle"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Spørg hver gang en vedhæftelse sendes; normalen er NEJ"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Spørg hver gang en vedhæftelse sendes; normalen er JA"
 
@@ -2826,40 +2988,40 @@
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Understøttelse af offentlig PGP-nøgleserver er slået fra."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Fjern slettede"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Fjern slettede"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Slet mappe(r)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Tøm skraldespanden hvor tit:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Fjern beskeder i skraldespanden, der er ældre end dette antal dage."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Fjern gamle beskeder i skraldespanden?"
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr "Fjerner %d beskedr fra skraldespand."
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr "Fjerner 1 besked fra skraldespand."
 
@@ -2878,24 +3040,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Kvotestatus: INTET LOFT"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Citat af %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "Anmod om bekræftelse ved aflevering."
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Gendan Mappetræ"
 
-#: search.php:163
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Modtaget den"
 
-#: search.php:171
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Modtaget siden"
 
-#: search.php:167
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Modtaget før"
 
@@ -2907,23 +3069,19 @@
 msgid "Redirect"
 msgstr "Omadresser"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Omadresser besked"
 
-#: compose.php:734
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Omadresser denne besked"
 
-#: compose.php:794
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Omadressering mislykkedes."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Opdater"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Opdater visningerne af mapper:"
 
@@ -2935,11 +3093,11 @@
 msgid "Reload View"
 msgstr "Opdater visning"
 
-#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Husk ledig/optaget-informationen."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Husk den sidste visning"
 
@@ -2955,15 +3113,15 @@
 msgid "Remove source"
 msgstr "Fjern kilde"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Omdøb mappe(r)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Omdøb mappe for sendte beskeder i starten af måneden?"
 
-#: lib/Folder.php:440
+#: lib/Folder.php:425
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -2973,7 +3131,7 @@
 msgid "Repl_y to List"
 msgstr "Svar til liste"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Erstat med:"
 
@@ -2981,7 +3139,7 @@
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Svar sendt."
 
@@ -2989,7 +3147,7 @@
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: compose.php:680
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Svar til alle:"
 
@@ -2997,7 +3155,7 @@
 msgid "Reply to List"
 msgstr "Svar til liste"
 
-#: compose.php:682
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Svar til liste:"
 
@@ -3005,101 +3163,101 @@
 msgid "Reply to _All"
 msgstr "Svar til alle"
 
-#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Svar med ikke-understøttet-besked"
 
-#: lib/MIME/Viewer/itip.php:535
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Svar med ledig/optaget for næste 2 måneder."
 
-#: lib/MIME/Viewer/itip.php:534
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Svar med anmodet ledig/optaget-information."
 
-#: message.php:251
+#: message.php:274
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: compose.php:678
+#: compose.php:769
 msgid "Reply:"
 msgstr "Reply:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Anmeld som ej-spam"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Anmeld som SPAM"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:384
 msgid "Request a _Read Receipt"
 msgstr "Anmod om kvittering for læsning"
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr "Anmod om bekræftelse ved aflevering?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Anmod om kvittering for læsning"
 
-#: mailbox.php:204
+#: mailbox.php:188
 msgid "Requested message not found."
 msgstr "Forespurgte besked ikke fundet."
 
-#: lib/MIME/Viewer/itip.php:697
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Krævet deltager"
 
-#: templates/search/header.inc:26 templates/search/main.inc:143
-#: templates/acl/acl.inc:158
+#: templates/search/header.inc:29 templates/search/main.inc:140
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Nulstil"
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Respondent-status opdateret."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Fortsæt"
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Fortsæt din session"
 
-#: templates/fetchmail/account_select.inc:32
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Tilbage til \"Skrivning af ny besked\""
+
+#: templates/fetchmail/account_select.inc:31
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 msgid "Return to Fetch Mail"
 msgstr "Tilbage til indstillingerne for \"Fetch Mail\""
 
-#: templates/smime/notactive.inc:33 templates/smime/smime.inc:158
-#: templates/pgp/notactive.inc:33 templates/pgp/pgp.inc:268
-#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/smime/notactive.inc:15 templates/smime/smime.inc:101
+#: templates/pgp/notactive.inc:15 templates/pgp/pgp.inc:147
+#: templates/filters/notactive.inc:22 templates/filters/prefs.inc:60
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Tilbage til indstillingerne"
 
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Vend tilbage til brevbakken efter sletning, flytning eller kopiering af "
 "besked?"
 
-#: lib/MIME/Viewer/itip.php:688
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Regel"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:425
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3107,44 +3265,40 @@
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME-krypteret besked"
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME-fejl: "
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME-fejl: Løsen til egen, privat nøgle nødvendig."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME IKKE aktiv"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME-indstillinger"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "Indtast S/MIME-løsen"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "Understøttelse af egen S/MIME nøglepar kræver sikker web-forbindelse."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Offentlig S/MIME-nøgle for \"%s\" slettet."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Offentlig S/MIME nøgle tilføjet."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Offentlig S/MIME nøglering"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Offentlig/privat S/MIME nøglepar tilføjet."
 
@@ -3156,26 +3310,26 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME signér/kryptér besked"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Understøttelse af S/MIME slået fra på dette system."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 "Understøttelse af S/MIME er ikke aktiveret, så beskeden kan ikke dekrypteres."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 "Understøttelse af S/MIME er ikke aktiveret, så indholdet af denne signerede "
 "besked kan ikke vises."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3183,88 +3337,108 @@
 "Understøttelse af S/MIME er ikke aktiveret, så den digitale signatur kan "
 "ikke verificeres."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
-"Understøttelse af S/MIME kræver brug af popup-vinduer.  Hvis din browser er "
-"sat til at blokkere popup-cinduer, bliver du nødt til at ændre indstilling; "
-"ellers vil S/MIME-funktioner ikke virke korrekt"
+"Understøttelse af S/MIME kræver anvendelse af popup-vinduer.  Hvis din "
+"browser er sat til at blokkere popup-vinduer, bliver du nødt til at ændre "
+"denne indstilling; ellers vil S/MIME-funktioner ikke virke korrekt."
+
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
 
-#: templates/compose/compose.inc:266
+#: templates/compose/compose.inc:253
 msgid "S_ubject"
 msgstr "Emne"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:361
 msgid "Sa_ve a copy in "
 msgstr "Gem en kopi i "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Gem som"
 
-#: search.php:363 templates/fetchmail/manage.inc:67
+#: search.php:304 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Gem"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:534
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Gem vedhæftelser med beskeder i \"Sendt post\"-mappen?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save Draft"
 msgstr "Gem kladde"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:37
-#: templates/pgp/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/filters/prefs.inc:69
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Gem billede"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Gem billede i galleri"
+
+#: templates/smime/notactive.inc:13 templates/smime/smime.inc:100
+#: templates/pgp/notactive.inc:13 templates/pgp/pgp.inc:146
+#: templates/filters/prefs.inc:59
 msgid "Save Options"
 msgstr "Gemme Indstillinger"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Gem brevpapir"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save _Draft"
 msgstr "Gem kladde"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Gem som"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Gem kladder som ulæst?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "Gem modtagere automatisk i det normale adressekartotek?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:123
 msgid "Save search as a virtual folder?"
 msgstr "Gem søgning som en virtuel mappe?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Gem sendt besked?"
 
-#: compose.php:1162
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Lagring af kladde mislykkedes. Følgende besked kom fra serveren: %s"
 
-#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:194
-#: lib/Block/tree_folders.php:50
+#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:199
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Søg"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Søg efter %s"
 
-#: search.php:316
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Søge-indstillinger"
+
+#: search.php:258
 msgid "Search Results"
-msgstr "Søgeresultater"
+msgstr "Resultat for søgning"
 
 #: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
@@ -3286,7 +3460,11 @@
 msgid "Select a field"
 msgstr "Vælg et felt"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr "Vælg brevpapir:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Vælg adressekartoteker for oprettelse og søgning af adresser."
 
@@ -3306,6 +3484,10 @@
 msgid "Select none"
 msgstr "Vælg ingen"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Vælg gallery til at lagre billed i."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Vælg mail-server-typen"
@@ -3314,31 +3496,35 @@
 msgid "Selected Address books:"
 msgstr "Valgte adressekartoteker:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:70
 msgid "Send Key to Public Keyserver"
 msgstr "Send nøgle til offentlig nøgleserver"
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Sendt seneste information"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "Send Message"
 msgstr "Send besked"
 
-#: config/prefs.php.dist:698
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Afsend besked uden et Emne?"
+
+#: config/prefs.php.dist:692
 msgid "Send read receipt when requested by the sender?"
 msgstr "Send læst-kvittering når anmodet af afsender?"
 
-#: folders.php:392
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "Mappe for sendte beskeder"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Mappe til afsendt e-mail:"
 
-#: templates/login/login.inc:132 templates/login/login.inc:145
+#: templates/login/login.inc:133 templates/login/login.inc:145
 #: templates/login/login.inc:152
 msgid "Server"
 msgstr "Server"
@@ -3355,7 +3541,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Vælg hvad der skal ske, når du flytter eller sletter beskeder."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Sæt brevhovedet X-Priority ved skrivning af beskeder?"
 
@@ -3371,7 +3557,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Del dine postmapper med andre brugere."
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3379,15 +3565,15 @@
 "Skal store klumper af citeret tekst være synlig eller skjult som standard?  "
 "Hvad enten du vælger er det nemt at skifte."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Skal brødteksten af text/plain beskeder gennemsøges for PGP-data?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Skal vinduet med den nye besked lukkes efter lagring af kladde?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Skal det være normalen, at din PGP-nøgle vedhæftes beskeder?"
 
@@ -3399,7 +3585,7 @@
 msgid "Show All Headers"
 msgstr "Vis alle brevhoveder"
 
-#: mailbox.php:361
+#: mailbox.php:350
 msgid "Show Deleted"
 msgstr "Vis slettede"
 
@@ -3415,44 +3601,44 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Vis kun aktiverede mapper"
 
-#: folders.php:287
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Vis deaktiverede"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr ""
 "Vis et pictogram som giver adgang til at fjerne vedhæftelse fra beskeder?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Vis symbolforklaring i brevbakkevisningen?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Kun forhåndsvisning af ulæste beskeder?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr "Forhåndsvisning i <em>tooltips</em>?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Vis \"Fetch Mail\" knappen i menuen?"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Vis billederne"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Vis \"Filter\" knappen i menuen?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Vi totalt antal beskeder i mappe?"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Vist"
 
@@ -3460,10 +3646,6 @@
 msgid "Si_ze"
 msgstr "Str."
 
-#: templates/login/login.inc:213
-msgid "Sign up if not registered"
-msgstr "Skriv dig ind hvis ikke registreret"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Signeret"
@@ -3472,10 +3654,6 @@
 msgid "Size"
 msgstr "Størrelse"
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr "Sorteringsretning"
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Sortér efter modtagelsestidspunkt"
@@ -3508,39 +3686,60 @@
 msgid "Spam folder:"
 msgstr "Mappe til spam-beskeder:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:344
 msgid "Special Characters"
 msgstr "Specielle tegn"
 
-#: templates/compose/compose.inc:334
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Specielle virtuelle mapper man ikke ændres."
+
+#: templates/compose/compose.inc:341
 msgid "Spell Check"
 msgstr "Stavekontrol"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Stavekontrol"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Stavekontrol afsluttet"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Stavefejl pr. skærm, når der køres stavekontrol."
 
-#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Start"
 
-#: lib/MIME/Viewer/itip.php:688
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr "Brevpapir"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Brevpapirnavn:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Brevpapirtype:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Brevpapir:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Status"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Fjern vedhæftelse"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Fjern ombrydning?"
 
@@ -3548,61 +3747,62 @@
 msgid "Sub_ject"
 msgstr "Emne"
 
-#: message.php:252 search.php:151 templates/compose/recompose.inc:25
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Emne"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Felt for Emne"
 
-#: search.php:365 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:306 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Godkend"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Aktiver mappe(r)"
 
-#: lib/MIME/Viewer/pgp.php:389 lib/MIME/Viewer/pkcs7.php:369
+#: lib/MIME/Viewer/pgp.php:393 lib/MIME/Viewer/pkcs7.php:385
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Udført"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Forslag"
 
-#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Indhold"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
 msgid "Switch Composition Method"
 msgstr "Skift skrivningsmetode"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to HTML composition"
 msgstr "Skift til HTML-skrivning"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to plain text composition"
 msgstr "Skift til ren tekstskrivning"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:414
 msgid "Te_xt"
 msgstr "Tekst"
 
-#: lib/MIME/Viewer/itip.php:269
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
 msgstr "Foreløbig: "
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Acceptér anmodning foreløbigt"
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Foreløbigt accepteret"
 
@@ -3611,10 +3811,22 @@
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Betingelsesfil ikke angives i conf.php"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Tekst"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "Beskedens Fra-kolonne skal refereres:"
 
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"IMAP-serveren synes ikke at understøtte den valgte ægtningsmetode. Kontakt "
+"din systemadministrator."
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "<em>Macintosh resource fork</em>"
@@ -3634,47 +3846,36 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Kontoen \"%s\" er gemt."
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Adressen \"%s\" er tilføjet %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Vedhæftelsen ikke fundet."
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "Kalender-data er ugyldig"
 
-#: templates/javascript/open_compose_win.js:37
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr "Skrivningsvinduet kan ikke åbnes.  Er din pop-up-blokker aktiveret?"
-
 #: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Indholdet af Macintosh-filen forefindes nedenfor."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "De(n) aktuelle mappe(r) \"%s\" vil blive omdøbt til \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "Den aktuelle liste over brugere, som har adgang til denne mappe, kunne ikke "
 "hentes"
 
-#: compose.php:1171
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Kladden er gemt i \"%s\" mappen."
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Hændelsen er indsat i din kalender."
 
@@ -3683,12 +3884,12 @@
 msgid "The field \"%s\" can't be expanded."
 msgstr "Feltet \"%s\" kan ikke ekspanderes."
 
-#: lib/Folder.php:328
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Mappen \"%s\" findes allerede"
 
-#: lib/Folder.php:171
+#: lib/Folder.php:150
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3697,46 +3898,54 @@
 "Mappen \"%s\" indholder ulovlige tegn i navnet. Dette kan føre til "
 "problemer. Kontakt venligst din systemadministrator."
 
-#: lib/Folder.php:347
+#: lib/Folder.php:312
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Mappen \"%s\" blev oprettet, men den blev ikke aktiveret."
 
-#: lib/Folder.php:285
+#: lib/Folder.php:229
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Mappen \"%s\" blev slettet, men den kunne ikke deaktiveres."
 
-#: lib/Folder.php:334
+#: lib/Folder.php:299
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Mappen \"%s\" blev ikke oprettet. Serverens besked kommer her"
 
-#: lib/Folder.php:278
+#: lib/Folder.php:222
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Mappen \"%s\" blev ikke slettet. Serverens besked kommer her"
 
-#: lib/Folder.php:350
+#: lib/Folder.php:315
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mappen \"%s\" er blevet oprettet."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:232
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Mappen \"%s\" er blevet slettet."
 
-#: lib/Folder.php:438
+#: lib/Folder.php:421
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mappen \"%s\" er omdøbt til \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Følgende filer er hæftet til denne del:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Vinduet til lagring af billeder kunne ikke åbnes.  Er din popup-blokker "
+"aktiveret?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3755,12 +3964,12 @@
 msgid "The mail server generated the following message:"
 msgstr "Mail-serveren genererede følgende besked:"
 
-#: lib/Message.php:614
+#: lib/Message.php:687
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Mappen %s allerede tom."
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3771,26 +3980,24 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Beskeden, der skrives på, er lukket. Afslutter."
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Beskeden har ikke noget Emne."
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Beskeden er slettet."
 
-#: lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Beskeden er verificeret."
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:390
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Beskeden er verificeret. Afsender: %s."
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr "Løsen-vinduet kunne ikke åbnes.  Er din popup-blokker slået til?"
-
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Råteksten af den offentlige PGP-nøgle can vises %s."
@@ -3803,7 +4010,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Den forespurgte fil findes ikke i Zip-vedhænget."
 
-#: message.php:531
+#: message.php:550
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3814,15 +4021,15 @@
 "Notification (MDN)</em> fra dig, når du har læst beskeden.  Click %s for at "
 "afsende notitsen."
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
 msgstr "Serveren kunne ikke danne et frimærke af billedet."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "Din signatur kunne ikke erstattes."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Din signatur er blevet rettet."
 
@@ -3830,7 +4037,22 @@
 msgid "The specified file does not exist."
 msgstr "Den forespurgte file findes ikke."
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:85
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Brevpapiret \"%s\" er tilføjet."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Brevpapiret \"%s\" er slettet."
+
+#: stationery.php:88
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Brevpapiret \"%s\" er ændret."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "Opgaven til sat på din opgaveliste."
 
@@ -3861,7 +4083,7 @@
 msgid "The text of the sent message can be viewed %s."
 msgstr "Den afsendte beskeds brødtekst kan ses %s."
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Brugerens ledig/optaget-information er gemt."
 
@@ -3873,28 +4095,16 @@
 msgid "There are no messages in this mailbox."
 msgstr "Der er ingen beskeder in denne brevbakke."
 
-#: thread.php:69
+#: thread.php:110
 msgid "There is no text that can be displayed inline."
 msgstr "Der findes ingen brødtekst, som kan vises indlejret."
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr ""
-"Der opstod et problem under tømning af %s. Dette er, hvad serveren svarede"
-
-#: lib/Message.php:616
+#: lib/Message.php:689
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Der opstod et problem under tømning af mailboxen. Serveren svarede: %s"
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-"Der opstod et problem under tømning af mailboxen. Dette er, hvad serveren "
-"svarede"
-
-#: lib/Message.php:92
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3903,16 +4113,16 @@
 "Der opstod en fejl under kopiering af beskeder fra \"%s\" til \"%s\". "
 "Serveren skriver"
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Der opstod en fejl under sletningen af beskeder fra mappen \"%s\". Her er "
+"Der opstod en fejl under fjernelse af beskeder fra mappen \"%s\". Her er "
 "beskeden fra serveren"
 
-#: lib/Message.php:277
+#: lib/Message.php:318
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3921,12 +4131,12 @@
 "Der opstod en fejl under sletningen af beskeder i mappen \"%s\". Her er "
 "beskeden fra serveren"
 
-#: lib/Message.php:213
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Der opstod en fejl under sletning af beskeder. Serveren skrev: %s"
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Der opstod en fejl under sletning af hændelsen: %s."
@@ -3935,7 +4145,7 @@
 msgid "There was an error displaying this message part"
 msgstr "Der opstod en fejl under visning af denne beskeddel"
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:591
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3944,29 +4154,29 @@
 "Der opstod en fejl under markering af beskeder i mappen \"%s\". Dette er "
 "beskeden fra serveren"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Der opstod en fejl under importeringen af %s."
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Der opstod en fejl under importeringen af hændelse: %s."
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Der opstod en fejl under importeringen af opgaven: %s."
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Der opstod en fejl under importeringen af brugers\n"
 "ledig/optaget information: %s"
 
-#: lib/Message.php:87
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3975,29 +4185,25 @@
 "Der opstod en fejl under flytningen af beskeder fra \"%s\" til \"%s\".\n"
 "Serveren skrev"
 
-#: compose.php:1179
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "Der opstod en fejl under lagring af denne besked som kladde."
 
-#: compose.php:940
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Der opstod en fejl under afsendelsen af din besked: %s"
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Der opstod en fejl under ændringen af hændelsen: %s."
 
-#: lib/MIME/Viewer/plain.php:59
-msgid "There was no text in this message part"
-msgstr "Der var ingen tekst i denne del af beskeden"
-
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "HTML-beskeden har indlejrede billeder."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -4005,21 +4211,21 @@
 "Denne HTML-besked har indlejrede billeder.  Blokkerede billeder vises "
 "således: "
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Denne offentlige PGP-nøgle er hæftet ved beskeden."
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Denne handling er ikke understøttet."
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Denne handling er endnu ikke implementeret."
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Dette tager nok noget tid. Er du sikker på, at du vil fortsætte ?"
 
@@ -4027,14 +4233,14 @@
 msgid "This message contains a Macintosh file."
 msgstr "Beskeden indeholder en Macintosh-fil."
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:416
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 "Beskeden medbringer en vedhæftelse, som er digitalt signeret via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:420
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Beskeden medbringer en vedhæftelse, som er krypteret via S/MIME."
 
@@ -4046,42 +4252,42 @@
 "Beskeden indeholder <em>mail delivery status</em> information, men formatet "
 "af beskeden er ukendt."
 
-#: lib/MIME/Viewer/pgp.php:315
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Beskeden synes ikke at være en gyldig PGP-krypteret besked.  Fejl: "
 
-#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr "Beskeden synes ikke at være i korrekt PGP-format (jævnfør RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Beskeden synes ikke at være i korrekt S/MIME-format."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Beskeden er digitalt signeret via PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Beskeden er digitalt signeret via S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Beskeden er krypteret via S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Beskeden er krypteret med PGP."
 
-#: message.php:195
+#: message.php:210
 msgid "This message to"
 msgstr "Denne besked til"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Denne server understøtter ikke deling af mapper."
 
@@ -4089,18 +4295,21 @@
 msgid "This window must be called from a compose window."
 msgstr "Dette vindue skal anråbes fra en skrivningsvindue."
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Trådet visning"
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Trådet visning"
 
-#: mailbox.php:585 message.php:248 search.php:139
-#: templates/mailbox/message_headers.inc:22
-#: templates/contacts/contacts.inc:214 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: mailbox.php:601 message.php:271 templates/mailbox/message_headers.inc:22
+#: templates/contacts/contacts.inc:219 templates/compose/recompose.inc:10
+#: templates/compose/redirect.inc:61 lib/Search.php:593
 msgid "To"
 msgstr "Til"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "To: Adresse"
 
@@ -4112,11 +4321,18 @@
 "For at markere flere felter skal du holde Ctrl (PC) eller Command (Mac) "
 "nede, medens du klikker."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"For at bruge en TLS-forbindelse skal du anvende PHP 5.1.0 eller højere."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Vedhæftelsers totale størrelse:"
 
-#: folders.php:383
+#: folders.php:369
 msgid "Trash folder"
 msgstr "Skraldespand"
 
@@ -4124,7 +4340,7 @@
 msgid "Trash folder:"
 msgstr "Skraldespand:"
 
-#: lib/Quota/command.php:72 lib/Quota/courier.php:53 lib/Quota/cyrus.php:65
+#: lib/Quota/command.php:71 lib/Quota/courier.php:53 lib/Quota/cyrus.php:64
 #: lib/Quota/logfile.php:88 lib/Quota/mdaemon.php:48
 #: lib/Quota/mercury32.php:79
 msgid "Unable to retrieve quota"
@@ -4143,28 +4359,45 @@
 msgid "Undelete"
 msgstr "Fortryd sletning"
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Ikke viste modtagere"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Uventet reaktion fra server ved AUTHENTICATE kommando."
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Uventet reaktion fra server ved Digest-MD5 respons."
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Uventet reaktion fra server ved LOGIN kommando."
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Uhåndteret komponent af type: %s"
 
-#: mailbox.php:544
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "Ukendt dato"
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Ukendt IMAP respons fra serveren. Server meldte: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Ukendt møde"
 
-#: mailbox.php:597
+#: mailbox.php:613
 msgid "Unknown Recipient"
 msgstr "Ukendt modtager"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:75
 msgid "Unload Passphrase"
 msgstr "Ophæv løsen"
 
@@ -4172,47 +4405,51 @@
 msgid "Unnamed"
 msgstr "Ikke navngivet"
 
-#: mailbox.php:687 message.php:483 templates/message/navbar_navigate.inc:6
+#: mailbox.php:702 message.php:502 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/legend.inc:5 templates/mailbox/navbar.inc:15
 #: templates/mailbox/navbar.inc:32
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Deaktiver mappe(r)"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Opdatér information om vedhæftelse"
+#: templates/compose/compose.inc:513
+msgid "Update"
+msgstr "Opdatér"
 
-#: lib/MIME/Viewer/itip.php:620
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Opdatér status on respondent"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Upload"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Brug standardværdi"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Brug IMAP mappe aktiveringer?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Anvend virtuel skraldespand?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Bruger"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr "Bruger \"%s\" tildelt de givne rettigheder til mappe \"%s\"."
 
-#: templates/login/login.inc:181
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Brugernavn"
 
@@ -4220,43 +4457,47 @@
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:70 templates/pgp/pgp.inc:75
 msgid "View"
 msgstr "Se"
 
-#: lib/MIME/Viewer/tnef.php:108 lib/MIME/Viewer/zip.php:92
+#: lib/MIME/Viewer/tnef.php:110 lib/MIME/Viewer/zip.php:92
 #, php-format
 msgid "View %s"
 msgstr "Vis %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Se %s offentlig nøgle"
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "Se HTML-indhold i et seperat vindue"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Se beskeder"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:75
 msgid "View Personal Private Key"
 msgstr "Se egen privat nøgle"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:70
 msgid "View Personal Public Key"
 msgstr "Se egen offentlig nøgle"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Se tråd"
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Se frimærke"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "View attachment in a separate window"
 msgstr "Se vedhæftelser i et seperat vindue"
 
@@ -4264,56 +4505,80 @@
 msgid "View content in a separate window"
 msgstr "Se indhold i et seperat vindue."
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Se hændelse"
 
-#: folders.php:375 mailbox.php:513
+#: folders.php:361 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "Se besked i %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Visning eller brevbakke, som vise efter login:"
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Se opgave"
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Se billederne"
 
-#: search.php:314
+#: search.php:255
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Virtuel mappe \"%s\" er dannet."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: search.php:296
+#: search.php:247
 msgid "Virtual Folders require a label."
 msgstr "Virtuelle mapper kræver en vignet."
 
-#: templates/search/main.inc:133
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Virtuel indbakke"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Virtuel indbakke mappe"
+
+#: lib/Mailbox.php:171 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Virtuel skraldespand"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Virtuel skraldespand"
+
+#: templates/search/main.inc:129
 msgid "Virtual folder label"
 msgstr "Virtuel mappe vignet"
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr "Advarsel"
 
-#: login.php:130
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Velkommen til %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Hvad skal der ske med spam-beskeder efter at de er indberettet som spam "
+"eller uskyldig?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4321,15 +4586,15 @@
 "Når du sletter beskeder, skal de flyttes til skraldespanden i stedet for at "
 "markere dem som slettet?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Hvilken side ønsker du så at starte på ved åbning af en ny brevbakke?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Skal vedhæftelser gemmes ved lagring af afsendt e-mail?"
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
@@ -4337,15 +4602,12 @@
 "Hvilket domæne skal efterskrives ufuldstændige adresser (e-mail-adresser "
 "uden \"@\") ved afsendelse af e-mail eller udviddelse af adresser?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Positivliste"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Ombryd linier efter dette antal af tegn."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Ja"
 
@@ -4367,21 +4629,39 @@
 msgid "You are copying/moving to a new folder."
 msgstr "Du er ved at kopiere/flytte til en ny mappe."
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "Du er ved at oprette en undermappe til "
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "Du er ved at oprette en mappe på højeste niveau."
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr "Du har ikke tilladelse til at danne mapper."
+
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Du har ikke tilladelse til at danne flere end %d mapper."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "Du er ved at omdøbe mappen: "
 
-#: lib/Folder.php:537
+#: templates/stationery/prefs.inc:35
 #, php-format
-msgid "You can not unsubscribe from \"%s\"."
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Du kan bruge disse makroer i brevpapirteksten: %c til aktuel besked, %s til "
+"signatur."
+
+#: lib/Folder.php:524
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
 msgstr "Du kan ikke deaktivere \"%s\"."
 
 #: lib/Maintenance/Task/tos_agreement.php:34
@@ -4391,11 +4671,11 @@
 msgstr ""
 "Du accepterede ikke brugsbetingelserne, hvorved du er blevet nægtet adgang."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "Du har ikke tilladelse til at ændre adgang til denne mappe"
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Du videresendte denne besked den %%s til følgende modtagere: %s."
@@ -4409,33 +4689,29 @@
 msgid "You have 1 new message."
 msgstr "Du har 1 ny besked."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Du har mindst én vedhæftelse markeret, som du endnu ikke har hentet.  Er du "
-"sikker på, at vil sende besked uden disse vedhæftelser?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Denne side er allerede afsendt."
 
-#: lib/IMP.php:1030
+#: lib/IMP.php:1054
 msgid "You have new mail in the following folder:"
 msgstr "Du har nye beskeder i følgende mappe:"
 
-#: lib/IMP.php:1035
+#: lib/IMP.php:1059
 msgid "You have new mail in the following folders:"
 msgstr "Du har nye beskeder i følgende mapper:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Der skal angives mindst en modtager."
 
-#: lib/MIME/Viewer/pgp.php:302
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Du skal angive løsenet til din private PGP-nøgle for at se denne besked"
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4463,10 +4739,6 @@
 msgid "You must specify a recipient."
 msgstr "Du skal angive en modtager."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Du skal angive mindst én fil, der skal vedhæftes."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
@@ -4474,57 +4746,58 @@
 "Du bliver nødt til at have \"%s\" slået til i dine "
 "vedligeholdelsesindstillinger."
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Du omadresserede denne besked til %s den %%s."
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Du besvarede denne besked den %s."
 
-#: lib/Folder.php:487
+#: lib/Folder.php:474
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "\"%s\" blev ikke aktiveret. Her er beskeden fra serveren"
 
-#: lib/Folder.php:539
+#: lib/Folder.php:526
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "\"%s\" blev ikke deaktiveret. Her er beskeden fra serveren"
 
-#: lib/Folder.php:490
+#: lib/Folder.php:477
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "\"%s\" blev aktiveret"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:529
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "\"%s\" blev deaktiveret"
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:96
 msgid "Your Name"
 msgstr "Dit navn"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:48
 msgid "Your PGP Public/Private Keys"
 msgstr "Dine offentlige/private PGP-nøgler"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:74
 msgid "Your Private Key"
 msgstr "Din private nøgle"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:69
 msgid "Your Public Key"
 msgstr "Din offentlige nøgle"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "E-mail-adressen, som andre svarer til (Reply-to:) <i>(valgfri)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr ""
+"e-mail-adressen, som andre sender svar til (Reply-to:) <em>(valgfri)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Dine offentlige/private S/MIME-certifikater"
 
@@ -4532,16 +4805,16 @@
 msgid "Your accounts:"
 msgstr "Dine konti:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
-msgstr "Dine alias-adresser <i>(valgfri, én adresse pr. linie)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr "Dine alias-adresser: <em>(valgfri, én adresse pr. linie)</em>"
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr "Din browser understøtter ikke indlejret visning af dette billedformat."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Dit normale tegnsæt til afsendelse af beskeder:"
 
@@ -4549,44 +4822,72 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Din normale krypteringsmetode til afsendelse af beskeder:"
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Din henviste vedhæftelse er blevet nedtaget af mindst én bruger.\n"
+"\n"
+"Vedhæftelsenavn: %s\n"
+"Vedhæftelsedato: %s\n"
+"\n"
+"Klik på følgende henvisning for at slette vedhæftelsen permanent:\n"
+"%s"
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Din besked er afleveret."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Din signatur:"
 
-#: compose.php:1219 mailbox.php:528 message.php:272 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Skjul adresser]"
+
+#: compose.php:1301 mailbox.php:535 message.php:295 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Intet emne]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Vis adresser -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Vis adresser - %s modtagere]"
+
+#: templates/compose/compose.inc:203
 msgid "_Bcc"
 msgstr "Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
-msgstr "Negativliste"
+msgstr "Blackliste"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:152
 msgid "_Cc"
 msgstr "Cc"
 
-#: lib/IMP.php:933
-msgid "_Compose"
-msgstr "Skriv"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "Slet"
 
-#: lib/IMP.php:935
+#: lib/IMP.php:957
 msgid "_Folders"
 msgstr "Mapper"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:79
 msgid "_Identity"
 msgstr "Profil"
 
@@ -4594,23 +4895,27 @@
 msgid "_Inbox"
 msgstr "Indbakke"
 
-#: lib/IMP.php:976
+#: lib/IMP.php:998
 msgid "_Log out"
 msgstr "Log ud"
 
-#: message.php:368
+#: message.php:391
 msgid "_Message Source"
 msgstr "Kildetekst"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr "Nye besked"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "Udskriv"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
 msgid "_Priority"
 msgstr "Prioritet"
 
-#: mailbox.php:402
+#: mailbox.php:404
 #, php-format
 msgid "_Refresh %s"
 msgstr "Genopfrisk %s"
@@ -4619,11 +4924,11 @@
 msgid "_Reply"
 msgstr "Svar"
 
-#: lib/IMP.php:937
+#: lib/IMP.php:959
 msgid "_Search"
 msgstr "Søg"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "_Send Message"
 msgstr "Afsend besked"
 
@@ -4631,7 +4936,7 @@
 msgid "_Thread"
 msgstr "Tråd"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:114
 msgid "_To"
 msgstr "Til"
 
@@ -4639,62 +4944,131 @@
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "Se tråd"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Positivliste"
 
-#: lib/Compose.php:351
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "adressent ukendt"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "vedhæftelse"
 
-#: view.php:99
+#: view.php:97
 msgid "attachments.zip"
 msgstr "vedhæftelser.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "bytes"
 msgstr "okteter"
 
-#: templates/contacts/contacts.inc:185
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "kan ikke danne uddata-fil"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "kan ikke åbne inddata"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "fejl ved anvendelse af kommando-linie"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "konfigurationsfejl"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "mangler kritisk systemfil"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "fejl i dataformat"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "indgang ikke fundet"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "fra"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "ukendt maskinnavn"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "inddata/uddata-fejl"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "intern software-fejl"
+
+#: pgp.php:68 smime.php:29
 msgid "key"
 msgstr "nøgle"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "brevbakke-fil"
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr "navn"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ingen"
 
-#: templates/compose/spelling.inc:111
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "eller"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "tilladelse nægtet"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "modtagere]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "fejl i protokol fra fjern side"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "tjeneste utilgængelig"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "stavefejl"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "stavefejl"
 
-#: lib/Filter.php:51
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "systemfejl"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "midlertidig fejltilstand"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "din negativliste"
 
-#: lib/Filter.php:61
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "din positivliste"


--- orig/locale/zh_TW/help.xml
+++ mod/locale/zh_TW/help.xml
@@ -1,266 +1,71 @@
 <?xml version="1.0" encoding="Big5"?>
-<!-- $Horde: imp/locale/zh_TW/help.xml,v 1.20.6.1 2005/01/25 22:05:50 jan Exp $ -->
+<!-- $Horde: imp/locale/zh_TW/help.xml,v 1.20.6.6 2006/03/23 00:24:06 jan Exp $ -->
 <help>
-  <entry id="compose-buttons" md5="301453c3a273ec0ba95b84aeb8661cca" state="changed">
+  <entry id="compose-buttons" md5="3259ba00a198559c7faa76e7867600d9" state="uptodate">
     <title>¶l¥ó¼g§@: §@¥Î¤è¦¡</title>
     <heading>§@¥Î¤è¦¡</heading>
     <para>
-    ¶Ç°e¶l¥óÅU¦W«ä¸q´N¬O±N§Aªº¶l¥ó§ë»¼¥X¥hµ¹§A©Ò§Æ±æ¦¬¨ìªº¤H¡C
-    ¦b§A«ö¦¹«ö¶s¤§«e½Ð½T»{¦¬¥ó¹ï¶H¡A¦]¬°¶l¥ó¤@¦ý°e¥X«á´NµLªk¨ú¦^¡C
+    "¶Ç°e¶l¥ó" ÅU¦W«ä¸q´N¬O±N§Aªº¶l¥ó§ë»¼¥X¥hµ¹§A©Ò§Æ±æ¦¬¨ìªº¤H¡C¦b§A«ö¦¹«ö¶s¤§«e½Ð½T»{¦¬¥ó¹ï¶H¡A¦]¬°¶l¥ó¤@¦ý°e¥X«á´NµLªk¨ú¦^¡C
     </para>
     <para>
-    ¦s¬°¯ó½Z±N¥¼§¹¦¨ªº¶l¥ó¦s©ñ©ó«H¥ó§X 'Drafts' ¤¤¡A
-    º¸«á§A¥i¥H¸g¥Ñ¥k¤W¤èªº«H¥ó§X¤U©Ô¥\¯àªí¶i¤J¯ó½Z§X 'Drafts'
-    ¨ÃÂI¿ï 'Ä~Äò½s¼g' ¥H§¹¦¨¸Ó¶l¥ó¡C
-    ¤Á°O¦b§A±N¶l¥ó¦s¬°¯ó½Z«e½Ð¬°¸Ó¶l¥ó¶ñ¼g¥D¦®¥H¤è«K¤é«á¿ëÃÑ¡C
-    ¶l¥ó¤@¦ý¦s¬°¯ó½Z«á¡A§A¥i¦^¨ìì¥ý©Ò¥¿¦bÀËµøªº«H¥ó§X¤¤¡C
-    </para>
-    <para>
-    ¨ú®ø¶l¥óÅU¦W«ä¸q´N¬O©ñ±ó¥Ø«e©Ò¥¿¦b½s¼gªº¶l¥ó¨Ã¦^¨ìì¥ý©Ò¥¿¦bÀËµøªº«H¥ó§X¤¤¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-buttons">
-    <title>Message Composition: Actions</title>
-    <heading>Actions</heading>
-    <para>
-    "Send Message" transmits your email message to the intended recipient(s). Make sure you do want to send your message as this action is final and can not be reversed.
-    </para>
-    <para>
-    "Save Draft" places an unfinished message in a folder called "Drafts" accessible through the folder drop-down box at the top-right of your screen. You can then finish the message later by switching to the "Drafts" folder, clicking on the saved message to open it, and then clicking on "Resume". Be sure to put a subject on the email before you save the draft so that you can easily identify which message you want within the Drafts folder.
-    </para>
-    <tip>
-    Depending on your installation, you can change in your preferences whether you are returned to the last folder you were viewing or back to the same message after saving a message as a draft.
-    </tip>
-    <para>
-    "Cancel Message" drops the message in progress and simply returns you to the last folder you were viewing.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-buttons">
-    <title>Message Composition: Actions</title>
-    <heading>Actions</heading>
-    <para>
-    "Send Message" transmits your email message to the intended recipient(s). Make sure you do want to send your message as this action is final and can not be reversed.
-    </para>
-    <para>
-    "Save Draft" places an unfinished message in a folder called "Drafts" accessible through the folder drop-down box at the top-right of your screen. You can then finish the message later by switching to the "Drafts" folder, clicking on the saved message to open it, and then clicking on "Resume". Be sure to put a subject on the email before you save the draft so that you can easily identify which message you want within the Drafts folder.
+    "¦s¬°¯ó½Z" ±N¥¼§¹¦¨ªº¶l¥ó¦s©ñ©ó«H¥ó§X "Drafts" ¤¤¡Aº¸«á§A¥i¥H¸g¥Ñ¥k¤W¤èªº«H¥ó§X¤U©Ô¥\¯àªí¶i¤J¯ó½Z§X 'Drafts' ¨ÃÂI¿ï 'Ä~Äò½s¼g' ¥H§¹¦¨¸Ó¶l¥ó¡C¤Á°O¦b§A±N¶l¥ó¦s¬°¯ó½Z«e½Ð¬°¸Ó¶l¥ó¶ñ¼g¥D¦®¥H¤è«K¤é«á¿ëÃÑ¡C
     </para>
     <tip>
-    Depending on your installation, you can change in your preferences whether you are returned to the last folder you were viewing or back to the same message after saving a message as a draft.
+    µø§Aªº¦w¸Ë±¡ªp¦Ó©w¡A§A¥i¥H¦b°¾¦n¿ï¶µ¤¤³]©w¤@¦ýÀx¦s¬°¯ó½Z«á¡A¦^¨ììÀËµø¤¤ªº«H¥ó§X©Î¬O¦^¨ìì«H¥ó¡C
     </tip>
     <para>
-    "Cancel Message" drops the message in progress and simply returns you to the last folder you were viewing.
+    "¨ú®ø¶l¥ó" ÅU¦W«ä¸q´N¬O©ñ±ó¥Ø«e©Ò¥¿¦b½s¼gªº¶l¥ó¨Ã¦^¨ìì¥ý©Ò¥¿¦bÀËµøªº«H¥ó§X¤¤¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="compose-buttons">
-    <title>Message Composition: Actions</title>
-    <heading>Actions</heading>
-    <para>
-    "Send Message" transmits your email message to the intended recipient(s). Make sure you do want to send your message as this action is final and can not be reversed.
-    </para>
-    <para>
-    "Save Draft" places an unfinished message in a folder called "Drafts" accessible through the folder drop-down box at the top-right of your screen. You can then finish the message later by switching to the "Drafts" folder, clicking on the saved message to open it, and then clicking on "Resume". Be sure to put a subject on the email before you save the draft so that you can easily identify which message you want within the Drafts folder.
-    </para>
-    <tip>
-    Depending on your installation, you can change in your preferences whether you are returned to the last folder you were viewing or back to the same message after saving a message as a draft.
-    </tip>
-    <para>
-    "Cancel Message" drops the message in progress and simply returns you to the last folder you were viewing.
-    </para>
-</entry>--></entry>
-  <entry id="compose-from" md5="26bcca134b528a540e070ef96a4d5038" state="changed">
+  </entry>
+  <entry id="compose-from" md5="82cf24d31a667a5b94e481cd5179c529" state="uptodate">
     <title>¶l¥ó¼g§@: ±H¥ó¤H</title>
-    <heading>"±H¥ó¤H"</heading>
-    <para>
-    µøª¬ªp§A¥i¥H¥Ñ¤U©Ô¥\¯àªí¿ï¾Ü¤@Ó¥Ñ"¿ï¶µ-&gt;Ó¤H¸ê°T"©Ò«Ø¥ßªº¨¤ÀÃÑ§O¡A©ÎªÌ
-    §A¤]¥i¥H¦bÄæ¦ì¤¤ª½±µ¿é¤J§Aªº¶l¥ó¦a§}¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-from">
-    <title>Message Composition: From</title>
-    <heading>From</heading>
-    <para>
-    If enabled by your administrator you can choose from a drop-down list an identity that you entered under <qt>Options-&gt;Personal Information</qt>, or you can enter the mail address in a text field that you want to use as the sender of this message.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-from">
-    <title>Message Composition: From</title>
-    <heading>From</heading>
-    <para>
-    If enabled by your administrator you can choose from a drop-down list an identity that you entered under <qt>Options-&gt;Personal Information</qt>, or you can enter the mail address in a text field that you want to use as the sender of this message.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-from">
-    <title>Message Composition: From</title>
-    <heading>From</heading>
+    <heading>±H¥ó¤H</heading>
     <para>
-    If enabled by your administrator you can choose from a drop-down list an identity that you entered under <qt>Options-&gt;Personal Information</qt>, or you can enter the mail address in a text field that you want to use as the sender of this message.
+    ¦pªGºÞ²zû¤¹³\§A¦b¦¹¨Ï¥Î§Aªº¹w«Ø¨¤ÀÃÑ§O¡A§A¥i¥H¥Ñ¤U©Ô¥\¯àªí¿ï¾Ü¤@Ó¥Ñ <qt>¿ï¶µ-&gt;Ó¤H¸ê°T</qt>©Ò«Ø¥ßªº¨¤ÀÃÑ§O¡A©ÎªÌ§A¤]¥i¥H¦bÄæ¦ì¤¤ª½±µ¿é¤J§Aªº¶l¥ó¦a§}¥H·í§@¸Ó«H¥óªº±H¥ó¤H¦a§}¡C
     </para>
-</entry>--></entry>
-  <entry id="compose-to" md5="e1d101c96b942693818c7daf072f92c3" state="changed">
+  </entry>
+  <entry id="compose-to" md5="31cba17f169572c367aa8014831eb8f8" state="uptodate">
     <title>¶l¥ó¼g§@: ¦¬¥ó¤H</title>
-    <heading>"¦¬¥ó¤H"</heading>
-    <para>
-    ¿é¤J¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¡C
-    ¬°Á×§K¿ù»~µo¥Í§A¥²¶·¨Ï¥Î¤@Ó³r¸¹¡A¨Ó°Ï¹j¤£¦Pªº¹q¤l¶l¥ó¦í§}¡C
-    §A©Ò¿é¤Jªº¦¬¥ó¹ï¶H¹q¤l¶l¥ó¦í§}±N¦Û°Ê¦¨¬°°e¥X¶l¥óªº"¦¬¥ó¤H:"¦í§}¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-to">
-    <title>Message Composition: To</title>
-    <heading>To</heading>
-    <para>
-    Enter the correct email address for the recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-to">
-    <title>Message Composition: To</title>
-    <heading>To</heading>
-    <para>
-    Enter the correct email address for the recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-to">
-    <title>Message Composition: To</title>
-    <heading>To</heading>
+    <heading>¦¬¥ó¤H</heading>
     <para>
-    Enter the correct email address for the recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
+    ¬°§Aªº«H¥ó¿é¤J¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¡C¦pªG§Aªº¦¬¥ó¹ï¶H¬°¤G¤H¥H¤W¡A½Ð¨Ï¥Î³r¸¹¨Ó°Ï¹j¤£¦Pªº¹q¤l¶l¥ó¦í§}¡A¥HÁ×§K¿ù»~µo¥Í¡C
     </para>
-</entry>--></entry>
-  <entry id="compose-cc" md5="7c40a96a23ce1fc3f93d026fd41d6289" state="changed">
+  </entry>
+  <entry id="compose-cc" md5="97571433ab037ef9c4d101a56bf74e25" state="uptodate">
     <title>¶l¥ó¼g§@: °Æ¥»</title>
-    <heading>"°Æ¥»"</heading>
-    <para>
-    ¿é¤J°Æ¥»¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¡C
-    ¬°Á×§K¿ù»~µo¥Í§A¥²¶·¨Ï¥Î¤@Ó³r¸¹¡A¨Ó°Ï¹j¤£¦Pªº¹q¤l¶l¥ó¦í§}¡C
-    §A©Ò¿é¤Jªº°Æ¥»¹q¤l¶l¥ó¦í§}±N¦Û°Ê¦¨¬°°e¥X¶l¥óªº"°Æ¥»:"¦í§}¡C
-    °Æ¥»³q±`¨Ï¥Î¦b»P¶l¥ó¨Ã«Dª½±µ¹ï¶H¦ý«o¦³«nÃö«Yªº®ÉÔ¡C
-    ©Ò¦³ªº'¦¬¥ó¤H'¦¬¥ó¹ï¶H»P'°Æ¥»'¦¬¥ó¹ï¶H³£¥i¥H¦b¥LÌ©Ò¦¬¨ìªº«H¥ó¤¤
-    ¬Ý¨£©¼¦¹ªº¹q¤l¶l¥ó¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-cc">
-    <title>Message Composition: Cc</title>
-    <heading>Cc</heading>
-    <para>
-    Enter the correct email address for the carbon copy recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
-    </para>
-    <para>
-    Carbon copies are usually sent to recipients who need not be the direct recipients of the message, but may need to receive the message for their information, usually indirectly concerned about the subject of the email. All "To:" recipients and "Cc:" recipients can see the entire list of both kinds of recipients.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-cc">
-    <title>Message Composition: Cc</title>
-    <heading>Cc</heading>
-    <para>
-    Enter the correct email address for the carbon copy recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
-    </para>
+    <heading>°Æ¥»</heading>
     <para>
-    Carbon copies are usually sent to recipients who need not be the direct recipients of the message, but may need to receive the message for their information, usually indirectly concerned about the subject of the email. All "To:" recipients and "Cc:" recipients can see the entire list of both kinds of recipients.
+    ¬°§Aªº«H¥ó¿é¤J°Æ¥»¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¡C¦pªG§Aªº°Æ¥»¦¬¥ó¹ï¶H¬°¤G¤H¥H¤W¡A½Ð¨Ï¥Î³r¸¹¨Ó°Ï¹j¤£¦Pªº¹q¤l¶l¥ó¦í§}¡A¥HÁ×§K¿ù»~µo¥Í¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="compose-cc">
-    <title>Message Composition: Cc</title>
-    <heading>Cc</heading>
     <para>
-    Enter the correct email address for the carbon copy recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
+    °Æ¥»¦¬¥ó¤H³q±`»P¶l¥ó¨ÃµLª½±µÃö«Y¡F¸g¥Ñ«H¥ó¥D¦®ªº§ãn»¡©ú§l¤Þ°Æ¥»¦¬¥ó¤HªºÃöª`¨ÃÀò¨ú¶l¥ó©Ò´£¨Ñªº°T®§¡C©Ò¦³ªº"¦¬¥ó¤H"¦¬¥ó¹ï¶H»P"°Æ¥»"¦¬¥ó¹ï¶H¦b¥LÌ©Ò¦¬¨ìªº«H¥ó¤¤¡A³£¥i¬Ý¨£©¼¦¹³£¬O«H¥óªº¦¬¥ó¹ï¶H¤§¤@¡C
     </para>
-    <para>
-    Carbon copies are usually sent to recipients who need not be the direct recipients of the message, but may need to receive the message for their information, usually indirectly concerned about the subject of the email. All "To:" recipients and "Cc:" recipients can see the entire list of both kinds of recipients.
-    </para>
-</entry>--></entry>
-  <entry id="compose-bcc" md5="01c60e854a0a6ace7f911ab77f3380f5" state="changed">
+  </entry>
+  <entry id="compose-bcc" md5="aa8f9e2d44fdb74def0fa15240ff687b" state="uptodate">
     <title>¶l¥ó¼g§@: ¯µ¥ó°Æ¥»</title>
-    <heading>"¯µ¥ó°Æ¥»"</heading>
-    <para>
-    ¿é¤J¯µ¥ó°Æ¥»¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¡C
-    ¬°Á×§K¿ù»~µo¥Í§A¥²¶·¨Ï¥Î³r¸¹¡A¨Ó°Ï¹j¤£¦Pªº¹q¤l¶l¥ó¦í§}¡C
-    §A©Ò¿é¤Jªº¯µ¥ó°Æ¥»¹q¤l¶l¥ó¦í§}±N¦Û°Ê¦¨¬°°e¥X¶l¥óªº"¯µ¥ó°Æ¥»:"¦í§}¡C
-    ³q±`¯µ¥ó°Æ¥»¦b¨Ï¥Î¤W¦³§O©ó¶l¥óªºª½±µ©Î¶¡±µÃö«Y(¨Ò¦p"¦¬¥ó¤H"¤Î"°Æ¥»")¡A
-    ¦ÓµÛ«©óÁô°Îªº®ÄªG¡C
-    ¯µ¥óªº·N¸q¦b©ó¡A±H¥Xªº¶l¥ó¤W±NÁôÂÃ¯µ¥ó°Æ¥»¹ï¶Hªº¸ê®Æ¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-bcc">
-    <title>Message Composition: Bcc</title>
-    <heading>Bcc</heading>
-    <para>
-    Enter the correct email address for the blind carbon copy recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
-    </para>
-    <para>
-    Blind carbon copies are usually sent to recipients who may need to read what is being written WITHOUT the other recipients knowing that they are receiving the email. Thus "blind" means that the identity of these recipients is hidden from all other recipients of the email. Only you the sender and the "Bcc" recipients will know that they received a copy.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-bcc">
-    <title>Message Composition: Bcc</title>
-    <heading>Bcc</heading>
-    <para>
-    Enter the correct email address for the blind carbon copy recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
-    </para>
+    <heading>¯µ¥ó°Æ¥»</heading>
     <para>
-    Blind carbon copies are usually sent to recipients who may need to read what is being written WITHOUT the other recipients knowing that they are receiving the email. Thus "blind" means that the identity of these recipients is hidden from all other recipients of the email. Only you the sender and the "Bcc" recipients will know that they received a copy.
+    ¿é¤J¯µ¥ó°Æ¥»¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¡C¦pªG§Aªº¯µ¥ó°Æ¥»¦¬¥ó¹ï¶H¬°¤G¤H¥H¤W¡A½Ð¨Ï¥Î³r¸¹¨Ó°Ï¹j¤£¦Pªº¹q¤l¶l¥ó¦í§}¡A¥HÁ×§K¿ù»~µo¥Í¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="compose-bcc">
-    <title>Message Composition: Bcc</title>
-    <heading>Bcc</heading>
     <para>
-    Enter the correct email address for the blind carbon copy recipient of your message. To enter multiple recipients, separate the email addresses with commas. Use of any other punctuation to separate multiple email addresses will result in an error.
+    ³q±`¯µ¥ó°Æ¥»¥Î©ó¡G¦b¤£³Q¨ä¥L¦¬¥ó¹ï¶Hª¾¹Dªº±¡§Î¤U¦¬¨ú«H¥ó¡C¯µ¥ó°Æ¥»¨ã¦³°ÎÂÜªº®ÄªG¡A¨ä¨¥÷°£¤F±H¥ó¤H»P¯µ¥ó°Æ¥»¦¬¥ó¹ï¶H¥»¨¡A«H¥ó¤¤ªº¨ä¥L¦¬¥ó¤H¨ÃµLªk±oª¾¡C
     </para>
-    <para>
-    Blind carbon copies are usually sent to recipients who may need to read what is being written WITHOUT the other recipients knowing that they are receiving the email. Thus "blind" means that the identity of these recipients is hidden from all other recipients of the email. Only you the sender and the "Bcc" recipients will know that they received a copy.
-    </para>
-</entry>--></entry>
-  <entry id="compose-subject" md5="607b6415ea1f6d0cf25e3cf57a2584cc" state="changed">
+  </entry>
+  <entry id="compose-subject" md5="0639a8790e306acc9e19b4d1ce342d53" state="uptodate">
     <title>¶l¥ó¼g§@: ¥D¦®</title>
-    <heading>"¥D¦®"</heading>
-    <para>
-    ¿é¤J¶l¥óªº¥D¦®¡C
-    §A©Ò¿é¤Jªº¥D¦®±N¦¨¬°°e¥X¶l¥óªº"¥D¦®:"¡C
-    ºÉ¥i¯à¥HÂ²³æ§ãnªº´yz¨Ó»¡©ú¥D¦®¡C
-    ¥D¦®¬O³Ì®e©öÅý¤H¯à°÷¦b¤é«á¦^·Q°_³o«Ê¶l¥ó¤º®eªº¤èªk¡A
-    ¦]¦¹¦b½s¼g¶l¥ó®É¥D¦®¬O¬Û·í«nªº¡C
-    ¦Ó¥B¡A·í§A'¦^ÂÐ'©Î'Âà±H'¶l¥ó®É¥D¦®¤]±N·|¤@¨Ö©ñ¶i·s¶l¥ó¤¤¡A
-    ¦p¦¹¤@¨Ó¶l¥ó¤§¶¡¤~¯à«¬¦¨¤@ºØÃöÁp¡C
-    µM¦Ó¡A¦pªG§A¹ï'¦^ÂÐ'©Î'Âà±H'ªº¶l¥ó¤º®e¤¤°µ¤F¨Ç³\ªº§ïÅÜ¡A
-    ©Î³\§A¥i¥H¦Ò¼{¦b'¥D¦®'¤W¼W¥[Â²³æªºÅÜ°Ê³qª¾¡A
-    ¦p¦¹©Ò¦³ªº¦¬«H¹ï¶H¤~¯àÄ~Äò¨Ì´`¦¹¤@"ÃöÁp"¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-subject">
-    <title>Message Composition: Subject</title>
-    <heading>Subject</heading>
-    <para>
-    Enter the subject of your message. It is best to keep the subject short, simple and descriptive. The subject line is the easiest way for you and your correspondents to remember what was in the email, thus is very important in organizing your email and finding important ones later.
-    </para>
+    <heading>¥D¦®</heading>
     <para>
-    Also, when you "Reply" or "Forward" an email, this subject line is copied over into the new message so that is becomes a valuable way of identifying which messages go together to form a "thread" to an email conversation. As a suggestion, if a replied or forwarded message contains new ideas, you may want to alter slightly the "Subject" line so that recipients can follow the progression of the "thread".
+    ¿é¤J¶l¥óªº¥D¦®¡CºÉ¥i¯à¥HÂ²³æ§ãnªº´yz¨Ó»¡©ú¥D¦®¡C¥D¦®¬O³Ì®e©öÅý¤H¯à°÷¦b¤é«á¦^·Q°_³o«Ê¶l¥ó¤º®eªº¤èªk¡A¦]¦¹¦b¤é«á²ÕÂ´»P´M§ä¶l¥ó¥D¦®´N§óÅã±o«nªº¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="compose-subject">
-    <title>Message Composition: Subject</title>
-    <heading>Subject</heading>
     <para>
-    Enter the subject of your message. It is best to keep the subject short, simple and descriptive. The subject line is the easiest way for you and your correspondents to remember what was in the email, thus is very important in organizing your email and finding important ones later.
+    ¦Ó¥B¡A·í§A"¦^ÂÐ"©Î"Âà±H"¶l¥ó®É¥D¦®¤]±N·|¤@¨Ö©ñ¶i·s¶l¥ó¤¤¡A¦p¦¹¤@¨Ó¶l¥ó¤§¶¡¤~¯à«¬¦¨¤@ºØÃöÁp¡CµM¦Ó¡A¦pªG§A¹ï"¦^ÂÐ"©Î"Âà±H"ªº¶l¥ó¤º®e¤¤°µ¤F¨Ç³\ªº§ïÅÜ¡A©Î³\§A¥i¥H¦Ò¼{¦b"¥D¦®"¤W¼W¥[¨Ç³\ªºÅÜ°Ê¡A¦p¦¹©Ò¦³ªº¦¬«H¹ï¶H¤~¯àÄ~Äò¨Ì´`¦¹¤@"ÃöÁp"¡C
     </para>
-    <para>
-    Also, when you "Reply" or "Forward" an email, this subject line is copied over into the new message so that is becomes a valuable way of identifying which messages go together to form a "thread" to an email conversation. As a suggestion, if a replied or forwarded message contains new ideas, you may want to alter slightly the "Subject" line so that recipients can follow the progression of the "thread".
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-subject">
-    <title>Message Composition: Subject</title>
-    <heading>Subject</heading>
-    <para>
-    Enter the subject of your message. It is best to keep the subject short, simple and descriptive. The subject line is the easiest way for you and your correspondents to remember what was in the email, thus is very important in organizing your email and finding important ones later.
-    </para>
-    <para>
-    Also, when you "Reply" or "Forward" an email, this subject line is copied over into the new message so that is becomes a valuable way of identifying which messages go together to form a "thread" to an email conversation. As a suggestion, if a replied or forwarded message contains new ideas, you may want to alter slightly the "Subject" line so that recipients can follow the progression of the "thread".
-    </para>
-</entry>--></entry>
-  <entry id="compose-options" md5="700a6844af3c7e6582da15929b5dd173" state="changed">
+  </entry>
+  <entry id="compose-options" md5="5f1d50a733c8b7e46aecece28822ff70" state="uptodate">
     <title>¶l¥ó¼g§@: ¿ï¶µ</title>
-    <heading>"¿ï¶µ"</heading>
+    <heading>¿ï¶µ</heading>
     <para>
-    ³o¨Ç¿ï¶µ¥Î¨Ó»²§U§A½s¼g¶l¥ó¡C
+    ³o¨Ç¿ï¶µ¥Î¨ÓÀ°§U§A½s¼g¶l¥ó¡C
     </para>
     <para>
     ÂI¿ï"«÷¼gÀË¬d"¡AÀË¬d¶l¥ó¤º®eªº³æ¤å«÷¼g¬O§_¦³»~¡C
@@ -269,179 +74,57 @@
     ÂI¿ï"ªþ¥ó"¡A§Ö³t¤Á´«¨ì¶±¤U¤èªºÀÉ®×ªþ¥[«ö¶s¡AÅý§Aªþ¥[ÀÉ®×¨ì¶l¥ó¤¤¡C
     </para>
     <para>
-    ¤Ä¿ï"±H¥ó³Æ¤À"¡AÀx¦s±H¥ó¨ì§A¦b"¿ï¶µ -&gt;Ó¤H¸ê°T -&gt;¨¥÷ÃÑ§O"©Ò«ü©w
-    ªº«H¥ó¹h¡C¬Æ¦Ü§A¤]¥i¥H³z¹L¤U©Ô¥\¯àªí¿ï¾Ü¨ä¥Lªº«H¥ó¹h³Æ¥÷¡C
+    ¦pªG¨t²ÎºÞ²zû¤¹³\§A±N±H¥ó³Æ¤À¡A§A¥i¥H¤Ä¿ï"±H¥ó³Æ¤À"¥HÀx¦s§Aªº±H¥ó¡C±H¥ó³Æ¤Àªº¦ì¸m³q±`¬°¹w³]«H¥ó§X©Î¬O¦b"¿ï¶µ-&gt;Ó¤H¸ê°T-&gt;¨¥÷ÃÑ§O"©Ò«ü©wªº«H¥ó§X¡C¦pªG¨t²ÎºÞ²zû¤¹³\§A¦Û¦æ¨M©w±H¥ó³Æ¤À§X¡A§AÁÙ¥i¥H³z¹L¤U©Ô¥\¯àªí¿ï¾Ü¨ä¥Lªº«H¥ó§X³Æ¥÷¡C
     </para>
     <para>
-    ¬°«nªº±H¥ó³Æ¤À¥H¨Ñ¤é«á°Ñ¦Ò¨Ã¥B§@¬°¤@ºØ°O¿ý¡C
-    ¥Ñ©óºÏºÐªÅ¶¡¨îªº¦Ò¶q¡A«O¯d½Æ¥ó±N³y¦¨¶l¥ó§Ö³t¦¨ªø¡A
-    ¦]¦¹§ÚÌ¨Ã¤£¹ªÀy§A¬°¨C¤@«Ê±H¥ó°µ³Æ¥÷(¯S§O¬O·í§A±H¥ó¥]§tªþ¥[ÀÉ®×ªºª¬ªp)¡A
-    ¥HÁ×§K§Aªº¶l½cÃBº¡µLªk¦¬¨ú·sªº¶l¥ó¡C
-    µM¦Ó¡A§AÁÙ¬O¥i¥HÂÇ¥Ñ°õ¦æ¿ï¶µ-&gt;Ó¤H¸ê°T-&gt;½s¿è§Aªº¨¥÷ÃÑ§O¸ê®Æ¡A
-    ±N¹w³]È³]©w¬°'±Ò¥Î'¡C¦P®É¦b¿ï¶µ¤¤§A¤]¥i¥H³]©w¤@¨ÇºûÅ@¤u§@
-    (¿ï¶µ-&gt;µn¤J¤u§@)¡AÅý¨t²Î¯à©w®É²MªÅ©Î§ó¦W³o¨Ç«H¥ó¹h¥H¸Ñ¬ÙºÏºÐªÅ¶¡¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-options">
-    <title>Message Composition: Options</title>
-    <heading>Options</heading>
-    <para>
-    These Options help you prepare your message.
-    </para>
-    <para>
-    Click "Spell Check" to check your spelling.
-    </para>
-    <para>
-    Click "Attachments" to go to the bottom of the page where you can attach files to this message.
-    </para>
-    <para>
-    If saving of sent mail has been enabled by your administrator, you can activate the checkbox next to "Save a copy" to keep a copy your this message you send. The destination folder will be either the default or the one you selected for this purpose under "Options-&gt;Personal Information-&gt;Identities". If your addminstrator has activated the selection of a sent mail destination, you will be able to choose the folder from a drop-down list next to this option.
-    </para>
-    <para>
-    Saving copies of important emails you send could be useful for record keeping of what was discussed. You can, however, turn this feature "on" as your default within your Identity, by going to "Options-&gt;Personal Information-&gt;Edit your identities". In your options you can also setup maintenance tasks that empty or rename these folders periodically.
+    ¬°«nªº±H¥ó³Æ¤À¥H¨Ñ¤é«á°O¿ý¡B°Ñ¦Ò¬O¤@ºØ¦nªº²ßºD¡C§A¥i¥HÂÇ¥ÑÂI¿ï"¿ï¶µ-&gt;Ó¤H¸ê°T-&gt;½s¿è§Aªº¨¥÷ÃÑ§O¸ê®Æ"¬°¨CÓ¨¥÷ÃÑ§Oªº±H¥ó³Æ¥÷¥\¯à¹w³]È³]©w¬°"±Ò¥Î"¡A¦P®É¦b¿ï¶µ¤¤§A¤]¥i¥H³]©w¤@¨ÇºûÅ@¤u§@Åý¨t²Î¯à©w®É²MªÅ©Î§ó¦W³o¨Ç«H¥ó§X¡C
     </para>
     <warn>
-    You may not want to save every email since you could have problems with your disk storage quota being used up quickly, especially when you send large attachments. A mailbox with full storage quota will not be able to receive new incoming email.
+    ¥Ñ©óºÏºÐªÅ¶¡¨îªº¦Ò¶q¡A§A¤£¤@©w»Ýn¬°¨C¤@«Ê±H¥ó³Æ¥÷¡A¯S§O¬O·í±Hµo§t¦³¤jªþ¥[ÀÉ®×®É¡C·íºÏºÐªÅ¶¡¤£¨¬®É§A±NµLªk¦A¦¬¨ì¥ô¦óªº·s¶l¥ó¡C"
     </warn>
-</entry>--><!-- English entry:
-<entry id="compose-options">
-    <title>Message Composition: Options</title>
-    <heading>Options</heading>
-    <para>
-    These Options help you prepare your message.
-    </para>
-    <para>
-    Click "Spell Check" to check your spelling.
-    </para>
-    <para>
-    Click "Attachments" to go to the bottom of the page where you can attach files to this message.
-    </para>
-    <para>
-    If saving of sent mail has been enabled by your administrator, you can activate the checkbox next to "Save a copy" to keep a copy your this message you send. The destination folder will be either the default or the one you selected for this purpose under "Options-&gt;Personal Information-&gt;Identities". If your addminstrator has activated the selection of a sent mail destination, you will be able to choose the folder from a drop-down list next to this option.
-    </para>
-    <para>
-    Saving copies of important emails you send could be useful for record keeping of what was discussed. You can, however, turn this feature "on" as your default within your Identity, by going to "Options-&gt;Personal Information-&gt;Edit your identities". In your options you can also setup maintenance tasks that empty or rename these folders periodically.
-    </para>
-    <warn>
-    You may not want to save every email since you could have problems with your disk storage quota being used up quickly, especially when you send large attachments. A mailbox with full storage quota will not be able to receive new incoming email.
-    </warn>
-</entry>--><!-- English entry:
-<entry id="compose-options">
-    <title>Message Composition: Options</title>
-    <heading>Options</heading>
-    <para>
-    These Options help you prepare your message.
-    </para>
-    <para>
-    Click "Spell Check" to check your spelling.
-    </para>
-    <para>
-    Click "Attachments" to go to the bottom of the page where you can attach files to this message.
-    </para>
-    <para>
-    If saving of sent mail has been enabled by your administrator, you can activate the checkbox next to "Save a copy" to keep a copy your this message you send. The destination folder will be either the default or the one you selected for this purpose under "Options-&gt;Personal Information-&gt;Identities". If your addminstrator has activated the selection of a sent mail destination, you will be able to choose the folder from a drop-down list next to this option.
-    </para>
-    <para>
-    Saving copies of important emails you send could be useful for record keeping of what was discussed. You can, however, turn this feature "on" as your default within your Identity, by going to "Options-&gt;Personal Information-&gt;Edit your identities". In your options you can also setup maintenance tasks that empty or rename these folders periodically.
-    </para>
-    <warn>
-    You may not want to save every email since you could have problems with your disk storage quota being used up quickly, especially when you send large attachments. A mailbox with full storage quota will not be able to receive new incoming email.
-    </warn>
-</entry>--></entry>
-  <entry id="compose-attach" md5="ad5f408b0122fffd4f3063583f6f4c0a" state="changed">
+  </entry>
+  <entry id="compose-attach" md5="e806e5e1641fb2531cc95d2df277851f" state="uptodate">
     <title>¶l¥ó¼g§@: ªþ¥[ÀÉ®×</title>
-    <heading>"ªþ¥[ÀÉ®×"</heading>
+    <heading>ªþ¥[ÀÉ®×</heading>
     <para>
     ¦pªG§AªºÂsÄý¾¹¤ä´©ÀÉ®×¤W¶Ç¥\¯à¡A§A¥i¥H¤@¦¸ªþ¥[¼ÆÓÀÉ®×¡C
     </para>
-    <para>¨BÆJ 1: ¿é¤JÀÉ®×ªº¸ô®|¥H¤Î¦WºÙ©ÎªÌ
-          ÂI¿ï "ÂsÄý" «ö¶s¿ï¾Ünªþ¥[ªºÀÉ®×¡C
-          ²{¦bÀÉ®×ªº¸ô®|¥H¤Î¦WºÙÀ³¸Ó¥X²{¦bªþ¥ó¤è¶ô¤¤¡C
-    </para>
-    <para>¨BÆJ 2: ¨M©wªþ¥[ÀÉ®×n¦b¶l¥ó¤¤¬O¥H"ªþ¥ó"©Î"ª½±µÅã¥Ü©ó¥»¤å°Ï"
-          ªº¤è¦¡§e²{¡C
-          ¦pªG¬O¥H"ª½±µÅã¥Ü©ó¥»¤å°Ï"ªº¤è¦¡¨Óªþ¥[ÀÉ®×¡A
-          ¦¬¥ó¹ï¶Hªº¶l¥ó¾\Åª³nÅé¥²¶·¯à¤ä´©¸Ó«¬ºAªºªþ¥[ÀÉ®×¡A
-          §_«h¸Óªþ¥[ÀÉ®×¤´µM·|¬O¥H"ªþ¥ó"ªº¤è¦¡§e²{¦Ó«D"ª½±µÅã¥Ü©ó¥»¤å°Ï"¡C
-    </para>
-    <para>¨BÆJ 3: ÂI¿ï "ªþ¥[" «ö¶s¡C ¸ÓÀÉ®×¦WºÙ¤Î¤j¤p±N³Q·s¼W¨ìªþ¥ó²M³æ¤¤¡C
-          ½Ðª`·N¹ï©ó¸û¤jªºÀÉ®× ¤Î/©Î ¸ûºCªººô¸ô³s½u³t«×¡A
-          ³oÓ¨BÆJ±N·|¯Ó¶O¤@¨Ç®É¶¡¡C¦b¦¹®É¶¡½Ð@¤ßµ¥Ô¨Ã¥B¤£nÂI¿ï¨ä¥L¨Æ±¡¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-attach">
-    <title>Message Composition: Attach</title>
-    <heading>Attach</heading>
-    <para>
-    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
-    </para>
-    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
-    </para>
-    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
+    <para>¨BÆJ 1: ¿é¤JÀÉ®×ªº¸ô®|»P¦WºÙ©ÎªÌÂI¿ï"ÂsÄý"«ö¶s¿ï¾Ünªþ¥[ªºÀÉ®×¡C²{¦bÀÉ®×ªº¸ô®|»P¦WºÙÀ³¸Ó¥X²{¦bªþ¥ó¤è¶ô¤¤¡C
     </para>
-    <para>Step 3: Click the "Attach" button. The file name and size will be added to your list of Attachments.
+    <para>¨BÆJ 2: ¨M©wªþ¥[ÀÉ®×¦b¶l¥ó¤¤ªº§e²{¤è¦¡¬O¥Hªþ¥ó©Îª½±µÅã¥Ü©ó¥»¤å¡C¦pªG¬Oª½±µÅã¥Ü©ó¥»¤å¡A¦¬¥ó¹ï¶Hªº¶l¥ó¾\Åª³nÅé¥²¶·¯à¤ä´©¸Ó«¬ºAªºªþ¥[ÀÉ®×¡A§_«h¤´·|¬O¥Hªþ¥óªº¤è¦¡§e²{¡C
     </para>
-    <tip>
-    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
-    </tip>
-</entry>--><!-- English entry:
-<entry id="compose-attach">
-    <title>Message Composition: Attach</title>
-    <heading>Attach</heading>
-    <para>
-    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
-    </para>
-    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
-    </para>
-    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
-    </para>
-    <para>Step 3: Click the "Attach" button. The file name and size will be added to your list of Attachments.
-    </para>
-    <tip>
-    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
-    </tip>
-</entry>--><!-- English entry:
-<entry id="compose-attach">
-    <title>Message Composition: Attach</title>
-    <heading>Attach</heading>
-    <para>
-    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
-    </para>
-    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
-    </para>
-    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
-    </para>
-    <para>Step 3: Click the "Attach" button. The file name and size will be added to your list of Attachments.
+    <para>¨BÆJ 3: ÂI¿ï "ªþ¥[" «ö¶s¡C ¸ÓÀÉ®×¦WºÙ¤Î¤j¤p±N³Q·s¼W¨ìªþ¥ó²M³æ¤¤¡C
     </para>
     <tip>
-    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    ½Ðª`·N¹ï©ó¸û¤jªºÀÉ®× ¤Î/©Î ¸ûºCªººô¸ô³s½u³t«×¡A³oÓ¨BÆJ±N·|¯Ó¶O¤@¨Ç®É¶¡¡C
+    ÀÉ®×¤W¶Ç´Á¶¡½Ð@¤ßµ¥Ô¨Ã¥B¤£nÂI¿ï¨ä¥L³sµ²·|«ö¶s¡C
     </tip>
-</entry>--></entry>
-  <entry id="compose-attachments" md5="5b62669ca09fe858b091c2221947cb87" state="changed">
+  </entry>
+  <entry id="compose-attachments" md5="8ac032c4ac182f3f0d6446c20f0089dd" state="uptodate">
     <title>¶l¥ó¼g§@: ªþ¥ó</title>
     <heading>ªþ¥ó</heading>
     <para>
     ¦¹°Ï°ìÅã¥Ü¶l¥ó¤¤©Ò¦³ªþ¥[ÀÉ®×²M³æ¡C
     </para>
-    <heading>§R°£¤wªþ¥[ÀÉ®×</heading>
+    <heading>§R°£ªþ¥[ÀÉ®×</heading>
     <para>
-    ±ý§R°£¤wªþ¥[ÀÉ®×ªº¨BÆJ¦p¤U:
+    ±ý§R°£ªþ¥[ÀÉ®×ªº¨BÆJ¦p¤U:
     </para>
     <para>
-    ¨BÆJ 1: ¤Ä¿ï¤wªþ¥[ÀÉ®×®ÇÃäªº§R°£¤è¶ô¡C
+    ¨BÆJ 1: ¤Ä¿ï¤wªþ¥[ÀÉ®×¤U¤èªº§R°£¤è¶ô¡C
     </para>
     <para>
-    ¨BÆJ 2: ÂI¿ï "ÅÜ§óªþ¥ó¸ê°T"¡C
+    ¨BÆJ 2: ÂI¿ï"ÅÜ§ó"¡C
     </para>
-    <heading>ÅÜ§óªþ¥ó°t¸m¤è¦¡</heading>
+    <heading>ÅÜ§óªþ¥ó°t¸m</heading>
     <para>
-    ±ýÅÜ§óªþ¥ó°t¸m¤è¦¡ªº¨BÆJ¦p¤U:
+    ±ýÅÜ§óªþ¥ó°t¸mªº¨BÆJ¦p¤U:
     </para>
     <para>
-    ¨BÆJ 1: ÅÜ§ó¨CÓªþ¥óªº°t¸m¤è¦¡¬° 'ª½±µÅã¥Ü©ó¥»¤å°Ï' ©Î 'ªþ¥ó'¡C
+    ¨BÆJ 1: ©óªþ¥[ÀÉ®×¤U¤èªº°t¸mÄæ¦ì¿ï¨ú"ª½±µÅã¥Ü©ó¥»¤å°Ï"©Î"ªþ¥ó"¡C
     </para>
     <para>
-    ¨BÆJ 2: ÂI¿ï "ÅÜ§óªþ¥ó¸ê°T"¡C
+    ¨BÆJ 2: ÂI¿ï"ÅÜ§ó"¡C
     </para>
     <heading>ÅÜ§óªþ¥ó´yz</heading>
     <para>
@@ -451,157 +134,29 @@
     ¨BÆJ 1: ©ó´yzÄæ¦ì¿é¤JÂ²µu±Ôz¡C
     </para>
     <para>
-    ¨BÆJ 2: ÂI¿ï "ÅÜ§óªþ¥ó¸ê°T"¡C
-    </para>
-  <!-- English entry:
-<entry id="compose-attachments">
-    <title>Message Composition: Attachments</title>
-    <heading>Attachments</heading>
-    <para>
-    This section displays a list of files already attached to your message.
-    </para>
-    <heading>Delete attached file(s)</heading>
-    <para>
-    To delete an attached file(s):
-    </para>
-    <para>
-    Step 1: Activate the check-button next to the attached filename(s) you want to delete.
-    </para>
-    <para>
-    Step 2: Click "Delete Attachment(s)".
-    </para>
-    <heading>Change Attachment Disposition</heading>
-    <para>
-    To change the disposition for your attachments:
-    </para>
-    <para>
-    Step 1: Change each attachment's disposition - either "inline" or "attachment" - to the desired value.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-    <heading>Change Attachment Description</heading>
-    <para>
-    To change the description for your attachments (the text the recipient will see that describes the attachment):
-    </para>
-    <para>
-    Step 1: Enter a description into the Description field.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-attachments">
-    <title>Message Composition: Attachments</title>
-    <heading>Attachments</heading>
-    <para>
-    This section displays a list of files already attached to your message.
-    </para>
-    <heading>Delete attached file(s)</heading>
-    <para>
-    To delete an attached file(s):
-    </para>
-    <para>
-    Step 1: Activate the check-button next to the attached filename(s) you want to delete.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-    <heading>Change Attachment Disposition</heading>
-    <para>
-    To change the disposition for your attachments:
-    </para>
-    <para>
-    Step 1: Change each attachment's disposition - either "inline" or "attachment" - to the desired value.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-    <heading>Change Attachment Description</heading>
-    <para>
-    To change the description for your attachments (the text the recipient will see that describes the attachment):
-    </para>
-    <para>
-    Step 1: Enter a description into the Description field.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
+    ¨BÆJ 2: ÂI¿ï"ÅÜ§ó"¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="compose-attachments">
-    <title>Message Composition: Attachments</title>
-    <heading>Attachments</heading>
-    <para>
-    This section displays a list of files already attached to your message.
-    </para>
-    <heading>Delete attached file(s)</heading>
-    <para>
-    To delete an attached file(s):
-    </para>
-    <para>
-    Step 1: Activate the check-button next to the attached filename(s) you want to delete.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-    <heading>Change Attachment Disposition</heading>
-    <para>
-    To change the disposition for your attachments:
-    </para>
-    <para>
-    Step 1: Change each attachment's disposition - either "inline" or "attachment" - to the desired value.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-    <heading>Change Attachment Description</heading>
-    <para>
-    To change the description for your attachments (the text the recipient will see that describes the attachment):
-    </para>
-    <para>
-    Step 1: Enter a description into the Description field.
-    </para>
-    <para>
-    Step 2: Click "Update Attachment Information".
-    </para>
-</entry>--></entry>
+  </entry>
   <entry id="compose-priority" md5="b023367c36de3ce1567d27ccaa45640c" state="uptodate">
     <title>¶l¥ó¼g§@: Àu¥ý¶¶§Ç</title>
-    <heading>"Àu¥ý¶¶§Ç"</heading>
+    <heading>Àu¥ý¶¶§Ç</heading>
     <para>
-    ¦¹¿ï¶µ¥Î¨Ó³]©w±H°e¶l¥óªº "X-Priority" ªíÀY¡C
-    "X-Priority" ¬O Netscape¡A Mozilla¡A Operar¤Î Outlook
-    µ¥¶l¥ó¾\Åª³nÅé©Ò»{¥iªº¤@ºØ "µêÀÀ" ¼ÐÅÒ¡C
-    ¥Ñ©ó¨ä¥Lªº¶l¥ó¾\Åª³nÅé¨Ã¤£¤ä´©³oºØªíÀY©Ò¥H±N·|©¿²¤¶l¥ó¤¤ªºÀu¥ý¶¶§Ç¡C
+    ¦¹¿ï¶µ¥Î¨Ó³]©w±H°e¶l¥óªº"X-Priority"ªíÀY¡C"X-Priority"¬O Netscape¡BMozilla¡BOperar¤Î Outlook µ¥¶l¥ó¾\Åª³nÅé©Ò»{¥iªº¤@ºØ"µêÀÀ" ¼ÐÅÒ¡C¥Ñ©ó¨ä¥Lªº¶l¥ó¾\Åª³nÅé¨Ã¤£¤ä´©³oºØªíÀY©Ò¥H±N·|©¿²¤¶l¥ó¤¤ªºÀu¥ý¶¶§Ç¡C
     </para>
   </entry>
-  <entry id="compose-save-attachments" state="changed" md5="5353905ce9ba89d4b8b7ca56e37b4678">
+  <entry id="compose-save-attachments" state="uptodate" md5="db89972c4ebb0b41ab691b6a7744a81d">
     <title>¶l¥ó¼g§@: Àx¦sªþ¥ó</title>
     <para>
-    ¨M©wÀx¦s±H¥ó³Æ¥÷®É¡A¬O§_¤]n¤@¨ÖÀx¦s±H¥ó¤¤ªºªþ¥[ÀÉ®×¡C ¦pªG"¬O"¡Aªþ¥[ÀÉ®×
-    ±N·|³QÀx¦s¡C ¦pªG"§_"¡Aªþ¥[ÀÉ®×±N©ó¶l¥ó±H¥X«á¥h°£¦Ó¤£·|³QÀx¦s¦b±H¥ó³Æ¥÷
-    ¹h¤¤¡C ¿ï¾Ü"§_"¥iÂÇ¥Ñ¥h°£(¤j«¬¼çÂÃ)ªþ¥ó¡A¦³§U©ó¸`¬Ù¶l½cºÏºÐªÅ¶¡¡C
+    ¨M©wÀx¦s±H¥ó³Æ¥÷®É¡A¬O§_¤]n¤@¨ÖÀx¦s±H¥ó¤¤ªºªþ¥[ÀÉ®×¡C¦pªG"¬O"¡Aªþ¥[ÀÉ®×±N·|Àx¦s¡C¦pªG"§_"¡Aªþ¥[ÀÉ®×±N©ó¶l¥ó±H¥X«á¥h°£¦Ó¤£·|³QÀx¦s¦b±H¥ó³Æ¥÷§X¤¤¡C¿ï¾Ü"§_"ªº¦n³B¬O¡G¥iÂÇ¥Ñ¥h°£(¤j«¬¼çÂÃ)ªþ¥ó¡A¸`¬Ù¶l½cºÏºÐªÅ¶¡¡C
     </para>
-  <!-- English entry:
-<entry id="compose-save-attachments">
-    <title>Message Composition: Save Attachments</title>
-    <para>
-    Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder. If "Yes", the attachment data will be saved. If "No", the attachment data will be stripped from the message after it is sent to all recipients. Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-save-attachments">
-    <title>Message Composition: Save Attachments</title>
-    <para>
-    Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder. If "Yes", the attachment data will be saved. If "No", the attachment data will be stripped from the message after it is sent to all recipients. Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-save-attachments">
-    <title>Message Composition: Save Attachments</title>
+  </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
     <para>
-    Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder. If "Yes", the attachment data will be saved. If "No", the attachment data will be stripped from the message after it is sent to all recipients. Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
     </para>
-</entry>--></entry>
-  <entry id="search" md5="21b917f954ab9af23d96a6ad60409fe1" state="changed">
+</entry>
+  <entry id="search" md5="86b2ef57b1194890833d9dd49ebc9b32" state="uptodate">
     <title>¶l¥ó·j´M</title>
     <heading>·j´M±ø¥ó</heading>
     <para>
@@ -609,7 +164,7 @@
     </para>
     <para>¨BÆJ 1: ©ó±ý·j´M±ø¥óªºÄæ¦ì¤¤¿é¤JÃöÁä¤å¦r¡C
     </para>
-    <para>¨BÆJ 2: ¿ï¾Ü¶l¥ó¼ÐÃÑ¥H¥[¤J¨ì·j´M±ø¥ó¤¤¡C
+    <para>¨BÆJ 2: ¿ï¾Ü¶l¥ó¼ÐÃÑ¨Ã¥[¤J¨ì·j´M±ø¥ó¤¤¡C
     </para>
     <para>¨BÆJ 3: ¿ï¾Ün·j´Mªº«H¥ó§X¡C
     </para>
@@ -617,204 +172,43 @@
     </para>
     <para>
     ¦pªG¦³¥ô¦óªº¶l¥ó»P§Aªº·j´M±ø¥ó¬Û²Å¡A
-    ¸Ó¶l¥óªº¥D¦®±NÅã¥Ü©ó "·j´M" µ²ªGªºµe±¤¤¡C
-    </para>
-  <!-- English entry:
-<entry id="search">
-    <title>Message Search</title>
-    <heading>Search Criteria</heading>
-    <para>
-    You may search for messages from your folders using different search criteria.
-    </para>
-    <para>
-        Step 1: Enter text to the fields you want to add to your search criteria.
-    </para>
-    <para>
-        Step 2: Choose the message flag(s) to add to your search criteria.
-    </para>
-    <para>
-        Step 3: Choose the folder(s) from which to search for the messages.
-    </para>
-    <para>
-        Step 4: Click "Search".
-    </para>
-    <para>
-    If any messages matched your search criteria, then the subjects of these messages will be shown in the "Search Results" view.
-    </para>
-</entry>--><!-- English entry:
-<entry id="search">
-    <title>Message Search</title>
-    <heading>Search Criteria</heading>
-    <para>
-    You may search for messages from your folders using different search criteria.
-    </para>
-    <para>
-        Step 1: Enter text to the fields you want to add to your search criteria.
-    </para>
-    <para>
-        Step 2: Choose the message flag(s) to add to your search criteria.
-    </para>
-    <para>
-        Step 3: Choose the folder(s) from which to search for the messages.
-    </para>
-    <para>
-        Step 4: Click "Search".
-    </para>
-    <para>
-    If any messages matched your search criteria, then the subjects of these messages will be shown in the "Search Results" view.
-    </para>
-</entry>--><!-- English entry:
-<entry id="search">
-    <title>Message Search</title>
-    <heading>Search Criteria</heading>
-    <para>
-    You may search for messages from your folders using different search criteria.
-    </para>
-    <para>
-        Step 1: Enter text to the fields you want to add to your search criteria.
+    ¸Ó¶l¥óªº¥D¦®±NÅã¥Ü©ó"·j´M"µ²ªGªºµe±¤¤¡C
     </para>
-    <para>
-        Step 2: Choose the message flag(s) to add to your search criteria.
-    </para>
-    <para>
-        Step 3: Choose the folder(s) from which to search for the messages.
-    </para>
-    <para>
-        Step 4: Click "Search".
-    </para>
-    <para>
-    If any messages matched your search criteria, then the subjects of these messages will be shown in the "Search Results" view.
-    </para>
-</entry>--></entry>
-  <entry id="folder-options" md5="b45a4dedf0c4a684064cdf6ae98d1b54" state="changed">
+  </entry>
+  <entry id="folder-options" md5="30687ec475765ba4467d2ef6dcec40c3" state="uptodate">
     <title>«H¥ó§XºÞ²z</title>
     <heading>«H¥ó§X¿ï¶µ</heading>
     <para>
-      §A¥i¥H¤Ä¿ï¥ª¤èÄæ¦ì¤¤ªº¤@Ó«H¥ó§X¡C
-      µM«á¦A¤U©Ô"¿ï¾Ü§@¥Î¤è¦¡"¥\¯àªí¡A¨Ã¿ï¾Ü¤@Ó§@¥Î¤è¦¡
-      ¨Ó¹ï¤Wzªº«H¥ó§X¶i¦æºÞ²z¡C
+      §A¥i¥H¤Ä¿ï¥ª¤èÄæ¦ì¤¤ªº¤@Ó«H¥ó§X¡CµM«á¦A¤U©Ô"¿ï¾Ü§@¥Î¤è¦¡"¥\¯àªí¡A¨Ã¿ï¾Ü¤@Ó§@¥Î¤è¦¡¨Ó¹ï©Ò¿ï¾Üªº«H¥ó§X¶i¦æ¾Þ§@¡C
     </para>
     <para>
-      §A±N·|³Qn¨D¿é¤J¨Ç³\ªº¬ÛÃö¾Þ§@¸ê®Æ¡C
-      ½Ð¤p¤ßªº°õ¦æ "§R°£«H¥ó§X" ¤Î "²MªÅ«H¥ó§X" ³o¤GºØ¾Þ§@¡A
-      ¦]¬°«H¥ó§X¤@¥¹¾D§R°£©Î²MªÅ¡A¨ä¤¤ªº¶l¥ó¤]±N¤@¨Ö®ø¥¢¡C
+      §A±N·|³Qn¨D¿é¤J¨Ç³\ªº¬ÛÃö¾Þ§@¸ê®Æ¡C½Ð¤p¤ßªº°õ¦æ"§R°£«H¥ó§X"¤Î"²MªÅ«H¥ó§X"³o¤GºØ§@·~¡A¦]¬°«H¥ó§X¤@¥¹¾D§R°£©Î²MªÅ¡A¨ä¤¤ªº¶l¥ó¤]±N¤@¨Ö®ø¥¢µLªk¦^´_¡C
     </para>
     <heading>¶×¤J mbox «¬ºA¹q¤l¶l¥óÀÉ®×</heading>
     <para>
-      ³oÓ¿ï¶µ±N¶×¤J¤@Ó mbox «¬ºA¹q¤l¶l¥óÀÉ®×¨ì§A©Ò¿ï©wªº«H¥ó§X¤¤¡C
-      ¿ï¾Ü¤@Ón¶×¤J¶l¥óªº«H¥ó§XµM«á¦A¿ï¾Ü³oÓ¿ï¶µ¡C
-      ¤§«á§A±N³Q¤Þ¾É¨ì¥t¤@Ó¶±¤¤¶}©l°õ¦æ¶×¤J°Ê§@¡C
-    </para>
-  <!-- English entry:
-<entry id="folder-options">
-    <title>Folder Management: Options</title>
-    <heading>Folder Options</heading>
-    <para>
-      You can select a folder by using the radio buttons along the left column. Once you have done this, select the option you wish to perform on the folder via the select box to the left.
-    </para>
-    <para>
-      You will be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
-    </para>
-    <heading>Import mbox File</heading>
-    <para>
-      This option will import a mbox format file into the folder of your choice. Choose 1 (one) folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox file to import.
-    </para>
-</entry>--><!-- English entry:
-<entry id="folder-options">
-    <title>Folder Management: Options</title>
-    <heading>Folder Options</heading>
-    <para>
-      You can select a folder by using the radio buttons along the left column. Once you have done this, select the option you wish to perform on the folder via the select box to the left.
-    </para>
-    <para>
-      You will be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
-    </para>
-    <heading>Import mbox File</heading>
-    <para>
-      This option will import a mbox format file into the folder of your choice. Choose 1 (one) folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox file to import.
+      ³oÓ¿ï¶µ±N¶×¤J¤@Ó mbox «¬ºA¹q¤l¶l¥óÀÉ®×¨ì§A©Ò¿ï©wªº«H¥ó§X¤¤¡C¿ï¾Ü¤@Ón¶×¤J¶l¥óªº«H¥ó§XµM«á¦A¿ï¾Ü³oÓ¿ï¶µ¡C¤§«á§A±N³Q¤Þ¾É¨ì¥t¤@Ó¶±¤¤¶}©l°õ¦æ¶×¤J°Ê§@¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="folder-options">
-    <title>Folder Navigator: Actions</title>
-    <heading>Folder Actions</heading>
-    <para>
-      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
-    </para>
-    <para>
-      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
-    </para>
-    <heading>Import Messages</heading>
-    <para>
-      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
-    </para>
-</entry>--></entry>
-  <entry id="folder-widgets" state="changed" md5="197bed699f67f57e3e5a0489e0d7c3c3">
+  </entry>
+  <entry id="folder-widgets" state="uptodate" md5="b9bc689402f7575771d74570e7f6f80a">
     <title>«H¥ó§XºÞ²z: Åã¥Ü</title>
-    <heading>Åã¥Ü/ÁôÂÃ¥¼q¾\</heading>
+    <heading>Åã¥Ü/ÁôÂÃ ¥¼q¾\</heading>
     <para>
-    ¦pªG¨Ï¥Î IMAP «H¥ó¹hq¾\¡AÅã¥Ü/ÁôÂÃ¥¼q¾\ªº«H¥ó¹h¡C
-    ±ýq¾\/¨ú®øq¾\«H¥ó¹h½Ð¥ý¤Ä¿ï«H¥ó¹h¡A¦A¥Ñ§@¥Î¤è¦¡¥\¯àªí¤U©Ô¿ï¨úq¾\/¨ú®ø
-    q¾\¡C
+    ¦pªG¨Ï¥Î IMAP «H¥ó§Xq¾\¡AÅã¥Ü/ÁôÂÃ¥¼q¾\ªº«H¥ó§X¡C±ýq¾\/¨ú®øq¾\«H¥ó§X½Ð¥ý¤Ä¿ï«H¥ó§X¡A¦A¥Ñ§@¥Î¤è¦¡¥\¯àªí¤U©Ô¿ï¨úq¾\/¨ú®øq¾\¡C
     </para>
     <heading>®i¶}</heading>
     <para>
-    ®i¶}©Ò¦³ªº«H¥ó¹h¡C
+    ®i¶}©Ò¦³ªº«H¥ó§X¡C
     </para>
     <heading>ºPÅ|</heading>
     <para>
-    ºPÅ|©Ò¦³ªº«H¥ó¹h¡C
+    ºPÅ|©Ò¦³ªº«H¥ó§X¡C
     </para>
-  <!-- English entry:
-<entry id="folder-widgets">
-    <title>Folder Management: Display</title>
-    <heading>Show/Hide Unsubscribed</heading>
-    <para>
-    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe option in the Folder Action drop-down menu.
-    </para>
-    <heading>Expand All</heading>
-    <para>
-    Expand all folder entries.
-    </para>
-    <heading>Collapse All</heading>
-    <para>
-    Collapse all folder entries.
-    </para>
-</entry>--><!-- English entry:
-<entry id="folder-widgets">
-    <title>Folder Management: Display</title>
-    <heading>Show/Hide Unsubscribed</heading>
-    <para>
-    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe option in the Folder Action drop-down menu.
-    </para>
-    <heading>Expand All</heading>
-    <para>
-    Expand all folder entries.
-    </para>
-    <heading>Collapse All</heading>
-    <para>
-    Collapse all folder entries.
-    </para>
-</entry>--><!-- English entry:
-<entry id="folder-widgets">
-    <title>Folder Navigator: Display</title>
-    <heading>Show/Hide Unsubscribed</heading>
-    <para>
-    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
-    </para>
-    <heading>Expand All</heading>
-    <para>
-    Expand all folder entries.
-    </para>
-    <heading>Collapse All</heading>
-    <para>
-    Collapse all folder entries.
-    </para>
-</entry>--></entry>
+  </entry>
   <entry id="filters" md5="5ef60786767e638fbf5ba8fc5bd5d9d2" state="uptodate">
     <title>¶l¥ó¹LÂo: ®M¥Î</title>
     <heading>®M¥Î©Ò¦³³W«h</heading>
     <para>
-    ¦b¶l½cÀËµøµe±¤¤ÂI¿ï¦¬¥ó¹h®ÇÃäªº"¶l¥ó¹LÂo"¹Ï¥Ü¡A¥H®M¥Î«ü©wªº³W«h¨ì
+    ¦b¶l½cÀËµøµe±¤¤ÂI¿ï¦¬¥ó§X®ÇÃäªº"¶l¥ó¹LÂo"¹Ï¥Ü¡A¥H®M¥Î«ü©wªº³W«h¨ì
     ©Ò¦³¶l¥ó¤W¡C
     </para>
   </entry>
@@ -838,7 +232,7 @@
     <para>
     ÂI¿ï"½s¿è§Aªº¤Íµ½¦W³æ"Åý§A·s¼W¡A§R°£¥H¤Î½s¿è¤@¥÷§A·Q¦¬«Hªº¹q¤l¶l¥ó¦W³æ¡C
     ¤Íµ½¦W³æªº¥Øªº¦b©ó¡G¥Ñ©ó¤Íµ½¦W³æ¾Ö¦³¤ñ¸û°ªªº¹LÂoÀu¥ýÅv¡A¥iÁ×§K¶l¥ó¾D
-    ¨ä¥L³W«h·m¥ý®M¥Î³y¦¨¿ò¥¢µ¥«áªG¡A½T«O¹ï¤è«H¥ó·|³Q°e¹F¦¬¥ó¹h¤¤¡C
+    ¨ä¥L³W«h·m¥ý®M¥Î³y¦¨¿ò¥¢µ¥«áªG¡A½T«O¹ï¤è«H¥ó·|³Q°e¹F¦¬¥ó§X¤¤¡C
     </para>
   </entry>
   <entry id="filter-on-login" state="uptodate" md5="37d9297d1cca46435e36b6e38e45dcdb">
@@ -850,105 +244,33 @@
   </entry>
   <entry id="filter-on-display" state="uptodate" md5="f5afc305402ef52bad108933f3f33291">
     <title>¶l¥ó¹LÂo: «·s¾ã²z®É¤@¨Ö®M¥Î</title>
-    <heading>¨C¦¸¶}±Ò¦¬¥ó¹h®É¡A¤@¨Ö±N©Ò¦³¹LÂo³W«h®M¥Î¨ä¤W¡C</heading>
+    <heading>¨C¦¸¶}±Ò¦¬¥ó§X®É¡A¤@¨Ö±N©Ò¦³¹LÂo³W«h®M¥Î¨ä¤W¡C</heading>
     <para>
-    ¤Ä¿ï³oÓ¿ï¶µ¡A¥H«á¨C¦¸¶}±Ò¦¬¥ó¹hªº¦P®É¡A¤]±N©Ò¦³¹LÂo³W«h®M¥Î©ó¦¬¥ó¹h ?
+    ¤Ä¿ï³oÓ¿ï¶µ¡A¥H«á¨C¦¸¶}±Ò¦¬¥ó§Xªº¦P®É¡A¤]±N©Ò¦³¹LÂo³W«h®M¥Î©ó¦¬¥ó§X ?
     </para>
   </entry>
-  <entry id="filter-any-mailbox" state="changed" md5="db1e4261ffcfc6d33e2a8cf806683f12">
-    <title>¶l¥ó¹LÂo: ®M¥Î©ó¥ô¤@Ó«H¥ó¹h</title>
-    <heading>±N¹LÂo³W«h®M¥Î©ó¥ô¤@Ó«H¥ó¹h ?</heading>
-    <para>
-    ¦pªG§A§Æ±æ¹LÂo³W«h¯à®M¥Î©ó¥ô¤@Ó«H¥ó¹h¤¤¡A½Ð¤Ä¿ï³oÓ¿ï¶µ¡C
-    ³q±`¹LÂo³W«h¥u®M¥Î©ó¦¬¥ó¹h¤¤ªº·s¶l¥ó¡C¦pªG¤Ä¿ï³oÓ¿ï¶µ¡A¦b©Ò¦³«H¥ó¹hªº¶l½c
-    ÀËµøµe±¤¤±N¥X²{¤@Ó¹Ï¥Ü¡AÂI¿ï¸Ó¹Ï¥Ü¥i±N¹LÂo³W«h®M¥Î¨ì¥Ø«eªº«H¥ó¹h¡Cµù:
-    ®M¥Î©ó"¥ô¤@«H¥ó¹h"¤ñ°_®M¥Î©ó"¦¬¥ó¹h"¦û¾Ú¸û¦hªººÏºÐªÅ¶¡(¨Ò¦p¡C³W«h³Q®M¥Î«á
-    «H¥ó¤S³Q«½Æ»¼°e¨ì¦P¤@Ó«H¥ó¹h¤¤)¥B/©Îµo¥ÍµLªk¹w´Áªºµ²ªG(¨Ò¦p¡C«á¨Ó«Ø¥ßªº
-    ·s³W«hP¨Ï¥Ø«e«H¥ó¹h¤¤ªº«H¥ó³Q·h²¾/§R°£)¡C
-    </para>
-  <!-- English entry:
-<entry id="filter-any-mailbox">
-    <title>Filters: Filter any Mailbox</title>
-    <heading>Apply filter rules to any mailbox?</heading>
+  <entry id="filter-any-mailbox" state="uptodate" md5="71c51e83909f9d0bd440d220772ee3c6">
+    <title>¶l¥ó¹LÂo: ®M¥Î©ó¥ô¤@Ó«H¥ó§X</title>
+    <heading>±N¹LÂo³W«h®M¥Î©ó¥ô¤@Ó«H¥ó§X ?</heading>
     <para>
-    Check this option if you want to be allowed to apply filter rules to any mailbox. Normally, filtering rules are only applied to new mail that is delivered to your INBOX. If this option is checked, an icon will appear on all mailbox pagges that will allow you to apply filter rules to the messages in the current mailbox. NOTE: Filtering in mailboxes other than INBOX may produce strange (e.g. the filter may cause a copy of messages to be delivered to the same mailbox) and/or undesired results (e.g. it may cause messages to be moved/deleted if new filtering rules have been implemented since the message has been delivered to the current mailbox).
+    ¦pªG§A§Æ±æ¹LÂo³W«h¯à®M¥Î©ó¥ô¤@Ó«H¥ó§X¤¤¡A½Ð¤Ä¿ï³oÓ¿ï¶µ¡C³q±`¹LÂo³W«h¥u®M¥Î©ó¦¬¥ó§X¤¤ªº·s¶l¥ó¡C¦pªG¤Ä¿ï³oÓ¿ï¶µ¡A¦b©Ò¦³«H¥ó§Xªº¶l½cÀËµøµe±¤¤±N¥X²{¤@Ó¹Ï¥Ü¡AÂI¿ï¸Ó¹Ï¥Ü¥i±N¹LÂo³W«h®M¥Î¨ì¥Ø«eªº«H¥ó§X¡Cµù:®M¥Î©ó¥ô¤@«H¥ó§X¤ñ°_®M¥Î©ó¦¬¥ó§X¥i¯à²£¥Í¸û¦hªº°ÝÃD(¨Ò¦p¡C³W«h³Q®M¥Î«á«H¥ó¤S³Q«½Æ»¼°e¨ì¦P¤@Ó«H¥ó§X¤¤)¥B/©Îµo¥ÍµLªk¹w´Áªºµ²ªG(¨Ò¦p¡C«á¨Ó«Ø¥ßªº·s³W«hP¨Ï¥Ø«e«H¥ó§X¤¤ªº«H¥ó³Q·h²¾/§R°£)¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="filter-any-mailbox">
-    <title>Filters: Filter any Mailbox</title>
-    <heading>Apply filter rules to any mailbox?</heading>
-    <para>
-    Check this option if you want to be allowed to apply filter rules to any mailbox. Normally, filtering rules are only applied to new mail that is delivered to your INBOX. If this option is checked, an icon will appear on all mailbox pagges that will allow you to apply filter rules to the messages in the current mailbox. NOTE: Filtering in mailboxes other than INBOX may produce strange (e.g. the filter may cause a copy of messages to be delivered to the same mailbox) and/or undesired results (e.g. it may cause messages to be moved/deleted if new filtering rules have been implemented since the message has been delivered to the current mailbox).
-    </para>
-</entry>--><!-- English entry:
-<entry id="filter-any-mailbox">
-    <title>Filters: Filter any Mailbox</title>
-    <heading>Apply filter rules to any mailbox?</heading>
-    <para>
-    Check this option if you want to be allowed to apply filter rules to any mailbox. Normally, filtering rules are only applied to new mail that is delivered to your INBOX. If this option is checked, an icon will appear on all mailbox pagges that will allow you to apply filter rules to the messages in the current mailbox. NOTE: Filtering in mailboxes other than INBOX may produce strange (e.g. the filter may cause a copy of messages to be delivered to the same mailbox) and/or undesired results (e.g. it may cause messages to be moved/deleted if new filtering rules have been implemented since the message has been delivered to the current mailbox).
-    </para>
-</entry>--></entry>
-  <entry id="pgp-compose-attach-pubkey" md5="426b99481a5ab2dbe8c00f0e8597e296" state="changed">
+  </entry>
+  <entry id="pgp-compose-attach-pubkey" md5="97446dbbb27616b4fa39be801e10df2d" state="uptodate">
     <title>PGP: ªþ¤W¤½¶}ª÷Æ_</title>
     <heading>ªþ¤W¤½¶}ª÷Æ_</heading>
     <para>
-    ¦pªG¤Ä¿ï¦¹¤@¶µ¥Ø¡A¥B§Aªº PGP ¤½¶}ª÷Æ_¤]¦s¦bªº¸Ü¡A«h±H¥Xªº«H¥ó¤¤±Nªþ¤W
-    §Aªº PGP ¤½¶}ª÷Æ_¡C
-    §A¥i¥H¸g¥Ñ¦b PGP ¿ï¶µªºµe±¤¤³]©w¦¹¤@¹w³]¦æ¬°¡C
-    </para>
-  <!-- English entry:
-<entry id="pgp-compose-attach-pubkey">
-    <title>PGP: Attach Public Key</title>
-    <heading>Attach Public Key</heading>
-    <para>
-    If selected then a copy of your PGP public key, if it exists, will be attached to the outgoing message. You can set the default behavior via the PGP Options screen.
+    ¦pªG¤Ä¿ï¦¹¤@¶µ¥Ø¡A¥B§Aªº PGP ¤½¶}ª÷Æ_¤]¦s¦bªº¸Ü¡A«h±H¥Xªº«H¥ó¤¤±Nªþ¤W§Aªº PGP ¤½¶}ª÷Æ_¡C§A¥i¥H¸g¥Ñ¦b PGP ¿ï¶µªºµe±¤¤³]©w¦¹¤@¹w³]¦æ¬°¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="pgp-compose-attach-pubkey">
-    <title>PGP: Attach Public Key</title>
-    <heading>Attach Public Key</heading>
-    <para>
-    If selected then a copy of your PGP public key, if it exists, will be attached to the outgoing message. You can set the default behavior via the PGP Options screen.
-    </para>
-</entry>--><!-- English entry:
-<entry id="pgp-compose-attach-pubkey">
-    <title>PGP: Attach Public Key</title>
-    <heading>Attach Public Key</heading>
-    <para>
-    If selected then a copy of your PGP public key, if it exists, will be attached to the outgoing message. You can set the default behavior via the PGP Options screen.
-    </para>
-</entry>--></entry>
-  <entry id="pgp-option-scan-body" md5="43cb3827064d451b64d42bdb06e034b8" state="changed">
+  </entry>
+  <entry id="pgp-option-scan-body" md5="6baaada0d46dc1ab0941087f235f359b" state="uptodate">
     <title>PGP: ±½´y¶l¥ó¤º®e</title>
     <heading>±½´y¶l¥ó¤º®e</heading>
     <para>
-    ¦pªG¤Ä¿ï¦¹¤@¶µ¥Ø¡Aºô¸ô¶l§½±N¦Û°Ê¦b¨C¤@«Ê¯Â¤å¦r®æ¦¡¶l¥ó¤¤±½´y PGP ¸ê®Æ¡A
-    ¦pªG¦³±½´y¨ì PGP ¸ê®Æ«hÅã¥Ü¸Ó¸ê®Æ¡C½Ðª`·N¡A¥Ñ©ó¨C¤@«Ê¯Â¤å¦r®æ¦¡¶l¥ó
-    ³£³Q±½´y¥H´M§ä PGP ¸ê®Æ¡A¦]¦¹³o¶µ¥\¯à±N¾ÉP¨t²Î³t«×ÅÜºC¡C
-    </para>
-  <!-- English entry:
-<entry id="pgp-option-scan-body">
-    <title>PGP: Scan Text Bodies</title>
-    <heading>Scan Text Bodies</heading>
-    <para>
-    If selected then IMP will scan the body of all text messages for PGP data, and display the results if any data is found. Note that this may slow down the system as every text message must be scanned in its entirety for PGP data.
+    ¦pªG¤Ä¿ï¦¹¤@¶µ¥Ø¡Aºô¸ô¶l§½±N¦Û°Ê¦b¨C¤@«Ê¯Â¤å¦r®æ¦¡¶l¥ó¤¤±½´y PGP ¸ê®Æ¡A¦pªG¦³±½´y¨ì PGP ¸ê®Æ«hÅã¥Ü¸Ó¸ê®Æ¡C½Ðª`·N¡A¥Ñ©ó¨C¤@«Ê¯Â¤å¦r®æ¦¡¶l¥ó³£³Q±½´y¥H´M§ä PGP ¸ê®Æ¡A¦]¦¹³o¶µ¥\¯à±N¾ÉP¨t²Î³t«×ÅÜºC¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="pgp-option-scan-body">
-    <title>PGP: Scan Text Bodies</title>
-    <heading>Scan Text Bodies</heading>
-    <para>
-    If selected then IMP will scan the body of all text messages for PGP data, and display the results if any data is found. Note that this may slow down the system as every text message must be scanned in its entirety for PGP data.
-    </para>
-</entry>--><!-- English entry:
-<entry id="pgp-option-scan-body">
-    <title>PGP: Scan Text Bodies</title>
-    <heading>Scan Text Bodies</heading>
-    <para>
-    If selected then IMP will scan the body of all text messages for PGP data, and display the results if any data is found. Note that this may slow down the system as every text message must be scanned in its entirety for PGP data.
-    </para>
-</entry>--></entry>
-  <entry id="compose-options-encrypt" md5="d1473a3e8905d603ef33f9d58506aac5" state="changed">
+  </entry>
+  <entry id="compose-options-encrypt" md5="1012144f749f19f5a24cef38601daa71" state="uptodate">
     <title>¶l¥ó¼g§@: ¥[±K¿ï¶µ</title>
     <heading>¶l¥ó¤£¥[±K</heading>
     <para>
@@ -956,24 +278,15 @@
     </para>
     <heading>PGP ¶l¥ó¥[±K</heading>
     <para>
-    ³oÓ¿ï¶µ±N¨Ï¥Î¦¬¥ó¹ï¶Hªº PGP Ó¤H¤½¶}ª÷Æ_¡A¬°¥Ø«e½s¼gªº¶l¥ó¥[±K¡C
-    ¨Ï¥Î³oÓ¿ï¶µ½s¼g¶l¥ó®É¡A¦¬¥ó¹ï¶H¶È¥u¯à¦³¤@¦ì¡C
-    ¦b§Aªº³q°T¿ý¤¤¥²¶·¦s¦³³o¦ì¦¬¥ó¹ï¶Hªº PGP ¤½¶}ª÷Æ_¡A§_«h±N·|¥X²{¿ù»~ªºª¬ªp¡C
-    ¦pªG§Aªº³q°T¿ý¤¤½T¹ê¤w¦s¦b³o¦ì¦¬¥ó¹ï¶Hªº PGP ¤½¶}ª÷Æ_¡A
-    ¦ý¤´µM¦¬¨ì¿ù»~ªº°T®§®É¡A½ÐÀË¬d¤@¤U¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¬O§_»P³q°T¿ý¤¤
-    ¸Óµ§ PGP ¤½¶}ª÷Æ_ªº¹q¤l¶l¥ó¦í§}¬Û§k¦X¡C
-    ¥[±K¸ê®Æ±Nªþ¥[©ó¶l¥ó¤¤¤@¨Ö±H¥X¡C
+    ³oÓ¿ï¶µ±N¨Ï¥Î¦¬¥ó¹ï¶Hªº PGP Ó¤H¤½¶}ª÷Æ_¡A¬°¥Ø«e½s¼gªº¶l¥ó¥[±K¡C¨Ï¥Î³oÓ¿ï¶µ½s¼g¶l¥ó®É¡A¦¬¥ó¹ï¶H¶È¥u¯à¦³¤@¦ì¡C¦b§Aªº³q°T¿ý¤¤¥²¶·¦s¦³³o¦ì¦¬¥ó¹ï¶Hªº PGP ¤½¶}ª÷Æ_¡A§_«h±N·|¥X²{¿ù»~ªºª¬ªp¡C¦pªG§Aªº³q°T¿ý¤¤½T¹ê¤w¦s¦b³o¦ì¦¬¥ó¹ï¶Hªº PGP ¤½¶}ª÷Æ_¡A¦ý¤´µM¦¬¨ì¿ù»~ªº°T®§®É¡A½ÐÀË¬d¤@¤U¦¬¥ó¹ï¶Hªº¹q¤l¶l¥ó¦í§}¬O§_»P³q°T¿ý¤¤¸Óµ§ PGP ¤½¶}ª÷Æ_ªº¹q¤l¶l¥ó¦í§}¬Û§k¦X¡C¥[±K¸ê®Æ±Nªþ¥[©ó¶l¥ó¤¤¤@¨Ö±H¥X¡C
     </para>
     <heading>PGP ¶l¥óÃ±³¹</heading>
     <para>
-    ³oÓ¿ï¶µ±N¨Ï¥Î§AªºÓ¤H¨p±Kª÷Æ_¬°¥Ø«e½s¼gªº¶l¥ó¬I¥H PGP ¼Æ¦ìÃ±³¹¡C
-    ¦pªG§A©|¥¼¦b³oÓµn¤J¨ä¶¡¤¤¿é¤J§AªºÓ¤H¨p±Kª÷Æ_±K½X¡A¨º§A±N·|³Qn¨D¿é¤J¡C
-    ¦¬¥ó¹ï¶H¥²¶·n¾Ö¦³§AªºÓ¤H¤½¶}ª÷Æ_¥H¶i¦æ¼Æ¦ìÅçÃÒ§AªºÃ±³¹¡C
+    ³oÓ¿ï¶µ±N¨Ï¥Î§AªºÓ¤H¨p±Kª÷Æ_¬°¥Ø«e½s¼gªº¶l¥ó¬I¥H PGP ¼Æ¦ìÃ±³¹¡C¦pªG§A©|¥¼¦b³oÓµn¤J´Á¶¡¤¤¿é¤J§AªºÓ¤H¨p±Kª÷Æ_±K½X¡A¨º§A±N·|³Qn¨D¦A¦¸¿é¤J¡C¦¬¥ó¹ï¶H¥²¶·n¾Ö¦³§AªºÓ¤H¤½¶}ª÷Æ_¥H¶i¦æ¼Æ¦ìÅçÃÒ§AªºÃ±³¹¡C
     </para>
     <heading>PGP ¶l¥óÃ±³¹/¶l¥ó¥[±K</heading>
     <para>
-    ³oÓ¿ï¶µ±N¥ý¹ï¶l¥ó°õ¦æ¼Æ¦ìÃ±³¹ªº°Ê§@µM«á¦A°õ¦æ¶l¥ó¥[±K¡C
-    §ó¶i¤@¨Bªº¸ê°T½Ð°Ñ¦Ò 'PGP ¶l¥ó¥[±K' ¤Î 'PGP ¶l¥óÃ±³¹'¡C
+    ³oÓ¿ï¶µ±N¥ý¹ï¶l¥ó°õ¦æ¼Æ¦ìÃ±³¹ªº°Ê§@µM«á¦A°õ¦æ¶l¥ó¥[±K¡C§ó¶i¤@¨Bªº¸ê°T½Ð°Ñ¦Ò "PGP ¶l¥ó¥[±K" ¤Î "PGP ¶l¥óÃ±³¹"¡C
     </para>
     <heading>S/MIME ¶l¥ó¥[±K</heading>
     <para>
@@ -987,133 +300,30 @@
     <para>
     TODO
     </para>
-  <!-- English entry:
-<entry id="compose-options-encrypt">
-    <title>Compose: Encryption Options</title>
-    <heading>No Encryption</heading>
-    <para>
-    Send the message with no encryption (cleartext).
-    </para>
-    <heading>PGP Encrypt Message</heading>
-    <para>
-    This option will encrypt the current message, using PGP and the recipients personal public key, and then send it. You can only send a message to a single person using this option. You MUST have the public key of the recipient stored in your addressbook or else this option will fail. If you have the public key for the recipient in your addressbook and are still receiving errors, verify that the e-mail address in the recipient field matches the e-mail address where the public key is stored. The encrypted data will be attached to the outgoing message.
-    </para>
-    <heading>PGP Sign Message</heading>
-    <para>
-    This option will digitally sign the current message using PGP and your personal private key. If you have not already entered the passphrase for your private key during this session you will be prompted for it. The receipient must have a copy of your public key to digitally verify your
-    signature.
-    </para>
-    <heading>PGP Sign/Encrypt Message</heading>
-    <para>
-    This option will first digitally sign your message and then will encrypt the resulting output. See the "PGP Encrypt Message" and "PGP Sign Message" entries for further information.
-    </para>
-    <heading>S/MIME Encrypt Message</heading>
-    <para>
-    TODO
-    </para>
-    <heading>S/MIME Sign Message</heading>
-    <para>
-    TODO
-    </para>
-    <heading>S/MIME Sign/Encrypt Message</heading>
-    <para>
-    TODO
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-options-encrypt">
-    <title>Compose: Encryption Options</title>
-    <heading>No Encryption</heading>
-    <para>
-    Send the message with no encryption (cleartext).
-    </para>
-    <heading>PGP Encrypt Message</heading>
-    <para>
-    This option will encrypt the current message, using PGP and the recipients personal public key, and then send it. You can only send a message to a single person using this option. You MUST have the public key of the recipient stored in your addressbook or else this option will fail. If you have the public key for the recipient in your addressbook and are still receiving errors, verify that the e-mail address in the recipient field matches the e-mail address where the public key is stored. The encrypted data will be attached to the outgoing message.
-    </para>
-    <heading>PGP Sign Message</heading>
-    <para>
-    This option will digitally sign the current message using PGP and your personal private key. If you have not already entered the passphrase for your private key during this session you will be prompted for it. The receipient must have a copy of your public key to digitally verify your
-    signature.
-    </para>
-    <heading>PGP Sign/Encrypt Message</heading>
-    <para>
-    This option will first digitally sign your message and then will encrypt the resulting output. See the "PGP Encrypt Message" and "PGP Sign Message" entries for further information.
-    </para>
-    <heading>S/MIME Encrypt Message</heading>
-    <para>
-    TODO
-    </para>
-    <heading>S/MIME Sign Message</heading>
-    <para>
-    TODO
-    </para>
-    <heading>S/MIME Sign/Encrypt Message</heading>
-    <para>
-    TODO
-    </para>
-</entry>--><!-- English entry:
-<entry id="compose-options-encrypt">
-    <title>Compose: Encryption Options</title>
-    <heading>No Encryption</heading>
-    <para>
-    Send the message with no encryption (cleartext).
-    </para>
-    <heading>PGP Encrypt Message</heading>
-    <para>
-    This option will encrypt the current message, using PGP and the recipients personal public key, and then send it. You can only send a message to a single person using this option. You MUST have the public key of the recipient stored in your addressbook or else this option will fail. If you have the public key for the recipient in your addressbook and are still receiving errors, verify that the e-mail address in the recipient field matches the e-mail address where the public key is stored. The encrypted data will be attached to the outgoing message.
-    </para>
-    <heading>PGP Sign Message</heading>
-    <para>
-    This option will digitally sign the current message using PGP and your personal private key. If you have not already entered the passphrase for your private key during this session you will be prompted for it. The receipient must have a copy of your public key to digitally verify your
-    signature.
-    </para>
-    <heading>PGP Sign/Encrypt Message</heading>
-    <para>
-    This option will first digitally sign your message and then will encrypt the resulting output. See the "PGP Encrypt Message" and "PGP Sign Message" entries for further information.
-    </para>
-    <heading>S/MIME Encrypt Message</heading>
-    <para>
-    TODO
-    </para>
-    <heading>S/MIME Sign Message</heading>
-    <para>
-    TODO
-    </para>
-    <heading>S/MIME Sign/Encrypt Message</heading>
-    <para>
-    TODO
-    </para>
-</entry>--></entry>
+  </entry>
   <entry id="pgp-overview" md5="24b5138b4b53f73b5f2f2739e4c1858d" state="uptodate">
     <title>PGP: ·§z</title>
     <heading>¤°»ò¬O PGP?</heading>
     <para>
-    PGP ¬O¤@ºØ¥Î©ó³q°T¥H¤Î¸ê®Æªº¥[±K¤u¨ã¡A¯S§O¬O¥Î©ó¹q¤l¶l¥ó¡C
-    PGP ¥i¥Î©ó¸ê®Æªº¥[±K¡B«Ø¥ß¼Æ¦ìÃ±³¹¡C
-    ºô¸ô¶l§½ IMP ¨Ï¥Î GnuPG (GNU Privacy Guard) ¥H´£¨Ñ¦¹¶µ¥\¯à¡C
+    PGP ¬O¤@ºØ¥Î©ó³q°T¥H¤Î¸ê®Æªº¥[±K¤u¨ã¡A¯S§O¬O¥Î©ó¹q¤l¶l¥ó¡CPGP ¥i¥Î©ó¸ê®Æªº¥[±K¡B«Ø¥ß¼Æ¦ìÃ±³¹¡Cºô¸ô¶l§½ IMP ¨Ï¥Î GnuPG (GNU Privacy Guard) ¥H´£¨Ñ¦¹¶µ¥\¯à¡C
     </para>
     <heading>±Ò¥Î PGP ?</heading>
     <para>
-    ¤Ä¿ï³oÓ¶µ¥Ø«á¡A§A±N¯à°÷ «Ø¥ß/ÀËµø §Aªº PGP Ó¤Hª÷Æ_¹ï¡A·s¼W/§R°£ ¨Ó¦Û¥L¤H
-    ©Òªþ°eªº¤½¶}ª÷Æ_¡AÅª¨ú¥[±K¶l¥ó¡AÅçÃÒ¼Æ¦ìÃ±³¹¶l¥ó¡A¥H¤Î¬°§An±Hµoªº¶l¥ó¬I¥H
-    ¥[±K/Ã±³¹ªº¥\¯à¡C
+    ¤Ä¿ï³oÓ¶µ¥Ø«á¡A§A±N¯à°÷ «Ø¥ß/ÀËµø §Aªº PGP Ó¤Hª÷Æ_¹ï¡A·s¼W/§R°£ ¨Ó¦Û¥L¤H©Òªþ°eªº¤½¶}ª÷Æ_¡AÅª¨ú¥[±K¶l¥ó¡AÅçÃÒ¼Æ¦ìÃ±³¹¶l¥ó¡A¥H¤Î¬°§An±Hµoªº¶l¥ó¬I¥H¥[±K/Ã±³¹ªº¥\¯à¡C
     </para>
   </entry>
   <entry id="pgp-option-attach-pubkey" md5="561ce43370ac4afbcc3f9818c8fbc2f6" state="uptodate">
     <title>PGP: ¿ï¶µ - ªþ¤W¤½¶}ª÷Æ_</title>
     <heading>¿ï¶µ - ªþ¤W¤½¶}ª÷Æ_</heading>
     <para>
-    ¦pªG¤Ä¿ï¦¹¤@¶µ¥Ø¡A¥B§Aªº PGP ¤½¶}ª÷Æ_¤]¦s¦bªº¸Ü¡A«h±H¥Xªº«H¥ó¤¤±Nªþ¤W
-    §Aªº PGP ¤½¶}ª÷Æ_¡C
+    ¦pªG¤Ä¿ï¦¹¤@¶µ¥Ø¡A¥B§Aªº PGP ¤½¶}ª÷Æ_¤]¦s¦bªº¸Ü¡A«h±H¥Xªº«H¥ó¤¤±Nªþ¤W§Aªº PGP ¤½¶}ª÷Æ_¡C
     </para>
   </entry>
   <entry id="pgp-manage-pubkey" md5="b289ea5824b7f69f35c0751497f4e1c3" state="uptodate">
     <title>PGP: ºÞ²z¤½¶}ª÷Æ_</title>
     <heading>·§z</heading>
     <para>
-    ³oÓµe±¦C¥X¥Ø«e¦b§Aªº³q°T¿ý¤¤¾Ö¦³¤½¶}ª÷Æ_ªº©Ò¦³¨Ï¥ÎªÌ¡C
-    ¥u¦³³o¨Ç¨Ï¥ÎªÌ¥i¥H 1)Åý§A¶Ç°e¤@«Ê¥[±Kªº¶l¥ó -©Î-
-    2)Åý§AÅçÃÒ¥L©Ò±Hµoªº¼Æ¦ìÃ±³¹¡C
+    ³oÓµe±¦C¥X¥Ø«e¦b§Aªº³q°T¿ý¤¤¾Ö¦³¤½¶}ª÷Æ_ªº©Ò¦³¨Ï¥ÎªÌ¡C¥u¦³³o¨Ç¨Ï¥ÎªÌ¥i¥H 1)Åý§A¶Ç°e¤@«Ê¥[±Kªº¶l¥ó -©Î- 2)Åý§AÅçÃÒ¥L©Ò±Hµoªº¼Æ¦ìÃ±³¹¡C
     </para>
     <heading>ÀËµø</heading>
     <para>
@@ -1128,61 +338,27 @@
     ¦Û§Aªº³q°T¿ý¤¤§R°£¦¹¤@¤½¶}ª÷Æ_¡C
     </para>
   </entry>
-  <entry id="pgp-import-pubkey" md5="a0bb34a07de288201d27ba5e891257a9" state="changed">
+  <entry id="pgp-import-pubkey" md5="6ee1130b46e9ff1ca9ad3a3a47e7b382" state="uptodate">
     <title>PGP: ºÞ²z¤½¶}ª÷Æ_ - ¶×¤J</title>
     <heading>¶×¤J¤½¶}ª÷Æ_</heading>
     <para>
-    ³oÓ«ö¶s±N¶}±Ò¤@Óµøµ¡¥H¨Ñ§A¤â°Ê¦a¶×¤J¤@Ó PGP ¤½¶}ª÷Æ_¡C
-    §A¥i¥H±Nª÷Æ_¶K¤J¨ì¤å¦rÄæ¦ì¤¤¡A©ÎªÌ¦Û§AªºÓ¤H¹q¸£±N¤½¶}ª÷Æ_ª½±µ¶×¤J¡C
-    ¦pªG¸Óª÷Æ_¬O¦Xªkªº¥¦±N·|³Q¦s©ñ¦b§AªºÓ¤H³q°T¿ý¤¤¡AÀH«á³oÓµøµ¡±N¤@¨ÖÃö³¬¡C
-    ¦pªG¤£¬O¦Xªkªºª÷Æ_¡A«h§A±N·|¬Ý¨£¿ù»~ªºì¦]¡C
-    </para>
-  <!-- English entry:
-<entry id="pgp-import-pubkey">
-    <title>PGP: Manage Public Keys - Import</title>
-    <heading>Import Public Keys</heading>
-    <para>
-    This button will open a window where you can manually import a PGP public key. The key can either be pasted into a textfield or, if the key resides in a file on your local computer, you can import it. If the key is valid it will be inserted into your addressbook and the window will close; if not valid, an error message will be returned explaining why.
-    </para>
-</entry>--><!-- English entry:
-<entry id="pgp-import-pubkey">
-    <title>PGP: Manage Public Keys - Import</title>
-    <heading>Import Public Keys</heading>
-    <para>
-    This button will open a window where you can manually import a PGP public key. The key can either be pasted into a textfield or, if the key resides in a file on your local computer, you can import it. If the key is valid it will be inserted into your addressbook and the window will close; if not valid, an error message will be returned explaining why.
-    </para>
-</entry>--><!-- English entry:
-<entry id="pgp-import-pubkey">
-    <title>PGP: Manage Public Keys - Import</title>
-    <heading>Import Public Keys</heading>
-    <para>
-    This button will open a window where you can manually import a PGP public key. The key can either be pasted into a textfield or, if the key resides in a file on your local computer, you can import it. If the key is valid it will be inserted into your addressbook and the window will close; if not valid, an error message will be returned explaining why.
+    ³oÓ«ö¶s±N¶}±Ò¤@Óµøµ¡¥H¨Ñ§A¤â°Ê¦a¶×¤J¤@Ó PGP ¤½¶}ª÷Æ_¡C§A¥i¥H±Nª÷Æ_¶K¤J¨ì¤å¦rÄæ¦ì¤¤¡A©ÎªÌ¦Û§AªºÓ¤H¹q¸£±N¤½¶}ª÷Æ_ª½±µ¶×¤J¡C¦pªG¸Óª÷Æ_¬O¦³®Äªº¥¦·|³Q©ñ¦b§AªºÓ¤H³q°T¿ý¤¤¡AÀH«á³oÓµøµ¡±N¤@¨ÖÃö³¬¡C¦pªG¤£¬O¦³®Äªºª÷Æ_¡A«h§A±N·|¬Ý¨£¿ù»~ªºì¦]¡C
     </para>
-</entry>--></entry>
+  </entry>
   <entry id="pgp-overview-personalkey" md5="220af2b74a58f430efd72d6d6b1f993f" state="uptodate">
     <title>PGP: ºÞ²zÓ¤Hª÷Æ_</title>
     <heading>·§z</heading>
     <para>
-    ¦pªG§A·Qn¹ï¶l¥ó¬I¥H¼Æ¦ìÃ±³¹©ÎªÌÅý¥L¤H¯à°÷±Hµ¹§A¥[±Kªº¶l¥ó¡A
-    ¨º§A¥²¶·n¥ý¾Ö¦³ÄÝ©ó¦Û¤vªº¤½¶}/¨p±KPGPª÷Æ_¹ï¡C
+    ¦pªG§A·Qn¹ï¶l¥ó¬I¥H¼Æ¦ìÃ±³¹©ÎªÌÅý¥L¤H¯à°÷±Hµ¹§A¥[±Kªº¶l¥ó¡A¨º§A¥²¶·n¥ý¾Ö¦³ÄÝ©ó¦Û¤vªº¤½¶}/¨p±KPGPª÷Æ_¹ï¡C
     </para>
     <heading>§Aªº¤½¶}ª÷Æ_</heading>
     <para>
-    §Aªº¤½¶}ª÷Æ_¥i¥H±Hµ¹¨º¨Ç¡A§A§Æ±æ¹ï¤è·|±Hµo¥[±K¶l¥óµ¹§Aªº¤H¡C
-    ¥[±K«áªº¶l¥ó¥u¦³§A¯à¸Ñ±K(¨Ï¥Î§Aªº¨p±Kª÷Æ_)¡C
-    ¥t¥~¡A§Aªº¤½¶}ª÷Æ_¥i¥H±Hµ¹¥ô¦ó¤@¦ì¡A§A´¿±Hµoµ¹¥L¼Æ¦ìÃ±³¹¶l¥óªº¤H -
-    ¦]¬°¼Æ¦ìÃ±³¹ªºÅçÃÒ»Ýn§Aªº¤½¶}ª÷Æ_¡C
+    §Aªº¤½¶}ª÷Æ_¥i¥H±Hµ¹¨º¨Ç¡A§A§Æ±æ¹ï¤è·|±Hµo¥[±K¶l¥óµ¹§Aªº¤H¡C¥[±K«áªº¶l¥ó¥u¦³§A¯à¸Ñ±K(¨Ï¥Î§Aªº¨p±Kª÷Æ_)¡C¥t¥~¡A§Aªº¤½¶}ª÷Æ_¥i¥H±Hµ¹¥ô¦ó¤@¦ì¡A§A´¿±Hµoµ¹¥L¼Æ¦ìÃ±³¹¶l¥óªº¤H - ¦]¬°¼Æ¦ìÃ±³¹ªºÅçÃÒ»Ýn§Aªº¤½¶}ª÷Æ_¡C
     </para>
     <heading>§Aªº¨p±Kª÷Æ_</heading>
     <para>
-    §Aªº¨p±Kª÷Æ_³Q¥Î¨Ó¡A¸Ñ±K©Ò¦³¥H§A¤½¶}ª÷Æ_¥[±Kªº¶l¥ó¡C
-    ¥t¥~¡A¦pªG§A·Qn¹ï±Hµoªº¶l¥ó¬I¥H¼Æ¦ìÃ±³¹¡A³o¤]»Ýn§Aªº¨p±Kª÷Æ_¡C
-    §Aªº¨p±Kª÷Æ_±N³Q·íªìª÷Æ_«Ø¥ß®É©Ò²£¥Íªº¤@²Õ±K½X©Ò«OÅ@¡C
-    ¦]¦¹·í¦³¥ô¦ó»Ýn§Aªº¨p±Kª÷Æ_³õ¦X®É¡A
-    ºô¸ô¶l§½±N·|´£¥Ü§A¿é¤J±K½X¡C
-    §A¥u»Ýn¦b¨CÓµn¤J´Á¶¡¿é¤J§Aªº±K½X§Y¥i -
-    ºô¸ô¶l§½±N·|¦Û°ÊÀx¦s§Aªº±K½Xª½¨ì§Aµn¥X¬°¤î
-    (©Ò¥H·í¤£¨Ï¥Îºô¸ô¶l§½ªº®ÉÔ¡A°O±on½T¹êµn¥X®@¡I)
+    §Aªº¨p±Kª÷Æ_³Q¥Î¨Ó¡A¸Ñ±K©Ò¦³¥H§A¤½¶}ª÷Æ_¥[±Kªº¶l¥ó¡C¥t¥~¡A¦pªG§A·Qn¹ï±Hµoªº¶l¥ó¬I¥H¼Æ¦ìÃ±³¹¡A³o¤]»Ýn§Aªº¨p±Kª÷Æ_¡C§Aªº¨p±Kª÷Æ_±N³Q·íªìª÷Æ_«Ø¥ß®É©Ò²£¥Íªº¤@²Õ±K½X©Ò«OÅ@¡C¦]¦¹·í¦³¥ô¦ó»Ýn§Aªº¨p±Kª÷Æ_³õ¦X®É¡Aºô¸ô¶l§½±N·|´£¥Ü§A¿é¤J±K½X¡C
+    §A¥u»Ýn¦b¨CÓµn¤J´Á¶¡¿é¤J§Aªº±K½X§Y¥i - ºô¸ô¶l§½±N·|¦Û°ÊÀx¦s§Aªº±K½Xª½¨ì§Aµn¥X¬°¤î(©Ò¥H·í¤£¨Ï¥Îºô¸ô¶l§½ªº®ÉÔ¡A°O±on½T¹êµn¥X®@¡I)
     </para>
   </entry>
   <entry id="pgp-personalkey-public" md5="3c844d4ff8fdda3e0d446b47a63117e0" state="uptodate">
@@ -1200,19 +376,15 @@
     <title>PGP: ºÞ²zÓ¤Hª÷Æ_ - ¨p±Kª÷Æ_</title>
     <heading>¿é¤J±K½X</heading>
     <para>
-    ¶}±Ò±K½X¹ï¸Üµøµ¡¡C¦pªG¿é¤J¥¿½Tªº±K½X¡A±K½X±N³Qºô¸ô¶l§½ IMP Àx¦s
-    ¡Aª½¨ì§Aªºµn¤J´Á¶¡µ²§ô¬°¤î¡C
+    ¶}±Ò±K½X¹ï¸Üµøµ¡¡C¦pªG¿é¤J¥¿½Tªº±K½X¡A±K½X±N³Qºô¸ô¶l§½ IMP Àx¦s¡Aª½¨ì§Aªºµn¤J´Á¶¡µ²§ô¬°¤î¡C
     </para>
     <heading>¨ø¸ü±K½X</heading>
     <para>
-    ¦Ûºô¸ô¶l§½²¾°£¤wÀx¦sªº±K½X - ¥ô¦ó«áÄòªº¨p±Kª÷Æ_³B²z
-    ³£¥²¶·¦A«·s¿é¤J¦¹±K½X¡C
+    ¦Ûºô¸ô¶l§½²¾°£¤wÀx¦sªº±K½X - ¥ô¦ó«áÄòªº¨p±Kª÷Æ_³B²z³£¥²¶·¦A«·s¿é¤J¦¹±K½X¡C
     </para>
     <heading>ÀËµø</heading>
     <para>
-    ¶}±Ò¤@Óµøµ¡¥HÀËµø PGP ¨p±Kª÷Æ_¡C "¤£n±N¦¹¨p±Kª÷Æ_¶Ç°eµ¹¥ô¦ó¤H" -
-    ¦¹¿ï¶µ¬OÄYÂÔ¦a¡A¦p¦¹¤@¨Ó§A¥i¥H±N§Aªººô¸ô¶l§½¨p±Kª÷Æ_¶×¥X¨Ñ¨ä¥L
-    µ{¦¡¨Ï¥Î¡C
+    ¶}±Ò¤@Óµøµ¡¥HÀËµø PGP ¨p±Kª÷Æ_¡C "¤£n±N¦¹¨p±Kª÷Æ_¶Ç°eµ¹¥ô¦ó¤H" - ¦¹¿ï¶µ¬OÄYÂÔ¦a¡A¦p¦¹¤@¨Ó§A¥i¥H±N§Aªººô¸ô¶l§½¨p±Kª÷Æ_¶×¥X¨Ñ¨ä¥Lµ{¦¡¨Ï¥Î¡C
     </para>
     <heading>²Ó¸`</heading>
     <para>
@@ -1223,10 +395,7 @@
     <title>PGP: ºÞ²zÓ¤Hª÷Æ_ - §R°£</title>
     <heading>§R°£Ó¤Hª÷Æ_</heading>
     <para>
-    ÂI¿ï³oÓ«ö¶s¡A·|±N§AÀx¦s¦bºô¸ô¶l§½°¾¦n³]©w¤¤ªºÓ¤H¤½¶}/¨p±Kª÷Æ_¹ï§R°£¡C
-    ½Ðª`·N¡G¥Ñ©óÓ¤H¨p±Kª÷Æ_»PÓ¤H¤½¶}ª÷Æ_¬O¦¨¹ïªº¡A¤@¦ýª÷Æ_¹ï«Ø¥ß§¹¦¨¨Ï¥ÎªÌ
-    À³¸ÓºÉ¥i¯àÁ×§K¥h§R°£¥¦¡C¦]¬°¦pªG¤S¦A¦¸«·s«Ø¥ßª÷Æ_¹ï¡A¤§«e©Ò¦³±Hµoµ¹ªB¤Í¨Ã¬y
-    ³q¦b¥~ªº¤½¶}ª÷Æ_±NµLªk»P·s«Øªº¨p±Kª÷Æ_§k¦X¡C(°£«D§A±N·s«Øªº¤½¶}ª÷Æ_«·s±Hµo)
+    ÂI¿ï³oÓ«ö¶s¡A·|±N§AÀx¦s¦bºô¸ô¶l§½°¾¦n³]©w¤¤ªºÓ¤H¤½¶}/¨p±Kª÷Æ_¹ï§R°£¡C½Ðª`·N¡G¥Ñ©óÓ¤H¨p±Kª÷Æ_»PÓ¤H¤½¶}ª÷Æ_¬O¦¨¹ïªº¡A¤@¦ýª÷Æ_¹ï«Ø¥ß§¹¦¨¨Ï¥ÎªÌÀ³¸ÓºÉ¥i¯àÁ×§K¥h§R°£¥¦¡C¦]¬°¦pªG¤S¦A¦¸«·s«Ø¥ßª÷Æ_¹ï¡A¤§«e©Ò¦³±Hµoµ¹ªB¤Í¨Ã¬y³q¦b¥~ªº¤½¶}ª÷Æ_±NµLªk»P·s«Øªº¨p±Kª÷Æ_§k¦X¡C(°£«D§A±N·s«Øªº¤½¶}ª÷Æ_«·s±Hµo)
     </para>
   </entry>
   <entry id="pgp-personalkey-create-name" md5="748cb124b7ff52820792e278037a8c27" state="uptodate">
@@ -1240,8 +409,7 @@
     <title>PGP: «Ø¥ßÓ¤Hª÷Æ_ - µù¸Ñ</title>
     <heading>µù¸Ñ</heading>
     <para>
-    §A§Æ±æ¬°¦¹Ó¤Hª÷Æ_´£¨Ñªº»¡©ú¡A³o¨Çµù¸Ñ±N´O¤J¨ì§AªºÓ¤Hª÷Æ_¤¤¡C
-    ³o¬O¿ï¾Ü©ÊÄæ¦ì¡C
+    §A§Æ±æ¬°¦¹Ó¤Hª÷Æ_´£¨Ñªº»¡©ú¡A³o¨Çµù¸Ñ±N´O¤J¨ì§AªºÓ¤Hª÷Æ_¤¤¡C³o¬O¿ï¾Ü©ÊÄæ¦ì¡C
     </para>
   </entry>
   <entry id="pgp-personalkey-create-email" md5="c729f70fdb3a73cbb7ba5ef5888e3092" state="uptodate">
@@ -1251,7 +419,7 @@
     §A©Ò§Æ±æ»PÓ¤Hª÷Æ_µ²¦Xªº¹q¤l¶l¥ó¦a§}¡C³o¬O¥²¶·Äæ¦ì¡C
     </para>
   </entry>
-  <entry id="pgp-personalkey-create-keylength" md5="546a087650cada2d1d4a01b478311bb9" state="uptodate">
+  <entry id="pgp-personalkey-create-keylength" md5="24ca641c63fb5ff310a39ee0d3b1ee55" state="uptodate">
     <title>PGP: «Ø¥ßÓ¤Hª÷Æ_ - ª÷Æ_ªø«×</title>
     <heading>ª÷Æ_ªø«×</heading>
     <para>
@@ -1264,13 +432,10 @@
     <title>PGP: «Ø¥ßÓ¤Hª÷Æ_ - ±K½X</title>
     <heading>±K½X</heading>
     <para>
-    ±K½X¥Î¨Ó«OÅ@/¥[±K§AªºÓ¤H¨p±Kª÷Æ_¡C±K½Xªº³]©w¦³´XÓì«h¡G
-    1) ¦Ü¤Ö 6 Ó¦r(^¤å©Î¼Æ¦r)¡C 2) ¤£n©Mµn¤J±K½X¬Û¦P¡C 3) ¦b¦r¨å¤¤§ä¤£¨ì¡C
-    4) ^¤å¦r»P¼Æ¦r¥æÂø¨Ï¥Î¡C
-    §A¥²¶·¿é¤J¤G¦¸±K½X¡A¥H½T«O§A¨S¦³»~³]¡C³o¬O¥²¶·Äæ¦ì¡C
+    ±K½X¥Î¨Ó«OÅ@/¥[±K§AªºÓ¤H¨p±Kª÷Æ_¡C±K½Xªº³]©w¦³´XÓì«h¡G1) ¦Ü¤Ö 6 Ó¦r(^¤å©Î¼Æ¦r)¡C 2) ¤£n©Mµn¤J±K½X¬Û¦P¡C 3) ¦b¦r¨å¤¤§ä¤£¨ì¡C4) ^¤å¦r»P¼Æ¦r¥æÂø¨Ï¥Î¡C§A¥²¶·¿é¤J¤G¦¸±K½X¡A¥H½T«O§A¨S¦³»~³]¡C³o¬O¥²¶·Äæ¦ì¡C
     </para>
   </entry>
-  <entry id="pgp-personalkey-create-actions" md5="8b34a7b76424db822724a60271a33096" state="changed">
+  <entry id="pgp-personalkey-create-actions" md5="0f8234935b964c83533b4ec4c15eb712" state="uptodate">
     <title>PGP: «Ø¥ßÓ¤Hª÷Æ_ - °Ê§@</title>
     <heading>«Ø¥ßª÷Æ_</heading>
     <para>
@@ -1278,121 +443,43 @@
     </para>
     <heading>¶×¤Jª÷Æ_¹ï</heading>
     <para>
-    ¶×¤J¤@²ÕÓ¤H ¤½¶}/¨p±K ª÷Æ_¹ï¡C
-    ³oÓ«ö¶s±N¶}±Ò¤@Óµøµ¡¡A¨Ñ§A¶×¤J§AªºPGPÓ¤H¤½¶}/¨p±Kª÷Æ_¹ï¡C
-    §A¥i¥H±Nª÷Æ_¶K¤J¨ì¤å¦rÄæ¦ì¤¤¡A©ÎªÌª½±µ¥Ñ§Aªº¹q¸£±N¤½¶}ª÷Æ_¶×¤J¡C
-    ¦pªG¸Óª÷Æ_¬O¦³®Äªº¥¦±N·|³Q¦s©ñ¦b§Aªº³]©w¤¤¡AÀH«á³oÓµøµ¡±N¤@¨ÖÃö³¬¡C
-    ¦pªG¤£¬O¦³®Äªºª÷Æ_¡A«h§A±N·|¬Ý¨£¿ù»~ªºì¦]¡C
-    </para>
-  <!-- English entry:
-<entry id="pgp-personalkey-create-actions">
-    <title>PGP: Create Personal Key - Actions</title>
-    <heading>Create Keys</heading>
-    <para>
-    Create and store your personal public/private keypair.
-    </para>
-    <heading>Import Keypair</heading>
-    <para>
-    Import a personal/private keypair. This button opens a window where you can manually import your existing PGP personal public/private keypair. The keys can either be pasted into a textfield or, if the keys reside in a file on your local computer, you can import them. If the keys are valid they will be inserted into your preferences and the window will close; if not valid, an error message will be returned explaining why.
-    </para>
-</entry>--><!-- English entry:
-<entry id="pgp-personalkey-create-actions">
-    <title>PGP: Create Personal Key - Actions</title>
-    <heading>Create Keys</heading>
-    <para>
-    Create and store your personal public/private keypair.
-    </para>
-    <heading>Import Keypair</heading>
-    <para>
-    Import a personal/private keypair. This button opens a window where you can manually import your existing PGP personal public/private keypair. The keys can either be pasted into a textfield or, if the keys reside in a file on your local computer, you can import them. If the keys are valid they will be inserted into your preferences and the window will close; if not valid, an error message will be returned explaining why.
-    </para>
-</entry>--><!-- English entry:
-<entry id="pgp-personalkey-create-actions">
-    <title>PGP: Create Personal Key - Actions</title>
-    <heading>Create Keys</heading>
-    <para>
-    Create and store your personal public/private keypair.
-    </para>
-    <heading>Import Keypair</heading>
-    <para>
-    Import a personal/private keypair. This button opens a window where you can manually import your existing PGP personal public/private keypair. The keys can either be pasted into a textfield or, if the keys reside in a file on your local computer, you can import them. If the keys are valid they will be inserted into your preferences and the window will close; if not valid, an error message will be returned explaining why.
+    ¶×¤J¤@²ÕÓ¤H ¤½¶}/¨p±K ª÷Æ_¹ï¡C³oÓ«ö¶s±N¶}±Ò¤@Óµøµ¡¡A¨Ñ§A¶×¤J§AªºPGPÓ¤H¤½¶}/¨p±Kª÷Æ_¹ï¡C§A¥i¥H±Nª÷Æ_¶K¤J¨ì¤å¦rÄæ¦ì¤¤¡A©ÎªÌª½±µ¥Ñ§Aªº¹q¸£±N¤½¶}ª÷Æ_¶×¤J¡C¦pªG¸Óª÷Æ_¬O¦³®Äªº¥¦±N·|³Q¦s©ñ¦b§Aªº³]©w¤¤¡AÀH«á³oÓµøµ¡±N¤@¨ÖÃö³¬¡C¦pªG¤£¬O¦³®Äªºª÷Æ_¡A«h§A±N·|¬Ý¨£¿ù»~ªºì¦]¡C
     </para>
-</entry>--></entry>
-  <entry id="smime-overview" md5="fe45458fac111d224aca9d96f49acd99" state="changed">
+  </entry>
+  <entry id="smime-overview" md5="d3c752b1345fb2eccfe575c07461963f" state="uptodate">
     <title>S/MIME: ·§z</title>
     <heading>¤°»ò¬O S/MIME?</heading>
     <para>
-    PGP ¬O¤@ºØ¥Î©ó³q°T¥H¤Î¸ê®Æªº¥[±K¤u¨ã¡A¯S§O¬O¥Î©ó¹q¤l¶l¥ó¡C 
-    PGP ¥i¥Î©ó¸ê®Æªº¥[±K¡B«Ø¥ß¼Æ¦ìÃ±³¹¡C ºô¸ô¶l§½¨Ï¥Î GnuPG (GNU Privacy Guard)
-    ¥H´£¨Ñ¤WzªºªA°È¡C
-    S/MIME ¬O¥t¤@ºØ¨p±K/¤½¶}ª÷Æ_¹ï¨t²Î¡C¸Ó¨t²Î´£¨Ñ½Ñ¦p¡G¼Æ¦ìÃ±³¹¡A¶l¥ó¥[±K¡A¥H¤Î
-    ¦b¶}©ñ¦@¥Î¤W´£¨ÑÂ«§ï°»´úªº§Þ³N¡C S/MIME ¥i¥H´£¨Ñ¶l¥ó¥[±Kªº¥\¯à¡A¥[±K«áªº¶l
-    ¥ó¥u¦³±H°eªÌ¤Î¦¬¥óªÌ¥i¥H¸Ñ±K¡CS/MIME ÁÙ¥i¥H¸g¥Ñ¼Æ¦ìÃ±³¹¨Ó¿ëÃÑ±H°eªÌªº¶l¥ó¡C
-    ¥[±K»P¼Æ¦ìÃ±³¹¤@°_¨Ï¥Î§ó¥i¥H´£¨ÑÂ«§ï°»´úªº¥\¯à¡A¦nÅý©Ò¦³¦¬¥ó¹ï¶H§P©w¶l¥ó¦b
-    ±Hµo«á¬O§_´¿³QÂ«§ï¡C
+    S/MIME ¬O¤@ºØ¨p±K/¤½¶}ª÷Æ_¹ï¨t²Î¡C¸Ó¨t²Î´£¨Ñ½Ñ¦p¡G¼Æ¦ìÃ±³¹¡A¶l¥ó¥[±K¡A¥H¤Î¦b¶}©ñ¦@¥Î¤W´£¨ÑÂ«§ï°»´úªº§Þ³N¡C S/MIME ¥i¥H´£¨Ñ¶l¥ó¥[±Kªº¥\¯à¡A¥[±K«áªº¶l¥ó¥u¦³±H°eªÌ¤Î¦¬¥óªÌ¥i¥H¸Ñ±K¡CS/MIME ÁÙ¥i¥H¸g¥Ñ¼Æ¦ìÃ±³¹¨Ó¿ëÃÑ±H°eªÌªº¨¥÷¡C¥[±K»P¼Æ¦ìÃ±³¹¤@°_¨Ï¥Î§ó¥i¥H´£¨ÑÂ«§ï°»´úªº¥\¯à¡A¦nÅý©Ò¦³¦¬¥ó¹ï¶H§P©w¶l¥ó¦b±Hµo«á¬O§_´¿³QÂ«§ï¡C
     </para>
     <heading>±Ò°Ê S/MIME ?</heading>
     <para>
     ¤Ä¿ï³oÓ¶µ¥Ø«á¡A§A±N¯à°÷¶×¤J§AªºÓ¤H S/MIME ª÷Æ_¡AÅª¨ú¥[±K¶l¥ó¡AÅçÃÒ¼Æ¦ìÃ±
     ³¹¶l¥ó¡A¥H¤Î¬°§An±Hµoªº¶l¥ó¬I¥H¥[±K/Ã±³¹ªº¥\¯à¡C
     </para>
-  <!-- English entry:
-<entry id="smime-overview">
-    <title>S/MIME: Overview</title>
-    <heading>What is S/MIME?</heading>
-    <para>
-    S/MIME is a private/public key pair system which provides digital signatures, message privacy, and tamper detection in a open, interoperable way. S/MIME can provide message privacy by encrypting messages that only the sender and the intended recipients can decode. It allows you to identify the sender of a message via a digital signature. Together, this encryption and digital signing help provide tamper detection, allowing recipients to determine whether a message was altered after it was sent.
-    </para>
-    <heading>Enable S/MIME functionality?</heading>
-    <para>
-    If this option is selected, you will be able to import your personal S/MIME keys, read encrypted mail, verify digitally signed mail, and encrypt/sign your outgoing mail.
-    </para>
-</entry>--><!-- English entry:
-<entry id="smime-overview">
-    <title>S/MIME: Overview</title>
-    <heading>What is S/MIME?</heading>
-    <para>
-    S/MIME is a private/public key pair system which provides digital signatures, message privacy, and tamper detection in a open, interoperable way. S/MIME can provide message privacy by encrypting messages that only the sender and the intended recipients can decode. It allows you to identify the sender of a message via a digital signature. Together, this encryption and digital signing help provide tamper detection, allowing recipients to determine whether a message was altered after it was sent.
-    </para>
-    <heading>Enable S/MIME functionality?</heading>
-    <para>
-    If this option is selected, you will be able to import your personal S/MIME keys, read encrypted mail, verify digitally signed mail, and encrypt/sign your outgoing mail.
-    </para>
-</entry>--><!-- English entry:
-<entry id="smime-overview">
-    <title>S/MIME: Overview</title>
-    <heading>What is S/MIME?</heading>
-    <para>
-    S/MIME is a private/public key pair system which provides digital signatures, message privacy, and tamper detection in a open, interoperable way. S/MIME can provide message privacy by encrypting messages that only the sender and the intended recipients can decode. It allows you to identify the sender of a message via a digital signature. Together, this encryption and digital signing help provide tamper detection, allowing recipients to determine whether a message was altered after it was sent.
-    </para>
-    <heading>Enable S/MIME functionality?</heading>
-    <para>
-    If this option is selected, you will be able to import your personal S/MIME keys, read encrypted mail, verify digitally signed mail, and encrypt/sign your outgoing mail.
-    </para>
-</entry>--></entry>
+  </entry>
   <entry id="smime-overview-personalkey" md5="9f4f36ae72cb4abc731067d338be3b98" state="uptodate">
     <title>S/MIME: Ó¤Hª÷Æ_</title>
     <heading>·§z</heading>
     <para>
-    ¦pªG§A·Qn¹ï¶l¥ó¬I¥H¼Æ¦ìÃ±³¹©ÎªÌ¥[±K¡A¨º§A¥²¶·n¥ý¾Ö¦³ÄÝ©ó
-    ¦Û¤vªº¤½¶}/¨p±KS/MIMEª÷Æ_¹ï¡C
+    ¦pªG§A·Qn¹ï¶l¥ó¬I¥H¼Æ¦ìÃ±³¹©ÎªÌ¥[±K¡A¨º§A¥²¶·n¥ý¾Ö¦³ÄÝ©ó¦Û¤vªº¤½¶}/¨p±KS/MIMEª÷Æ_¹ï¡C
     </para>
   </entry>
-  <entry id="smime-import-personal-certs" state="new">
+  <entry id="smime-import-personal-certs" state="uptodate" md5="cf0ed2e3e24d30dedf8cfef2c2645759">
     <title>S/MIME: Import Personal Certificates</title>
     <heading>Import Personal Certificates</heading>
     <para>
     Import personal certificates from a PKCS #12 format file. PKCS #12 files is the file usually generated when exporting a key from a browser (e.g. Internet Explorer, Firefox) or from a certificate store maintained by an Operating System (e.g. Windows XP). If the keys are valid they will be inserted into your preferences and the window will close; if not valid, an error message will be returned explaining why.
     </para>
 </entry>
-  <entry id="smime-delete-personal-certs" state="new">
+  <entry id="smime-delete-personal-certs" state="uptodate" md5="018bb6b61a7e416892de288ad1c880f4">
     <title>S/MIME: Delete Personal Certificates</title>
     <heading>Delete Personal Certificates</heading>
     <para>
     Delete your personal certificates from your preferences.  You will no longer be able to sign S/MIME messages or view any S/MIME encrypted messages addressed to you.
     </para>
 </entry>
-  <entry id="smime-manage-pubkey" state="new">
+  <entry id="smime-manage-pubkey" state="uptodate" md5="8b6c63684d3d73b3d084025a78fe7e88">
     <title>S/MIME: Manage Public Keys</title>
     <heading>S/MIME: Manage Public Keys</heading>
     <para>
@@ -1411,185 +498,58 @@
     Deletes the selected public key from storage.  Deleting a public key for a user will prevent your from encrypting a message to that user.
     </para>
 </entry>
-  <entry id="printing" md5="d678fcc02ec59acaaa2ac24dff4123a8" state="changed">
+  <entry id="printing" md5="f233c11b6b4a6bedeb68f1d5a2a976db" state="uptodate">
     <title>¦C¦L</title>
     <heading>¦C¦L¤@«Ê¶l¥ó</heading>
     <para>
-    ±ý¦C¤@«Ê¥¿¦bÀËµøªº¶l¥ó¡A ½ÐÂI¿ï¶l¥ó¶±¤W¤è©Î¤U¤èªº"¤Íµ½¦C¦L"¡C ®æ¦¡¤Æ«á
-    ªº¶l¥ó±N¶}±Ò©ó·sµøµ¡¤¤µ¥«Ý¦C¦L¡C µø§AªºÂsÄý¾¹»P§@·~¨t²Î¦Ó©w¡A¦¹®É¬O§_¶}
-    ±Ò¤@Ó¦C¦L¥æ½Íµøµ¡¡C ¦pªG¨S¦³¶}±Ò¡A½ÐÂI¿ïÂsÄý¾¹ªº"ÀÉ®×"«á¦AÂI¿ï"¦C¦L"
-    ¤w¶}±Ò¦C¦L¥æ½Íµøµ¡¡C
-    </para>
-  <!-- English entry:
-<entry id="printing">
-    <title>Printing</title>
-    <heading>Print a message</heading>
-    <para>
-    To print a message you are viewing, click on the "Print" link at either the top or bottom of the message. The message will open in a new window formated for printing. Depending on your web browser and operating system, the print dialog box may open for you. If it does not open, then pull down the web browser's "File" menu and choose "Print" to open the print dialog box.
-    </para>
-</entry>--><!-- English entry:
-<entry id="printing">
-    <title>Printing</title>
-    <heading>Print a message</heading>
-    <para>
-    To print a message you are viewing, click on the "Print" link at either the top or bottom of the message. The message will open in a new window formated for printing. Depending on your web browser and operating system, the print dialog box may open for you. If it does not open, then pull down the web browser's "File" menu and choose "Print" to open the print dialog box.
-    </para>
-</entry>--><!-- English entry:
-<entry id="printing">
-    <title>Printing</title>
-    <heading>Print a message</heading>
-    <para>
-    To print a message you are viewing, click on the "Print" link at either the top or bottom of the message. The message will open in a new window formated for printing. Depending on your web browser and operating system, the print dialog box may open for you. If it does not open, then pull down the web browser's "File" menu and choose "Print" to open the print dialog box.
+    ±ý¦C¤@«Ê¥¿¦bÀËµøªº¶l¥ó¡A ½ÐÂI¿ï¶l¥ó¶±¤W¤è©Î¤U¤èªº"¤Íµ½¦C¦L"¡C®æ¦¡¤Æ«áªº¶l¥ó±N¶}±Ò©ó·sµøµ¡¤¤µ¥«Ý¦C¦L¡C µø§AªºÂsÄý¾¹»P§@·~¨t²Î¦Ó©w¡A³q±`¦¹®É·|¶}±Ò¤@Ó¦C¦L¥æ½Íµøµ¡¡C ¦pªG¨S¦³¶}±Ò¡A½ÐÂI¿ïÂsÄý¾¹ªº"ÀÉ®×"«á¦AÂI¿ï"¦C¦L"¥H¶}±Ò¦C¦L¥æ½Íµøµ¡¡C
     </para>
-</entry>--></entry>
-  <entry id="sorting" md5="149f1b5caf65e8b93bb3ef0491bfee26" state="changed">
+  </entry>
+  <entry id="sorting" md5="18cdeac38027fe5c42bab693f2a4260a" state="uptodate">
     <title>±Æ§Ç»PÃöÁp</title>
     <heading>±Æ§Ç</heading>
     <para>
-    ÀËµø¶l¥ó²M³æ®É¡AÂÇ¥ÑÂI¿ï¤W¤èªº¥ô¤@ÓÄæ¦ì¦WºÙ¹F¨ì¶l¥ó±Æ§Çªº¥Øªº¡C
-    ÂI¿ïÄæ¦ì¦WºÙ®Çªº½bÀY¹Ï¥Ü¥i¥HÅÜ§ó±Æ§Çªº¤è¦V¡C
+    ÀËµø¶l¥ó²M³æ®É¡AÂÇ¥ÑÂI¿ï¤W¤èªº¥ô¤@ÓÄæ¦ì¦WºÙ¹F¨ì¶l¥ó±Æ§Çªº¥Øªº¡CÂI¿ïÄæ¦ì¦WºÙ®Çªº½bÀY¹Ï¥Ü¥i¥HÅÜ§ó±Æ§Çªº¤è¦V¡C
     </para>
     <heading>ÃöÁp</heading>
     <para>
-    ÂÇ¥ÑÂI¿ï¥D¦®Äæ¦ì¤¤ªº [ÃöÁp] ³sµ²¡A¨Ï¶l¥ó¨Ì©¼¦¹ÃöÁp©Ê (¥D¦®)±Æ¦C¦Ó²£¥Í
-    ¸s»E®ÄªG¡C¦pªGn¦^¨ì¤@¯ë¥¿±`ªº¥D¦®±Æ§Ç¡A½ÐÂI¿ï¥D¦®Äæ¦ì¤¤ªº [¥D¦®] ³sµ²¡C
-    </para>
-  <!-- English entry:
-<entry id="sorting">
-    <title>Sorting and Threading</title>
-    <heading>Sorting Entries</heading>
-    <para>
-    When viewing a list of messages, you can sort the messages by any column by clicking on the appropriate column heading. To switch columns between ascending and descending order, click on the arrow icon in the column heading.
-    </para>
-    <heading>Threading</heading>
-    <para>
-    To group messages by threads (subject), so each message is grouped with all its replies, click the [Thread] link in the subject column heading. To return to normal subject sorting, click on the [Subject] link in the subject column heading.
-    </para>
-</entry>--><!-- English entry:
-<entry id="sorting">
-    <title>Sorting and Threading</title>
-    <heading>Sorting Entries</heading>
-    <para>
-    When viewing a list of messages, you can sort the messages by any column by clicking on the appropriate column heading. To switch columns between ascending and descending order, click on the arrow icon in the column heading.
-    </para>
-    <heading>Threading</heading>
-    <para>
-    To group messages by threads (subject), so each message is grouped with all its replies, click the [Thread] link in the subject column heading. To return to normal subject sorting, click on the [Subject] link in the subject column heading.
-    </para>
-</entry>--><!-- English entry:
-<entry id="sorting">
-    <title>Sorting and Threading</title>
-    <heading>Sorting Entries</heading>
-    <para>
-    When viewing a list of messages, you can sort the messages by any column by clicking on the appropriate column heading. To switch columns between ascending and descending order, click on the arrow icon in the column heading.
-    </para>
-    <heading>Threading</heading>
-    <para>
-    To group messages by threads (subject), so each message is grouped with all its replies, click the [Thread] link in the subject column heading. To return to normal subject sorting, click on the [Subject] link in the subject column heading.
+    ÂÇ¥ÑÂI¿ï¥D¦®Äæ¦ì¤¤ªº [ÃöÁp] ³sµ²¡A¨Ï¶l¥ó¨Ì©¼¦¹ÃöÁp©Ê (¥D¦®)±Æ¦C¦Ó²£¥Í¸s»E®ÄªG¡C¦pªGn¦^¨ì¤@¯ë¥¿±`ªº¥D¦®±Æ§Ç¡A½ÐÂI¿ï¥D¦®Äæ¦ì¤¤ªº [¥D¦®] ³sµ²¡C
     </para>
-</entry>--></entry>
+  </entry>
   <entry id="alternative-msg" md5="4978073f76977b6af6b69810e4d22a65" state="uptodate">
     <title>¦h«²Õ¦¨/¥i´À¥N «¬¶l¥ó (Multipart/Alternative Message)</title>
     <para>
-    ¦bºô¸ô¤W¦³¤@¨Ç¶l¥ó¬O¥H¤@ºØ©Ò¿×ªº "multipart/alternative" «¬ºA³Q¶Ç°e¡A
-    ©Ò¿×"¦h«²Õ¦¨"ªº·N«ä¬O«ü³o«Ê¶l¥ó¥]§t¼ÆÓ²Õ¦¨¡A©Ò¦³²Õ¦¨ªº¤º®e¨ä¹ê¬O¤@¼Ëªº¡A
-    ¥u¤£¹L¬O¥H¤£¦Pªº®æ¦¡Àx¦s¡C
-    ¹q¤l¶l¥ó¾\Åª³nÅé¹J¨ì³oºØÃþ«¬¶l¥óªº³B²z¤è¦¡¬O¡A¦bÂsÄý¾¹¤¤¥H¤º¤åª½±µÅã¥Ü
-    ³Ì«á¤@Ó²Õ¦¨¡C¦Ü©ó¶l¥ó¤¤¨ä¾lªº²Õ¦¨¡A«h¨Ã¦CÅã¥Ü¦b "¦¹¶l¥óªº¨ä¥L®æ¦¡" ¤U
-    ¤è¡A¨ÑÓ§OÀËµø©Î¤U¸ü¡C
-    ½ÐÂÔ°O¦b¤ß¡A³o¨Ç²Õ¦¨¦³µÛ "¬Û¦P" ªº¤º®e - ¥u¬O®æ¦¡¤£¦P¦Ó¤w¡C
+    ¦bºô¸ô¤W¦³¤@¨Ç¶l¥ó¬O¥H¤@ºØ©Ò¿×ªº "multipart/alternative" «¬ºA³Q¶Ç°e¡A©Ò¿×"¦h«²Õ¦¨"ªº·N«ä¬O«ü³o«Ê¶l¥ó¥]§t¼ÆÓ²Õ¦¨¡A©Ò¦³²Õ¦¨ªº¤º®e¨ä¹ê¬O¤@¼Ëªº¡A¥u¤£¹L¬O¥H¤£¦Pªº®æ¦¡Àx¦s¡C¹q¤l¶l¥ó¾\Åª³nÅé¹J¨ì³oºØÃþ«¬¶l¥óªº³B²z¤è¦¡¬O¡A¦bÂsÄý¾¹¤¤¥H¤º¤åª½±µÅã¥Ü³Ì«á¤@Ó²Õ¦¨¡C¦Ü©ó¶l¥ó¤¤¨ä¾lªº²Õ¦¨¡A«h¨Ã¦CÅã¥Ü¦b "¦¹¶l¥óªº¨ä¥L®æ¦¡" ¤U¤è¡A¨ÑÓ§OÀËµø©Î¤U¸ü¡C½ÐÂÔ°O¦b¤ß¡A³o¨Ç²Õ¦¨¦³µÛ "¬Û¦P" ªº¤º®e - ¥u¬O®æ¦¡¤£¦P¦Ó¤w¡C
     </para>
   </entry>
-  <entry id="prefs-rename_sentmail_monthly" md5="c2db56352b30ffa27b0c8b876218c411" state="changed">
-    <title>°¾¦n³]©w: ºûÅ@: ©ó¨C¤ëªì§ó§ï±H¥ó³Æ¥÷¹hªº¦WºÙ</title>
-    <para>
-    ¦pªG§A§Æ±æºô¸ô¶l§½¡A©ó¨CÓ¤ëªì§ó§ï§Aªº±H¥ó³Æ¥÷¹h¦WºÙ¡A½Ð¤Ä¿ï¡C
-    ±H¥ó³Æ¥÷¹h°£¤F§ó¦W¬°ÂÂªº±H¥ó³Æ¥÷¹h¥~(§ó¦W«áªº¦WºÙ¥]§t¤ë¤Î¦~¥÷)¡A
-    ¨Ã¦b§ó¦W«á«Ø¥ß¥t¤@Ó·sªºªÅ¥Õ±H¥ó³Æ¥÷¹h¡C
-    </para>
-  <!-- English entry:
-<entry id="prefs-rename_sentmail_monthly">
-    <title>Preferences: Maintenance: Rename Sent-mail Folder Monthly</title>
-    <para>
-    Turn this option on if you would like to rename your sent-mail folder at the beginning of every month. The folder will be renamed (to a name that contains the month and year) and a new sent-mail folder will be created.
-    </para>
-</entry>--><!-- English entry:
-<entry id="prefs-rename_sentmail_monthly">
-    <title>Preferences: Maintenance: Rename Sent-mail Folder Monthly</title>
-    <para>
-    Turn this option on if you would like to rename your sent-mail folder at the beginning of every month. The folder will be renamed (to a name that contains the month and year) and a new sent-mail folder will be created.
-    </para>
-</entry>--><!-- English entry:
-<entry id="prefs-rename_sentmail_monthly">
-    <title>Preferences: Maintenance: Rename Sent-mail Folder Monthly</title>
-    <para>
-    Turn this option on if you would like to rename your sent-mail folder at the beginning of every month. The folder will be renamed (to a name that contains the month and year) and a new sent-mail folder will be created.
-    </para>
-</entry>--></entry>
-  <entry id="prefs-delete_sentmail_monthly" md5="bd65c23ed7a137e2d5f6f17b50df4e8b" state="changed">
-    <title>°¾¦n³]©w: ºûÅ@: ©ó¨C¤ëªì§R°£ÂÂªº±H¥ó³Æ¥÷¹h</title>
-    <para>
-    ¦pªG§A§Æ±æºô¸ô¶l§½¡A©ó¨CÓ¤ëªì§R°£ÂÂªº±H¥ó³Æ¥÷¹h¡A½Ð¤Ä¿ï¡C
-    ¦pªGºô¸ô¶l§½°w¹ï¨Ï¥ÎªÌ³]©wºÏºÐªÅ¶¡°tÃB¡A³oÓ¿ï¶µ±N¦³§U©óÁ×§KºÏºÐ
-    ªÅ¶¡¤£¨¬ªºµo¥Í¡C
-    </para>
-  <!-- English entry:
-<entry id="prefs-delete_sentmail_monthly">
-    <title>Preferences: Maintenance: Delete Sent-mail Folder Monthly</title>
-    <para>
-    Turn this option on if you would like to delete old sent-mail folders at the beginning of every month. This may be useful if you have a quota, for example.
-    </para>
-</entry>--><!-- English entry:
-<entry id="prefs-delete_sentmail_monthly">
-    <title>Preferences: Maintenance: Delete Sent-mail Folder Monthly</title>
+  <entry id="prefs-rename_sentmail_monthly" md5="530fa20e0afbc25ffd40877948832899" state="uptodate">
+    <title>°¾¦n³]©w: ºûÅ@: ©ó¨C¤ëªì§ó§ï±H¥ó³Æ¥÷§Xªº¦WºÙ</title>
     <para>
-    Turn this option on if you would like to delete old sent-mail folders at the beginning of every month. This may be useful if you have a quota, for example.
+    ¦pªG§A§Æ±æºô¸ô¶l§½¡A©ó¨CÓ¤ëªì§ó§ï§Aªº±H¥ó³Æ¥÷§X¦WºÙ¡A½Ð¤Ä¿ï¡C±H¥ó³Æ¥÷§X°£¤F§ó¦W¬°ÂÂªº±H¥ó³Æ¥÷§X¥~(§ó¦W«áªº¦WºÙ¥]§t¤ë¤Î¦~¥÷)¡A¨Ã¦b§ó¦W«á«Ø¥ß¥t¤@Ó·sªºªÅ¥Õ±H¥ó³Æ¥÷§X¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="prefs-delete_sentmail_monthly">
-    <title>Preferences: Maintenance: Delete Sent-mail Folder Monthly</title>
+  </entry>
+  <entry id="prefs-delete_sentmail_monthly" md5="0beed16dfd68e2f25e0c66871fd546df" state="uptodate">
+    <title>°¾¦n³]©w: ºûÅ@: ©ó¨C¤ëªì§R°£ÂÂªº±H¥ó³Æ¥÷§X</title>
     <para>
-    Turn this option on if you would like to delete old sent-mail folders at the beginning of every month. This may be useful if you have a quota, for example.
+    ¦pªG§A§Æ±æºô¸ô¶l§½¡A©ó¨CÓ¤ëªì§R°£ÂÂªº±H¥ó³Æ¥÷§X¡A½Ð¤Ä¿ï¡C¦pªGºô¸ô¶l§½°w¹ï¨Ï¥ÎªÌ³]©wºÏºÐªÅ¶¡°tÃB¡A³oÓ¿ï¶µ±N¦³§U©óÁ×§KºÏºÐªÅ¶¡¤£¨¬ªºµo¥Í¡C
     </para>
-</entry>--></entry>
+  </entry>
   <entry id="prefs-delete_sentmail_monthly_keep" md5="71ed1c2eab48b91a25b5bcd4b14ccea9" state="uptodate">
-    <title>°¾¦n³]©w: ºûÅ@: ¦pªG¨C¤ë§R°£¤@¦¸¡A¦h¤Ö¤ë¥÷ªºÂÂ±H¥ó³Æ¥÷¹h±N³Q«O¦s</title>
+    <title>°¾¦n³]©w: ºûÅ@: ¦pªG¨C¤ë§R°£¤@¦¸¡A¦h¤Ö¤ë¥÷ªºÂÂ±H¥ó³Æ¥÷§X±N³Q«O¦s</title>
     <para>
-    ¦pªG§A¤w¤Ä¿ï "©ó¨C¤ëªì§R°£ÂÂªº±H¥ó³Æ¥÷¹h" ³oÓ¿ï¶µªº¸Ü¡A§A¥i¥H¦b¦¹¿é¤J¤@Ó
-    «O¯d¤ë¥÷¼ÆÈ¡C«O¯d¤ë¥÷¼ÆÈ¤§«e©Ò¦³ÂÂªº±H¥ó³Æ¥÷¹h±N¤@«ß§R°£¡C
+    ¦pªG§A¤w¤Ä¿ï "©ó¨C¤ëªì§R°£ÂÂªº±H¥ó³Æ¥÷§X" ³oÓ¿ï¶µªº¸Ü¡A§A¥i¥H¦b¦¹¿é¤J¤@Ó«O¯d¤ë¥÷¼ÆÈ¡C«O¯d¤ë¥÷¼ÆÈ¤§«e©Ò¦³ÂÂªº±H¥ó³Æ¥÷§X±N¤@«ß§R°£¡C
     </para>
   </entry>
-  <entry id="prefs-delete_attachments_monthly" state="changed" md5="a9033d67e4a859740cc98092e022ae57">
+  <entry id="prefs-delete_attachments_monthly" state="uptodate" md5="373ea02ede6df5fc345caf632e19a75f">
     <title>°¾¦n³]©w: ºûÅ@: ©ó¨C¤ëªì§R°£¤wÂà¦s¬°ºô§}ªºªþ¥ó</title>
     <para>
-    ¦pªG§A§Æ±æºô¸ô¶l§½¡A©ó¨CÓ¤ëªì§R°£¤wÂà¦s¬°ºô§}ªºÂÂªþ¥ó¡A½Ð¤Ä¿ï¡C
-    ¦pªGºô¸ô¶l§½°w¹ï¨Ï¥ÎªÌ³]©wºÏºÐªÅ¶¡°tÃB¡A³oÓ¿ï¶µ±N¦³§U©óÁ×§KºÏºÐªÅ¶¡
-    ¤£¨¬ªºµo¥Í¡C
-    </para>
-  <!-- English entry:
-<entry id="prefs-delete_attachments_monthly">
-    <title>Preferences: Maintenance: Delete Linked Attachments Monthly</title>
-    <para>
-    Turn this option on if you would like to delete old linked attachments at the beginning of every month. This may be useful if you have a quota, for example.
-    </para>
-</entry>--><!-- English entry:
-<entry id="prefs-delete_attachments_monthly">
-    <title>Preferences: Maintenance: Delete Linked Attachments Monthly</title>
-    <para>
-    Turn this option on if you would like to delete old linked attachments at the beginning of every month. This may be useful if you have a quota, for example.
-    </para>
-</entry>--><!-- English entry:
-<entry id="prefs-delete_attachments_monthly">
-    <title>Preferences: Maintenance: Delete Linked Attachments Monthly</title>
-    <para>
-    Turn this option on if you would like to delete old linked attachments at the beginning of every month. This may be useful if you have a quota, for example.
+    ¦pªG§A§Æ±æºô¸ô¶l§½¡A©ó¨CÓ¤ëªì§R°£¤wÂà¦s¬°ºô§}ªºÂÂªþ¥ó¡A½Ð¤Ä¿ï¡C¦pªGºô¸ô¶l§½°w¹ï¨Ï¥ÎªÌ³]©wºÏºÐªÅ¶¡°tÃB¡A³oÓ¿ï¶µ±N¦³§U©óÁ×§KºÏºÐªÅ¶¡¤£¨¬ªºµo¥Í¡C
     </para>
-</entry>--></entry>
+  </entry>
   <entry id="prefs-delete_attachments_monthly_keep" state="uptodate" md5="1b340a60214dffd04aec02cc1127df5d">
     <title>°¾¦n³]©w: ºûÅ@: ¦pªG¨C¤ë§R°£¤@¦¸¡A¦h¤Ö¤ë¥÷¤wÂà¦s¬°ºô§}ªºÂÂªþ¥ó±N³Q«O¦s</title>
     <para>
-    ¦pªG§A¤w¤Ä¿ï "©ó¨C¤ëªì§R°£¤wÂà¦s¬°ºô§}ªºªþ¥ó" ³oÓ¿ï¶µªº¸Ü¡A§A¥i¥H¦b¦¹¿é
-    ¤J¤@Ó«O¯d¤ë¥÷¼ÆÈ¡C«O¯d¤ë¥÷¼ÆÈ¤§«e©Ò¦³Âà¦s¬°ºô§}ªºÂÂªþ¥ó±N¤@«ß§R°£¡C
+    ¦pªG§A¤w¤Ä¿ï "©ó¨C¤ëªì§R°£¤wÂà¦s¬°ºô§}ªºªþ¥ó" ³oÓ¿ï¶µªº¸Ü¡A§A¥i¥H¦b¦¹¿é¤J¤@Ó«O¯d¤ë¥÷¼ÆÈ¡C«O¯d¤ë¥÷¼ÆÈ¤§«e©Ò¦³Âà¦s¬°ºô§}ªºÂÂªþ¥ó±N¤@«ß§R°£¡C
     </para>
   </entry>
   <entry id="prefs-purge_trash" md5="dc71871146be3e46ade0087a8cf18273" state="uptodate">
@@ -1607,8 +567,7 @@
   <entry id="prefs-purge_trash_keep" md5="3cb5a2b5b80b7ac1179ae005f983970e" state="uptodate">
     <title>°¾¦n³]©w: ºûÅ@: ¨C¦¸¾ã²z©U§£½c®É¡A²M°£¦h¤Ö¤Ñ¼Æ¥H«eªº¶l¥ó</title>
     <para>
-    ¦pªG§A¤w¤Ä¿ï "²M°£©U§£½c¤¤ªºÂÂ¶l¥ó" ³oÓ¿ï¶µªº¸Ü¡A§A§Æ±æ²M°£¦h¤Ö¤Ñ¼Æ
-    ¥H«eªº¶l¥ó¡H
+    ¦pªG§A¤w¤Ä¿ï "²M°£©U§£½c¤¤ªºÂÂ¶l¥ó" ³oÓ¿ï¶µªº¸Ü¡A§A§Æ±æ²M°£¦h¤Ö¤Ñ¼Æ¥H«eªº¶l¥ó¡H
     </para>
   </entry>
   <entry id="prefs-attrib_text" state="uptodate" md5="721a09d7ca028c97e3bd2b38c597fff7">
@@ -1617,8 +576,7 @@
      §A¥i¥H¦b¦¹©w¸q¦^ÂÐ¤å¥óªº¤Þz¦C¡C
      </para>
      <para>
-     §A¥i¥H¬°§A©Òn¦^ÂÐªº«H¥ó´¡¤J¤@¨ÇÅÜ¼Æ¡C ÅÜ¼Æªº«¬ºA¬O¥H '%'«á±¦A¥[¤W
-     ¤@Ó¦r¤¸©Ò²Õ¦¨¡C ¥H¤U¦C¥X¥i¨Ñ·f°t¨Ï¥ÎªºÅÜ¼Æ:
+     §A¥i¥H¬°§A©Òn¦^ÂÐªº«H¥ó´¡¤J¤@¨ÇÅÜ¼Æ¡C ÅÜ¼Æªº«¬ºA¬O¥H '%'«á±¦A¥[¤W¤@Ó¦r¤¸©Ò²Õ¦¨¡C ¥H¤U¦C¥X¥i¨Ñ·f°t¨Ï¥ÎªºÅÜ¼Æ:
      </para>
 
      <para> %f : ±H¥óªÌªº¦WºÙ¤Î¹q¤l¶l¥ó¦í§}</para>
@@ -1634,88 +592,96 @@
      <para> %% : '%' ¦r¤¸</para>
 
   </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="uptodate" md5="89e92c4d68224b2345b59959878a7174">
     <title>°¾¦n³]©w: ½Ð¦¬¥ó¤H¶Ç°eÅª¨ú¦^±ø</title>
     <para>
-    "½Ð¦¬¥ó¤H¶Ç°eÅª¨ú¦^±ø" ¥Î¨Ón¨D¦¬¥ó¹ï¶H¡A¶}±Ò«H¥ó®É
-    ¶¶«K¶Ç°e¦^±øµ¹±H«H¤H¡Aªí©ú¨Ó«H¤w¦¬¨ì¡C½Ðª`·N¨Ã¤£¬O©Ò¦³ªº¶l¥ó¾\Åª³n
-    Åé³£¤ä´©³o¶µ¥\¯à¡C
+    "½Ð¦¬¥ó¤H¶Ç°eÅª¨ú¦^±ø" ¥Î¨Ón¨D¦¬¥ó¹ï¶H¡A¶}±Ò«H¥ó®É¶¶«K¶Ç°e¦^±øµ¹±H«H¤H¡Aªí©ú¨Ó«H¤w¦¬¨ì¡C½Ðª`·N¨Ã¤£¬O©Ò¦³ªº¶l¥ó¾\Åª³nÅé³£¤ä´©³o¶µ¥\¯à¡C
     </para>
   </entry>
-  <entry id="prefs-disposition_send_mdn" state="new">
-    <title>Preferences: Send MDN</title>
+  <entry id="prefs-disposition_send_mdn" state="uptodate" md5="1fe04e5dc3de68d172da284895973ea9">
+    <title>°¾¦n³]©w: ¶Ç°e¦^±ø</title>
     <para>
-    "Send a MDN" sends a Message Disposition Notification (also known as a read receipt) when you view a message in which the user has requested that they receive notification that you have read the message. In most cases, this will happen automatically without prompting you. In certain isolated cases, you may have to manually decide to send the notification by clicking on a link.
+    "¶Ç°e¦^±ø" ·í±H¥ó¤H©ó«H¥ó¤¤n¨D¦¬¥ó¹ï¶H¡A¶}±Ò«H¥ó®É¶¶«K¶Ç°e¦^±øµ¹±H¥ó¤Hªí¥Ü«H¥ó¤w¨ì¡C¤@¯ë¦Ó¨¥¦^±ø³qª¾·|À³±H¥ó¤Hªºn¨D¦Û°Ê¶i¦æ¶Ç°e¡C¤£¹L¦bºô¸ô¶l§½ªºÀô¹Ò¤¤§A¥²¶·¦Û¦æÂI¿ï³sµ²¥H¶Ç°e¦^±øªº±H¥ó¤H¡C
     </para>
-</entry>
+  </entry>
   <entry id="prefs-disposition_request_delivery" state="uptodate" md5="26598e29af05a07de5e13644669be712">
     <title>°¾¦n³]©w: ½Ð¦¬¥ó¦øªA¾¹¶Ç»¼°e¹F½T»{</title>
     <para>
-    "½Ð¦¬¥ó¦øªA¾¹¶Ç»¼°e¹F½T»{" n¨D¦¬¥ó¹ï¶H©ÒÄÝªº¶l¥ó
-    ¦øªA¾¹¤@¥¹¦¬¨ì«H¥ó«á¥ß§Y¶Ç°e½T»{°T®§µ¹±H«H¤H¡C½Ðª`·N¡A¶l¥ó±H¹F¹ï¤èªº¦øªA¾¹
-    ¨Ã¤£ªí¥Ü¦¬¥ó¹ï¶H¤w¸g¬Ý¹L§Aªº«H¥ó¡C¶È¯à¸ÑÅª¬°¡G«H¬O±H¨ì¤F¡A¦ý¦³¨S¦³¤H¥h¬Ý«h¤£
-    ±o¦Óª¾¡C¨Ã«D©Ò¦³ªº¶l¥ó¦øªA¾¹³£¦³¤ä´©³o¶µ¥\¯à¡C
+    "½Ð¦¬¥ó¦øªA¾¹¶Ç»¼°e¹F½T»{" n¨D¦¬¥ó¹ï¶H©ÒÄÝªº¶l¥ó¦øªA¾¹¤@¥¹¦¬¨ì«H¥ó«á¥ß§Y¶Ç°e½T»{°T®§µ¹±H«H¤H¡C½Ðª`·N¡A¶l¥ó±H¹F¹ï¤èªº¦øªA¾¹¨Ã¤£ªí¥Ü¦¬¥ó¹ï¶H¤w¸g¬Ý¹L§Aªº«H¥ó¡C¶È¯à¸ÑÅª¬°¡G«H¬O±H¨ì¤F¡A¦ý¦³¨S¦³¤H¥h¬Ý«h¤£±o¦Óª¾¡C¨Ã«D©Ò¦³ªº¶l¥ó¦øªA¾¹³£¦³¤ä´©³o¶µ¥\¯à¡C
     </para>
   </entry>
+  <entry id="prefs-delete_spam_after_report" state="uptodate" md5="cefa8b52e09b0ada90e0889a3959efea">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="uptodate" md5="28e1cf08e328345a8e7274c853492d4f">
     <title>°¾¦n³]©w: ÁôÂÃ HTML ¶l¥ó¤¤ªº¹Ï¤ù</title>
     <para>
     HTML ¶l¥ó¤¤¡A©Ò¦³¯àª½±µÅã¥Üªº¹Ï¤ù¡A¬O§_À³¸ÓÁôÂÃ¨Ã¥H¬õ¦â¼Ð¥Ü¥N´À ¡H
     </para>
-    <para>¦³¨Ç©U§£¶l¥ó¦b¶}±Òªº¦P®É¡AÀH§Y±Ò°Ê»P¹Ï¤ù¬Û³sµ²ªº¡u°lÂÜ¸Ë¸m¡v¡A½Ð¥B
-    ª½±µ§i¶D©U§£¶l¥ó±H°eªÌ¡G³o«Ê¼s§i«H¤w³Q¥´¶}¦Ó¥B³oÓ«H½c¬O¦³®Äªº«H½c¡A¥¼¨Ó§A
-    ªº«H½cÂÂ·|·½·½¤£Â_ªº¦¬¨ì©U§£«H¡C
-    </para>
-    <para>ÁôÂÃ¹Ï¤ù¥i¥H«OÅ@§A¥u¬Ý¨ì§A·Qn¬Ýªº¹Ï¤ù¡A¨Ã¥B¤]¦P®Éªý¾×¤F¡u°lÂÜ¸Ë¸m¡v
-    ªº¹B§@¡C¥un§A½T©w³o«Ê«H¤£¬O¼s§i«H¡AÂI¿ï¡uÅã¥Ü¹Ï¤ù¡v¡A´N¥i¥H¬Ý¨ì³o«Ê«H¸Ì
-    ±ªº¹Ï¤ù¤F¡C
+    <para>¦³¨Ç©U§£¶l¥ó¦b¶}±Òªº¦P®É¡AÀH§Y±Ò°Ê»P¹Ï¤ù¬Û³sµ²ªº¡u°lÂÜ¸Ë¸m¡v¡A½Ð¥Bª½±µ§i¶D©U§£¶l¥ó±H°eªÌ¡G³o«Ê¼s§i«H¤w³Q¥´¶}¦Ó¥B³oÓ«H½c¬O¦³®Äªº«H½c¡A¥¼¨Ó§Aªº«H½cÂÂ·|·½·½¤£Â_ªº¦¬¨ì©U§£«H¡C
+    </para>
+    <para>ÁôÂÃ¹Ï¤ù¥i¥H«OÅ@§A¥u¬Ý¨ì§A·Qn¬Ýªº¹Ï¤ù¡A¨Ã¥B¤]¦P®Éªý¾×¤F¡u°lÂÜ¸Ë¸m¡vªº¹B§@¡C¥un§A½T©w³o«Ê«H¤£¬O¼s§i«H¡AÂI¿ï¡uÅã¥Ü¹Ï¤ù¡v¡A´N¥i¥H¬Ý¨ì³o«Ê«H¸Ì±ªº¹Ï¤ù¤F¡C
     </para>
   </entry>
   <entry id="prefs-html_image_addrbook" state="uptodate" md5="759fa3df24e0a3cd89f320102252f91a">
     <title>°¾¦n³]©w: ¦Û°ÊÅã¥Ü HTML ¶l¥ó¤¤ªº©Ò¦³¹Ï¤ù</title>
     <para>
-    ¦pªG±Ò¥Î"ÁôÂÃ HTML ¶l¥ó¤¤ªº¹Ï¤ù"³o¶µ¥\¯à¡A¦Ó¥B±H¥ó¤H¥X²{¦b§Úªº³q°T¿ý¤¤¡A
-    ¬O§_¦Û°ÊÅã¥Ü¸Ó«H¥ó¤¤ªº¹Ï¤ù¡H 
+    ¦pªG±Ò¥Î"ÁôÂÃ HTML ¶l¥ó¤¤ªº¹Ï¤ù"³o¶µ¥\¯à¡A¦Ó¥B±H¥ó¤H¥X²{¦b§Úªº³q°T¿ý¤¤¡A¬O§_¦Û°ÊÅã¥Ü¸Ó«H¥ó¤¤ªº¹Ï¤ù¡H 
     </para>
   </entry>
-  <entry id="prefs-mailbox_start" state="changed" md5="dc8c87959cc7893669bf85c6c6834565">
+  <entry id="prefs-mailbox_start" state="uptodate" md5="3d1196f265d8b7cc465ebf21512acc05">
     <title>°¾¦n³]©w: ¶l½c°_©l¶±</title>
     <para>
-    ·í¤@Ó¶l½c²Ä¤@¦¸³Q¦s¨ú®É¡A¨M©w¨äÀËµøµe±n¥ýÅã¥Üþ¤@Ó¶±¡C³Æµù¡G¥¼¬Ý¹L
-    «H¥ó¿ï¶µ¦bÃöÁp±Æ§Ç¤¤µLªk§@¥Î¡A¨Ã¥B±N¥H«H½cªº"³Ì«á¤@¶¥N´À"¡C
+    ·í¤@Ó¶l½c²Ä¤@¦¸³Q¦s¨ú®É¡A¨M©w¨äÀËµøµe±n¥ýÅã¥Üþ¤@Ó¶±¡C³Æµù¡G"¥¼¬Ý¹L"«H¥ó¿ï¶µ¦b"ÃöÁp"±Æ§Ç¤¤µLªk§@¥Î¡A¨Ã¥B±N¥H«H½cªº³Ì«á¤@¶¥N´À¡C
     </para>
-  <!-- English entry:
-<entry id="prefs-mailbox_start">
-    <title>Preferences: Mailbox Start Page</title>
+  </entry>
+  <entry id="prefs-save_attachments" state="uptodate" md5="35b46334cdcc7fa416b9f9fca5874e80">
+    <title>°¾¦n³]©w: ªþ¥óÀH±H¥ó¤@°_³Æ¥÷</title>
     <para>
-    Determines which page in the mailbox view will be displayed when you access a mailbox for the first time. Note that the "unseen" message options do not work with the "Thread" sorting option - instead, you will be sent to the last page.
+    ¦pªGÀx¦s±H¥ó³Æ¥÷®É¡A¨M©w¬O§_¤]n¤@¨ÖÀx¦sªþ¥[ÀÉ®×¡C¤U¦C¿ï¶µ¥i¨Ñ°Ñ¦Ò¡G
     </para>
-</entry>--><!-- English entry:
-<entry id="prefs-mailbox_start">
-    <title>Preferences: Mailbox Start Page</title>
+
     <para>
-    Determines which page in the mailbox view will be displayed when you access a mailbox for the first time. Note that the "unseen" message options do not work with the "Thread" sorting option - instead, you will be sent to the last page.
+    * "¥Ã»·Àx¦sªþ¥[ÀÉ®×" - ¦b¶l¥ó½s¼gµe±¤¤¥Ã»·¤£n´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F¦Ó¥Bªþ¥[ÀÉ®×¥Ã»·ÀHµÛ«H¥ó¤@°_³Æ¤À¡C
     </para>
-</entry>--><!-- English entry:
-<entry id="prefs-mailbox_start">
-    <title>Preferences: Mailbox Start Page</title>
     <para>
-    Determines which page in the mailbox view will be displayed when you access a mailbox for the first time. Note that the "unseen" message options do not work with the "Thread" sorting option - instead, you will be sent to the last page.
+    * "´£¥Ü§Ú¡A¨C¤@«Ê¥]§tªþ¥[ÀÉ®×ªº«H¥ó±H¥X«á; ¹w³]¬°n" - ¦b¶l¥ó½s¼gµe±¤¤¥Ã»·´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F¹w³]¬°Àx¦s¡C
     </para>
-</entry>--></entry>
-  <entry id="prefs-save_attachments" state="uptodate" md5="35b46334cdcc7fa416b9f9fca5874e80">
-    <title>°¾¦n³]©w: ªþ¥óÀH±H¥ó¤@°_³Æ¥÷</title>
     <para>
-    ¦pªGÀx¦s±H¥ó³Æ¥÷®É¡A¨M©w¬O§_¤]n¤@¨ÖÀx¦sªþ¥[ÀÉ®×¡C¤U¦C¿ï¶µ¥i¨Ñ°Ñ¦Ò¡G
+    * "´£¥Ü§Ú¡A¨C¤@«Ê¥]§tªþ¥[ÀÉ®×ªº«H¥ó±H¥X«á; ¹w³]¬°¤£n" - ¦b¶l¥ó½s¼gµe±¤¤¥Ã»·´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F¹w³]¬°¤£Àx¦s¡C
+    </para>
+    <para>
+    * "¥Ã¤£Àx¦sªþ¥[ÀÉ®×" - ¦b¶l¥ó½s¼gµe±¤¤¥Ã»·¤£n´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F¦Ó¥Bªþ¥[ÀÉ®×¥Ã»·¤£·|ÀHµÛ«H¥ó¤@°_³Æ¤À¡C
     </para>
-
-    <para>* "¥Ã»·Àx¦sªþ¥[ÀÉ®×" - ¦b¶l¥ó½s¼gµe±¤¤¥Ã»·¤£n´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F
-    ¦Ó¥Bªþ¥[ÀÉ®×¥Ã»·ÀHµÛ«H¥ó¤@°_³Æ¤À¡C</para>
-    <para>* "´£¥Ü§Ú¡A¨C¤@«Ê¥]§tªþ¥[ÀÉ®×ªº«H¥ó±H¥X«á; ¹w³]¬°n" - ¦b¶l¥ó½s¼gµe
-     ±¤¤¥Ã»·´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F¹w³]¬°Àx¦s¡C</para>
-    <para>* "´£¥Ü§Ú¡A¨C¤@«Ê¥]§tªþ¥[ÀÉ®×ªº«H¥ó±H¥X«á; ¹w³]¬°¤£n" - ¦b¶l¥ó½s¼gµe
-     ±¤¤¥Ã»·´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F¹w³]¬°¤£Àx¦s¡C</para>
-    <para>* "¥Ã¤£Àx¦sªþ¥[ÀÉ®×" - ¦b¶l¥ó½s¼gµe±¤¤¥Ã»·¤£n´£¥ÜÀx¦sªþ¥[ÀÉ®×¡F
-     ¦Ó¥Bªþ¥[ÀÉ®×¥Ã»·¤£·|ÀHµÛ«H¥ó¤@°_³Æ¤À¡C</para>
   </entry>
+  <entry id="virtual_inbox" state="uptodate" md5="4d1969e640f6e0bed4f8958f018c2d07">
+    <title>µêÀÀ«H¥ó§X: µêÀÀ¦¬¥ó§X</title>
+    <para>
+    µêÀÀ¦¬¥ó§X·|¦Û°Ê·j´M¥Ø¼Ð«H¥ó§X¤¤ªº©Ò¦³·s¶l¥ó¡A¨Ã±N©Ò¦³¸ó«H¥ó§X·j´Mªºµ²ªGÀx¦s¬°³æ¤@«H¥ó§X¡C¦³§O©ó¦¬¥ó§X¡AµêÀÀ¦¬¥ó§X©Ò¦s©ñªº¶È¥u¬O·j´Mªºµ²ªG¦Ó¤£¬O«H¥ó¡C©Ò¿×¥Ø¼Ð«H¥ó§X«üªº¬O:¥H"«H¥ó§X-&gt;¿ï¾Ü§@¥Î¤è¦¡-&gt;ÀË¬d·s¶l¥ó"©Ò¤Ä¿ïªº«H¥ó§X¡C
+    </para>
+  </entry>
+  <entry id="virtual_trash" state="uptodate" md5="11f91811b9b2af90fe68740f6a86cef6">
+    <title>µêÀÀ«H¥ó§X: µêÀÀ©U§£½c</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/templates/filters/prefs.inc
+++ mod/templates/filters/prefs.inc
@@ -4,14 +4,11 @@
 <input type="hidden" name="group" value="<?php echo $group ?>" />
 <input type="hidden" name="app" value="<?php echo $app ?>" />
 
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-<tr><td class="header" align="left"><b><?php echo _("Filter Settings") ?></b></td>
-<?php Prefs_UI::generateNavigationCell('filters') ?>
-</tr>
-</table>
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
-<tr><td class="item"><table border="0"><tr valign="top"><td class="item">
-
+<div class="header">
+  <?php Prefs_UI::generateNavigationCell('filters') ?>
+  <?php echo _("Filter Settings") ?>
+</div>
+<p class="item">
 <?php if (!empty($filters_link)): ?>
 <?php echo Horde::img('filters.png', _("Edit Filters")) . '&nbsp;&nbsp;' . Horde::link(Horde::url($filters_link), _("Edit your filter rules")) . _("Edit your filter rules") ?></a>&nbsp;
 <?php echo Help::link('imp', 'filter-edit-rules') ?><br />
@@ -26,18 +23,14 @@
 <?php echo Horde::img('filters.png', _("Edit Whitelist")) . '&nbsp;&nbsp;' . Horde::link(Horde::url($whitelist_link), _("Edit your whitelist")) . _("Edit your whitelist") ?></a>&nbsp;
 <?php echo Help::link('imp', 'filter-edit-whitelist') ?><br />
 <?php endif; ?>
-
-</td></tr></table></td></tr></table>
+</p>
 
 <?php if (!$login_locked || !$display_locked || !$menuitem_locked): ?>
 <br />
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0">
-<tr><td class="header" align="left"><b><?php echo _("Filter Options") ?></b></td>
-</tr>
-</table>
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="3">
-<tr><td class="item"><table border="0"><tr valign="top"><td class="item">
-
+<h1 class="header">
+  <?php echo _("Filter Options") ?>
+</h1>
+<p class="item" style="padding:1px;">
 <?php if (!$login_locked): ?>
 <input type="checkbox" id="filter_login" name="filter_login" <?php echo ($prefs->getValue('filter_on_login')) ? "checked=\"checked\"" : "" ?> />&nbsp;
 <?php echo Horde::label('filter_login', _("Apply filter rules upon logging on?")) ?>&nbsp;
@@ -61,14 +54,10 @@
 <?php echo Horde::label('filter_menuitem', _("Show the filter icon on the menubar?")) ?>&nbsp;
 <?php echo Help::link('imp', 'filter-menuitem') ?><br />
 <?php endif; ?>
+</p>
 
-</td></tr></table></td></tr></table>
-
-<br />
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap">
 <input type="submit" name="save" class="button" onclick="document.filterprefs.actionID.value='filter_prefs_update';return true;" value="<?php echo _("Save Options") ?>" />&nbsp;&nbsp;
 <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
-</td></tr></table>
 <?php endif; ?>
 
 </form>


--- orig/templates/fetchmail/account_select.inc
+++ mod/templates/fetchmail/account_select.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 var loading;
 function accountSubmit(isnew)
@@ -17,17 +17,16 @@
 <form name="fm_switch" action="<?php echo $fetch_url ?>">
 <?php Util::pformInput() ?>
 <input type="hidden" name="actionID" value="fetchmail_prefs_edit" />
-<select name="account" class="fixed" onchange="javascript:accountSubmit()">
+<select name="account" onchange="javascript:accountSubmit()">
   <option value=""><?php echo _("Select an account") ?></option>
-<?php for ($i = 0; $i < count($accounts); $i++): ?>
-  <option value="<?php echo $i ?>"><?php echo $accounts[$i] ?></option>
+<?php for ($i = 0, $iMax = count($accounts); $i < $iMax; $i++): ?>
+  <option value="<?php echo $i ?>"><?php echo htmlspecialchars($accounts[$i]) ?></option>
 <?php endfor; ?>
-</select> or
+</select> <?php echo _("or") ?>
 <input type="button" class="button" onclick="document.fm_switch.actionID.value='fetchmail_create';accountSubmit(true);return true;" value="<?php echo _("Create a New Account") ?>" />
 </form>
 </td></tr></table></td></tr></table>
 
-<br />
-<table border="0" align="center" width="100%" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap">
-<input type="button" name="back" class="button" onclick="document.location.href='<?php echo $prefs_url ?>'" value="<?php echo _("Return to Fetch Mail") ?>" />
-</td></tr></table>
+<p>
+ <input type="button" name="back" class="button" onclick="document.location.href='<?php echo $prefs_url ?>'" value="<?php echo _("Return to Fetch Mail") ?>" />
+</p>


--- orig/lib/Crypt/SMIME.php
+++ mod/lib/Crypt/SMIME.php
@@ -11,9 +11,9 @@
  * The IMP_SMIME:: class contains all functions related to handling
  * S/MIME messages within IMP.
  *
- * $Horde: imp/lib/Crypt/SMIME.php,v 1.45.2.9 2005/09/22 04:21:35 slusarz Exp $
+ * $Horde: imp/lib/Crypt/SMIME.php,v 1.45.2.13 2006/02/21 00:21:21 slusarz Exp $
  *
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -353,11 +353,11 @@
             $oid = $cacheSess->storeOid($mime_part);
         }
 
-        return $this->getJSOpenWinCode('save_attachment_public_key', false, array('from=' . $from, 'cert=' . $oid));
+        return $this->getJSOpenWinCode('save_attachment_public_key', false, array('from' => $from, 'cert' => $oid));
     }
 
     /**
-     * Print out the link for the open_smime_win javascript function.
+     * Print out the link for the javascript SMIME popup.
      *
      * @param integer $actionid  The actionID to perform.
      * @param mixed $reload      If true, reload base window on close. If text,
@@ -370,11 +370,11 @@
      */
     function getJSOpenWinCode($actionid, $reload = true, $params = null)
     {
-        $popup_url = Horde::applicationUrl('smime.php', true);
+        $popup_url = Horde::applicationUrl('smime.php');
         $popup_url = Util::addParameter($popup_url, 'actionID', $actionid, false);
         if (!empty($reload)) {
             if (is_bool($reload)) {
-                $popup_url = Util::addParameter($popup_url, 'reload', Horde::selfUrl(true), false);
+                $popup_url = Util::addParameter($popup_url, 'reload', Util::removeParameter(Horde::selfUrl(true), array('actionID')), false);
             } else {
                 require_once 'Horde/SessionObjects.php';
                 $cacheSess = &Horde_SessionObjects::singleton();
@@ -383,12 +383,10 @@
         }
 
         if (is_array($params)) {
-            foreach ($params as $val) {
-                $popup_url = Util::addParameter($popup_url, $val, null, false);
-            }
+            $popup_url = Util::addParameter($popup_url, $params, null, false);
         }
 
-        return "open_smime_win('" . $popup_url . "');";
+        return "popup_imp('" . $popup_url . "',450,200);";
     }
 
     /**


--- orig/templates/folders/import.inc
+++ mod/templates/folders/import.inc
@@ -13,9 +13,9 @@
   <tr class="item">
     <td>
       <br />&nbsp;&nbsp;
-      <?php echo sprintf(_("Import mbox file %s into folder %s."), 
-                         '&nbsp;&nbsp;<input name="mbox_upload" type="file" size="30" class="fixed" />&nbsp;&nbsp;',
-                         '<b>' . $folder_list[0] . '</b>') ?>
+      <?php printf(_("Import mbox file %s into folder %s."),
+                   '&nbsp;&nbsp;<input name="mbox_upload" type="file" size="30" class="fixed" />&nbsp;&nbsp;',
+                   '<strong>' . String::convertCharset($folder_list[0], 'UTF7-IMAP') . '</strong>') ?>
       &nbsp;&nbsp;
       <input type="button" class="button" value="<?php echo _("Import") ?>" onclick="submitAction('import_mbox')"/>
       <input type="button" class="button" value="<?php echo _("Cancel") ?>" onclick="submitAction(0)"/>


--- orig/po/zh_CN.po
+++ mod/po/zh_CN.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
-"POT-Creation-Date: 2002-05-29 10:19+0800\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2001-6-12 18:39+0800\n"
 "Last-Translator: WangHengWen <whw at my169.com>\n"
 "Language-Team: Chinese <whw at my169.com>\n"
@@ -13,2014 +14,5204 @@
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "   ÊÕ¼þÈË£º"
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "   ÊÕ¼þÈË£º"
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "   ÈÕÆÚ£º "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "  ·¢¼þÈË£º"
 
-msgid " - $nm new message"
-msgstr " - $nm ÐÂÓÊ¼þ"
-
-msgid " - $nm new messages"
-msgstr " - $nm ÐÂÓÊ¼þ"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "    Ö÷Ìâ£º"
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " ÔÚ"
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr ""
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "µÚ %d ·â¹² %d ·â"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»É¾³ý¡£"
+
+#: lib/Spam.php:178
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:158
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr ""
+
+#: lib/Spam.php:170
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:150
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr ""
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "´Ó %d µ½ %d ¹² %d ·â"
 
-#, c-format
-msgid "%s Standard"
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
 msgstr ""
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "ÎÄ¼þ¼Ð%sÒÑ¾´æÔÚ£¬ÄãµÄÎÄ¼þ¼Ð%sÃ»ÓÐ±»¸ÄÃû."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr ""
 
-#, c-format
-msgid "%s messages were fetched..."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
 msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦¸ÄÃûÎª\"%s\"¡£"
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr ""
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr " Ó¦ÓÃÕâÐ©¸Ä±ä²¢ÒÆ¶¯µ½ÏÂÒ»ÆÁ"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "·ÅÆúËùÓÐ¸ü¸Ä²¢·µ»Øµ½Ð´ÓÊ¼þ"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
 
+#: spelling.php:277
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* µã»÷È·¶¨°´Å¥Ôö¼Ó *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* ÇëÑ¡ÔñµØÖ· *"
 
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»É¾³ý¡£"
+
+#: lib/Spam.php:180
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:160
+msgid "1 message has been reported as not spam."
+msgstr ""
+
+#: lib/Spam.php:172
+msgid "1 message has been reported as spam to your system administrator."
+msgstr ""
+
+#: lib/Spam.php:152
+msgid "1 message has been reported as spam."
+msgstr ""
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "ÌØÊâ×Ö·û"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "ÌØÊâ×Ö·û"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "ÌØÊâ×Ö·û"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "ÌØÊâ×Ö·û"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
 msgstr ""
-"<p><i>¸ÃÓÊ¼þ²ÉÓÃÁËÆäËûµÄ×Ö·û±àÂë£¬Èç¹ûÏÔÊ¾²»ÕýÈ·£¬%sµã»÷ÕâÀï</a>ÔÚÐÂ´°¿ÚÖÐ´ò"
-"¿ª.</i></p>\n"
 
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "ÕÊºÅ£º"
 
-msgid "Action"
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr " ¶¯×÷"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr " Ôö¼Óµ½µØÖ·±¾ (%s) "
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr " Ôö¼Ó¸½¼þ"
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "¸öÈËÐÅÏ¢"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "µØÖ·±¾"
 
-msgid "Addressbooks"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
 msgstr "µØÖ·±¾"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "ËùÓÐÔÚ¸ÃÓÊÏäÖÐµÄÓÊ¼þ¶¼½«¶ªÊ§£¬ÄãÈ·ÐÅÒªÕâÃ´×öÂð£¿"
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "ËùÓÐ"
 
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "ËùÓÐÔÚÏÂÁÐÓÊÏäÖÐµÄÓÊ¼þ½«±»ÏÂÔØµ½Ò»¸öMBOXÎÄ¼þÖÐ£º"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr "ËùÓÐÔÚ\"%s\"ÎÄ¼þ¼ÐÖÐµÄÔçÓÚ%sÌìÇ°µÄÓÊ¼þ½«±»ÓÀ¾ÃÐÔÉ¾³ý¡£"
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "ËùÓÐ´óÓÚ%s¸öÔÂµÄ·¢¼þÏä½«±»É¾³ý¡£"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "ËùÓÐ´óÓÚ%s¸öÔÂµÄ·¢¼þÏä½«±»É¾³ý¡£"
 
-msgid "All"
-msgstr "ËùÓÐ"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦¸ÄÃûÎª\"%s\"¡£"
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr " Ôö¼Ó¸½¼þ"
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
+
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Ôö¼ÓÐÂÌõÄ¿Ê±·¢ÉúÎ´Öª´íÎó¡£"
 
-msgid "Answered messages"
-msgstr "ÒÑ»Ø¸´ÓÊ¼þ"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "Ôö¼ÓÐÂÌõÄ¿Ê±·¢ÉúÎ´Öª´íÎó¡£"
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "ÒÑ»Ø¸´"
 
-msgid "Apply All Rules"
-msgstr "Ó¦ÓÃËùÓÐ¹æÔò"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "ÒÑ»Ø¸´ÓÊ¼þ"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Ó¦ÓÃ¹ýÂËÆ÷"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Ó¦ÓÃ¹ýÂËÆ÷"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "µ±µÇÂ¼Ê±Ó¦ÓÃ¹ýÂË¹æÔò¡£"
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "µ±Ë¢ÐÂÓÊÏäÊ±Ó¦ÓÃ¹ýÂË¹æÔò¡£"
 
-msgid "April"
-msgstr "ËÄÔÂ"
-
-msgid "Are you SURE you want to continue?"
-msgstr "ÄãÈ·¶¨Òª¼ÌÐøÂð£¿"
-
-msgid "Are you completely sure you wish to continue?"
-msgstr "Äã°Ù·Ö°ÙµÄÈ·¶¨ÄãÒª¼ÌÐøÕâÃ´×öÂð£¿"
-
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "ÄãÈ·ÐÅÄãÒªÉ¾³ý¸Ã¹«¹²ÃÜÔ¿Âð£¿"
 
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "ÄãÈ·ÐÅÄãÒªÉ¾³ýÃÜÔ¿¶Ô£¿£¨²»ÍÆ¼öµÄàÞ£¡£©"
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "ÄãÈ·ÐÅÄãÒªÕâÃ´×ö£¿"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
+
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "ÄãÈ·ÐÅÄãÒªÓÀ¾ÃÐÔÉ¾³ýÕâÐ©ÏûÏ¢Âð£¿"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "µ½´ïÊ±¼ä"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "ÉýÐò"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
+msgid "Attach"
+msgstr "Õ³Ìù"
+
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "¸½¼þ"
+
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "¸½¼ÓÒ»¸öÄãµÄPGP¹«¹²ÃÜÔ¿µ½ÄãµÄÓÊ¼þÖÐ£¿"
 
-msgid "Attach"
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
 msgstr "Õ³Ìù"
 
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "¸½¼þ"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "¸½¼þ"
 
-msgid "August"
-msgstr "°ËÔÂ"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "¸½¼þ"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr " ¶¯×÷"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "¿ÉÓÃµÄµØÖ·±¾£º"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "·µ»Øµ½ %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "·µ»Øµ½ %s"
 
-msgid "Barbie"
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
 msgstr ""
 
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "°µËÍ"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "¼ÓÈëºÚÃûµ¥"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "ÄÚÈÝ£º"
 
-msgid "Both Header Listing and Body of Message"
-msgstr ""
-
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "È«²¿"
 
-msgid "Brown"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
 msgstr ""
 
-msgid "Camouflage"
+#: templates/search/fields.inc:36
+msgid "Calendar"
 msgstr ""
 
-msgid "Can't connect to the Mail Server"
+#: lib/Fetchmail/imap.php:201
+#, fuzzy
+msgid "Can not connect to the remote mail server."
 msgstr "Áª½Óµ½ÓÊ¼þ·þÎñÆ÷Ê§°Ü"
 
-msgid "Cancel Message"
-msgstr "È¡ÏûÏûÏ¢"
+#: lib/Fetchmail/imap.php:199
+#, fuzzy
+msgid "Can not connect to the remote mail server: "
+msgstr "Áª½Óµ½ÓÊ¼þ·þÎñÆ÷Ê§°Ü"
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "È¡Ïû"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "È¡ÏûÏûÏ¢"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "³ËÍ"
 
-msgid "Cc:"
-msgstr "³ËÍ£º"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "¸öÈËµÄ"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "¸ü¸Ä"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "¸ü¸ÄËùÓÐ"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "´´½¨ÎÄ¼þ¼Ð"
+
+#: config/prefs.php.dist:112
+#, fuzzy
 msgid ""
-"Change display options such as the color scheme, how many messages you see "
-"on each page and how messages are sorted."
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
 msgstr "¸ü¸ÄÏÔÊ¾Ñ¡ÏîÈçÅäÉ«·½°¸£¬Ã¿Ò³ÏÔÊ¾ÓÊ¼þÊý¼°ÓÊ¼þÅÅÐò·½Ê½¡£"
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "¸ü¸ÄÓÊ¼þ·þÎñÆ÷Éè¶¨¡£"
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr "¸ü¸ÄÄãµÄÃû×Ö£¬ÓÊ¼þµØÖ·ºÍÇ©Ãû"
 
-msgid "Change"
-msgstr "¸ü¸Ä"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "¼ì²éÐÂÓÊ¼þ"
 
-msgid "Checkbox"
-msgstr "¼ì²é¿ò"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
 
-msgid "Cherry"
+#: config/prefs.php.dist:463
+msgid "Check spelling before sending a message?"
 msgstr ""
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Ñ¡Ôñ²Ù×÷£º"
 
-msgid "Choose the addressbook to use when adding addresses."
-msgstr "Ñ¡ÔñÔö¼ÓµØÖ·Ê±ËùÊ¹ÓÃµÄµØÖ·±¾"
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "¸ü¸ÄÓÊ¼þ·þÎñÆ÷Éè¶¨¡£"
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
 msgstr ""
 
-msgid "Cleared all messages from %s."
-msgstr "Çå³ýËùÓÐ´Ó%sÀ´µÄÓÊ¼þ¡£"
-
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
-msgstr ""
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Ñ¡Ôñ²Ù×÷£º"
 
-msgid "Click to Save PGP Public Key in your Addressbook"
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
+msgstr "Ñ¡ÔñÔö¼ÓµØÖ·Ê±ËùÊ¹ÓÃµÄµØÖ·±¾"
+
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr "Ñ¡ÔñÔö¼ÓµØÖ·Ê±ËùÊ¹ÓÃµÄµØÖ·±¾"
+
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "ÔÚÐÂ´°¿ÚÖÐÐ´ÓÊ¼þ"
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ÔÚÐÂ´°¿ÚÖÐÐ´ÓÊ¼þ"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:171
+#, fuzzy
+msgid "Click to Save PGP Public Key in your Address book"
 msgstr "½«PGP¹«¹²ÃÜÔ¿±£´æµ½ÄãµÄµØÖ·±¾ÖÐ"
 
-msgid "Closed Folder"
+#: lib/MIME/Viewer/pkcs7.php:202
+#, fuzzy, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr "½«PGP¹«¹²ÃÜÔ¿±£´æµ½ÄãµÄµØÖ·±¾ÖÐ"
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
 
-msgid "Collapse All Folders"
-msgstr "ÕÛµþËùÓÐÎÄ¼þ¼Ð"
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Ð´ÓÊ¼þ"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+#, fuzzy
+msgid "Closed Folder"
+msgstr "ÕÛµþÎÄ¼þ¼Ð"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "ÕÛµþËùÓÐ"
 
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "ÕÛµþËùÓÐ"
 
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "ÕÛµþËùÓÐÎÄ¼þ¼Ð"
+
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "ÕÛµþÎÄ¼þ¼Ð"
 
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "±¸×¢"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Ð´ÓÊ¼þ(%s)"
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "±¸×¢"
 
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "Ð´ÓÊ¼þ"
 
-msgid "Compose messages in a separate window."
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
 msgstr "ÔÚÐÂ´°¿ÚÖÐÐ´ÓÊ¼þ"
 
-msgid "Compose"
-msgstr "Ð´ÓÊ¼þ"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "¸ü¸ÄÓÊ¼þ·þÎñÆ÷Éè¶¨¡£"
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
 
-msgid "Contact List"
-msgstr "ÁªÏµÈËÇåµ¥"
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
 
-msgid "Control PGP support for IMP."
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
 msgstr ""
 
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
 
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "¸´ÖÆ"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Çå³ýÀ¬»øÏä"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "¸üÕý"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "¸üÕýºóµÄÎÄ±¾"
 
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "²»ÄÜÉ¾³ý´Ó%sÀ´µÄÓÊ¼þ£º%s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "²»ÄÜÉ¾³ý´Ó%sÀ´µÄÓÊ¼þ£º%s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Î¬»¤²Ù×÷"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "´´½¨"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "´´½¨ÎÄ¼þ¼Ð"
 
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "´´½¨ÃÜÔ¿"
 
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "´´½¨ÎÄ¼þ¼Ð"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "´´½¨Ò»¸öÐÂµÄÀ¬»øÏä"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "´´½¨Ò»¸öÐÂµÄ²Ý¸åÏä"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "´´½¨Ò»¸öÐÂµÄ·¢¼þÏä"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "´´½¨Ò»¸öÐÂµÄÀ¬»øÏä"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr "´´½¨¹ýÂË¹æÔò×éÖ¯ÄãÊÕµ½µÄÓÊ¼þ£¬±£´æµ½ÎÄ¼þ¼ÐÖÐ¼°É¾³ýÀ¬»øÓÊ¼þ¡£"
 
-msgid "Create"
-msgstr "´´½¨"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "´´½¨Ò»¸öÐÂµÄ·¢¼þÏä"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
-msgid "Customize accounts for fetching mail from other POP3/IMAP accounts."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+#, fuzzy
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr "¶¨ÖÆÕÊºÅ´ÓÆäËüPOP3/IMAP·þÎñÆ÷ÊÕÈ¡ÓÊ¼þ¡£"
 
-msgid "Customize how you send mail and where drafts are saved."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
 msgstr "¶¨ÖÆÄãµÄÊÕ¼þÏäºÍ²Ý¸åÏä¡£"
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
+#: config/prefs.php.dist:40
+#, fuzzy, php-format
+msgid "Customize tasks to run upon logon to %s."
 msgstr "¶¨ÖÆµÇÂ¼µ½%sÊ±ËùÒª½øÐÐµÄÎ¬»¤²Ù×÷¡£"
 
-#, c-format
-msgid "Customize tasks to run upon logon to %s."
-msgstr ""
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "ÈÕÆÚ"
 
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "ÈÕÆÚ"
 
-msgid "December"
-msgstr "Ê®¶þÔÂ"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "ÒÑÉ¾³ý"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "É¾³ý"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Ä¬ÈÏÅÅÐò±ê×¼:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Ä¬ÈÏÅÅÐò·½Ïò£º"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "ÒÑÉ¾³ý"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "É¾³ý"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "Delete %s Public Key"
 msgstr "É¾³ý%s¹«¹²ÃÜÔ¿"
 
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "É¾³ýµ±Ç°ÃÜÔ¿"
 
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "É¾³ýÎÄ¼þ¼Ð"
 
-msgid "Delete messages"
-msgstr "É¾³ýÓÊ¼þ"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "É¾³ýÎÄ¼þ¼Ð"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "É¾³ýÎÄ¼þ¼Ð"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "É¾³ýÎÄ¼þ¼Ð"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "ÔÚÃ¿¸öÔÂ³õÉ¾³ý¾ÉµÄ·¢¼þÏä"
 
-msgid "Delete"
-msgstr "É¾³ý"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "ÔÚÃ¿¸öÔÂ³õÉ¾³ý¾ÉµÄ·¢¼þÏä"
 
-msgid "Deleted an attachment."
-msgstr "É¾³ýÒ»¸ö¸½¼þ"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "É¾³ýÓÊ¼þ"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "ÒÑÉ¾³ý"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "ÒÑÉ¾³ýÓÊ¼þ"
 
-msgid "Deleted"
-msgstr "ÒÑÉ¾³ý"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "É¾³ýÒ»¸ö¸½¼þ"
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "É¾³ý²¢ÒÆ¶¯ÓÊ¼þ"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "ÄæÐò"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Ñ¡Ïî"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Ï¸½Ú"
 
+#: config/prefs.php.dist:677
+#, fuzzy
 msgid "Dim signatures?"
-msgstr ""
+msgstr "ÄãµÄÇ©Ãû£º"
 
-msgid "Display Options"
-msgstr "ÏÔÊ¾Ñ¡Ïî"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "ÏÔÊ¾"
 
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr ""
 
-msgid "Display message when filters have been applied."
+#: config/prefs.php.dist:792
+msgid "Display pop-up notification of new mail?"
 msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
 msgstr ""
 
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr ""
 
-msgid "Display"
-msgstr "ÏÔÊ¾"
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "ÏÔÊ¾Ñ¡Ïî"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
 
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "²»¼ì²éÐÂÓÊ¼þ"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "ÄãÏë´ò¿ª¸ÃÎÄ¼þ¼ÐÂð£¿"
 
-msgid "Do you want to scan the body of text messages for PGP data?"
-msgstr ""
-
-msgid ""
-"Do you want your PGP public key to be attached to your messages by default?"
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
 msgstr ""
 
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Íê³É"
 
-msgid "Download %s"
-msgstr "ÏÂÔØ %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "ÏÂÔØÎÄ¼þ¼Ð"
 
-msgid "Download"
-msgstr "ÏÂÔØ"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "ÏÂÔØÎÄ¼þ¼Ð"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "²Ý¸å"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "²Ý¸åÏä£º"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "²Ý¸åÏä£º"
 
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "E-MailµØÖ·"
 
-msgid "Edit your IMAP/POP3 accounts."
-msgstr "±à¼ÄãµÄIMAP/POP3ÕÊºÅ¡£"
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
+msgid "Edit"
+msgstr "±à¼"
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "¼ÓÈëºÚÃûµ¥"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "¹ýÂËÆ÷"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "±à¼ÄãµÄ¹ýÂË¹æÔò"
 
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "±à¼ÄãµÄ¹ýÂË¹æÔò"
 
-msgid "Edit your identities"
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
 msgstr ""
 
-msgid "Edit"
-msgstr "±à¼"
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "±à¼ÄãµÄ¹ýÂË¹æÔò"
 
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "EmailµØÖ·"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Çå³ýËùÓÐ´Ó%sÀ´µÄÓÊ¼þ¡£"
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Çå³ýÎÄ¼þ¼Ð"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Çå³ýÎÄ¼þ¼Ð"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Çå³ýÀ¬»øÏä"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Çå³ýÀ¬»øÏä"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Çå³ýÀ¬»øÏä"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr ""
 
-msgid "Encrypt Message"
-msgstr "¼ÓÃÜÓÊ¼þ"
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
 
-msgid "End forwarded message"
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
 msgstr ""
 
+#: lib/Compose.php:384
+#, fuzzy
+msgid "End forwarded message"
+msgstr "´Ó%s×ª·¢µÄÓÊ¼þ"
+
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "¾ÉÓÊ¼þ"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "´Ó%s×ª·¢µÄÓÊ¼þ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr ""
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "ÇëÊäÈëÐÂµÄÀ¬»øÏäµÄÃû×Ö"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "ÇëÊäÈëÐÂµÄ²Ý¸åÏäµÄÃû×Ö"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "ÇëÊäÈëÐÂµÄ·¢¼þÏäµÄÃû×Ö"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "ÇëÊäÈëÐÂµÄÀ¬»øÏäµÄÃû×Ö"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "¼ÓÃÜÓÊ¼þ"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "ÌõÄ¿\"%s\"ÒÑ¾³É¹¦µÄÌí¼Óµ½µØÖ·±¾Àï"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "´íÎó"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "ÅäÖÃÐÅÏ¢ÒÑ¾·á¹¦¸ü¸Ä¡£"
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Ã¿¸ô15·ÖÖÓ"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Ã¿¸ô30ÃëÖÓ"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Ã¿¸ô5·ÖÖÓ"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Ã¿¸ô°ëÐ¡Ê±"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Ã¿·ÖÖÓ"
 
-msgid "Expand All Folders"
-msgstr "Õ¹¿ªËùÓÐÎÄ¼þ¼Ð"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Õ¹¿ªËùÓÐ"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Õ¹¿ªËùÓÐ"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Õ¹¿ªËùÓÐÎÄ¼þ¼Ð"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Õ¹¿ªÎÄ¼þ¼Ð"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
+#, fuzzy
 msgid "Expand Names"
+msgstr "Õ¹¿ªÎÄ¼þ¼Ð"
+
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:980
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr ""
 
-msgid "February"
-msgstr "¶þÔÂ"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Õ¹¿ªËùÓÐ"
 
-msgid "Fetch Mail in a separate window."
-msgstr "ÔÚÐÂ´°¿ÚÖÐFetch Mail"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "ÐÂÓÊ¼þ"
 
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
 msgid "Fetch Mail"
-msgstr ""
-
-msgid "Fetch mail"
-msgstr ""
+msgstr "ÐÂÓÊ¼þ"
 
-msgid "Fetch"
-msgstr ""
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "ÔÚÐÂ´°¿ÚÖÐFetch Mail"
 
-msgid "Fetching... Please wait..."
-msgstr ""
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "µ±µÇÂ¼Ê±Ó¦ÓÃ¹ýÂË¹æÔò¡£"
 
-msgid "Field"
-msgstr "×Ö¶Î"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Çå³ýËùÓÐ´Ó%sÀ´µÄÓÊ¼þ¡£"
 
-msgid "Filename"
-msgstr "ÎÄ¼þÃû"
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "´Ó%s×ª·¢µÄÓÊ¼þ"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Ö»»ñÈ¡ÐÂÓÊ¼þ"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr ""
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "¹ýÂËÆ÷"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "¹ýÂËÆ÷"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "ÆäËûÑ¡Ïî"
 
-msgid "Filter Rules"
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "¹ýÂË¹æÔò"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+msgid "Filter message content for profanity?"
+msgstr ""
+
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
 msgstr ""
 
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "¹ýÂËÆ÷"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "²éÕÒ"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "µÚÒ»Ò³"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "µÚÒ»Ò³"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "×ª·¢"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "ÓÊÏäµ¼º½"
 
-msgid "Folder Prefix"
-msgstr "ÎÄ¼þ¼ÐÇ°×º"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "¶þÔÂ"
 
-msgid "Folders"
-msgstr "ÎÄ¼þ¼Ð"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "×ª·¢"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "×ª·¢£º"
 
-#, c-format
-msgid "Forwarded message from %s"
+#: lib/Compose.php:369
+msgid "Forwarded message"
 msgstr "´Ó%s×ª·¢µÄÓÊ¼þ"
 
-msgid "Forwarded message"
+#: lib/Compose.php:367
+#, php-format
+msgid "Forwarded message from %s"
 msgstr "´Ó%s×ª·¢µÄÓÊ¼þ"
 
-msgid "From Address"
-msgstr "·¢¼þÈËµØÖ·"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "·þÎñÆ÷ÐÅÏ¢"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "·¢¼þÈË"
 
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "·¢¼þÈË"
 
-msgid "From:"
-msgstr "·¢¼þÈË£º"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "·¢¼þÈËµØÖ·"
 
+#: compose.php:777 compose.php:781
+#, fuzzy
 msgid "Fwd:"
-msgstr ""
+msgstr "×ª·¢£º"
+
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "×ª·¢£º"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "´Ó%s×ª·¢µÄÓÊ¼þ"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Ñ¡Ïî"
 
-msgid "Get only new messages"
+#: templates/fetchmail/manage.inc:37
+#, fuzzy
+msgid "Get only new messages? (IMAP only)"
 msgstr "Ö»»ñÈ¡ÐÂÓÊ¼þ"
 
-msgid "Green"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "ÏÂÒ»·â"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr " Ôö¼Óµ½µØÖ·±¾ (%s) "
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
 msgstr ""
 
-msgid "Grey"
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
 msgstr ""
 
-msgid "Hash-Algorithim"
-msgstr "HashËã·¨"
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
 
+#: templates/message/headers.inc:58
 msgid "Headers"
 msgstr "ÓÊ¼þÍ·"
 
-msgid "Help"
-msgstr "°ïÖú"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr ""
 
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Òþ²ØÒÑÉ¾³ýµÄ"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Òþ²ØÎ´¶©ÔÄµÄ"
 
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "ÄãÏ£ÍûÈçºÎÏÔÊ¾¸½¼þ?"
 
-msgid "How to prefix quoted lines in a reply:"
+#: config/prefs.php.dist:504
+msgid "How to attribute quoted lines in a reply"
 msgstr ""
 
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr ""
 
-msgid "IMAP/POP3 Accounts"
-msgstr "IMAP/POP3ÕÊºÅ"
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
 
-msgid "IMP PGP Administration"
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
 msgstr ""
 
-msgid "IMP is not properly configured"
-msgstr "IMPÃ»ÓÐÕýÈ·ÅäÖÃ"
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
 
-msgid "INBOX"
-msgstr "ÊÕ¼þÏä"
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "Identities"
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
 msgstr ""
 
-msgid "Identity"
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
 msgstr ""
 
-msgid "Identity's name:"
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
 msgstr ""
 
-msgid "Ignore All"
-msgstr "ºöÂÔËùÓÐ"
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
+msgid "INBOX"
+msgstr "ÊÕ¼þÏä"
+
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "ËùÓÐÔÚ¸ÃÓÊÏäÖÐµÄÓÊ¼þ¶¼½«¶ªÊ§£¬ÄãÈ·ÐÅÒªÕâÃ´×öÂð£¿"
 
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "ºöÂÔ"
 
+#: templates/compose/spelling.inc:83
+msgid "Ignore All"
+msgstr "ºöÂÔËùÓÐ"
+
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "ÖØÒª"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "µ¼ÈëÃÜÔ¿"
 
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "µ¼ÈëÃÜÔ¿¶Ô"
 
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "ÖØÒªÓÊ¼þ"
+
+#: pgp.php:42
 msgid "Import PGP Key"
 msgstr "µ¼ÈëPGPÃÜÔ¿"
 
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
+msgstr "µ¼Èë¸öÈËË½ÈËPGPÃÜÔ¿"
+
+#: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
 msgstr "µ¼Èë¸öÈËË½ÈËPGPÃÜÔ¿"
 
+#: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
 msgstr "µ¼Èë¸öÈË¹«¹²PGPÃÜ"
 
+#: templates/smime/import_key.inc:4
+#, fuzzy
+msgid "Import Personal S/MIME Certificates"
+msgstr "µ¼Èë¸öÈËË½ÈËPGPÃÜÔ¿"
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "µ¼Èë¹«¹²ÃÜÔ¿"
 
+#: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
 msgstr "µ¼Èë¹«¹²PGPÃÜÔ¿"
 
-msgid "Important messages"
-msgstr "ÖØÒªÓÊ¼þ"
+#: templates/smime/import_key.inc:8
+#, fuzzy
+msgid "Import Public S/MIME Key"
+msgstr "µ¼Èë¹«¹²ÃÜÔ¿"
+
+#: smime.php:16
+#, fuzzy
+msgid "Import S/MIME Key"
+msgstr "µ¼ÈëÃÜÔ¿"
+
+#: templates/folders/import.inc:9
+#, fuzzy
+msgid "Import mbox File"
+msgstr "µ¼ÈëÃÜÔ¿"
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
 
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "ÖØÒª"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "ÖØÒªÓÊ¼þ"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Çå³ýËùÓÐ´Ó%sÀ´µÄÓÊ¼þ¡£"
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "ÔÚ»Ø¸´ÖÐ°üº¬ÔÊ¼ÓÊ¼þ£¿"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "ÔÚ»Ø¸´ÖÐ°üº¬ÔÊ¼ÓÊ¼þ£¿"
 
-#, c-format
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "ºöÂÔ"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "Information on %s Public Key"
 msgstr "¹ØÓÚ¹«¹²ÃÜÔ¿%sµÄÐÅÏ¢"
 
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "¹ØÓÚË½ÈËÃÜÔ¿µÄÐÅÏ¢"
 
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "¹ØÓÚ¸öÈË¹«¹²ÃÜÔ¿µÄÐÅÏ¢"
 
-msgid "Insert Key Here"
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+msgid "Inline"
+msgstr ""
+
+#: templates/smime/import_key.inc:9
+#, fuzzy
+msgid "Insert Certificate Here"
 msgstr "ÔÚÕâÀï²åÈëÃÜÔ¿"
 
-msgid "Invalid PGP Key."
-msgstr "·Ç·¨µÄPGPÃÜÔ¿"
+#: templates/pgp/import_key.inc:15
+#, fuzzy
+msgid "Insert Personal Private PGP Key Here"
+msgstr "µ¼Èë¸öÈËË½ÈËPGPÃÜÔ¿"
+
+#: templates/pgp/import_key.inc:10
+#, fuzzy
+msgid "Insert Personal Public PGP Key Here"
+msgstr "µ¼Èë¸öÈË¹«¹²PGPÃÜ"
+
+#: templates/pgp/import_key.inc:5
+#, fuzzy
+msgid "Insert Public PGP Key Here"
+msgstr "µ¼Èë¹«¹²PGPÃÜÔ¿"
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "EmailµØÖ·"
 
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "·Ç·¨µÄÔË³ÌÓÊÏä"
 
-msgid "Invalid Username/Password"
-msgstr "·Ç·¨µÄÓÃ»§Ãû/ÃÜÂë"
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
+#, fuzzy
+msgid "Invalid key"
+msgstr "·Ç·¨µÄPGPÃÜÔ¿"
 
+#: pgp.php:196
 msgid "Invalid personal PGP private key."
 msgstr "·Ç·¨µÄ¸öÈËPGPË½ÈËÃÜÔ¿"
 
+#: pgp.php:171
 msgid "Invalid personal PGP public key."
 msgstr "·Ç·¨µÄ¸öÈËPGP¹«¹²ÃÜÔ¿"
 
-msgid "January"
-msgstr "Ò»ÔÂ"
-
-msgid "July"
-msgstr "ÆßÔÂ"
-
-msgid "June"
-msgstr "ÁùÔÂ"
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
 
-msgid "Key Fingerprint"
+#: templates/compose/compose.inc:577
+msgid "KB"
 msgstr ""
 
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "ÃÜÔ¿³¤¶È"
 
-msgid "Language"
-msgstr "ÓïÑÔ"
-
-msgid "Last Page"
-msgstr "×îºóÒ»Ò³"
-
-#, c-format
-msgid "Last login: %s"
-msgstr "×îºóµÇÂ¼Ê±¼ä£º%s"
-
-msgid "Last login: Never"
-msgstr "ÄãÕâÊÇµÚÒ»´ÎµÇÂ¼ÏµÍ³àÞ£º£©"
-
-msgid "Light Blue"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
 msgstr ""
 
-msgid "List-Archive"
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
 msgstr ""
 
-msgid "List-Help"
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
 msgstr ""
 
-msgid "List-Owner"
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
 msgstr ""
 
-msgid "List-Post"
+#: templates/login/login.inc:216
+msgid "Language"
+msgstr "ÓïÑÔ"
+
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "×îºóÒ»Ò³"
+
+#: mailbox.php:358
+msgid "Last Page"
+msgstr "×îºóÒ»Ò³"
+
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "¸½¼þ"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
 msgstr ""
 
-msgid "List-Subscribe"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
 msgstr ""
 
-msgid "List-Unsubscribe"
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
 msgstr ""
 
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr ""
 
+#: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
 msgstr "±¾µØÓÊÏä"
 
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr " ¶¯×÷"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "µÇÂ¼"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "µÇÂ¼µ½%s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "µÇÂ¼"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "µÇÂ¼ÈÎÎñ"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr "ÒòÎªÄ³ÖÖÔÒòµÇÂ¼Ê§°Ü£¬×îÓÐ¿ÉÄÜÇé¿öÊÇÄãµÄÓÃ»§Ãû/ÃÜÂë²»ÕýÈ·"
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr ""
 
-msgid "Logout"
-msgstr "×¢Ïú"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "ÓÊÏä"
 
-msgid "Mail Filters"
+#: config/prefs.php.dist:96
+msgid "Mail Previews"
 msgstr ""
 
-msgid "Mail Management"
-msgstr "ÓÊ¼þ¹ÜÀí"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
+#: folders.php:402
 msgid "Mailbox"
 msgstr "ÓÊÏä"
 
-msgid "Maintenance Operations"
-msgstr "Î¬»¤²Ù×÷"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "ÏÔÊ¾Ñ¡Ïî"
+
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
 
-msgid "March"
-msgstr "ÈýÔÂ"
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "±ê¼ÇÎª£º"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr ""
 
-msgid "May"
-msgstr "ÎåÔÂ"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
 
-msgid "Message Composition"
-msgstr "Ð´ÓÊ¼þ"
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
 
-msgid "Message Date"
-msgstr "ÓÊ¼þÈÕÆÚ"
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
 
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "¸½¼þ"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "·þÎñÆ÷ÐÅÏ¢"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "´ò¿ªÎÄ¼þ¼Ð"
+
+#: lib/Compose.php:331
+#, fuzzy
+msgid "Message"
+msgstr "ÓÊ¼þµ½"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
+msgid "Message Composition"
+msgstr "Ð´ÓÊ¼þ"
+
+#: config/prefs.php.dist:917
+msgid "Message Date"
+msgstr "ÓÊ¼þÈÕÆÚ"
+
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "ÓÊ¼þµ½"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "ÓÊ¼þ²éÕÒ"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "ÓÊ¼þ´óÐ¡"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "ÔÊ¼ÐÅÏ¢"
 
+#: config/prefs.php.dist:66
+#, fuzzy
 msgid "Message Viewing"
-msgstr ""
-
-msgid "Message fields"
-msgstr "ÓÊ¼þ×Ö¶Î"
+msgstr "ÓÊ¼þ´óÐ¡"
 
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "ÓÊ¼þ±êÖ¾"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "ÓÊ¼þ¼Ð"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "ÓÊ¼þ¼Ð"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "É¾³ýÒ»¸ö¸½¼þ"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "ÓÊ¼þ×Ö¶Î"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "ÓÊ¼þ×Ö¶Î"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "ÓÊ¼þÈÕÆÚ"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
+msgstr "¸öÈËPGPÃÜÔ¿ÒÑ¾³É¹¦É¾³ý¡£"
+
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "ÓÊ¼þÒÑ¾³É¹¦·¢ËÍ£¬µ«ÊÇÃ»ÓÐ±£´æµ½"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
 msgstr "ÓÊ¼þÒÑ¾³É¹¦·¢ËÍ£¬µ«ÊÇÃ»ÓÐ±£´æµ½"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Ã¿Ò³ÏÔÊ¾µÄÓÊ¼þÊý."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "ÓÊ¼þµ½"
 
-msgid "Mime Type"
-msgstr "MIMEÀàÐÍ"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "±à¼"
 
-msgid "Move Down"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move"
+msgstr "ÒÆ¶¯"
+
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
 msgstr "ÏÂÒÆ"
 
-msgid "Move Up"
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "Ñ¡ÔñÎÄ¼þ¼Ð"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
 msgstr "ÉÏÒÆ"
 
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "ÒÆ¶¯ÓÊ¼þµ½<B>%s</B>ÎÄ¼þ¼Ð"
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
 
-msgid "Move"
-msgstr "ÒÆ¶¯"
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "ÓÊ¼þ´óÐ¡"
 
-msgid "Name and/or email can not be empty"
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
 msgstr ""
 
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Ãû³Æ"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr " ¶¯×÷"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "´ÓÀ´Ã»ÓÐ"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "É¾³ýÒ»¸ö¸½¼þ"
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "ÐÂ"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "´ò¿ªÎÄ¼þ¼Ð"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "ÐÂÓÊ¼þ"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "ÏÂÒ»·â"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "ÐÂÓÊ¼þ"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "ÐÂÓÊ¼þ"
 
-msgid "New"
-msgstr "ÐÂ"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "ÏÂ"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "ÏÂÒ»·â"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "ÏÂÒ»Ò³"
 
-msgid "Next"
-msgstr "ÏÂ"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "²»"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
 
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr ""
 
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "ÐÂÓÊ¼þ"
+
+#: pgp.php:137
 msgid "No PGP public key imported."
 msgstr "Ã»ÓÐPGP¹«¹²ÃÜÔ¿µ¼Èë"
 
-msgid "No Subject"
-msgstr "ÎÞÖ÷Ìâ"
+#: templates/smime/smime.inc:84
+#, fuzzy
+msgid "No Personal Certificate Present"
+msgstr "µ¼Èë¸öÈËË½ÈËPGPÃÜÔ¿"
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "¸üÕýºóµÄÎÄ±¾"
+
+#: templates/smime/smime.inc:15
+#, fuzzy
+msgid "No Public Keys Found"
+msgstr "ÄãµÄ¹«¹²ÃÜÔ¿"
 
+#: smime.php:151
+#, fuzzy
+msgid "No S/MIME public key imported."
+msgstr "Ã»ÓÐPGP¹«¹²ÃÜÔ¿µ¼Èë"
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "¸½¼þ"
+
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "¹ØÓÚ¹«¹²ÃÜÔ¿%sµÄÐÅÏ¢"
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "Ã»ÓÐÖ¸¶¨ÎÄ¼þ¼Ð"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Ã»ÓÐÖ¸¶¨ÎÄ¼þ¼Ð"
 
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Ö»»ñÈ¡ÐÂÓÊ¼þ"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Ã»ÓÐÖ¸¶¨ÎÄ¼þ¼Ð"
+
+#: lib/Compose.php:325
+#, fuzzy
 msgid "No message body text"
-msgstr ""
+msgstr "ÒÆ¶¯ÓÊ¼þµ½"
 
-msgid "No messages matched your search"
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "Ã»ÓÐÕÒµ½·ûºÏÌõ¼þµÄÓÊ¼þ"
 
-msgid "No messages to fetch..."
-msgstr ""
-
+#: pgp.php:189
+#, fuzzy
 msgid "No personal PGP private key imported."
-msgstr ""
+msgstr "·Ç·¨µÄ¸öÈËPGPË½ÈËÃÜÔ¿"
 
+#: pgp.php:165
+#, fuzzy
 msgid "No personal PGP public key imported."
+msgstr "Ã»ÓÐPGP¹«¹²ÃÜÔ¿µ¼Èë"
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
 msgstr ""
 
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Ã»ÓÐÓï·¨´íÎó"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr ""
 
-msgid "No"
-msgstr "²»"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "Ã»ÓÐÖ¸¶¨ÎÄ¼þ¼Ð"
 
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
+#, fuzzy
 msgid "None"
+msgstr "Íê³É"
+
+#: templates/compose/compose.inc:295
+msgid "Normal"
 msgstr ""
 
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Ã»ÓÐÉ¾³ýµÄ"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "²»ÊÇ²Ý¸å"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "²»ÖØÒªµÄ"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "²»ÊÇ¸öÈËµÄ"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+#, fuzzy
+msgid "Not a valid public key."
+msgstr "·Ç·¨µÄ¸öÈËPGP¹«¹²ÃÜÔ¿"
+
+#: templates/search/main.inc:67
+#, fuzzy
 msgid "Not deleted messages"
-msgstr ""
+msgstr "ÒÑÉ¾³ýÓÊ¼þ"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "²»ÖØÒªµÄÓÊ¼þ"
 
-msgid "November"
-msgstr "Ê®Ò»ÔÂ"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "ÒýÓÃ"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
+#: config/prefs.php.dist:377
+msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr "ÔÚÃ¿¸öÔÂ³õÉ¾³ý¾ÉµÄ·¢¼þÏä"
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "È·¶¨"
 
-msgid "October"
-msgstr "Ê®ÔÂ"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "¾ÉÓÊ¼þ"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+#, fuzzy
 msgid "Old sent-mail folders being purged."
+msgstr "ÔÚÃ¿¸öÔÂ³õÉ¾³ý¾ÉµÄ·¢¼þÏä"
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
 msgstr ""
 
-msgid "Open Folder"
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "ÇëÖ»Ñ¡ÔñÒ»¸öÄãÒª²Ù×÷µÄÎÄ¼þ¼Ð¡£"
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "´ò¿ªÎÄ¼þ¼Ð"
 
-msgid "Options"
-msgstr "Ñ¡Ïî"
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "´ò¿ªÎÄ¼þ¼Ð"
 
-msgid "Orange"
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
 msgstr ""
 
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "ÆäËûÑ¡Ïî"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "ÆäËûÑ¡Ïî"
 
-msgid "PGP Digital Signature"
+#: templates/login/login.inc:201
+msgid "Outbound Server"
 msgstr ""
 
-msgid "PGP Encrypted Data"
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
 msgstr ""
 
-#, c-format
-msgid "PGP Error: %s"
-msgstr ""
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "¼ÓÃÜÓÊ¼þ"
 
-msgid "PGP Error: For message encryption, there can only be one recipient."
-msgstr ""
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "´íÎó"
 
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr ""
 
-msgid "PGP NOT Active"
-msgstr ""
-
+#: config/prefs.php.dist:142
 #, fuzzy
 msgid "PGP Options"
 msgstr "Ñ¡Ïî"
 
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr ""
 
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 
-#, c-format
-msgid "PGP Public Key for \"%s\" was successfully added."
-msgstr ""
+#: lib/MIME/Viewer/pgp.php:173
+#, fuzzy
+msgid "PGP Public Key Text"
+msgstr "ÄãµÄ¹«¹²ÃÜÔ¿"
 
-#, c-format
-msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr ""
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦´´½¨¡£"
 
-msgid "PGP Public Key"
-msgstr ""
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦É¾³ý¡£"
 
+#: templates/pgp/pgp.inc:14
+#, fuzzy
 msgid "PGP Public Keyring"
-msgstr ""
-
-msgid "PGP Public/Private Keypair successfully added."
-msgstr ""
+msgstr "ÄãµÄ¹«¹²ÃÜÔ¿"
 
+#: templates/compose/encrypt_list.inc:8
 #, fuzzy
 msgid "PGP Sign Message"
 msgstr "·¢ËÍÓÊ¼þ"
 
+#: templates/compose/encrypt_list.inc:9
+#, fuzzy
 msgid "PGP Sign/Encrypt Message"
-msgstr ""
+msgstr "·¢ËÍÓÊ¼þ"
 
-msgid "PGP Signed/Encrypted Data"
-msgstr ""
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "ÅäÖÃÐÅÏ¢ÒÑ¾·á¹¦¸ü¸Ä¡£"
+
+#: pgp.php:177
+#, fuzzy
+msgid "PGP public key successfully added."
+msgstr "ÅäÖÃÐÅÏ¢ÒÑ¾·á¹¦¸ü¸Ä¡£"
 
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 
-msgid "PGP"
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
 msgstr ""
 
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr ""
 
-#, c-format
-msgid "Page %d of %d"
-msgstr "µÚ %d Ò³¹² %d Ò³"
-
-msgid "Part(s)"
-msgstr "¸½¼þ"
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
 
-msgid "Passphrase (Again)"
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
 msgstr ""
 
-msgid "Passphrase successfully unloaded."
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
 msgstr ""
 
-msgid "Passphrase"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
 msgstr ""
 
-msgid "Passphrase:"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
 msgstr ""
 
-msgid "Passphrases can not be empty"
+#: templates/mailbox/header.inc:19
+#, php-format
+msgid "Page %d of %d"
+msgstr "µÚ %d Ò³¹² %d Ò³"
+
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
 msgstr ""
 
-msgid "Passphrases do not match"
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
 msgstr ""
 
-msgid "Password"
-msgstr "ÃÜÂë"
+#: templates/message/headers.inc:43
+msgid "Part(s)"
+msgstr "¸½¼þ"
 
-msgid "Password:"
-msgstr "ÃÜÂë:"
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
 
-msgid "Perform maintenance operations on login"
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "ÅäÖÃÐÅÏ¢ÒÑ¾·á¹¦¸ü¸Ä¡£"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+#, fuzzy
+msgid "Passphrase:"
+msgstr "ÃÜÂë:"
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
+msgid "Password"
+msgstr "ÃÜÂë"
+
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
 msgstr "µÇÂ¼Ê±Ö´ÐÐÎ¬»¤²Ù×÷"
 
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+msgid "Personal"
+msgstr "¸öÈËµÄ"
+
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "¸öÈËÐÅÏ¢"
 
+#: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
 msgstr "¸öÈËPGPÃÜÔ¿¶Ô³É¹¦Éú³É¡£"
 
+#: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
 msgstr "¸öÈËPGPÃÜÔ¿ÒÑ¾³É¹¦É¾³ý¡£"
 
-msgid "Personal"
-msgstr "¸öÈËµÄ"
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
 
+#: smime.php:132
+#, fuzzy
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "¸öÈËPGPÃÜÔ¿ÒÑ¾³É¹¦É¾³ý¡£"
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr ""
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "ÇëÊäÈëÐÂµÄÎÄ¼þ¼ÐµÄÃû³Æ£º"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "ÇëÊäÈëÐÂµÄÎÄ¼þ¼ÐµÄÃû³Æ£º"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "ÇëÊäÈëÐÂµÄÃû³Æ£º"
 
+#: templates/pgp/passphrase.inc:19
+#, php-format
 msgid ""
 "Please enter the passphrase for your PGP private key. You will only need to "
-"enter this passphrase once per IMP session."
+"enter this passphrase once per %s session."
 msgstr ""
 
-msgid "Please enter valid search criteria."
-msgstr "ÇëÊäÈëºÏ·¨µÄ²éÕÒÌõ¼þ¡£"
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
 
-msgid "Please provide your username and password"
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "ÇëÊäÈëÄãµÄÓÃ»§ÃûºÍÃÜÂë"
+
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "ÇëÊäÈëÄãµÄÓÃ»§ÃûºÍÃÜÂë"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr ""
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "ÇëÑ¡ÔñÄãÒª²Ù×÷µÄÎÄ¼þ¼Ð¡£"
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "ÇëÑ¡ÔñÖÁÉÙÒ»¸öÒª²éÕÒµÄÎÄ¼þ¼Ð¡£"
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "ÇëÑ¡ÔñÖÁÉÙÒ»¸öÒª²éÕÒµÄÎÄ¼þ¼Ð¡£"
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "ÇëÖ»Ñ¡ÔñÒ»¸öÄãÒª²Ù×÷µÄÎÄ¼þ¼Ð¡£"
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
+msgstr "ÇëÑ¡ÔñÖÁÉÙÒ»¸öÒª²éÕÒµÄÎÄ¼þ¼Ð¡£"
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
 msgstr ""
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/prefs.php.dist:214
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr ""
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "ÅäÖÃÐÅÏ¢ÒÑ¾·á¹¦¸ü¸Ä¡£"
 
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "ÉÏÒ»·â"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "ÉÏÒ»·â"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "ÉÏÒ»·â"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "´òÓ¡"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "¹ýÂË¹æÔò%dµÄÎÊÌâ£ºÎÄ¼þ¼Ð%s²»´æÔÚ¡£"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "´òÓ¡"
 
-msgid "Problem?"
-msgstr "ÎÊÌâ£¿"
+#: templates/smime/import_key.inc:76
+#, fuzzy
+msgid "Private Key Password"
+msgstr "ÄãµÄË½ÈËÃÜÔ¿"
 
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "ÐÒé£º"
 
-msgid "Purge Deleted"
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Òþ²ØÒÑÉ¾³ýµÄ"
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Purge Deleted"
+msgstr "Òþ²ØÒÑÉ¾³ýµÄ"
+
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "É¾³ýÎÄ¼þ¼Ð"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr ""
 
-msgid "Purge messages in Trash folder older than this amount of days"
-msgstr ""
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr "ËùÓÐÔÚ\"%s\"ÎÄ¼þ¼ÐÖÐµÄÔçÓÚ%sÌìÇ°µÄÓÊ¼þ½«±»ÓÀ¾ÃÐÔÉ¾³ý¡£"
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "´´½¨Ò»¸öÐÂµÄÀ¬»øÏä"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "´´½¨Ò»¸öÐÂµÄÀ¬»øÏä"
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "´´½¨Ò»¸öÐÂµÄÀ¬»øÏä"
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
 msgstr ""
 
-msgid "Quoting"
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "ÒýÓÃ"
 
-msgid "Received after"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
 msgstr ""
 
-msgid "Received before"
+#: lib/Search.php:50
+msgid "Received On"
 msgstr ""
 
-msgid "Received on"
+#: lib/Search.php:58
+msgid "Received Since"
 msgstr ""
 
+#: lib/Search.php:54
+msgid "Received Until"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "ÖØ¼Ä"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "ÖØ¼Ä"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "ÖØ¼ÄÓÊ¼þ"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "ÖØ¼Ä¸ÃÓÊ¼þ"
 
-msgid "Redirect"
-msgstr "ÖØ¼Ä"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "ÖØ¼ÄÓÊ¼þÊ§°Ü¡£"
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Ë¢ÐÂ"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr ""
 
-msgid "Refresh"
-msgstr "Ë¢ÐÂ"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+msgid "Reload"
+msgstr ""
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr ""
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr ""
 
+#: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
 msgstr "Ô¶³ÌÓÊÏä:"
 
-msgid "Remove Selected"
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
 msgstr "É¾³ýÒÑÑ¡ÖÐµÄ¸½¼þ"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "ÎÄ¼þ¼Ð¸ÄÃû"
 
-msgid "Rename sent-mail folder at beginning of month"
-msgstr ""
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
+msgstr "ÔÚÃ¿¸öÔÂ³õÉ¾³ý¾ÉµÄ·¢¼þÏä"
 
-#, c-format
+#: lib/Folder.php:455
+#, fuzzy, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr ""
+msgstr "±£´æ²Ý¸åÊ§°Ü£¬·þÎñÆ÷»ØÓ¦ÐÅÏ¢ÈçÏÂ£º%s"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "»Ø¸´µ½ÓÊ¼þÁÐ±í"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Ìæ»»Îª£º"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "´ð¸´"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "»Ø¸´µ½"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "´ð¸´ËùÓÐ"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "´ð¸´ËùÓÐ£º"
 
+#: templates/message/navbar_actions.inc:10
 msgid "Reply to List"
 msgstr "»Ø¸´µ½ÓÊ¼þÁÐ±í"
 
-msgid "Reply"
-msgstr "´ð¸´"
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "»Ø¸´µ½ÓÊ¼þÁÐ±í"
 
-msgid "Reply-To: "
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "´ð¸´ËùÓÐ"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "»Ø¸´µ½£º"
 
-msgid "Reply-to"
-msgstr "»Ø¸´µ½"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "»Ø¸´µ½£º"
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "»Ø¸´"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+msgid "Report as Innocent"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr ""
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
 msgstr "ÐèÒªÓÊ¼þ»ØÖ´"
 
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
+msgstr "ÐèÒªÓÊ¼þ»ØÖ´"
+
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "ÖØÖÃ"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "»Ö¸´"
 
-msgid "Return to Main Preferences Screen"
+#: recompose.php:98
+msgid "Resume your session"
 msgstr ""
 
-msgid "Return to Previous Screen"
-msgstr "·µ»Øµ½ÉÏÒ»ÆÁ"
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Ð´ÓÊ¼þ"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Ñ¡Ïî"
 
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "É¾³ý¡¢ÒÆ¶¯¡¢¸´ÖÆÓÊ¼þºó·µ»Øµ½ÓÊ¼þÁÐ±íÖÐ£¿"
 
-msgid "Rule Definition"
-msgstr "¹æÔò¶¨Òå"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+#, fuzzy
+msgid "S/MIME Encrypt Message"
+msgstr "¼ÓÃÜÓÊ¼þ"
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "±£´æÑ¡Ïî"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦É¾³ý¡£"
+
+#: smime.php:162
+#, fuzzy
+msgid "S/MIME Public Key successfully added."
+msgstr "ÅäÖÃÐÅÏ¢ÒÑ¾·á¹¦¸ü¸Ä¡£"
+
+#: templates/smime/smime.inc:10
+#, fuzzy
+msgid "S/MIME Public Keyring"
+msgstr "µ¼Èë¹«¹²ÃÜÔ¿"
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "·¢ËÍÓÊ¼þ"
+
+#: templates/compose/encrypt_list.inc:14
+#, fuzzy
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "¼ÓÃÜÓÊ¼þ"
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Ö÷Ìâ"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "±£´æ¸±±¾µ½"
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Áí´æÎª"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Áí´æÎª"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "´æÎª²Ý¸å"
 
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Áí´æÎª"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "±£´æÑ¡Ïî"
 
-msgid "Save a copy in "
-msgstr "±£´æ¸±±¾µ½"
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "±£´æÑ¡Ïî"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "´æÎª²Ý¸å"
 
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Áí´æÎª"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
 msgstr ""
 
-#, c-format
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+msgid "Save sent mail?"
+msgstr ""
+
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "±£´æ²Ý¸åÊ§°Ü£¬·þÎñÆ÷»ØÓ¦ÐÅÏ¢ÈçÏÂ£º%s"
 
-msgid "Search Results"
-msgstr "²éÕÒ½á¹û"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "²éÕÒ"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "²éÕÒ"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "±£´æÑ¡Ïî"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "²éÕÒ½á¹û"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "ÒÑÔÄ¶Á"
 
-msgid "Select addressbook sources for adding and searching for addresses."
-msgstr ""
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Ñ¡Ôñ"
 
-msgid "Select all"
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Ñ¡ÔñÒ»¸öÕÊºÅ"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Ñ¡ÔñÒ»¸öÕÊºÅ"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
 msgstr "Ñ¡ÔñËùÓÐ"
 
-msgid "Select an account"
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
 msgstr "Ñ¡ÔñÒ»¸öÕÊºÅ"
 
-msgid "Select an identity"
-msgstr ""
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
+msgstr "Ñ¡ÔñÔö¼ÓµØÖ·Ê±ËùÊ¹ÓÃµÄµØÖ·±¾"
 
-msgid "Select charset:"
-msgstr "Ñ¡Ôñ×Ö·û±àÂë£º"
+#: templates/search/main.inc:88
+msgid "Select all"
+msgstr "Ñ¡ÔñËùÓÐ"
 
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "Ñ¡ÔñÔö¼ÓµØÖ·Ê±ËùÊ¹ÓÃµÄµØÖ·±¾"
+
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "Ñ¡ÔñÒ»¸öÕÊºÅ"
+
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "²»Ñ¡Ôñ"
 
-msgid "Select your color scheme."
-msgstr "Ñ¡ÔñÄãµÄÅäÉ«·½°¸¡£"
-
-msgid "Select your preferred language:"
-msgstr "Ñ¡ÔñÄãµÄÊ×Ñ¡ÏîÓïÑÔ£º"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Ñ¡Ôñ"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Ñ¡ÔñµØÖ·±¾£º"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "·þÎñÆ÷ÐÅÏ¢"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "·¢ËÍÓÊ¼þ"
 
-msgid "Sent mail folder:"
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
 msgstr ""
 
-msgid "September"
-msgstr "¾ÅÔÂ"
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "´´½¨Ò»¸öÐÂµÄ·¢¼þÏä"
 
-msgid "Server Information"
-msgstr "·þÎñÆ÷ÐÅÏ¢"
+#: templates/prefs/sentmailselect.inc:38
+#, fuzzy
+msgid "Sent mail folder:"
+msgstr "´´½¨Ò»¸öÐÂµÄ·¢¼þÏä"
 
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "·þÎñÆ÷"
 
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
+msgstr "·þÎñÆ÷ÐÅÏ¢"
+
+#: templates/fetchmail/manage.inc:23
 msgid "Server:"
 msgstr "·þÎñÆ÷£º"
 
-msgid "Set preferences for filtering messages for unwanted content."
+#: config/prefs.php.dist:80
+msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 
-msgid "Set preferences for what happens when you move and delete messages."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "ÎÄ¼þ¼Ð"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "ÓÊ¼þ¼Ð"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
 msgstr ""
 
-msgid "Set the current time zone."
-msgstr "ÉèÖÃµ±Ç°Ê±Çø¡£"
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 
+#: templates/pgp/pgp.inc:4
+#, fuzzy
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr "¸½¼ÓÒ»¸öÄãµÄPGP¹«¹²ÃÜÔ¿µ½ÄãµÄÓÊ¼þÖÐ£¿"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "ÏÔÊ¾ËùÓÐÓÊ¼þÍ·"
+
+#: templates/message/headers.inc:67
 msgid "Show All Headers"
 msgstr "ÏÔÊ¾ËùÓÐÓÊ¼þÍ·"
 
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "ÏÔÊ¾ÒÑÉ¾³ýµÄ"
 
+#: templates/message/headers.inc:61
+#, fuzzy
 msgid "Show Limited Headers"
+msgstr "ÏÔÊ¾ËùÓÐÓÊ¼þÍ·"
+
+#: templates/message/headers.inc:70
+msgid "Show Mailing List Information"
+msgstr "ÏÔÊ¾ÓÊ¼þÁÐ±íÐÅÏ¢"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "ÏÔÊ¾Î´¶©ÔÄµÄ"
+
+#: folders.php:298
+msgid "Show Unsubscribed"
+msgstr "ÏÔÊ¾Î´¶©ÔÄµÄ"
+
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
+
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
+msgstr "Ã¿Ò³ÏÔÊ¾µÄÓÊ¼þÊý."
+
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
 msgstr ""
 
-msgid "Show Mailing List Information"
-msgstr "ÏÔÊ¾ÓÊ¼þÁÐ±íÐÅÏ¢"
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
 
-msgid "Show Unsubscribed"
-msgstr "ÏÔÊ¾Î´¶©ÔÄµÄ"
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
 
-msgid "Show last login time when logging in"
-msgstr "µ±µÇÂ¼Ê±ÏÔÊ¾×îºóÒ»´ÎµÇÂ¼Ê±¼ä"
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
 
-msgid "Show legend in the mailbox view."
+#: config/prefs.php.dist:666
+msgid "Shown"
 msgstr ""
 
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "´óÐ¡"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "´óÐ¡"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "´óÐ¡"
 
-msgid "Some of IMP's configuration files are missing:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
 msgstr ""
 
-msgid "Sort Direction"
-msgstr "ÅÅÐò·½Ïò"
-
-msgid "Spam Report from"
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
 msgstr ""
 
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "·¢¼þÈËµØÖ·"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "ÓÊ¼þ´óÐ¡"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "ÎÞÖ÷Ìâ"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "Î´ÔÄ¶Á"
+
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "·¢¼þÈËµØÖ·"
+
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "À¬»øÏä£º"
+
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "ÌØÊâ×Ö·û"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Æ´Ð´¼ì²é"
 
+#: templates/compose/spelling.inc:46
+#, fuzzy
 msgid "Spell Checker"
-msgstr ""
+msgstr "Æ´Ð´¼ì²é"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Æ´Ð´¼ì²éÍê±Ï"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr ""
 
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+#, fuzzy
+msgid "Start"
+msgstr "×´Ì¬"
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "×´Ì¬"
 
-msgid "Subject Field"
-msgstr "Ö÷Ìâ×Ö¶Î"
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "¸½¼þ"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Ö÷Ìâ"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Ö÷Ìâ"
 
-msgid "Subject:"
-msgstr "Ö÷Ìâ£º"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Ö÷Ìâ×Ö¶Î"
 
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Ìá½»"
 
+#: templates/folders/actions.inc:11
+#, fuzzy
 msgid "Subscribe to Folder(s)"
-msgstr ""
+msgstr "É¾³ýÎÄ¼þ¼Ð"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "³É¹¦"
 
+#: templates/compose/spelling.inc:86
+#, fuzzy
 msgid "Suggestions"
+msgstr "±£´æÑ¡Ïî"
+
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "ÎÄ±¾"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
 msgstr ""
 
-msgid "Sun"
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
 msgstr ""
 
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr ""
 
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "ÎÄ±¾"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, php-format
 msgid "The account \"%s\" has been deleted."
 msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»É¾³ý¡£"
 
-#, c-format
+#: fetchmailprefs.php:74
+#, php-format
 msgid "The account \"%s\" has been saved."
 msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»±£´æ¡£"
 
-#, c-format
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "µ±Ç°ÎÄ¼þ¼Ð\"%s\"½«±»¸ÄÃûÎª\"%s\"¡£"
 
-#, c-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr ""
 
-#, c-format
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾´æÔÚ"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
 
-#, c-format
+#: lib/Folder.php:356
+#, fuzzy, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr ""
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦¸ÄÃûÎª\"%s\"¡£"
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr ""
 
-#, c-format
+#: lib/Folder.php:343
+#, fuzzy, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr ""
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: lib/Folder.php:265
+#, fuzzy, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦´´½¨¡£"
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦É¾³ý¡£"
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦¸ÄÃûÎª\"%s\"¡£"
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
 msgstr ""
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
 msgstr ""
 
-msgid "The message being composed has been closed.  Exiting."
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
 msgstr ""
 
-msgid "The signature couldn't be replaced."
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
 msgstr ""
 
-msgid "The signature was successfully replaced."
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
 msgstr ""
 
-msgid "There are no messages in this mailbox."
-msgstr "ÔÚ¸ÃÓÊÏäÖÐÃ»ÓÐÈÎºÎÓÊ¼þ"
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾´æÔÚ"
 
-#, c-format
-msgid "There was a problem expunging %s. This is what the server said"
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
 msgstr ""
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»É¾³ý¡£"
+
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»±£´æ¡£"
+
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
 msgstr ""
 
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
 msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
+msgstr ""
+
+#: templates/compose/compose.js:102
+#, fuzzy
+msgid "The signature was successfully replaced."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦´´½¨¡£"
+
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»±£´æ¡£"
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»É¾³ý¡£"
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "ÕÊºÅ\"%s\"ÒÑ¾±»É¾³ý¡£"
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "É¾³ýÓÊ¼þ"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "ÖØ¼Ä¸ÃÓÊ¼þ"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
+msgid "There are no messages in this mailbox."
+msgstr "ÔÚ¸ÃÓÊÏäÖÐÃ»ÓÐÈÎºÎÓÊ¼þ"
+
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, fuzzy, php-format
+msgid "There was a problem expunging %s. This is what the server said"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: lib/Message.php:653
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 
-#, c-format
+#: lib/Message.php:621
+#, fuzzy
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: lib/Message.php:90
+#, fuzzy, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: lib/Message.php:198 lib/Message.php:213
+#, fuzzy, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
-msgstr ""
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
 
-#, c-format
+#: lib/Message.php:275
+#, fuzzy, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
-msgstr ""
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
 
-msgid "There was an error deleting messages. This is what the server said"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: lib/MIME/Viewer/itip.php:99
+#, php-format
+msgid "There was an error deleting the event: %s."
 msgstr ""
 
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr ""
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, fuzzy, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: folders.php:165
+#, php-format
+msgid "There was an error importing %s."
 msgstr ""
 
-msgid "There was an error flagging messages. This is what the server said"
+#: lib/MIME/Viewer/itip.php:136
+#, php-format
+msgid "There was an error importing the event: %s."
 msgstr ""
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
+#: lib/MIME/Viewer/itip.php:166
+#, php-format
+msgid "There was an error importing the task: %s."
 msgstr ""
 
-msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+#: lib/MIME/Viewer/itip.php:152
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 
-msgid "There was an error saving a draft."
+#: lib/Message.php:85
+#, fuzzy, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "ÎÄ¼þ¼Ð'%s'Ã»ÓÐ±»É¾³ý£¬·þÎñÆ÷ÐÅÏ¢ÈçÏÂ£º"
+
+#: compose.php:1244
+msgid "There was an error saving this message as a draft."
 msgstr ""
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr ""
 
-msgid "There was an error undeleting messages. This is what the server said"
+#: lib/MIME/Viewer/itip.php:113
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "ÔÚ¸ÃÓÊÏäÖÐÃ»ÓÐÈÎºÎÓÊ¼þ"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
 msgstr ""
 
-msgid "There was an error viewing the requested message."
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
 msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr ""
 
-msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
 msgstr ""
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
 msgstr ""
 
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: templates/javascript/folders.js:14
+#, fuzzy
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "ÄãÈ·¶¨Òª¼ÌÐøÂð£¿"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
 msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
 
-msgid "This may take some time. Are you sure you want to continue?"
+#: lib/MIME/Viewer/pgp.php:315
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr ""
 
-msgid "This message has been encrypted with PGP."
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
 msgstr ""
 
-msgid "This message has been reported as spam."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
 msgstr ""
 
+#: message.php:211
 msgid "This message to"
 msgstr "¸ÃÓÊ¼þµ½"
 
-msgid "This window must be called from compose window"
+#: acl.php:46
+msgid "This server does not support sharing folders."
 msgstr ""
 
-msgid "Thread View"
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
 msgstr ""
 
+#: thread.php:152
 #, fuzzy
-msgid "Thread"
-msgstr "Î´ÔÄ¶Á"
+msgid "Thread Display"
+msgstr "ÏÔÊ¾"
 
-msgid "Time Zone"
-msgstr "Ê±Çø"
+#: thread.php:76 config/prefs.php.dist:922
+#, fuzzy
+msgid "Thread View"
+msgstr "Î´ÔÄ¶Á"
 
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "ÊÕ¼þÈË"
 
-msgid "To:"
-msgstr "ÊÕ¼þÈË£º"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "·¢¼þÈËµØÖ·"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "¸½¼þ"
 
-#, fuzzy, c-format
-msgid "Total Size: %s KB"
-msgstr "×Ü¹²´óÐ¡£º%d KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "À¬»øÏä£º"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "À¬»øÏä£º"
 
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
+msgid "Unanswered"
+msgstr "Î´´ð¸´"
+
+#: templates/search/main.inc:35
 msgid "Unanswered messages"
 msgstr "Î´´ð¸´µÄÓÊ¼þ"
 
-msgid "Unanswered"
-msgstr "Î´´ð¸´"
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
+msgid "Undelete"
+msgstr "»Ö¸´ÒÑÉ¾³ýµÄ"
+
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
+msgid "Undisclosed Recipients"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
 
-msgid "Undelete"
-msgstr "»Ö¸´ÒÑÉ¾³ýµÄ"
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
 
-msgid "Undisclosed Recipients"
+#: mailbox.php:618
+msgid "Unknown Recipient"
 msgstr ""
 
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr ""
 
+#: fetchmailprefs.php:65
 #, fuzzy
 msgid "Unnamed"
 msgstr "ÓÃ»§Ãû"
 
-msgid "Unread"
-msgstr "Î´ÔÄ¶Á"
-
-msgid "Unseen Messages"
-msgstr ""
-
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Î´²é¿´"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr ""
 
-msgid "Upload"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
 msgstr ""
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
 msgstr ""
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr ""
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+msgid "Use IMAP folder subscriptions?"
 msgstr ""
 
+#: config/prefs.php.dist:735
 #, fuzzy
-msgid "User Options"
-msgstr "Ñ¡Ïî"
+msgid "Use Virtual Trash Folder?"
+msgstr "Çå³ýÀ¬»øÏä"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "ÓÃ»§Ãû"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
 
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "ÓÃ»§Ãû"
 
+#: templates/fetchmail/manage.inc:17
 #, fuzzy
 msgid "Username:"
 msgstr "ÓÃ»§Ãû"
 
-#, c-format
-msgid "View %s Public Key"
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "View"
 msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr ""
 
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
+msgid "View %s Public Key"
+msgstr "É¾³ý%s¹«¹²ÃÜÔ¿"
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "ÔÚÐÂ´°¿ÚÖÐFetch Mail"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "ÐÂÓÊ¼þ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
 msgid "View Personal Private Key"
-msgstr ""
+msgstr "µ¼Èë¸öÈËË½ÈËPGPÃÜÔ¿"
 
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+#, fuzzy
 msgid "View Personal Public Key"
+msgstr "µ¼Èë¸öÈË¹«¹²PGPÃÜ"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Î´ÔÄ¶Á"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
 msgstr ""
 
-msgid "View messages in "
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "ÔÚÐÂ´°¿ÚÖÐFetch Mail"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "ÔÚÐÂ´°¿ÚÖÐFetch Mail"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
 msgstr ""
 
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
+msgstr "ÐÂÓÊ¼þ"
+
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr ""
 
-msgid "View"
+#: lib/MIME/Viewer/itip.php:170
+msgid "View task"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "É¾³ýÓÊ¼þ"
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦É¾³ý¡£"
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "´´½¨ÎÄ¼þ¼Ð"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Çå³ýÀ¬»øÏä"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
 msgstr ""
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "»¶Óµ½ %s"
 
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
+msgstr ""
+
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
 msgstr ""
 
-msgid "Wrap text at this many characters."
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
 msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr ""
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "ÄãÔÚÏÂÁÐÓÊÏäÖÐÓÐÓÊ¼þ£º\\n"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "ÄãÔÚÏÂÁÐÓÊÏäÖÐÓÐÓÊ¼þ£º\\n"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
+msgstr "ÄãÔÚÏÂÁÐÓÊÏäÖÐÓÐÓÊ¼þ£º\\n"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "You are copying/moving to a new folder."
 msgstr ""
 
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr ""
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr ""
 
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr ""
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
+#, fuzzy
 msgid "You are renaming the folder: "
+msgstr "ÄãÔÚÏÂÁÐÓÊÏäÖÐÓÐÓÊ¼þ£º\\n"
+
+#: lib/Folder.php:557
+#, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr ""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
 msgstr ""
 
-msgid "You didn't specify a Mail Server"
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
 msgstr ""
 
-msgid "You didn't specify the password"
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
 msgstr ""
 
-msgid "You didn't specify the username"
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
 
-#, c-format
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "ÄãÓÐ%s·âÐÂÓÊ¼þ"
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "ÄãÓÐÒ»·âÐÂÓÊ¼þ"
 
-msgid "You have been logged out.<br />Thank you for using the system."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "ÄãÓÐÒ»·âÐÂÓÊ¼þ"
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
 msgstr ""
 
+#: lib/IMP.php:1074
 #, fuzzy
 msgid "You have new mail in the following folder:"
 msgstr "ÄãÔÚÏÂÁÐÓÊÏäÖÐÓÐÓÊ¼þ£º\\n"
 
+#: lib/IMP.php:1079
 #, fuzzy
 msgid "You have new mail in the following folders:"
 msgstr "ÄãÔÚÏÂÁÐÓÊÏäÖÐÓÐÓÊ¼þ£º\\n"
 
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
+
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Äã±ØÐëÏÈÑ¡ÖÐÒªÉ¾³ýµÄ¸½¼þ."
-
-msgid "You must first specify the file to attach."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
 msgstr ""
 
-msgid "You must have at least one recipient."
-msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
-
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
+#, fuzzy
 msgid "You must select a target mailbox first."
-msgstr ""
+msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
 
+#: fetchmailprefs.php:85
 #, fuzzy
 msgid "You must select an account to be deleted."
 msgstr "Äã±ØÐëÏÈÑ¡ÖÐÒªÉ¾³ýµÄ¸½¼þ."
 
+#: templates/contacts/contacts.inc:81
 #, fuzzy
 msgid "You must select an address first."
 msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
 
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 #, fuzzy
-msgid "You must select an identity to be deleted."
-msgstr "Äã±ØÐëÏÈÑ¡ÖÐÒªÉ¾³ýµÄ¸½¼þ."
-
 msgid "You must select at least one message first."
-msgstr ""
+msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
 
+#: templates/compose/redirect.inc:13
+#, fuzzy
 msgid "You must specify a recipient."
+msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
+
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Äã±ØÐëÖÁÉÙÓÐÒ»¸öÊÕ¼þÈË."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr ""
 
-#, c-format
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "ÖØ¼Ä¸ÃÓÊ¼þ"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "ÖØ¼Ä¸ÃÓÊ¼þ"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 
-#, c-format
+#: lib/Folder.php:510
+#, fuzzy, php-format
 msgid "You were successfully subscribed to \"%s\""
-msgstr ""
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦¸ÄÃûÎª\"%s\"¡£"
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr ""
 
-#, fuzzy, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "µÇÂ¼´íÎó£¬ÇëÖØÐÂµÇÂ¼"
-
-msgid "Your From: address:"
-msgstr ""
-
-msgid "Your Information"
-msgstr "ÄãµÄ¸öÈËÐÅÏ¢"
-
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "ÄãµÄÃû×Ö"
 
+#: templates/pgp/pgp.inc:50
+#, fuzzy
 msgid "Your PGP Public/Private Keys"
-msgstr ""
+msgstr "ÄãµÄË½ÈËÃÜÔ¿"
 
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "ÄãµÄË½ÈËÃÜÔ¿"
 
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "ÄãµÄ¹«¹²ÃÜÔ¿"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr ""
+
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
 
+#: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "ÄãµÄÕÊºÅ£º"
 
-msgid "Your browser does not support inline display of this image type"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
 
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
 msgstr "ÄãµÄä¯ÀÀÆ÷²»Ö§³Ö´òÓ¡¹¦ÄÜ£¬°´CTRL+P´òÓ¡¡£"
 
-msgid "Your current time zone:"
-msgstr "ÄãµÄµ±Ç°Ê±Çø£º"
-
-msgid "Your default identity:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
 msgstr ""
 
-msgid "Your full name:"
-msgstr "ÄãµÄÈ«Ãû£º"
-
-msgid "Your identities:"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
 msgstr ""
 
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "ÎÄ¼þ¼Ð\"%s\"ÒÑ¾³É¹¦É¾³ý¡£"
+
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "ÄãµÄÇ©Ãû£º"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[ÎÞÖ÷Ìâ]"
 
-msgid "add source"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "°µËÍ"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "¼ÓÈëºÚÃûµ¥"
+
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "³ËÍ"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "É¾³ý"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "ÎÄ¼þ¼Ð"
+
+#: templates/compose/compose.inc:81
+msgid "_Identity"
 msgstr ""
 
-msgid "cannot move past the beginning"
+#: lib/IMP.php:961
+msgid "_Inbox"
 msgstr ""
 
-msgid "cannot move past the end"
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "×¢Ïú"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "ÔÊ¼ÐÅÏ¢"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "ÐÂÓÊ¼þ"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "´òÓ¡"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
 msgstr ""
 
-msgid "delete message"
-msgstr "É¾³ýÓÊ¼þ"
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Ë¢ÐÂ"
 
-msgid "from"
-msgstr "·¢¼þÈË"
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "´ð¸´"
 
-msgid "move down"
-msgstr "ÏÂÒÆ"
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "²éÕÒ"
 
-msgid "move message to"
-msgstr "ÒÆ¶¯ÓÊ¼þµ½"
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "·¢ËÍÓÊ¼þ"
 
-msgid "move up"
-msgstr "ÉÏÒÆ"
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Î´ÔÄ¶Á"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "ÊÕ¼þÈË"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "»Ö¸´ÒÑÉ¾³ýµÄ"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Î´ÔÄ¶Á"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
 
-msgid "no folder selected"
+#: lib/Compose.php:176
+msgid "addressee unknown"
 msgstr ""
 
-msgid "no rule selected"
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "¸½¼þ"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "¸½¼þ"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
 msgstr ""
 
-msgid "no text specified"
+#: lib/Compose.php:200
+msgid "cannot create output file"
 msgstr ""
 
-msgid "none"
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
+msgid "from"
+msgstr "·¢¼þÈË"
+
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
 msgstr ""
 
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
+
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "ÓÊÏä"
+
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Ãû³Æ"
+
+#: templates/compose/spelling.inc:76
+#, fuzzy
+msgid "none"
+msgstr "Íê³É"
+
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "»òÕß"
 
-msgid "please fill in the text and choose a field and an action"
+#: lib/Compose.php:216
+msgid "permission denied"
 msgstr ""
 
-msgid "remove source"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
 msgstr ""
 
-msgid "select folder"
-msgstr "Ñ¡ÔñÎÄ¼þ¼Ð"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "Æ´Ð´´íÎó"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "Æ´Ð´´íÎó"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "Æ´Ð´´íÎó"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "¼ÓÈëºÚÃûµ¥"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
 msgstr ""


--- orig/templates/contacts/contacts.inc
+++ mod/templates/contacts/contacts.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function adjustSize()
@@ -176,9 +176,9 @@
 <input type="hidden" name="sa" />
 <?php Util::pformInput() ?>
 
-<div class="header">
+<h1 class="header">
   <?php echo _("Address Book") ?>
-</div>
+</h1>
 
 <div id="contactstable" class="headerbox item">
 
@@ -256,7 +256,7 @@
 </div>
 
 </form>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 adjustSize();
 //-->


--- orig/po/el_GR.po
+++ mod/po/el_GR.po
@@ -3,18 +3,22 @@
 # Stefanos I. Dimitriou <sdimitri_webmail at teiath.gr>, 2002.
 # Silligardos Xristoforos, 2002.
 # Anagnostopoulos Apostolis, 2002.
+# Milosis C. Konstantinos, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP: 3.2-cvs\n"
 "POT-Creation-Date: 2002-11-07 12:08+0200\n"
 "PO-Revision-Date: 2001-05-05 15:00+0200\n"
-"Last-Translator: Stefanos I. Dimitriou <support_webmail at teiath.gr>\n"
+"Last-Translator: Konstantinos C. Milosis <kmilosis at yahoo.com>\n"
 "Language-Team: Greek <dev at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+msgid "                        Switch to HTML composition"
+msgstr "ÅíáëëáãÞ ìåèüäïõ óôïé÷åéïèåóßáò"
+
 msgid "      To: "
 msgstr "    Ðñïò:"
 
@@ -30,6 +34,9 @@
 msgid " - $nm new messages"
 msgstr " - $nm ÍÝá ìçíýìáôá"
 
+msgid "  The mailbox trash is already empty."
+msgstr "  Ç ãñáììáôïèõñßäá 'êÜäïò' åßíáé Þäç Üäåéá."
+
 msgid " Subject: "
 msgstr " ÈÝìá:"
 
@@ -39,6 +46,27 @@
 msgid "#"
 msgstr "#"
 
+#: mailbox.php:190
+msgid "%d message(s) have been deleted."
+msgstr "%d ìÞíõìá(ôá) äéáãñÜöçêáí."
+
+#: lib/Spam.php:169
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "%d ìçíýìáôá áíáöÝñèçêáí óáí ÌÇ spam óôï äéá÷åéñéóôÞ ôïõ óõóôÞìáôïò."
+
+#: lib/Spam.php:149
+msgid "%d messages have been reported as not spam."
+msgstr "%d ìçíýìáôá áíáöÝñèçêáí óáí ÌÇ spam."
+
+#: lib/Spam.php:161
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "%d ìçíýìáôá áíáöÝñèçêáí óáí spam óôï äéá÷åéñéóôÞ ôïõ óõóôÞìáôïò."
+
+#: lib/Spam.php:141
+msgid "%d messages have been reported as spam."
+msgstr "%d ìçíýìáôá áíáöÝñèçêáí óáí spam."
+
 #, c-format
 msgid "%d of %d Messages"
 msgstr "%d áðü %d Ìçíýìáôá"
@@ -47,22 +75,82 @@
 msgid "%d to %d of %d Messages"
 msgstr "%d Ýùò %d áðü %d Ìçíýìáôá"
 
+#: pgp.php:332
+msgid "%s PGP Administration"
+msgstr "%s Äéá÷åßñéóç PGP"
+
+#: smime.php:254
+msgid "%s S/MIME Administration"
+msgstr "%s Äéá÷åßñéóç S/MIME"
+
 #, c-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s õðÜñ÷åé Þäç. Ï %s öÜêåëïò äåí ìåôïíïìÜóôçêå."
 
 #, c-format
 msgid "%s does not appear to be a valid mailbox."
-msgstr "%s äåí åßíáé Ýãêõñï ãñáììáôïêéâþôéï."
+msgstr "%s äåí öáßíåôáé íá åßíáé Ýãêõñï ãñáììáôïêéâþôéï."
 
 #, c-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s öÜêåëïò èá ìåôïíïìáóôåß óôçí áñ÷Þ ôïõ ìÞíá."
 
+#: lib/MIME/Viewer/itip.php:226
+msgid "%s has accepted."
+msgstr "%s Ýãéíå áðïäåêôü."
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "%s has cancelled %s."
+msgstr "%s áêýñùóå %s."
+
+#: lib/MIME/Viewer/itip.php:232
+msgid "%s has declined."
+msgstr "%s äåí Ýãéíå áðïäåêôü."
+
+#: lib/MIME/Viewer/itip.php:452
+msgid "%s has replied to a free/busy request."
+msgstr "%s áðÜíôçóå óå åñþôçìá åëåýèåñïõ/áðáó÷ïëçìÝíïõ."
+
+#: lib/MIME/Viewer/itip.php:583
+msgid "%s has replied to the invitation to %s."
+msgstr "%s áðÜíôçóå óôç ðñüóêëçóç ãéá %s."
+
+#: lib/MIME/Viewer/itip.php:441
+msgid "%s has sent you free/busy information."
+msgstr "%s áðÝóôåéëå ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ."
+
+#: lib/MIME/Viewer/itip.php:238
+msgid "%s has tentatively accepted."
+msgstr "%s Ýãéíå ðñïóùñéíÜ áðïäåêôü."
+
 #, c-format
 msgid "%s is already empty."
 msgstr "%s åßíáé Þäç Üäåéï."
 
+#: lib/MIME/Viewer/itip.php:446
+msgid "%s requests your free/busy information."
+msgstr "%s æÞôçóóå ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ."
+
+#: lib/MIME/Viewer/itip.php:541
+msgid "%s requests your presence at %s."
+msgstr "%s æÞôçóå ôçí ðáñïõóßá óïõ óôçí %s."
+
+#: lib/Message.php:398
+msgid "%s was successfully added to %s."
+msgstr "%s ðñïóôÝèçêå åðéôõ÷þò óôï %s."
+
+#: lib/MIME/Viewer/itip.php:553
+msgid "%s wishes to ammend %s."
+msgstr "%s åðéèõìåß ôñïðïðïßçóç ôïõ %s."
+
+#: lib/MIME/Viewer/itip.php:531
+msgid "%s wishes to make you aware of %s."
+msgstr "%s åðéèõìåß íá óáò ðëçñïöïñÞóåé ãéá %s."
+
+#: lib/MIME/Viewer/itip.php:558
+msgid "%s wishes to receive the latest information about %s."
+msgstr "%s åðéèõìåß íá ëÜâåé ôéò ôåëåõôáßåò ðëçñïöïñßåò ãéá %s."
+
 #, c-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;áðü&nbsp;%d)"
@@ -74,6 +162,12 @@
 msgstr ""
 "(Áðüññéøç üëùí ôùí áëëáãþí êáé åðéóôñïöÞ óôçí ïèüíç óýíèåóçò ìçíýìáôïò.)"
 
+msgid "(Highest)"
+msgstr "(Õøçëüôáôç)"
+
+msgid "(Maximum Attachment Size: %s bytes)"
+msgstr "(ÌÝãéóôï ìÝãåèïò Åðéóõíáðôüìåíïõ: %s bytes)"
+
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -81,12 +175,118 @@
 "(ÅðéóôñïöÞ óôçí ïèüíç óýíèåóçò áöïý Ý÷ïõí åöáñìïóôåß üëåò ïé áëëáãÝò. Ïé "
 "áëëáãÝò óå áõôÞ ôçí ïèüíç ÄÅÍ èá åöáñìïóôïýí.)"
 
+#: spelling.php:274
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(ÁðïóôïëÞ ìçíýìáôïò ìåôÜ ôçí åöáñìïãÞ ôùí áëëáãþí ðïõ Ý÷åôå Þäç êÜíåé. Ïé "
+"áëëáãÝò óôçí ôñÝ÷ïõóá ïèüíç ÄÅÍ èá åöáñìïóèïýí.)"
+
 msgid "* Add these by clicking OK *"
 msgstr "* ÐñïóèÞêç áõôþí åðéëÝãïíôáò ÏÊ *"
 
 msgid "* Please select address(es) *"
 msgstr "* Ðáñáêáëþ åðéëÝîôå ôç äéåýèõíóç(åéò) *"
 
+msgid "1 (Highest)"
+msgstr "1 (Õøçëüôáôç)"
+
+msgid "2 (High)"
+msgstr "2 (ÕøçëÞ)"
+
+msgid "3 (Normal)"
+msgstr "3 (ÊáíïíéêÞ)"
+
+msgid "4 (Low)"
+msgstr "4 (×áìçëÞ)"
+
+msgid "5 (Lowest)"
+msgstr "5 (×áìçëüôáôç)"
+
+#: config/prefs.php.dist:788
+msgid "100 characters"
+msgstr "100 ÷áñáêôÞñåò"
+
+#: config/prefs.php.dist:791
+msgid "1000 characters"
+msgstr "1000 ÷áñáêôÞñåò"
+
+#: config/prefs.php.dist:789
+msgid "250 characters"
+msgstr "250 ÷áñáêôÞñåò"
+
+#: config/prefs.php.dist:790
+msgid "500 characters"
+msgstr "500 ÷áñáêôÞñåò"
+
+msgid "<b>Content-Disposition:</b>"
+msgstr "<b>Äéáñßèìõóç Ðåñéå÷ïìÝíïõ:</b>"
+
+msgid "<b>Content-Transfer-Encoding:</b>"
+msgstr "<b>Êùäéêïðïéçóç ÌåôáöïñÜò Ðåñéå÷ïìÝíïõ:</b>"
+
+msgid "<b>Content-Type:</b>"
+msgstr "<b>Ôýðïò Ðåñéå÷ïìÝíïõ</b>"
+
+msgid "<b>Date:</b>"
+msgstr "<b>Çìåñïìçíßá:</b>"
+
+msgid "<b>Delivered-To:</b>"
+msgstr "<b>Ðáñáäüèçêå óôïí:</b>"
+
+msgid "<b>Description:</b>"
+msgstr "<b>ÐåñéãñáöÞ:</b>"
+
+msgid "<b>Disposition:</b>"
+msgstr "<b>Ñýèìéóç:</b>"
+
+msgid "<b>From:</b>"
+msgstr "<b>Áðü:</b>"
+
+msgid "<b>Headers:</b>"
+msgstr "<b>Åðéêåöáëßäåò:</b>"
+
+msgid "<b>In-Reply-To:</b>"
+msgstr "<b>Óå áðÜíôçóç ôïõ:</b>"
+
+msgid "<b>MIME-Version:</b>"
+msgstr "<b>¸êäïóç MIME:</b>"
+
+msgid "<b>Message-ID:</b>"
+msgstr "<b>Êùäéêüò Ìçíýìáôïò:</b>"
+
+#: lib/MIME/Viewer/itip.php:61
+msgid "<b>The calendar data is invalid</b>"
+msgstr "<b>Ôá äåäïìÝíá ôïõ çìåñïëïãßïõ äåí åßíáé Ýãêõñá</b>"
+
+msgid "<b>Total Attachments Size:</b>"
+msgstr "<b>Óõíïëéêü ÌÝãåèïò Åðéóõíáðôüìåíùí: </b>"
+
+msgid "<b>Priority:</b>"
+msgstr "<b>Ðñïôåñáéüôçôá:</b>"
+
+msgid "<b>Received:</b>"
+msgstr "<b>ÐáñáëÞöèçêå:</b>"
+
+msgid "<b>Return-Path:</b>"
+msgstr "<b>ÅðéóôñïöÞ óå:</b>"
+
+msgid "<b>Search</b>"
+msgstr "<b>ÁíáæÞôçóç</b>"
+
+msgid "<b>Subject:</b>"
+msgstr "<b>ÈÝìá:</b>"
+
+msgid "<b>To:</b>"
+msgstr "<b>Ðñïò:</b>"
+
+msgid "<b>User-Agent:</b>"
+msgstr "<b>ÌåóïëáâçôÞò ×ñÞóôç:</b>"
+
+msgid "<b>X-Priority:</b>"
+msgstr "<b>Ðñïôáéñåüôçôá-×:</b>"
+
 #, c-format
 msgid ""
 "<p><i>This message was written in a character set other than your own. If it "
@@ -94,29 +294,136 @@
 "i></p>\n"
 msgstr ""
 "<p><i>Áõôü ôï ìÞíõìá ãñÜöôçêå ìå äéáöïñåôéêÞ êùäéêïðïßçóç áðü áõôÞ ðïõ "
-"÷ñçóéìïðïéåßôå. Áí äåí åìöáíßæåôáé óùóôÜ, %s åðéëÝîôå åäþ </a> ãéá íá áíïßîåé "
-"óå íÝï ðáñÜèõñï. </i></p>\n"
+"÷ñçóéìïðïéåßôå. Áí äåí åìöáíßæåôáé óùóôÜ, %s åðéëÝîôå åäþ </a> ãéá íá "
+"áíïßîåé óå íÝï ðáñÜèõñï. </i></p>\n"
+
+msgid "AND"
+msgstr "ÊÁÉ"
+
+#: lib/MIME/Viewer/images.php:150
+msgid "A large image named %s is attached to this message."
+msgstr "Ìéá ìåãÜëç åéêüíá ìå üíïìá %s Ý÷åé åðéóõíáöèåß óå áõôü ôï ìÞíõìá."
+
+#: lib/MIME/Viewer/notification.php:53
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+"Åíá ìÞíõìá ðïõ áðïóôåßëáôå åß÷å óáí áðïôÝëåóìá ôçí åðéóôñïöÞ áõôïý ôïõ "
+"ìçíÞìáôïò åíçìÝñùóçò áðü ôïí ðáñáëÞðôç."
+
+#: lib/MIME/Viewer/itip.php:546
+msgid "Accept request"
+msgstr "Áðïäï÷Þ áéôÞìáôïò"
+
+#: lib/MIME/Viewer/itip.php:738
+msgid "Accepted"
+msgstr "¸ãéíå áðïäåêôü"
+
+#: lib/IMP.php:911 lib/IMP.php:913
+msgid "Acco_unts"
+msgstr "Ëïãáñéáóìïß"
+
+#: templates/fetchmail/manage.inc:7
+msgid "Account's name:"
+msgstr "¼íïìá Ëïãáñéáóìïý:"
 
 msgid "Action"
-msgstr "ÄñÜóç"
+msgstr "ÅíÝñãåéá"
+
+msgid "Actions"
+msgstr "ÅíÝñãåéåò"
 
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "ÐñïóèÞêç ðçãáßïõ"
+
+#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+msgid "Add this to my calendar"
+msgstr "ÐñïóèÞêç áõôïý óôï çìåñïëüãéü ìïõ"
+
+#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
 #, c-format
 msgid "Add to Addressbook (%s)"
 msgstr "ÐñïóèÞêç óôï ÄéåõèõíóéïãñÜöï (%s)"
 
+msgid "Added \"%s\" as an attachment."
+msgstr "ÐñïóôÝèçêå \"%s\" óáí óõíçììÝíï."
+
 msgid "Added an attachment."
 msgstr "ÐñïóôÝèçêå Ýíá óõíçììÝíï."
 
+#: config/prefs.php.dist:190
+msgid ""
+"Additional headers to display when viewing: <i>(optional, enter each header "
+"on a new line)</i>"
+msgstr ""
+"Ðñüóèåôåò åðéêåöáëßäåò ãéá åìöÜíéóç êáôÜ ôçí ðñïâïëÞ: <i>(ÐñïáéñåôéêÜ, âÜëå "
+"êÜèå åðéêåöáëßäá óå íÝá ãñáììÞ)</i>"
+
+#: lib/MIME/Viewer/notification.php:65
+msgid "Additional information can be viewed %s."
+msgstr "Åðéðñüóèåôåò ðëçñïöïñßåò ìðïñåßôå íá äåßôå %s."
+
+#: lib/MIME/Viewer/notification.php:65
+msgid "Additional information details"
+msgstr "Ðñüóèåôåò ðëçñïöïñéáêÝò ëåðôïìÝñåéåò"
+
+#: lib/MIME/Viewer/status.php:96
+msgid "Additional message details"
+msgstr "Ðñüóèåôåò ëåðôïìÝñåéåò ìçíýìáôïò"
+
+#: lib/MIME/Viewer/status.php:95
+msgid "Additional message details can be viewed %s."
+msgstr "Ðñüóèåôåò ëåðôïìÝñåéåò ìçíýìáôïò ìðïñïýí íá ðñïâëçèïýí %s."
+
+#: lib/MIME/Viewer/status.php:81
+msgid "Additional message error details"
+msgstr "Ðñüóèåôåò ëåðôïìÝñåéò ëÜèïõò ôïõ ìçíýìáôïò"
+
+#: lib/MIME/Viewer/status.php:80
+msgid "Additional message error details can be viewed %s."
+msgstr "Ðñüóèåôåò ëåðôïìÝñåéò ëÜèïõò ôïõ ìçíýìáôïò ìðïñïýí íá ðñïâëçèïýí %s."
+
+#: contacts.php:90 templates/contacts/contacts.inc:170
+#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
 msgid "Address Book"
-msgstr "ÄéåõèõíóéïãñÜöïò"
+msgstr "Äéåõè/ãñÜöïò"
+
+msgid "Address Books"
+msgstr "ÄéåõèõíóéïãñÜöïé"
 
 msgid "Addressbooks"
 msgstr "ÄéåõèõíóéïãñÜöïé"
 
+msgid ""
+"Addresses to BCC all messages: <i>(optional, enter each address on a new "
+"line)</i>"
+msgstr ""
+"Äéåõèýíóåéò ãéá ÊñõöÞ Êïéíïðïßçóç óå üëá óáò ôá ìçíýìáôá: <i>(ðñïåñáéôéêÜ, "
+"âÜëôå ìßá äéåýèõíóç óå êÜèå ãñáììÞ)</i>"
+
+msgid ""
+"Addresses to explicitly tie to this identity: <i>(optional, enter each "
+"address on a new line)</i>"
+msgstr ""
+"Äéåõèýíóåéò ðïõ áíôéóôïé÷ïýí áðïêëåéóôéêÜ óå áõôÞ ôç ôáõôüôçôá: <i>"
+"(ðñïåñáéôéêÜ, âÜëôå ìßá äéåýèõíóç óå êÜèå ãñáììÞ)</i>"
+
+msgid "All"
+msgstr "Oëá"
+
 msgid "All messages in the folder(s) will be lost!"
 msgstr "¼ëá ôá ìçíýìáôá óôïí(ïõò) öÜêåëï(ïõò) èá ÷áèïýí!"
 
 msgid ""
+"All messages in the folder(s) will be lost!\\nAre you completely sure you "
+"wish to continue?\\n"
+msgstr ""
+"¼ëá ôá ìçíýìáôá óôï(ïõò) öÜêåëï(ïõò) èá ÷áèïýí! \\nÅßóôå áðïëýôùò óßãïõñïé "
+"üôé èÝëåôå íá óõíå÷ßóåôå;\\n"
+
+msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
@@ -130,12 +437,48 @@
 "¼ëá ôá ìçíýìáôá óôï öÜêåëï \"%s\" ðïõ åßíáé ðáëéüôåñá áðü %s çìÝñåò èá "
 "äéáãñáöïýí ìüíéìá."
 
+#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "Ïëá ôá óõíçììÝíá ðïõ åßíáé ðáëáéüôåñá áðü %s ìÞíåò èá äéáãñáöïýí."
+
 #, c-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "¼ëïé ïé öÜêåëïé ìå áðåóôáëìÝíá ðïõ åßíáé ðáëéüôåñïé áðü %s ìÞíåò èá äéáãñáöïýí."
+msgstr ""
+"¼ëïé ïé öÜêåëïé ìå áðåóôáëìÝíá ðïõ åßíáé ðáëéüôåñïé áðü %s ìÞíåò èá "
+"äéáãñáöïýí."
 
-msgid "All"
-msgstr "Oëá"
+msgid ""
+"All sessions begin at the Login screen.  Before you can use any of the "
+"webmail features, you must connect to your IMAP account using the username "
+"and password assigned to you by your network administrator."
+msgstr ""
+"Èá îåêéíÞóåôå áðü ôçí ïèüíç åéóüäïõ. Ðñéí ÷ñçóéìïðïéÞóåôå ïðïéåóäÞðïôå áðü "
+"ôéò õðçñåóßåò ôïõ Web Mail, èá ðñÝðåé íá óõíäåèåßôå óôï ëïãáñéáóìü IMAP ðïõ "
+"Ý÷åôå ÷ñçóéìïðïéþíôáò ôï üíïìá ÷ñÞóôç êáé ôï óõíèçìáôéêü ðïõ óáò Ý÷ïõí äþóåé."
+
+#: templates/filters/prefs.inc:55
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+"Íá åðéôñÝðåôáé êáíüíåò ößëôñùí íá åöáñìüæïíôáé óå ïðïéáäÞðïôå ãñáììáôïèõñßäá "
+"(mailbox);"
+
+#: lib/MIME/Viewer/alternative.php:113
+msgid "Alternative parts for this section:"
+msgstr "ÅíáëëáêôéêÜ ìÝñç ãéá áõôÞ ôç óõíåäñßá:"
+
+msgid "Always"
+msgstr "ÐÜíôá"
+
+msgid "Always save attachments"
+msgstr "ÁðïèÞêåõóç óõíçììÝíùí ðÜíôá"
+
+#: lib/Message.php:491
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
+"ÐñïÝêõøå ëÜèïò êáôÜ ôç ðñïóðÜèåéá áðüóðáóçò ôïõ óõíçììÝíïõ. Ï åîõðçñåôçôÞò "
+"IMAP áíáöÝñåé: "
 
 msgid "An illegal value was specified."
 msgstr "Ïñßóôçêå ìßá ìç åðéôñåðüìåíç ôéìÞ."
@@ -143,88 +486,266 @@
 msgid "An unknown error occured adding the new entry."
 msgstr "ÐáñïõóéÜóôçêå Üãíùóôï ëÜèïò êáôÜ ôçí ðñïóèÞêç íÝáò åããñáöÞò."
 
-msgid "Answered messages"
-msgstr "ÁðáíôçìÝíá ìçíýìáôá"
+#: lib/Message.php:385
+msgid "An unknown error occured while creating the new task."
+msgstr "ÐñïÝêõøå Üãíùóôï ëÜèïò êáôÜ ôç äçìéïõñãßá íÝáò åñãáóßáò."
 
 msgid "Answered"
 msgstr "ÁðáíôçìÝíá"
 
+msgid "Answered messages"
+msgstr "ÁðáíôçìÝíá ìçíýìáôá"
+
 msgid "Apply All Rules"
 msgstr "ÅöáñìïãÞ üëùí ôùí êáíüíùí"
 
+msgid "Apply Filters"
+msgstr "ÅöáñìïãÞ Ößëôñùí"
+
 msgid "Apply Filters on"
 msgstr "ÅöáñìïãÞ ôùí ößëôñùí óôï"
 
 msgid "Apply filter rules upon logging on?"
 msgstr "ÅöáñìïãÞ ôùí êáíüíùí ößëôñùí êÜèå öïñÜ ðïõ êÜíåôå åéóáãùãÞ;"
 
+msgid "Apply filter rules upon logging on."
+msgstr "ÅöáñìïãÞ ôùí êáíüíùí ößëôñùí êÜèå öïñÜ ðïõ ìðáßíåôå óôçí õðçñåóßá."
+
 msgid "Apply filter rules when mailbox is refreshed?"
-msgstr "ÅöáñìïãÞ ôùí êáíüíùí ößëôñùí êÜèå öïñÜ ðïõ êÜíåôå áíáíÝùóç ôïõ ãñáììáôïêéâþôéïõ;"
+msgstr ""
+"ÅöáñìïãÞ ôùí êáíüíùí ößëôñùí êÜèå öïñÜ ðïõ êÜíåôå áíáíÝùóç ôïõ "
+"ãñáììáôïêéâþôéïõ;"
+
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr "ÅöáñìïãÞ ôùí êáíüíùí ößëôñùí êÜèå öïñÜ ðïõ åìöáíßæåôå ôá Åéóåñ÷üìåíá;"
+
+msgid "Apply Filters to %s"
+msgstr "ÅöáñìïãÞ Ößëôñùí óå %s"
 
 msgid "April"
 msgstr "Áðñßëéïò"
 
+msgid "Approximate Size"
+msgstr "ÌÝãåèïò êáôÜ ðñïóÝããéóç"
+
 msgid "Are you SURE you want to continue?"
 msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá óõíå÷ßóåôå;"
 
+#: templates/folders/javascript.inc:5
 msgid "Are you completely sure you wish to continue?"
-msgstr "Åßóôå áðüëõôá óßãïõñïé ðùò èÝëåôå íá óõíå÷ßóåôå;"
+msgstr "Åßóáé áðüëõôá óßãïõñïò üôé èÝëåéò íá óõíå÷ßóåéò;"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+msgid "Are you sure you want to delete this public key?"
+msgstr "Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå áõôü ôï äçìüóéï êëåéäß;"
+
+#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+"Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå áõôü ôï æåýãïò êåëéäéþí (Äåí "
+"óõíßóôáôáé!)"
 
 msgid "Are you sure you want to do this?"
 msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá åêôåëÝóåôå áõôÞ ôçí åíÝñãåéá;"
 
+#: templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá äéáãñÜøåôå áõôÜ ôá ìçíýìáôá ÌÏÍÉÌÁ;"
 
+#: lib/MIME/Contents.php:215
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá äéáãñÜøåôå áõôÜ ôá óõíçììÝíá ÌÏÍÉÌÁ;"
+
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá áäåéÜóåôå áõôü ôïí öÜêåëï;"
 
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá áäåéÜóåôå ôïí êÜäï;"
 
+#: templates/mailbox/actions.inc:8
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Åßóôå óßãïõñïé ðùò èÝëåôå íá äéáãñÜøåôå áõôÜ ôá ìçíýìáôá ìïíéìá;"
+
+#: templates/mailbox/javascript.inc:86
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "ÈÝëåôå óßãïõñá íá áíáöÝñåôå áõôÜ ôá ìçíýìáôá óáí 'áèþá';"
+
+#: templates/mailbox/javascript.inc:77
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Åßóôå óßãïõñïé üôé èÝëåôå íá áíáöÝñåôå áõôÜ ôá ìçíýìáôá óáí 'spam';"
+
 msgid "Arrival Time"
 msgstr "¿ñá ËÞøçò"
 
 msgid "Ascending"
 msgstr "Áýîïõóá"
 
+msgid "Ask"
+msgstr "Åñþôçóç"
+
 msgid "Attach"
 msgstr "Åðéóýíáøç"
 
+#: templates/compose/compose.inc:466
+msgid "Attach Files"
+msgstr "Åðéóýíáøç Áñ÷åßùí"
+
+#: templates/compose/compose.inc:447
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "Íá åðéóõíáöèåß áíôßãñáöï ôïõ äçìüóéïõ PCP êëåéäéïý óáò óôï ìÞíõìá;"
+
+#: lib/MIME/Viewer/tnef.php:113
+msgid "Attached File:"
+msgstr "Åðéóõíáðôüìåíï Áñ÷åßï:"
+
+#: lib/Compose.php:355 lib/Compose.php:442
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+"Ôï åðéóõíáðôüìåíï áñ÷åßï \"%s\" õðåñâáßíåé ôï üñéï ìåãÝèïõò åðéóõíáðôüìåíïõ. "
+"ÄÅÍ èá åðéóõíáöèåß."
+
+#: lib/MIME/Viewer/itip.php:341
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "Ôï åðéóõíáðôüìåíï åßíáé áðÜíôçóç óå áßôçìá çìåñïëïãßïõ ðïõ óôåßëáôå."
+
 msgid "Attachment"
 msgstr "ÓõíçììÝíï"
 
+#: compose.php:977 lib/Message.php:452
+msgid "Attachment stripped: Original attachment type"
+msgstr "Ôï óõíçììÝíï áðïóðÜóèçêå: Ðñáãìáôéêüò ôýðïò äåäïìÝíùí"
+
 msgid "Attachments"
 msgstr "ÓõíçììÝíá"
 
+#: lib/MIME/Viewer/itip.php:668
+msgid "Attendees"
+msgstr "ÓõììåôÝ÷ïíôåò"
+
+#: lib/MIME/Viewer/notification.php:56
+msgid "Attention"
+msgstr "Ðñïóï÷Þ"
+
 msgid "August"
 msgstr "Áýãïõòôïò"
 
-msgid "Available Addressbooks:"
+#: lib/Auth/imp.php:49
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr "Auth_imp: Ç áðáéôïýìåíç åðÝêôáóç IMAP äåí âñÝèçêå."
+
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
+"Áõôüìáôç åìöÜíéóç åéêüíùí óå HTML ìçíýìáôá üôáí ï áðïóôïëÝáò åßíáé óôï "
+"ÄéåõèõíóéïãñÜöï ìïõ;"
+
+msgid "Available Address books:"
 msgstr "ÄéáèÝóéìïé ÄéåõèõíóéïãñÜöïé:"
 
+#: lib/MIME/Viewer/itip.php:704
+msgid "Awaiting Response"
+msgstr "Óå ÁíáìïíÞ ÁðÜíôçóçò"
+
+msgid "Bac_k to %s"
+msgstr "ÅðéóôñïöÞ óôá %s"
+
 #, c-format
 msgid "Back to %s"
 msgstr "ÅðéóôñïöÞ óôá %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "ÅðéóôñïöÞ óôï ÅõñåôÞñéï Ðïëëáðëþí ÌçíõìÜôùí"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "ÅðéóôñïöÞ óôçí åìöÜíéóç ÍçìÜôùí"
+
+#: lib/IMAP/Client.php:572
+msgid "Bad login name or password."
+msgstr "Áêõñï üíïìá Þ êùäéêüò."
+
+#: lib/IMAP/Client.php:387
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Áêõñï Þ êáêïãñáìÝíï åñþôçìá. Ï ÅîõðçñåôçôÞò áðÜíôçóå: %s"
+
+#: lib/IMAP/Client.php:576
+msgid "Bad request: %s."
+msgstr "Áêõñï åñþôçìá: %s."
+
 msgid "Bcc"
 msgstr "ÊñõöÞ Êïéíïðïßçóç"
 
+msgid ""
+"Begin by entering your user and password in the appropriate fields.  You'll "
+"then need to select the IMAP mail server to which you'd like to connect."
+msgstr ""
+"ÎåêéíÞóôå âÜæïíôáò ôï üíïìá ÷ñÞóôç êáé ôï óõíèçìáôéêü óáò óôá êáôÜëëçëá "
+"ðåäßá. Êáôüðéí ðñÝðåé íá åðéëÝîåôå ôïí ôýðï äéáêïìéóôÞ ðïõ èá "
+"÷ñçóéìïðïéÞóåôå."
+
+#: lib/MIME/Viewer/status.php:168
+msgid "Below is the raw text of the status information message."
+msgstr "Áêïëïõèåß ôï 'êáèáñü' êåßìåíï ôïõ ðëçñïöïñéáêïý ìçíýìáôïò êáôÜóôáóçò."
+
 msgid "Blacklist"
 msgstr "Åíï÷ëçôéêÞ Áëëçëïãñáößá"
 
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+"Íá ìðëïêÜñïíôáé ïé åéêüíåò óå ìçíýìáôá HTML åêôüò áí ñçôÜ Ý÷ïõí æçôçèåß;"
+
 msgid "Body"
 msgstr "Êåßìåíï Ìçíýìáôïò"
 
+msgid "Body:"
+msgstr "Êåßìåíï Ìçíýìáôïò:"
+
 msgid "Both"
 msgstr "Êáé ôá äýï"
 
-msgid "Cancel Message"
-msgstr "Áêýñùóç Ìçíýìáôïò"
+msgid "Both Header Listing and Body of Message"
+msgstr "Êáé ôá äýï, óôçí åðéêåöáëßäá êáé óôï óþìá ôïõ ìçíÞìáôïò"
+
+msgid "Browse..."
+msgstr "ÁíáæÞôçóç..."
+
+msgid "C_harset"
+msgstr "Êùäéêïóåëßäá"
+
+#: templates/search/fields.inc:35
+msgid "Calendar"
+msgstr "Çìåñïëüãéï"
+
+#: lib/Fetchmail/imap.php:204
+msgid "Can not connect to the remote mail server."
+msgstr "Áäýíáôç ç óýíäåóç ìå ôïí áðïìáêñõóìÝíï åîõðçñåôçôÞ e-mail."
+
+#: lib/Fetchmail/imap.php:202
+msgid "Can not connect to the remote mail server: "
+msgstr "Áäýíáôç ç óýíäåóç ìå ôïí áðïìáêñõóìÝíï åîõðçñåôçôÞ e-mail:"
+
+#: lib/MIME/Viewer/partial.php:53
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+"Áäýíáôç ç åìöÜíéóç - âñÝèçêáí ìüíï %s áðü %s ìÝñç áõôïý ôïõ ìçíýìáôïò óôç "
+"ôñÝ÷ïõóá ãñáììáôïèõñßäá."
 
+#: templates/contacts/contacts.inc:248 templates/folders/import.inc:21
+#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
+#: templates/compose/spelling.inc:106 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Áêýñùóç"
 
+msgid "Cancel Message"
+msgstr "Áêýñùóç Ìçíýìáôïò"
+
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Áêõñþíïíôáò áõôü ôï ìÞíõìá èá ÷áèïýí ïñéóôéêÜ ôá ðåñéå÷üìåíá ôïõ."
 
@@ -234,9 +755,15 @@
 msgid "Cc:"
 msgstr "Êïéíïðïßçóç:"
 
+msgid "Change"
+msgstr "ÁëëáãÞ"
+
 msgid "Change All"
 msgstr "ÁëëáãÞ ¼ëùí"
 
+msgid "Change Folder"
+msgstr "ÁëëáãÞ ÖáêÝëïõ"
+
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -247,6 +774,9 @@
 msgid "Change mail server settings."
 msgstr "ÁëëáãÞ ôùí ñõèìßóåùí ÄéáêïìéóôÞ."
 
+msgid "Change mail server and folder settings."
+msgstr "ÁëëáãÞ ôùí ñõèìßóåùí ÄéáêïìéóôÞ êáé ÖáêÝëëùí."
+
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -254,14 +784,29 @@
 "Ìðïñåßôå íá áëëÜîåôå ôï üíïìá, ôç äéåýèõíóç êáé ôçí õðïãñáöÞ óáò, óôïé÷åßá "
 "ðïõ âëÝðïõí ïé ðáñáëÞðôåò óáò üôáí äéáâÜæïõí Þ áðáíôÜíå óôá ìçíýìáôÜ óáò."
 
-msgid "Change"
-msgstr "ÁëëáãÞ"
+#: config/prefs.php.dist:793
+msgid "Characters to display:"
+msgstr "×áñáêôÞñåò ðñïò åìöÜíéóç:"
 
+#: templates/folders/actions.inc:13
 msgid "Check Folder(s) for New Mail"
 msgstr "¸ëåã÷ïò ÖáêÝëïõ(ùí) ãéá ÍÝá Ìçíýìáôá"
 
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+msgid "Check _All/None"
+msgstr "ÅðéëïãÞ ¼ëùí/Êáíåíüò"
+
+#: templates/fetchmail/fetchmail.inc:14
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+"¸ëåã÷ïò üëùí ôùí åîõðçñåôçôþí áðü ôïõò ïðïéïõò èÝëåôå íá áíôëÞóåôå ìçíýìáôá:"
+
+#: config/prefs.php.dist:454
+msgid "Check spelling before sending a message?"
+msgstr "Åëåã÷ïò ïñèïãñáößáò ðñéí ôçí áðïóôïëÞ;"
+
 msgid "Checkbox"
-msgstr "ÅðéëïãÞ ôùí e-mail"
+msgstr "Ðëáßóéï ÅðéëïãÞò"
 
 msgid "Choose Action:"
 msgstr "ÅðéëÝîôå ÅíÝñãåéá:"
@@ -269,42 +814,132 @@
 msgid "Choose a mail server:"
 msgstr "ÅðéëÝîôå ÄéáêïìéóôÞ Áëëçëïãñáößáò:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:716
+msgid "Choose an action:"
+msgstr "ÅðéëÝîôå ìéá åíÝñãåéá:"
+
+msgid "Choose the address book to use when adding addresses."
 msgstr ""
 "ÅðéëÝîôå ôïí ÄéåõèõíóéïãñÜöï ðïõ èá ÷ñçóéìïðïéåßôå üôáí ðñïóèÝôåôå íÝåò "
 "äéåõèýíóåéò."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
-msgstr "ÅðéëÝîôå ôç óåéñÜ ìå ôçí ïðïßá èá ãßíåôáé áíáæÞôçóç óôïõò äéåõèõíóéïãñÜöïõò."
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+"ÅðéëÝîôå ôç óåéñÜ ìå ôçí ïðïßá èá ãßíåôáé áíáæÞôçóç óôïõò äéåõèõíóéïãñÜöïõò."
 
 #, c-format
 msgid "Cleared all messages from %s."
 msgstr "Êáèáñéóìüò üëùí ôùí ìçíõìÜôùí áðü %s."
 
+#: lib/MIME/Viewer/images.php:100
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+"ÐáôÞóôå %s ãéá íá ìåôáôñáðåß ôï áñ÷åßï åéêüíáò óå ìïñöÞ ðïõ ìðïñåß íá äåßîåé "
+"ï åîåñåõíçôÞò óáò"
+
+#: lib/MIME/Viewer/images.php:89
+msgid "Click %s to download the image."
+msgstr "ÐáôÞóôå %s ãéá íá êáôåâÜóåôå ôçí åéêüíá."
+
+#: lib/Filter.php:103
+msgid "Click %s to go to %s management page."
+msgstr "ÐáôÞóôå %s ãéá ìåôÜâáóç óôç óåëßäá äéá÷åßñéóçò %s."
+
+#: lib/MIME/Viewer/html.php:116
+msgid "Click %s to view HTML content in a separate window."
+msgstr "ÐáôÞóôå %s ãéá íá äåßôå ôá ðåñéå÷üìåíá HTML óå äéáöïñåôéêü ðáñÜèõñï."
+
+#: lib/MIME/Viewer/images.php:151
+msgid "Click %s to view a thumbnail of this image."
+msgstr "ÐáôÞóôå %s ãéá íá äåßôå ôçí åéêüíá óå ìéêñÞ êëßìáêá."
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ÐáôÞóôå %s ãéá íá äåßôå ôï óõíçììÝíï óå äéáöïñåôéêü ðáñÜèõñï."
+
+#: lib/MIME/Viewer/related.php:64
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "ÐáôÞóôå %s ôá ðïëëáðëÜ/ó÷åôéêÜ ìÝñç óå äéáöïñåôéêü ðáñÜèõñï."
+
 msgid "Click here for Secure HTTPS"
 msgstr "ÅðéëÝîôå åäþ ãéá áóöáëÝò HTTPS"
 
 msgid "Click here for Standard HTTP"
 msgstr "ÅðéëÝîôå åäþ ãéá áðëü HTTP"
 
+#: lib/MIME/Viewer/html.php:103
+msgid "Click here to HIDE the Images"
+msgstr "ÐáôÞóôå åäþ ãéá íá ÊÑÕØÅÔÅ ôçí åéêüíá"
+
+#: lib/MIME/Viewer/html.php:106
+msgid "Click here to SHOW the Images"
+msgstr "ÐáôÞóôå åäþ ãéá íá ÅÌÖÁÍÉÓÅÔÅ ôçí åéêüíá"
+
+#: templates/prefs/sourceselect.inc:321
 msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
+"Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
-"ÅðéëÝîôå Ýíá áðü ôïõò äéáèÝóéìïõò äéåõèõíóéïãñÜöïõò, êáôüðéí åðéëÝîôå ôá "
+"ÅðéëÝîôå Ýíáí áðü ôïõò äéáèÝóéìïõò äéåõèõíóéïãñÜöïõò, êáôüðéí åðéëÝîôå ôá "
 "ðåäßá óôá ïðïßá èá ãßíåôáé áíáæÞôçóç."
 
+#: lib/MIME/Viewer/pgp.php:176
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr "ÐáôÞóôå ãéá íá óþóåôå ôï PGP äçìüóéï êëåéäß óôï ÄéåõèõíóéïãñÜöï óáò"
+
+#: lib/MIME/Viewer/pkcs7.php:194
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+"ÐáôÞóôå ãéá íá óþóåôå ôï S/MIME ðéóôïðïéçôéêü ôïõ %s óôï ÄéåõèõíóéïãñÜöï óáò"
+
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+"ÊÜíïíôáò êëéê óôç äéåýèõíóç íá áíïßîåé óýíèåóç íÝïõ ìçíýìáôïò ãéá ôïí "
+"áðïóôïëÝá"
+
+msgid "Clicking on the address will open the message to be read"
+msgstr "ÊÜíïíôáò êëéê óôç äéåýèõíóç íá áíïßîåé ôï ìÞíõìá ãéá áíÜãùíóç"
+
+#: templates/fetchmail/fetchmail.inc:30
+msgid "Close"
+msgstr "Êëåßóéìï"
+
+#: compose.php:751 compose.php:1058
+msgid "Close this window"
+msgstr "Êëåßóéìï áõôïý ôïõ ðáñáèýñïõ"
+
+#: folders.php:383
 msgid "Closed Folder"
 msgstr "Êëåéóôüò ÖÜêåëïò"
 
-msgid "Collapse All Folders"
-msgstr "ÁíÜðôõîç üëùí ôùí ÖáêÝëùí"
+#: folders.php:403
+msgid "Collapse"
+msgstr "Óýìðôõîç"
 
+#: templates/folders/actions.inc:34
 msgid "Collapse All"
-msgstr "ÁíÜðôõîç üëùí"
+msgstr "Óýìðôõîç üëùí"
+
+msgid "Collapse All Folders"
+msgstr "Óýìðôõîç üëùí ôùí ÖáêÝëùí"
 
 msgid "Collapse Folder"
-msgstr "ÁíÜðôõîç ÖáêÝëïõ"
+msgstr "Óýìðôõîç ÖáêÝëïõ"
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr "×ñùìáôéêüò Äåßêôçò: "
+
+#: templates/pgp/pgp.inc:191
+msgid "Comment"
+msgstr "Ó÷üëéï"
+
+#: lib/MIME/Viewer/itip.php:754
+msgid "Completed"
+msgstr "ÏëïêëçñùìÝíï"
+
+msgid "Compose"
+msgstr "Óýíèåóç"
 
 #, c-format
 msgid "Compose Message (%s)"
@@ -313,15 +948,67 @@
 msgid "Compose a message"
 msgstr "Óýíèåóç åíüò ìçíýìáôïò"
 
+#: compose.php:750 compose.php:1057
+msgid "Compose another message"
+msgstr "Óýíèåóç Üëëïõ ìçíýìáôïò"
+
 msgid "Compose messages in a separate window?"
 msgstr "Ç óýíèåóç ôùí ìçíõìÜôùí íá ãßíåôáé óå íÝï ðáñÜèõñï;"
 
-msgid "Compose"
-msgstr "Óýíèåóç"
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+"Óýíèåóç ìçíÞìáôïò ìå HTML óôïé÷åéïèåóßá åî ïñéóìïý; (áí ï browser "
+"õðïóôçñßæåé áõôü ôï ÷áñáêôçñéóôéêü)"
+
+msgid "Conclusion"
+msgstr "ÓõìðÝñáóìá"
+
+msgid "Configure how messages are displayed."
+msgstr "Ñõèìßóôå ðùò èá åìöáíßæïíôáé ôá ìçíýìáôá."
+
+#: config/prefs.php.dist:96
+msgid "Configure mail preview options."
+msgstr "Ñõèìßóôå ôéò åðéëïãÝò åìöÜíéóçò ìçíõìÜôùí."
+
+#: framework/IMAP/IMAP/ACL/rfc2086.php:206
+#: framework/IMAP/IMAP/ACL/rfc2086.php:319
+msgid "Connection failed."
+msgstr "Ç óýíäåóç áðÝôõ÷å."
+
+#: framework/IMAP/IMAP/ACL/rfc2086.php:206
+#: framework/IMAP/IMAP/ACL/rfc2086.php:319
+msgid "Connection failed: "
+msgstr "Ç óýíäåóç áðÝôõ÷å:"
+
+#: framework/Crypt/Crypt/pgp.php:793
+msgid "Connection refused to the public keyserver."
+msgstr "Áñíçóç óýíäåóçò áðü ôïí åîõðçñåôçôÞ Äçìüóéùí êëåéäéþí."
+
+#: framework/Crypt/Crypt/pgp.php:795
+msgid "Connection refused to the public keyserver. Reason: %s (%s)"
+msgstr "Áñíçóç óýíäåóçò áðü ôïí åîõðçñåôçôÞ Äçìüóéùí êëåéäéþí. Ëüãïò: %s (%s)"
+
+#: framework/VFS/VFS/ftp.php:794
+msgid "Connection to FTP server failed."
+msgstr "Ç óýíäåóç óôïí åîõðçñåôçôÞ FTP áðÝôõ÷å."
+
+#: lib/Fetchmail/imap.php:237
+msgid "Connection to server failed"
+msgstr "Ç óýíäåóç ìå ôï äéáêïìéóôÞ áðÝôõ÷å"
 
 msgid "Contact List"
 msgstr "Ëßóôá åðáöþí"
 
+#: config/prefs.php.dist:135
+msgid "Control PGP support for %s."
+msgstr "ÅëÝãîôå ôçí õðïóôÞñéîç PGP ãéá %s."
+
+#: config/prefs.php.dist:144
+msgid "Control S/MIME support for %s."
+msgstr "ÅëÝãîôå ôçí õðïóôÞñéîç S/MIME ãéá %s."
+
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -329,22 +1016,66 @@
 "ÅðéëÝîôå êÜèå ðüôå ãßíåôáé Ýëåã÷ïò ãéá íÝá ìçíýìáôá, êáé áí èá åéäïðïéåßóôå "
 "üôáí Ýñ÷ïíôáé."
 
+#: config/prefs.php.dist:700
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "Íá ìåôáôñÝðïíôáé ÷áéñåôéóìïß óõìâüëùí óå áíôßóôïé÷á åéêïíßäéá;"
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "ÁíôéãñáöÞ"
 
+#: templates/message/navbar_navigate.inc:19
+msgid "Copy to folder"
+msgstr "ÁíôéãñáöÞ óå öÜêåëï"
+
+#: templates/compose/spelling.inc:44
 msgid "Correct"
 msgstr "Óùóôü"
 
 msgid "Corrected Text"
 msgstr "ÄéïñèùìÝíï Êåßìåíï"
 
+#: attachment.php:50
+msgid "Could not create the VFS backend: %s"
+msgstr "Áäýíáôç ç äçìéïõñãßá õðïóôÞñéîçò VFS: %s"
+
 #, c-format
 msgid "Could not delete messages from %s: %s"
 msgstr "Äåí Þôáí äõíáôüí íá äéáãñáöïýí ôá ìçíýìáôá áðü %s: %s"
 
+#: lib/Message.php:634
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "Áäýíáôç ç äéáãñáöÞ ìçíõìÜôùí áðü %s. Ï åîõðçñåôçôÞò áíáöÝñåé: %s"
+
+#: lib/Session.php:294
+msgid "Could not execute maintenance operations."
+msgstr "Áäýíáôç ç åêôÝëåóç äéáäéêáóéþí óõíôÞñçóçò."
+
+#: lib/MIME/Viewer/tnef.php:56
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr "Áäýíáôç ç åîáãùãÞ ôïõ áéôïýìåíïõ áñ÷åßïõ áðü MS-TNEF óõíçììÝíï."
+
+#: lib/MIME/Viewer/zip.php:61
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "Áäýíáôç ç åîáãùãÞ ôïõ áéôïýìåíïõ áñ÷åßïõ áðü ZIP âéâëéïèÞêç."
+
+#: search.php:356 templates/fetchmail/manage.inc:67
+#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:157
+msgid "Create"
+msgstr "Äçìéïõñãßá"
+
 msgid "Create Folder"
 msgstr "Äçìéïõñãßá ÖáêÝëïõ"
 
+#: templates/pgp/pgp.inc:252
+msgid "Create Keys"
+msgstr "Äçìéïõñãßá êëåéäéþí"
+
+#: templates/search/header.inc:14
+msgid "Create Virtual Folder"
+msgstr "Äçìéïõñãßá Éäåáôïý ÖáêÝëïõ"
+
 msgid "Create a new drafts folder"
 msgstr "Äçìéïõñãßá ÍÝïõ ÖáêÝëïõ 'Ðñü÷åéñá'"
 
@@ -358,11 +1089,24 @@
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"Äçìéïõñãßá ößëôñùí ãéá ôçí ïñãÜíùóç ôùí åéóåñ÷üìåíùí ìçíõìÜôùí óå "
-"öáêÝëïõò êáé äéáãñáöÞ áíåðéèýìçôùí ìçíõìÜôùí (spam)."
+"Äçìéïõñãßá ößëôñùí ãéá ôçí ïñãÜíùóç ôùí åéóåñ÷üìåíùí ìçíõìÜôùí óå öáêÝëïõò "
+"êáé äéáãñáöÞ áíåðéèýìçôùí ìçíõìÜôùí (spam)."
 
-msgid "Create"
-msgstr "Äçìéïõñãßá"
+#: templates/acl/acl.inc:95
+msgid "Current access to %s"
+msgstr "ÔñÝ÷ïõóá ðñüóâáóç óå %s"
+
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr "Ñýèìéóç ëïãáñéóìþí ãéá ðñïóêüìéóç ìçíõìÜôùí áðü Üëëïõò ëïãáñéáóìïýò."
+
+msgid "Customize how you send mail."
+msgstr "Ñýèìéóç ôùí åðéëïãþí ãéá ôçí áðïóôïëÞ ìçíõìÜôùí."
+
+msgid ""
+"Customize how you send mail and where drafts or sent messages are saved."
+msgstr ""
+"Ñýèìéóç ôùí åðéëïãþí ãéá ôçí áðïóôïëÞ ìçíõìÜôùí êáé ôçí áðïèÞêåõóÞ ôïõò ùò "
+"ðñü÷åéñá Þ áðåóôáëìÝíá."
 
 msgid "Customize how you send mail and where drafts are saved."
 msgstr ""
@@ -371,19 +1115,30 @@
 
 #, c-format
 msgid "Customize maintenance operations run upon login to %s."
-msgstr "Ñýèìéóç ôùí ëåéôïõñãéþí óõíôÞñçóçò ðïõ ãßíïíôáé êáôÜ ôçí åßóïäï óôçí  %s."
-
+msgstr ""
+"Ñýèìéóç ôùí ëåéôïõñãéþí óõíôÞñçóçò ðïõ ãßíïíôáé êáôÜ ôçí åßóïäï óôçí  %s."
 
 #, c-format
 msgid "Customize tasks to run upon logon to %s."
-msgstr "Ñýèìéóç ôùí åíåñãåéþí ðïõ èá åêôåëïýíôáé êáôÜ ôçí åßóïäï óôçí õðçñåóßá %s."
+msgstr ""
+"Ñýèìéóç ôùí åíåñãåéþí ðïõ èá åêôåëïýíôáé êáôÜ ôçí åßóïäï óôçí õðçñåóßá %s."
+
+msgid "Dat_e"
+msgstr "Çìåñïìçíßá"
 
 msgid "Date"
 msgstr "Çìåñïìçíßá"
 
+msgid "Date:"
+msgstr "Çìåñïìçíßá:"
+
 msgid "December"
 msgstr "ÄåêÝìâñéïò"
 
+#: lib/MIME/Viewer/itip.php:742
+msgid "Declined"
+msgstr "Áðïññßöèçêå"
+
 msgid "Default Identity"
 msgstr "ÐñïåðéëåãìÝíç Ôáõôüôçôá"
 
@@ -393,97 +1148,275 @@
 msgid "Default sorting direction:"
 msgstr "ÐñïåðéëåãìÝíç êáôåýèõíóç ôáîéíüìçóçò:"
 
+#: lib/MIME/Viewer/itip.php:750
+msgid "Delegated"
+msgstr "ÌåôáâéâÜóèçêå"
+
+#: folders.php:374 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:239 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:93
+msgid "Delete"
+msgstr "ÄéáãñáöÞ"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+msgid "Delete %s Public Key"
+msgstr "ÄéáãñáöÞ %s äçìéüóéïõ êëåéäéïý"
+
+#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+msgid "Delete Current Keys"
+msgstr "ÄéáãñáöÞ ôñÝ÷ïíôùí êëåéäéþí"
+
 msgid "Delete Folder(s)"
 msgstr "ÄéáãñáöÞ ÖáêÝëïõ(ùí)"
 
+#: folders.php:374
+msgid "Delete Virtual Folder"
+msgstr "ÄéáãñáöÞ Éäåáôïý ÖáêÝëïõ"
+
+msgid "Delete an attachment."
+msgstr "ÄéáãñáöÞ óõíçììÝíïõ."
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+"ÄéáãñáöÞ ôùí ðñïóêïìéóèÝíôùí ìçíõìÜôùí áðü ôïí áðïìáêñõóìÝíï åîõðçñåôçôÞ;"
+
+#: lib/MIME/Viewer/itip.php:606
+msgid "Delete from my calendar"
+msgstr "ÄéáãñáöÞ áðü ôï Çìåñïëüãéü ìïõ"
+
 msgid "Delete messages"
 msgstr "ÄéáãñáöÞ ÌçíõìÜôùí"
 
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Íá äéáãñÜöïíôáé ôá ðáëéÜ óõíäåìÝíá óõíçììÝíá óôçí áñ÷Þ êÜèå ìÞíá?"
+
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Íá äéáãñÜöïíôáé ïé ðáëéïß êáôÜëïãïé ÁÐÅÓÔÁËÌÅÍÁ óôçí áñ÷Þ êÜèå ìÞíá?"
 
-msgid "Delete"
-msgstr "ÄéáãñáöÞ"
+msgid "Delete spam messages after they have been reported as spam?"
+msgstr "ÄéáãñáöÞ 'spam' ìçíõìÜôùí ìåôÜ ôçí áíáöïñÜ ôïõò;"
 
-msgid "Deleted an attachment."
-msgstr "ÄéáãñáöÞ óõíçììÝíïõ."
+msgid "Deleted"
+msgstr "ÄéáãñáììÝíá"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
-msgstr "ÄéáãñáììÝíá ìçíýìáôá"
+msgstr "ÄéáãñáìÝíá ìçíýìáôá"
 
-msgid "Deleted"
-msgstr "ÄéáãñáììÝíá"
+msgid "Deleted the attachment \"%s\"."
+msgstr "ÄéáãñÜöçêå ôï óõíçììÝíï \"%s\"."
 
 msgid "Deleting and Moving Messages"
 msgstr "ÄéáãñáöÞ êáé ÌåôáöïñÜ ÌçíõìÜôùí"
 
+#: lib/MIME/Viewer/itip.php:548
+msgid "Deny request"
+msgstr "Áñíçóç áéôÞìáôïò"
+
+#: lib/MIME/Viewer/itip.php:497
+msgid "Deny request for free/busy information"
+msgstr "Áñíçóç áéôÞìáôïò ãéá ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ"
+
+#: config/prefs.php.dist:903
 msgid "Descending"
 msgstr "Öèßíïõóá"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:656
+msgid "Description"
+msgstr "ÐåñéãñáöÞ"
+
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:151
+msgid "Details"
+msgstr "ËåðôïìÝñåéåò"
+
+#: config/prefs.php.dist:680
 msgid "Dim signatures?"
 msgstr "Ç õðïãñáöÞ óáò;"
 
+msgid "Display"
+msgstr "ÅìöÜíéóç"
+
 msgid "Display Options"
 msgstr "ÅðéëïãÝò ÅìöÜíéóçò"
 
+msgid "Display confirmation after sending a message?"
+msgstr "Íá åìöáíßæåôáé åðéâåâáßùóç ìåôÜ ôçí áðïóôïëÞ;"
+
+msgid "Display in Body of Message"
+msgstr "ÅìöÜíéóç óôï óþìá ôï ìçíýìáôïò"
+
 msgid "Display message when filters have been applied?"
 msgstr "ÅìöÜíéóç åéäïðïßçóçò áöïý åöáñìïóôïýí ôá ößëôñá;"
 
 msgid "Display pop-up notification of new mail?"
 msgstr "ÅìöÜíéóç åéäïðïßçóçò êáôÜ ôçí ðáñáëáâÞ íÝùí ìçíõìÜôùí;"
 
-msgid "Display"
-msgstr "ÅìöÜíéóç"
+msgid "Display the 'Empty Trash' link in the menubar?"
+msgstr "ÅìöÜíéóç ôïõ 'Áäåéáóìá ÊÜäïõ' óôï ìåíïý;"
+
+#: templates/compose/attachments.inc:11
+msgid "Disposition"
+msgstr "Äéáêáíïíéóìüò"
+
+#: templates/compose/attachments.inc:11
+msgid "Disposition Notification"
+msgstr "Ðëçñïöüñçóç Äéáêáíïíéóìïý"
+
+msgid "Do NOT match"
+msgstr "Íá ÌÇÍ ôáéñéÜæåé"
 
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Íá ìçí ãßíåôáé ¸ëåã÷ïò óôïí(ïõò) ÖÜêåëï(ïõò) ãéá íÝá ìçíýìáôá"
 
+msgid "Do not generate a link in the From: column"
+msgstr "Íá ìç äçìéïõñãçèåß óýíäåóç óôç óôÞëç Áðü:"
+
 msgid "Do you want to open that folder?"
 msgstr "ÈÝëåôå íá áíïßîåôå áõôüí ôïí öÜêåëï;"
 
 msgid "Done"
 msgstr "¸ãéíå"
 
+msgid "Download"
+msgstr "ÊáôÝâáóìá"
+
 #, c-format
 msgid "Download %s"
-msgstr "ÁðïèÞêåõóç %s"
+msgstr "ÊáôÝâáóìá %s"
 
-msgid "Download Folder(s)"
-msgstr "ÖÜêåëïò ÁíáêôçìÝíùí"
+#: lib/MIME/Contents.php:204
+msgid "Download %s in .zip Format"
+msgstr "ÊáôÝâáóìá %s óå .zip Format"
 
-msgid "Download"
-msgstr "ÁðïèÞêåõóç"
+msgid "Download All Attachments (in .zip file)"
+msgstr "ÊáôÝâáóìá üëùí ôùí óõíçìÝíùí (óå .zip áñ÷åßï)"
+
+msgid "Download Folder(s)"
+msgstr "ÊáôÝâáóìá ÖáêÝëïõ(ùí) (óôï PC óáò)"
 
+#: templates/folders/actions.inc:19
+msgid "Download Folder(s) [.zip format]"
+msgstr "ÊáôÝâáóìá ÖáêÝëïõ(ùí) (óôï PC óáò) [óå ìïñöÞ .zip]"
+
+#: lib/MIME/Contents.php:204
+msgid "Download in .zip Format"
+msgstr "ÊáôÝâáóìá óå .zip Format"
+
+#: message.php:491 mailbox.php:676 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Ðñü÷åéñá"
 
+msgid "Draft folder"
+msgstr "Ðñü÷åéñïò ÖÜêåëïòí"
+
 msgid "Drafts folder:"
 msgstr "ÖÜêåëïò Ðñü÷åéñùí:"
 
+#: templates/pgp/pgp.inc:196
+msgid "E-mail Address"
+msgstr "Äéåýèõíóç E-mail"
+
+#: lib/MIME/Viewer/status.php:77
+msgid "ERROR: Your message could not be delivered."
+msgstr "ËÁÈÏÓ: Ôï ìÞíõìÜ óáò äåí ìðïñåß íá ðáñáäïèåß."
+
+msgid "Edit"
+msgstr "Åðåîåñãáóßá"
+
+#: templates/filters/prefs.inc:21
+msgid "Edit Blacklist"
+msgstr "Åðåîåñãáóßá Ìáýñçò Ëßóôáò"
+
+#: templates/filters/prefs.inc:16
+msgid "Edit Filters"
+msgstr "Åðåîåñãáóßá Ößëôñùí"
+
+#: folders.php:375 templates/search/header.inc:16
+#: templates/mailbox/header.inc:13
+msgid "Edit Virtual Folder"
+msgstr "Åðåîåñãáóßá Éäåáôïý ÖáêÝëïõ"
+
+#: templates/mailbox/header.inc:13
+msgid "Edit Virtual Folder Definition for %s"
+msgstr "Åðåîåñãáóßá Ïñéóìïý Éäåáôïý ÖáêÝëïõ ãéá %s"
+
+#: templates/filters/prefs.inc:26
+msgid "Edit Whitelist"
+msgstr "Åðåîåñãáóßá ËåõêÞò Ëßóôáò"
+
+#: templates/filters/prefs.inc:21
+msgid "Edit your blacklist"
+msgstr "Åðåîåñãáóßá Ìáýñçò Ëßóôáò"
+
 msgid "Edit your filter rules"
 msgstr "Åðåîåñãáóßá ôùí êáíüíùí ößëôñùí"
 
 msgid "Edit your identities"
 msgstr "Åðåîåñãáóßá ôùí ôáõôïôÞôùí óáò"
 
-msgid "Edit"
-msgstr "Åðåîåñãáóßá"
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr "Åðåîåñãáóßá ðñïôéìÞóåùí ãéá ðñüóâáóç Üëëùí ëïãáñéáóìþí."
+
+msgid "Edit your whitelist"
+msgstr "Åðåîåñãáóßá ËåõêÞò Ëßóôáò"
 
 msgid "Email Address"
 msgstr "Äéåýèõíóç Áëëçëïãñáößáò"
 
+msgid "Emptied all messages from %s."
+msgstr "ÄéáãñÜöçêáí üëá ôá ìçíýìáôá áðü %s."
+
 msgid "Empty Folder(s)"
-msgstr "¢äåéáóìá ÖáêÝëïõ(ùí)"
+msgstr "Áäåéáóìá ÖáêÝëïõ(ùí)"
 
 msgid "Empty Trash folder"
-msgstr "¢äåéáóìá ÖáêÝëïõ ÄéáãñáììÝíá"
+msgstr "Áäåéáóìá ÖáêÝëïõ ÄéáãñáììÝíá"
+
+msgid "Empty _Trash"
+msgstr "Áäåéáóìá ÊÜäïõ"
 
-msgid "Empty Trash"
-msgstr "¢äåéáóìá ÄéáãñáììÝíùí"
+#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+msgid "Enable PGP functionality?"
+msgstr "Åíåñãïðïßçóç ëåéôïõñãéþí PGP;"
+
+#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+msgid "Enable S/MIME functionality?"
+msgstr "Åíåñãïðïßçóç ëåéôïõñãéþí S/MIME;"
+
+#: config/prefs.php.dist:780
+msgid "Enable message previews?"
+msgstr "Åíåñãïðïßçóç ðñïåðéóêüðéóçò ìçíõìÜôùí;"
+
+#: templates/compose/compose.inc:433
+msgid "Encr_yption Options"
+msgstr "ÅðéëïãÝò ÊñõðôïãñÜöçóçò"
+
+#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+msgid "End"
+msgstr "ÔÝëïò"
 
 msgid "End forwarded message"
 msgstr "ÔÝëïò ðñïùèçìÝíïõ ìçíýìáôïò"
 
+#: lib/Compose.php:262
+msgid "End message"
+msgstr "ÔÝëïò ìçíýìáôïò"
+
+#: lib/Compose.php:260
+msgid "End message from %s"
+msgstr "ÔÝëïò ìçíýìáôïò áðü %s"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+msgid "Enter Passphrase"
+msgstr "ÅéóÜãåôå ëÝîç êëåéäß"
+
 msgid "Enter the name for your new drafts folder"
 msgstr "Äþóôå ôï üíïìá ãéá ôï íÝï öÜêåëï 'Ðñü÷åéñá'"
 
@@ -500,6 +1433,14 @@
 msgid "Error"
 msgstr "ËÜèïò"
 
+#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+msgid "Error sending reply: %s."
+msgstr "ËÜèïò êáôÜ ôçí áðïóôïëÞ áðÜíôçóçò: %s."
+
+#: lib/MIME/Viewer/itip.php:92
+msgid "Event successfully deleted."
+msgstr "Ôï ãåãïíüò äéáãñÜöçêå åðéôõ÷þò."
+
 msgid "Every 15 minutes"
 msgstr "ÊÜèå 15 ËåðôÜ"
 
@@ -515,30 +1456,83 @@
 msgid "Every minute"
 msgstr "ÊÜèå ëåðôü"
 
-msgid "Expand All Folders"
-msgstr "ÁíÜðôõîç ¼ëùí ôùí ÖáêÝëùí"
-
+#: templates/folders/actions.inc:33
 msgid "Expand All"
 msgstr "ÁíÜðôõîç ¼ëùí"
 
+#: templates/folders/actions.inc:33
+msgid "Expand All Folders"
+msgstr "ÁíÜðôõîç ¼ëùí ôùí ÖáêÝëùí"
+
 msgid "Expand Folder"
 msgstr "ÁíÜðôõîç ÖáêÝëïõ"
 
 msgid "Expand Names"
 msgstr "ÁíÜðôõîç ÏíïìÜôùí"
 
+#: config/prefs.php.dist:1021
+msgid "Expand names in the compose window automatically in the background?"
+msgstr "Íá áíáðôýóïíôáé áõôüìáôá ôá ïíüìáôá êáôÜ ôç óýíèåóç óôï ðáñáóêÞíéï;"
+
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Íá ãßíåôáé ðÜíôá áíÜðôõîç üëïõ ôïõ äÝíôñïõ ôùí öáêÝëùí;"
 
+#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
+#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+msgid "Expanding"
+msgstr "Áíáðôýóóïíôáò"
+
+#: framework/Crypt/Crypt/pgp.php:398
+msgid "Expiration Date"
+msgstr "Çìåñïìçíßá ËÞîçò"
+
 msgid "February"
 msgstr "ÖåâñïõÜñéïò"
 
+msgid "F_etch Mail"
+msgstr "Ðñïóêüìéóç ÌçíõìÜôùí"
+
+msgid "Fetch Mail"
+msgstr "Ðñïóêüìéóç ÌçíõìÜôùí"
+
+msgid "Fetch Mail in a separate window?"
+msgstr "Ðñïóêüìéóç áëëçëïãñáößáò óå äéáöïñåôéêü ðáñÜèõñï;"
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "Ðñïóêüìéóç ìçíõìÜôùí ìå ôçí åßóïäï (login);"
+
+#: lib/Fetchmail.php:306
+msgid "Fetched %d message(s) from %s"
+msgstr "Ðñïóêüìéóç %d ìçíýìáôïò(ùí) áðü %s"
+
+#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+msgid "Fetchmail: "
+msgstr "Ðñïóêüìéóç ìçíõìÜôùí: "
+
+#: lib/Fetchmail.php:308
+msgid "Fetchmail: no new messages."
+msgstr "Ðñïóêüìéóç ìçíõìÜôùí: êáíÝíá íÝï ìÞíõìá."
+
 msgid "Field"
 msgstr "Ðåäßï"
 
+#: lib/IMP.php:917
+msgid "Fi_lters"
+msgstr "Ößëôñá"
+
+msgid "File"
+msgstr "Áñ÷åßï"
+
+msgid "File %s:"
+msgstr "Áñ÷åßï %s:"
+
 msgid "Filename"
 msgstr "¼íïìá Áñ÷åßïõ"
 
+msgid "Filter"
+msgstr "Ößëôñï"
+
 #, c-format
 msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
 msgstr "ÅíÝñãåéá ößëôñùí: Ôï ìÞíõìá \"%s\" áðü \"%s\" äéáãñÜöçêå."
@@ -548,8 +1542,8 @@
 "Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
 "\"%s\"."
 msgstr ""
-"ÁðïôÝëåóìá Ößëôñïõ: Ôï ìÞíõìá \"%s\" áðü \"%s\" ìåôáêéíÞèçêå óôï öÜêåëï "
-"\"%s\"."
+"ÁðïôÝëåóìá Ößëôñïõ: Ôï ìÞíõìá \"%s\" áðü \"%s\" ìåôáêéíÞèçêå óôï öÜêåëï \"%s"
+"\"."
 
 #, c-format
 msgid ""
@@ -558,42 +1552,103 @@
 msgstr ""
 "ÁðïôÝëåóìá Ößëôñïõ: Ôï ìÞíõìá \"%s\" áðü \"%s\" ìåôáêéíÞèçêå óôï êÜäï. "
 
+#: templates/filters/prefs.inc:35
+msgid "Filter Options"
+msgstr "ÅðéëïãÝò Ößëôñùí"
+
 msgid "Filter Rules"
 msgstr "Êáíüíåò Ößëôñùí"
 
+#: templates/filters/prefs.inc:8
+msgid "Filter Settings"
+msgstr "Ñõèìßóåéò Ößëôñùí"
+
 msgid "Filter message content for profanity?"
 msgstr "Íá ÖéëôñÜñåôáé ôï ðåñéå÷üìåíï ôùí ìçíõìÜôùí ãéá õâñéóôéêü ðåñéå÷üìåíï;"
 
+msgid "Filter support is disabled on this system."
+msgstr "Ç õðïóôÞñéîç ößëôñùí Ý÷åé áðåíåñãïðïéçèåß ó' áõôü ôï óýóôçìá."
+
 msgid "Filters"
 msgstr "Ößëôñá"
 
+msgid "Filters NOT Active"
+msgstr "Ôá Ößëôñá ÄÅÍ åßíáé åíåñãïðïéçìÝíá"
+
+#: lib/Filter.php:102
+msgid "Filters: %s management page"
+msgstr "Ößëôñá: %s óåëßäá äéá÷åßñéóçò"
+
+#: templates/contacts/contacts.inc:178
 msgid "Find"
-msgstr "ÁíáæÞôçóç"
+msgstr "Åýñåóç"
+
+msgid "First Mailbox Page"
+msgstr "Ðñþôç óåëßäá ôïõ Mailbox"
 
 msgid "First Page"
 msgstr "Áñ÷éêÞ Óåëßäá "
 
+msgid "Fo_rward"
+msgstr "Ðñïþèçóç"
+
 msgid "Folder Navigator"
-msgstr "ÖÜêåëïò Navigator"
+msgstr "ÐëïÞãçóç ÖÜêåëùí"
 
 msgid "Folder Prefix"
 msgstr "ÖÜêåëïò Prefix"
 
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "Óýíïøç ÖáêÝëïõ"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr "Ï Äéáìïéñáóìüò öáêÝëùí äåí Ý÷åé åíåñãïðïéçèåß."
+
+#: folders.php:52
+msgid "Folder use is not enabled."
+msgstr "Ç ÷ñÞóç öáêÝëùí äåí Ý÷åé åíåñãïðïéçèåß."
+
 msgid "Folders"
 msgstr "ÖÜêåëïé"
 
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr "ÌïñöÞ ôùí çìåñïìçíéþí ôùí óçìåñéíþí ìçíçìÜôùí"
+
 msgid "Forward"
 msgstr "Ðñïþèçóç"
 
 msgid "Forward:"
 msgstr "Ðñïþèçóç:"
 
+#: lib/Compose.php:290
+msgid "Forwarded message"
+msgstr "ÐñïùèçìÝíï ìÞíõìá"
+
 #, c-format
 msgid "Forwarded message from %s"
 msgstr "Ðñïþèçóç ìçíýìáôïò áðü %s"
 
-msgid "From Address"
-msgstr "Äéåýèõíóç ÁðïóôïëÝá"
+#: lib/MIME/Viewer/itip.php:442
+msgid "Free/Busy Information"
+msgstr "Ðëçñïöïñßåò Åëåýèåñïõ/Áðáó÷ïëçìÝíïõ"
+
+#: lib/MIME/Viewer/itip.php:453
+msgid "Free/Busy Reply"
+msgstr "ÁðÜíôçóç Åëåýèåñïõ/Áðáó÷ïëçìÝíïõ"
+
+#: lib/MIME/Viewer/itip.php:447
+msgid "Free/Busy Request"
+msgstr "Áßôçìá Åëåýèåñïõ/Áðáó÷ïëçìÝíïõ"
+
+#: lib/MIME/Viewer/itip.php:364
+msgid "Free/Busy Request Response"
+msgstr "ÁðÜíôçóç óå áßôçìá Åëåýèåñïõ/Áðáó÷ïëçìÝíïõ"
+
+#: templates/mailbox/message_headers.inc:22
+msgid "Fro_m"
+msgstr "Áðü"
 
 msgid "From"
 msgstr "Áðü"
@@ -601,27 +1656,135 @@
 msgid "From:"
 msgstr "Áðü:"
 
+msgid "From Address"
+msgstr "Äéåýèõíóç ÁðïóôïëÝá"
+
 msgid "Fwd:"
 msgstr "Ðñïþè.:"
 
+msgid "Fwd: "
+msgstr "Ðñïþè.: "
+
+#: compose.php:1207
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Ðñïþè: %u ÐñïùèçìÝíá Ìçíýìáôá"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "ÃåíéêÝò ÅðéëïãÝò"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "ËÞøç ìüíï ôùí íÝùí ìçíõìÜôùí; (ìüíï IMAP)"
+
+msgid "Getting Started"
+msgstr "Áñ÷ßæïíôáò"
+
+msgid "Go to Message"
+msgstr "ÅðéóôñïöÞ óôï ÌÞíõìá"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr "Äþóå ðñüóâáóç"
+
+#: message.php:546 lib/Filter.php:102 lib/MIME/Viewer/images.php:89
+#: lib/MIME/Viewer/images.php:96 lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:151 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/related.php:64 lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+msgid "HERE"
+msgstr "ÅÄÙ"
+
+msgid "HTML Version of Message"
+msgstr "HTML Åêäïóç ôïõ ìçíÞìáôïò"
+
+#: framework/Crypt/Crypt/pgp.php:399
+msgid "Hash-Algorithm"
+msgstr "Áëãüñéèìïò Hash"
+
+msgid "Headers:"
+msgstr "Åðéêåöáëßäåò:"
+
+msgid "Headers"
+msgstr "Åðéêåöáëßäåò"
+
 msgid "Help"
 msgstr "ÂïÞèåéá"
 
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr "Áõôü åßíáé ôï ìÞíõìá ðïõ óõíèÝôáôå:"
+
+msgid "Hi. This is the qmail-send program at %s"
+msgstr "Ôï ìÞíõìá áõôü äçìéïõñãÞèçêå áðü ôï óýóôçìá %s"
+
+#: config/prefs.php.dist:671
+msgid "Hidden"
+msgstr "Áðüêñõøç"
+
+msgid "Hidden in Thread View"
+msgstr "Áðüêñõøç óå åìöÜíéóç ÍÞìáôïò"
+
 msgid "Hide Deleted"
 msgstr "Áðüêñõøç ÄéåãñáììÝíùí"
 
 msgid "Hide Unsubscribed"
 msgstr "Áðüêñõøç ìÞ óõíäåìÝíùí"
 
+#: lib/MIME/Viewer/html.php:103
+msgid "Hide the Images"
+msgstr "Áðüêñõøç ôùí åéêüíùí"
+
+msgid "High"
+msgstr "ÕøçëÞ"
+
+msgid "High Priority"
+msgstr "ÕøçëÞ ðñïôåñáéüôçôá"
+
+msgid "Highest"
+msgstr "Õøçëüôáôç"
+
+msgid "How do you want to display attachments?"
+msgstr "Ðùò èÝëåôå íá åìöáíßæïíôáé ôá óõíçììÝíá;"
+
+msgid "How to attribute quoted lines in a reply"
+msgstr "Ðùò íá óçìáôïäïôïýíôáé ïé åéóáãüìåíåò ãñáììÝò óå ìéÜ áðÜíôçóç"
+
 msgid "How to prefix quoted lines in a reply:"
 msgstr "Ðïéïò ÷áñáêôÞñáò íá ôïðïèåôåßôáé ðñéí áðü êÜèå ãñáììÞ óôéò áðáíôÞóåéò:"
 
+#: lib/Fetchmail/imap.php:132
+msgid "IMAP (Auto Detect Protocols)"
+msgstr "IMAP (Áõôüìáôïò Åíôïðéóìüò Ðñùôïêüëëùí)"
+
+#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+msgid "IMAP over SSL"
+msgstr "IMAP ðÜíù áðü SSL"
+
+#: lib/Fetchmail/imap.php:155
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP ðÜíù áðü SSL (áõôï-õðïãñáöüìåíï ðéóôïðïéçôéêü)"
+
+#: templates/login/login.inc:175
+msgid "IMAP over SSL (self-signed)"
+msgstr "IMAP ðÜíù áðü SSL (áõôï-õðïãñáöüìåíï)"
+
+#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+msgid "IMAP, no TLS"
+msgstr "IMAP ÷ùñßò TLS"
+
 msgid "IMP is not properly configured"
 msgstr "Ôï IMP äåí åßíáé ðëÞñùò ñõèìéóìÝíï"
 
 msgid "INBOX"
 msgstr "Åéóåñ÷üìåíá"
 
+msgid "I_nbox"
+msgstr "Åéóåñ÷üìåíá"
+
 msgid "Identities"
 msgstr "Ôáõôüôçôåò"
 
@@ -631,21 +1794,170 @@
 msgid "Identity's name:"
 msgstr "Ïíïìáôåðþíõìï:"
 
+msgid "Ignore"
+msgstr "ÐáñÜâëåøç"
+
 msgid "Ignore All"
 msgstr "ÐáñÜâëåøç '¼ëùí"
 
-msgid "Ignore"
-msgstr "ÐáñÜâëåøç"
+#: templates/folders/import.inc:20
+msgid "Import"
+msgstr "ÅéóáãùãÞ"
 
-msgid "Important messages"
-msgstr "ÓçìáíôéêÜ ìçíýìáôá"
+#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+msgid "Import Key"
+msgstr "ÅéóáãùãÞ Êëåéäéïý"
+
+#: templates/pgp/pgp.inc:254
+msgid "Import Keypair"
+msgstr "ÅéóáãùãÞ æåýãïõò êëåéäéþí"
+
+#: templates/folders/actions.inc:25
+msgid "Import Messages"
+msgstr "ÅéóáãùãÞ ÌçíõìÜôùí"
+
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr "ÅéóáãùãÞ PGP êëåéäéïý"
+
+#: templates/smime/smime.inc:148
+msgid "Import Personal Certificates"
+msgstr "ÅéóáãùãÞ ðñïóùðéêþí Ðéóôïðïéçôéêþí"
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr "ÅéóáãùãÞ Ðñïóùðéêïý Éäéùôéêïý PGP Êëåéäéïý"
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr "ÅéóáãùãÞ Ðñïóùðéêïý Äçìüóéïõ PGP Êëåéäéïý"
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr "ÅéóáãùãÞ Ðñïóùðéêïý S/MIME Ðéóôïðïéçôéêïý"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+msgid "Import Public Key"
+msgstr "ÅéóáãùãÞ Äçìüóéïõ Êëåéäéïý"
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr "ÅéóáãùãÞ Äçìüóéïõ PGP Êëåéäéïý"
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr "ÅéóáãùãÞ Äçìüóéïõ S/MIME Êëåéäéïý"
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr "ÅéóáãùãÞ S/MIME Êëåéäéïý"
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr "ÅéóáãùãÞ áñ÷åßïõ 'mbox'"
+
+#: templates/folders/import.inc:16
+msgid "Import mbox file %s into folder %s."
+msgstr "ÅéóáãùãÞ 'mbox' áñ÷åßïõ %s óôï öÜêåëï %s."
 
 msgid "Important"
 msgstr "ÓçìáíôéêÜ"
 
+msgid "Important messages"
+msgstr "ÓçìáíôéêÜ ìçíýìáôá"
+
+#: folders.php:157
+msgid "Imported %d messages from %s."
+msgstr "ÅéóÞ÷èçêáí %d ìçíýìáôá áðü %s."
+
+#: lib/MIME/Viewer/itip.php:758
+msgid "In Process"
+msgstr "Óå åîÝëéîç"
+
+#: lib/Folder.php:248 lib/IMP.php:369
+msgid "Inbox"
+msgstr "Åéóåñ÷üìåíá"
+
+msgid "Include a brief summary of the header in a reply?"
+msgstr "ÅíóùìÜôùóç óýíôïìçò ðåñßëçøçò åðéêåöáëßäáò óôéò áðáíôÞóåéò;"
+
 msgid "Include original message in a reply?"
 msgstr "ÅíóùìÜôùóç ôïõ áñ÷éêïý ìçíýìáôïò óôéò áðáíôÞóåéò;"
 
+#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+msgid "Info"
+msgstr "Ðëçñïöïñßåò"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+msgid "Information on %s Public Key"
+msgstr "Ðëçñïöïñßåò ãéá ôï %s Äçìüóéï Êëåéäß"
+
+#: templates/pgp/pgp.inc:151
+msgid "Information on Personal Private Key"
+msgstr "Ðëçöïñïñßåò ãéá ôï Ðñïóùðéêü Éäéùôéêü Êëåéäß"
+
+#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+msgid "Information on Personal Public Key"
+msgstr "Ðëçñïöïñßåò ãéá ôï Ðñïóùðéêü Äçìüóéï Êëåéäß"
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
+#: templates/compose/attachments.js:99
+msgid "Inline"
+msgstr "ÅíóùìáôïìÝíï"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr "ÅéóáãùãÞ Ðéóôïðïéçôéêïý Åäþ"
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr "ÅéóáãùãÞ Ðñïóùðéêïý Éäéùôéêïý PGP êëåéäéïý Åäþ"
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr "ÅéóáãùãÞ Ðñïóùðéêïý Äçìüóéïõ PGP êëåéäéïý Åäþ"
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr "ÅéóáãùãÞ Äçìüóéïõ PGP êëåéäéïý Åäþ"
+
+msgid "Introduction"
+msgstr "ÅéóáãùãÞ"
+
+msgid "Introduction to %s"
+msgstr "ÅéóáãùãÞ óôï %s"
+
+#: lib/MIME/Viewer/itip.php:375
+msgid "Invalid Action selected for this component."
+msgstr "ÅðéëÝîáôå ìç Ýãêõñç åíÝñãåéá ãéá áõôü ôï óôïé÷åßï."
+
+#: mailbox.php:549 mailbox.php:590
+msgid "Invalid Address"
+msgstr "Áêõñç Äéåýèõíóç"
+
+#: lib/Fetchmail/imap.php:312
+msgid "Invalid Remote Mailbox"
+msgstr "Ìç Ýãêõñç áðïìáêñõóìÝíç ãñáììáôïèõñßäá"
+
+#: compose.php:132
+msgid "Invalid character in e-mail address: %s."
+msgstr "Ìç Ýãêõñïò ÷áñáêôÞñáò óôçí e-mail äéåýèõíóç: %s."
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr "Ìç Ýãêõñï êëåéäß"
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr "Áêõñï ðñïóùðéêü éäéùôéêü êëåéäß PGP."
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr "Áêõñï ðñïóùðéêü äçìüóéï êëåéäß PGP."
+
+msgid "Invert"
+msgstr "ÁíôéóôñïöÞ"
+
 msgid "January"
 msgstr "ÉáíïõÜñéïò"
 
@@ -655,9 +1967,40 @@
 msgid "June"
 msgstr "Éïýíéïò"
 
+#: framework/Crypt/Crypt/pgp.php:397
+msgid "Key Creation"
+msgstr "Äçìéïõñãßá Êëåéäéïý"
+
+#: framework/Crypt/Crypt/pgp.php:400
+msgid "Key Fingerprint"
+msgstr "Áðïôýðùìá Êëåéäéïý"
+
+#: templates/pgp/pgp.inc:201
+msgid "Key Length"
+msgstr "ÌÞêïò êëåéäéïý"
+
+#: framework/Crypt/Crypt/pgp.php:397
+msgid "Key Type"
+msgstr "Ôýðïò Êëåéäéïý"
+
+#: framework/Crypt/Crypt/smime.php:622
+msgid "Key Usage"
+msgstr "×ñÞóç Êëåéäéïý"
+
+#: framework/Crypt/Crypt/pgp.php:743
+msgid "Key already exists on the public keyserver."
+msgstr "Ôï êëåéäß õðÜñ÷åé Þäç óôïí åîõðçñåôçôÞ äçìüóéùí êëåéäéþí."
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr "Ôï êëåéäß áðåóôÜëç åðéôõ÷þò óôï åîõðçñåôçôÞ Äçìïóßùí Êëåéäéþí."
+
 msgid "Language"
 msgstr "Ãëþóóá"
 
+msgid "Last Mailbox Page"
+msgstr "Ôåëåõôáßá óåëßäá ôïõ Mailbox"
+
 msgid "Last Page"
 msgstr "Ôåëåõôáßá Óåëßäá"
 
@@ -668,11 +2011,44 @@
 msgid "Last login: Never"
 msgstr "Ôåëåõôáßá Åßóïäïò óôçí õðçñåóßá: ÐïôÝ"
 
+msgid "Li_nk Attachments"
+msgstr "Óýíäåóç Åðéóõíáðôüìåíùí"
+
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "Óýíäåóç Åðéóõíáðôüìåíùí;"
+
+#: attachment.php:34 lib/Compose.php:988
+msgid "Linked attachments are forbidden."
+msgstr "Ç óýíäåóç ôùí åðéóõíáðôüìåíùí äåí åðéôñÝðåôáé."
+
+#: config/prefs.php.dist:1040
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+"ÅìöÜíéóç üëùí ôùí åðáöþí üôáí åìöáíßæåôáé ç ïèüíç åðáöþí (áí áðåíåñãïðïé-"
+"çèåß èá âëÝðåôå ìüíï ôéò åðáöÝò ðïõ ôáéñéÜæïõí óôá êñéôÞñéá áíáæÞôçóçò)"
+
+msgid "Listing in the Header"
+msgstr "Ëßóôá óôçí åðéêåöáëßäá"
+
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "Ôïðéêüò åîõðçñåôçôÞò mail:"
+
+#: lib/MIME/Viewer/itip.php:661
+msgid "Location"
+msgstr "ÈÝóç"
+
+msgid "Log in"
+msgstr "Åßóïäïò"
+
 #, c-format
 msgid "Log in to %s"
 msgstr "Åßóïäïò óôï %s"
 
-msgid "Log in"
+msgid "Login"
 msgstr "Åßóïäïò"
 
 msgid "Login Tasks"
@@ -685,39 +2061,141 @@
 "Ç åßóïäïò óáò áðÝôõ÷å. Åßíáé ðïëý ðéèáíü üôé äþóáôå ëÜèïò üíïìá ÷ñÞóôç Þ "
 "óõíèçìáôéêü. ÅëÝãîôå üôé ôï 'Caps Lock' åßíáé áðåíåñãïðïéçìÝíï."
 
+msgid "Logging In"
+msgstr "Åßóïäïò óôçí ÅöáñìïãÞ"
+
 msgid "Logout"
 msgstr "¸îïäïò"
 
+msgid "Low"
+msgstr "×áìçëÞ"
+
+msgid "Low Priority"
+msgstr "×áìçëÞ ðñïôåñáéüôçôá"
+
+msgid "Lowest"
+msgstr "×áìçëüôáôç"
+
+#: lib/MIME/Viewer/appledouble.php:46
+msgid "Macintosh File"
+msgstr "Áñ÷åßï Macintosh"
+
+#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "ÌÞíõìá"
+
 msgid "Mail Filters"
 msgstr "Ößëôñá ÌçíõìÜôùí"
 
 msgid "Mail Management"
 msgstr "Äéá÷åßñéóç ÌçíõìÜôùí"
 
+#: config/prefs.php.dist:95
+msgid "Mail Previews"
+msgstr "Ðñïåðéóêüðçóç ÌçíõìÜôùí"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr "ÅîõðçñåôçôÞò ìçíõìÜôùí ãéá óýíäåóç:"
+
 msgid "Mailbox"
 msgstr "Ãñáììáôïêéâþôéï"
 
+msgid "Mailbox and Folder Display Options"
+msgstr "ÅðéëïãÝò åìöÜíéóçò Ãñáììáôïêéâþôéïõ êáé ÖáêÝëëùí"
+
 msgid "Maintenance Operations"
 msgstr "Ëåéôïõñãßåò ÓõíôÞñçóçò"
 
 msgid "March"
 msgstr "ÌÜñôéïò"
 
+#: templates/folders/actions.inc:16
+msgid "Mark All Messages in Folder as Seen"
+msgstr "ÓÞìáíóç üëùí ôùí ìçíõìÜôùí óôï öÜêåëï óáí 'ÁíáãíùóìÝíá'"
+
+#: templates/folders/actions.inc:17
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "ÓÞìáíóç üëùí ôùí ìçíõìÜôùí óôï öÜêåëï óáí 'Ìç ÁíáãíùóìÝíá'"
+
 msgid "Mark as:"
 msgstr "×áñáêôçñéóìüò ùò:"
 
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Íá åìöáíßæïíôáé ïé áðáíôÞóåéò ìå äéáöïñåôéêÜ ÷ñþìáôá;"
 
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "ÌáñêÜñéóìá ìçíõìÜôùí óáí áíáãíùóìÝíá; (ìüíï IMAP)"
+
+msgid "Mark simple markup?"
+msgstr "Íá óçìåéþíùíôáé áðëÝò óçìåéþóåéò;"
+
+msgid "Match All Queries"
+msgstr "Ôáßñéáóìá üëùí ôùí åñùôÞóåùí"
+
+msgid "Match Any Query"
+msgstr "Ôáßñéáóìá ïðïéáóäÞðïôå åñþôçóçò"
+
+msgid "Maximum Attachment Size"
+msgstr "ÌÝãéóôï ìÝãåèïò Åðéóõíáðôüìåíïõ"
+
+#: templates/compose/compose.inc:488
+msgid "Maximum number of attachments reached."
+msgstr "ÎåðåñÜóèçêå ï ìÝãéóôïò áñéèìüò óõíçììÝíùí."
+
+#: templates/compose/compose.inc:483
+msgid "Maximum total attachment size reached."
+msgstr "ÎåðåñÜóèçêå ôï óõíïëéêü ìÝãåèïò óõíçììÝíùí."
+
 msgid "May"
 msgstr "ÌÜéïò"
 
+#: lib/MIME/Viewer/itip.php:604
+msgid "Meeting Cancellation"
+msgstr "Áêýñùóç óõíÜíôçóçò"
+
+#: lib/MIME/Viewer/itip.php:532
+msgid "Meeting Information"
+msgstr "Ðëçñïöïñßåò ÓõíÜíôçóçò"
+
+#: lib/MIME/Viewer/itip.php:542
+msgid "Meeting Proposal"
+msgstr "Ðñüôáóç ÓõíÜíôçóçò"
+
+#: lib/MIME/Viewer/itip.php:584
+msgid "Meeting Reply"
+msgstr "ÁðÜíôçóç ãéá ÓõíÜíôçóç"
+
+#: lib/MIME/Viewer/itip.php:554
+msgid "Meeting Update"
+msgstr "ÅíçìÝñùóç ÓõíÜíôçóçò"
+
+#: lib/MIME/Viewer/itip.php:559
+msgid "Meeting Update Request"
+msgstr "Áßôçìá ÅíçìÝñùóçò ãéá óõíÜíôçóç"
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr "Ìåíïý Ëßóôáò ÖáêÝëùí"
+
+#: lib/Compose.php:237
+msgid "Message"
+msgstr "ÌÞíõìá"
+
+#: compose.php:508 compose.php:535 compose.php:567 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Óýíèåóç Ìçíýìáôïò"
 
+msgid "Message Filters"
+msgstr "Ößëôñá ÌçíõìÜôùí"
+
 msgid "Message Date"
 msgstr "Çìåñïìçíßá Ìçíýìáôïò"
 
+msgid "Message Options"
+msgstr "ÅðéëïãÝò ÌçíõìÜôùí"
+
 msgid "Message Search"
 msgstr "ÁíáæÞôçóç ÌçíõìÜôùí"
 
@@ -739,11 +2217,26 @@
 msgid "Message folders"
 msgstr "ÁíáæÞôçóç óôïõò öáêÝëïõò"
 
-msgid "Message sent successfully, but not saved to"
-msgstr "Ôï ÌÞíõìá óôÜëèçêå åðéôõ÷þò, äåí áðïèçêåýôçêå áíôßãñáöü ôïõ óôïí êáôÜëïãï "
-
-msgid "Message"
-msgstr "ÌÞíõìá"
+#: lib/Compose.php:235
+msgid "Message from %s"
+msgstr "Ìýíõìá áðü %s"
+
+#: templates/search/header.inc:33
+msgid "Message matches"
+msgstr "ÌÞíõìá ðïõ íá ôáéñéÜæåé"
+
+#: compose.php:747 compose.php:761
+msgid "Message redirected successfully."
+msgstr "Ôï ìÞíõìá áíáêáôåõèýíèçêå åðéôõ÷þò."
+
+#: compose.php:994
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Ôï ÌÞíõìá óôÜëèçêå åðéôõ÷þò, äåí áðïèçêåýôçêå üìùò óôï %s"
+
+# compose.php:1053, 1068
+#: compose.php:1053
+msgid "Message sent successfully."
+msgstr "Ôï ÌÞíõìá óôÜëèçêå åðéôõ÷þò."
 
 msgid "Messages per page in the mailbox view."
 msgstr "Ìçíýìáôá áíÜ óåëßäá óôçí ðñïâïëÞ ôïõ Ãñáììáôïêéâþôéïõ."
@@ -757,36 +2250,84 @@
 msgid "Modify"
 msgstr "Ôñïðïðïßçóç"
 
+#: templates/compose/expand.inc:12
+msgid "More than one address found for field '%s'."
+msgstr "Ðåñéóóüôåñåò áðü ìßá äéåõèýíóåéò âñÝèçêáí ãéá ôï ðåäßï '%s'."
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move"
+msgstr "ÌåôáöïñÜ"
+
 msgid "Move Down"
 msgstr "Ìåôáêßíçóç Ðñïò ôá ÊÜôù"
 
 msgid "Move Up"
 msgstr "Ìåôáêßíçóç Ðñïò ôá ÅðÜíù"
 
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr "Ìåôáêßíçóç Ðñïò ôá ÊÜôù"
+
 #, c-format
 msgid "Move messages to the <b>%s</b> folder"
 msgstr "ÌåôáöïñÜ Ìçíýìáôïò óôïí <b>%s</b> öÜêåëï"
 
-msgid "Move"
-msgstr "ÌåôáöïñÜ"
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr "Ìåôáêßíçóç Ðñïò ôá ÅðÜíù"
+
+#: lib/MIME/Viewer/alternative.php:130
+msgid "Multipart/alternative"
+msgstr "Multipart/åíáëëáêôéêü"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
+#: templates/pgp/pgp.inc:24
+msgid "NOTE"
+msgstr "ÓÇÌÅÉÙÓÇ"
 
 msgid "Name"
 msgstr "¼íïìá"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr "Ôï ìÞíõìá êáé/Þ ôï üíïìá äåí ìðïñåß íá åßíáé êåíÜ"
+
+#: lib/MIME/Viewer/itip.php:763
+msgid "Needs Action"
+msgstr "Áðáéôïýíôáé åíÝñãåéåò"
+
 msgid "Never"
 msgstr "ÐïôÝ"
 
+msgid "Never save attachments"
+msgstr "ÐïôÝ íá ìçí áðïèçêåýïíôáé ôá óõíçììÝíá"
+
+msgid "New"
+msgstr "ÍÝá"
+
 msgid "New Folder"
 msgstr "ÅéóáãùãÞ ÖáêÝëïõ"
 
 msgid "New Mail"
 msgstr "ÍÝï ÌÞíõìá"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "ÍÝï ÌÞíõìá"
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+msgid "New Message to %s"
+msgstr "ÍÝï ÌÞíõìá óå %s"
+
+msgid "New User Introduction"
+msgstr "Ïäçãßåò ãéá ôïõò íÝïõò ÷ñÞóôåò"
+
 msgid "New messages"
 msgstr "ÍÝá ìçíýìáôá"
 
-msgid "New"
-msgstr "ÍÝá"
+msgid "Next"
+msgstr "Åðüìåíï"
 
 msgid "Next Message"
 msgstr "Åðüìåíï ÌÞíõìá"
@@ -794,17 +2335,88 @@
 msgid "Next Page"
 msgstr "Åðüìåíç Óåëßäá"
 
-msgid "Next"
-msgstr "Åðüìåíï"
+msgid "No"
+msgstr "¼÷é"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr "Äåí âñÝèçêå ðéóôïðïéçôéêü"
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr "×ùñßò êñõðôïãñÜöçóç"
+
+#: templates/pgp/pgp.inc:80
+msgid "No Keys in Keyring"
+msgstr "Äåí õðÜñ÷ïõí ÊëåéäéÜ óôï óýóôçìá Êëåéäéþí"
+
+msgid "No Messages"
+msgstr "Äåí ÕðÜñ÷ïõí ìçíýìáôá"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr "Äåí åéóÜ÷èçêå äçìüóéï êëåéäß PGP."
+
+#: templates/smime/smime.inc:140
+msgid "No Personal Certificate Present"
+msgstr "Äåí õðÜñ÷åé Ðñïóùðéêü Ðéóôïðïéçôéêü"
+
+#: templates/smime/smime.inc:54
+msgid "No Public Keys Found"
+msgstr "Äåí âñÝèçêáí Äçìüóéá ÊëåéäéÜ"
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr "Äåí åéóÜ÷èçêå äçìüóéï êëåéäß S/MIME."
 
 msgid "No Subject"
 msgstr "Äåí ÕðÜñ÷åé ÈÝìá"
 
+#: lib/MIME/Viewer/tnef.php:94
+msgid "No attachments found."
+msgstr "Äåí âñÝèçêáí óõíçììÝíá."
+
+#: acl.php:72 acl.php:98
+msgid "No folder selected."
+msgstr "Äåí åðéëÝ÷èçêå öÜêåëïò."
+
+#: lib/Block/summary.php:130
+msgid "No folders are being checked for new mail."
+msgstr "Äåí åëÝãèçêáí öÜêåëëïé ãéá íÝá ìçíýìáôá."
+
 msgid "No folders were specified"
 msgstr "Äåí Ý÷ïõí ïñéóôåß öÜêåëïé"
 
-msgid "No messages matched your search"
-msgstr "Äåí âñÝèçêáí ìçíýìáôá ðïõ íá ôáéñéÜæïõí óôá êñéôÞñéá óáò"
+#: lib/Block/summary.php:133
+msgid "No folders with new messages"
+msgstr "Äåí õðÜñ÷ïõí öÜêåëïé ìå íÝá ìçíÞìáôá"
+
+#: lib/Block/summary.php:133
+msgid "No folders with unseen messages"
+msgstr "Äåí õðÜñ÷ïõí öÜêåëïé ìå ìç áíáãíùóìÝíá ìçíÞìáôá"
+
+#: lib/Compose.php:231
+msgid "No message body text"
+msgstr "Äåí õðÜñ÷åé óþìá êåéìÝíïõ"
+
+msgid "No messages matched your search."
+msgstr "Äåí âñÝèçêáí ìçíýìáôá ðïõ íá ôáéñéÜæïõí óôá êñéôÞñéá óáò."
+
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr "Äåí åéóÜ÷èçêå ðñïóùðéêü éäéùôéêü êëåéäß PGP."
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr "Äåí åéóÜ÷èçêå ðñïóùðéêü äçìüóéï êëåéäß PGP."
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr "Äåí åéóÜ÷èçêå ðñïóùðéêü ðéóôïðïéçôéêü S/MIME."
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr "Äåí Ý÷åé ïñéóèåß ðñüãñáììá åëÝã÷ïõ ïñèïãñáößáò."
 
 msgid "No spelling errors"
 msgstr "Äåí õðÜñ÷ïõí ïñèïãñáöéêÜ ëÜèç"
@@ -812,12 +2424,23 @@
 msgid "No suggestions"
 msgstr "Äåí õðÜñ÷ïõí ÐñïôÜóåéò"
 
-msgid "No"
-msgstr "¼÷é"
-
+#: acl.php:68 acl.php:94
+msgid "No user specified."
+msgstr "Äåí ïñßóèçêå ÷ñÞóôçò."
+
+#: lib/MIME/Viewer/itip.php:694
+msgid "Non Participant"
+msgstr "Êáíåßò ÓõììåôÝ÷ùí"
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:5
+#: lib/MIME/Viewer/itip.php:651
 msgid "None"
 msgstr "ÊáíÝíá"
 
+msgid "Normal"
+msgstr "ÊáíïíéêÞ"
+
 msgid "Not Deleted"
 msgstr "Ìç ÄéáãñáììÝíá"
 
@@ -830,21 +2453,40 @@
 msgid "Not Personal"
 msgstr "Ìç ðñïóùðéêÜ"
 
+#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
+#: lib/Crypt/SMIME.php:166
+msgid "Not a valid public key."
+msgstr "Ìç Ýãêõñï äçìüóéï êëåéäß."
+
 msgid "Not deleted messages"
 msgstr "Ìç ÄéáãñáììÝíá ìçíýìáôá"
 
 msgid "Not important messages"
 msgstr "Ìç óçìáíôéêÜ ìçíýìáôá"
 
+#: lib/Maintenance/Task/fetchmail_login.php:76
+msgid "Note that this can take some time"
+msgstr "Õðüøç üôé áõôü èá ðÜñåé êÜðïéá þñá"
+
 msgid "November"
 msgstr "ÍïÝìâñéïò"
 
+#: config/prefs.php.dist:371
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Áñéèìüò ìçíþí ðïõ èá êñáôïýíôáé ôá ðáëéÜ óõíäåìÝíá óõíçììÝíá, áí ãßíåôáé "
+"äéáãñáöÞ ìçíéáßá."
+
+#: config/prefs.php.dist:353
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "Áñéèìüò öáêÝëùí ÁÐÅÓÔÁËÌÅÍÁ ðïõ äåí èá äéáãñÜöïíôáé áíÜ ìÞíá."
 
 msgid "OK"
 msgstr "ÅíôÜîåé"
 
+msgid "OR"
+msgstr "Þ"
+
 msgid "October"
 msgstr "Ïêôþâñéïò"
 
@@ -852,40 +2494,253 @@
 msgstr "ÐáëéÜ Ìçíýìáôá"
 
 msgid "Old sent-mail folders being purged."
-msgstr "Ðáëéïß ÖÜêåëïé ìå áðåóôáëìÝíá ðïõ äéáãñÜöïíôáé."
+msgstr "Ïé Ðáëéïß ÖÜêåëïé ìå áðåóôáëìÝíá èá äéáãñáöïýí."
+
+msgid ""
+"Once you've filled in these three fields, click the \"Login\" button to "
+"proceed."
+msgstr ""
+"¼ôáí èá Ý÷åôå óõìðëçñþóåé áõôÜ ôá ôñßá ðåäßá, åðéëÝîôå ôï \"Åßóïäïò\" ãéá íá "
+"óõíå÷ßóåôå."
+
+#: lib/Block/summary.php:27
+msgid "Only display folders with unread messages in them?"
+msgstr "ÅìöÜíéóç ìüíï ôùí öáêÝëùí ðïõ Ý÷ïõí ìç áíáãíùóìÝíá ìçíÞìáôá;"
+
+#: templates/folders/javascript.inc:78
+msgid "Only one folder should be selected for this action."
+msgstr "Ìüíï Ýíáò öÜêåëïò ðñÝðåé íá Ý÷åé åðéëåãåß ãé' áõôÞ ôçí åíÝñãåéá."
+
+#: templates/menu.inc:7 templates/menu.inc:27
+msgid "Ope_n Folder"
+msgstr "Áíïéãìá"
 
 msgid "Open Folder"
 msgstr "Áíïéãìá ÖáêÝëïõ"
 
+#: lib/MIME/Viewer/itip.php:690
+msgid "Optional Participant"
+msgstr "Ðñïáéñåôéêïß ÓõììåôÝ÷ïíôåò"
+
 msgid "Options"
 msgstr "ÅðéëïãÝò"
 
+msgid "Options for %s"
+msgstr "ÅðéëïãÝò ãéá %s"
+
+msgid "Options:"
+msgstr "ÅðéëïãÝò:"
+
+#: templates/javascript/htmlarea_lang.js:18
+msgid "Ordered List"
+msgstr "ÔáîéíïìçìÝíç Ëßóôá"
+
+msgid "Organizing"
+msgstr "ÏñãÜíùóç"
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr "Áëëïé ëïãáñéáóìïß Mail"
+
 msgid "Other Options"
 msgstr "Áëëåò ÅðéëïãÝò"
 
-#, c-format
+msgid "Overview"
+msgstr "ÃåíéêÜ"
+
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr "ÊñõðôïãñáöçìÝíï ìÞíõìá (PGP)"
+
+#: compose.php:343
+msgid "PGP Error: "
+msgstr "ËÜèïò PGP: "
+
+#: compose.php:322
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr "ËÜèïò PGP : Áðáéôåßôáé ëÝîç-êëåéäß ãéá ôï ðñïóùðéêü éäéùôéêü êëåéäß."
+
+#: templates/pgp/notactive.inc:6
+msgid "PGP NOT Active"
+msgstr "ÌÇ åíåñãü PGP"
+
+#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+msgid "PGP Options"
+msgstr "ÅðéëïãÝò PGP"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr "ÅéóáãùãÞ ëÝîçò-êëåéäéïý PGP"
+
+#: templates/pgp/pgp.inc:128
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr "Ç õðïóôÞñéîç ðñïóùðéêïý æåýãïõò êëåéäéþí áðáéôåß áóöáëÞ web óýíäåóç."
+
+msgid "PGP Public"
+msgstr "Äçìüóéï Êëåéäß PGP"
+
+#: lib/MIME/Viewer/pgp.php:178
+msgid "PGP Public Key Text"
+msgstr "Êåßìåíï Äçìüóéïõ Êëåéäéïý PGP"
+
+#: pgp.php:149
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Ôï Äçìüóéï Êëåéäß PGP ãéá \"%s (%s)\" ðñïóôÝèçêå åðéôõ÷þò."
+
+#: pgp.php:245
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Ôï Äçìüóéï Êëåéäß PGP ãéá \"%s\" äéáãñÜöçêå åðéôõ÷þò."
+
+#: templates/pgp/pgp.inc:72
+msgid "PGP Public Keyring"
+msgstr "Óýóôçìá Äçìüóéùí Êëåéäéþí PGP"
+
+#: templates/compose/encrypt_list.inc:8
+msgid "PGP Sign Message"
+msgstr "ÕðïãåãñáììÝíï ìÞíõìá (PGP)"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr "ÕðïãåãñáììÝíï êáé êñõðôïãñáöçìÝíï ìÞíõìá (PGP)"
+
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr "Ôï Éäéùôéêü Êëåéäß PGP ðñïóôÝèçêå åðéôõ÷þò."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr "Ôï Äçìüóéï Êëåéäß PGP ðñïóôÝèçêå åðéôõ÷þò."
+
+#: templates/pgp/notactive.inc:11
+msgid "PGP support is disabled on this system."
+msgstr "Ç ÕðïóôÞñéîç PGP Ý÷åé áðåíåñãïðïéçèåß ó' áõôü ôï óýóôçìá."
+
+#: lib/MIME/Viewer/pgp.php:214
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+"Ç ÕðïóôÞñéîç PGP äåí åßíáé åíåñãÞ êáé ç øçöéáêÞ õðïãñáöÞ äåí åßíáé äõíáôü íá "
+"åðéâåâáéùèåß."
+
+#: lib/MIME/Viewer/pgp.php:301
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+"Ç ÕðïóôÞñéîç PGP äåí åßíáé åíåñãÞ êáé ôï ìÞíõìá äåí åßíáé äõíáôü íá "
+"áðïêñõðôïãñáöçèåß."
+
+#: templates/pgp/pgp.inc:24
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly"
+msgstr ""
+"Ç õðïóôÞñéîç PGP áðáéôåß ôç ÷ñÞóç áíáäõüìåíùí (Popup) ðáñáèýñùí. Áí Ý÷åôå "
+"áðåíåñãïðïéÞóåé áõôÞ ôçí åðéëïãÞ óôïí browser óáò, èá ðñÝðåé íá áëëÜîåôå "
+"áõôÞ ôçí åðéëïãÞ, äéáöïñåôéêÜ ôï PGP äåí èá ëåéôïõñãåß óùóôÜ"
+
+#: lib/Fetchmail/imap.php:103
+msgid "POP3 (Auto Detect Protocols)"
+msgstr "POP3 (Áõôüìáôç áíß÷íåõóç Ðñùôïêüëëùí)"
+
+#: lib/Fetchmail/imap.php:120
+msgid "POP3 over SSL"
+msgstr "POP3 ðÜíù áðü SSL"
+
+#: lib/Fetchmail/imap.php:126
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 ðÜíù áðü SSL (áõôüìáôá õðïãåãñáììÝíï ðéóôïðïéçôéêü)"
+
+#: templates/login/login.inc:177
+msgid "POP3 over SSL (self-signed)"
+msgstr "POP3 ðÜíù áðü SSL (áõôüìáôá õðïãåãñáììÝíï ðéóôïðïéçôéêü)"
+
+#: lib/Fetchmail/imap.php:114
+msgid "POP3, no TLS"
+msgstr "POP3 ÷ùñßò TLS"
+
+# templates/mailbox/header.inc:19#, c-format
+#: templates/mailbox/header.inc:19 #
 msgid "Page %d of %d"
 msgstr "Óåëßäá %d áðü %d"
 
+msgid "Page with the First Unseen Message"
+msgstr "Óåëßäá ìå ôï ðñþôï ìç áíáãíùóìÝíï ìÞíõìá"
+
+msgid "Page with the Last Unseen Message"
+msgstr "Óåëßäá ìå ôï ôåëåõôáßï ìç áíáãíùóìÝíï ìÞíõìá"
+
 msgid "Part(s)"
 msgstr "ÌÝñïò(ç)"
 
+#: templates/pgp/pgp.inc:211
+msgid "Passphrase"
+msgstr "ËÝîç-êëåéäß"
+
+#: templates/pgp/pgp.inc:216
+msgid "Passphrase (Again)"
+msgstr "ËÝîç-êëåéäß (îáíÜ)"
+
+#: smime.php:235 pgp.php:310
+msgid "Passphrase successfully unloaded."
+msgstr "Ç ëÝîç-êëåéäß 'áðïöïñôþèçêå' åðéôõ÷þò."
+
+#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr "ËÝîç-êëåéäß:"
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr "Ç ËÝîç-êëåéäß äåí ìðïñåß íá åßíáé êåíÞ"
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr "Ç ëÝîç-êëåéäß äåí ôáéñéÜæåé"
+
 msgid "Password"
 msgstr "Êùäéêüò"
 
+msgid "Path to your mail folders:"
+msgstr "ÄéáäñïìÞ ãéá ôïí öÜêåëï ìå ôá ìçíýìáôá óáò:"
+
 msgid "Perform maintenance operations on login?"
 msgstr "Íá åêôåëïýíôáé ëåéôïõñãßåò óõíôÞñçóçò êáôÜ ôçí åßóïäï óôçí õðçñåóßá;"
 
+msgid "Personal"
+msgstr "ÐñïóùðéêÜ"
+
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "ÐñïóùðéêÝò Ðëçñïöïñßåò"
 
-msgid "Personal"
-msgstr "ÐñïóùðéêÜ"
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr "Ðñïóùðéêü æåýãïò êëåéäéþí PGP äçìéïõñãÞèçêå åðéôõ÷þò."
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr "Ðñïóùðéêü æåýãïò êëåéäéþí PGP äéáãñÜöçêå åðéôõ÷þò."
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "ÐñïóùðéêÜ ðéóôïðïéçôéêÜ S/MIME ÄÅÍ åéóÞ÷èçóáí: "
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "ÐñïóùðéêÜ êëåéäéÜ S/MIME äéáãñÜöçêáí åðéôõ÷þò."
 
 msgid "Place your signature before replies and forwards?"
-msgstr "Íá ôïðïèåôåßôáé ç õðïãñáöÞ óáò ðñéí áðü ôéò áðáíôÞóåéò êáé ôéò ðñïùèÞóåéò ôùí ìçíõìÜôùí óáò;"
+msgstr ""
+"Íá ôïðïèåôåßôáé ç õðïãñáöÞ óáò ðñéí áðü ôéò áðáíôÞóåéò êáé ôéò ðñïùèÞóåéò "
+"ôùí ìçíõìÜôùí óáò;"
 
+#: compose.php:241
+msgid "Plaintext Version of Message"
+msgstr "¸êäïóç ìçíýìáôïò ìå êáèáñü êåßìåíï"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
 msgid "Please enter a name for the new folder:"
 msgstr "Ðáñáêáëþ äþóôå Ýíá üíïìá ãéá ôïí íÝï öÜêåëï:"
 
@@ -895,18 +2750,68 @@
 msgid "Please enter the new name:"
 msgstr "Ðáñáêáëþ åéóÜãåôå ôï íÝï üíïìá:"
 
+#: templates/pgp/passphrase.inc:19
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+"Ðáñáêáëþ åéóÜãåôå ôç ëÝîç êëåéäß ãéá ôï ðñïóùðéêü éäéùôéêü PGP êëåéäß. Áõôü "
+"áðáéôåßôáé ìéá öïñÜ ìüíï ãéá êÜèå %s óýíäåóç."
+
+#: templates/smime/passphrase.inc:13
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+"Ðáñáêáëþ åéóÜãåôå ôç ëÝîç êëåéäß ãéá ôï ðñïóùðéêü éäéùôéêü S/MIME êëåéäß. "
+"Áõôü áðáéôåßôáé ìéá öïñÜ ìüíï ãéá êÜèå %s óýíäåóç."
+
 msgid "Please enter valid search criteria."
 msgstr "Ðáñáêáëþ åéóÜãåôå Ýãêõñá êñéôÞñéá áíáæÞôçóçò."
 
+#: recompose.php:88
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+"Ðáñáêáëþ êÜíôå åßóïäï (login) îáíÜ ãéá íá óõíå÷ßóåôå ôç óýíèåóç ôïõ "
+"ìçíýìáôïò. Áí äå ÷ñçóéìïðïéåßôå cookies êáé êÜíåôå óýíèåóç óå áíáäõüìåíï "
+"ðáñÜèõñï, èá ðñÝðåé íá îáíáêÜíåôå åßóïäï êáé óôï êýñéï ðáñÜèõñï. Áõôü "
+"ãßíåôáé ãéá íá åìðïäßóåé åðßèåóç ãéá õðïêëïðÞ ôçò óýíäåóÞò óáò. Æçôïýìå "
+"óõãíþìç ãéá üðïéá ôáëáéðùñßá."
+
+#: templates/login/login.inc:81
+msgid "Please provide your password."
+msgstr "Ðáñáêáëþ äþóôå ôïí êùäéêü óáò."
+
+msgid "Please provide your username."
+msgstr "Ðáñáêáëþ äþóôå ôï üíïìá ÷ñÞóôç"
+
 msgid "Please provide your username and password"
 msgstr "Ðáñáêáëþ äþóôå ôï üíïìá ÷ñÞóôç êáé ôïí êùäéêü óáò"
 
 msgid "Please resolve ambiguous or invalid addresses."
-msgstr "Ðáñáêáëþ äéïñèþóôå ôçí äéåýèõíóç, åßíáé ðéèáíüôáôá ëáíèáóìÝíç."
+msgstr "Ðáñáêáëþ åðéëÝîôå, äéöïñüìåíç Þ Üêõñç äéåýèõíóç."
+
+#: lib/MIME/Viewer/itip.php:631
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+"Ðáñáêáëþ äéáâÜóôå ôéò ðáñáêÜôù ðëçñïöïñßåò êáé ìåôÜ åðéëÝîôå ìéá åíÝñãåéá "
+"áðü ôï ðáñáêÜôù ìåíïý."
 
+#: templates/folders/javascript.inc:56
 msgid "Please select a folder before you perform any actions."
 msgstr "Ðáñáêáëþ åðéëÝîåôå Ýíá öÜêåëï ðñéí êÜíåôå ïðïéáäÞðïôå åíÝñãåéá."
 
+#: lib/MIME/Viewer/itip.php:461
+msgid "Please select an action from the menu below."
+msgstr "Ðáñáêáëþ åðéëÝîôå ìéá åíÝñãéá áðü ôï ðáñáêÜôù ìåíïý."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Ðáñáêáëþ åðéëÝîåôå ôïõëÜ÷éóôïí Ýíá êáôÜëïãï ãéá áíáæÞôçóç."
 
@@ -917,17 +2822,39 @@
 msgstr "Ðáñáêáëþ åðéëÝîôå Þ åðåîåñãáóôåßôå ôï áìÝóùò åðüìåíï:"
 
 msgid "Precede your signature with dashes ('-- ')"
-msgstr "Íá ôïðïèåôïýíôáé ðáýëåò ðñéí ôçí õðïãñáöÞ óáò('-- ')"
+msgstr "Íá ôïðïèåôïýíôáé ðáýëåò ðñéí ôçí õðïãñáöÞ óáò ('-- ')"
+
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+msgid "Preferences successfully updated."
+msgstr "Ïé ðñïôéìÞóåéò åíçìåñþèçêáí åðéôõ÷þò."
+
+msgid "Preview"
+msgstr "Ðñïåðéóêüðçóç"
 
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Ðñïçãïýìåíï ÌÞíõìá"
 
+#: mailbox.php:336
 msgid "Previous Page"
 msgstr "Ðñïçãïýìåíç Óåëßäá"
 
 msgid "Print"
 msgstr "Åêôýðùóç"
 
+msgid "Priority"
+msgstr "Ðñïôåñáéüôçôá"
+
+msgid "Priority:"
+msgstr "Ðñïôåñáéüôçôá:"
+
+#: templates/smime/import_key.inc:74
+msgid "Private Key Password"
+msgstr "Êùäéêüò ðñïóùðéêïý êëåéäéïý"
+
+msgid "Problem"
+msgstr "Ðñüâëçìá"
+
 #, c-format
 msgid "Problem with filter rule %d: folder does not exist: %s"
 msgstr "Ðñüâëçìá ìå ôïí êáíüíá ößëôñïõ %d: Ï öÜêåëïò äåí õðÜñ÷åé: %s"
@@ -935,24 +2862,82 @@
 msgid "Problem?"
 msgstr "Ðñüâëçìá;"
 
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr "Åñþôçóç êÜèå öïñÜ ðïõ áðïóôÝëëåôáé óõíçììÝíï, ðñïêáèïñéóìÝíï Ï×É"
+
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr "Åñþôçóç êÜèå öïñÜ ðïõ áðïóôÝëëåôáé óõíçììÝíï, ðñïêáèïñéóìÝíï ÍÁÉ"
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr "Ðñùôüêïëëï:"
+
+#: lib/Crypt/PGP.php:461
+msgid "Public PGP keyserver support has been disabled."
+msgstr "Ç õðïóôÞñéîç åîõðçñåôçôÞ PGP êëåéäéþí Ý÷åé áðåíåñãïðïéçèåß."
+
+msgid "Pur_ge Deleted"
+msgstr "ÏñéóôéêÞ ÄéáãñáöÞ"
+
 msgid "Purge Deleted"
 msgstr "ÏñéóôéêÞ ÄéáãñáöÞ"
 
+#: templates/folders/actions.inc:22
+msgid "Purge Folder(s)"
+msgstr "ÏñéóôéêÞ äéáãñáöÞ öáêÝëïõ(ùí)"
+
 msgid "Purge Trash how often:"
 msgstr "Íá ÁäåéÜæåé ï êÜäïò êÜèå:"
 
 msgid "Purge messages in Trash folder older than this amount of days."
-msgstr "Íá äéáãñÜöïíôáé ôá ìçíýìáôá áðü ôïí êÜäï ðïõ åßíáé ðáëéüôåñá áðü áõôü ôïí áñéèìü çìåñþí."
+msgstr ""
+"Íá äéáãñÜöïíôáé ôá ìçíýìáôá áðü ôïí êÜäï ðïõ åßíáé ðáëéüôåñá áðü áõôü ôïí "
+"áñéèìü çìåñþí."
 
-msgid "Purge old message in the Trash folder?"
+msgid "Purge old messages in the Trash folder?"
 msgstr "ÄéáãñáöÞ ðáëéþí ìçíõìÜôùí áðü ôïí êÜäï;"
 
+msgid "Purging"
+msgstr "ÄéáãñáöÞ"
+
 #, c-format
 msgid "Purging %d message(s) from Trash folder."
 msgstr "ÄéáãñáöÞ %d ìÞíõìá(ôá) áðü ôïí êÜäï."
 
+msgid "Put this after @ when sending mail and default address expansion:"
+msgstr ""
+"ÓõìðÞñùóå ìå ôï ðáñáêÜôù ìåôÜ ôï @ êáôÜ ôçí áðïóôïëÞ ìå ðñïêáèïñéóìÝíç "
+"äéåýèõíóç:"
+
+#: templates/quota/quota.inc:17
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Äéáèåóéìüôçôá ÷þñïõ ãñáììáôïèõñßäáò óáò: %.2fMB / %.2fMB  (%.2f%%)"
+
+#: templates/quota/quota.inc:21
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "Äéáèåóéìüôçôá ÷þñïõ ãñáììáôïèõñßäáò óáò: %.2fMB / ×ÙÑÉÓ ÏÑÉÁ"
+
+#: templates/quota/quota.inc:24
+msgid "Quota status: NO LIMIT"
+msgstr "Äéáèåóéìüôçôá ÷þñïõ ãñáììáôïèõñßäáò óáò: ×ÙÑÉÓ ÏÑÉÁ"
+
 msgid "Quoting"
-msgstr "Áñ÷éêü ìÞíõìá áðü "
+msgstr "Ðåñéïñßæïíôáò"
+
+msgid "Quoting %f"
+msgstr "Ðåñéïñßæïíôáò %f"
+
+msgid "Received:"
+msgstr "ÐáñáëÞöèçêå:"
+
+msgid "Received On"
+msgstr "ÐáñáëÞöèçêå óôéò"
+
+msgid "Received Since"
+msgstr "ÐáñáëÞöèçêå áðü ôüôå"
+
+msgid "Received Until"
+msgstr "ÐáñáëÞöèçêå ìÝ÷ñé"
 
 msgid "Received after"
 msgstr "ÐáñáëÞöèçêå ìåôÜ áðü"
@@ -963,57 +2948,122 @@
 msgid "Received on"
 msgstr "ÐáñáëÞöèçêå óôéò"
 
+msgid "Redirec_t"
+msgstr "Áíáêáôåýèõíóç"
+
+msgid "Redirect"
+msgstr "Áíáêáôåýèõíóç"
+
 msgid "Redirect Message"
 msgstr "Áíáêáôåýèõíóç Ìçíýìáôïò"
 
 msgid "Redirect this message"
 msgstr "Áíáêáôåýèõíóç áõôïý ôïõ Ìçíýìáôïò"
 
-msgid "Redirect"
-msgstr "Áíáêáôåýèõíóç"
-
 msgid "Redirecting failed."
 msgstr "Ç áíáêáôåýèõíóç áðÝôõ÷å."
 
+msgid "Refresh"
+msgstr "ÁíáíÝùóç"
+
 msgid "Refresh Folder Views:"
 msgstr "ÁíáíÝùóç ÐñïâïëÞò ÖáêÝëùí:"
 
-msgid "Refresh"
+msgid "Reload"
 msgstr "ÁíáíÝùóç"
 
 msgid "Reload View"
 msgstr "ÁíáíÝùóç ÐñïâïëÞò"
 
+#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+msgid "Remember the free/busy information."
+msgstr "Íá èõìÜìáé ôéò ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ."
+
+#: config/prefs.php.dist:950
 msgid "Remember the last view"
 msgstr "Íá ðáñáìÝíåé ç ôåëåõôáßá ðñïâïëÞ"
 
-msgid "Remove Selected"
-msgstr "Áêýñùóç ÅðéëåãìÝíùí"
+#: templates/fetchmail/manage.inc:27
+msgid "Remote Mailbox:"
+msgstr "ÁðïìáêñõóìÝíç Ãñáììáôïèõñßäá:"
+
+#: templates/search/fields.inc:40
+msgid "Remove Field From Search"
+msgstr "ÄéáãñáöÞ ðåäßïõ áðü ôçí ÁíáæÞôçóç"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "ÄéáãñáöÞ ðçãáßïõ"
 
 msgid "Rename Folder"
 msgstr "Ìåôïíïìáóßá ÖáêÝëïõ"
 
+#: templates/folders/actions.inc:6
+msgid "Rename Folder(s)"
+msgstr "Ìåôïíïìáóßá ÖáêÝëïõ(ùí)"
+
+msgid "Remove Selected"
+msgstr "Áêýñùóç ÅðéëåãìÝíùí"
+
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Ìåôïíïìáóßá ôïõ öáêÝëïõ ÁÐÅÓÔÁËÌÅÍÁ óôçí áñ÷Þ êÜèå ìÞíá;"
 
 #, c-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "Ç ìåôïíïìáóßá ôïõ öáêÝëïõ \"%s\" óå \"%s\" áðÝôõ÷å. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgstr ""
+"Ç ìåôïíïìáóßá ôïõ öáêÝëïõ \"%s\" óå \"%s\" áðÝôõ÷å. Ôï óýóôçìá Ýâãáëå ôï "
+"áêüëïõèï ìÞíõìá"
 
+#: templates/message/navbar_actions.inc:10
+msgid "Repl_y to List"
+msgstr "ÁðÜíôçóç óôçí ïìÜäá"
+
+#: templates/compose/spelling.inc:90
 msgid "Replace with:"
 msgstr "ÁíôéêáôÜóôáóç ìå:"
 
+msgid "Reply"
+msgstr "ÁðÜíôçóç"
+
+#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+msgid "Reply Sent."
+msgstr "ÁðÜíôçóç ÓôÜëèçêå."
+
 msgid "Reply to All"
 msgstr "ÁðÜíôçóç óå üëïõò"
 
 msgid "Reply to All:"
 msgstr "ÁðÜíôçóç óå üëïõò:"
 
-msgid "Reply"
-msgstr "ÁðÜíôçóç"
+msgid "Reply to List"
+msgstr "ÁðÜíôçóç óôçí ïìÜäá"
+
+msgid "Reply to List:"
+msgstr "ÁðÜíôçóç óôçí ïìÜäá:"
+
+msgid "Reply to _All"
+msgstr "ÁðÜíôçóç óå üëïõò"
+
+#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
+#: lib/MIME/Viewer/itip.php:504
+msgid "Reply with Not Supported Message"
+msgstr "ÁðÜíôçóç ìå Ìç Õðïóôçñéæüìåíï ÌÞíõìá."
+
+#: lib/MIME/Viewer/itip.php:492
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+"ÁðÜíôçóç ìå ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ ãéá ôïõò åðüìåíïõò äýï (2) "
+"ìÞíåò."
+
+#: lib/MIME/Viewer/itip.php:491
+msgid "Reply with requested free/busy information."
+msgstr "ÁðÜíôçóç ìå ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ ðïõ æçôÞèçêáí."
+
+msgid "Reply-To"
+msgstr "ÁðÜíôçóç-Ðñïò"
 
 msgid "Reply-To: "
-msgstr "ÁðÜíôçóç-Ðñïò:"
+msgstr "ÁðÜíôçóç-Ðñïò: "
 
 msgid "Reply-to"
 msgstr "ÁðÜíôçóç-ðñïò"
@@ -1021,59 +3071,297 @@
 msgid "Reply:"
 msgstr "ÁðÜíôçóç:"
 
+#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+msgid "Report as Innocent"
+msgstr "ÁíáöïñÜ óáí Áèþï"
+
+#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
 msgid "Report as Spam"
 msgstr "ÁíáöïñÜ ìçíýìáôïò ùò 'Spam'"
 
+msgid "Re_quest Delivery Confirmation"
+msgstr "Íá æçôçèåß Åðéâåâáßùóç üôé ðáñáäüèçêå"
+
+msgid "Request Delivery Report"
+msgstr "Íá æçôçèåß ÁíáöïñÜ ðáñÜäïóçò"
+
+msgid "Request a <span class=\"accessKey\">R</span>ead Receipt"
+msgstr "Íá æçôçèåß <span class=\"accessKey\">Å</span>ðéâåâáßùóç üôé äéáâÜóèçêå"
+
 msgid "Request a Return Receipt"
 msgstr "Íá æçôçèåß Åðéâåâáßùóç ÐáñáëáâÞò"
 
+msgid "Request a _Read Receipt"
+msgstr "Íá æçôçèåß Åðéâåâáßùóç üôé äéáâÜóèçêå"
+
+msgid "Request delivery confirmation?"
+msgstr "Íá æçôçèåß Åðéâåâáßùóç Üöéîçò;"
+
+msgid "Request read Receipt?"
+msgstr "Íá æçôçèåß Åðéâåâáßùóç üôé äéáâÜóèçêå;"
+
+msgid "Request read receipts?"
+msgstr "Íá æçôçèåß Åðéâåâáßùóç üôé äéáâÜóèçêå;"
+
+#: mailbox.php:197
+msgid "Requested message not found."
+msgstr "Ôï ìÞíõìá ðïõ æçôÞèçêå äåí âñÝèçêå."
+
+#: lib/MIME/Viewer/itip.php:682
+msgid "Required Participant"
+msgstr "ÆçôÞèçêå ÓõììåôÝ÷ùí"
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:158
 msgid "Reset"
 msgstr "Êáèáñéóìüò Öüñìáò"
 
+#: lib/MIME/Viewer/itip.php:106
+msgid "Respondent Status Updated."
+msgstr "Ç êáôÜóôáóç áõôïý ðïõ áðÜíôçóç åíçìåñþèçêå."
+
+#: templates/message/navbar_actions.inc:28
 msgid "Resume"
 msgstr "ÓõíÝ÷åéá"
 
+#: recompose.php:89
+msgid "Resume your session"
+msgstr "ÅðéóôñïöÞ óôç óýíäåóç"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr "ÅðéóôñïöÞ óôç Ðñïóêüìéóç ÌçíõìÜôùí"
+
+msgid "Return to Main Preferences Screen"
+msgstr "ÅðéóôñïöÞ óôçí êýñéá ïèüíç ÐñïôéìÞóåùí"
+
+msgid "Return to Options"
+msgstr "ÅðéóôñïöÞ óôéò ÅðéëïãÝò"
+
+#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
+msgid "Return to Previous Screen"
+msgstr "ÅðéóôïñöÞ óôçí Ðñïçãïýìåíç Ïèüíç"
+
+msgid "Return to Welcome Screen"
+msgstr "ÅðéóôñïöÞ óôçí áñ÷éêÞ ïèüíç"
+
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "ÅðéóôñïöÞ óôïí öÜêåëï Åéóåñ÷üìåíá ìåôÜ áðü äéáãñáöÞ, ìåôáöïñÜ Þ áíôéãñáöÞ "
 "ìçíýìáôïò?"
 
+#: lib/MIME/Viewer/itip.php:673
+msgid "Role"
+msgstr "Ñüëïò"
+
 msgid "Rule Definition"
-msgstr "Ñýèìéóç Ößëôñùí"
+msgstr "Ïñéóìüò Êáíüíá"
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr "ÊñõðôïãñáöçìÝíï ìÞíõìá (S/MIME)"
+
+#: compose.php:379
+msgid "S/MIME Error: "
+msgstr "S/MIME ËÜèïò: "
+
+#: compose.php:358
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+"S/MIME ËÜèïò: Áðáéôåßôáé ëÝîç-êëåéäß ãéá ôï ðñïóùðéêü éäéùôéêü êëåéäß óáò."
+
+#: templates/smime/notactive.inc:6
+msgid "S/MIME NOT Active"
+msgstr "Ôï S/MIME äåí åßíáé åíåñãü"
+
+#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+msgid "S/MIME Options"
+msgstr "ÅðéëïãÝò S/MIME"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr "ÅéóáãùãÞ ëÝîçò-êëåéäéïý S/MIME"
+
+#: templates/smime/smime.inc:100
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+"Ç ÕðïóôÞñéîç Ðñïóùðéêïý æåýãïõò êëåéäéþí S/MIME áðáéôåß áóöáëÞ óýíäåóç web."
+
+#: smime.php:140
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Ôï Äçìüóéï êëåéäß S/MIME ãéá \"%s\" äéáãñÜöçêå åðéôõ÷þò."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr "Ôï Äçìüóéï Êëåéäß S/MIME ðñïóôÝèçêå åðéôõ÷þò."
+
+#: templates/smime/smime.inc:45
+msgid "S/MIME Public Keyring"
+msgstr "Äçìüóéá êëåéäïèÞêç S/MIME"
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "Ôï æåýãïò Äçìüóéïõ/Éäéùôéêïý êëåéäéïý S/MIME ðñïóôÝèçêå åðéôõ÷þò."
+
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr "ÕðïãåãñáììÝíï ìÞíõìá (S/MIME)"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "ÕðïãåãñáììÝíï/êñõðôïãñáöçìÝíï ìÞíõìá (S/MIME)"
+
+#: templates/smime/notactive.inc:11
+msgid "S/MIME support is disabled on this system."
+msgstr "Ç õðïóôÞñéîç S/MIME Ý÷åé áðåíåñãïðïéçèåß ó' áõôü ôï óýóôçìá."
+
+#: lib/MIME/Viewer/pkcs7.php:233
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+"Ç õðïóôÞñéîç S/MIME äåí Ý÷åé åíåñãïðïéçèåß êáé óõíåðþò ôï ìÞíõìá åßíáé "
+"áäýíáôï íá áðïêñõðôïãñáöçèåß."
+
+#: lib/MIME/Viewer/pkcs7.php:165
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+"Ç õðïóôÞñéîç S/MIME äåí Ý÷åé åíåñãïðïéçèåß êáé óõíåðþò ôï ðåñéå÷üìåíï áõôïý "
+"ôïõ õðïãåãñáììÝíïõ ìçíýìáôïò äåí ìðïñåß íá åìöáíéóèåß."
+
+#: lib/MIME/Viewer/pkcs7.php:138
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"Ç õðïóôÞñéîç S/MIME äåí Ý÷åé åíåñãïðïéçèåß êáé óõíåðþò ç øçöéáêÞ õðïãñáöÞ "
+"åßíáé áäýíáôï íá åðáëçèåõèåß."
+
+#: templates/smime/smime.inc:24
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly"
+msgstr ""
+"Ç õðïóôÞñéîç S/MIME áðáéôåß áíáäõüìåíá (popup) ðáñÜèõñá. Áí ï browser óáò "
+"Ý÷åé ñõèìéóèåß óå áðåíåñãïðïßçóç áõôÞò ôçò ëåéôïõñãßáò, ðñÝðåé íá ôï "
+"áëëÜîåôå, äéáöïñåôéêÜ ôï S/MIME äåí èá ëåéôïõñãåß óùóôÜ."
+
+#: templates/compose/compose.inc:266
+msgid "S_ubject"
+msgstr "ÈÝìá"
+
+#: templates/compose/compose.inc:354
+msgid "Sa_ve a copy in "
+msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ óå "
 
+#: templates/message/navbar_actions.inc:30
+msgid "Sa_ve as"
+msgstr "ÁðïèÞêåõóç ùò"
+
+#: search.php:358 templates/fetchmail/manage.inc:67
+msgid "Save"
+msgstr "ÁðïèÞêåõóç"
+
+#: templates/compose/compose.inc:528
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr "Íá áðïèçêåõôïýí ôá óõíçììÝíá óôïí öÜêåëëï sent-mail ìáæß ìå ôï ìÞíõìá;"
+
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
 msgid "Save Draft"
 msgstr "ÁðïèÞêåõóç óôï Ðñü÷åéñï"
 
+#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
+#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
+#: templates/pgp/notactive.inc:23
+msgid "Save Options"
+msgstr "ÁðïèÞêåõóç Åðéëïãþí"
+
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+msgid "Save _Draft"
+msgstr "ÁðïèÞêåõóç óôï Ðñü÷åéñï"
+
 msgid "Save a copy in "
 msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ óôïí öÜêåëï "
 
+msgid "Save a copy in \"sent-mail\""
+msgstr "ÁðïèÞêåõóç áíôéãñÜöïõ óôïí öÜêåëï \"sent-mail\""
+
 msgid "Save as"
 msgstr "ÁðïèÞêåõóç ùò"
 
- msgid "Save sent mail"
+msgid "Save drafts as unseen?"
+msgstr "ÁðïèÞêåõóç ðñü÷åéñùí óáí ìç áíáãíùóìÝíá;"
+
+#: config/prefs.php.dist:1030
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+"ÁðïèÞêåõóç ôùí ðáñáëçðôþí áõôüìáôá óôïí ðñïêáèïñéóìÝíï ÄéåõèõíóéïãñÜöï óáò;"
+
+msgid "Save search as a virtual folder?"
+msgstr "ÁðïèÞêåõóç áíáæÞôçóçò óå éäåáôü öÜêåëï;"
+
+msgid "Save sent mail"
 msgstr "ÁðïèÞêåõóç áðåóôáëìÝíïõ ìçíýìáôïò"
 
+msgid "Save sent mail?"
+msgstr "ÁðïèÞêåõóç áðåóôáëìÝíïõ ìçíýìáôïò;"
+
 #, c-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr ""
-"Ç áðïèÞêåõóç ôïõ ðñü÷åéñïõ ìçíýìáôïò áðÝôõ÷å. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá: %s"
-
-msgid "Search Results"
-msgstr "ÁðïôåëÝóìáôá ÁíáæÞôçóçò"
+"Ç áðïèÞêåõóç ôïõ ðñü÷åéñïõ ìçíýìáôïò áðÝôõ÷å. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï "
+"ìÞíõìá: %s"
 
 msgid "Search"
 msgstr "ÁíáæÞôçóç"
 
+msgid "Search %s"
+msgstr "ÁíáæÞôçóç óå %s"
+
+msgid "Search Mail"
+msgstr "ÁíáæÞôçóç ÌçíõìÜôùí"
+
+msgid "Search Results"
+msgstr "ÁðïôåëÝóìáôá ÁíáæÞôçóçò"
+
 msgid "Seen"
 msgstr "ÄéáâáóìÝíá"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+msgid "Select"
+msgstr "ÅðéëïãÞ"
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "ÅðéëïãÞ Üëëïõ Ëïãáñéáóìïý"
+
+#: templates/search/fields.inc:35
+msgid "Select a date"
+msgstr "ÅðéëÝîôå ìéá çìåñïìçíßá"
+
+#: templates/search/fields.inc:10
+msgid "Select a field"
+msgstr "ÅðéëÝîôå Ýíá ðåäßï"
+
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "ÅðéëÝîôå áðü ôïõò äéáèÝóéìïõò äéåõèõíóéïãñÜöïõò."
 
 msgid "Select all"
 msgstr "ÅðéëïãÞ üëùí"
 
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr ""
+"ÅðéëïãÞ üëùí ôùí ðåäßùí ãéá áíáæÞôçóç üôáí åðåêôåßíïíôáé ïé äéåõèýíóåéò."
+
+#: templates/fetchmail/account_select.inc:21
+msgid "Select an account"
+msgstr "ÅðéëÝîôå Ýíá ëïãáñéáóìü"
+
 msgid "Select an identity"
 msgstr "ÅðéëÝîôå ìßá ôáõôüôçôá"
 
@@ -1083,58 +3371,181 @@
 msgid "Select none"
 msgstr "ÅðéëïãÞ êáíåíüò"
 
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr "ÅðéëÝîôå ôïí ôýðï ôïõ åîõðçñåôçôÞ Mail"
+
+msgid ""
+"Select the characters you need from the boxes below. You can then copy and "
+"paste them from the text area."
+msgstr ""
+"ÅðéëÝîôå ôïõò ÷áñáêôÞñåò ðïõ ÷ñåéÜæåóèå áðü ôá ðáñáêÜôù êïõôÜêéá. Óôç "
+"óõíÝ÷åéá áíôéãñÜøôå ôá êáé åðéêïëÞóôå ôá óôçí ðåñéï÷Þ êåéìÝíïõ ôïõ ìçíÞìáôïò"
+
 msgid "Select your preferred language:"
 msgstr "ÅðéëÝîôå ôçí ðñïôéìïýìåíç ãëþóóá:"
 
-msgid "Select"
-msgstr "ÅðéëïãÞ"
-
-msgid "Selected Addressbooks:"
+msgid "Selected Address books:"
 msgstr "ÅðéëïãÞ ÄéåõèõíóéïãñÜöïõ:"
 
+#: templates/pgp/pgp.inc:147
+msgid "Send Key to Public Keyserver"
+msgstr "ÁðïóôïëÞ êëåéäéïý óå åîõðçñåôçôÞ Äçìüóéùí êëåéäéþí"
+
+#: lib/MIME/Viewer/itip.php:560
+msgid "Send Latest Information"
+msgstr "ÁðïóôïëÞ ðñüóöáôùí ðëçñïöïñéþí"
+
+msgid "Send MDN when requested by the sender?"
+msgstr "Íá áðïóôÝëëåôáé åðéâåâáßùóç áíÜãíùóçò üôáí æçôåßôáé áðü ôïí áðïóôïëÝá;"
+
 msgid "Send Message"
 msgstr "ÁðïóôïëÞ Ìçíýìáôïò"
 
+msgid "Sent mail folder"
+msgstr "ÖÜêåëïò ÁðåóôáëìÝíùí ÌçíõìÜôùí"
+
 msgid "Sent mail folder:"
 msgstr "ÖÜêåëïò ÁðåóôáëìÝíùí ÌçíõìÜôùí:"
 
 msgid "September"
 msgstr "ÓåðôÝìâñéïò"
 
+msgid "Server"
+msgstr "ÄéáêïìéóôÞò"
+
+msgid "Server and Folder Information"
+msgstr "Ðëçñïöïñßåò ÄéáêïìéóôÞ êáé ÖáêÝëëùí"
+
 msgid "Server Information"
 msgstr "Ðëçñïöïñßåò ÄéáêïìéóôÞ"
 
-msgid "Server"
-msgstr "ÄéáêïìéóôÞò"
+msgid "Server:"
+msgstr "ÄéáêïìéóôÞò:"
 
 msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Ñõèìßóôå ôïõò êáíüíåò ôùí ößëôñùí ãéá ìçíýìáôá ìå áíåðéèýìçôï ðåñéå÷üìåíï."
+msgstr ""
+"Ñõèìßóôå ôïõò êáíüíåò ôùí ößëôñùí ãéá ìçíýìáôá ìå áíåðéèýìçôï ðåñéå÷üìåíï."
 
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Ñõèìßóåéò ãéá ôç ìåôáöïñÜ êáé äéáãñáöÞ ìçíõìÜôùí."
 
+msgid "Set the X-Priority header when composing messages?"
+msgstr "Íá ôßèåôáé åðéêåöáëßäá ðñïôåñáéüôçôáò êáôÜ ôç óýíèåóç;"
+
 msgid "Set the current time zone."
 msgstr "Ïñéóìüò æþíçò þñáò."
 
 msgid "Set the language that menu items, explanations, and help are in."
 msgstr "Ïñßóôå ôçí ãëþóóá ôïõ ìåíïý, êáé ôçò âïÞèåéáò."
 
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr "ÊïéíÞ ×ñÞóç ÖáêÝëùí"
+
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr "ÊïéíÞ ÷ñÞóç öáêÝëùí ìçíõìÜôùí"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr "ÊÜíå êïéíÞ ÷ñÞóç öáêÝëùí ìçíõìÜôùí ìå Üëëïõò ÷ñÞóôåò."
+
+#: config/prefs.php.dist:672
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+"Íá áðïêñýðôïíôáé åî ïñéóìïý ìåãÜëá ôìÞìáôá êåéìÝíïõ óå åéóáãùãéêÜ; Ìðïñåßôå "
+"íá ôï åíáëëÜóåôå üðïôå ôï åðéèõìåßôå."
+
+#: templates/pgp/pgp.inc:52
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr "Íá åëÝã÷åôáé ôï êåßìåíï ôïõ ìçíýìáôïò ãéá äåäïìÝíá PGP;"
+
 msgid "Should the compose window be closed after saving a draft?"
-msgstr "Íá êëåßíåé ôï ðáñÜèõñï óýíèåóçò ìåôÜ ôçí áðïèÞêåõóç ôïõ ìçíýìáôïò óôá ðñü÷åéñá;"
+msgstr ""
+"Íá êëåßíåé ôï ðáñÜèõñï óýíèåóçò ìåôÜ ôçí áðïèÞêåõóç ôïõ ìçíýìáôïò óôá "
+"ðñü÷åéñá;"
+
+#: templates/pgp/pgp.inc:40
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr "Íá åðéóõíÜðôåôáé åîïñéóìïý ôï äçìüóéï êëåéäß óáò óôá ìçíýìáôá;"
+
+msgid "Show All Folders"
+msgstr "ÅìöÜíéóç Ïëùí ôùí ÖáêÝëùí"
+
+msgid "Show All Headers"
+msgstr "ÅìöÜíéóç Ïëùí ôùí Åðéêåöáëßäùí"
 
 msgid "Show Deleted"
 msgstr "ÅìöÜíéóç ÄéáãñáììÝíùí"
 
+msgid "Show Limited Headers"
+msgstr "ÅìöÜíéóç ðåñéïñéóìÝíùí Åðéêåöáëßäùí"
+
+#: templates/message/headers.inc:70
+msgid "Show Mailing List Information"
+msgstr "ÅìöÜíéóç ðëçñïöïñéþí ãéá Ëßóôá ÌçíõìÜôùí"
+
+#: templates/search/main.inc:92
+msgid "Show Only Subscribed Folders"
+msgstr "ÅìöÜíéóç ìüíï ôùí óõíäåìÝíùí (subscribed) ÖáêÝëùí"
+
+#: folders.php:254
 msgid "Show Unsubscribed"
-msgstr "Áðüêñõøç áóýíäåôùí (Unsubscribed) öáêÝëùí"
+msgstr "ÅìöÜíéóç áóýíäåôùí (Unsubscribed) öáêÝëùí"
+
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
+"ÅìöÜíéóç åéêïíéäßïõ ãéá íá åðéôñÝðåôáé ï äéá÷ùñéóìüò óõííçììÝíùí áðü ôá "
+"ìçíýìáôá;"
 
 msgid "Show last login time when logging in?"
 msgstr ""
-"ÊáôÜ ôçí åßóïäï íá åìöáíßæåôáé ç çìåñïìçíßá ðïõ Ýãéíå "
-"ôåëåõôáßá öïñÜ åßóïäïò óôçí õðçñåóßá;"
+"ÊáôÜ ôçí åßóïäï íá åìöáíßæåôáé ç çìåñïìçíßá ðïõ Ýãéíå ôåëåõôáßá öïñÜ åßóïäïò "
+"óôçí õðçñåóßá;"
 
 msgid "Show legend in the mailbox view?"
-msgstr "Íá åìöáíßæåôáé ç åðéãñáöÞ óôçí ðñïâïëÞ ôïõ Ãñáììáôïêéâþôéïõ;"
+msgstr "Íá åìöáíßæïíôáé åðåîçãÞóåéò óôçí ðñïâïëÞ ôïõ Ãñáììáôïêéâþôéïõ;"
+
+#: config/prefs.php.dist:809
+msgid "Show previews for unread messages only?"
+msgstr "ÅìöÜíéóç ðñïçãïýìåíùí ãéá ìç áíáãíùóìÝíá ìçíýìáôá ìüíï;"
+
+#: config/prefs.php.dist:817
+msgid "Show previews in tooltips?"
+msgstr "ÅìöÜíéóç ðñïçãüìåíïõ óôá 'tooltips';"
+
+#: config/prefs.php.dist:848
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr "ÅìöÜíéóç ôïõ åéêïíéäßïõ ðñïóêüìéóçò (Fetch Mail) óôï ìåíïý;"
+
+#: lib/MIME/Viewer/html.php:106
+msgid "Show the Images"
+msgstr "ÅìöÜíéóç ôùí Åéêüíùí"
+
+#: templates/filters/prefs.inc:61
+msgid "Show the filter icon on the menubar?"
+msgstr "ÅìöÜíéóç ôïõ åéêïíéäßïõ ößëôñùí óôï ìåíïý;"
+
+#: lib/Block/summary.php:30
+msgid "Show total number of mails in folder?"
+msgstr "ÅìöÜíéóç áñéèìïý ìçíõìÜôùí óôï öÜêåëï;"
+
+msgid "Shown"
+msgstr "Åìöáíßóèçêå"
+
+msgid "Si_ze"
+msgstr "ÌÝãåèïò"
+
+#: templates/login/login.inc:241
+msgid "Sign up if not registered"
+msgstr "ÅããñáöÞ (sign up) Üí äåí Ý÷åé Þäç ãßíåé"
+
+#: templates/mailbox/legend.inc:17
+msgid "Signed"
+msgstr "ÕðïãåãñáììÝíá"
 
 msgid "Size"
 msgstr "ÌÝãåèïò"
@@ -1145,6 +3556,38 @@
 msgid "Sort Direction"
 msgstr "Êáôåýèõíóç Ôáîéíüìçóçò"
 
+#: templates/mailbox/message_headers.inc:6
+msgid "Sort by Arrival"
+msgstr "Ôáîéíüìçóç êáôÜ Áöéîç"
+
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Date"
+msgstr "Ôáîéíüìçóç êáôÜ Çìåñïìçíßá"
+
+#: templates/mailbox/message_headers.inc:21
+msgid "Sort by From Address"
+msgstr "Ôáîéíüìçóç êáôÜ Ä-íóç ÁðïóôïëÝá"
+
+#: templates/mailbox/message_headers.inc:36
+msgid "Sort by Message Size"
+msgstr "Ôáîéíüìçóç êáôÜ ÌÝãåèïò Ìçíýìáôïò"
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Subject"
+msgstr "Ôáîéíüìçóç êáôÜ ÈÝìá"
+
+#: templates/mailbox/message_headers.inc:26
+msgid "Sort by Thread"
+msgstr "Ôáîéíüìçóç êáôÜ ÍÞìá"
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by To Address"
+msgstr "Ôáîéíüìçóç êáôÜ Ä-íóç ÐáñáëÞðôç"
+
+#: templates/prefs/spamselect.inc:4
+msgid "Spam folder:"
+msgstr "ÖÜêåëïò Spam:"
+
 msgid "Spam Report from"
 msgstr "ÁíáöïñÜ ìçíýìáôïò 'Spam' áðü"
 
@@ -1163,15 +3606,38 @@
 msgid "Spelling errors per screen when spell checking."
 msgstr "ÏñèïãñáöéêÜ ëÜèç áíÜ óåëßäá üôáí ãßíåôáé ïñèïãñáöéêüò Ýëåã÷ïò."
 
-msgid "Subject Field"
-msgstr "ÈÝìá ìçíýìáôïò"
+#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+msgid "Start"
+msgstr "¸íáñîç"
+
+#: lib/MIME/Viewer/itip.php:673
+msgid "Status"
+msgstr "ÊáôÜóôáóç"
+
+#: lib/MIME/Contents.php:215
+msgid "Strip Attachment"
+msgstr "Áðüóðáóç ÓõíçììÝíïõ"
+
+#: config/prefs.php.dist:801
+msgid "Strip linebreaks?"
+msgstr "Áðüóðáóç áëëáãþí ãñáììþí;"
+
+#: templates/mailbox/message_headers.inc:32
+msgid "Sub_ject"
+msgstr "ÈÝìá"
 
 msgid "Subject"
 msgstr "ÈÝìá"
 
+msgid "Subject Field"
+msgstr "ÈÝìá ìçíýìáôïò"
+
 msgid "Subject:"
 msgstr "ÈÝìá:"
 
+msgid "Submit"
+msgstr "ÁðïóôïëÞ"
+
 msgid "Subscribe to Folder(s)"
 msgstr "Óýíäåóç óôï ÖÜêåëï(ïõò)"
 
@@ -1181,14 +3647,117 @@
 msgid "Suggestions"
 msgstr "ÐñïôÜóåéò"
 
+#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+msgid "Summary"
+msgstr "Áíáêåöáëáßùóç"
+
+msgid "Switch Composition Method"
+msgstr "ÅíáëëáãÞ ìåèüäïõ óôïé÷åéïèåóßáò"
+
+msgid "Switch to HTML composition"
+msgstr "ÅíáëëáãÞ óå HTML óôïé÷åéïèåóßá"
+
+msgid "Switch to"
+msgstr "ÅíáëëáãÞ óå"
+
+msgid "Switch to %s composition"
+msgstr "ÅíáëëáãÞ óå %s óôïé÷åéïèåóßá"
+
+msgid "Switch to plain text composition"
+msgstr "ÅíáëëáãÞ óå óôïé÷åéïèåóßá áðëïý êåéìÝíïõ"
+
+msgid "Te_xt"
+msgstr "Êåßìåíï"
+
 msgid "Text"
 msgstr "Êåßìåíï"
 
+#: lib/MIME/Viewer/itip.php:547
+msgid "Tentatively Accept request"
+msgstr "ÐñïóùñéíÞ Áðïäï÷Þ ÁéôÞìáôïò"
+
+#: lib/MIME/Viewer/itip.php:746
+msgid "Tentatively Accepted"
+msgstr "¸ãéíå áðïäï÷Þ ÐñïóùñéíÜ"
+
+#: lib/Maintenance/Task/tos_agreement.php:54
+msgid "Terms of Service file not specified in conf.php"
+msgstr "Ïé üñïé ôïõ áñ÷åßïõ åîõðçñåôÞóåùí äåí ïñßóèçêáí óôï conf.php"
+
+msgid "Thank you for using the system."
+msgstr "Åõ÷áñéóôïýìå ðïõ ÷ñçóéìïðïéÞóáôå ôï óýóôçìÜ ìáò."
+
+msgid "The Compose Window"
+msgstr "Ôï ðáñÜèõñï Óýíèåóçò"
+
+msgid "The From: column of the message should be linked:"
+msgstr "Ç óôÞëç Áðü: ôïõ ìçíýìáôïò ðñÝðåé íá óõíäåèåß:"
+
+#: fetchmailprefs.php:81
+msgid "The account \"%s\" has been deleted."
+msgstr "Ï ëïãáñéáóìüò \"%s\" äéáãñÜöçêå."
+
+#: fetchmailprefs.php:74
+msgid "The account \"%s\" has been saved."
+msgstr "Ï ëïãáñéáóìüò \"%s\" áðïèçêåýèçêå."
+
+#: lib/Filter.php:94
+msgid "The address \"%s\" has been added to %s."
+msgstr "Ç äéåýèõíóç \"%s\" ðñïóôÝèçêå óôç %s."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "Ôï óõíçììÝíï äåí âñÝèçêå."
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"Ôï ðáñÜèõñï óýíèåóçò äåí ìðïñåß íá áíïßîåé. Ðéèáíþò Ý÷åôå ñõèìßóåé ôïí "
+"åîåñåõíçôÞ óáò (browser) íá ìðëïêÜñåé ôá áíáäõüìåíá ðáñÜèõñá."
+
+msgid ""
+"The contents of your Inbox folder will be displayed immediately upon logging "
+"in.  The Mailbox Listing shows the contents of each message's header "
+"(message status, date sent, sender, subject, and size).  Each column has a "
+"heading.  Clicking on the heading will cause the listing to be sorted by "
+"that column."
+msgstr ""
+"Ôá ðåñéå÷üìåíá ôïõ êáôáëüãïõ 'Åéóåñ÷üìåíá' èá åìöáíßæïíôáé ìå ôçí åßóïäü óáò "
+"óôï óýóôçìá. Óôç ëßóôá ìå ôá ìçíýìáôá åìöáíßæïíôáé ïé åðéêåöáëßäåò ãéá êÜèå "
+"ìÞíõìá (Ç êáôÜóôáóç ôïõ, ç çìåñïìçíßá áðïóôïëÞò, ï áðïóôïëÝáò, ôï èÝìá êáé "
+"ôï ìÝãåèïò). Ìðïñåßôå íá ôáîéíïìÞóåôå ôá ìçíýìáôá óáò åðéëÝãïíôáò ôï üíïìá "
+"ôïõ ðåäßïõ ðïõ èÝëåôå, óôçí áñ÷Þ ôçò ëßóôáò."
+
 #, c-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Ï ôñÝ÷ùí öÜêåëïò(ïé) \"%s\" èá ìåôïíïìáóôåß óå \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:112
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+"Ç ôñÝ÷ïõóá ëßóôá ìå ôïõò ÷ñÞóôåò ðïõ Ý÷ïõí ðñüóâáóç óå áõôü ôï öÜêåëï äå "
+"ìðïñåß íá áíáêôçèåß"
+
+#: compose.php:1147
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "Ôï ðñü÷åéñï áðïèçêåýèçêå óôï öÜêåëï \"%s\"."
+
+msgid "The encryption features require a secure web connection."
+msgstr "Ïé ëåéôïõñãßåò êñõðôïãñÜöçóçò áðáéôïýí áóöáëÞ óýíäåóç."
+
+#: lib/MIME/Viewer/itip.php:129
+msgid "The event was added to your calendar."
+msgstr "Ôï ãåãïíüò ðñïóôÝèçêå óôï çìåñïëüãéü óáò."
+
+#: templates/compose/expand.inc:9
+msgid "The field '%s' can't be expanded."
+msgstr "Ôï ðåäßï '%s' äåí ìðïñåß íá åðåêôáèåß."
+
+# lib/Folder.php:426, c-format
+#: lib/Folder.php:426
 msgid "The folder \"%s\" already exists"
 msgstr "Ï öÜêåëïò \"%s\" õðÜñ÷åé Þäç"
 
@@ -1210,7 +3779,8 @@
 
 #, c-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "Ï öÜêåëïò \"%s\" äåí äçìéïõñãÞèçêå. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgstr ""
+"Ï öÜêåëïò \"%s\" äåí äçìéïõñãÞèçêå. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
 #, c-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
@@ -1228,6 +3798,10 @@
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Ï öÜêåëïò \"%s\" ìåôïíïìÜóôçêå ìå åðéôõ÷ßá óå \"%s\"."
 
+#: lib/MIME/Viewer/tnef.php:96
+msgid "The following files were attached to this part:"
+msgstr "Ôá ðáñáêÜôù áñ÷åßá åß÷áí åðéóõíáöèåß ó' áõôü:"
+
 #, c-format
 msgid "The identity \"%s\" has been deleted."
 msgstr "Ç ôáõôüôçôá \"%s\" äéáãñÜöçêå."
@@ -1236,30 +3810,151 @@
 msgid "The identity \"%s\" has been saved."
 msgstr "Ôá óôïé÷åßá ôçò ôáõôüôçôáò \"%s\" Ý÷ïõí áðïèçêåõôåß."
 
+#: lib/MIME/Viewer/html.php:95
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+"Ïé åéêüíåò èá åìöáíéóèïý, ãéáôß ï áðïóôïëÝáò åßíáé óôï ÄéåõèõíóéïãñÜöï óáò"
+
+msgid "The Mailbox Listing"
+msgstr "Ç ëßóôá ôïõ ãñáììáôïêéâùôßïõ"
+
+#: lib/MIME/Viewer/status.php:78
+msgid "The mail server generated the following error message:"
+msgstr "Ï äéáêïìéóôÞò áëëçëïãñáößáò äçìéïýñãçóå ôï ðáñáêÜôù ìÞíõìá ëÜèïõò:"
+
+#: lib/MIME/Viewer/notification.php:54
+msgid "The mail server generated the following informational message:"
+msgstr ""
+"Ï äéáêïìéóôÞò áëëçëïãñáößáò äçìéïýñãçóå ôï ðáñáêÜôù ðëçñïöïñéáêü ìÞíõìá:"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "The mail server generated the following message:"
+msgstr "Ï äéáêïìéóôÞò áëëçëïãñáößáò äçìéïýñãçóå ôï ðáñáêÜôù ìÞíõìá:"
+
+#: lib/Message.php:645
+msgid "The mailbox %s is already empty."
+msgstr "Ç ãñáììáôïèõñßäá %s åßíáé Þäç Üäåéá."
+
+#: lib/Fetchmail.php:262
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr "Ôï ìÞíõìá \"%s\" áðü \"%s\" (%d Bytes) îåðåñíÜ ôï üñéï ðñïóêüìéóçò."
+
+#: templates/contacts/contacts.inc:98
 msgid "The message being composed has been closed.  Exiting."
 msgstr "Ôï ìÞíõìá ðïõ óõíèÝôåôáé êëåßíåé."
 
+#: message.php:142
+msgid "The message has been deleted."
+msgstr "Ôï ìÞíõìá Ý÷åé äéáãñáöåß."
+
+#: lib/MIME/Viewer/pgp.php:399
+msgid "The message has been verified."
+msgstr "Ôï ìÞíõìá Ý÷åé åðéâåâáéùèåß."
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "The message has been verified. Sender: %s."
+msgstr "Ôï ìÞíõìá Ý÷åé åðéâåâáéùèåß. ÁðïóôïëÝáò: %s"
+
+#: framework/MIME/MIME/MDN.php:214
+msgid ""
+"The message sent on %s to %s with subject \"%s\" has been displayed.\n"
+"This is no guarantee that the message has been read or understood."
+msgstr ""
+"Ôï ìÞíõìá ðïõ óôÜëèçêå ôçí %s óôïí %s ìå èÝìá \"%s\" åìöáíßóèçêå.\n"
+"Áõôü äåí áðïôåëåß åããýçóç üôé äéáâÜóèçêå êáé êáôáíïÞèçêå."
+
+msgid ""
+"The Message Screen display the contents of the selected message.  From here, "
+"you can browse message attachments, reply to the current message, delete the "
+"current message, or advance to the next message in your current mailbox."
+msgstr ""
+"Ç ïèüíç ìçíõìÜôùí åìöáíßæåé ôá ðåñéå÷üìåíá ôïõ åðéëåãìÝíïõ ìçíýìáôïò. Áðü "
+"åäþ ìðïñåßôå íá äåßôå ôá óõíçììÝíá áñ÷åßá, íá áðáíôÞóåôå óôï ìÞíõìá, íá ôï "
+"äéáãñÜøåôå ç íá ðñï÷ùñÞóåôå óôï åðüìåíï ìÞíõìá."
+
+msgid "The Message Screen"
+msgstr "Ïèüíç ÌçíõìÜôùí"
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"Ôï ðáñÜèõñï åéóáãùãÞò ëÝîçò-êëåéäéïý äåí ìðïñåß íá áíïßîåé. ÌÞðùò Ý÷åôå "
+"ñõèìßóåé ôï browser óáò íá ìðëïêÜñåé ôá áíáäõüìåíá (popup) ðáñÜèõñá;"
+
+#: lib/MIME/Viewer/pgp.php:178
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr "Ôï ðåñéå÷üìåíï ôïõ äçìüóéïõ êëåéäéïý PGP ìðïñåß íá åìöáíéóèåß %s."
+
+#: lib/MIME/Viewer/tnef.php:62
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "Ôï áñ÷Ýéï ðïõ æçôÞèçêå äåí õðÜñ÷åé óôá MS-TNEF óõíçììÝíá."
+
+#: lib/MIME/Viewer/zip.php:67
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "Ôï áñ÷åßï ðïõ æçôÞèçêå äåí õðÜñ÷åé óôá óõìðéåóìÝíá (ZIP) óõíçììÝíá."
+
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+"Ï áðïóôïëÝáò Ý÷åé æçôÞóåé åíçìÝñùóç ãéá ôçí áíÜãíùóç áõôïý ôïõ ìçíýìáôïò. "
+"Ðáñáêáëþ ðáôÞóôå %s ãéá íá ôïõ áðïóôáëåß ìÞíõìá åíçìÝñùóçò."
+
 msgid "The signature couldn't be replaced."
 msgstr "Ç õðïãñáöÞ äåí ìðïñïýóå íá áíôéêáôáóôáèåß."
 
 msgid "The signature was successfully replaced."
 msgstr "Ç õðïãñáöÞ áíôéêáôáóôÜèçêå ìå åðéôõ÷ßá."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr "Ôï áñ÷åßï ðïõ ïñßóáôå äåí õðÜñ÷åé."
+
+#: lib/MIME/Viewer/itip.php:159
+msgid "The task has been added to your tasklist."
+msgstr "Ç åñãáóßá ðñïóôÝèçêå óôç ëßóôá åñãáóéþí óáò."
+
+#: lib/MIME/Viewer/status.php:98
+msgid "The text of the message"
+msgstr "Ôï êåßìåíï ôïõ ìçíýìáôïò"
+
+#: lib/MIME/Viewer/status.php:97
+msgid "The text of the sent message can be viewed %s."
+msgstr "Ôï êåßìåíï ôïõ áðåóôáëìÝíïõ ìçíýìáôïò ìðïñåßôå íá ôï äåßôå %s."
+
+#: lib/MIME/Viewer/itip.php:144
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Ïé ðëçñïöïñßåò åëåýèåñïõ/áðáó÷ïëçìÝíïõ áðïèçêåýèçêáí åðéôõ÷þò."
+
+#: lib/MIME/Viewer/alternative.php:89
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Äåí õðÜñ÷ïõí åíáëëáêôéêÜ ìÝñç ðïõ ìðïñïýí íá åìöáíéóèïýí."
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Äåí õðÜñ÷ïõí ìçíýìáôá óå áõôü ôï ãñáììáôïêéâþôéï."
 
 #, c-format
 msgid "There was a problem expunging %s. This is what the server said"
-msgstr "ÐáñïõóéÜóôçêå óöÜëìá óôç äéáãñáöÞ %s. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgstr ""
+"ÐáñïõóéÜóôçêå óöÜëìá óôç äéáãñáöÞ %s. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
 msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "ÐáñïõóéÜóôçêå óöÜëìá óôç äéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgstr ""
+"ÐáñïõóéÜóôçêå óöÜëìá óôç äéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ. Ôï óýóôçìá Ýâãáëå ôï "
+"áêüëïõèï ìÞíõìá"
 
 #, c-format
 msgid ""
 "There was a problem expunging the mailbox. This is what the server said: %s"
 msgstr ""
-"ÐáñïõóéÜóôçêå óöÜëìá óôç äéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá: %s"
+"ÐáñïõóéÜóôçêå óöÜëìá óôç äéáãñáöÞ ôïõ ãñáììáôïêéâùôßïõ. Ôï óýóôçìá Ýâãáëå ôï "
+"áêüëïõèï ìÞíõìá: %s"
 
 #, c-format
 msgid ""
@@ -1280,28 +3975,35 @@
 msgid ""
 "There was an error copying messages to \"%s\". This is what the server said"
 msgstr ""
-"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç áíôéãñáöÞ ôùí ìçíõìÜôùí óôï \"%s\". Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
-
+"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç áíôéãñáöÞ ôùí ìçíõìÜôùí óôï \"%s\". Ôï óýóôçìá "
+"Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
 #, c-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôùí ìçíõìÜôùí áðü ôï öÜêåëï \"%s\". "
-"Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôùí ìçíõìÜôùí áðü ôï öÜêåëï \"%s\". Ôï "
+"óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
 #, c-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôùí ìçíõìÜôùí óôï öÜêåëï \"%s\". "
-"Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôùí ìçíõìÜôùí óôï öÜêåëï \"%s\". Ôï "
+"óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
 msgid "There was an error deleting messages. This is what the server said"
-msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôùí ìçíõìÜôùí. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgstr ""
+"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôùí ìçíõìÜôùí. Ôï óýóôçìá Ýâãáëå ôï "
+"áêüëïõèï ìÞíõìá"
 
+#: lib/MIME/Viewer/itip.php:90
+msgid "There was an error deleting the event: %s."
+msgstr "ÐáñïõóéÜóèçêå óöÜëìá êáôÜ ôç äéáãñáöÞ ôïõ ãåãïíüôïò: %s."
+
+#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
 msgid "There was an error displaying this message part"
 msgstr "ÕðÞñîå ëÜèïò êáôÜ ôçí åìöÜíéóç áõôïý ôïõ ìÝñïõò ôïõ ìçíýìáôïò"
 
@@ -1310,13 +4012,34 @@
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç óÞìáíóç ôùí ìçíõìÜôùí óôï öÜêåëï \"%s\". "
-"Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç óÞìáíóç ôùí ìçíõìÜôùí óôï öÜêåëï \"%s\". Ôï "
+"óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
 msgid "There was an error flagging messages. This is what the server said"
-msgstr "ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç óÞìáíóç ôùí ìçíõìÜôùí. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgstr ""
+"ÐáñïõóéÜóôçêå óöÜëìá êáôÜ ôç óÞìáíóç ôùí ìçíõìÜôùí. Ôï óýóôçìá Ýâãáëå ôï "
+"áêüëïõèï ìÞíõìá"
 
-#, c-format
+#: folders.php:155
+msgid "There was an error importing %s."
+msgstr "ÐáñïõóéÜóèçêå óöÜëìá êáôÜ ôçí åéóáãùãÞ %s."
+
+#: lib/MIME/Viewer/itip.php:126
+msgid "There was an error importing the event: %s."
+msgstr "ÐáñïõóéÜóèçêå óöÜëìá êáôÜ ôçí åéóáãùãÞ ôïõ ãåãïíüôïò %s."
+
+#: lib/MIME/Viewer/itip.php:156
+msgid "There was an error importing the task: %s."
+msgstr "ÐáñïõóéÜóèçêå óöÜëìá êáôÜ ôçí åéóáãùãÞ ôçò åñãáóßáò %s."
+
+#: lib/MIME/Viewer/itip.php:142
+msgid "There was an error importing user's free/busy information: %s."
+msgstr ""
+"ÐáñïõóéÜóèçêå óöÜëìá êáôÜ ôçí åéóáãùãÞ ðëçñïöïñéþí åëåýèåñïõ/áðáó÷ïëçìÝíïõ "
+"ôïõ ÷ñÞóôç %s."
+
+# lib/Message.php:102, c-format
+#: lib/Message.php:102
 msgid ""
 "There was an error moving messages to \"%s\". This is what the server said"
 msgstr ""
@@ -1332,16 +4055,66 @@
 msgid "There was an error saving a draft."
 msgstr "ÕðÞñîå ëÜèïò óôçí áðïèÞêåõóç ôïõ ìçíýìáôïò ùò ðñü÷åéñï."
 
+msgid "There was an error saving this message as a draft."
+msgstr "ÕðÞñîå ëÜèïò óôçí áðïèÞêåõóç áõôïý ôïõ ìçíýìáôïò ùò ðñü÷åéñï."
+
 #, c-format
 msgid "There was an error sending your message: %s"
 msgstr "ÕðÞñîå ëÜèïò êáôÜ ôçí áðïóôïëÞ ôïõ ìçíýìáôïò: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "ÕðÞñîå ðñüâëçìá êáôÜ ôçí åðáíáöïñÜ ôùí ìçíõìÜôùí. Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
+msgid "There was an error undeleting messages. This is what the server said"
+msgstr ""
+"ÕðÞñîå ðñüâëçìá êáôÜ ôçí åðáíáöïñÜ ôùí ìçíõìÜôùí. Ôï óýóôçìá Ýâãáëå ôï "
+"áêüëïõèï ìÞíõìá"
+
+#: lib/MIME/Viewer/itip.php:104
+msgid "There was an error updating the event: %s."
+msgstr "ÐáñïõóéÜóèçêå ëÜèïò êáôÜ ôçí åíçìÝñùóç ôïõ ãåãïíüôïò: %s."
 
 msgid "There was an error viewing the requested message."
 msgstr "ÕðÞñîå ðñüâëçìá êáôÜ ôï Üíïéãìá ôïõ ìçíýìáôïò."
 
+#: lib/MIME/Viewer/plain.php:62
+msgid "There was no text in this message part"
+msgstr "Äåí õðÜñ÷åé êåßìåíï óôï ìÞíõìá áõôü"
+
+#: lib/MIME/Viewer/html.php:93
+msgid "This HTML message has images embedded in it."
+msgstr "Ôï HTML ìÞíõìá Ý÷åé åíóùìáôùìÝíç åéêüíá."
+
+#: lib/MIME/Viewer/html.php:89
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+"Áõôü ôï HTML ìÞíõìá Ý÷åé åíóùìáôùìÝíåò åéêüíåò. Ïé ìðëïêáñéóìÝíåò åéêüíåò èá "
+"åìöáíéóèïýí êÜðùò Ýôóé: "
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "This PGP Public Key was attached to the message."
+msgstr "Áõôü ôï Äçìüóéï êëåéäß PGP åðéóõíÜöèçêå óôï ìÞíõìá."
+
+#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
+#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
+#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+msgid "This action is not supported."
+msgstr "ÁõôÞ ç åíÝñãåéá äåí õðïóôçñßæåôáé."
+
+#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+msgid "This action is not yet implemented."
+msgstr "ÁõôÞ ç åíÝñãåéá äåí Ý÷åé áêüìç õëïðïéçèåß."
+
+msgid ""
+"This has hopefully given you a general understanding of how to web mail "
+"interface works.  You'll surely become comfortable with it after seeing how "
+"easy and convenient it is for reading and sending mail, as well as managing "
+"your IMAP mail account."
+msgstr ""
+"Áõôü èá óáò Ý÷åé äþóåé ìßá êáëÞ åéêüíá ãéá ôï ðþò äïõëåýåé ôï ðåñéâÜëëïí ôïõ "
+"Web Mail. Èá åîïéêåéùèåßôå ìå ôçí åöáñìïãÞ áöïý äåßôå ðüóï åýêïëç åßíáé ç "
+"áðïóôïëÞ êáé ç ëÞøç ìçíõìÜôùí, üðùò åðßóçò êáé ïé äéá÷åßñéóç ôùí ëïãáñéáóìþí "
+"óáò ìå IMAP."
+
 msgid ""
 "This file controls local MIME drivers for IMP, specifically what kinds of "
 "attachments are viewable and/or downloadable."
@@ -1382,8 +4155,66 @@
 "ÁõôÞ ç åíÝñãåéá åíäÝ÷åôáé íá êáèõóôåñÞóåé. Åßóôå óßãïõñïò(ç) üôé èÝëåôå íá "
 "óõíå÷ßóåôå;"
 
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "This message contains a Macintosh file."
+msgstr "Áõôü ôï ìÞíõìá ðåñéÝ÷åé áñ÷åßï Macintosh."
+
+#: lib/MIME/Viewer/pkcs7.php:402
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+"Áõôü ôï ìÞíõìá ðåñéÝ÷åé óõíçììÝíá ðïõ Ý÷ïõí õðïãñáöåß øçöéáêÜ ìÝóù S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:406
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+"Áõôü ôï ìÞíõìá ðåñéÝ÷åé óõíçììÝíá ðïõ Ý÷ïõí êñõðôïãñáöçèåß ìÝóù S/MIME."
+
+#: lib/MIME/Viewer/status.php:167
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
+"Áõôü ôï ìÞíõìá ðåñéÝ÷åé ðëçñïöïñßåò êáôÜóôáóçò, áëëÜ ç ìïñöÞ ôïõ åßíáé "
+"Üãíùóôç."
+
+#: lib/MIME/Viewer/pgp.php:321 ======= kmilosis =====
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "Ôï ìÞíõìá áõôü äå öáßíåôáé íá åßíáé Ýãêõñï PGP êñõðôïãñáöçìÝíï. ËÜèïò:"
+
+#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+"Ôï ìÞíõìá áõôü äå öáßíåôáé íá åßíáé óå óùóôÞ PGP ìïñöÞ (óýìöùíï ìå ôï "
+"ðñüôõðï RFC 2015)."
+
+#: lib/MIME/Viewer/pkcs7.php:162
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr "Ôï ìÞíõìá áõôü äå öáßíåôáé íá åßíáé óå óùóôÞ S/MIME ìïñöÞ."
+
+#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+msgid "This message has been digitally signed via PGP."
+msgstr "Ôï ìÞíõìá áõôü Ý÷åé õðïãñáöèåß øçöéáêÜ ìå PGP."
+
+#: lib/MIME/Viewer/pkcs7.php:135
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Ôï ìÞíõìá áõôü Ý÷åé õðïãñáöèåß øçöéáêÜ ìå S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+msgid "This message has been encrypted via S/MIME."
+msgstr "Ôï ìÞíõìá áõôü Ý÷åé êñõðôïãñáöçèåß ìå S/MIME."
+
+#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+msgid "This message has been encrypted with PGP."
+msgstr "Ôï ìÞíõìá áõôü Ý÷åé êñõðôïãñáöçèåß ìå PGP."
+
 msgid "This message has been reported as spam to your system administrator."
-msgstr "Ôï ìÞíõìá áõôü áíáöÝñèçêå ùò 'Spam' óôï äéá÷åéñéóôÞ ôïõ óõóôÞìáôïò óáò."
+msgstr ""
+"Ôï ìÞíõìá áõôü áíáöÝñèçêå ùò 'Spam' óôï äéá÷åéñéóôÞ ôïõ óõóôÞìáôïò óáò."
 
 msgid "This message to"
 msgstr "Áõôü ôï ìÞíõìá ðñïò"
@@ -1391,6 +4222,19 @@
 msgid "This number must be at least one."
 msgstr "Áõôüò ï áñéèìüò ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí Ýíá."
 
+msgid ""
+"This problem report was received from %s. The user clicked the problem<br/"
+">report link from the following location:<br/>%s and is using the following "
+"browser:<br/>%s"
+msgstr ""
+"Ôï ðñüâëçìá áõôü áíáöÝñèçêå áðü %s. Ï ÷ñÞóôçò êÜëåóå ôçí<br/>áíáöïñÜ "
+"ðñïâëÞìáôïò áðü ôï ðáñáêÜôù URL:<br/>%s êáé ÷ñçóéìïðïéåß ôïí áêüëïõèï "
+"browser:<br/>%s"
+
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr "Áõôüò ï åîõðçñåôçôÞò äåí õðïóôçñßæåé êïéíü÷ñçóôïõò öáêÝëïõò."
+
 msgid "This value must be a number."
 msgstr "ÁõôÞ ç ôéìÞ ðñÝðåé íá åßíáé áñéèìüò."
 
@@ -1409,42 +4253,112 @@
 msgid "To"
 msgstr "Ðñïò"
 
+msgid "To Address"
+msgstr "Äéåýèõíóç ÐáñáëÞðôç"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+"Ãéá íá åðéëÝîåôå ðïëëáðëÜ ðåäßá, êñáôÞóôå ðáôçìÝíï ôï Control (PC) Þ ôï "
+"Command (Mac) êáé óôç óõíÝ÷åéá êÜíôå êëéê."
+
 msgid "To:"
 msgstr "Ðñïò:"
 
+msgid ""
+"To view the contents of a message, click on the message's subject.  You'll "
+"be taken to the Message screen."
+msgstr ""
+"Ãéá íá äåßôå ôá ðåñéå÷üìåíá åíüò ìçíýìáôïò, ðáôÞóôå ôï èÝìá ôïõ ìçíýìáôïò. "
+"Èá åìöáíéóôåß ç ïèüíç ìçíõìÜôùí, áðü üðïõ èá ìðïñÝóåôå íá ôï äéáâÜóåôå."
+
+#: templates/compose/compose.inc:567
+msgid "Total Attachments Size:"
+msgstr "Óõíïëéêü ìÝãåèïò åðéóõíáðôüìåíùí:"
+
 #, c-format
 msgid "Total Size: %s KB"
 msgstr "Óõíïëéêü ÌÝãåèïò: %s KB"
 
+msgid "Trash folder"
+msgstr "ÖÜêåëïò ÄéáãñáììÝíá"
+
 msgid "Trash folder:"
 msgstr "ÖÜêåëïò ÄéáãñáììÝíá:"
 
-msgid "Unanswered messages"
-msgstr "Ìç áðáíôçìÝíá ìçíýìáôá"
+#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
+#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+msgid "Unable to retrieve quota"
+msgstr "Áäýíáôç ç áíÜêôçóç ðëçñïöïñéþí ãéá äéáèÝóéìï ÷þñï"
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
 msgid "Unanswered"
 msgstr "Ìç áðáíôçìÝíá"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Ìç áðáíôçìÝíá ìçíýìáôá"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "ÅðáíáöïñÜ"
 
+#: mailbox.php:554 mailbox.php:566 lib/MIME/Headers.php:218
 msgid "Undisclosed Recipients"
 msgstr "Ìç Õðáñêôïß ÐáñáëÞðôåò"
 
+msgid "Undo Changes"
+msgstr "Áêýñùóç Áëëáãþí"
+
+#: lib/MIME/Viewer/itip.php:408
+msgid "Unhandled component of type: %s"
+msgstr "Óõóôáôéêü ìç ÷åéñéæüìåíï ôýðïõ: %s"
+
+#: mailbox.php:531
+msgid "Unknown Date"
+msgstr "Áãíùóôïé Çìåñïìçíßá"
+
+#: lib/MIME/Viewer/itip.php:624
+msgid "Unknown Meeting"
+msgstr "Áãíùóôç ÓõíÜíôçóç"
+
+#: mailbox.php:582
+msgid "Unknown Recipient"
+msgstr "Áãíùóôïò ÐáñáëÞðôçò"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+msgid "Unload Passphrase"
+msgstr "Áöáßñåóç ëÝîçò-êëåéäß"
+
 msgid "Unnamed"
-msgstr "¢ãíùóôç ÌïñöÞ Áñ÷åßïõ"
+msgstr "×ùñßò üíïìá"
 
 msgid "Unread"
 msgstr "Ìç äéáâáóìÝíá"
 
-msgid "Unseen Messages"
-msgstr "Ìç äéáâáóìÝíá ìçíýìáôá"
-
 msgid "Unseen"
 msgstr "Ìç äéáâáóìÝíá"
 
+msgid "Unseen Messages"
+msgstr "Ìç äéáâáóìÝíá ìçíýìáôá"
+
+#: templates/folders/actions.inc:10
 msgid "Unsubscribe from Folder(s)"
-msgstr "Áðïóýíäåóç áðü ôïí öÜêåëï(ïõò)"
+msgstr "Áðïóýíäåóç áðü ÖÜêåëï(ïõò)"
+
+#: templates/compose/compose.inc:574
+msgid "Update Attachment Information"
+msgstr "ÅíçìÝñùóç Ðëçñïöïñéþí ãéá ÓõíçììÝíá"
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Update respondent status"
+msgstr "ÅíçìÝñùóç êáôÜóôáóçò áíôáðïêñéíüìåíïõ"
+
+#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr "Öüñôùóç"
 
 msgid "Use Ctrl/Option+Click to select multiple fields"
 msgstr "Ìå ðáôçìÝíï ôï ðëÞêôñï Ctrl åðéëÝîôå ðïëëáðëÜ ðåäßá áðü ôç ëßóôá"
@@ -1455,42 +4369,148 @@
 msgid "Use IMAP folder subscriptions?"
 msgstr "×ñçóéìïðïéÞóôå ôç óõíäñïìÞ óôïõò êáôáëüãïõò IMAP;"
 
+msgid "User"
+msgstr "×ñÞóôçò"
+
 msgid "User Options"
 msgstr "ÅðéëïãÝò ×ñÞóôç"
 
+msgid "User Preferences"
+msgstr "ÅðéëïãÝò ×ñÞóôç"
+
 msgid "Username"
 msgstr "¼íïìá ×ñÞóôç"
 
+msgid "Username:"
+msgstr "¼íïìá ×ñÞóôç:"
+
+msgid "View"
+msgstr "ÅìöÜíéóç"
+
 #, c-format
 msgid "View %s"
 msgstr "ÅìöÜíéóç %s"
 
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+msgid "View %s Public Key"
+msgstr "ÅìöÜíéóç %s Äçìüóéïõ Êëåéäéïý"
+
+#: lib/MIME/Viewer/html.php:116
+msgid "View HTML content in a separate window"
+msgstr "ÅìöÜíéóç HTML ðåñéå÷ïìÝíïõ óå äéáöïñåôéêü ðáñÜèõñï"
+
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "ÅìöÜíéóç ÌçíõìÜôùí"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+msgid "View Personal Private Key"
+msgstr "ÅìöÜíéóç Ðñïóùðéêïý Éäéùôéêïý Êëåéäéïý"
+
+#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+msgid "View Personal Public Key"
+msgstr "ÅìöÜíéóç Ðñïóùðéêïý Äçìüóéïõ Êëåéäéïý"
+
+#: templates/message/navbar_actions.inc:17
+msgid "View Thread"
+msgstr "ÅìöÜíéóç ÍÞìáôïò"
+
+#: lib/MIME/Viewer/images.php:151 lib/MIME/Viewer/images.php:153
+msgid "View Thumbnail"
+msgstr "ÅìöÜíéóç óå ìéêñÞ êëßìáêá"
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid "View attachment in a separate window"
+msgstr "ÅìöÜíéóç óõíçììÝíùí óå äéáöïñåôéêü ðáñÜèõñï"
+
+#: lib/MIME/Viewer/related.php:64
+msgid "View content in a separate window"
+msgstr "ÅìöÜíéóç ðåñéå÷ïìÝíïõ óå äéáöïñåôéêü ðáñÜèõñï"
+
+#: lib/MIME/Viewer/itip.php:130
+msgid "View event"
+msgstr "ÅìöÜíéóç óõìöÜíôïò"
+
 msgid "View messages in "
 msgstr "ÅìöÜíéóç ìçíõìÜôùí óôï "
 
+msgid "View messages in %s"
+msgstr "ÅìöÜíéóç ìçíõìÜôùí óôï %s"
+
 msgid "View or mailbox to display after login:"
-msgstr "ÐñïâïëÞ Þ Ãñáììáôïêéâþôéï ðïõ èá åìöáíßæåôáé ìåôÜ ôçí åßóïäï óôçí õðçñåóßá:"
+msgstr ""
+"ÐñïâïëÞ Þ Ãñáììáôïêéâþôéï ðïõ èá åìöáíßæåôáé ìåôÜ ôçí åßóïäï óôçí õðçñåóßá:"
+
+#: lib/MIME/Viewer/itip.php:160
+msgid "View task"
+msgstr "ÅìÜíéóç åñãáóßáò"
+
+#: lib/MIME/Viewer/html.php:110
+msgid "View the Images"
+msgstr "ÅìöÜíéóç ôùí åéêüíùí"
+
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Ï Éäåáôüò ÖÜêåëëïò \"%s\" äçìéïõñãÞèçêå åðéôõ÷þò."
+
+msgid "Virtual Folders"
+msgstr "Éäåáôïß öÜêåëëïé"
+
+#: search.php:291
+msgid "Virtual Folders require a label."
+msgstr "Ïé éäåáôïß ÖÜêåëïé áðáéôïýí 'åôéêÝôá'."
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr "ÅôéêÝôá éäåáôïý öáêÝëëïõ"
 
 msgid "Warning"
 msgstr "Ðñïåéäïðïßçóç"
 
+msgid "Welcome"
+msgstr "ÊáëùóÞñèáôå"
+
 #, c-format
 msgid "Welcome to %s"
 msgstr "ÊáëùóÞñèáôå %s"
 
 msgid ""
+"Welcome to the Internet Message Program (IMP)!  Through IMP's intuitive "
+"interface, you'll be able to access and manage your IMAP mail account using "
+"the simplicity of a standard web browser."
+msgstr ""
+"Êáëþò Þñèáôå óôï Internet Message Program (IMP)! Ôï IMP óáò äßíåé ðñüóâáóç "
+"óôïõò IMAP ëïãáñéáóìïýò ðïõ Ý÷åôå. ÌÝóù åíüò áðëïý browser ìðïñåßôå íá "
+"äéá÷åéñéóôåßôå ìå áðëü êáé åýêïëï ôñüðï ôïõò ëïãáñéáóìïýò óáò."
+
+msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr ""
-"¼ôáí äéáãñÜöïíôáé ìçíýìáôá, íá ìåôáöÝñïíôáé óôïí öÜêåëï äéáãñáììÝíá"
-" áíôß íá ÷áñáêôçñßæïíôáé ùò äéáãñáììÝíá;"
+"¼ôáí äéáãñÜöïíôáé ìçíýìáôá, íá ìåôáöÝñïíôáé óôïí öÜêåëï äéáãñáììÝíá áíôß íá "
+"÷áñáêôçñßæïíôáé ùò äéáãñáììÝíá;"
+
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr "Ïôáí áíïßãåôå Ýíá íÝï mailbox, ìå ðïéÜ óåëßäá èÝëåôå íá îåêéíÜôå;"
+
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr "Ïôáí áðïèçêåýïíôáé ôá áðåóôáëìÝíá, íá áðïèçêåýïíôáé êáé ôá óõíçììÝíá;"
 
+#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "ËåõêÞ Ëßóôá"
+
+#: config/prefs.php.dist:437
 msgid "Wrap text at this many characters."
 msgstr "Áñéèìüò ÷áñáêôÞñùí ãéá ôçí áëëáãÞ ãñáììÞò."
 
 msgid "Yes"
 msgstr "Íáé"
 
+#: lib/Maintenance/Task/fetchmail_login.php:63
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Ðñüêåéôáé íá ðñïóêïìßóåôå ìçíýìáôá áðü ôïõò áêüëïõèïõò ëïãáñéáóìïýò:"
+
+#: templates/folders/javascript.inc:8
 msgid "You are attempting to delete the following folders:"
 msgstr "¸÷åôå åðéëÝîåé íá äéáãñÜøåôå ôïõò áêüëïõèïõò öáêÝëïõò:"
 
@@ -1503,6 +4523,13 @@
 msgid "You are creating a top-level folder."
 msgstr "Äçìéïõñãåßôå Ýíá öÜêåëï ðñþôïõ åðéðÝäïõ."
 
+msgid ""
+"You are creating a top-level folder.\\nPlease enter the name of the new "
+"folder:\\n"
+msgstr ""
+"ÄçìéïõñãÞóôå Ýíá öÜêåëï ðñþôïõ åðéðÝäïõ.\\nÐáñáêáëþ äþóôå ôï üíïìÜ ôïõ íÝïõ "
+"êáôáëüãïõ:\\n"
+
 msgid "You are currently using Secure HTTPS<br/>"
 msgstr "ÁõôÞ ôç óôéãìÞ ÷ñçóéìïðïéåßôå áóöáëÝò HTTPS<br/>"
 
@@ -1512,15 +4539,48 @@
 msgid "You are renaming the folder: "
 msgstr "¸÷åôå åðéëÝîåé íá ìåôïíïìÜóåôå ôï öÜêåëï:"
 
-#, c-format
+msgid ""
+"You can send mail in a variety ways.  You might choose to compose a new "
+"message or perhaps to reply to an existing message.  Whichever method you "
+"choose, however, will open the standard Compose Window."
+msgstr ""
+"Ìðïñåßôå íá óôåßëåôå Ýíá ìÞíõìá ìå äéÜöïñïõò ôñüðïõò. Ìðïñåßôå íá åðéëÝîåôå "
+"íá óõíèÝóåôå Ýíá íÝï ìÞíõìá Þ íá áðáíôÞóåôå óå Ýíá õðÜñ÷ïí ìÞíõìá. ¼ðïéï "
+"ôñüðï êáé íá åðéëÝîåôå, èá áíïßîåé ôï ðáñÜèõñï ãéá ôç óýíèåóç ìçíýìáôïò."
+
+#: lib/Maintenance/Task/tos_agreement.php:37
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+"Äåí óõìöùíåßôå ìå ôïõò üñïõò ÷ñÞóçò, óõíåðþò äåí åðéôñÝðåôáé ç óýíäåóç."
+
+#: templates/acl/acl.inc:165
+msgid "You do not have permission to change access to this folder"
+msgstr "Äåí Ý÷åôå åîïõóéïäüôçóç íá áëëÜîåôå ôçí ðñüóâáóç ó' áõôüí ôï öÜêåëï."
+
+#: lib/Maillog.php:132
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr "ÐñïùèÞóáôå áõôü ôï ìÞíõìá ôçí %%s óôïõò áêüëïõèïõò ðáñáëÞðôåò: %s."
+
+# templates/mailbox/alert.inc:3, c-format
+#: templates/mailbox/alert.inc:3
 msgid "You have %s new messages."
 msgstr "¸÷åôå %s ÍÝá ìçíýìáôá."
 
 msgid "You have 1 new message."
 msgstr "¸÷åôå 1 ÍÝï ìÞíõìá."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "¸÷åôå áðïóõíäåèåß. Åõ÷áñéóôïýìå ðïõ ÷ñçóéìïðïéÞóáôå ôçí õðçñåóßá. "
+#: templates/compose/attachments.js:116
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
+"¸÷åôå ôïõëÜ÷éóôïí Ýíá óõíçììÝíï åðéëåãìÝíï ðïõ äåí öïñôþóáôå áêüìç. Åßóôå "
+"óßãïõñïé üôé èÝëåôå íá óôåßëåôå áõôü ôï ìÞíõìá ÷ùñßò ôá óõíçììÝíá;"
+
+msgid "You have been logged out."
+msgstr "¸÷åôå áðïóõíäåèåß."
 
 msgid "You have new mail in the following folder:"
 msgstr "¸÷åôå íÝá ìçíýìáôá óôïí áêüëïõèï öÜêåëï:"
@@ -1528,8 +4588,27 @@
 msgid "You have new mail in the following folders:"
 msgstr "¸÷åôå íÝá ìçíýìáôá óôïõò áêüëïõèïõò öáêÝëïõò:"
 
+msgid "You must enter at least one recipient."
+msgstr "ÐñÝðåé íá óõìðëçñþóåôå ôïõëÜ÷éóôïí Ýíáí ðáñáëÞðôç."
+
+#: lib/MIME/Viewer/pgp.php:308
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+"ÐñÝðåé íá åéóÜãåôå ôç ëÝîç-êëåéäß ãéá ôï éäéùôéêü êëåéäß PGP, ðñïêåéìÝíïõ íá "
+"äåßôå áõôü ôï ìÞíõìá"
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+"ÐñÝðåé íá åéóÜãåôå ôç ëÝîç-êëåéäß ãéá ôï éäéùôéêü êëåéäß S/MIME, ðñïêåéìÝíïõ "
+"íá äåßôå áõôü ôï ìÞíõìá"
+
 msgid "You must first select the attachment(s) to delete."
-msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå ôï óõíçììÝíï(á) áñ÷åßï(á) ðïõ èÝëåôå íá äéáãñÜøåôå."
+msgstr ""
+"ÐñÝðåé ðñþôá íá åðéëÝîåôå ôï óõíçììÝíï(á) áñ÷åßï(á) ðïõ èÝëåôå íá äéáãñÜøåôå."
 
 msgid "You must first specify the file to attach."
 msgstr "ÐñÝðåé ðñþôá íá ðñïóäéïñßóåôå ôï áñ÷åßï ðïõ èÝëåôå íá åðéóõíÜøåôå."
@@ -1540,6 +4619,11 @@
 msgid "You must select a target mailbox first."
 msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå Ýíá öÜêåëï."
 
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
+msgstr "ÐñÝðåé íá åðéëÝîôå Ýíá ëïãáñéáóìü ãéá äéáãñáöÞ."
+
+#: templates/contacts/contacts.inc:76
 msgid "You must select an address first."
 msgstr "ÐñÝðåé ðñþôá íá åðéëÝîåôå ìéá äéåýèõíóç."
 
@@ -1552,7 +4636,21 @@
 msgid "You must specify a recipient."
 msgstr "ÐñÝðåé íá ðñïóäéïñßóåôå Ýíá ðáñáëÞðôç."
 
-#, c-format
+#: templates/fetchmail/manage.inc:48
+msgid "You need to have '%s' enabled in your maintenance options."
+msgstr ""
+"ÐñÝðåé íá Ý÷åôå ôçí åðéëïãÞ '%s' åíåñãïðïéçìÝíç óôçí åðéëïãÞ äéá÷åßñéóçò."
+
+#: lib/Maillog.php:140
+msgid "You redirected this message to %s on %%s."
+msgstr "Áíáêáôåõèýíáôå áõôü ôï ìÞíõìá óôï %s óå %%s."
+
+#: lib/Maillog.php:144
+msgid "You replied to this message on %s."
+msgstr "ÁðáíôÞóáôå óå áõôü ôï ìÞíõìá óôéò %s."
+
+# lib/Folder.php:590, c-format
+#: lib/Folder.php:590
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Äåí óõíäåèÞêáôå óôï \"%s\". Ôï óýóôçìá Ýâãáëå ôï áêüëïõèï ìÞíõìá"
 
@@ -1573,16 +4671,51 @@
 msgstr "Ç óýíäåóç óáò %s Ý÷åé ëÞîåé."
 
 msgid "Your From: address:"
-msgstr "Áðü:"
+msgstr "Ç Áðü: äéåýèõíóÞ óáò:"
 
 msgid "Your Information"
 msgstr "Ïé ðëçñïöïñßåò óáò"
 
+#: templates/pgp/pgp.inc:186
+msgid "Your Name"
+msgstr "Ôï üíïìÜ óáò"
+
+#: templates/pgp/pgp.inc:119
+msgid "Your PGP Public/Private Keys"
+msgstr "Ôï Äçìüóéï/Ðñïóùðéêü óáò PGP êëåéäß"
+
+#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+msgid "Your Private Key"
+msgstr "Ôï Éäéùôéêü êëåéäß óáò"
+
+#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+msgid "Your Public Key"
+msgstr "Ôï Äçìüóéï êëåéäß óáò"
+
 msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Ç äéåýèõíóÞ óáò ðïõ èá ôïðïèåôåßôáé óôï ðåäßï ÁðÜíôçóç-ðñïò: <i>(ðñïáéñåôéêü)</i>"
+msgstr ""
+"Ç äéåýèõíóÞ óáò ðïõ èá ôïðïèåôåßôáé óôï ðåäßï ÁðÜíôçóç-ðñïò: <i>(ðñïáéñåôéêü)"
+"</i>"
+
+#: templates/smime/smime.inc:91
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "Ôï Äçìüóéï/Éäéùôéêü S/MIME êëåéäß óáò"
+
+#: templates/fetchmail/account_select.inc:16
+msgid "Your accounts:"
+msgstr "Ïé ëïãáñéáóìïß óáò:"
+
+#: config/prefs.php.dist:165
+msgid ""
+"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+msgstr ""
+"Ïé óõíþíõìåò äéåõèýóåéò óáò: <i>(ðñïáéñåôéêü, åéóÜãåôå êÜèå äéåýèõíóç Üëëç "
+"ãñáììÞ)</i>"
 
 msgid "Your browser does not support inline display of this image type"
-msgstr "Ï Browser (ð.÷. Internet Explorer Þ Netscape) óáò äåí õðïóôçñßæåé ôçí ðáñïõóßáóç áõôïý ôïõ ôýðïõ åéêüíáò"
+msgstr ""
+"Ï Browser (ð.÷. Internet Explorer Þ Netscape) óáò äåí õðïóôçñßæåé ôçí "
+"ðáñïõóßáóç áõôïý ôïõ ôýðïõ åéêüíáò"
 
 msgid ""
 "Your browser does not support this print option. Press Control/Option + P to "
@@ -1594,6 +4727,12 @@
 msgid "Your current time zone:"
 msgstr "ÅðéëÝîôå ôç Æþíç ¿ñáò óôçí ïðïßá âñßóêåóôå:"
 
+msgid "Your default charset for sending messages:"
+msgstr "Ç ðñïåðéëåãìÝíç êùäéêïóåëßäá êáôÜ ôçí áðïóôïëÞ:"
+
+msgid "Your default encryption method for sending messages:"
+msgstr "Ç ðñïåðéëåãìÝíç ìÝèïäïò êñõðôïãñÜöçóçò êáôÜ ôçí áðïóôïëÞ:"
+
 msgid "Your default identity:"
 msgstr "Ç ðñïåðéëåãìÝíç ôáõôüôçôÜ óáò :"
 
@@ -1603,6 +4742,10 @@
 msgid "Your identities:"
 msgstr "Ïé ôáõôüôçôåò óáò:"
 
+#: lib/MIME/Viewer/status.php:92
+msgid "Your message was successfully delivered."
+msgstr "Ôï ìÞíõìÜ óáò ðáñáäüèçêå åðéôõ÷þò."
+
 msgid "Your options have been updated."
 msgstr "Ïé åðéëïãÝò ðïõ êÜíáôå Ý÷ïõí åíçìåñùèåß."
 
@@ -1610,15 +4753,15 @@
 "Your session will expire in 1 minute. Do you want to reload the page to "
 "prevent losing your work?"
 msgstr ""
-"Ç óýíäåóç óáò èá ëÞîåé óå Ýíá ëåðôü. ÈÝëåôå íá áíáíåþóåôå ôç óåëßäá"
-"ãéá íá ìçí ÷áèåß ç åñãáóßá óáò;"
+"Ç óýíäåóç óáò èá ëÞîåé óå Ýíá ëåðôü. ÈÝëåôå íá áíáíåþóåôå ôç óåëßäáãéá íá "
+"ìçí ÷áèåß ç åñãáóßá óáò;"
 
 msgid ""
 "Your session will expire in 5 minutes. Do you want to reload the page to "
 "prevent losing your work?"
 msgstr ""
-"Ç óýíäåóç óáò èá ëÞîåé óå 5 ëåðôÜ. ÈÝëåôå íá áíáíåþóåôå ôç óåëßäá"
-"ãéá íá ìçí ÷áèåß ç åñãáóßá óáò;"
+"Ç óýíäåóç óáò èá ëÞîåé óå 5 ëåðôÜ. ÈÝëåôå íá áíáíåþóåôå ôç óåëßäáãéá íá ìçí "
+"÷áèåß ç åñãáóßá óáò;"
 
 msgid "Your signature:"
 msgstr "Ç õðïãñáöÞ óáò:"
@@ -1626,29 +4769,161 @@
 msgid "[No Subject]"
 msgstr "[Äåí õðÜñ÷åé èÝìá]"
 
+#: templates/compose/compose.inc:216
+msgid "_Bcc"
+msgstr "Ê.Êïéí."
+
+#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+msgid "_Blacklist"
+msgstr "Ìáýñç Ëßóôá"
+
+#: templates/compose/compose.inc:165
+msgid "_Cc"
+msgstr "Êïéí."
+
+#: lib/IMP.php:904
+msgid "_Compose"
+msgstr "Óýíèåóç"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+msgid "_Delete"
+msgstr "ÄéáãñáöÞ"
+
+#: lib/IMP.php:906
+msgid "_Folders"
+msgstr "ÖÜêåëïé"
+
+msgid "_Help"
+msgstr "ÂïÞèåéá"
+
+#: templates/compose/compose.inc:80
+msgid "_Identity"
+msgstr "Ôáõôüôçôá"
+
+#: lib/IMP.php:897
+msgid "_Inbox"
+msgstr "Åéóåñ÷üìåíá"
+
+#: lib/IMP.php:947
+msgid "_Log out"
+msgstr "Åîïäïò"
+
+#: message.php:375
+msgid "_Message Source"
+msgstr "Ðçãáßï ÌÞíõìá"
+
+#: templates/message/navbar_actions.inc:31
+msgid "_Options"
+msgstr "ÅðéëïãÝò"
+
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr "ÍÝï ÌÞíõìá"
+
+#: templates/message/navbar_actions.inc:31
+msgid "_Print"
+msgstr "Åêôýðùóç"
+
+#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+msgid "_Priority"
+msgstr "Ðñïôåñáéüôçôá"
+
+#: mailbox.php:389
+msgid "_Refresh %s"
+msgstr "ÁíáíÝùóç %s"
+
+#: templates/message/navbar_actions.inc:8
+msgid "_Reply"
+msgstr "ÁðÜíôçóç"
+
+#: lib/IMP.php:908
+msgid "_Search"
+msgstr "ÁíáæÞôçóç"
+
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+msgid "_Send Message"
+msgstr "ÁðïóôïëÞ Ìçíýìáôïò"
+
+#: templates/mailbox/message_headers.inc:27
+msgid "_Thread"
+msgstr "ÍÞìá"
+
+#: templates/compose/compose.inc:115
+msgid "_To"
+msgstr "Ðñïò"
+
+msgid "_Undelete"
+msgstr "ÅðáíáöïñÜ"
+
+msgid "_View Thread"
+msgstr "ÐñïâïëÞ ÍçìÜôùí"
+
+#: templates/mailbox/actions.inc:13 templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr "ËåõêÞ Ëßóôá"
+
 msgid "add source"
 msgstr "ÐñïóèÞêç Ðçãáßïõ Êþäéêá"
 
+msgid "and is using the following browser:"
+msgstr "êáé ÷ñçóéìïðïéåß ôïí áêüëïõèï browser:"
+
+#: lib/Compose.php:344
+msgid "attachment"
+msgstr "ÓõíçììÝíï"
+
+#: view.php:102
+msgid "attachments.zip"
+msgstr "ÓõíçììÝíá.zip"
+
 msgid "cannot move past the beginning"
-msgstr "Åßóôå óôçí áñ÷Þ ôçò ëßóôáò. Äåí ìðïñåß íá ãßíåé ìåôáêßíçóç ðñïò ôá åðÜíù."
+msgstr ""
+"Åßóôå óôçí áñ÷Þ ôçò ëßóôáò. Äåí ìðïñåß íá ãßíåé ìåôáêßíçóç ðñïò ôá åðÜíù."
 
 msgid "cannot move past the end"
-msgstr "Åßóôå óôï ôÝëïò ôçò ëßóôáò. Äåí ìðïñåß íá ãßíåé ìåôáêßíçóç ðñïò ôá êÜôù."
+msgstr ""
+"Åßóôå óôï ôÝëïò ôçò ëßóôáò. Äåí ìðïñåß íá ãßíåé ìåôáêßíçóç ðñïò ôá êÜôù."
 
 msgid "delete message"
 msgstr "äéáãñáöÞ ìçíýìáôïò"
 
+msgid "deleted"
+msgstr "äéáãñáììÝíá"
+
+msgid "drafts"
+msgstr "ðñü÷åéñá"
+
 msgid "from"
-msgstr "Áðü"
+msgstr "áðü"
+
+msgid "gpg: Signature made %s using %s"
+msgstr "gpg: Ç õðïãñáöÞ Ýãéíå %s ìå ÷ñÞóç %s"
+
+msgid "inline"
+msgstr "åíóùìáôùìÝíï"
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr "êëåéäß"
+
+#: folders.php:151
+msgid "mailbox file"
+msgstr "áñ÷åßï ãñáììáôïèõñßäáò"
 
 msgid "move down"
-msgstr "Ìåôáêßíçóç Ðñïò ôá ÊÜôù"
+msgstr "ìåôáêßíçóç Ðñïò ôá ÊÜôù"
 
 msgid "move message to"
 msgstr "ìåôáêßíçóç ôïõ ìçíýìáôïò óôïí"
 
 msgid "move up"
-msgstr "Ìåôáêßíçóç Ðñïò ôá ÅðÜíù"
+msgstr "ìåôáêßíçóç Ðñïò ôá ÅðÜíù"
+
+#: compose.php:977 lib/Message.php:452
+msgid "name"
+msgstr "Ïíïìá"
 
 msgid "no folder selected"
 msgstr "äåí Ý÷åé åðéëå÷ôåß öÜêåëïò"
@@ -1665,8 +4940,15 @@
 msgid "or"
 msgstr "Þ"
 
+msgid "or:"
+msgstr "Þ:"
+
 msgid "please fill in the text and choose a field and an action"
-msgstr "ðáñáêáëþ óõìðëçñþóôå ôï êåßìåíï êáé åðéëÝîôå Ýíá ðåäßï êáé ìßá åíÝñãåéá "
+msgstr ""
+"ðáñáêáëþ óõìðëçñþóôå ôï êåßìåíï êáé åðéëÝîôå Ýíá ðåäßï êáé ìßá åíÝñãåéá "
+
+msgid "quoted-printable"
+msgstr "åêôõðþóéìï"
 
 msgid "remove source"
 msgstr "áöáßñåóç ðçãÞò"
@@ -1680,206 +4962,24 @@
 msgid "spelling errors"
 msgstr "ïñèïãñáöéêÜ ëÜèç"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "üðïõ ôï ðåäßï %s ðåñéÝ÷åé <b>%s</b>"
-
-msgid ""
-"All messages in the folder(s) will be lost!\\nAre you completely sure you "
-"wish to continue?\\n"
-msgstr ""
-"¼ëá ôá ìçíýìáôá óôï(ïõò) öÜêåëï(ïõò) èá ÷áèïýí! \\nÅßóôå áðïëýôùò "
-"óßãïõñïé üôé èÝëåôå íá óõíå÷ßóåôå;\\n"
-
-msgid ""
-"All sessions begin at the Login screen.  Before you can use any of the "
-"webmail features, you must connect to your IMAP account using the "
-"username and password assigned to you by your network administrator."
-msgstr ""
-"Èá îåêéíÞóåôå áðü ôçí ïèüíç åéóüäïõ. Ðñéí ÷ñçóéìïðïéÞóåôå ïðïéåóäÞðïôå "
-"áðü ôéò õðçñåóßåò ôïõ Web Mail, èá ðñÝðåé íá óõíäåèåßôå óôï ëïãáñéáóìü "
-"IMAP ðïõ Ý÷åôå ÷ñçóéìïðïéþíôáò ôï üíïìá ÷ñÞóôç êáé ôï óõíèçìáôéêü ðïõ óáò "
-"Ý÷ïõí äþóåé."
-
-msgid "Apply filter rules upon logging on."
-msgstr "ÅöáñìïãÞ ôùí êáíüíùí ößëôñùí êÜèå öïñÜ ðïõ ìðáßíåôå óôçí õðçñåóßá."
-
-msgid ""
-"Begin by entering your user and password in the appropriate fields.  "
-"You'll then need to select the IMAP mail server to which you'd like to "
-"connect."
-msgstr ""
-"ÎåêéíÞóôå âÜæïíôáò ôï üíïìá ÷ñÞóôç êáé ôï óõíèçìáôéêü óáò óôá êáôÜëëçëá "
-"ðåäßá. Êáôüðéí ðñÝðåé íá åðéëÝîåôå ôïí ôýðï äéáêïìéóôÞ ðïõ èá "
-"÷ñçóéìïðïéÞóåôå."
-
-msgid "Body:"
-msgstr "Êåßìåíï Ìçíýìáôïò:"
-
-msgid "Change Folder"
-msgstr "ÁëëáãÞ ÖáêÝëïõ"
-
-msgid "Conclusion"
-msgstr "ÁðïôÝëåóìá"
-
-msgid ""
-"Customize how you send mail and where drafts or sent messages are saved."
-msgstr ""
-"Ñýèìéóç ôùí åðéëïãþí ãéá ôçí áðïóôïëÞ ìçíõìÜôùí êáé ôçí áðïèÞêåõóÞ ôïõò "
-"ùò ðñü÷åéñá Þ áðåóôáëìÝíá."
-
-msgid "Filter"
-msgstr "Ößëôñï"
-
-msgid "Getting Started"
-msgstr "Áñ÷ßæïíôáò"
-
-msgid "Introduction to %s"
-msgstr "ÅéóáãùãÞ óôï %s"
-
-msgid "Introduction"
-msgstr "ÅéóáãùãÞ"
-
-msgid "Logging In"
-msgstr "Åßóïäïò óôçí ÅöáñìïãÞ"
-
-msgid "Message Filters"
-msgstr "Ößëôñá ÌçíõìÜôùí"
-
-msgid "New User Introduction"
-msgstr "Ïäçãßåò ãéá ôïõò íÝïõò ÷ñÞóôåò"
-
-msgid ""
-"Once you've filled in these three fields, click the \"Login\" button to "
-"proceed."
-msgstr ""
-"¼ôáí èá Ý÷åôå óõìðëçñþóåé áõôÜ ôá ôñßá ðåäßá, åðéëÝîôå ôï \"Åßóïäïò\" ãéá"
-" íá óõíå÷ßóåôå."
-
-msgid "Path to your mail folders:"
-msgstr "ÌïíïðÜôé ãéá ôïí öÜêåëï ìå ôá ìçíýìáôá óáò:"
-
-msgid "Purging "
-msgstr "ÄéáãñáöÞ"
-
-msgid "Return to Welcome Screen"
-msgstr "ÅðéóôñïöÞ óôçí áñ÷éêÞ ïèüíç"
-
-msgid ""
-"The Compose Window allows you to set, among other things, the message "
-"recipient's address (who you're sending mail to), the message subject, "
-"and the message contents.  Simply fill out the appropriate fields at the "
-"top of the window (only the To: address is required, but the Subject: is "
-"suggested) and type your message in the large lower field.  Once you've "
-"completed entering your message, you may choose to Spell Check your "
-"message text.  Once you're done composing your new message, click the "
-"\"Send\" button to send the message to the recipient."
-msgstr ""
-"Ôï ðáñÜèõñï óýíèåóçò, óáò åðéôñÝðåé, åêôüò ôùí Üëëùí, íá ïñßóåôå ôçí "
-"äéåýèõíóç ôïõ ðáñáëÞðôç (óå ðïéüí óôÝëíåôå ôï ìÞíõìá), ôï èÝìá ôïõ "
-"ìçíýìáôïò êáé ôï ðåñéå÷üìåíï ôïõ ìçíýìáôïò. Áðëþò óõìðëçñþóôå ôá "
-"êáôÜëëçëá ðåäßá óôï åðÜíù ìÝñïò ôïõ ðáñáèýñïõ (ìüíï ôï Ðñïò: ðåäßï åßíáé "
-"áðáñáßôçôï íá óõìðëçñùèåß, Üëëá ôï ÈÝìá: åßíáé ðñïôéìüôåñï íá åßíáé "
-"óõìðëçñùìÝíï) êáé ãñÜøôå ôï ìÞíõìÜ óáò óôï ìåãÜëï ðåäßï ðïõ öáßíåôáé óôï "
-"êÜôù ìÝñïò ôïõ ðáñáèýñïõ. ¼ôáí ïëïêëçñþóåôå ôç óõããñáöÞ ôïõ ìçíýìáôüò "
-"óáò, ìðïñåßôå íá åðéëÝîåôå íá ãßíåé ïñèïãñáöéêüò Ýëåã÷ïò óôï êåßìåíü óáò. "
-"¼ôáí Ý÷åé ïëïêëçñùèåß ç óýíèåóç ôïõ íÝïõ ìçíýìáôüò óáò, ðáôÞóôå ôï êïõìðß "
-"\"ÁðïóôïëÞ\" ãéá íá óôåßëåôå ôï ìÞíõìá óôïí ðáñáëÞðôç."
-
-msgid "The Compose Window"
-msgstr "Ôï ðáñÜèõñï Óýíèåóçò"
-
-msgid "The Mailbox Listing"
-msgstr "Ç ëßóôá ôïõ ãñáììáôïêéâùôßïõ"
-
-msgid ""
-"The Message Screen display the contents of the selected message.  From "
-"here, you can browse message attachments, reply to the current message, "
-"delete the current message, or advance to the next message in your "
-"current mailbox."
-msgstr ""
-"Ç ïèüíç ìçíõìÜôùí åìöáíßæåé ôá ðåñéå÷üìåíá ôïõ åðéëåãìÝíïõ ìçíýìáôïò. Áðü "
-"åäþ ìðïñåßôå íá äåßôå ôá óõíçììÝíá áñ÷åßá, íá áðáíôÞóåôå óôï ìÞíõìá, íá ôï "
-"äéáãñÜøåôå ç íá ðñï÷ùñÞóåôå óôï åðüìåíï ìÞíõìá."
-
-msgid "The Message Screen"
-msgstr "Ïèüíç ÌçíõìÜôùí"
+msgid "trash"
+msgstr "êÜäïò"
 
-msgid ""
-"The contents of your Inbox folder will be displayed immediately upon "
- "logging in.  The Mailbox Listing shows the contents of each message's "
- "header (message status, date sent, sender, subject, and size).  Each "
- "column has a heading.  Clicking on the heading will cause the listing to "
- "be sorted by that column."
- msgstr ""
- "Ôá ðåñéå÷üìåíá ôïõ êáôáëüãïõ 'Åéóåñ÷üìåíá' èá åìöáíßæïíôáé ìå ôçí åßóïäü "
- "óáò óôï óýóôçìá. Óôç ëßóôá ìå ôá ìçíýìáôá åìöáíßæïíôáé ïé åðéêåöáëßäåò "
- "ãéá êÜèå ìÞíõìá (Ç êáôÜóôáóç ôïõ, ç çìåñïìçíßá áðïóôïëÞò, ï áðïóôïëÝáò, "
- "ôï èÝìá êáé ôï ìÝãåèïò). Ìðïñåßôå íá ôáîéíïìÞóåôå ôá ìçíýìáôá óáò "
- "åðéëÝãïíôáò ôï üíïìá ôïõ ðåäßïõ ðïõ èÝëåôå, óôçí áñ÷Þ ôçò ëßóôáò."
-
- msgid ""
- "This has hopefully given you a general understanding of how to web mail "
- "interface works.  You'll surely become comfortable with it after seeing "
- "how easy and convenient it is for reading and sending mail, as well as "
- "managing your IMAP mail account."
- msgstr ""
- "Áõôü èá óáò Ý÷åé äþóåé ìßá êáëÞ åéêüíá ãéá ôï ðþò äïõëåýåé ôï ðåñéâÜëëïí "
- "ôïõ Web Mail. Èá åîïéêåéùèåßôå ìå ôçí åöáñìïãÞ áöïý äåßôå ðüóï åýêïëç "
- "åßíáé ç áðïóôïëÞ êáé ç ëÞøç ìçíõìÜôùí, üðùò åðßóçò êáé ïé äéá÷åßñéóç ôùí "
- "ëïãáñéáóìþí óáò ìå IMAP."
-
- msgid ""
- "To view the contents of a message, click on the message's subject.  "
- "You'll be taken to the Message screen."
- msgstr ""
- "Ãéá íá äåßôå ôá ðåñéå÷üìåíá åíüò ìçíýìáôïò, ðáôÞóôå ôï èÝìá ôïõ "
- "ìçíýìáôïò. Èá åìöáíéóôåß ç ïèüíç ìçíõìÜôùí, áðü üðïõ èá ìðïñÝóåôå íá ôï "
- "äéáâÜóåôå."
+msgid "trash %s"
+msgstr "êÜäïò %s"
 
-msgid "User Preferences"
-msgstr "ÅðéëïãÝò ×ñÞóôç"
+msgid "unnamed"
+msgstr "÷ùñßò üíïìá"
 
- msgid ""
- "Welcome to the Internet Message Program (IMP)!  Through IMP's intuitive "
- "interface, you'll be able to access and manage your IMAP mail account "
- "using the simplicity of a standard web browser."
- msgstr ""
-"Êáëþò Þñèáôå óôï Internet Message Program (IMP)! Ôï IMP óáò äßíåé "
- "ðñüóâáóç óôïõò IMAP ëïãáñéáóìïýò ðïõ Ý÷åôå. ÌÝóù åíüò áðëïý browser "
- "ìðïñåßôå íá äéá÷åéñéóôåßôå ìå áðëü êáé åýêïëï ôñüðï ôïõò ëïãáñéáóìïýò óáò."
-
- msgid "Welcome"
- msgstr "ÊáëùóÞñèáôå"
-
- msgid ""
- "You are creating a top-level folder.\\nPlease enter the name of the new "
- "folder:\\n"
-msgstr ""
- "ÄçìéïõñãÞóôå Ýíá öÜêåëï ðñþôïõ åðéðÝäïõ.\\nÐáñáêáëþ äþóôå ôï üíïìÜ ôïõ "
- "íÝïõ êáôáëüãïõ:\\n"
-
- msgid ""
- "You can send mail in a variety ways.  You might choose to compose a new "
- "message or perhaps to reply to an existing message.  Whichever method you "
-"choose, however, will open the standard Compose Window."
- msgstr ""
- "Ìðïñåßôå íá óôåßëåôå Ýíá ìÞíõìá ìå äéÜöïñïõò ôñüðïõò. Ìðïñåßôå íá "
- "åðéëÝîåôå íá óõíèÝóåôå Ýíá íÝï ìÞíõìá Þ íá áðáíôÞóåôå óå Ýíá õðÜñ÷ïí "
- "ìÞíõìá. ¼ðïéï ôñüðï êáé íá åðéëÝîåôå, èá áíïßîåé ôï ðáñÜèõñï ãéá ôç "
- "óýíèåóç ìçíýìáôïò."
-
- msgid "deleted"
- msgstr "ÄéáãñáììÝíá"
-
- msgid "or:"
- msgstr "Þ:"
+msgid "user is over quota"
+msgstr "Ï ÷ñÞóôçò äåí Ý÷åé äéáèÝóéìï ÷þñï!!!"
 
- msgid "Save Options"
- msgstr "ÁðïèÞêåõóç Åðéëïãþí"
+msgid "your blacklist"
+msgstr "Ìáýñç(ò) Ëßóôáò óáò"
 
- msgid "Undo Changes"
- msgstr "Áêýñùóç Áëëáãþí"
+msgid "your whitelist"
+msgstr "ËåõêÞ(ò) Ëßóôáò óáò"
 
- msgid "Return to Options"
- msgstr "ÅðéóôñïöÞ óôéò ÅðéëïãÝò"
+#, c-format
+msgid "where the %s field contains <b>%s</b>"
+msgstr "üðïõ ôï ðåäßï %s ðåñéÝ÷åé <b>%s</b>"


--- orig/po/pt_BR.po
+++ mod/po/pt_BR.po
@@ -1,16 +1,15 @@
-# translation of pt_BR.po to Brazilian Portuguese
-# translation of imp.po to Brazilian Portuguese
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR Horde Project.
-# Fabio Gomes <flgomes at fazenda.sp.gov.br>, 2004.
+# translation of imp.pot to Brazilian Portuguese
+# Copyright (C) YEAR Horde Project
+# This file is distributed under the same license as the Imp package.
 #
+# Fabio Gomes <flgoms at uol.com.br>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: pt_BR\n"
+"Project-Id-Version: Imp\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2004-11-17 12:36+0100\n"
-"PO-Revision-Date: 2004-12-15 17:00-0200\n"
-"Last-Translator: Fabio Gomes <flgomes at fazenda.sp.gov.br>\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2006-02-15 13:01-0200\n"
+"Last-Translator: Fabio Gomes <flgoms at uol.com.br>\n"
 "Language-Team: Brazilian Portuguese <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -18,32 +17,36 @@
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "      Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "      Para: "
 
-#: lib/Compose.php:241 lib/Compose.php:293
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "    Data: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "    De: "
 
-#: mailbox.php:383
+#: mailbox.php:406 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
-msgstr " (Chave de acesso %s)"
+msgstr " (Tecla de Atalho %s)"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr " Assunto: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " em "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
@@ -52,135 +55,130 @@
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:180
+#: thread.php:156
 #, php-format
-msgid "%d message(s) have been deleted."
+msgid "%d Messages"
+msgstr "%d Mensagens"
+
+#: mailbox.php:174
+#, php-format
+msgid "%d messages have been deleted."
 msgstr "%d mensagem(ns) foi(ram) excluída(s)."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "%d mensagens foram reportadas como não spam ao seu administrador de sistema."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d mensagens foram reportadas como não spam."
 
-#: lib/Spam.php:161
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
 "%d mensagens foram reportadas como spam ao seu administrador de sistema."
 
-#: lib/Spam.php:141
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d mensagens foram reportadas como spam."
 
-#: mailbox.php:352
+#: mailbox.php:356
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d à %d de %d Mensagens"
 
-#: mailbox.php:591
+#: mailbox.php:626
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s Administração do PGP"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s Administração do S/MIME"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
-msgstr "%s já existe. Sua pasta %s foi renomeada."
+msgstr "%s já existe. Sua pasta %s não foi renomeada."
 
-#: lib/Message.php:643
+#: lib/Message.php:669
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
-msgstr "%s não parece ser uma caixa postal válida."
+msgstr "%s não parece ser uma pasta válida."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
-msgstr "A pasta %s foi renomeada no início do mês."
+msgstr "A pasta %s está sendo renomeada no início do mês."
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s foi aceito."
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s cancelou %s."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s cancelou \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s recusou."
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s respondeu a uma requisição de informação livre/ocupado."
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s respondeu a um convite para %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s respondeu ao convite para \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s enviou a você uma informação livre/ocupado."
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s aceitou provisoriamente."
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s requisitou sua informação livre/ocupado."
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s requisitou sua presença em %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s solicitou sua presença em \"%s\"."
 
-#: lib/Message.php:398
+#: lib/Message.php:443
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s foi adicionado com sucesso %s."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s foi adicionado com sucesso em %s."
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s deseja corrigir %s."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s deseja corrigir \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s. deseja deixar você ciente de %s."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s deseja informar você sobre \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s deseja receber a última informação sobre %s."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s deseja receber a última informação sobre \"%s\"."
 
-#: message.php:278 message.php:283
+#: message.php:295 message.php:300
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -190,15 +188,23 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aplicar estas alterações e ir para a próxima tela.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Descartar todas alterações e retornar à tela de composição.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Texto Puro)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -206,7 +212,7 @@
 "(Retornar à tela de composição após aplicar todas alterações realizadas até "
 "agora.  Alterações na tela atual NÃO serão aplicadas.)"
 
-#: spelling.php:274
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -218,53 +224,53 @@
 msgid "* Add these by clicking OK *"
 msgstr "* Adicione estes clicando em OK *"
 
-#: templates/contacts/contacts.inc:207
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Por favor selecione o(s) endereço(s) *"
 
-#: lib/Spam.php:171
+#: mailbox.php:172
+msgid "1 message has been deleted."
+msgstr "1 mensagem foi excluída."
+
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 "1 mensagem foi reportada como não spam ao seu administrador de sistema."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "1 mensagem foi reportada como não spam."
 
-#: lib/Spam.php:163
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 mensagem foi reportada como spam ao seu administrador de sistema."
 
-#: lib/Spam.php:143
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "1 mensagem foi reportada como spam."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 caracteres"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 caracteres"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 caracteres"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 caracteres"
 
-#: lib/MIME/Viewer/itip.php:62
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>Os dados do calendário são inválidos</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Um imagem grande de nome %s está anexada a esta mensagem."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -276,113 +282,117 @@
 msgid "AND"
 msgstr "E"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Aceitar e adicionar a minha agenda"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Aceitar solicitação"
 
-#: lib/MIME/Viewer/itip.php:740
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Aceita"
 
-#: lib/IMP.php:895 lib/IMP.php:897
-msgid "Acco_unts"
-msgstr "Con_tas"
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr "Aceita: "
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Nome da conta:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Ações"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Adicionar %s ao Catálogo de Endereços"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Adicionar fonte"
 
-#: lib/MIME/Viewer/itip.php:535 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
-msgstr "Adicionar isto ao meu calendário"
+msgstr "Adicionar isto a minha agenda"
 
-#: lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Adicionar ao Catálogo de Endereços (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Adicionar a minha agenda"
 
-#: compose.php:1141
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" adicionado como um anexo."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Cabeçalhos adicionais a serem mostrados ao visualizar: <i>(opcional, "
-"preencha cada cabeçalho em uma nova linha)</i>"
+"Cabeçalhos adicionais para mostrar ao visualizar: <em>(opcional, digite cada "
+"cabeçalho em uma nova linha)</em>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Informações adicionais podem ser visualizadas %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Detalhes adicionais da informação"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Detalhes adicionais da mensagem"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Detalhes adicionais da mensagem podem ser visualizados %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Detalhes adicionais de erro da mensagem"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "Detalhes adicionais de erro da mensagem podem ser visualizados %s."
 
-#: contacts.php:95 templates/contacts/contacts.inc:174
-#: templates/compose/compose.inc:334 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Catálogos de Endereços"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "Endereços em Cco em todas as mensagens: <i>(opcional, preencha cada endereço "
 "em uma nova linha)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Endereços explicitamente ligados a esta identidade: <i>(opcional, preencha "
 "cada endereço em uma nova linha)</i>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
-msgstr "Todas"
+msgstr "Todos"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Todas as mensagens na(s) pasta(s) serão perdidas!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -390,7 +400,7 @@
 "Todas as mensagens na(s) seguinte(s) pasta(s) serão baixadas em um arquivo "
 "MBOX:"
 
-#: lib/Maintenance/Task/purge_trash.php:86
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -399,54 +409,59 @@
 "Todas as mensagens em sua pasta \"%s\" mais antigas que %s dias serão "
 "excluídas permanentemente."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "Todos os anexos ligados mais antigos que %s meses serão excluídos."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
 "Todas as pastas \"Enviados\" mais antigas que %s meses serão excluídas."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
-msgstr "Todos os direitos na pasta '%s' foram removidas do usuário '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr ""
+"Todos os direitos na pasta \"%s\" foram removidas do usuário \"%s\" com "
+"sucesso."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Permitir Criação de Pastas?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
-msgstr ""
-"Permitir que as regras de filtro sejam aplicadas em qualquer caixa postal?"
+msgstr "Permitir que as regras de filtro sejam aplicadas em qualquer pasta?"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "Partes alternativas para esta seção:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "Sempre"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Sempre salvar anexos"
 
-#: lib/Message.php:491
+#: lib/Message.php:534
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
-msgstr "Um erro ocorreu ao tentar remover o anexo. O servidor IMAP disse: "
+msgstr "Ocorreu um erro ao tentar remover o anexo. O servidor IMAP disse: "
 
-#: message.php:185 compose.php:1016
-msgid "An unknown error occured adding the new entry."
-msgstr "Um erro desconhecido ocorreu ao adicionar um novo registro."
+#: lib/Message.php:417
+msgid "An unknown error occured while creating the new note."
+msgstr "Ocorreu um erro desconhecido ao criar a nova nota."
 
-#: lib/Message.php:385
+#: lib/Message.php:416
 msgid "An unknown error occured while creating the new task."
-msgstr "Um erro desconhecido ocorreu ao criar a nova tarefa."
+msgstr "Ocorreu um erro desconhecido ao criar a nova tarefa."
 
-#: message.php:492 mailbox.php:661 templates/message/navbar_navigate.inc:9
+#: message.php:503 mailbox.php:699 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -465,51 +480,50 @@
 msgid "Apply Filters to %s"
 msgstr "Aplicar Filtros em %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Aplicar regras de filtro ao conectar?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Aplicar regras de filtro sempre que a Caixa de Entrada for exibida?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Você tem CERTEZA que quer prosseguir?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Você esta completamente certo que deseja prosseguir?"
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Você tem certeza que quer excluir esta Definição de Pasta Virtual?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Você tem certeza que quer excluir esta chave pública?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
-"Você tem certeza que quer excluir este par de chaves? (Isto não é "
+"Você tem certeza que quer excluir seu par de chaves? (Isto não é "
 "recomendado!)"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Você tem certeza que quer fazer isto?"
 
-#: message.php:400 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:63
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Você tem certeza que deseja excluir PERMANENTEMENTE estas mensagens?"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
-msgstr "Você tem certeza que deseja excluir PERMANENTEMENTE estes anexos?"
+msgstr "Você tem certeza que deseja excluir PERMANENTEMENTE este anexo?"
 
 #: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Você tem certeza que deseja esvaziar esta pasta?"
 
-#: lib/IMP.php:886
+#: lib/IMP.php:923
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Você tem certeza que deseja esvaziar sua pasta de spams?"
+
+#: lib/IMP.php:916
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Você tem certeza que deseja esvaziar sua Lixeira?"
 
@@ -517,43 +531,39 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Você tem certeza que deseja excluir permanentemente estas mensagens?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Você tem certeza que deseja reportar esta mensagem como inocente?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Você tem certeza que deseja reportar esta mensagem como spam?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Hora da Chegada"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Perguntar"
 
-#: templates/compose/compose.inc:513
-msgid "Attach"
-msgstr "Anexar"
-
-#: templates/compose/compose.inc:470
+#: templates/compose/compose.inc:472
 msgid "Attach Files"
 msgstr "Arquivos Anexados"
 
-#: templates/compose/compose.inc:451
+#: templates/compose/compose.inc:453
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Anexar uma cópia de sua chave pública PGP a esta mensagem?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Arquivo Anexado:"
 
-#: lib/Compose.php:352 lib/Compose.php:439
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -561,38 +571,47 @@
 "O arquivo anexado \"%s\" excede o limite de tamanho de anexo. Arquivo NÃO "
 "anexado."
 
-#: lib/MIME/Viewer/itip.php:342
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
-msgstr "Segue em anexo a resposta a requisição de calendário que você enviou."
+msgstr ""
+"Se encontra anexada a resposta à requisição de agendamento que você enviou."
 
-#: mailbox.php:695 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:500
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:500 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Anexo"
 
-#: compose.php:966 lib/Message.php:452
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Anexo %s excluído."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Informação do Anexo"
+
+#: compose.php:1105 lib/Message.php:495
 msgid "Attachment stripped: Original attachment type"
 msgstr "Anexo removido: Tipo original do anexo"
 
-#: templates/compose/compose.inc:344 templates/compose/compose.inc:468
-#: lib/Compose.php:987
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:470
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Anexos"
 
-#: lib/MIME/Viewer/itip.php:669
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "Participantes"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Atenção"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp:Extensão IMAP obrigatória não encontrada."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -604,40 +623,63 @@
 msgid "Available Address books:"
 msgstr "Catálogos de Endereço disponíveis:"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Aguardando resposta"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
 msgstr "Retorna_r para %s"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Retornar para %s"
 
-#: message.php:259 search.php:153 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Voltar para o Índice de Visualização de Múltiplas Mensagens"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Voltar à Visualização por Discussão"
+
+#: lib/IMAP/Client.php:573
+#, php-format
+msgid "Bad login name or password."
+msgstr "Login ou senha inválidos."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Solicitação inválida ou defeituosa: o Servidor Respondeu: %s"
+
+#: lib/IMAP/Client.php:577
+#, php-format
+msgid "Bad request: %s."
+msgstr "Solicitação inválida: %s."
+
+#: message.php:276 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Cco"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
-msgstr "Abaixo está o texto bruto da mensagem de informação de estado."
+msgstr "Abaixo está o texto bruto da mensagem de informação de situação."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Lista Negra"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Bloquear mensagens em HTML a menos que elas tenham sido explicitamente "
 "solicitadas?"
 
-#: search.php:161
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Corpo"
 
@@ -646,44 +688,45 @@
 msgid "Both"
 msgstr "Ambos"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Ambas Listagem do Cabeçalho e Corpo da Mensagem"
 
-#: templates/compose/compose.inc:287
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "Con_junto de caracteres"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
-msgstr "Calendário"
+msgstr "Agenda"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
-msgstr "Não posso conectar ao servidor de correio remoto."
+msgstr "Não consigo conectar ao servidor de correio remoto."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
-msgstr "Não posso conectar ao servidor de correio remoto: "
+msgstr "Não consigo conectar ao servidor de correio remoto: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr ""
-"Impossível exibir - encontradas somente %s de %s partes desta mensagem na "
-"caixa postal atual."
+"Não consigo exibir - encontradas somente %s de %s partes desta mensagem na "
+"pasta atual."
 
-#: templates/contacts/contacts.inc:252 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:106 templates/pgp/passphrase.inc:32
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/compose/compose.inc:74 templates/compose/compose.inc:430
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:432
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Cancelar Mensagem"
 
@@ -691,28 +734,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Cancelar esta mensagem descartará permanentemente seu conteúdo."
 
-#: message.php:258 search.php:149 templates/contacts/contacts.inc:222
-#: templates/compose/recompose.inc:15
+#: message.php:275 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:687
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Importação de certificados não está disponível. O envio de arquivos não está "
+"habilitado neste servidor."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Moderador"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Alterar"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Alterar Todas"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Alterar Pasta"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -732,24 +783,24 @@
 "Altera o nome, endereço e assinatura que as pessoas vêem quando elas lêem e "
 "respondem suas mensagens."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Caracteres a exibir:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Verificar Novas Mensagens na(s) Pasta(s)"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
-msgstr "Verificar _Todas/Nenhuma"
+msgstr "Marcar Todas/Nenhuma"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr ""
 "Verificar todos os servidores de correio de onde você quer trazer mensagens:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Verificar ortografia antes de enviar uma mensagem?"
 
@@ -757,60 +808,64 @@
 msgid "Choose Action:"
 msgstr "Escolha a Ação:"
 
-#: config/servers.php.dist:165
+#: config/servers.php.dist:179
 msgid "Choose a mail server:"
 msgstr "Escolha um servidor de correio:"
 
-#: lib/MIME/Viewer/itip.php:479 lib/MIME/Viewer/itip.php:718
-msgid "Choose an action:"
-msgstr "Escolha uma ação:"
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr "Por favor selecione ou edite na caixa à direita:"
 
-#: templates/prefs/sourceselect.inc:350
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "Escolha o catálogo de endereços para utilizar ao adicionar endereços."
 
 #: templates/prefs/sourceselect.inc:293
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr ""
-"Escolha a ordem de procura dos catálogos de endereços ao expandir endereços."
+"Escolha a ordem de pesquisa dos catálogos de endereços ao expandir endereços."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Clique em %s para converter o arquivo de imagem em um formato que seu "
 "navegador pode exibir."
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Clique em %s para baixar a imagem."
 
-#: lib/Filter.php:103
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Clique em %s para ir para a página de gerenciamento de %s."
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Clique em %s para ver o conteúdo HTML em uma janela separada."
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Clique em %s para ver uma miniatura desta imagem."
 
-#: lib/MIME/Viewer/pkcs7.php:404
+#: lib/MIME/Viewer/pkcs7.php:423
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Clique em %s para ver o anexo em uma janela a parte."
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Click here to HIDE the Images"
-msgstr "Clique aqui para OCULTAR as imagens"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+"Clique em %s para visualizar esta parte do tipo multipart/related em uma "
+"janela separada."
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Clique aqui para EXIBIR as imagens"
 
@@ -822,49 +877,49 @@
 "Clique em um de seus Catálogos de Endereços selecionados e então selecione "
 "todos os campos a pesquisar."
 
-#: lib/MIME/Viewer/pgp.php:174
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Clique para Salvar a Chave Pública PGP em seu Catálogo de Endereços"
 
-#: lib/MIME/Viewer/pkcs7.php:190
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 "Clique para Salvar o certificado S/MIME de %s em seu Catálogo de Endereços"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Clicar no endereço irá compor uma nova mensagem para o remetente"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Clicar no endereço abrirá a mensagem para ser lida"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Fechar"
 
-#: compose.php:1032
+#: compose.php:418
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: folders.php:387
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Fechar Pasta"
 
-#: folders.php:407
+#: folders.php:430
 msgid "Collapse"
 msgstr "Contrair"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Contrair Todas"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Contrair Todas Pastas"
 
-#: folders.php:407
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Contrair Pasta"
 
@@ -872,32 +927,23 @@
 msgid "Color Indicator: "
 msgstr "Indicador de Cor: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Comentar"
 
-#: lib/MIME/Viewer/itip.php:756
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
-msgstr "Completo"
+msgstr "Encerrada"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Compor"
-
-#: mailbox.php:725 lib/MIME/Headers.php:196
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Compor Mensagem (%s)"
-
-#: compose.php:1031
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Compor outra mensagem"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Compor mensagens em uma janela separada?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -905,29 +951,37 @@
 "Compor mensagens em um editor HTML por padrão (se o navegador suportar esta "
 "característica)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
-msgstr "Configura a quantidade de mensagens exibidas."
+msgstr "Configura com as mensagens são exibidas."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Configura opções de pré-visualização de mensagem."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Conexão descartada pelo servidor IMAP."
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "A conexão com o servidor falhou"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Controla o suporte PGP para %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Controla o suporte S/MIME para %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Opções de controle relacionadas a pesquisa de mensagens."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -935,7 +989,7 @@
 "Controla quando fazer a verificação por novas mensagens e se deve notificar "
 "ou não quando elas chegarem."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Converter 'emoticons' textuais em gráficos?"
 
@@ -943,71 +997,88 @@
 msgid "Copy"
 msgstr "Copiar"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Copiar para a pasta"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corrigir"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Texto Corrigido"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Impossível completar a solicitação: Razão: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
-msgstr "Não pude criar um backend VSF: %s"
+msgstr "Não consegui criar um conector VSF: %s"
 
-#: lib/Message.php:634
+#: lib/Message.php:660
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Não consegui excluir as mensagens de %s. O servidor disse: %s"
 
-#: lib/Session.php:276
+#: lib/Session.php:321
 msgid "Could not execute maintenance operations."
-msgstr "Não pude executar as operações de manutenção."
+msgstr "Não consegui executar as operações de manutenção."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
-msgstr "Não pude extrair o arquivo solicitado do anexo MS-TNEF."
+msgstr "Não consegui extrair o arquivo solicitado do anexo MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
-msgstr "Não pude extrair o arquivo solicitado do arquivo Zip."
+msgstr "Não consegui extrair o arquivo solicitado do arquivo Zip."
+
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Impossível abrir conexão segura no servidor IMAP: %s: %s."
+
+#: lib/Session.php:269
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "Impossível obter informações de nomes do servidor IMAP."
 
-#: search.php:351 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Criar"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Criar Pasta"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Criar Chaves"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Criar Pasta Virtual"
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Outras Contas de Correio"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Criar uma nova pasta de spam"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
-msgstr "Criar uma nova pasta \"Rascunhos\""
+msgstr "Criar uma nova pasta de rascunhos"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
-msgstr "Criar uma nova pasta \"Enviados\""
+msgstr "Criar uma nova pasta mensagens enviadas"
 
 #: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Criar uma nova pasta \"Lixeira\""
+msgstr "Criar uma nova lixeira"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1015,12 +1086,20 @@
 "Cria regras de filtro para organizar as novas mensagens, ordená-las em "
 "pastas e excluir spam."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Criar um novo papel de carta"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Criar papel de carta e formulário de respostas."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Acesso atual a %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Customiza contas para trazer mensagens de outras contas."
 
@@ -1033,76 +1112,101 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Customiza tarefas a serem executadas ao conectar a %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Dat_a"
 
-#: message.php:255 thread.php:72
+#: message.php:272 thread.php:153
 msgid "Date"
 msgstr "Data"
 
-#: lib/MIME/Viewer/itip.php:744
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "Recusado"
 
-#: config/prefs.php.dist:894
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr "Recusado"
+
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Excluir"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Campo de Pesquisa Padrão"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Critério padrão de ordenação:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
-msgstr "Direção padrão de ordenação:"
+msgstr "Direção de ordenação padrão:"
 
-#: lib/MIME/Viewer/itip.php:752
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Delegado"
 
-#: folders.php:378 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:243 templates/message/navbar_actions.inc:6
+#: folders.php:400 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Excluir Chave Pública %s"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Excluir Chaves Atuais"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Excluir Pasta(s)"
 
-#: folders.php:378
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "Excluir Pastas Selecionadas"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Excluir Papel de Carta"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Excluir Pastas Virtuais"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Excluir Definições de Pastas Virtuais de %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Excluir mensagens trazidas do servidor remoto?"
 
-#: lib/MIME/Viewer/itip.php:607
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
-msgstr "Excluir do meu calendário"
+msgstr "Excluir da minha agenda"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
-msgstr "Excluir anexos ligados antigos no início do mês?"
+msgstr "Excluir links de anexos antigos no início do mês?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
-msgstr "Excluir pastas \"Enviados\" antigas no início do mês?"
+msgstr "Excluir pastas antigas de mensagens enviadas no início do mês?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Excluir spams após eles terem sido reportados como spam?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Excluir spams"
 
-#: message.php:495 mailbox.php:685 templates/mailbox/navbar.inc:20
+#: message.php:506 mailbox.php:725 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Excluída"
@@ -1111,7 +1215,7 @@
 msgid "Deleted messages"
 msgstr "Mensagens Excluídas"
 
-#: compose.php:300
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Anexo \"%s\" excluído."
@@ -1120,29 +1224,33 @@
 msgid "Deleting and Moving Messages"
 msgstr "Excluindo e Movendo Mensagens"
 
-#: lib/MIME/Viewer/itip.php:549
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Negar solicitação"
 
-#: lib/MIME/Viewer/itip.php:498
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Negar solicitação de informação livre/ocupado"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Descendente"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:657
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Descrição"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Detalhes"
 
-#: config/prefs.php.dist:680
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "Não anexou \"%s\" pois o arquivo estava vazio."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Esmaecer assinaturas?"
 
@@ -1150,47 +1258,55 @@
 msgid "Display"
 msgstr "Exibir"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Exibir confirmação após enviar uma mensagem?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Exibir no Corpo da Mensagem"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Exibir pop-up de notificação de nova mensagem?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Exibir o ícone 'Apagar Spams' na barra de menus?"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Exibir o ícone 'Esvaziar Lixeira' na barra de menus?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Disposição"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "NÃO corresponde"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Não Verifica Novas Mensagens na(s) Pasta(s)"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
-msgstr "Não gerar uma ligação na coluna \"De:\""
+msgstr "Não gerar um link na coluna \"De:\""
 
-#: lib/IMP.php:988
+#: lib/IMP.php:1024
 msgid "Do you want to open that folder?"
 msgstr "Você quer abrir esta pasta?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Não possui uma conta? Cadastre-se."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Feito"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Baixar %s no formato .zip"
@@ -1199,25 +1315,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Baixar todos anexos (em arquivo .zip)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Baixar Pasta(s)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Baixar Pasta(s) [formato .zip]"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Baixar em formato .zip"
 
-#: message.php:493 mailbox.php:666 templates/message/navbar_navigate.inc:11
+#: message.php:504 mailbox.php:704 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Rascunho"
 
-#: folders.php:358
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Pasta \"Rascunhos\""
 
@@ -1225,53 +1341,60 @@
 msgid "Drafts folder:"
 msgstr "Pasta \"Rascunhos\":"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Endereço de e-mail"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:302
+msgid "END"
+msgstr "FIM"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "ERRO: Sua mensagem não pôde ser entregue."
 
-#: folders.php:379
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Editar"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Editar Lista Negra"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
-#: folders.php:379 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Editar Sentença de Pesquisa"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Editar Pasta Virtual"
 
 #: templates/mailbox/header.inc:13
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
-msgstr "Editar Definição da Pasta Virtual %s"
+msgstr "Editar Definição da Pasta Virtual para %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Editar Lista Branca"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Editar sua lista negra"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Editar suas regras de filtro"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
-msgstr "Editar suas preferências ao acessar outras contas de e-mail."
+msgstr "Edita suas preferências ao acessar outras contas de e-mail."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Editar sua lista branca"
 
@@ -1279,153 +1402,187 @@
 msgid "Email Address"
 msgstr "Endereço de E-Mail"
 
-#: lib/Message.php:651
+#: lib/Message.php:677
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Todas mensagens de %s foram excluídas."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:653
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Todas as mensagens da Lixeira Virtual foram excluídas."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Esvaziar Pasta(s)"
 
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "Esvaziar Pasta(s) Selecionada(s)"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Esvaziar Lixeira"
 
-#: lib/IMP.php:886
+#: lib/IMP.php:923
+msgid "Empty _Spam"
+msgstr "Apagar S_pam"
+
+#: lib/IMP.php:916
 msgid "Empty _Trash"
 msgstr "Esvaziar _Lixeira"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Habilitar funcionalidade PGP?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Habilitar funcionalidade S/MIME?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Habilitar pré-visualização de mensagem?"
 
-#: templates/compose/compose.inc:437
+#: templates/compose/compose.inc:439
 msgid "Encr_yption Options"
 msgstr "Opções de _Criptografia"
 
-#: lib/MIME/Viewer/itip.php:475 lib/MIME/Viewer/itip.php:645
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Criptografado"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Final"
 
-#: lib/Compose.php:318
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Final da mensagem encaminhada"
 
-#: lib/Compose.php:259
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Final da mensagem"
 
-#: lib/Compose.php:257
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Final da mensagem de %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Forneça a senha"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Forneça o nome de sua nova pasta de spams"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
-msgstr "Forneça o nome de sua nova pasta \"Rascunhos\""
+msgstr "Forneça o nome de sua nova pasta de rascunhos"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
-msgstr "Forneça o nome de sua nova pasta \"Enviados\""
+msgstr "Forneça o nome de sua nova pasta de mensagens enviadas"
 
 #: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
-msgstr "Forneça o nome de sua nova pasta \"Lixeira\""
+msgstr "Forneça o nome de sua nova lixeira"
+
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "Toda a Mensagem"
 
-#: message.php:187 compose.php:1018
+#: message.php:194 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Registro \"%s\" foi adicionado ao catálogo de endereços com sucesso"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:361 lib/MIME/Viewer/pgp.php:390
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Erro"
 
-#: lib/MIME/Viewer/itip.php:278 lib/MIME/Viewer/itip.php:371
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Erro conectando ao servidor IMAP: %s: %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Erro ao enviar resposta: %s."
 
-#: lib/MIME/Viewer/itip.php:93
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Evento excluído com sucesso."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Cada 30 segundos"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Cada 5 minutos"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Cada meia hora"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Cada minuto"
 
-#: folders.php:416
+#: folders.php:438
 msgid "Expand"
 msgstr "Expandir"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Expandir Todas"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Expandir Todas Pastas"
 
-#: folders.php:416
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Expandir Pasta"
 
-#: templates/compose/compose.inc:335 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Expandir Nomes"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 "Expandir nomes na janela de composição automaticamente em segundo plano?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr ""
-"Expandir inteiramente a árvore de pastas por padrão na visualização de "
+"Expandir, por padrão, inteiramente a árvore de pastas na visualização de "
 "pastas?"
 
-#: templates/compose/compose.inc:159 templates/compose/compose.inc:209
-#: templates/compose/compose.inc:260 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Expandindo"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:934 lib/IMP.php:936
+msgid "F_etch Mail"
+msgstr "Trazer Mensagens"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Trazer Mensagens"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "Trazer mensagens em uma janela separada?"
 
@@ -1433,65 +1590,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Trazer mensagens ao conectar?"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:291
 #, php-format
-msgid "Fetched %d message(s) from %s"
+msgid "Fetched %d messages from %s"
 msgstr "%d mensagens trazidas de %s"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "1 mensagem trazida de %s"
+
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Trazer Mensagens: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Trazer Mensagens: sem mensagens novas."
 
-#: lib/IMP.php:901
+#: lib/IMP.php:940
 msgid "Fi_lters"
 msgstr "_Filtros"
 
-#: templates/compose/compose.inc:496 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:496 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Arquivo"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Opções de Filtro"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Configurações de Filtro"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Filtrar mensagem com conteúdo ofensivo?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "O suporte a filtros está desabilitado neste sistema."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtros"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filtros NÃO Ativos"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
-msgstr "Filtros: %s página de gerenciamento"
+msgstr "Filtros: página de gerenciamento de %s"
 
-#: templates/contacts/contacts.inc:182
+#: templates/contacts/contacts.inc:186
 msgid "Find"
-msgstr "Procurar"
+msgstr "Encontrar"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
-msgstr "Primeira Página da Caixa Postal"
+msgstr "Primeira Página da Pasta"
 
-#: mailbox.php:324
+#: mailbox.php:328
 msgid "First Page"
 msgstr "Primeira Página"
 
@@ -1499,90 +1661,78 @@
 msgid "Fo_rward"
 msgstr "Encamin_har"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Ações de Pastas - Confirmação"
+
+#: folders.php:289 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Navegador de Pastas"
 
-#: templates/login/login.inc:195
-msgid "Folder Prefix"
-msgstr "Prefixo da Pasta"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Resumo de Pastas"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "O compartilhamento de pastas não está habilitado."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "A utilização de pastas não está habilitada."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr ""
 "Formato da data das mensagens na visualização da caixa postal para mensagens "
 "datadas de hoje"
 
-#: compose.php:696 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: compose.php:681
+#: compose.php:805
 msgid "Forward:"
 msgstr "Encaminhar:"
 
-#: lib/Compose.php:287
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: lib/Compose.php:285
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Mensagem encaminhada de %s"
 
-#: lib/MIME/Viewer/itip.php:443
-msgid "Free/Busy Information"
-msgstr "Informação Livre/Ocupado"
-
-#: lib/MIME/Viewer/itip.php:454
-msgid "Free/Busy Reply"
-msgstr "Resposta Livre/Ocupado"
-
-#: lib/MIME/Viewer/itip.php:448
-msgid "Free/Busy Request"
-msgstr "Solicitação de Informação Livre/Ocupado"
-
-#: lib/MIME/Viewer/itip.php:365
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Resposta da Solicitação de Informação Livre/Ocupado"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
-msgstr "D_e"
+msgstr "_De"
 
-#: message.php:256 search.php:141 thread.php:73
-#: templates/contacts/contacts.inc:186 templates/compose/compose.inc:102
+#: message.php:273 thread.php:154 templates/compose/compose.inc:99
+#: lib/Search.php:589
 msgid "From"
 msgstr "De"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
-msgstr "Endereço do remetente"
+msgstr "Endereço do Remetente"
 
-#: compose.php:693 compose.php:697
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Enc:"
 
-#: compose.php:1173
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "Enc: "
 
-#: compose.php:1175
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Enc: %u Mensagens Encaminhadas"
@@ -1596,29 +1746,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Obter somente novas mensagens? (somente IMAP)"
 
-#: thread.php:65
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Ir"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Ir para a Mensagem"
 
-#: templates/acl/acl.inc:135
+#: lib/IMP.php:504
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Ir para o registro do catálogo de endereços de \"%s\""
+
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Conceder acesso"
 
-#: message.php:548 lib/Filter.php:102 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/html.php:114
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/pkcs7.php:404 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/pgp.php:176 lib/MIME/Viewer/status.php:123
-#: lib/MIME/Viewer/status.php:130
+#: message.php:549 lib/Filter.php:105 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "AQUI"
 
-#: lib/MIME/Viewer/html.php:115
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:251
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "Versão HTML da Mensagem"
 
@@ -1630,104 +1791,127 @@
 msgid "Here is the message you were composing:"
 msgstr "Aqui está a mensagem que você estava compondo:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Oculto"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Oculto na Visualização por Discussão"
 
-#: mailbox.php:346
+#: mailbox.php:350
 msgid "Hide Deleted"
 msgstr "Ocultar Excluídas"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Ocultar Não Inscritas"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Hide the Images"
-msgstr "Ocultar as Imagens"
-
-#: templates/compose/compose.inc:309
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Alta"
 
-#: message.php:290 mailbox.php:671 templates/mailbox/legend.inc:12
+#: message.php:307 mailbox.php:709 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Prioridade Alta"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Altíssima"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Como você deseja exibir anexos?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Como atribuir linhas citadas em uma resposta"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Auto Detectar Protocolos)"
 
-#: templates/login/login.inc:170 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "O Servidor IMAP fechou a conexão: o Servidor Respondeu: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP sobre SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP sobre SSL (certificado auto-assinado)"
 
-#: templates/login/login.inc:171
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP sobre SSL (auto-assinado)"
 
-#: templates/login/login.inc:169 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "O servidor IMAP fechou a conexão."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, sem TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "Servidores de Correio IMAP/POP3"
 
-#: folders.php:350
+#: lib/IMP.php:804
 msgid "INBOX"
 msgstr "Caixa de Entrada"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Se estiver utilizando SSL ou TLS, a extensão openssl do PHP deve estar "
+"carregada."
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Todas as mensagens na(s) pasta(s) serão perdidas!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorar Todas"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Imagem"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importar"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importar Chave"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Importar Par de Chaves"
 
-#: pgp.php:42
+#: templates/folders/actions.inc:27
+msgid "Import Messages"
+msgstr "Importar Mensagens"
+
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "Importar Chave PGP"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr "Importar Certificados Pessoais"
 
 #: templates/pgp/import_key.inc:14
@@ -1742,7 +1926,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Importar Certificados S/MIME Pessoais"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Importar Chave Pública"
 
@@ -1758,7 +1942,7 @@
 msgid "Import S/MIME Key"
 msgstr "Importar Chave S/MIME"
 
-#: templates/folders/actions.inc:25 templates/folders/import.inc:9
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "Importar Arquivo mbox"
 
@@ -1767,7 +1951,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Importar arquivo mbox %s para a pasta %s."
 
-#: message.php:494 mailbox.php:679 templates/message/navbar_navigate.inc:7
+#: message.php:505 mailbox.php:719 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1777,46 +1961,48 @@
 msgid "Important messages"
 msgstr "Mensagens importantes"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d mensagens importadas de %s."
 
-#: lib/MIME/Viewer/itip.php:760
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "Processando"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:86
+#: lib/Folder.php:211 lib/IMP.php:308 lib/IMAP/Tree.php:119
+#: lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Incluir um breve resumo do cabeçalho na resposta?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Incluir mensagem original na resposta?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Informação"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Informação sobre a Chave Pública %s"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Informação sobre Chave Privada Pessoal"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Informação sobre Chave Pública Pessoal"
 
 #: templates/compose/attachments.inc:15 templates/compose/compose.inc:501
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "Incorporado"
 
@@ -1836,32 +2022,32 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Insira a Chave Pública PGP Aqui"
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Ação inválida selecionada para este componente."
 
-#: mailbox.php:539 mailbox.php:580
+#: mailbox.php:570 mailbox.php:612
 msgid "Invalid Address"
 msgstr "Endereço Inválido"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Caixa Postal Remota inválida"
 
-#: compose.php:141
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Caracter inválido no endereço de e-mail: %s."
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "Chave inválida"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Chave Privada PGP Pessoal inválida."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Chave Pública PGP Pessoal inválida."
 
@@ -1869,47 +2055,74 @@
 msgid "Invert"
 msgstr "Inverter"
 
-#: templates/compose/compose.inc:571
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Tamanho da Chave"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+"A geração de chave deve levar muito tempo para terminar. Continuar com a "
+"geração de chave?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"A importação não está disponível. O envio de arquivos não está habilitado "
+"neste servidor."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"A importação não está disponível. Você não tem um catálogo de endereços "
+"definido para adicionar seus contatos."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
-msgstr "Chave enviada com sucesso para o servidor de chaves."
+msgstr "Chave enviada com sucesso para o servidor de chaves públicas."
 
-#: templates/login/login.inc:223
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Idioma"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
-msgstr "Última Página da Caixa Postal"
+msgstr "Última Página da Pasta"
 
-#: mailbox.php:337
+#: mailbox.php:341
 msgid "Last Page"
 msgstr "Última Página"
 
-#: templates/compose/compose.inc:384
-msgid "Li_nk Attachments"
-msgstr "Ane_xos Ligados"
+#: templates/compose/compose.inc:549
+msgid "Link Attachments?"
+msgstr "Criar links para Anexos?"
 
-#: attachment.php:34 lib/Compose.php:977
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
-msgstr "Anexos Ligados não são permitidos."
+msgstr "Links de anexos não são permitidos."
+
+#: lib/Compose.php:1100
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Os links expirarão em %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
 "Listar todos contatos quando carregar a tela de contatos? (se desabilitado, "
-"você verá somente contatos que você explicitamente procurar)"
+"você verá somente contatos que você explicitamente pesquisar)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Listando no Cabeçalho"
 
@@ -1917,11 +2130,11 @@
 msgid "Local Mailbox:"
 msgstr "Caixa Postal Local:"
 
-#: lib/MIME/Viewer/itip.php:662
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
-msgstr "Localização"
+msgstr "Região"
 
-#: templates/login/login.inc:231
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Conectar"
 
@@ -1938,27 +2151,27 @@
 msgid "Login Tasks"
 msgstr "Tarefas de Conexão"
 
-#: templates/compose/compose.inc:311
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr "Baixa"
 
-#: message.php:292 mailbox.php:674 templates/mailbox/legend.inc:13
+#: message.php:309 mailbox.php:712 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Prioridade Baixa"
 
-#: templates/compose/compose.inc:312
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Baixíssima"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Arquivo Macintosh"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Correio"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Pré-visualização de Mensagens"
 
@@ -1966,19 +2179,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Tipo de servidor de correio a conectar:"
 
-#: folders.php:368
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Caixa Postal"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Opções de Visualização de Caixa Postal e Pastas"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Marcar como Lidas Todas as Mensagens na Pasta"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Marcar como Não Lidas Todas as Mensagens na Pasta"
 
@@ -1986,7 +2199,7 @@
 msgid "Mark as:"
 msgstr "Marcar como:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Marcar diferentes níveis de citação com diferentes cores?"
 
@@ -1994,15 +2207,15 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Marcar mensagens como lidas? (somente IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Ressaltar marcador simples?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "Coincidir todas"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "Coincidir qualquer uma"
 
@@ -2010,114 +2223,102 @@
 msgid "Maximum Attachment Size"
 msgstr "Tamanho Máximo de Anexo"
 
-#: templates/compose/compose.inc:488
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Número Máximo de Pastas"
+
+#: templates/compose/compose.inc:489
 msgid "Maximum number of attachments reached."
 msgstr "Número máximo de anexos atingido."
 
-#: templates/compose/compose.inc:483
+#: templates/compose/compose.inc:485
 msgid "Maximum total attachment size reached."
 msgstr "Tamanho máximo de anexos atingido."
 
-#: lib/MIME/Viewer/itip.php:605
-msgid "Meeting Cancellation"
-msgstr "Cancelamento de Reunião"
-
-#: lib/MIME/Viewer/itip.php:533
-msgid "Meeting Information"
-msgstr "Informação da Reunião"
-
-#: lib/MIME/Viewer/itip.php:543
-msgid "Meeting Proposal"
-msgstr "Proposta de Reunião"
-
-#: lib/MIME/Viewer/itip.php:585
-msgid "Meeting Reply"
-msgstr "Resposta à Reunião"
-
-#: lib/MIME/Viewer/itip.php:555
-msgid "Meeting Update"
-msgstr "Atualização de Reunião"
-
-#: lib/MIME/Viewer/itip.php:560
-msgid "Meeting Update Request"
-msgstr "Solicitação de Atualização de Reunião"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Menu de Lista de Pastas"
 
-#: lib/Compose.php:234
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Mensagem"
 
-#: compose.php:498 compose.php:525 compose.php:558 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Composição de Mensagem"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Data da Mensagem"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Opções de Mensagem"
 
-#: search.php:349
+#: search.php:306
 msgid "Message Search"
-msgstr "Procurar Mensagens"
+msgstr "Pesquisar Mensagens"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Tamanho da Mensagem"
 
-#: message.php:377
+#: message.php:391
 msgid "Message Source"
 msgstr "Código Fonte da Mensagem"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Visualização da Mensagem"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Campos da Mensagem"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
-msgstr "Marcadores da Mensagem"
+msgstr "Marcadores da mensagem"
 
 #: templates/search/main.inc:83
 msgid "Message folders"
-msgstr "Pastas de Mensagem"
+msgstr "Pastas de mensagem"
 
-#: lib/Compose.php:232
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Mensagem de %s"
 
-#: templates/search/header.inc:33
+#: mailbox.php:653
+msgid "Message has attachments"
+msgstr "A mensagem tem anexos"
+
+#: mailbox.php:644
+msgid "Message is encrypted"
+msgstr "A mensagem está criptografada"
+
+#: mailbox.php:639
+msgid "Message is signed"
+msgstr "A mensagem está assinada"
+
+#: templates/search/header.inc:36
 msgid "Message matches"
-msgstr "Coincidir mensagem"
+msgstr "Mensagem corresponde"
 
-#: compose.php:740 compose.php:750
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Mensagem redirecionada com sucesso."
 
-#: compose.php:983
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Mensagem enviada com sucesso, mas não foi salva em %s"
 
-#: compose.php:1027 compose.php:1042
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Mensagem enviada com sucesso."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Mensagens por página na visualização da caixa postal."
 
-#: mailbox.php:301
+#: mailbox.php:308
 msgid "Messages to"
 msgstr "Mensagens para"
 
@@ -2127,8 +2328,8 @@
 
 #: templates/compose/expand.inc:12
 #, php-format
-msgid "More than one address found for field '%s'."
-msgstr "Mais de um endereço encontrado por campo '%s'."
+msgid "More than one address found for field \"%s\"."
+msgstr "Mais de um endereço encontrado no campo '%s'."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
@@ -2138,45 +2339,57 @@
 msgid "Move down"
 msgstr "Abaixo"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"Mover spams para a pasta spam e mensagens inocentes para a Caixa de Entrada"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
-msgstr "Mover para pasta"
+msgstr "Mover para a pasta"
 
 #: templates/prefs/sourceselect.inc:314
 msgid "Move up"
 msgstr "Acima"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Visualização de Múltiplas Mensagens"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "NENHUM"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "NOTA"
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:674
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Nome"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
-msgstr "Nome e/ou e-mail não pode estar vazio"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
+msgstr "Nome e/ou e-mail não pode ser vazio"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Necessita de Ação"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Nunca"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Nunca salvar anexos"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Nova"
 
@@ -2184,15 +2397,25 @@
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nova Mensagem"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Nova Mensagem"
+
+#: mailbox.php:761 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Nova Mensagem para %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Novas mensagens"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Próxima"
 
@@ -2200,15 +2423,16 @@
 msgid "Next Message"
 msgstr "Próxima Mensagem"
 
-#: mailbox.php:335
+#: mailbox.php:339
 msgid "Next Page"
 msgstr "Próxima Página"
 
-#: templates/compose/compose.inc:536 config/prefs.php.dist:948
+#: templates/compose/compose.inc:540 templates/compose/compose.inc:553
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr "Não"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Nenhum Certificado encontrado"
 
@@ -2216,101 +2440,126 @@
 msgid "No Encryption"
 msgstr "Sem Criptografia"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Sem Chaves no Chaveiro"
 
-#: mailbox.php:354
+#: mailbox.php:358
 #, php-format
 msgid "No Messages"
 msgstr "Sem Mensagens"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Nenhuma chave pública PGP importada."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Nenhum Certificado Pessoal Presente"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:319
+msgid "No Preview Text"
+msgstr "Sem Pré-visualização de Texto"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Nenhuma Chave Pública Encontrada"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Nenhuma chave pública S/MIME importada."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Nenhum anexo encontrado."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Nenhum e-mail encontrado na chave pública."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Nenhuma pasta selecionada."
 
-#: lib/Block/summary.php:131
+#: lib/Block/summary.php:146
 msgid "No folders are being checked for new mail."
-msgstr "Nenhuma pasta está sendo verificada a procura de novas mensagens."
+msgstr "Novas mensagens não estão sendo verificadas em nenhuma pasta."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:201 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Nenhuma pasta foi especificada"
 
-#: lib/Block/summary.php:137
+#: lib/Block/summary.php:152
 msgid "No folders with new messages"
 msgstr "Nenhuma pasta com novas mensagens"
 
-#: lib/Block/summary.php:134
+#: lib/Block/summary.php:149
 msgid "No folders with unseen messages"
 msgstr "Nenhuma pasta com mensagens não lidas"
 
-#: lib/Compose.php:228
+#: lib/Compose.php:336
 msgid "No message body text"
-msgstr "Nenhum texto de corpo de mensagem"
+msgstr "Nenhum texto no corpo da mensagem"
+
+#: lib/IMAP/Client.php:569
+msgid "No message returned."
+msgstr "Nenhuma mensagem retornada."
 
-#: lib/Mailbox.php:1134
+#: lib/Mailbox.php:362
 msgid "No messages matched your search."
-msgstr "Nenhuma mensagem correspondeu sua procura."
+msgstr "Nenhuma mensagem correspondeu a sua pesquisa."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Nenhuma chave privada PGP pessoal foi importada."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Nenhuma chave pública PGP pessoa foi importada."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Nenhum certificado S/MIME pessoal foi importado."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Não existe uma chave pessoal privada, devido a isso a mensagem não pode ser "
+"descriptografada."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Nenhum programa de verificação de ortografia foi configurado."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Nenhum erro de ortografia"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Sem sugestões"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:561
+msgid "No supported IMAP authentication method could be found."
+msgstr "Nenhum suporte a métodos de autenticação IMAP foi encontrado."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Nenhum usuário especificado."
 
-#: lib/MIME/Viewer/itip.php:695
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Sem Participantes"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 lib/MIME/Viewer/itip.php:652
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Nenhuma"
 
-#: templates/compose/compose.inc:310
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normal"
 
@@ -2332,8 +2581,7 @@
 msgid "Not Personal"
 msgstr "Não Pessoal"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
-#: lib/Crypt/SMIME.php:166
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Não é uma chave pública válida."
 
@@ -2345,28 +2593,35 @@
 msgid "Not important messages"
 msgstr "Mensagens não importantes"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr "Note que isto pode levar algum tempo"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Nada"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Notificação: Anexo baixado"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
-"Número de meses para manter anexos ligados antigos se estiver excluindo "
+"Número de meses para manter links de anexos antigos se estiver excluindo "
 "mensalmente."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
-"Número de pastas \"Enviados\" antigas a manter se estiver excluindo "
+"Número de pastas antigas de mensagens enviadas a manter se estiver excluindo "
 "mensalmente."
 
-#: templates/contacts/contacts.inc:251 lib/MIME/Viewer/itip.php:510
-#: lib/MIME/Viewer/itip.php:720
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "OU"
@@ -2375,47 +2630,47 @@
 msgid "Old messages"
 msgstr "Mensagens antigas"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
-msgstr "Pastas \"Enviados\" antigas estão sendo excluídas."
+msgstr "As pastas antigas de mensagens enviadas estão sendo excluídas."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Exibir somente pastas com mensagens não lidas?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Somente uma pasta deve ser selecionada para esta ação."
 
-#: templates/menu.inc:26 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "_Abrir Pasta"
-
-#: templates/menu.inc:17 templates/menu.inc:20
-msgid "Open Folder"
-msgstr "Abrir Pasta"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "Abrir _Pasta"
 
-#: folders.php:385
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Pasta Aberta"
 
-#: lib/MIME/Viewer/itip.php:691
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
-msgstr "Participante Opcional"
+msgstr "Participação Opcional"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Outras Contas de Correio"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Outras Opções"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:294
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Servidor de Envio"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2423,19 +2678,15 @@
 msgid "PGP Encrypt Message"
 msgstr "Mensagem Criptografada com PGP"
 
-#: compose.php:351
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "Erro do PGP: "
 
-#: compose.php:330
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "Erro do PGP: Senha necessária para a chave privada pessoal."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP NÃO Ativo"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "Opções de PGP"
 
@@ -2443,25 +2694,25 @@
 msgid "PGP Passphrase Input"
 msgstr "Entrada da Senha do PGP"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Suporte a Par de Chaves PGP Pessoais requer uma conexão web segura."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Texto da Chave Pública PGP"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr "Chave Pública PGP para \"%s (%s)\" foi adicionada com sucesso."
+msgstr "Chave Pública PGP de \"%s (%s)\" foi adicionada com sucesso."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr "Chave Pública PGP para \"%s\" foi excluída com sucesso."
+msgstr "Chave Pública PGP de \"%s\" foi excluída com sucesso."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Chaveiro Público PGP"
 
@@ -2473,19 +2724,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Mensagem Assinada/Criptografada com PGP"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Chave privada PGP adicionada com sucesso."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
-msgstr "Chave pública PGP adicionada com PGP."
+msgstr "Chave pública PGP adicionada com sucesso."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Suporte a PGP está desabilitado neste sistema."
 
-#: lib/MIME/Viewer/pgp.php:212
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2493,57 +2744,57 @@
 "Suporte a PGP não está atualmente ativo, sendo assim não é possível "
 "verificar a assinatura digital."
 
-#: lib/MIME/Viewer/pgp.php:299
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "Suporte a PGP não está atualmente ativo, sendo assim não é possível "
 "descriptografar a mensagem."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
-"Suporte a PGP requer que janelas pop-up sejam utilizadas. Se seu navegador "
+"Suporte a PGP requer que janelas pop-up sejam utilizadas.  Se seu navegador "
 "está atualmente configurado para bloquear pop-ups, você deve alterar esta "
-"configuração ou as funções PGP não funcionarão corretamente"
+"configuração ou as funções PGP não funcionarão corretamente."
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Auto Detectar Protocolos)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 sobre SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 sobre SSL (certificado auto-assinado)"
 
-#: templates/login/login.inc:173
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 sobre SSL (auto-assinado)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, sem TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Página com as Mensagens Não Lidas Primeiro"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Página com as Mensagens Não Lidas por Último"
 
@@ -2551,32 +2802,32 @@
 msgid "Part(s)"
 msgstr "Parte(s)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Senha"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
-msgstr "Senha (novamente)"
+msgstr "Senha (Novamente)"
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "Senha descarregada com sucesso."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Senha:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
-msgstr "Senha não pode estar em branco"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "As senhas não podem estar em branco"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
-msgstr "Senhas não coincidem"
+msgstr "As senhas não coincidem"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:217
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Senha"
 
@@ -2584,11 +2835,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Executar operações de manutenção ao conectar?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "As permissões para este usuário não podem ser alteradas."
 
-#: message.php:485 mailbox.php:650 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:688 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Pessoal"
@@ -2597,39 +2848,49 @@
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Par de Chaves PGP Pessoal gerada com sucesso."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Chaves PGP Pessoais excluídas com sucesso."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Certificados S/MIME Pessoais NÃO foram importados: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Chaves S/MIME Pessoais excluídas com sucesso."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Inserir sua assinatura antes de respostas e encaminhamentos?"
 
-#: compose.php:249
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Versão da Mensagem em Texto Puro"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Emitir aviso sonoro ao receber nova mensagem? Isto requer que seu navegador "
+"suporte arquivos de sons embutidos. Quase todos suportam em Windows e Mac, "
+"mas outras plataformas necessitaram de um plugin."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Por favor forneça um nome para a nova pasta:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Por favor forneça o nome para a nova pasta:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Por favor forneça o novo nome:"
 
@@ -2651,7 +2912,7 @@
 "Por favor forneça a senha para sua chave privada S/MIME. Você somente "
 "precisará fornecer esta senha uma vez por sessão %s."
 
-#: recompose.php:88
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2664,60 +2925,43 @@
 "prevenir que hackers detenham o ID de sua sessão. Nos desculpamos por "
 "qualquer inconveniência."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Por favor forneça sua senha."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Por favor forneça seu usuário."
 
-#: compose.php:79 lib/IMP.php:514
+#: compose.php:106 lib/IMP.php:465
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Por favor corrija endereços inválidos ou ambíguos."
 
-#: lib/MIME/Viewer/itip.php:632
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Por favor reveja a seguinte informação, e então selecione uma ação a partir "
-"do menu abaixo."
-
-#: templates/folders/javascript.inc:56
-msgid "Please select a folder before you perform any actions."
-msgstr "Por favor selecione a pasta antes de executar qualquer ação."
-
-#: lib/MIME/Viewer/itip.php:462
-msgid "Please select an action from the menu below."
-msgstr "Por favor selecione uma ação a partir do menu acima."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Por favor selecione uma pasta antes de realizar esta ação."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
-msgstr "Por favor selecione pelo menos uma pasta para procurar."
+msgstr "Por favor selecione pelo menos uma pasta para pesquisar."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Por favor selecione somente uma pasta para esta operação."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Por favor selecione ou edite na caixa à direita:"
 
-#: templates/compose/compose.inc:131 templates/compose/compose.inc:181
-#: templates/compose/compose.inc:232
-msgid "Please select or edit right next:"
-msgstr "Por favor selecione ou edite o seguinte:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Preceder sua assinatura com traços ('--')?"
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Preferências atualizadas com sucesso."
 
@@ -2729,11 +2973,11 @@
 msgid "Previous Message"
 msgstr "Mensagem Anterior"
 
-#: mailbox.php:326
+#: mailbox.php:330
 msgid "Previous Page"
 msgstr "Página Anterior"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Imprimir"
 
@@ -2741,15 +2985,15 @@
 msgid "Priority"
 msgstr "Prioridade"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Senha da Chave Privada"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Perguntar sempre que um anexo é enviado; padrão é NÃO"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Perguntar sempre que um anexo é enviado; padrão é SIM"
 
@@ -2757,77 +3001,76 @@
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: lib/Crypt/PGP.php:451
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Suporte a servidores de chave pública está desabilitado."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Esva_ziar Lixeira"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Esvaziar Lixeira"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Esvaziar Pasta(s)"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Freqüência para esvaziar Lixeira:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Excluir mensagens da Lixeira mais antigas que esta quantidade de dias."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Excluir mensagens antigas na Lixeira?"
 
-#: lib/Maintenance/Task/purge_trash.php:63
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
+msgid "Purging %d messages from Trash folder."
 msgstr "Excluindo %d mensagem(ns) da Lixeira."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Inserir isto após @ quando enviar uma mensagem e expansão padrão de endereço:"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "Excluindo 1 mensagem da Lixeira."
 
 #: templates/quota/quota.inc:17
 #, php-format
 msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
-msgstr "Estado da Quota: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Situação da Quota: %.2fMB / %.2fMB  (%.2f%%)"
 
 #: templates/quota/quota.inc:21
 #, php-format
 msgid "Quota status: %.2fMB / NO LIMIT"
-msgstr "Estado da Quota: %.2fMB / SEM LIMITE"
+msgstr "Situação da Quota: %.2fMB / SEM LIMITE"
 
 #: templates/quota/quota.inc:24
 #, php-format
 msgid "Quota status: NO LIMIT"
-msgstr "Estado da Quota: SEM LIMITE"
+msgstr "Situação da Quota: SEM LIMITE"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
-msgid "Quoting %%f:"
-msgstr "Citando %%f:"
+msgid "Quoting %f:"
+msgstr "Citando %f:"
 
-#: templates/compose/compose.inc:381
-msgid "Re_quest Delivery Confirmation"
-msgstr "Solicitar Confirmação de _Entrega"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Reconstruir a Árvore de Pastas"
 
-#: search.php:165
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Recebido Em"
 
-#: search.php:173
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Recebido Desde"
 
-#: search.php:169
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Recebido Até"
 
@@ -2839,27 +3082,23 @@
 msgid "Redirect"
 msgstr "Redirecionar"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Redirecionar Mensagem"
 
-#: compose.php:703
+#: compose.php:827
 msgid "Redirect this message"
-msgstr "Redirecionar esta Mensagem"
+msgstr "Redirecionar esta mensagem"
 
-#: compose.php:759
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Redirecionamento falhou."
 
-#: templates/compose/compose.inc:577
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Atualizar Visualização de Pastas:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "Atualizar"
 
@@ -2867,35 +3106,35 @@
 msgid "Reload View"
 msgstr "Atualizar Visualização"
 
-#: lib/MIME/Viewer/itip.php:484 lib/MIME/Viewer/itip.php:503
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Lembrar a informação livre/ocupado."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Lembrar a última visualização"
 
 #: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
-msgstr "Caixa Posta Remota:"
+msgstr "Caixa Postal Remota:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
-msgstr "Excluir Campo da Procura"
+msgstr "Remover Campo da Pesquisa"
 
 #: templates/prefs/sourceselect.inc:305
 msgid "Remove source"
-msgstr "Excluir origem"
+msgstr "Remover origem"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Renomear Pasta(s)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Renomear \"Enviados\" no início do mês?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:458
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Falha ao renomear \"%s\" para \"%s\". Isto é o que o servidor disse"
@@ -2904,7 +3143,7 @@
 msgid "Repl_y to List"
 msgstr "Responder para Lista de Disc_ussão"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Substituir por:"
 
@@ -2912,7 +3151,7 @@
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/MIME/Viewer/itip.php:280 lib/MIME/Viewer/itip.php:373
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Resposta Enviada."
 
@@ -2920,7 +3159,7 @@
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: compose.php:650
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Responder a Todos:"
 
@@ -2928,7 +3167,7 @@
 msgid "Reply to List"
 msgstr "Responder para a Lista de Discussão"
 
-#: compose.php:652
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Responder para a Lista de Discussão:"
 
@@ -2936,107 +3175,101 @@
 msgid "Reply to _All"
 msgstr "Responder a Todos"
 
-#: lib/MIME/Viewer/itip.php:486 lib/MIME/Viewer/itip.php:495
-#: lib/MIME/Viewer/itip.php:505
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Responder com Mensagem Não Suportada"
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Responder com informação livre/ocupado durante 2 meses."
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Responder com solicitação de informação livre/ocupado."
 
-#: message.php:260
+#: message.php:277
 msgid "Reply-To"
-msgstr "Endereço para Resposta (Reply-To)"
+msgstr "Reply-To"
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Endereço para Resposta (Reply-To): "
 
-#: compose.php:648
+#: compose.php:769
 msgid "Reply:"
 msgstr "Responder:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Reportar como Inocente"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Reportar como Spam"
 
-#: templates/compose/compose.inc:378
+#: templates/compose/compose.inc:386
 msgid "Request a _Read Receipt"
 msgstr "Solicitar Confirmação de _Leitura"
 
-#: config/prefs.php.dist:587
-msgid "Request delivery confirmation?"
-msgstr "Solicitar confirmação de entrega?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Solicitar confirmação de leitura?"
 
 #: mailbox.php:187
 msgid "Requested message not found."
-msgstr "Mensagem solicitada não encontrada."
+msgstr "A mensagem solicitada não foi encontrada."
 
-#: lib/MIME/Viewer/itip.php:683
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Participante Obrigatório"
 
-#: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:138 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Limpar"
 
-#: lib/MIME/Viewer/itip.php:107
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
-msgstr "Resposta de Estado Atualizada."
+msgstr "Situação de Resposta Atualizada."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Continuar"
 
-#: recompose.php:89
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Continuar sua sessão"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Retornar para \"Composição de Mensagem\""
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
-#: templates/fetchmail/account_select.inc:32
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
-msgstr "Retornar a Trazer Mensagem"
-
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Retornar à Tela Principal de Preferências"
+msgstr "Retornar para Trazer Mensagem"
 
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Retornar à Opções"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Retornar à Tela Anterior"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Retornar à listagem da caixa postal após excluir, mover ou copiar uma "
 "mensagem?"
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
-msgstr "Regra"
+msgstr "Função"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:223
-#: lib/MIME/Viewer/pkcs7.php:405
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3044,44 +3277,40 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Mensagem Criptografada com S/MIME"
 
-#: compose.php:387
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "Erro do S/MIME: "
 
-#: compose.php:366
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "Erro do S/MIME: Senha necessária para a chave privada pessoal."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME NÃO Ativo"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "Opções do S/MIME"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "Entrada da Senha S/MIME"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "Suporte a Par de Chaves S/MIME Pessoais requer uma conexão web segura."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Chave Pública S/MIME de \"%s\" foi excluída com sucesso."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Chave Pública S/MIME adicionada com sucesso."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
-msgstr "Chaveiro Públic S/MIME"
+msgstr "Chaveiro Público S/MIME"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Par de Chaves Pública/Privada S/MIME adicionado com sucesso."
 
@@ -3093,11 +3322,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Mensagem Assinada/Criptografada com S/MIME"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Suporte a S/MIME está desabilitado neste sistema."
 
-#: lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3105,7 +3334,15 @@
 "Suporte a S/MIME não está atualmente habilitado, sendo assim não é possível "
 "descriptografar a mensagem."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message cannot "
+"be displayed."
+msgstr ""
+"O suporte S/MIME não está habilitado por isso o conteúdo desta mensagem não "
+"pode ser exibida."
+
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3113,92 +3350,110 @@
 "Suporte a S/MIME não está atualmente habilitado, sendo assim não é possível "
 "verificar a assinatura digital."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
-"S/MIME support requires popup windows to be used. If your browser is "
+"S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
-"Suporte a S/MIME requer que janelas pop-up sejam utilizadas. Se seu "
-"navegador está atualmente configurado para bloquear pop-ups, você deve "
-"alterar esta configuração ou as funções S/MIME não funcionarão corretamente"
+"O suporte S/MIME requer que janelas pop-up seja utilizadas.  Se seu "
+"navegador está atualmente configurado para desabilitar janelas pop-up, você "
+"deve alterar esta configuração ou as funções S/MIME não funcionarão "
+"corretamente."
+
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
 
-#: templates/compose/compose.inc:270
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
-msgstr "_Assunto"
+msgstr "A_ssunto"
 
-#: templates/compose/compose.inc:358
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
-msgstr "_Salvar uma cópia em "
+msgstr "Sal_var uma cópia em "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Salvar como"
 
-#: search.php:353 templates/fetchmail/manage.inc:67
+#: search.php:308 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Salvar"
 
-#: templates/compose/compose.inc:532
+#: templates/compose/compose.inc:536
 msgid "Save Attachments with message in sent-mail folder?"
-msgstr "Salvar anexos com a mensagem em \"Enviados\"?"
+msgstr "Salvar anexos com a mensagem na pasta de mensagens enviadas?"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save Draft"
 msgstr "Salvar Rascunho"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Salvar como"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Salvar Imagem na Galeria"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Salvar Opções"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Salvar Papel de Carta"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
 msgid "Save _Draft"
-msgstr "Salvar _Rascunho"
+msgstr "Salvar Rascun_ho"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Salvar como"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Salvar rascunhos como não lidos?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr ""
 "Salvar automaticamente destinatários no seu catálogo de endereços padrão?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:122
 msgid "Save search as a virtual folder?"
-msgstr "Salvar procura como uma pasta virtual?"
+msgstr "Salvar pesquisa como uma pasta virtual?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Salvar enviados?"
 
-#: compose.php:1112
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Falha ao salvar rascunho. Isto é o que o servidor disse: %s"
 
-#: templates/contacts/contacts.inc:196 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
 msgid "Search"
-msgstr "Procurar"
+msgstr "Pesquisar"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
-msgstr "Procurar %s"
+msgstr "Pesquisar %s"
 
-#: lib/Block/tree_folders.php:170
-msgid "Search Mail"
-msgstr "Procurar Mensagens"
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Opções de Pesquisa"
 
-#: search.php:306
+#: search.php:263
 msgid "Search Results"
-msgstr "Resultados da Procura"
+msgstr "Resultados da Pesquisa"
 
 #: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
@@ -3212,7 +3467,7 @@
 msgid "Select Another Account"
 msgstr "Selecionar Outra Conta"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "Selecione uma data"
 
@@ -3220,10 +3475,14 @@
 msgid "Select a field"
 msgstr "Selecione um campo"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+msgid "Select a stationery:"
+msgstr "Selecione um papel de carta:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
-"Selecione um catálogo de endereços para adicionar e procurar endereços."
+"Selecione um catálogo de endereços para adicionar e pesquisar endereços."
 
 #: templates/search/main.inc:88
 msgid "Select all"
@@ -3239,7 +3498,11 @@
 
 #: templates/search/main.inc:89
 msgid "Select none"
-msgstr "Anular seleção"
+msgstr "Não selecionar nenhum"
+
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Selecionar a galeria onde salvar a imagem."
 
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
@@ -3247,34 +3510,38 @@
 
 #: templates/prefs/sourceselect.inc:309
 msgid "Selected Address books:"
-msgstr "Selecione o Catálogo de Endereços:"
+msgstr "Catálogos de Endereços Selecionados:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
-msgstr "Selecione o servidor de Chaves Públicas"
+msgstr "Enviar chave para o servidor de chaves públicas"
 
-#: lib/MIME/Viewer/itip.php:561
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Enviar Últimas Informações"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Enviar NDM quando solicitado pelo remetente?"
-
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Send Message"
 msgstr "Enviar Mensagem"
 
-#: folders.php:363
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Enviar a mensagem sem um Assunto?"
+
+#: config/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "Enviar NDM quando solicitado pelo remetente?"
+
+#: folders.php:378
 msgid "Sent mail folder"
-msgstr "Enviados"
+msgstr "Pasta Enviados"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
-msgstr "Enviados:"
+msgstr "Pasta Enviados:"
 
-#: templates/login/login.inc:134 templates/login/login.inc:148
-#: templates/login/login.inc:155
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Servidor"
 
@@ -3289,9 +3556,9 @@
 #: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
-"Ajusta preferências sobre o que acontece quando você move e exclui mensagens."
+"Define preferências sobre o que acontece quando você move e exclui mensagens."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Inserir o cabeçalho X-Priority ao compor mensagens?"
 
@@ -3301,30 +3568,30 @@
 
 #: templates/acl/acl.inc:86
 msgid "Share mail folders"
-msgstr "Pastas de correio compartilhadas"
+msgstr "Compartilhar pastas"
 
 #: config/prefs.php.dist:32
 msgid "Share your mail folders with other users."
 msgstr "Compartilha suas pastas de correio com outros usuários."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
 "Blocos grandes de texto citado devem ser exibidos ou ocultados por padrão? "
-"Isto pode ser alterado sempre que quiser."
+"Isto pode ser alterado facilmente sempre que quiser."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
 "O corpo das mensagens texto puro deve ser examinado a procura de dados PGP?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "A janela de composição deve ser fechada após salvar um rascunho?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Por padrão deve-se anexar sua chave pública PGP em suas mensagens?"
 
@@ -3336,7 +3603,7 @@
 msgid "Show All Headers"
 msgstr "Exibir Todos os Cabeçalhos"
 
-#: mailbox.php:344
+#: mailbox.php:348
 msgid "Show Deleted"
 msgstr "Exibir Excluídas"
 
@@ -3352,54 +3619,50 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Exibir Somente Pastas Inscritas"
 
-#: folders.php:254
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Exibir Não Inscritas"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Exibir um ícone para permitir remover anexos de mensagens?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "Exibir legenda na visualização da caixa postal?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Exibir pré-visualização somente de mensagens não lidas?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
-msgstr "Exibir pré-visualização nas dicas?"
+msgstr "Exibir pré-visualização nos balões de dicas?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Exibir o ícone Trazer Mensagens na barra de menu?"
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Exibir as Imagens"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Exibir o ícone de filtros na barra de menu?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Exibir o número total de mensagens na pasta?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Exibidas"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "Ta_manho"
 
-#: templates/login/login.inc:237
-msgid "Sign up if not registered"
-msgstr "Assinar não for registrado"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Assinada"
@@ -3408,150 +3671,184 @@
 msgid "Size"
 msgstr "Tamanho"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Ordenar a Direção"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Ordenar em Ordem de Chegada"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "Ordenar por Data"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Ordenar por Endereço de Remetente"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
-msgstr "Ordenar por Tamanho de Mensagem"
+msgstr "Ordenar por Tamanho da Mensagem"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Ordenar por Assunto"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Ordenar por Discussão"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Ordenar por Endereço de Destinatário"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Pasta de Spam:"
 
-#: templates/compose/compose.inc:341
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Caracteres Especiais"
 
-#: templates/compose/compose.inc:338
+#: search.php:142
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Pastas Especiais Virtuais não podem ser editadas."
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Verificar Ortografia"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Verificação Ortográfica"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Verificação ortográfica completa"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Número de erros de ortografia por tela durante a verificação."
 
-#: lib/MIME/Viewer/itip.php:470 lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Iniciar"
 
-#: lib/MIME/Viewer/itip.php:674
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr "Papel de Carta"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Nome do papel de carta:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Tipo de papel de carta:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Papel de Carta:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
-msgstr "Estado"
+msgstr "Situação"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Remover Anexo"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Remover quebras de linha?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "_Assunto"
 
-#: message.php:261 search.php:157 templates/compose/recompose.inc:25
+#: message.php:278 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Assunto"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Campo Assunto"
 
-#: search.php:355 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:310 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Enviar"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Inscrever-se à(s) Pasta(s)"
 
-#: lib/MIME/Viewer/pkcs7.php:364 lib/MIME/Viewer/pgp.php:393
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Sucesso"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Sugestões"
 
-#: lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Resumo"
 
-#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
+#: templates/compose/compose.inc:397 templates/compose/compose.inc:400
 msgid "Switch Composition Method"
 msgstr "Trocar o Método de Composição"
 
-#: templates/compose/compose.inc:399
+#: templates/compose/compose.inc:401
 msgid "Switch to HTML composition"
 msgstr "Trocar para o editor HTML"
 
-#: templates/compose/compose.inc:399
+#: templates/compose/compose.inc:401
 msgid "Switch to plain text composition"
 msgstr "Trocar para o editor de texto puro"
 
-#: templates/compose/compose.inc:414
+#: templates/compose/compose.inc:416
 msgid "Te_xt"
 msgstr "Te_xto"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr "Provisório: "
+
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Aceitar solicitação provisoriamente"
 
-#: lib/MIME/Viewer/itip.php:748
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
-msgstr "Aceito provisoriamente"
+msgstr "Aceito Provisoriamente"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Arquivo de Termos do Serviço não especificado em conf.php"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Te_xto"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "A coluna De: na mensagem deve ser ligada a:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:530
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"O servidor IMAP parece não suportar o método de autenticação selecionado. "
+"Por favor entre em contato com o administrador do sistema."
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Fork de recursos Macintosh"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Fork de recursos Macintosh pode ser baixado %s."
@@ -3566,15 +3863,14 @@
 msgid "The account \"%s\" has been saved."
 msgstr "A conta \"%s\" foi salva."
 
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "O endereço \"%s\" foi adicionado a %s."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "O anexo não foi encontrado."
 
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr "O dado da agenda é inválido"
+
 #: templates/javascript/open_compose_win.js:37
 msgid ""
 "The compose window can't be opened. Perhaps you have set your browser to "
@@ -3583,40 +3879,40 @@
 "A janela de composição não pode ser aberta. Talvez você tenha configurado "
 "seu navegador para bloquear pop-ups?"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
-msgstr "O conteúdo do arquivo Macintosh está acima."
+msgstr "O conteúdo do arquivo Macintosh está abaixo."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "A(s) pasta(s) \"%s\" atual(ias) será(ão) renomeada(s) para \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr "A lista atual de usuários com acesso a esta pasta não pôde ser obtida"
 
-#: compose.php:1121
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "O rascunho foi salvo na pasta \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
-msgstr "O evento foi adicionado em seu calendário."
+msgstr "O evento foi adicionado em sua agenda."
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
+msgid "The field \"%s\" can't be expanded."
 msgstr "O campo \"%s\" não pode ser expandido."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:332
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "A pasta \"%s\" já existe"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:162
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3625,46 +3921,54 @@
 "A pasta \"%s\" contem caracteres ilegais em seu nome. Isto pode causar "
 "problemas. Por favor entre em contato com o administrador do sistema."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:351
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "A pasta \"%s\" foi criada mas você não foi inscrito nela."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:269
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "A pasta \"%s\" foi excluída mas você não foi inscrito nela."
+msgstr "A pasta \"%s\" foi excluída mas você não se desinscreveu dela."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:338
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "A pasta \"%s\" foi criada. Isto é o que o servidor disse"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:262
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "A pasta \"%s\" não foi excluída. Isto é o que o servidor disse"
+
+#: lib/Folder.php:354
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "A pasta \"%s\" foi criada com sucesso."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "A pasta \"%s\" foi excluída com sucesso."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:456
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "A pasta \"%s\" foi renomeada para \"%s\" com sucesso."
 
-#: lib/Folder.php:373
-#, php-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "A pasta '%s' não foi excluída. Isto é o que o servidor disse"
-
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Os seguintes arquivos foram anexados a esta parte:"
 
-#: lib/MIME/Viewer/html.php:93
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"A janela de composição não pode ser aberta. Talvez você tenha configurado "
+"seu navegador para bloquear pop-ups?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3672,24 +3976,24 @@
 "As imagens serão exibidas porque o remetente está presente em seu catálogo "
 "de endereços."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "O servidor de correio gerou a seguinte mensagem de erro:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "O servidor de correio gerou a seguinte mensagem informativa:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "O servidor de correio gerou a seguinte mensagem:"
 
-#: lib/Message.php:645
+#: lib/Message.php:671
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "A caixa postal %s já está vazia."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3700,7 +4004,11 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "A mensagem sendo composta foi fechada. Saindo."
 
-#: message.php:143
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "A mensagem não possui um Assunto."
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "A mensagem foi excluída."
 
@@ -3708,7 +4016,7 @@
 msgid "The message has been verified."
 msgstr "A mensagem foi verificada."
 
-#: lib/MIME/Viewer/pkcs7.php:368
+#: lib/MIME/Viewer/pkcs7.php:389
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "A mensagem foi verificada. Remetente: %s."
@@ -3721,20 +4029,20 @@
 "A janela de senha não foi aberta. Talvez você tenha configurado seu "
 "navegador para bloquear pop-ups?"
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "O texto puro da Chave Pública PGP pode ser visualizada %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "O arquivo solicitado não existe no anexo MS-TNEF."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "O arquivo solicitado não existe no anexo Zip."
 
-#: message.php:549
+#: message.php:550
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3745,11 +4053,15 @@
 "Mensagem de você quando tiver lido esta mensagem. Por favor clique em %s "
 "para enviar a mensagem de notificação."
 
-#: templates/compose/compose.js:104
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "O servidor não conseguiu criar uma miniatura desta imagem."
+
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "A assinatura não pôde ser substituída."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "A assinatura foi substituída com sucesso."
 
@@ -3757,42 +4069,57 @@
 msgid "The specified file does not exist."
 msgstr "O arquivo especificado não existe."
 
-#: lib/MIME/Viewer/itip.php:160
+#: stationery.php:84
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "O papel de carta \"%s\" foi adicionado."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "O papel de carta \"%s\" foi excluído."
+
+#: stationery.php:87
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "O papel de carta \"%s\" foi atualizado."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "A tarefa foi adicionada a sua lista de tarefas."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "O texto da mensagem"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "O texto da mensagem pode ser visualizado %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "O texto da mensagem de retorno"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "O texto da mensagem de retorno pode ser visualizado %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "O texto da mensagem enviada"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "O texto da mensagem enviada pode ser visualizado %s."
 
-#: lib/MIME/Viewer/itip.php:145
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "A informação livre/ocupado do usuário foi armazenada com sucesso."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "Não existem partes alternativas que podem ser exibidas incorporadas."
 
@@ -3800,22 +4127,16 @@
 msgid "There are no messages in this mailbox."
 msgstr "Não existem mensagens nesta caixa postal."
 
-#: lib/Message.php:604
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Houve um problema ao esvaziar %s. Isto foi o que o servidor disse"
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr "Não existem partes alternativas que podem ser exibidas incorporadas."
 
-#: lib/Message.php:647
+#: lib/Message.php:673
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Houve um problema ao esvaziar a caixa postal. O servidor disse: %s"
 
-#: lib/Message.php:613
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-"Houve um problema ao esvaziar a caixa postal. Isto foi o que o servidor disse"
-
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3824,7 +4145,7 @@
 "Houve um erro ao copiar mensagens de \"%s\" para \"%s\". Isto é o que o "
 "servidor disse"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:206 lib/Message.php:224
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3833,7 +4154,7 @@
 "Houve um erro ao excluir mensagens da pasta \"%s\". Isto foi o que o "
 "servidor disse"
 
-#: lib/Message.php:296
+#: lib/Message.php:300
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3842,22 +4163,22 @@
 "Houve um erro ao excluir mensagens na pasta \"%s\". Isto é o que o servidor "
 "disse"
 
-#: lib/Message.php:230
+#: lib/Message.php:222
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr ""
 "Houve um erro ao excluir as mensagens. Isto foi o que o servidor disse: %s"
 
-#: lib/MIME/Viewer/itip.php:91
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Houve um erro ao excluir o evento: %s."
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Houve um erro ao exibir esta parte da mensagem"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:574
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3866,27 +4187,27 @@
 "Houve um erro ao marcar as mensagens nesta pasta \"%s\". Isto é o que o "
 "servidor disse"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Houve um erro ao importar %s."
 
-#: lib/MIME/Viewer/itip.php:127
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Houve um erro ao importar o evento: %s."
 
-#: lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Houve um erro ao importar a tarefa: %s."
 
-#: lib/MIME/Viewer/itip.php:143
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "Houve um erro ao importar a informação livre/ocupado do usuário: %s."
 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3895,29 +4216,29 @@
 "Houve um erro ao mover mensagens de \"%s\" para \"%s\". Isto é o que o "
 "servidor disse"
 
-#: compose.php:1129
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "Houve um erro ao salvar esta mensagem como rascunho."
 
-#: compose.php:905
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Houve um erro ao enviar esta mensagem: %s"
 
-#: lib/MIME/Viewer/itip.php:105
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Houve um erro ao atualizar o evento: %s."
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
-msgstr "Não existe texto nesta parte da mensagem"
+msgstr "Não havia texto nesta parte da mensagem"
 
-#: lib/MIME/Viewer/html.php:91
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "Esta mensagem HTML tem imagens incorporadas a ela."
 
-#: lib/MIME/Viewer/html.php:87
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -3925,45 +4246,45 @@
 "Esta mensagem HTML tem imagens incorporadas a ela. Imagens bloqueadas "
 "aparecem desta forma: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "A Chave Pública PGP foi anexada a esta mensagem."
 
-#: lib/MIME/Viewer/itip.php:96 lib/MIME/Viewer/itip.php:110
-#: lib/MIME/Viewer/itip.php:134 lib/MIME/Viewer/itip.php:148
-#: lib/MIME/Viewer/itip.php:164 lib/MIME/Viewer/itip.php:283
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Esta ação não é suportada."
 
-#: lib/MIME/Viewer/itip.php:170 lib/MIME/Viewer/itip.php:383
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Esta ação ainda não está implementada."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Isto pode levar algum tempo. Você tem certeza que quer prosseguir?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr "Esta mensagem contém um arquivo Macintosh."
 
-#: lib/MIME/Viewer/pkcs7.php:396
+#: lib/MIME/Viewer/pkcs7.php:415
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 "Esta mensagem contém um anexo que foi assinado digitalmente com S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:400
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Esta mensagem contém um anexo que foi criptografado com S/MIME."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
-"Esta mensagem contém informação de estado de entrega, mas o formato da "
+"Esta mensagem contém informação de situação de entrega, mas o formato da "
 "mensagem é desconhecido."
 
 #: lib/MIME/Viewer/pgp.php:319
@@ -3973,7 +4294,7 @@
 "Esta mensagem não parece ser uma mensagem válida criptografada com PGP. "
 "Erro: "
 
-#: lib/MIME/Viewer/pgp.php:244 lib/MIME/Viewer/pgp.php:354
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
@@ -3981,31 +4302,31 @@
 "Esta mensagem não parece estar no formato correto PGP (de acordo com a RFC "
 "2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Esta mensagem não parece estar no formato correto S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:209 lib/MIME/Viewer/pgp.php:420
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Esta mensagem foi assinada digitalmente com PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Esta mensagem foi assinada digitalmente com S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:224
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Esta mensagem foi criptografada com S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Esta mensagem foi criptografada com PGP."
 
-#: message.php:204
+#: message.php:211
 msgid "This message to"
 msgstr "Esta mensagem para"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "O servidor não suporta pastas compartilhadas."
 
@@ -4013,18 +4334,21 @@
 msgid "This window must be called from a compose window."
 msgstr "Esta janela deve ser aberta a partir da janela de composição."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Exibição da Discussão"
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Visualização de Discussões"
 
-#: message.php:257 mailbox.php:560 search.php:145
-#: templates/contacts/contacts.inc:220
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:274 mailbox.php:592 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "Para"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "Endereço do destinatário "
 
@@ -4036,11 +4360,19 @@
 "Para selecionar vários campos, segure Control (PC) ou Command (Mac) ao "
 "clicar."
 
-#: templates/compose/compose.inc:571
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+"Para utilizar uma conexão TLS, você deve estar utilizando PHP 5.0.6 ou "
+"superior."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Tamanho Total dos Anexos:"
 
-#: folders.php:354
+#: folders.php:369
 msgid "Trash folder"
 msgstr "Lixeira"
 
@@ -4048,8 +4380,8 @@
 msgid "Trash folder:"
 msgstr "Lixeira:"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Impossível obter quota"
 
@@ -4066,28 +4398,33 @@
 msgid "Undelete"
 msgstr "Restaurar"
 
-#: mailbox.php:544 mailbox.php:556 lib/MIME/Headers.php:219
+#: mailbox.php:575 mailbox.php:588 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Destinatários Não Revelados"
 
-#: lib/MIME/Viewer/itip.php:409
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Componente não suportado do tipo: %s"
 
-#: mailbox.php:521
+#: mailbox.php:555
 msgid "Unknown Date"
 msgstr "Data Desconhecida"
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Resposta desconhecida do servidor IMAP: o Servidor Respondeu: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Reunião Desconhecida"
 
-#: mailbox.php:572
+#: mailbox.php:604
 msgid "Unknown Recipient"
 msgstr "Destinatário Desconhecido"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Descarregar Senha"
 
@@ -4095,47 +4432,52 @@
 msgid "Unnamed"
 msgstr "Sem Nome"
 
-#: message.php:491 mailbox.php:655 templates/message/navbar_navigate.inc:6
+#: message.php:502 mailbox.php:693 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Não Lida"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
-msgstr "Desinscriver-se da(s) Pasta(s)"
+msgstr "Desinscrever-se da(s) Pasta(s)"
 
-#: templates/compose/compose.inc:578
-msgid "Update Attachment Information"
-msgstr "Atualizar Informação de Anexos"
+#: templates/compose/compose.inc:515
+msgid "Update"
+msgstr "Atualizar"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
-msgstr "Atualizar estado da resposta"
+msgstr "Atualizar situação da resposta"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Enviar"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Utilizar Valor Padrão"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Utilizar inscrições de pastas IMAP?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Utilizar Lixeira Virtual?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Usuário"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 "Foram concedidas com sucesso as permissões para o usuário '%s' na pasta '%s'."
 
-#: templates/login/login.inc:205
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Usuário"
 
@@ -4143,87 +4485,127 @@
 msgid "Username:"
 msgstr "Usuário:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Ver"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "Ver %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Ver Chave Pública %s"
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "Ver conteúdo HTML em uma janela separada"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Ver Mensagens"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Ver Chave Privada Pessoal"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Ver Chave Pública Pessoal"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Ver Discussão"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Ver Miniatura"
 
-#: lib/MIME/Viewer/pkcs7.php:404
+#: lib/MIME/Viewer/pkcs7.php:423
 msgid "View attachment in a separate window"
 msgstr "Ver anexo em uma janela a parte"
 
-#: lib/MIME/Viewer/itip.php:131
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Visualizar o conteúdo em uma janela separada"
+
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Ver evento"
 
-#: folders.php:346 mailbox.php:490
+#: folders.php:361 mailbox.php:518
 #, php-format
 msgid "View messages in %s"
 msgstr "Ver mensagens em %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Visão ou caixa postal a exibir após conectar:"
 
-#: lib/MIME/Viewer/itip.php:161
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Ver tarefa"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Ver as Imagens"
 
-#: search.php:304
+#: search.php:260
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Pasta Virtual \"%s\" criada com sucesso."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:117 lib/IMAP/Tree.php:305
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:371
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Pastas Virtuais"
 
-#: templates/search/main.inc:133
+#: search.php:252
+msgid "Virtual Folders require a label."
+msgstr "Pastas Virtuais necessitam de um nome."
+
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Lixeira Virtual"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Caixa de Entrada Virtual"
+
+#: lib/Mailbox.php:156 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Lixeira Virtual"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Lixeira Virtual"
+
+#: templates/search/main.inc:128
 msgid "Virtual folder label"
 msgstr "Nome da pasta virtual"
 
-#: login.php:136
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "Aviso"
+
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Bem-vindo ao %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"O que fazer com spams após eles terem sido reportados como spam ou inocentes?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4231,51 +4613,87 @@
 "Ao excluir mensagens, movê-las para a Lixeira ao invés de marcá-las como "
 "excluídas?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Quando abrir uma nova caixa postal, em que página você quer iniciar?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
-msgstr "Quando salvar enviados, deveríamos salvar os anexos?"
+msgstr "Ao salvar enviados, deveremos salvar os anexos?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"Ao enviar mensagens ou expandir endereços, qual domínio deverá ser incluído "
+"em um endereço não qualificado (endereço de e-mail sem \"@\")?"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Lista Branca"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Quebrar linhas após esta quantidade de caracteres."
-
-#: templates/compose/compose.inc:535 config/prefs.php.dist:949
+#: templates/compose/compose.inc:539 templates/compose/compose.inc:552
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Sim"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
-msgstr "Você vai trazer mensagens da(s) seguinte(s) conta(s):"
+msgstr "Você esta prestes a trazer mensagens da(s) seguinte(s) conta(s):"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Você está tentando excluir as seguintes pastas:"
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr ""
+"Você está tentando excluir todas as mensagens contidas na(s) seguinte(s) "
+"pasta(s)."
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Você está tentando excluir a(s) seguinte(s) pasta(s)."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Você está copiando/movendo para uma nova pasta."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "Você está criando uma subpasta em "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "Você está criando uma pasta principal."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:315
+msgid "You are not allowed to create folders."
+msgstr "Você está criando uma pasta principal."
+
+#: lib/Folder.php:322
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Você não está autorizado a criar mais de %d pastas."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "Você está renomeando a pasta: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Você pode utilizar os seguintes delimitadores no texto do papel de carta: %c "
+"para a mensagem atual; %s para a assinatura."
+
+#: lib/Folder.php:557
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "Você não pode se desinscrever de \"%s\"."
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
@@ -4283,11 +4701,11 @@
 "Você não concordou com os Termos de Serviço, sendo assim você não foi "
 "autorizado a conectar."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "Você não tem permissão para alterar o acesso a esta pasta"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
@@ -4302,23 +4720,19 @@
 msgid "You have 1 new message."
 msgstr "Você tem 1 nova mensagem."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Você tem pelo menos uma anexo selecionado que você ainda não enviou. Você "
-"tem certeza que quer enviar a mensagem sem estes anexos?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Você já enviou esta página."
 
-#: lib/IMP.php:987
+#: lib/IMP.php:1023
 msgid "You have new mail in the following folder:"
 msgstr "Você tem novas mensagens na seguinte pasta:"
 
-#: lib/IMP.php:992
+#: lib/IMP.php:1028
 msgid "You have new mail in the following folders:"
 msgstr "Você tem novas mensagens nas seguintes pastas:"
 
-#: compose.php:136
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Você deve fornecer pelo menos um destinatário."
 
@@ -4329,7 +4743,7 @@
 "Você deve fornecer a senha para sua chave privada PGP para visualizar esta "
 "mensagem"
 
-#: lib/MIME/Viewer/pkcs7.php:235
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4337,7 +4751,7 @@
 "Você deve fornecer a senha para sua chave privada S/MIME para visualizar "
 "esta mensagem"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Você deve selecionar uma caixa postal de destino primeiro."
 
@@ -4349,8 +4763,8 @@
 msgid "You must select an address first."
 msgstr "Você deve selecionar um endereço primeiro."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Você deve selecionar pelo menos uma mensagem primeiro."
 
@@ -4358,66 +4772,62 @@
 msgid "You must specify a recipient."
 msgstr "Você deve especificar um destinatário."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Você deve especificar pelo menos um arquivo para anexar."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "Você precisa estar com '%s' habilitado nas opções de manutenção."
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Você precisa estar com \"%s\" habilitado nas opções de manutenção."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Você redirecionou esta mensagem para %s em %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Você replicou esta mensagem em %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Você não foi inscrito em \"%s\". Aqui está o que o servidor disse"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Você não foi desinscrito de \"%s\". Aqui está o que o servidor disse"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Você foi inscrito em \"%s\" com sucesso"
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Você foi desinscrito de \"%s\" com sucesso"
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Seu Nome"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Suas Chaves Pública/Privada PGP"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Sua Chave Privada"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Sua Chave Pública"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Seu endereço para resposta (Reply-To): <i>(opcional)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Seu endereço Responder-Para: <em>(opcional)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Seus Certificados Público/Privado S/MIME"
 
@@ -4425,26 +4835,18 @@
 msgid "Your accounts:"
 msgstr "Suas contas:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
 "Seus endereços secundários (alias): <i>(opcional, preencha cada endereço em "
 "uma nova linha)</i>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr "Seu navegador não suporta exibição incorporada deste tipo de imagem."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Seu navegador não suporta esta opção de impressão. Pressione Control/Option "
-"+ P para imprimir."
-
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Seu conjunto de caracteres padrão para enviar mensagens:"
 
@@ -4452,68 +4854,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Seu método de criptografia padrão para enviar mensagens:"
 
-#: lib/MIME/Viewer/status.php:92
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Seu anexo foi baixado por pelo menos um usuário.\n"
+"\n"
+"Nome do anexo: %s\n"
+"Data do anexo: %s\n"
+"\n"
+"Clique no link a seguir para excluir permanentemente o anexo:\n"
+"%s"
+
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Sua mensagem foi enviada com sucesso."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Sua assinatura:"
 
-#: message.php:281 compose.php:1163 mailbox.php:505 lib/Compose.php:728
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Ocultar Endereços]"
+
+#: message.php:298 compose.php:1301 mailbox.php:533 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Sem Assunto]"
 
-#: templates/compose/compose.inc:220
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Exibir Endereços -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Exibir endereços - %s destinatários]"
+
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "Cc_o"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Lista _Negra"
 
-#: templates/compose/compose.inc:169
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:888
-msgid "_Compose"
-msgstr "_Compor"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "E_xcluir"
 
-#: lib/IMP.php:890
+#: lib/IMP.php:929
 msgid "_Folders"
 msgstr "_Pastas"
 
-#: templates/compose/compose.inc:84
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identidade"
 
-#: lib/IMP.php:881
+#: lib/IMP.php:898
 msgid "_Inbox"
 msgstr "Caixa de _Entrada"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:970
 msgid "_Log out"
 msgstr "_Desconectar"
 
-#: message.php:377
+#: message.php:391
 msgid "_Message Source"
 msgstr "Códi_go Fonte da Mensagem"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:926
+msgid "_New Message"
+msgstr "Nova mensagem"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "I_mprimir"
 
-#: templates/compose/compose.inc:287 templates/compose/compose.inc:304
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
-msgstr "_Prioridade"
+msgstr "Pr_ioridade"
 
-#: mailbox.php:379
+#: mailbox.php:402
 #, php-format
 msgid "_Refresh %s"
 msgstr "Atuali_zar %s"
@@ -4522,39 +4956,43 @@
 msgid "_Reply"
 msgstr "Re_sponder"
 
-#: lib/IMP.php:892
+#: lib/IMP.php:931
 msgid "_Search"
-msgstr "Proc_urar"
+msgstr "Pes_quisar"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "_Send Message"
-msgstr "En_viar Mensagem"
+msgstr "Enviar _Mensagem"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
-msgstr "_Discussão"
+msgstr "Disc_ussão"
 
-#: templates/compose/compose.inc:119
+#: templates/compose/compose.inc:116
 msgid "_To"
-msgstr "_Para"
+msgstr "Par_a"
 
 #: templates/mailbox/actions.inc:13
 msgid "_Undelete"
 msgstr "_Restaurar"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Ver Discussão"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Lista _Branca"
 
-#: lib/Compose.php:341
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "destinatário desconhecido"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "anexo"
 
-#: view.php:102
+#: view.php:97
 msgid "attachments.zip"
 msgstr "anexos.zip"
 
@@ -4562,38 +5000,107 @@
 msgid "bytes"
 msgstr "bytes"
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "impossível criar arquivo de destino"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "impossível abrir origem"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "erro de sintaxe na linha de comando"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "erro de configuração"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "está faltando um arquivo crítico do sistema"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "erro no formato dos dados"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "registro não encontrado"
+
+#: templates/contacts/contacts.inc:190
+msgid "from"
+msgstr "de"
+
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "nome do host é desconhecido"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "erro de entrada/saída"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "erro interno do programa"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "chave"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "arquivo mailbox"
 
-#: compose.php:966 lib/Message.php:452
+#: compose.php:1105 lib/Message.php:495
 msgid "name"
 msgstr "nome"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "nenhuma"
 
-#: templates/compose/spelling.inc:90
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ou"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "permissão negada"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "destinatários]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "erro remoto no protocolo"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "serviço indisponível"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "erro de ortografia"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "erros de ortografia"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "erro do sistema"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "falha temporária"
+
+#: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "sua lista negra"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "sua lista branca"


--- orig/templates/smime/import_key.inc
+++ mod/templates/smime/import_key.inc
@@ -19,23 +19,25 @@
 <input type="hidden" name="actionID" value="<?php echo $target ?>" />
 <?php Util::pformInput(); ?>
 
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
- <tr>
-  <td align="left" class="header" nowrap="nowrap"><b><?php echo $title ?></b></td>
+<div class="header">
 <?php if ($certimport): ?>
-  <td align="right" class="header" nowrap="nowrap"><?php echo Help::link('imp', 'smime-import-personal-certs') ?></td>
+  <ul>
+    <li><?php echo Help::link('imp', 'smime-import-personal-certs') ?></li>
+  </ul>
 <?php endif; ?>
- </tr>
+  <?php echo $title ?></td>
+</div>
 
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php if (isset($insert_text)): ?>
  <tr>
-  <td class="item" align="left">
+  <td class="item leftAlign">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left"><b><?php echo $insert_text ?>:</b></td>
+     <td class="item leftAlign"><strong><?php echo $insert_text ?>:</strong></td>
     </tr>
     <tr>
-     <td class="item" align="left">
+     <td class="item leftAlign">
       <textarea name="import_key" rows="6" cols="80" class="fixed"></textarea>
      </td>
     </tr>
@@ -44,16 +46,16 @@
  </tr>
 
  <tr>
-  <td class="item" align="left"><font color="red"><b>--<?php echo _("OR") ?>--</b></font></td>
+  <td class="item leftAlign"><font color="red"><strong>--<?php echo _("OR") ?>--</strong></font></td>
  </tr>
 <?php endif; ?>
 
  <tr>
-  <td class="item" align="left"<?php if ($certimport): ?> colspan="2"<?php endif; ?>>
+  <td class="item leftAlign"<?php if ($certimport): ?> colspan="2"<?php endif; ?>>
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left">
-      <b><?php echo _("Upload") ?>:</b>&nbsp;<input name="upload_key" type="file" size="40" class="fixed" />
+     <td class="item leftAlign">
+      <strong><?php echo _("Upload") ?>:</strong>&nbsp;<input name="upload_key" type="file" size="40" class="fixed" />
      </td>
     </tr>
    </table>
@@ -62,31 +64,27 @@
 
 <?php if ($certimport): ?>
  <tr>
-  <td class="item" align="left" colspan="2">
+  <td class="item leftAlign" colspan="2">
    <table border="0" cellpadding="0" width="100%">
     <tr>
-     <td class="item" align="left">
-      <b><?php echo _("Password") ?>:</b>&nbsp;<input name="upload_key_pass" type="password" size="30" class="fixed" />
+     <td class="item leftAlign">
+      <strong><?php echo _("Password") ?>:</strong>&nbsp;<input name="upload_key_pass" type="password" size="30" class="fixed" />
      </td>
     </tr>
     <tr>
-     <td class="item" align="left">
-      <b><?php echo _("Private Key Password") ?>:</b>&nbsp;<input name="upload_key_pk_pass" type="password" size="30" class="fixed" />
+     <td class="item leftAlign">
+      <strong><?php echo _("Private Key Password") ?>:</strong>&nbsp;<input name="upload_key_pk_pass" type="password" size="30" class="fixed" />
      </td>
     </tr>
    </table>
   </td>
  </tr>
 <?php endif; ?>
-
- <tr>
-  <td nowrap="nowrap" align="center" class="header" valign="middle"<?php if ($certimport): ?> colspan="2"<?php endif; ?>>
-   <input type="submit" name="import" class="button" value="<?php echo _("Import Key") ?>" />
-   <input type="submit" name="import" class="button" onclick="window.close();" value="<?php echo _("Cancel") ?>" />
-  </td>
- </tr>
 </table>
 
+<input type="submit" name="import" class="button" value="<?php echo _("Import Key") ?>" />
+<input type="submit" name="import" class="button" onclick="window.close();" value="<?php echo _("Cancel") ?>" />
+
 </form>
 </body>
 </html>


--- orig/po/ro_RO.po
+++ mod/po/ro_RO.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP 3.1\n"
-"POT-Creation-Date: 2002-08-01 04:40-0700\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-08-01 12:56:+02:00\n"
 "Last-Translator: Corneliu MUSAT <cmusat at keysys.ro>\n"
 "Language-Team: Romanian <i18n at lists.horde.org>\n"
@@ -13,68 +14,193 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Catre: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Catre: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Data: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    De la: "
 
-msgid " - $nm new message"
-msgstr " - $nm mesaj nou"
-
-msgid " - $nm new messages"
-msgstr " - $nm mesaje noi"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Subiect: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " in "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr ""
 
-#, c-format
-msgid "%c"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d din %d Mesaje"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Afiseaza un mesaj la aplicarea filtrelor."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d - %d din %d Mesaje"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s exista. Directorul %s nu a putut fi redenumit."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s nu pare sa fie o casuta postala valida."
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Directorul %s va fi redenumit. Inceput de luna."
 
-#, c-format
-msgid "%s is already empty."
-msgstr "%s este deja gol."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Directorul \"%s\" a fost redenumit cu succes ca \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
 
-#, c-format
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr ""
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aplica modificarile si mergi mai departe.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Renunta la modificari. Inapoi la fereastra de Mesaj Nou.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -82,1521 +208,5013 @@
 "Aplica schimbarile de pina acum si intoarce-te la fereastra de Mesaj Nou."
 "Schimbarile de pe pagina curenta NU vor fi aplicate."
 
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"Aplica schimbarile de pina acum si intoarce-te la fereastra de Mesaj Nou."
+"Schimbarile de pe pagina curenta NU vor fi aplicate."
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Adauga astea apasind OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Te rog alege adres(a/ele) *"
 
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Identitatea \"%s\" a fost stearsa."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Caractere Speciale"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Caractere Speciale"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Caractere Speciale"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Caractere Speciale"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
 msgstr ""
-"<p><i>Acest mesaj a fost scris cu alt set de caractere decit al tau. Daca nu e"
-"afisat corect, %sclick aici</a> pentru a-l deschide intr-o fereastra noua.</i></p>\n"
 
-msgid "Action"
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "Numele Identitatii:"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Actiunea"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Adauga la Agenda (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "Adauga un atasament."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Date Personale"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Agenda"
 
-msgid "Addressbooks"
-msgstr "Agende"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "Agenda"
+
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Toate mesajele din directo(r/are) se vor pierde!"
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Toate"
 
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
-"Toate mesajele din directo(rul/arele) urmato(r/are) vor fi salvate intr-un"
-" fisier MBOX:"
+"Toate mesajele din directo(rul/arele) urmato(r/are) vor fi salvate intr-un "
+"fisier MBOX:"
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
-"Toate mesajele din directorul \"%s\", mai vechi de %s zile vor fi sterse"
-"definitiv."
+"Toate mesajele din directorul \"%s\", mai vechi de %s zile vor fi "
+"stersedefinitiv."
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Toate directoarele cu mesaje-trimise mai vechi de %s luni vor fi sterse."
 
-#, c-format
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "Toate directoarele cu mesaje-trimise mai vechi de %s luni vor fi sterse."
+msgstr ""
+"Toate directoarele cu mesaje-trimise mai vechi de %s luni vor fi sterse."
 
-msgid "All"
-msgstr "Toate"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Directorul \"%s\" a fost redenumit cu succes ca \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "Adauga un atasament."
 
-msgid "An illegal value was specified."
-msgstr "S-a specificat o valoare gresita."
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Eroare de natura necunoscuta! Adaugarea nu a reusit."
 
-msgid "Answered messages"
-msgstr "Mesaje cu Raspuns"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "Eroare de natura necunoscuta! Adaugarea nu a reusit."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Cu Raspuns"
 
-msgid "Apply All Rules"
-msgstr "Aplica Toate Filtrele"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Mesaje cu Raspuns"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Aplica filtrele pe"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Aplica filtrele pe"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "Aplica filtrele la Conectare."
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Aplica filtrele la Reinprospatare."
 
-msgid "April"
-msgstr "Aprilie"
-
-msgid "Are you SURE you want to continue?"
-msgstr "Sigur vrei sa continui ?"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "Sigur vrei sa facia asta ?"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "Esti absolut sigur ca vrei sa continui ?"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Sigur vrei sa facia asta ?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Sigur vrei sa stergi definitiv aceste mesaje ?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Sigur vrei sa stergi definitiv aceste mesaje ?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Sigur vrei sa golesti acest director ?"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Sigur vrei sa golesti Gunoiul ?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Sigur vrei sa golesti Gunoiul ?"
 
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Sigur vrei sa stergi definitiv aceste mesaje ?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Sigur vrei sa golesti acest director ?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Sigur vrei sa golesti acest director ?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Ora sosirii"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Crescator"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Ataseaza"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Atasamente"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "Ataseaza"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Atasament"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Atasamente"
 
-msgid "August"
-msgstr "August"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Atasamente"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Actiunea"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "Agende disponibile:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Inapoi la %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Inapoi la %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Copie #2"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Lista Neagra"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Corp Mesaj"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Amindoua"
 
-msgid "Cancel Message"
-msgstr "Renunta La Mesaj"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
 
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Renunta"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Renunta La Mesaj"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Daca renunti la acest Raspuns, continutul lui se va pierde."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Copie"
 
-msgid "Cc:"
-msgstr "Copie:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+msgid "Chair Person"
+msgstr ""
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Schimba"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Schimba Tot"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Creaza Director"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
-msgstr ""
-"Optiuni de genul cite mesaje vezi pe o pagina si cum sint ele"
-" sortate."
+msgstr "Optiuni de genul cite mesaje vezi pe o pagina si cum sint ele sortate."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Scimba optiunile referitoare la serverul de mail."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
-msgstr ""
-"Specifica numele, adresa si semnatura care vor aparea in Mesajul tau."
+msgstr "Specifica numele, adresa si semnatura care vor aparea in Mesajul tau."
 
-msgid "Change"
-msgstr "Schimba"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Verifica daca sint mesaje noi in Directo(r/are)"
 
-msgid "Checkbox"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
 msgstr ""
 
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+msgid "Check spelling before sending a message?"
+msgstr ""
+
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Alege Actiunea:"
 
-msgid "Choose the addressbook to use when adding addresses."
-msgstr "Alage agenda in care se vor adauga adresele noi."
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "Scimba optiunile referitoare la serverul de mail."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
-msgstr "Alage ordinea de cautare in agende."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Au fost sterse toate mesajele din %s."
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Alege Actiunea:"
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
-msgstr ""
-"Fa Click pe una din agende si selecteaza toate cimpurile in care "
-"vrei sa cauti."
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
+msgstr "Alage agenda in care se vor adauga adresele noi."
 
-msgid "Closed Folder"
-msgstr "Director Inchis"
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr "Alage ordinea de cautare in agende."
 
-msgid "Collapse All Folders"
-msgstr "Restringe toate directoarele."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
 
-msgid "Collapse All"
-msgstr "Restringe tot"
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
 
-msgid "Collapse Folder"
-msgstr "Restringe directorul"
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Mesaj Nou (%s)"
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Compune Mesaj Nou in fereastra separata."
 
-msgid "Compose a message"
-msgstr "Trimite un Mesaj Nou"
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
 
-msgid "Compose messages in a separate window."
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
 msgstr "Compune Mesaj Nou in fereastra separata."
 
-msgid "Compose"
-msgstr "Mesaj Nou"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
 
-msgid "Contact List"
-msgstr "Lisat de Contacte"
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
 
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"Fa Click pe una din agende si selecteaza toate cimpurile in care vrei sa "
+"cauti."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Mesaj Nou"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "Director Inchis"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Restringe tot"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All"
+msgstr "Restringe tot"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Restringe toate directoarele."
+
+#: folders.php:449
+msgid "Collapse Folder"
+msgstr "Restringe directorul"
+
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "Mesaj Nou"
+
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
+msgstr "Trimite un Mesaj Nou"
+
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
+msgstr "Compune Mesaj Nou in fereastra separata."
+
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Scimba optiunile referitoare la serverul de mail."
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"Controleaza cind se verifica daca sint mesaje noi si daca vei fi sau nu anuntat"
-" la sosirea lor."
+"Controleaza cind se verifica daca sint mesaje noi si daca vei fi sau nu "
+"anuntat la sosirea lor."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Copiaza"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Goleste Gunoiul"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Corect"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Text Corectat"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Nu am putut sterge mesajele de la %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nu am putut sterge mesajele de la %s: %s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Operatiuni de Mentenanta"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Creaza"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Creaza Director"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "Creaza"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Creaza Director"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Creaza director nou pentru Gunoi"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Creaza director nou pentru Ciorne"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Creaza director nou pentru Mesaje-Trimise"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Creaza director nou pentru Gunoi"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"Creaza filtre pentru organizarea mesajelor primite, sortarea lor in directoare"
-" si stergerea celor nedorite."
+"Creaza filtre pentru organizarea mesajelor primite, sortarea lor in "
+"directoare si stergerea celor nedorite."
 
-msgid "Create"
-msgstr "Creaza"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Creaza director nou pentru Mesaje-Trimise"
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "Alege cum trimiti mesajele si unde vor fi salvate Ciornele."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Alege operatiunile de mentenanta executate cind te conectezi la %s."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "Alege cum trimiti mesajele si unde vor fi salvate Ciornele."
 
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Alege operatiunile executate la conectarea la %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Data"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Data"
 
-msgid "December"
-msgstr "Decembrie"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Sterse"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Sterge"
 
-msgid "Default Identity"
-msgstr "Identitate Implicita"
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Criteriu implicit de sortare:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Directie implicita de sortare:"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Sterse"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Sterge"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Sterge Directo(rul/arele)"
 
-msgid "Delete messages"
-msgstr "Sterge mesajele"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Sterge Directo(rul/arele)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Sterge Directo(rul/arele)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Sterge Directo(rul/arele)"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "Sterge directoarele cu Mesaje-Trimise la inceput de luna."
 
-msgid "Delete"
-msgstr "Sterge"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "Sterge directoarele cu Mesaje-Trimise la inceput de luna."
 
-msgid "Deleted an attachment."
-msgstr "Sterge un atasament."
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Sterge mesajele"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Sterse"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Mesaje Sterse"
 
-msgid "Deleted"
-msgstr "Sterse"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Sterge un atasament."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Optiuni Mutare, Copiere, Stergere mesaje."
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Descrescator"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+msgid "Description"
+msgstr ""
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Dim signatures - de tradus ?"
 
-msgid "Display Options"
-msgstr "Optiuni de afisare"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Afiseaza"
 
-msgid "Display message when filters have been applied."
-msgstr "Afiseaza un mesaj la aplicarea filtrelor."
+#: config/prefs.php.dist:479
+msgid "Display confirmation after sending a message?"
+msgstr ""
+
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "Anunta-ma cind am mesaje noi."
 
-msgid "Display"
-msgstr "Afiseaza"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
 
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "Optiuni de afisare"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Nu verifica daca sint mesaje noi in Directo(r/are)"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Vrei sa deschizi acel Director ?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Gata"
 
-#, c-format
-msgid "Download %s"
-msgstr "Salveaza %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Salveaza Directo(rul/arele)"
 
-msgid "Download"
-msgstr "Salveaza"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Salveaza Directo(rul/arele)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Ciorne"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "Director cu Ciorne:"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Director cu Ciorne:"
 
-msgid "Edit your filter rules"
-msgstr "Schimba Regulile de Filtrare"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "Adresa de Email"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
 
-msgid "Edit your identities"
-msgstr "Schimba Datele Personale"
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr ""
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "Lista Neagra"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Filtre Mesaje"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Schimba Regulile de Filtrare"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Schimba Regulile de Filtrare"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Schimba Regulile de Filtrare"
+
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Adresa de Email"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Au fost sterse toate mesajele din %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Goleste Directo(rul/arele)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Goleste Directo(rul/arele)"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Goleste Gunoiul"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Goleste Gunoiul"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Goleste Gunoiul"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
+#, fuzzy
 msgid "End forwarded message"
+msgstr "Copie Mesaj trimisa de %s"
+
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "Mesaje Vechi"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "Copie Mesaj trimisa de %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
 msgstr ""
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Introdu numele noului Director Gunoi "
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Introdu numele noului director cu Ciorne"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Introdu numele noului director cu Mesaje-Trimise"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Introdu numele noului Director Gunoi "
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Redirecteaza"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Adresa \"%s\" a fost adaugata cu succes la Agenda."
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Eroare"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Directorul \"%s\" a fost sters cu succes."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "La 15 minute"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "La 30 secunde"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "La 5 minute"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "La 1/2 ore"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "In fiecare minut"
 
-msgid "Expand All Folders"
-msgstr "Desfasoara Toate Directoarele"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Desfasoara Tot"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Desfasoara Tot"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Desfasoara Toate Directoarele"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Desfasoara Directorul"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Completeaza adresa din Agenda"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Desfasoara Arborele de Directoare in fereastra de Directoare."
 
-msgid "February"
-msgstr "Februarie"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Desfasoara Tot"
 
-msgid "Field"
-msgstr "Cimpul"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Mesaje Noi"
 
-msgid "Filename"
-msgstr "Nume Fisier"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "Mesaje Noi"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Filtru: Mesajul \"%s\" de la \"%s\" a fost sters."
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "Compune Mesaj Nou in fereastra separata."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr "Filtru: Mesajul \"%s\" de la \"%s\" a fost mutat in Directorul \"%s\"."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Aplica filtrele la Conectare."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr "Filtru: Mesajul \"%s\" de la \"%s\" a fost aruncat la Gunoi."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Au fost sterse toate mesajele din %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Copie Mesaj trimisa de %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr ""
+
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr " - $nm mesaje noi"
 
-msgid "Filter Rules"
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Filtre"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Filtre"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Alte Optiuni"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Reguli de Filtrare"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
 msgstr "Activeaza filtru cuvinte cenzurate !"
 
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtre"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Gaseste"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Prima Pagina"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Prima Pagina"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Trimite Copie"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Directoare"
 
-msgid "Folder Prefix"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Februarie"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
 msgstr ""
 
-msgid "Folders"
-msgstr "Directoare"
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
 
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
+
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Trimite Copie"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Trimite Copie"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Copie Mesaj trimisa de %s"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Copie Mesaj trimisa de %s"
 
-msgid "From Address"
-msgstr "Expeditor"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Optiuni Server"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
 
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "De la"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "De la"
 
-msgid "From:"
-msgstr "De la:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "Expeditor"
 
+#: compose.php:777 compose.php:781
+#, fuzzy
 msgid "Fwd:"
+msgstr "Trimite Copie"
+
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "Trimite Copie"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Copie Mesaj trimisa de %s"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Alte Optiuni"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: templates/folders/actions.inc:31
+msgid "Go"
 msgstr ""
 
-msgid "Help"
-msgstr "Ajutor"
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "Mesajul Urmator"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Adauga la Agenda (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
 
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+msgid "Hidden in Thread View"
+msgstr ""
+
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Ascunde Mesaje-Sterse"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr ""
 
-msgid "How to prefix quoted lines in a reply:"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Citatele din Mesajul-Raspun vor fi marcate cu:"
 
-msgid "IMP is not properly configured"
-msgstr "IMP nu este configurat corect"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
 
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr ""
 
-msgid "Identities"
-msgstr "Identitati"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity"
-msgstr "Identitate"
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Toate mesajele din directo(r/are) se vor pierde!"
 
-msgid "Identity's name:"
-msgstr "Numele Identitatii:"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignora"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignora tot"
 
-msgid "Ignore"
-msgstr "Ignora"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Important messages"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Importante"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "Importante"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "Importante"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
 msgstr "Mesaje Importante"
 
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Importante"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Mesaje Importante"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Au fost sterse toate mesajele din %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Include mesajul original in raspuns."
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Include mesajul original in raspuns."
 
-msgid "January"
-msgstr "Ianuarie"
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Ignora"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+msgid "Inline"
+msgstr ""
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Adresa de Email"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
 
-msgid "July"
-msgstr "Iulie"
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
 
-msgid "June"
-msgstr "Iunie"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
 
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Limba"
 
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "Ultima Pagina"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Ultima Pagina"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Ultima conectare: %s"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Atasamente"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
 
-msgid "Last login: Never"
-msgstr "Ultima conectare: Niciodata"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-#, c-format
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "Casuta de Mesaje"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Actiunea"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Conectare"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Conectare la %s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Conectare"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Actiuni la Conectare"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: templates/compose/compose.inc:296
+msgid "Low"
 msgstr ""
-"Conectare imposibila. Nume de Utilizator sau/si Parola gresita."
-"Incearca din nou."
 
-msgid "Logout"
-msgstr "Deconectare"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
 
-msgid "Mail Filters"
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
 msgstr "Filtre Mesaje"
 
-msgid "Mail Management"
-msgstr "Intretinere Mesaje"
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "Casuta de Mesaje"
 
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "Filtre Mesaje"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Casuta de Mesaje"
 
-msgid "Maintenance Operations"
-msgstr "Operatiuni de Mentenanta"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Optiuni de afisare"
 
-msgid "March"
-msgstr "Martie"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
+
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Marcheaza:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Marcheaza diferite nivele de citare cu diferite culori."
 
-msgid "May"
-msgstr "Mai"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Atasament"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Optiuni Server"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
 
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Deschide"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "Mesaj"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Compune Mesaj Nou"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Data Sosirii"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "Mesaj(ul/ele) in"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Cauta Mesajul"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Marime Mesaj"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Sursa Mesajului"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Filtrare Continut"
 
-msgid "Message fields"
-msgstr "Cimpurile Mesajului"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Marcate ca"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "In Directoarele"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "In Directoarele"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Sterge un atasament."
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Cimpurile Mesajului"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Cimpurile Mesajului"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Data Sosirii"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
 msgstr "Mesaj trimis cu succes dar nesalvat in"
 
-msgid "Message"
-msgstr "Mesaj"
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Mesaj trimis cu succes dar nesalvat in"
+
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "Mesaj trimis cu succes dar nesalvat in"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "mesaje pe o pagina."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Mesaj(ul/ele) in"
 
-msgid "Mime Type"
-msgstr ""
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Modifica"
 
-msgid "Move Down"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move"
+msgstr "Muta"
+
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
 msgstr "Mai Jos"
 
-msgid "Move Up"
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "alege unde"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
 msgstr "Mai Sus"
 
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Muta Mesajele in <b>%s</b>."
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
 
-msgid "Move"
-msgstr "Muta"
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Filtrare Continut"
 
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nume"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Actiunea"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Niciodata"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "Sterge un atasament."
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Noi"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "Deschide"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Mesaje Noi"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Mesajul Urmator"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Mesaje Noi"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Mesaje Noi"
 
-msgid "New"
-msgstr "Noi"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Urmatorul"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Mesajul Urmator"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Pagina Urmatoare"
 
-msgid "Next"
-msgstr "Urmatorul"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "Nu"
 
-msgid "No Subject"
-msgstr "Fara Subiect"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "Mesaje Noi"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Text Corectat"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "Atasamente"
 
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "Nu s-a specificat directorul"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Nu s-a specificat directorul"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Mesaje Nesterse"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Mesaje Nesterse"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "muta mesajul in"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "Nu au fost gasite mesaje corespunzatoare"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Nu exista greseli de scriere"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Nu exista sugestii"
 
-msgid "No"
-msgstr "Nu"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "Nu s-a specificat directorul"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Nici Una"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Nesterse"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Curate"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Neimportante"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Ne Personal"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Mesaje Nesterse"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Mesaje Neimportante"
 
-msgid "November"
-msgstr "Noiembrie"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Citat"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "directoare cu Mesaje-Trimise se vor pastra la inceputul lunii."
+
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr "directoare cu Mesaje-Trimise se vor pastra la inceputul lunii."
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr ""
+
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "Mesaje Vechi"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Directorul de Mesaje-Trimise vechi a fost golit."
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "Te rog alege un singur director pentru aceasta actiune."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Deschide"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Deschide"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "Alte Optiuni"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "Alte Optiuni"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "Renunta La Mesaj"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "Eroare"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "Optiuni"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Directorul \"%s\" a fost creat cu succes."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Directorul \"%s\" a fost sters cu succes."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "Trimite"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr ""
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
-msgstr "directoare cu Mesaje-Trimise se vor pastra la inceputul lunii."
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
 
-msgid "OK"
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
 msgstr ""
 
-msgid "October"
-msgstr "Octombrie"
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
 
-msgid "Old messages"
-msgstr "Mesaje Vechi"
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
 
-msgid "Old sent-mail folders being purged."
-msgstr "Directorul de Mesaje-Trimise vechi a fost golit."
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
 
-msgid "Open Folder"
-msgstr "Deschide"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "Options"
-msgstr "Optiuni"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-msgid "Other Options"
-msgstr "Alte Optiuni"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Pagina %d din %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Atasament(e)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "Mesaj trimis cu succes dar nesalvat in"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Parola"
 
-msgid "Perform maintenance operations on login"
+#: templates/fetchmail/manage.inc:48
+#, fuzzy
+msgid "Perform maintenance operations on login?"
 msgstr "Executa operatiuni de mentenanta la Conectare."
 
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+#, fuzzy
+msgid "Personal"
+msgstr "Ne Personal"
+
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Date Personale"
 
-msgid "Personal"
+#: pgp.php:120
+msgid "Personal PGP keypair generated successfully."
+msgstr ""
+
+#: pgp.php:127
+msgid "Personal PGP keys deleted successfully."
+msgstr ""
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
 msgstr ""
 
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Plaseaza semnatura inaintea raspunsurilor."
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "Introdu numele noului director:"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Introdu numele noului director:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Te rog introdu noul nume:"
 
-msgid "Please enter valid search criteria."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
 msgstr ""
 
-msgid "Please provide your username and password"
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "Te rog introdu numele de Utilizator si Parola."
+
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "Te rog introdu numele de Utilizator si Parola."
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Va rog sa verificati adresele introduse. Nu par sa fie corecte."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Te rog alege un director inainte de a specifica actiunea."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "Te rog alege cel putin un director de cautare."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Te rog alege cel putin un director de cautare."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Te rog alege un singur director pentru aceasta actiune."
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
+msgstr "Te rog alege cel putin un director de cautare."
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
 msgstr ""
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Desparte semnatura prin ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "Directorul \"%s\" a fost creat cu succes."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Pagina Precedenta"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Mesajul Precedent"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Pagina Precedenta"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Tipareste"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problema cu regula de filtrare %d: directorul nu exista: %s"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "Tipareste"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
 
-msgid "Problem?"
-msgstr "Problema ?"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Sterge de Tot"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Sterge de Tot"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Sterge Directo(rul/arele)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Goleste Gunoiul"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Sterge mesajele din directorul Gunoi mai vechi de acest numar de zile."
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Sterge mesajele vechi din directorul Gunoi (definitiv)."
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Golim %d mesaj(e) din Gunoi."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "Golim %d mesaj(e) din Gunoi."
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Citat"
 
-msgid "Received after"
-msgstr "Primite inainte de"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Primite pe"
 
-msgid "Received before"
-msgstr "Primite dupa"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Primite pe"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Primite pe"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Redirecteaza"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Redirecteaza"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Redirecteaza"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Redirecteaza acest mesaj"
 
-msgid "Redirect"
-msgstr "Redirecteaza"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Redirectarea a esuat."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Reimprospateaza"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Reimprospateaza fereastra cu directoare:"
 
-msgid "Refresh"
-msgstr "Reimprospateaza"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Reincarca fereastra"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Reincarca fereastra"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Ultima stare"
 
-msgid "Remove Selected"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "Casuta de Mesaje"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
 msgstr "Sterge cele selectate"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "Redenumeste Directorul"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Redenumeste directorul cu Mesaje-Trimise la inceputul lunii."
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Redenumirea lui \"%s\" in \"%s\" a esuat. Iata ce a zis serverul:"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Raspunde la Toti"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Inlocuieste cu:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Raspunde"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Raspunde la"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Raspunde la Toti"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Raspunde la Toti:"
 
-msgid "Reply"
-msgstr "Raspunde"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "Raspunde la Toti"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "Raspunde la Toti:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Raspunde la Toti"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "Raspuns-Catre:"
 
-msgid "Reply-to"
-msgstr "Raspunde la"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "Raspuns-Catre:"
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Raspunde:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Raporteaza ca Nedorit"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Raporteaza ca Nedorit"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "Cere Confirmare de Primire"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "Cere Confirmare de Primire"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Sterge Tot"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
+#, fuzzy
 msgid "Resume"
+msgstr "Sterge Tot"
+
+#: recompose.php:98
+msgid "Resume your session"
 msgstr ""
 
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Compune Mesaj Nou"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Alte Optiuni"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
-"Intoarce-te la lista de mesaje dupa stergerea, mutarea sau copierea unui mesaj."
+"Intoarce-te la lista de mesaje dupa stergerea, mutarea sau copierea unui "
+"mesaj."
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "Optiuni"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Directorul \"%s\" a fost sters cu succes."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "Trimite"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
 
-msgid "Rule Definition"
-msgstr "Defineste Regula"
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Subiect"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "Salveaza o copie in "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Salveaza ca"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Salveaza ca"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Salveaza Ciorna"
 
-msgid "Save a copy in "
-msgstr "Salveaza o copie in "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Salveaza ca"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "Optiuni"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Salveaza Ciorna"
 
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Salveaza ca"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Salveaza Mesaj-Trimis"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Salvarea Ciornei a esuat. Iata ce a spus serverul: %s"
 
-msgid "Search Results"
-msgstr "Rezultate Cautare"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Cautare"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Cautare"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Alte Optiuni"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "Rezultate Cautare"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Citite"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Selecteaza"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Selecteaza Nimic"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Selecteaza o identitate"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Selecteaza Tot"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Selecteaza Nimic"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Alege Agendele pentru adrese."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Selecteaza Tot"
 
-msgid "Select an identity"
-msgstr "Selecteaza o identitate"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "Alage ordinea de cautare in agende."
 
-msgid "Select charset:"
-msgstr "Selecteaza setul de caractere:"
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "Selecteaza Nimic"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Selecteaza Nimic"
 
-msgid "Select your preferred language:"
-msgstr "Selecteaza limba:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Selecteaza"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Agende selectate"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Optiuni Server"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Trimite"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "Director Mesaje-Trimise:"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Director Mesaje-Trimise:"
 
-msgid "September"
-msgstr "Septembrie"
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+#, fuzzy
+msgid "Server"
+msgstr "Niciodata"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "Optiuni Server"
 
-msgid "Server"
-msgstr ""
-
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Filtrare Mesaje primite impotriva continutului nedorit.<br />Cuvinte cenzurate."
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
+msgstr "Niciodata"
 
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "Alege ce se intimpla atunci cind muti, copiezi sau stergi mesaje."
 
-msgid "Set the current time zone."
-msgstr "Specifica localizarea geografica (fusul orar)."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Directoare"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Director Mesaje-Trimise:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Alege limba de afisare a meniurilor, explicatiilor si ajutorului."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Inchidem fereastra de compunere Mesaj Nou la salvarea ciornei."
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Restringe toate directoarele."
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Arata Mesaje Sterse"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "Date Personale"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Subscrie la Directo(r/are)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr ""
 
-msgid "Show last login time when logging in"
-msgstr "Afiseaza data si ora ultimei conectari."
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-msgid "Show legend in the mailbox view."
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
 msgstr "Afiseaza Legenda in lista de mesaje."
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "Marime"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Marime"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Marime"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Unele fisiere de configurare ale IMP lipsesc."
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "Expeditor"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "Marime Mesaj"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "Fara Subiect"
+
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr ""
 
-msgid "Sort Direction"
-msgstr "Directia de Sortare"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "Expeditor"
 
-msgid "Spam Report from"
-msgstr "Mesaj nedorit raportat de"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Gunoi:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Caractere Speciale"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr ""
 
+#: templates/compose/spelling.inc:46
+#, fuzzy
 msgid "Spell Checker"
-msgstr ""
+msgstr "Caractere Speciale"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr ""
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "greseli de ortografie pe pagina."
 
-msgid "Subject Field"
-msgstr "Subiectul"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Atasament"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Subiect"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Subiect"
 
-msgid "Subject:"
-msgstr "Subiect:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Subiectul"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "Subiect"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Subscrie la Directo(r/are)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr ""
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Sugestii"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Textul"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Textul"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Identitatea \"%s\" a fost stearsa."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Identitatea \"%s\" a fost salvata."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Directo(rul/arele) curent(e) \"%s\" vor fi redenumite ca \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Identitatea \"%s\" a fost stearsa."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Directorul \"%s\" exista deja."
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
-"Directorul \"%s\" contine caractere nepermise in numele sau."
-" Ar putea crea probleme. Contacteaza-l pe Administrator"
+"Directorul \"%s\" contine caractere nepermise in numele sau. Ar putea crea "
+"probleme. Contacteaza-l pe Administrator"
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Directorul \"%s\" a fost creat dar tu nu ai subscris la el."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Directorul \"%s\" a fost sters dar tu nu ai anulat subscrierea la el."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Directorul \"%s\" nu a fost creat. Iata ce a spus serverul:"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Directorul \"%s\" nu a fost sters. Iata ce a spus serverul:"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Directorul \"%s\" a fost creat cu succes."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Directorul \"%s\" a fost sters cu succes."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Directorul \"%s\" a fost redenumit cu succes ca \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "%s este deja gol."
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr ""
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "Identitatea \"%s\" a fost stearsa."
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "Identitatea \"%s\" a fost salvata."
 
-msgid "The message being composed has been closed.  Exiting."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
 msgstr ""
 
-msgid "The signature couldn't be replaced."
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
 msgstr ""
 
+#: templates/compose/compose.js:102
+#, fuzzy
 msgid "The signature was successfully replaced."
+msgstr "Directorul \"%s\" a fost creat cu succes."
+
+#: attachment.php:59
+msgid "The specified file does not exist."
 msgstr ""
 
-msgid "There are no messages in this mailbox."
-msgstr "Nu exista Mesaje in aceasta casuta postala."
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Identitatea \"%s\" a fost salvata."
 
-#, c-format
-msgid "There was a problem expunging %s. This is what the server said"
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Identitatea \"%s\" a fost stearsa."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Identitatea \"%s\" a fost stearsa."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
 msgstr ""
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "sterge mesajul"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
 msgstr ""
 
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
 msgstr ""
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
 msgstr ""
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Redirecteaza acest mesaj"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
 msgstr ""
 
-#, c-format
-msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
+msgid "There are no messages in this mailbox."
+msgstr "Nu exista Mesaje in aceasta casuta postala."
+
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, fuzzy, php-format
+msgid "There was a problem expunging %s. This is what the server said"
+msgstr "Directorul \"%s\" nu a fost creat. Iata ce a spus serverul:"
+
+#: lib/Message.php:653
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 
-#, c-format
+#: lib/Message.php:621
+#, fuzzy
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Directorul \"%s\" nu a fost sters. Iata ce a spus serverul:"
+
+#: lib/Message.php:90
+#, fuzzy, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "Redenumirea lui \"%s\" in \"%s\" a esuat. Iata ce a zis serverul:"
+
+#: lib/Message.php:198 lib/Message.php:213
+#, fuzzy, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
-msgstr ""
+msgstr "Directorul \"%s\" nu a fost sters. Iata ce a spus serverul:"
 
-#, c-format
+#: lib/Message.php:275
+#, fuzzy, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
-msgstr ""
+msgstr "Directorul \"%s\" nu a fost sters. Iata ce a spus serverul:"
 
-msgid "There was an error deleting messages. This is what the server said"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "Directorul \"%s\" nu a fost sters. Iata ce a spus serverul:"
+
+#: lib/MIME/Viewer/itip.php:99
+#, php-format
+msgid "There was an error deleting the event: %s."
 msgstr ""
 
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr ""
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, fuzzy, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
+msgstr "Directorul \"%s\" nu a fost creat. Iata ce a spus serverul:"
+
+#: folders.php:165
+#, php-format
+msgid "There was an error importing %s."
 msgstr ""
 
-msgid "There was an error flagging messages. This is what the server said"
+#: lib/MIME/Viewer/itip.php:136
+#, php-format
+msgid "There was an error importing the event: %s."
 msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:166
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:152
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr ""
+
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "Redenumirea lui \"%s\" in \"%s\" a esuat. Iata ce a zis serverul:"
+
+#: compose.php:1244
+msgid "There was an error saving this message as a draft."
+msgstr ""
+
+#: compose.php:1006
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:113
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Nu exista Mesaje in aceasta casuta postala."
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
 msgstr ""
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
 msgstr ""
 
-msgid "There was an error saving a draft."
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Aceasta operatiune este de durata. Esti sigur ca vrei sa continui ?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
 msgstr ""
 
-#, c-format
-msgid "There was an error sending your message: %s"
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
 msgstr ""
 
-msgid "There was an error undeleting messages. This is what the server said"
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
-msgid "There was an error viewing the requested message."
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "%s nu pare sa fie o casuta postala valida."
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
 msgstr ""
 
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
 msgstr ""
 
-msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Aceasta operatiune este de durata. Esti sigur ca vrei sa continui ?"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
+msgstr ""
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Acest mesaj a fost raportat Administratorului ca fiind Nedorit."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr ""
 
+#: message.php:211
 msgid "This message to"
 msgstr "Mesajul in"
 
-msgid "This number must be at least one."
+#: acl.php:46
+msgid "This server does not support sharing folders."
 msgstr ""
 
-msgid "This value must be a number."
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
 msgstr ""
 
-msgid "This window must be called from compose window"
-msgstr ""
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Afiseaza"
 
+#: thread.php:76 config/prefs.php.dist:922
+#, fuzzy
 msgid "Thread View"
-msgstr ""
-
-msgid "Thread"
-msgstr ""
-
-msgid "Time Zone"
-msgstr "Zona "
+msgstr "Reincarca fereastra"
 
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Catre"
 
-msgid "To:"
-msgstr "Catre:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "Expeditor"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
 
-#, c-format
-msgid "Total Size: %s KB"
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
 msgstr ""
 
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Atasamente"
+
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Gunoi:"
+
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Gunoi:"
 
-msgid "Unanswered messages"
-msgstr "Mesaje fara Raspuns"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Fara Raspuns"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Mesaje fara Raspuns"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Recupereaza"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr ""
 
-msgid "Unnamed"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
 msgstr ""
 
-msgid "Unread"
-msgstr "Necitite"
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+msgid "Unknown Recipient"
+msgstr ""
 
-msgid "Unseen Messages"
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
 msgstr ""
 
+#: fetchmailprefs.php:65
+#, fuzzy
+msgid "Unnamed"
+msgstr "Utilizator"
+
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Necitite"
 
+#: templates/folders/actions.inc:12
+#, fuzzy
 msgid "Unsubscribe from Folder(s)"
+msgstr "Subscrie la Directo(r/are)"
+
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
 msgstr ""
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Foloseste Ctrl/Option+Click pentru selestie multipla."
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Foloseste Valoarea Implicita"
 
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Subscrie la directoare IMAP."
 
-msgid "User Options"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Goleste Gunoiul"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Utilizator"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Utilizator"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "Utilizator"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "View"
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr ""
 
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Compune Mesaj Nou in fereastra separata."
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Mesaje Noi"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+msgid "View Thread"
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Compune Mesaj Nou in fereastra separata."
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Compune Mesaj Nou in fereastra separata."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
 msgstr ""
 
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
+msgstr "Mesaje Noi"
+
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "La conectare afiseaza:"
 
+#: lib/MIME/Viewer/itip.php:170
+msgid "View task"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Sterge mesajele"
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Directorul \"%s\" a fost sters cu succes."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Creaza Director"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Goleste Gunoiul"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "Atentie"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Bine ai venit in sistemul %s"
 
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
+#, fuzzy
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
 msgstr ""
 "Cind stergi un mesaj, muta-l in Gunoi in loc sa-l marchezi ca fiind sters."
 
-msgid "Wrap text at this many characters."
-msgstr "de caractere pe linie."
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Da"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Directorul urmator va fi sters:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Directorul urmator va fi sters:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Directorul urmator va fi sters:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "Redenumeste directorul: "
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Creare subdirector la "
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Creare director in radacina."
 
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Creare director in radacina."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Redenumeste directorul: "
 
-#, c-format
-msgid "You have %s new messages."
+#: lib/Folder.php:557
+#, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr ""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
 msgstr ""
 
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
+
+#: templates/mailbox/alert.inc:3
+#, fuzzy, php-format
+msgid "You have %s new messages."
+msgstr " - $nm mesaje noi"
+
+#: templates/mailbox/alert.inc:3
+#, fuzzy
 msgid "You have 1 new message."
+msgstr " - $nm mesaj nou"
+
+#: compose.php:494
+msgid "You have already submitted this page."
 msgstr ""
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Ai fost deconectat.<br />Iti multumim ca folosesti sistemul."
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
+#: lib/IMP.php:1074
+#, fuzzy
 msgid "You have new mail in the following folder:"
-msgstr ""
+msgstr "Directorul urmator va fi sters:"
 
+#: lib/IMP.php:1079
+#, fuzzy
 msgid "You have new mail in the following folders:"
-msgstr ""
+msgstr "Directorul urmator va fi sters:"
 
-msgid "You must first select the attachment(s) to delete."
+#: compose.php:153
+msgid "You must enter at least one recipient."
 msgstr ""
 
-msgid "You must first specify the file to attach."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 
-msgid "You must have at least one recipient."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
 msgstr ""
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr ""
 
-msgid "You must select an address first."
+#: fetchmailprefs.php:85
+msgid "You must select an account to be deleted."
 msgstr ""
 
-msgid "You must select an identity to be deleted."
+#: templates/contacts/contacts.inc:81
+msgid "You must select an address first."
 msgstr ""
 
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
+#, fuzzy
 msgid "You must select at least one message first."
-msgstr ""
+msgstr "Te rog alege cel putin un director de cautare."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr ""
 
-#, c-format
-msgid "You were not subscribed to \"%s\". Here is what the server said"
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Te rog alege cel putin un director de cautare."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr ""
 
-#, c-format
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Redirecteaza acest mesaj"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Redirecteaza acest mesaj"
+
+#: lib/Folder.php:507
+#, fuzzy, php-format
+msgid "You were not subscribed to \"%s\". Here is what the server said"
+msgstr "Redenumirea lui \"%s\" in \"%s\" a esuat. Iata ce a zis serverul:"
+
+#: lib/Folder.php:559
+#, fuzzy, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr ""
+msgstr "Directorul \"%s\" nu a fost creat. Iata ce a spus serverul:"
 
-#, c-format
+#: lib/Folder.php:510
+#, fuzzy, php-format
 msgid "You were successfully subscribed to \"%s\""
-msgstr ""
+msgstr "Directorul \"%s\" a fost redenumit cu succes ca \"%s\"."
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr ""
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "Numele complet:"
+
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
 msgstr ""
 
-msgid "Your From: address:"
-msgstr "Adresa de Expeditor:"
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
+msgstr ""
 
-msgid "Your Information"
-msgstr "Informatii Personale"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "Numele complet:"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Raspunde la: <i>(optional)</i>"
 
-msgid "Your browser does not support inline display of this image type"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
 
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
+msgstr "Identitati:"
+
+#: config/prefs.php.dist:173
 msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
 
-msgid "Your current time zone:"
-msgstr "Zona geografica:"
-
-msgid "Your default identity:"
-msgstr "Identitatea implicita:"
+#: lib/MIME/Viewer/images.php:92
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
 
-msgid "Your full name:"
-msgstr "Numele complet:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
 
-msgid "Your identities:"
-msgstr "Identitati:"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your options have been updated."
-msgstr "Optiunile au fost salvate."
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Directorul \"%s\" a fost sters cu succes."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Semnatura:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Fara Subiect]"
 
-msgid "add source"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Copie #2"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "Lista Neagra"
+
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Copie"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Sterge"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Directoare"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitate"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Deconectare"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "Sursa Mesajului"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Mesaje Noi"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Tipareste"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Reimprospateaza"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Raspunde"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Cautare"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Trimite"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Necitite"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Catre"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Recupereaza"
+
+#: templates/message/navbar_actions.inc:18
+msgid "_View Thread"
 msgstr ""
 
-msgid "cannot move past the beginning"
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
 msgstr ""
 
-msgid "cannot move past the end"
+#: lib/Compose.php:176
+msgid "addressee unknown"
 msgstr ""
 
-msgid "delete message"
-msgstr "sterge mesajul"
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Atasament"
 
-msgid "from"
-msgstr "de la"
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Atasamente"
 
-msgid "move down"
+#: templates/compose/compose.inc:513
+msgid "bytes"
 msgstr ""
 
-msgid "move message to"
-msgstr "muta mesajul in"
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
 
-msgid "move up"
+#: lib/Compose.php:172
+msgid "cannot open input"
 msgstr ""
 
-msgid "no folder selected"
+#: lib/Compose.php:164
+msgid "command line usage error"
 msgstr ""
 
-msgid "no rule selected"
+#: lib/Compose.php:220
+msgid "configuration error"
 msgstr ""
 
-msgid "no text specified"
+#: lib/Compose.php:196
+msgid "critical system file missing"
 msgstr ""
 
-msgid "none"
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
+msgid "from"
+msgstr "de la"
+
+#: lib/Compose.php:180
+msgid "host name unknown"
 msgstr ""
 
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
+
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Casuta de Mesaje"
+
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Nume"
+
+#: templates/compose/spelling.inc:76
+#, fuzzy
+msgid "none"
+msgstr "Gata"
+
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr ""
 
-msgid "please fill in the text and choose a field and an action"
+#: lib/Compose.php:216
+msgid "permission denied"
 msgstr ""
 
-msgid "remove source"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
 msgstr ""
 
-msgid "select folder"
-msgstr "alege unde"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
+#, fuzzy
 msgid "spelling error"
-msgstr ""
+msgstr "Nu exista greseli de scriere"
 
+#: templates/compose/spelling.inc:46
+#, fuzzy
 msgid "spelling errors"
+msgstr "Nu exista greseli de scriere"
+
+#: lib/Compose.php:192
+msgid "system error"
+msgstr ""
+
+#: lib/Compose.php:208
+msgid "temporary failure"
 msgstr ""
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "primite %s <b>%s</b>"
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "Lista Neagra"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/po/id_ID.po
+++ mod/po/id_ID.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP v3.2.2\n"
-"POT-Creation-Date: 2004-01-09 09:37+0700\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2004-01-09 13:56+0700\n"
 "Last-Translator: Slamin <slamin at unej.ac.id>\n"
 "Language-Team: UPT TI UNEJ <uptti at unej.ac.id>\n"
@@ -14,64 +15,195 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Kepada: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Kepada: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Tanggal: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "    Dari: "
 
-msgid " - $nm new message"
-msgstr " - $nm pesan baru"
-
-msgid " - $nm new messages"
-msgstr " - $nm pesan-pesan baru"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Perihal: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " pada "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#, c-format
-msgid "%d of %d Messages"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d dari %d Pesan"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+"Pesan ini sudah dilaporkan sebagai spam kepada administrator sistem anda."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr ""
+"Pesan ini sudah dilaporkan sebagai spam kepada administrator sistem anda."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d ke %d dari %d Pesan"
 
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s sudah ada. Nama folder %s anda tidak berubah."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s tidak muncul sebagai mailbox yang benar."
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Nama folder %s sedang diubah pada awal bulan."
 
-#, c-format
-msgid "%s is already empty."
-msgstr "%s sudah kosong."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Folder \"%s\" sudah diubah nama ke \"%s\" dengan sukses."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
 
-#, c-format
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;of&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Lakukan perubahan dan pindah ke layar berikutnya.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Abaikan semua perubahan dan kembali ke layar pengiriman.)"
 
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -79,47 +211,198 @@
 "(Kembali ke layar pengiriman setelah melakukan semua perubahan. Perubahan "
 "pada layar ini tidak akan dilakukan.)"
 
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Kembali ke layar pengiriman setelah melakukan semua perubahan. Perubahan "
+"pada layar ini tidak akan dilakukan.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Tambah dengan klik OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Silakan pilih alamat *"
 
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+"Pesan ini sudah dilaporkan sebagai spam kepada administrator sistem anda."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr ""
+"Pesan ini sudah dilaporkan sebagai spam kepada administrator sistem anda."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Karakter Spesial"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Karakter Spesial"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Karakter Spesial"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Karakter Spesial"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
 msgstr ""
-"<p><i>Pesan ini ditulis dengan kumpulan karakter selain punya anda. Jika "
-"tidak tampil dengan benar, %sklik disini</a> untuk membukanya pada sebuah "
-"window baru.</i></p>\n"
 
-msgid "Action"
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "Nama Indentitas"
+
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Aksi"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Tambahkan ke Buku Alamat (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "tambahkan sumber"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "Attachment ditambahkan."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Informasi Pribadi"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Buku Alamat"
 
-msgid "Addressbooks"
-msgstr "Buku alamat-alamat"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "Buku Alamat"
+
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Semua pesan dalam folder itu akan hilang!"
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Semua"
 
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "Semua pesan dalam folder berikut akan didownload pada satu file MBOX: "
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
@@ -127,116 +410,344 @@
 "Semua pesan dalam folder \"%s\" yang lebih dari %s hari akan dihapus secara "
 "permanen."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "Semua folder sent-mail lama yang lebih dari %s bulan akan dihapus."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "Semua folder sent-mail lama yang lebih dari %s bulan akan dihapus."
 
-msgid "All"
-msgstr "Semua"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Folder \"%s\" sudah diubah nama ke \"%s\" dengan sukses."
 
-msgid "Alternative"
-msgstr "Alternatif"
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
 
-msgid "An illegal value was specified."
-msgstr "Nilai ilegal telah terspesifikasi."
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
+
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "Attachment ditambahkan."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Kesalahan aneh terjadi pada penambahan entri baru."
 
-msgid "Answered messages"
-msgstr "Jawab pesan"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "Kesalahan aneh terjadi pada penambahan entri baru."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Jawab"
 
-msgid "Apply All Rules"
-msgstr "Lakukan Semua Aturan"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Jawab pesan"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Aktifkan Filter"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Aktifkan Filter"
 
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Lakukan aturan filter pada saat login?"
 
-msgid "Apply filter rules when mailbox is refreshed?"
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Lakukan aturan filter ketika mailbox dibuka ulang?"
 
-msgid "April"
-msgstr "April"
-
-msgid "Are you SURE you want to continue?"
-msgstr "Anda yakin ingin melanjutkan?"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
+msgstr "Anda yakin ingin melakukan ini?"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "Anda sangat yakin ingin melanjutkan?"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Anda yakin ingin melakukan ini?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Anda yakin ingin menghapus pesan-pesan ini secara PERMANEN?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Anda yakin ingin menghapus pesan-pesan ini secara PERMANEN?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Anda yakin ingin mengosongkan folder ini?"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Anda yakin ingin mengosongkan folder trash ini?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Anda yakin ingin mengosongkan folder trash ini?"
 
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Anda yakin ingin menghapus pesan-pesan ini secara PERMANEN?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Anda yakin ingin mengosongkan folder ini?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Anda yakin ingin mengosongkan folder ini?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Waktu Kedatangan"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Urutan menaik"
 
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Lampirkan"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Lampiran-lampiran"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "Lampirkan"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Lampiran"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Lampiran-lampiran"
 
-msgid "August"
-msgstr "Agustus"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Lampiran-lampiran"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Aksi"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "Buku alamat yang tersedia:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Kembali ke %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Kembali ke %s"
 
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Blacklist"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Body"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Keduanya"
 
-msgid "Cancel Message"
-msgstr "Batalkan Pesan"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Batalkan"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Batalkan Pesan"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Membatalkan pesan ini akan mengabaikan isinya secara permanen."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
-msgstr "Cc:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Pribadi"
+
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Ubah"
 
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Ubah Semua"
 
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Buat Folder"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -244,9 +755,12 @@
 "Ubah pilihan tampilan seperti banyaknya pesan yang anda lihat pada masing-"
 "masing halaman dan bagaimana pesan-pesan diurutkan."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Ubah pengaturan mail server"
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -254,72 +768,210 @@
 "Ubah nama, alamat, dan tandatangan yang dilihat orang ketika membaca dan "
 "membalas email anda."
 
-msgid "Change"
-msgstr "Ubah"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Cek Folder untuk Mail Baru"
 
-msgid "Checkbox"
-msgstr "Checkbox"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "Ada kesalahan saat mengirim pesan anda: %s"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Pilih Aksi:"
 
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Pilih mail server:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Pilih Aksi:"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
 msgstr "Pilih buku alamat yang digunakan ketika menambah alamat."
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Pilih urutan dari buku alamat yang dicari ketika mengembangkan alamat."
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Kosongkan semua pesan dari %s."
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
 
-msgid "Click here for Secure HTTPS"
-msgstr "Klik disini untuk Secure HTTPS"
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Kirim pesan pada window terpisah?"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
 
-msgid "Click here for Standard HTTP"
-msgstr "Klik disini untuk HTTP Standar"
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
 
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
 msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
+"Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
 "Klik pada salah satu buku alamat pilihan anda kemudian pilih semua field "
 "untuk mencari."
 
-msgid "Closed Folder"
-msgstr "Folder Tertutup"
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
 
-msgid "Collapse All Folders"
-msgstr "Hapus Semua Folder"
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
 
-msgid "Collapse All"
-msgstr "Hapus Semua"
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Kirim"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
+msgstr ""
+
+#: folders.php:429
+msgid "Closed Folder"
+msgstr "Folder Tertutup"
+
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Hapus Semua"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All"
+msgstr "Hapus Semua"
+
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Hapus Semua Folder"
 
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Hapus Folder"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Kirim Pesan (%s)"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "Kirim"
 
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "Kirim sebuah pesan"
 
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Kirim pesan pada window terpisah?"
 
-msgid "Compose"
-msgstr "Kirim"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
+
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Ubah pengaturan mail server"
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
 
-msgid "Contact List"
-msgstr "Daftar Kontak"
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
 
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -327,31 +979,100 @@
 "Kontrol jika mail baru akan dicek, dan apakah memberi tahu anda atau tidak "
 "jika mail datang."
 
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Copy"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Kosongkan folder Trash"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Benar"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Teks Benar"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Tidak bisa menghapus pesan dari %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Tidak bisa menghapus pesan dari %s: %s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Operasi Perawatan"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Buat"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Buat Folder"
 
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "Buat"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Buat Folder"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Buat folder trash baru"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Buat folder drafts baru"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Buat folder sent mail baru"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Buat folder trash baru"
 
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -359,846 +1080,2967 @@
 "Buat aturan filter untuk mengatur pesan masuk anda, urutkan ke folder, dan "
 "hapus spam."
 
-msgid "Create"
-msgstr "Buat"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Buat folder sent mail baru"
 
-msgid "Customize how you send mail and where drafts are saved."
-msgstr "Atur bagaimana anda kirim mail dan dimana drafts disimpan."
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr ""
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Atur operasi perawatan saat login pada %s."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "Atur bagaimana anda kirim mail dan dimana drafts disimpan."
 
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Atur tugas yang dijalankan saat logon pada %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Tanggal"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Tanggal"
 
-msgid "December"
-msgstr "Desember"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Dihapus"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Hapus"
 
-msgid "Default Identity"
-msgstr "Identitas Default"
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Kriteria urutan yang default"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Arah urutan yang default"
 
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Dihapus"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Hapus"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Hapus Folder"
 
-msgid "Delete messages"
-msgstr "Hapus pesan"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Hapus Folder"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Hapus Folder"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Hapus Folder"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Hapus folder sent-mail lama pada awal bulan?"
 
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Hapus folder sent-mail lama pada awal bulan?"
 
-msgid "Delete"
-msgstr "Hapus"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Hapus pesan"
 
-msgid "Deleted an attachment."
-msgstr "Hapus lampiran."
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Dihapus"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Pesan terhapus"
 
-msgid "Deleted"
-msgstr "Dihapus"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Hapus lampiran."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Menghapus dan Memindah Pesan"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Urut menurun"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Pilihan Pemakai"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Dim tandatangan?"
 
-msgid "Display Options"
-msgstr "Pilihan Tampilan"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Tampilkan"
 
-msgid ""
-"Display confirmation after sending a message? (only when not using a pop-up "
-"compose window)"
+#: config/prefs.php.dist:479
+#, fuzzy
+msgid "Display confirmation after sending a message?"
 msgstr ""
 "Tampilkan konfirmasi setelah mengirim pesan? (hanya jika tidak menggunakan "
 "window pengiriman pop-up)"
 
-msgid "Display message when filters have been applied?"
-msgstr "Tampilkan pesan jika sudah difilter?"
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Tampilkan pemberitahuan pop-up dari mail baru?"
 
-msgid "Display"
-msgstr "Tampilkan"
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "Pilihan Tampilan"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
 
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Jangan Tandai Folder untuk Mail Baru"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Apakah anda ingin membuka folder itu?"
 
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Sudah"
 
-#, c-format
-msgid "Download %s"
-msgstr "Download %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Download Folder"
 
-msgid "Download"
-msgstr "Download"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Download Folder"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Draft"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "Folder drafts"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Folder drafts"
 
-msgid "Edit your filter rules"
-msgstr "Edit aturan filter"
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "Alamat Email"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
 
-msgid "Edit your identities"
-msgstr "Edit identitas anda"
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
 
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Edit"
 
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "Blacklist"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Filter Mail"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit Whitelist"
+msgstr "Whitelist"
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Edit aturan filter"
+
+#: templates/filters/prefs.inc:13
+msgid "Edit your filter rules"
+msgstr "Edit aturan filter"
+
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Edit aturan filter"
+
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Alamat Email"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Kosongkan semua pesan dari %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Kosongkan Folder"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Kosongkan Folder"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Kosongkan folder Trash"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Kosongkan Trash"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Kosongkan Trash"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Akhir pesan yang diteruskan"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "Pesan Lama"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "Teruskan pesan dari %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Masukkan nama untuk folder trash baru"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Masukkan nama untuk folder drafts baru"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Masukkan nama untuk folder sent mail baru"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Masukkan nama untuk folder trash baru"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Arahkan Pesan"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Entri \"%s\" telah ditambahkan ke buku alamat dengan sukses"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Salah"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Folder \"%s\" sudah dihapus dengan sukses."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Setiap 15 menit"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Setiap 30 detik"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Setiap 5 menit"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Setiap setengah jam"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Setiap menit"
 
-msgid "Expand All Folders"
-msgstr "Kembangkan Semua Folder"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Kembangkan Semua"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Kembangkan Semua"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Kembangkan Semua Folder"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Kembangkan Folder"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Kembangkan Nama"
 
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Kembangkan seluruh hirarki folder secara default pada tampilan folder?"
 
-msgid "February"
-msgstr "Pebruari"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Kembangkan Semua"
+
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Mail Baru"
 
-msgid "Field"
-msgstr "Field"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "Mail Baru"
 
-msgid "Filename"
-msgstr "Namafile"
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "Kirim pesan pada window terpisah?"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Aktifitas Filter: Pesan \"%s\" dari \"%s\" sudah dihapus."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Lakukan aturan filter pada saat login?"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"Aktifitas Filter: Pesan \"%s\" dari \"%s\" sudah dipindah ke folder \"%s\"."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Kosongkan semua pesan dari %s."
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Teruskan pesan dari %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
-"Aktifitas Filter: Pesan \"%s\" dari \"%s\" sudah dipindah ke folder Trash "
 
-msgid "Filter Rules"
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Anda punya %s pesan baru."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Filter"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Filter"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Pilihan Lain"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Aturan Filter"
 
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "Filter isi pesan untuk profanity?"
 
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filter"
 
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Cari"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Halaman Pertama"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Halaman Pertama"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Teruskan"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Navigator Folder"
 
-msgid "Folder Prefix"
-msgstr "Prefix Folder"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Pebruari"
 
-msgid "Folders"
-msgstr "Folder"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Teruskan"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Teruskan:"
 
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Akhir pesan yang diteruskan"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Teruskan pesan dari %s"
 
-msgid "From Address"
-msgstr "Dari Alamat"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Informasi Server"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "Dari"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Dari"
 
-msgid "From:"
-msgstr "Dari:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "Dari Alamat"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fwd:"
 
-msgid "Help"
-msgstr "Bantuan"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "Fwd:"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Akhir pesan yang diteruskan"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Pilihan Pemakai"
 
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
+
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "Pesan Berikutnya"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Tambahkan ke Buku Alamat (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
+
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "Lihat Thread"
+
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Sembunyikan yang Dihapus"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Sembunyikan tidak langganan"
 
-msgid "How to prefix quoted lines in a reply:"
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Bagaimana baris diprefik dalam balasan:"
 
-msgid "IMP is not properly configured"
-msgstr "IMP tidak dikonfigurasi dengan sempurna"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
 
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-msgid "Identities"
-msgstr "Identitas-identitas"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity"
-msgstr "Identitas"
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Semua pesan dalam folder itu akan hilang!"
 
-msgid "Identity's name:"
-msgstr "Nama Indentitas"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Abaikan"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Abaikan Semua"
 
-msgid "Ignore"
-msgstr "Abaikan"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
-msgid "Important messages"
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Penting"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "Penting"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "Penting"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
 msgstr "Pesan penting"
 
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Penting"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Pesan penting"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Kosongkan semua pesan dari %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Masukkan pesan asli pada balasan?"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Masukkan pesan asli pada balasan?"
 
-msgid "Invalid character in e-mail address."
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Abaikan"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "tidak ada"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "Alamat Email"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, fuzzy, php-format
+msgid "Invalid character in e-mail address: %s."
 msgstr "Karakter salah pada alamat e-mail."
 
-msgid "January"
-msgstr "Januari"
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
 
-msgid "July"
-msgstr "Juli"
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
 
-msgid "June"
-msgstr "Juni"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
 
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
+
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Bahasa"
 
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "Halaman Terakhir"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Halaman Terakhir"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Login terakhir: %s"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Lampiran-lampiran"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
 
-msgid "Last login: Never"
-msgstr "Login terakhir: Tidak pernah"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-#, c-format
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "Mailbox"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Aksi"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Masuk"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Masuk pada %s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Masuk"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Login Tugas"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: templates/compose/compose.inc:296
+msgid "Low"
 msgstr ""
-"Login gagal karena beberapa alasan. Sangat mungkin username atau password "
-"yang anda masukkan salah."
 
-msgid "Logout"
-msgstr "Keluar"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
 
-msgid "Mail Filters"
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
 msgstr "Filter Mail"
 
-msgid "Mail Management"
-msgstr "Manajemen Mail"
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "Mailbox"
 
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
+msgstr "Filter Mail"
+
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
+
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Mailbox"
 
-msgid "Maintenance Operations"
-msgstr "Operasi Perawatan"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Pilihan Tampilan"
 
-msgid "March"
-msgstr "Maret"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
 
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Tandai sebagai:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Tandai perbedaan tingkat dengan warna yang berbeda?"
 
-msgid "May"
-msgstr "Mei"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Lampiran"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Informasi Server"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Buka Folder"
+
+#: lib/Compose.php:331
+msgid "Message"
+msgstr "Pesan"
+
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Pengiriman Pesan"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Tanggal Pesan"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "Pesan ke"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Cari Pesan"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Ukuran Pesan"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Sumber Pesan"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Lihat Pesan"
 
-msgid "Message fields"
-msgstr "Field pesan"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Flag pesan"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Folder Pesan"
 
-msgid "Message sent successfully"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "Folder Pesan"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Hapus lampiran."
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Field pesan"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Field pesan"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Tanggal Pesan"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
 msgstr "Pesan dikirim dengan sukses"
 
-msgid "Message sent successfully, but not saved to"
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
 msgstr "Pesan dikirim dengan sukses, tapi tidak disimpan"
 
-msgid "Message"
-msgstr "Pesan"
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "Pesan dikirim dengan sukses"
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Pesan per halaman pada tampilan mailbox."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Pesan ke"
 
-msgid "Mime Type"
-msgstr "Jenis Mime"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Ubah"
 
-msgid "Move Down"
-msgstr "Kebawah"
-
-msgid "Move Up"
-msgstr "Keatas"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Pindah pesan ke folder <b>%s</b>"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Pindah"
 
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "turun"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "pilih folder"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "naik"
+
+#: lib/MIME/Viewer/alternative.php:127
+#, fuzzy
+msgid "Multipart/alternative"
+msgstr "Alternatif"
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Lihat Pesan"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
+
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nama"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Aksi"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Tidak pernah"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "Hapus lampiran."
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Baru"
+
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Folder Baru"
 
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Mail Baru"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Pesan Berikutnya"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Pesan baru"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Pesan baru"
 
-msgid "New"
-msgstr "Baru"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Berikutnya"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Pesan Berikutnya"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Halam Berikutnya"
 
-msgid "Next"
-msgstr "Berikutnya"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "Tidak"
 
-msgid "No Subject"
-msgstr "Tidak ada Perihal"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "Pesan baru"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Teks Benar"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "Lampiran-lampiran"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "tidak ada folder yang dipilih"
 
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Tidak ada folder yang terspesifikasi"
 
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Pesan tidak terhapus"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Pesan tidak terhapus"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "pindah pesan ke"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "Tidak ada pesan yang anda cari"
 
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Tidak ada kesalahan pengejaan"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Tidak ada saran"
 
-msgid "No"
-msgstr "Tidak"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "Tidak ada folder yang terspesifikasi"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Tidak ada"
 
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Tidak Dihapus"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Bukan Draft"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Tidak Penting"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Tidak Pribadi"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Pesan tidak terhapus"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Pesan tidak penting"
 
-msgid "November"
-msgstr "Nopember"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Quoting"
 
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "Jumlah folder sent-mail lama yang tetap ada jika dihapus bulanan."
+
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "Jumlah folder sent-mail lama yang tetap ada jika dihapus bulanan."
 
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-msgid "October"
-msgstr "Oktober"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Pesan Lama"
 
-msgid "Old sent-mail folders being purged."
-msgstr "Folder sent-mail lama sedang dibuang."
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Folder sent-mail lama sedang dibuang."
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "Pilih hanya satu folder untuk operasi ini."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Buka Folder"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Buka Folder"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "Pilihan Lain"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "Pilihan Lain"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "Batalkan Pesan"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "Salah"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "Pilihan"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Folder \"%s\" sudah dibuat dengan sukses."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Folder \"%s\" sudah dihapus dengan sukses."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "Kirim Pesan"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "Tandatangan sudah diganti dengan sukses."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
 
-msgid "Open Folder"
-msgstr "Buka Folder"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-msgid "Options"
-msgstr "Pilihan"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-msgid "Other Options"
-msgstr "Pilihan Lain"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Halaman %d dari %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Bagian"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "Pesan dikirim dengan sukses, tapi tidak disimpan"
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Password"
 
-msgid "Path to your mail folders:"
-msgstr "Path ke folder mail anda:"
-
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "Lakukan operasi perawatan pada login?"
 
-msgid "Personal Information"
-msgstr "Informasi Pribadi"
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
 
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Pribadi"
 
+#: config/prefs.php.dist:14
+msgid "Personal Information"
+msgstr "Informasi Pribadi"
+
+#: pgp.php:120
+#, fuzzy
+msgid "Personal PGP keypair generated successfully."
+msgstr "Pesan dikirim dengan sukses"
+
+#: pgp.php:127
+#, fuzzy
+msgid "Personal PGP keys deleted successfully."
+msgstr "Pesan dikirim dengan sukses"
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Letakkan tandatangan anda sebelum membalas dan meneruskan?"
 
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Masukkan nama untuk folder baru:"
 
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Masukkan nama dari folder baru:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Masukkan nama baru:"
 
-msgid "Please enter valid search criteria."
-msgstr "Masukkan kriteria pencarian yang benar."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "Berikan username dan password anda"
 
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "Berikan username dan password anda"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Betulkan alamat yang rancu dan tidak benar."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Pilih sebuah folder sebelum melakukan aksi."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "Pilih sedikitnya satu folder untuk pencarian."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Pilih sedikitnya satu folder untuk pencarian."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Pilih hanya satu folder untuk operasi ini."
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "Pilih atau edit tepat berikutnya:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Awali tandatangan anda dengan dash ('-- ')"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "Folder \"%s\" sudah dibuat dengan sukses."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Halaman Sebelumnya"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Pesan Sebelumnya"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Halaman Sebelumnya"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Cetak"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Masalah dengan aturan filter %d: folder tidak ada: %s"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "Cetak"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
 
-msgid "Problem?"
-msgstr "Masalah?"
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Buang yang Dihapus"
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Buang yang Dihapus"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Hapus Folder"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Buang Trash selama:"
 
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Buang pesan lama dalam folder Trash yang lebih dari jumlah jatah hari."
 
-msgid "Purge old message in the Trash folder?"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Buang pesan lama dalam folder Trash?"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "%d pesan sedang dibuang dari folder Trash."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "%d pesan sedang dibuang dari folder Trash."
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Quoting"
 
-msgid "Received after"
-msgstr "Diterima setelah"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Diterima pada"
 
-msgid "Received before"
-msgstr "Diterima sebelum"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Diterima pada"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Diterima pada"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Arahkan"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Arahkan"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Arahkan Pesan"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Arahkan pesan ini"
 
-msgid "Redirect"
-msgstr "Arahkan"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Pengarahan gagal"
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Tampil Ulang"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Tampil Ulang Folder:"
 
-msgid "Refresh"
-msgstr "Tampil Ulang"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Tampil Lagi"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Tampil Lagi"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Ingat tampilan terakhir"
 
-msgid "Remove Selected"
-msgstr "Pindah yang Dipilih"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "Mailbox"
+
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "hapus sumber"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "Ubah Nama Folder"
 
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Ubah nama folder sent-mail pada awal bulan?"
 
-#, c-format
-msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said."
+#: lib/Folder.php:455
+#, fuzzy, php-format
+msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Perubahan nama \"%s\" ke \"%s\" gagal. Itulah yang dikatakan server."
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Balas ke Semua"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Ganti dengan:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Balas"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Balas-kepada"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Balas ke Semua"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Balas ke Semua:"
 
-msgid "Reply"
-msgstr "Balas"
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "Balas ke Semua"
 
-msgid "Reply-To: "
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "Balas ke Semua:"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Balas ke Semua"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "Balas-Kepada:"
 
-msgid "Reply-to"
-msgstr "Balas-kepada"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "Balas-Kepada:"
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Balas:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Laporkan sebagai Spam"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Laporkan sebagai Spam"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "Minta Tanda Terima"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "Minta Tanda Terima"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Reset"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Ulangi"
 
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Pengiriman Pesan"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Pilihan Pemakai"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Kembali ke mailbox setelah penghapusan, pemindahan dan pengcopyan pesan?"
 
-msgid "Rule Definition"
-msgstr "Definisi Aturan"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "Pilihan"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Folder \"%s\" sudah dihapus dengan sukses."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "Kirim Pesan"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Perihal"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "Simpan copy dalam "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Simpan sebagai"
 
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Simpan sebagai"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Simpan Draft"
 
-msgid "Save a copy in "
-msgstr "Simpan copy dalam "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Simpan sebagai"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
 
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "Pilihan Pemakai"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Simpan Draft"
+
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Simpan sebagai"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Simpan mail yang dikirim"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Penyimpanan draft gagal. Ini yang dikatakan server: %s"
 
-msgid "Search Results"
-msgstr "Hasil Pencarian"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Cari"
 
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Cari"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Pilihan Pemakai"
+
+#: search.php:265
+msgid "Search Results"
+msgstr "Hasil Pencarian"
+
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Dilihat"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Pilih"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Pilih tidak ada"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Pilih identitas"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Pilih semua"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Pilih tidak ada"
+
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Pilih sumber buku alamat untuk penambahan dan pencarian alamat."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Pilih semua"
 
-msgid "Select an identity"
-msgstr "Pilih identitas"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "Pilih urutan dari buku alamat yang dicari ketika mengembangkan alamat."
 
-msgid "Select charset:"
-msgstr "Pilih charset:"
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "Pilih tidak ada"
 
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Pilih tidak ada"
 
-msgid "Select your preferred language:"
-msgstr "Pilih bahasa yang anda diinginkan:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Pilih"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Buku Alamat yang Dipilih"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Informasi Server"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Kirim Pesan"
 
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "Folder sent mail:"
+
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Folder sent mail:"
 
-msgid "September"
-msgstr "September"
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
+msgid "Server"
+msgstr "Server"
 
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "Informasi Server"
 
-msgid "Server"
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
 msgstr "Server"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Set preference untuk memfilter pesan pada isi yang tidak diinginkan."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
 "Set preference apa yang terjadi jika anda memindah dan menghapus pesan."
 
-msgid "Set the current time zone."
-msgstr "Set zona waktu yang berlaku."
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
+msgstr ""
+
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Folder"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Folder sent mail:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Set bahasa pada item menu, penjelasan dan bantuan yang ada."
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Haruskah window pengiriman ditutup setelah menyimpan draft?"
 
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Hapus Semua Folder"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Tunjukkan yang Dihapus"
 
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "Informasi Pribadi"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Subscribe ke Folder"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Tunjukkan tidak langganan"
 
-msgid "Show last login time when logging in?"
-msgstr "Tunjukkan waktu login terakhir jika login?"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Tunjukkan legenda pada tampilan mailbox?"
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+#, fuzzy
+msgid "Show total number of mails in folder?"
+msgstr "Path ke folder mail anda:"
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "Ukuran"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Ukuran"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Ukuran"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Beberapa file konfigurasi IMP hilang:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "Dari Alamat"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "Ukuran Pesan"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "Tidak ada Perihal"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "Thread"
 
-msgid "Sort Direction"
-msgstr "Arah Urutan"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "Dari Alamat"
 
-msgid "Spam Report from"
-msgstr "Laporan Spam dari"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Folder Trash:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Karakter Spesial"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Cek Ejaan"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Pengecek Ejaan"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Cek ejaan selesai"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Eja kesalahan per layar jika mengecek ejaan"
 
-msgid "Subject Field"
-msgstr "Field Perihal"
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Lampiran"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Perihal"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Perihal"
 
-msgid "Subject:"
-msgstr "Perihal:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Field Perihal"
+
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "Perihal"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Subscribe ke Folder"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Sukses"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Saran"
 
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Teks"
+
+#: lib/MIME/Viewer/itip.php:269
+#, fuzzy
+msgid "Tentative: "
+msgstr "Alternatif"
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Teks"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Identitas \"%s\" sudah dihapus."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Identitas \"%s\" sudah disimpan."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Folder \"%s\" yang berlaku akan diubah nama ke \"%s\"."
 
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Identitas \"%s\" sudah dihapus."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Folder \"%s\" sudah ada"
 
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1206,87 +4048,231 @@
 "Folder \"%s\" berisi karakter ilegal pada namanya. Ini mungkin menjadi "
 "masalah. Silakan tanya pada administrator sistem anda."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Folder \"%s\" sudah dibuat tetapi anda tidak melanggan padanya."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Folder \"%s\" sudah dihapus tetapi anda tidak tidak melanggan darinya."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Folder \"%s\" sudah dibuat. Ini yang dikatakan server"
 
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Folder \"%s\" tidak dihapus. Ini yang dikatakan server"
 
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Folder \"%s\" sudah dibuat dengan sukses."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Folder \"%s\" sudah dihapus dengan sukses."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Folder \"%s\" sudah diubah nama ke \"%s\" dengan sukses."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "Identitas \"%s\" sudah dihapus."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "Identitas \"%s\" sudah disimpan."
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "%s sudah kosong."
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
 
-msgid "The message being composed has been closed.  Exiting."
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
 msgstr "Pesan yang sedang dikirim sudah ditutup. Keluar."
 
-msgid "The signature couldn't be replaced."
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
+msgstr "Identitas \"%s\" sudah dihapus."
+
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "Tandatangan tidak dapat diganti."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Tandatangan sudah diganti dengan sukses."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Identitas \"%s\" sudah disimpan."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Identitas \"%s\" sudah dihapus."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Identitas \"%s\" sudah dihapus."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "hapus pesan"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Arahkan pesan ini"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Tandatangan sudah diganti dengan sukses."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Tidak ada pesan dalam mailbox ini."
 
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Ada masalah expunging %s. Ini yang dikatakan server"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Ada masalah expunging mailbox. Ini yang dikatakan server"
-
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Ada masalah expunging mailbox. Ini yang dikatakan server: %s"
 
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"Ada masalah dengan upload file. File tersebut mungkin lebih besar dari "
-"ukuran maksimum yang dibolehkan (%d MB)."
-
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"Ada masalah dengan upload file. File tersebut mungkin lebih besar dari "
-"ukuran maksimum yang dibolehkan."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Ada masalah expunging mailbox. Ini yang dikatakan server"
 
-#, c-format
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr "Ada kesalahan saat mengcopy pesan ke \"%s\". Ini yang dikatakan server"
 
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
@@ -1294,19 +4280,29 @@
 "Ada kesalahan saat menghapus pesan dari folder \"%s\". Ini yang dikatakan "
 "server"
 
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "Ada kesalahan mengcopy pesan ke \"%s\". Ini yang dikatakan server"
 
-msgid "There was an error deleting messages. This is what the server said"
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Ada kesalahan saat menghapus pesan. Ini yang dikatakan server"
 
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Ada kesalahan saat melihat pesan yang diminta."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Ada kesalahan saat menampilkan bagian pesan ini"
 
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
@@ -1314,173 +4310,435 @@
 "Ada kesalahan saat memflag pesan dari folder \"%s\". Ini yang dikatakan "
 "server"
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Ada kesalahan saat memflag pesan. Ini yang dikatakan server"
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "Ada kesalahan saat menyimpan draft."
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr "Ada kesalahan saat memindah pesan ke \"%s\". Ini yang dikatakan server"
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Ada kesalahan saat melihat pesan yang diminta."
+
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Ada kesalahan saat melihat pesan yang diminta."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Ada kesalahan saat mengirim pesan anda: %s"
 
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
-msgstr "Ada kesalahan saat memindah pesan ke trash. Ini yang dikatakan server"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "Ada kesalahan saat memindah pesan ke \"%s\". Ini yang dikatakan server"
 
-msgid "There was an error saving a draft."
-msgstr "Ada kesalahan saat menyimpan draft."
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "Ada kesalahan saat menampilkan bagian pesan ini"
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Ada kesalahan saat mengirim pesan anda: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr ""
-"Ada kesalahan saat membatalkan penghapusan pesan. Ini yang dikatakan server"
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Ada kesalahan saat mengirim pesan anda: %s"
 
-msgid "There was an error viewing the requested message."
-msgstr "Ada kesalahan saat melihat pesan yang diminta."
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Ada kesalahan saat menampilkan bagian pesan ini"
+
+#: lib/MIME/Viewer/html.php:97
+#, fuzzy
+msgid "This HTML message has images embedded in it."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
 
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
 msgstr ""
-"File ini mengontrol driver MIME lokal untuk IMP, khususnya jenis dari "
-"lampiran apa yang bisa dilihat dan/atau didownload."
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
 msgstr ""
-"File ini mengontrol preference default untuk IMP, dan juga mengontrol "
-"preferences mana yang bisa diubah pemakai."
 
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Ini mungkin butuh waktu. Anda yakin ingin melanjutkan?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
-"File ini mengontrol setting default untuk IMP, dan juga mendefinisikan "
-"daftar server yang tersedia jika anda menggunakan daftar server."
 
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"File ini mengontrol stylesheet yang digunakan untuk mengatur warna dan font "
-"dalam penambahan atau penggantian default Horde."
 
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "%s tidak muncul sebagai mailbox yang benar."
+
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
-"Ini adalah file utama konfigurasi IMP. File ini berisi path dan pilihan "
-"untuk scripts IMP."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Ini mungkin butuh waktu. Anda yakin ingin melanjutkan?"
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+#, fuzzy
+msgid "This message has been digitally signed via PGP."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr ""
-"Pesan ini sudah dilaporkan sebagai spam kepada administrator sistem anda."
+#: lib/MIME/Viewer/pkcs7.php:143
+#, fuzzy
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
+
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#, fuzzy
+msgid "This message has been encrypted via S/MIME."
+msgstr "Pesan ini sudah dilaporkan sebagai spam."
 
-msgid "This message has been reported as spam."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+#, fuzzy
+msgid "This message has been encrypted with PGP."
 msgstr "Pesan ini sudah dilaporkan sebagai spam."
 
+#: message.php:211
 msgid "This message to"
 msgstr "Pesan ini kepada"
 
-msgid "This number must be at least one."
-msgstr "Angka ini paling sedikit harus satu."
-
-msgid "This value must be a number."
-msgstr "Nilai ini harus angka."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "Window ini harus dipanggil dari window pengiriman"
 
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Tampilkan"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Lihat Thread"
 
-msgid "Thread"
-msgstr "Thread"
-
-msgid "Time Zone"
-msgstr "Zona Waktu"
-
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Kepada"
 
-msgid "To:"
-msgstr "Kepada:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "Dari Alamat"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Lampiran-lampiran"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Ukuran Total: %s KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Folder Trash:"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Folder Trash:"
 
-msgid "Unanswered messages"
-msgstr "Pesan tidak dijawab"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Tidak dijawab"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Pesan tidak dijawab"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Tidak dihapus"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Penerima rahasia"
 
-msgid "Unnamed"
-msgstr "Tidak dinamai"
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
 
-msgid "Unread"
-msgstr "Tidak dibaca"
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "Penerima rahasia"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
 
-msgid "Unseen Messages"
-msgstr "Pesan tidak dilihat"
+#: fetchmailprefs.php:65
+msgid "Unnamed"
+msgstr "Tidak dinamai"
 
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Tidak dilihat"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Tidak langganan dari Folder"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Gunakan Ctrl/Option+Klik untuk memilih field ganda"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Gunakan Nilai Default"
 
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Gunakan folder IMAP langganan?"
 
-msgid "User Options"
-msgstr "Pilihan Pemakai"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Kosongkan folder Trash"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Username"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
 
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Username"
 
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "Username"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "Lihat %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Lihat %s"
 
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Kirim pesan pada window terpisah?"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Pesan baru"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Thread"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Kirim pesan pada window terpisah?"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Kirim pesan pada window terpisah?"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "Lihat pesan dalam "
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Lihat atau tampilkan mailbox setelah login:"
 
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "Lihat %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Lihat pesan dalam "
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Folder \"%s\" sudah dihapus dengan sukses."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Buat Folder"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Kosongkan folder Trash"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "Peringatan"
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Selamat Datang di %s"
 
-msgid "Welcome to UNEJ Mail"
-msgstr "Selamat Datang di UNEJ Mail"
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
 
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -1488,207 +4746,490 @@
 "Jika pesan dihapus, pindahkan mereka ke folder Trash anda daripada menandai "
 "mereka dengan terhapus?"
 
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Whitelist"
 
-msgid "Wrap text at this many characters."
-msgstr "Kumpulkan teks pada karakter ini."
-
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Ya"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Anda sedang mencoba menghapus folder berikut ini:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Anda sedang mencoba menghapus folder berikut ini:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Anda sedang mencoba menghapus folder berikut ini:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Anda sedang mengcopy/memindah ke folder baru."
 
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Anda sedang membuat sub-folder ke "
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Anda sedang membuat folder tingkat-atas."
 
-msgid "You are currently using Secure HTTPS<br/>"
-msgstr "Anda sedang menggunakan Secure HTTPS<br/>"
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Anda sedang membuat folder tingkat-atas."
 
-msgid "You are currently using Standard HTTP<br/>"
-msgstr "Anda sedang menggunakan HTTP Standar<br/>"
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
 
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Anda sedang mengubah nama folder: "
 
-msgid "You can not have the '\\' character in your full name."
-msgstr "Anda tidak bisa menggunakan karakter '\\' pada nama lengkap anda."
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Anda sudah tidak-langganan dari \"%s\" dengan sukses"
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
 
-#, c-format
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Anda punya %s pesan baru."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Anda punya 1 pesan baru."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Anda sudah keluar.<br />Terima kasih telah menggunakan sistem ini."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Anda punya 1 pesan baru."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Anda punya mail dalam folder berikut ini:"
 
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Anda punya mail dalam folder-folder berikut ini:"
 
-msgid "You must first select the attachment(s) to delete."
-msgstr "Anda harus memilih dulu lampiran yang akan dihapus."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Anda harus punya paling sedikitnya satu penerima."
 
-msgid "You must first specify the file to attach."
-msgstr "Anda harus menspesifikasi dulu file yang akan dilampirkan."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-msgid "You must have at least one recipient."
-msgstr "Anda harus punya paling sedikitnya satu penerima."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Anda harus memilih mailbox target dulu."
 
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "Anda harus memilih identitas yang akan dihapus."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Anda harus memilih alamat dulu."
 
-msgid "You must select an identity to be deleted."
-msgstr "Anda harus memilih identitas yang akan dihapus."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Anda harus memilih dulu paling sedikitnya satu pesan"
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Anda harus menspesifikasi penerima."
 
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Anda harus menspesifikasi dulu file yang akan dilampirkan."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Arahkan pesan ini"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Arahkan pesan ini"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Anda tidak langganan ke \"%s\". Ini yang dikatakan server"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Anda tidak tidak-langganan dari \"%s\". Ini yang dikatakan server"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Anda sudah langganan ke \"%s\" dengan sukses"
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Anda sudah tidak-langganan dari \"%s\" dengan sukses"
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Sesi %s anda sudah habis. Silakan login lagi."
-
-msgid "Your From: address:"
-msgstr "Dari Anda: alamat:"
-
-msgid "Your Information"
-msgstr "Informasi Anda"
-
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Balasan kepada Anda: alamat: <i>(pilihan)</i>"
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "Nama lengkap anda:"
 
-msgid "Your browser does not support inline display of this image type"
-msgstr "Browser anda tidak mendukung penampilan inline dari jenis gambar ini"
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
 msgstr ""
-"Browser anda tidak mendukung pilihan cetak ini. Tekan Control/Option + P "
-"untuk mencetak."
 
-msgid "Your current time zone:"
-msgstr "Zona waktu anda saat ini:"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "Nama lengkap anda:"
 
-msgid "Your default identity:"
-msgstr "Identitas default anda:"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Balasan kepada Anda: alamat: <i>(pilihan)</i>"
 
-msgid "Your full name:"
-msgstr "Nama lengkap anda:"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
 
-msgid "Your identities:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
 msgstr "Identitas anda:"
 
-msgid "Your options have been updated."
-msgstr "Pilihan anda sudah diperbarui."
-
+#: config/prefs.php.dist:173
 msgid ""
-"Your session will expire in 1 minute. Do you want to reload the page to "
-"prevent losing your work?"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Sesi anda akan habis dalam 1 menit. Apakah anda ingin mengambil ulang "
-"halaman tersebut untuk menghindari kesia-siaan kerja anda?"
 
-msgid ""
-"Your session will expire in 5 minutes. Do you want to reload the page to "
-"prevent losing your work?"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr "Browser anda tidak mendukung penampilan inline dari jenis gambar ini"
+
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
 msgstr ""
-"Sesi anda akan habis dalam 5 menit. Apakah anda ingin mengambil ulang "
-"halaman tersebut untuk menghindari kesia-siaan kerja anda?"
 
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Folder \"%s\" sudah dihapus dengan sukses."
+
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Tandatangan Anda"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Tidak ada Perihal]"
 
-msgid "add source"
-msgstr "tambahkan sumber"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Bcc"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "Blacklist"
 
-msgid "cannot move past the beginning"
-msgstr "tidak bisa pindah ke awal"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Cc"
 
-msgid "cannot move past the end"
-msgstr "tidak bisa pindah ke akhir"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Hapus"
 
-msgid "delete message"
-msgstr "hapus pesan"
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Folder"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitas"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Keluar"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "Sumber Pesan"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Pesan baru"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Cetak"
 
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Tampil Ulang"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Balas"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Cari"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Kirim Pesan"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Thread"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Kepada"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Tidak dihapus"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Thread"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+#, fuzzy
+msgid "_Whitelist"
+msgstr "Whitelist"
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Lampiran"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Lampiran-lampiran"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "dari"
 
-msgid "move down"
-msgstr "turun"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-msgid "move message to"
-msgstr "pindah pesan ke"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-msgid "move up"
-msgstr "naik"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-msgid "no folder selected"
-msgstr "tidak ada folder yang dipilih"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "tidak ada aturan yang dipilih"
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Mailbox"
 
-msgid "no text specified"
-msgstr "tidak ada teks yang dispesifikasi"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Nama"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "tidak ada"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "atau"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "silakan isi teks dan pilih field dan aksi"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "hapus sumber"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "pilih folder"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "kesalahan ejaan"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "kesalahan-kesalahan ejaan"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "dimana field %s berisi <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "kesalahan ejaan"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "Blacklist"
+
+#: lib/Filter.php:61
+#, fuzzy
+msgid "your whitelist"
+msgstr "Whitelist"


--- orig/pgp.php
+++ mod/pgp.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: imp/pgp.php,v 2.79.6.1 2005/01/03 12:25:32 jan Exp $
+ * $Horde: imp/pgp.php,v 2.79.6.8 2006/04/10 05:03:43 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -28,7 +28,6 @@
     }
 
     $title = _("PGP Passphrase Input");
-    $notification->push('document.passphrase_dialog.passphrase.focus();', 'javascript');
     require IMP_TEMPLATES . '/common-header.inc';
     $submit_url = Util::addParameter($selfURL, 'actionID', 'process_passphrase_dialog');
     IMP::status();
@@ -68,10 +67,7 @@
 
     $res = Browser::wasFileUploaded('upload_key', _("key"));
     if (!is_a($res, 'PEAR_Error')) {
-        $fp = fopen($_FILES['upload_key']['tmp_name'], 'r');
-        $key = fread($fp, filesize($_FILES['upload_key']['tmp_name']));
-        fclose($fp);
-        return $key;
+        return file_get_contents($_FILES['upload_key']['tmp_name']);
     } else {
         $GLOBALS['notification']->push($res, 'horde.error');
         return;
@@ -86,6 +82,7 @@
 
 
 @define('IMP_BASE', dirname(__FILE__));
+$authentication = OP_HALFOPEN;
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Crypt/PGP.php';
 
@@ -107,9 +104,9 @@
     $passphrase2 = Util::getFormData('generate_passphrase2');
 
     if (empty($realname) || empty($email)) {
-        $notification->push(_("Name and/or email can not be empty"), 'horde.error');
+        $notification->push(_("Name and/or email cannot be empty"), 'horde.error');
     } elseif (empty($passphrase1) || empty($passphrase2)) {
-        $notification->push(_("Passphrases can not be empty"), 'horde.error');
+        $notification->push(_("Passphrases cannot be empty"), 'horde.error');
     } elseif ($passphrase1 !== $passphrase2) {
         $notification->push(_("Passphrases do not match"), 'horde.error');
     } else {
@@ -329,18 +326,15 @@
 /* Get passphrase (if available). */
 $passphrase = $imp_pgp->getPassphrase();
 
-$title = sprintf(_("%s PGP Administration"), _("Mail"));
-require IMP_TEMPLATES . '/common-header.inc';
-require IMP_TEMPLATES . '/menu.inc';
-IMP::status();
-require_once 'Horde/Prefs/UI.php';
 require IMP_BASE . '/config/prefs.php';
+require_once 'Horde/Prefs/UI.php';
+$app = 'imp';
+Prefs_UI::generateHeader('pgp');
 
 /* If PGP preference not active, do NOT show PGP Admin screen. */
 if ($prefs->getValue('use_pgp')) {
     $openpgpwin = $imp_pgp->getJSOpenWinCode('open_passphrase_dialog');
-    require_once IMP_TEMPLATES . '/pgp/open_pgp_win.js';
-    require_once IMP_TEMPLATES . '/pgp/open_pgp_import.js';
+    Horde::addScriptFile('popup.js');
     require IMP_TEMPLATES . '/pgp/pgp.inc';
 } else {
     require IMP_TEMPLATES . '/pgp/notactive.inc';


--- orig/templates/login/login.inc
+++ mod/templates/login/login.inc
@@ -1,23 +1,22 @@
 <?php
 $server_key = IMP::getAutoLoginServer(true);
+$rightAlign = empty($nls['rtl'][$language]) ? 'right' : 'left';
+$leftAlign = empty($nls['rtl'][$language]) ? 'left' : 'right';
+$tabindex = 1;
 
-/* Build the <select> widget for the servers and hordeauth servers
- * lists. */
-if ($conf['server']['server_list'] == 'shown') {
-    $servers_list = '';
-    $hordeauth_servers_list = '';
-
-    foreach ($servers as $key => $curServer) {
-        $sel = (IMP::isPreferredServer($curServer, $key)) ? ' selected="selected"' : '';
-        $servers_option  = "<option value=\"$key\"$sel>";
-        $servers_option .= $curServer['name'] . '</option>';
-
-        if (empty($curServer['hordeauth']) || !Auth::isAuthenticated()) {
-            $servers_list   .= $servers_option;
-        } else {
-            if (Auth::isAuthenticated()) {
-                $hordeauth_servers_list .= $servers_option;
-            }
+/* Build the <select> widget for the servers and hordeauth servers lists. */
+$show_list = ($conf['server']['server_list'] == 'shown');
+if ($show_list) {
+    $hordeauth_servers_list = $servers_list = '';
+    $isAuth = Auth::isAuthenticated();
+    foreach ($servers as $key => $val) {
+        $sel = (IMP::isPreferredServer($val, $key)) ? ' selected="selected"' : '';
+        $servers_option = "<option value=\"$key\"$sel>" . $val['name'] . '</option>';
+
+        if (empty($curServer['hordeauth']) || !$isAuth) {
+            $servers_list .= $servers_option;
+        } elseif ($isAuth) {
+            $hordeauth_servers_list .= $servers_option;
         }
     }
 }
@@ -33,7 +32,7 @@
 }
 ?>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function setFocus()
@@ -45,11 +44,11 @@
     }
 }
 
-<?php if ($conf['server']['server_list'] == 'shown' && !empty($hordeauth_servers_list)): ?>
-<?php $reloadurl = Util::addParameter(Horde::selfUrl(), 'autologin', $autologin); ?>
+<?php if ($show_list && !empty($hordeauth_servers_list)): ?>
+<?php $reloadurl = Util::addParameter(Horde::selfUrl(), array('autologin' => $autologin, 'server_key' => '')); ?>
 function imp_reload()
 {
-    window.top.document.location = '<?php echo $reloadurl ?>&server_key=' + document.imp_login.server_key[document.imp_login.server_key.selectedIndex].value;
+    window.top.document.location = '<?php echo $reloadurl ?>' + document.imp_login.server_key[document.imp_login.server_key.selectedIndex].value;
 }
 <?php endif; ?>
 
@@ -59,7 +58,7 @@
         return;
     }
 
-<?php if ($conf['server']['server_list'] == 'shown'): ?>
+<?php if ($show_list): ?>
     if (document.imp_login.server[document.imp_login.server.selectedIndex].value.substr(0, 1) == "_") {
         return false;
     }
@@ -89,9 +88,9 @@
 
 <form name="imp_login" action="<?php echo $formAction ?>" method="post"<?php echo $imp_auth ? ' target="_parent"' : '' ?>>
 <?php Util::pformInput() ?>
-<input type="hidden" name="actionID" value="<?php echo $actionID ?>" />
+<input type="hidden" name="actionID" value="<?php echo htmlspecialchars($actionID) ?>" />
 <input type="hidden" name="url" value="<?php echo htmlspecialchars(Util::getFormData('url')) ?>" />
-<input type="hidden" name="mailbox" value="<?php echo $prefs->getValue('mailbox') ?>" />
+<input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($prefs->getValue('mailbox')) ?>" />
 <input type="hidden" name="load_frameset" value="<?php echo $imp_auth ? 1 : 0 ?>" />
 <input type="hidden" name="autologin" value="<?php echo $autologin ? 1 : 0 ?>" />
 <?php if (!empty($formData)): ?>
@@ -100,144 +99,175 @@
 <?php if (!empty($ie_clientcaps)): ?>
 <input type="hidden" name="ie_version" value="" />
 <?php endif; ?>
+<?php if (!($show_list && !empty($hordeauth_servers_list))): ?>
+<input type="hidden" name="server_key" value="<?php echo htmlspecialchars($server_key) ?>" />
+<?php endif; ?>
 <?php $args = IMP::getComposeArgs(); foreach ($args as $arg => $value): ?>
 <input type="hidden" name="<?php echo htmlspecialchars($arg) ?>" value="<?php echo htmlspecialchars($value) ?>" />
 <?php endforeach; ?>
 
 <div id="menu">
- <span style="float:right">
-  <?php
-  $menu = &new Menu(HORDE_MENU_MASK_NONE);
-  echo $menu->render();
-  ?>
- </span>
+<?php
+$menu = &new Menu(HORDE_MENU_MASK_NONE);
+$imenu = $menu->render();
+if ($imenu): ?>
+ <span style="float:<?php echo $rightAlign ?>"><?php echo $imenu ?></span>
+<?php endif; ?>
  <h1 align="center"><?php echo $title ?></h1>
 </div>
-
-<br class="spacer" />
 <?php $notification->notify(array('listeners' => 'status')) ?>
 
-<table width="100%"><tr><td align="center"><table width="300" align="center">
+<table width="100%">
+ <tr>
+  <td align="center">
+   <table align="center">
 
 <?php if (!empty($reason)): ?>
-<tr>
-  <td colspan="2" class="tooltip"><?php echo $reason ?></td>
-</tr>
+    <tr>
+     <td colspan="2" class="notice"><?php echo $reason ?></td>
+    </tr>
+<?php endif; ?>
+
+<?php if ($show_list && !empty($hordeauth_servers_list)): ?>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Server") ?></strong></td>
+     <td class="light" align="<?php echo $leftAlign ?>">
+      <select tabindex="<?php echo $tabindex++ ?>" name="server_key" onchange="imp_reload();">
+<?php echo $hordeauth_servers_list ?>
+      </select>
+      <input tabindex="<?php echo $tabindex++ ?>" type="button" class="button" onclick="imp_reload();" value="<?php echo _("Login") ?>" />
+     </td>
+    </tr>
+<?php endif; ?>
+
+<?php if ($show_list && !empty($servers_list)): ?>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Server") ?></strong></td>
+     <td class="light" align="<?php echo $leftAlign ?>">
+      <select tabindex="<?php echo $tabindex++ ?>" name="server"><?php echo $servers_list ?></select>
+     </td>
+    </tr>
+<?php elseif (!empty($conf['server']['change_server'])): ?>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Server") ?></strong></td>
+     <td align="<?php echo $leftAlign ?>" class="light">
+      <input type="text" tabindex="<?php echo $tabindex++ ?>" name="server" value="<?php echo Util::getFormData('server', $server_key) ?>" onchange="serverChangeHandler()" style="direction:ltr" />
+
+<?php if (!empty($conf['server']['change_port'])): ?>
+      <input type="text" size="4" name="port" tabindex="<?php echo $tabindex++ ?>" value="<?php echo Util::getFormData('port', $servers[$server_key]['port']) ?>" style="direction:ltr" />
+<?php endif; ?>
+
+<?php if (!empty($conf['server']['change_protocol'])): ?>
+<?php $protocol = Util::getFormData('protocol', $servers[$server_key]['protocol']) ?>
+      <select tabindex="<?php echo $tabindex++ ?>" name="protocol" onchange="updatePort();">
+       <option value="imap"<?php if ($protocol == 'imap') echo ' selected="selected"' ?>>IMAP</option>
+       <option value="imap/notls"<?php if ($protocol == 'imap/notls') echo ' selected="selected"' ?>><?php echo _("IMAP, no TLS") ?></option>
+       <option value="imap/ssl"<?php if ($protocol == 'imap/ssl') echo ' selected="selected"' ?>><?php echo _("IMAP over SSL") ?></option>
+       <option value="imap/ssl/novalidate-cert"<?php if ($protocol == 'imap/ssl/novalidate-cert') echo ' selected="selected"' ?>><?php echo _("IMAP over SSL (self-signed)") ?></option>
+       <option value="pop3"<?php if ($protocol == 'pop3') echo ' selected="selected"' ?>>POP3</option>
+       <option value="pop3/ssl/novalidate-cert"<?php if ($protocol == 'pop3/ssl/novalidate-cert') echo ' selected="selected"' ?>><?php echo _("POP3 over SSL (self-signed)") ?></option>
+      </select>
+<?php endif; ?>
+
+     </td>
+    </tr>
+<?php endif; ?>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Username") ?></strong></td>
+     <td align="<?php echo $leftAlign ?>" class="light" nowrap="nowrap">
+      <input type="text" tabindex="<?php echo $tabindex++ ?>" name="imapuser" value="<?php echo htmlspecialchars(Util::getFormData('imapuser')) ?>" style="direction:ltr" />
 <?php
-endif;
+    if (!empty($conf['hooks']['vinfo'])) {
+        @include_once HORDE_BASE . '/config/hooks.php';
+        if (function_exists('_imp_hook_vinfo')) {
+            echo '<strong>@' . call_user_func('_imp_hook_vinfo', 'vdomain') . '</strong>';
+        }
+    }
+?>
+     </td>
+    </tr>
 
-$tabindex = 1;
-if ($conf['server']['server_list'] == 'shown' && !empty($hordeauth_servers_list)): ?>
-<tr>
-  <td align="right" class="light"><b><?php echo _("Server") ?></b></td>
-  <td class="light" align="left">
-    <select tabindex="<?php echo $tabindex++ ?>" name="server_key" onchange="imp_reload();">
-      <?php echo $hordeauth_servers_list ?>
-    </select><input tabindex="<?php echo $tabindex++ ?>" type="button" class="button" onclick="imp_reload();" value="<?php echo _("Login") ?>" />
-  </td>
-</tr>
-<?php else: ?>
-    <input type="hidden" name="server_key" value="<?php echo $server_key ?>" />
-<?php endif; ?>
-
-<?php if ($conf['server']['server_list'] == 'shown' && !empty($servers_list)): ?>
-<tr>
-    <td align="right" class="light"><b><?php echo _("Server") ?></b></td>
-    <td class="light" align="left">
-        <select tabindex="<?php echo $tabindex++ ?>" name="server"><?php echo $servers_list ?></select>
-    </td>
-</tr>
-<?php elseif ($conf['server']['change_server']): ?>
-<tr>
-    <td align="right" class="light"><b><?php echo _("Server") ?></b></td>
-    <td align="left" class="light">
-        <input type="text" tabindex="3" name="server" value="<?php echo Util::getFormData('server', $server_key) ?>" />
-        <?php if ($conf['server']['change_port']): ?>
-        <input type="text" size="4" name="port" tabindex="<?php echo $tabindex++ ?>" value="<?php echo Util::getFormData('port', $servers[$server_key]['port']) ?>" />
-        <?php endif; ?>
-        <?php if ($conf['server']['change_protocol']): ?>
-        <select tabindex="<?php echo $tabindex++ ?>" name="protocol" onchange="updatePort();">
-            <?php $protocol = Util::getFormData('protocol', $servers[$server_key]['protocol']) ?>
-            <option value="imap"<?php if ($protocol == 'imap') echo ' selected="selected"' ?>>IMAP</option>
-            <option value="imap/notls"<?php if ($protocol == 'imap/notls') echo ' selected="selected"' ?>><?php echo _("IMAP, no TLS") ?></option>
-            <option value="imap/ssl"<?php if ($protocol == 'imap/ssl') echo ' selected="selected"' ?>><?php echo _("IMAP over SSL") ?></option>
-            <option value="imap/ssl/novalidate-cert"<?php if ($protocol == 'imap/ssl/novalidate-cert') echo ' selected="selected"' ?>><?php echo _("IMAP over SSL (self-signed)") ?></option>
-            <option value="pop3"<?php if ($protocol == 'pop3') echo ' selected="selected"' ?>>POP3</option>
-            <option value="pop3/ssl/novalidate-cert"<?php if ($protocol == 'pop3/ssl/novalidate-cert') echo ' selected="selected"' ?>><?php echo _("POP3 over SSL (self-signed)") ?></option>
-        </select>
-        <?php endif; ?>
-    </td>
-</tr>
-<?php endif; ?>
-
-<?php if ($conf['server']['change_folders'] && $conf['server']['server_list'] == 'none'): ?>
-<tr>
-    <td align="right" class="light"><b><?php echo _("Folder Prefix") ?></b></td>
-    <td align="left"><input type="text" tabindex="<?php echo $tabindex++ ?>" name="folders" value="<?php echo Util::getFormData('folders', $servers[$server_key]['folders']) ?>" /></td>
-</tr>
-<?php endif; ?>
-
-<tr>
-    <td align="right" class="light"><b><?php echo _("Username") ?></b></td>
-    <td align="left" class="light" nowrap="nowrap">
-      <input type="text" tabindex="<?php echo $tabindex++ ?>" name="imapuser" value="<?php echo htmlspecialchars(Util::getFormData('imapuser')) ?>" />
-    <?php
-        if (!empty($conf['hooks']['vinfo'])) {
-            @include_once HORDE_BASE . '/config/hooks.php';
-            if (function_exists('_imp_hook_vinfo')) { ?>
-      <b>@<?php echo call_user_func('_imp_hook_vinfo', 'vdomain') ?></b>
-    <?php } } ?>
-    </td>
-</tr>
-<tr>
-    <td align="right" class="light"><b><?php echo _("Password") ?></b></td>
-    <td align="left"><input type="password" tabindex="<?php echo $tabindex++ ?>" name="pass" /></td>
-</tr>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Password") ?></strong></td>
+     <td align="<?php echo $leftAlign ?>">
+      <input type="password" tabindex="<?php echo $tabindex++ ?>" name="pass" style="direction:ltr" />
+     </td>
+    </tr>
+
+<?php if (!empty($conf['server']['change_smtphost'])): ?>
+    <tr style="height: 1em;"><td colspan="2"></td></tr>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Outbound Server") ?></strong></td>
+     <td align="<?php echo $leftAlign ?>" class="light">
+      <input type="text" tabindex="<?php echo $tabindex++ ?>" name="smtphost" value="<?php echo Util::getFormData('smtphost', $server_key) ?>" style="direction:ltr" />
+<?php if (!empty($conf['server']['change_smtpport'])): ?>
+      <input type="text" size="4" name="smtpport" tabindex="<?php echo $tabindex++ ?>" value="<?php echo Util::getFormData('smtpport', $servers[$server_key]['smtpport']) ?>" style="direction:ltr" /> <?php echo _("SMTP"); ?>
+<?php endif; ?>
+     </td>
+    </tr>
+<?php endif; ?>
 
+<?php if (!empty($conf['server']['change_smtphost'])): ?>
+    <tr style="height: 1em;"><td colspan="2"></td></tr>
+<?php endif; ?>
 <?php if (!$prefs->isLocked('language')): ?>
-<tr>
-    <td align="right" class="light"><b><?php echo _("Language") ?></b></td>
-    <td align="left" class="light"><select tabindex="<?php echo $tabindex++ ?>" name="new_lang" onchange="selectLang()"><?php echo $langs ?></select>
-    </td>
-</tr>
+    <tr>
+     <td align="<?php echo $rightAlign ?>" class="light"><strong><?php echo _("Language") ?></strong></td>
+     <td align="<?php echo $leftAlign ?>" class="light">
+      <select tabindex="<?php echo $tabindex++ ?>" name="new_lang" onchange="selectLang()" style="direction:ltr"><?php echo $langs ?></select> </td>
+    </tr>
 <?php endif; ?>
 
-<tr>
-    <td>&nbsp;</td>
-    <td align="left" class="light"><input type="submit" class="button" name="loginButton" tabindex="<?php echo $tabindex++ ?>" value="<?php echo _("Log in") ?>" onclick="return submit_login();" /></td>
-</tr>
+    <tr>
+     <td>&nbsp;</td>
+     <td align="<?php echo $leftAlign ?>" class="light">
+      <input type="submit" class="button" name="loginButton" tabindex="<?php echo $tabindex++ ?>" value="<?php echo _("Log in") ?>" onclick="return submit_login();" />
+     </td>
+    </tr>
 
 <?php if ($conf['signup']['allow'] && isset($auth) && $auth->hasCapability('add')): ?>
-<tr>
-    <td>&nbsp;</td>
-    <td class="light"><?php echo Horde::link(Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/signup.php'), 'url', Util::getFormData('url')), _("Sign up if not registered"), 'light') . _("Sign up if not registered") ?></a></td>
-</tr>
+    <tr>
+     <td>&nbsp;</td>
+     <td class="light"><?php echo Horde::link(Util::addParameter(Horde::url($registry->get('webroot', 'horde') . '/signup.php'), 'url', Util::getFormData('url')), _("Don't have an account? Sign up."), 'light') . _("Don't have an account? Sign up.") ?></a></td>
+    </tr>
 <?php endif; ?>
 
-</table></td></tr></table>
+   </table>
+  </td>
+ </tr>
+</table>
 </form>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
+<?php if (!empty($conf['server']['change_protocol'])): ?>
 function updatePort()
 {
-<?php if ($conf['server']['change_port']): ?>
+<?php if (!empty($conf['server']['change_port'])): ?>
     if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'imap') {
         document.imp_login.port.value = 143;
-    } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'imap/ssl') {
-        document.imp_login.port.value = 993;
-    } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'imap/ssl/novalidate-cert') {
+    } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'imap/ssl' ||
+               document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'imap/ssl/novalidate-cert') {
         document.imp_login.port.value = 993;
     } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'pop3') {
         document.imp_login.port.value = 110;
-    } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'pop3/ssl') {
-        document.imp_login.port.value = 995;
-    } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'pop3/ssl/novalidate-cert') {
+    } else if (document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'pop3/ssl' ||
+               document.imp_login.protocol.options[document.imp_login.protocol.selectedIndex].value == 'pop3/ssl/novalidate-cert') {
         document.imp_login.port.value = 995;
     }
 <?php endif; ?>
 }
+<?php endif; ?>
+
+<?php if (!empty($conf['server']['change_server'])): ?>
+function serverChangeHandler(ctl)
+{
+<?php if (!empty($conf['server']['change_smtphost'])): ?>
+    document.imp_login.smtphost.value = document.imp_login.server.value;
+<?php endif; ?>
+}
+<?php endif; ?>
 
 <?php if (!$prefs->isLocked('language')): ?>
 function selectLang()
@@ -248,18 +278,17 @@
         document.imp_login.pass.value == '') {
         var lang_page = 'login.php?new_lang=' + document.imp_login.new_lang[document.imp_login.new_lang.selectedIndex].value;
 <?php
-$url = Util::getFormData('url');
-if (!empty($url)):
+    $url = Util::getFormData('url');
+    if (!empty($url)) {
+        echo "lang_page += '&url=" . urlencode($url) . "';";
+    }
 ?>
-        lang_page += '&url=<?php echo urlencode($url) ?>';
-<?php endif; ?>
         self.location = lang_page;
     }
 }
 <?php endif; ?>
 
-<?php
-if ($imp_auth): ?>
+<?php if ($imp_auth): ?>
 if (parent.frames.horde_main) {
     document.imp_login.target = '_parent';
 }


--- orig/themes/luc/screen.css
+++ mod/themes/luc/screen.css
@@ -1,5 +1,5 @@
 /**
- * $Horde: imp/themes/luc/screen.css,v 1.2.2.1 2005/07/06 17:56:17 jan Exp $
+ * $Horde: imp/themes/luc/screen.css,v 1.2.2.2 2005/10/18 12:14:16 jan Exp $
  */
 
 .folders {


--- orig/templates/pgp/pgp.inc
+++ mod/templates/pgp/pgp.inc
@@ -1,274 +1,150 @@
-<form method="post" name="pgp" action="<?php echo $selfURL ?>">
-<input type="hidden" name="actionID" value="" />
-
-<table border="0" align="center" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td align="left" class="header" nowrap="nowrap"><b><?php echo _("PGP Options") ?></b></td>
-    <?php $app = 'imp'; Prefs_UI::generateNavigationCell('pgp') ?>
-  </tr>
-
-  <tr>
-    <td class="item" align="left" colspan="2">
-      <table border="0" cellpadding="0" width="100%">
-        <tr>
-          <td class="item" align="left" valign="top">&nbsp;
-            <input type="checkbox" id="use_pgp" name="use_pgp" <?php echo ($prefs->getValue('use_pgp')) ? "checked=\"checked\"" : "" ?> />&nbsp;
-          </td>
-          <td class="item" align="left">
-            <table border="0" cellpadding="0" width="75%">
-              <tr>
-                <td class="item" align="left"><label for="use_pgp"><?php echo _("Enable PGP functionality?") ?></label>
-                </td>
-              </tr>
-              <tr>
-                <td class="item" align="left"><font color="red"><b><?php echo _("NOTE") ?>:</b></font> <?php echo _("PGP support requires popup windows to be used.  If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly") ?>.
-                </td>
-              </tr>
-            </table>
-          </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-overview') ?></td>
-        </tr>
-
-        <tr><td>&nbsp;</td></tr>
-
+<input type="checkbox" id="use_pgp" name="use_pgp"<?php echo ($prefs->getValue('use_pgp')) ? ' checked="checked"' : '' ?> /> <label for="use_pgp"><?php echo _("Enable PGP functionality?") ?></label>&nbsp;<?php echo Help::link('imp', 'pgp-overview') ?><br />
+<strong style="color:red"><?php echo _("NOTE") ?>:</strong> <?php echo _("PGP support requires popup windows to be used.  If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly.") ?><br />
 <?php if (!$prefs->isLocked('pgp_attach_pubkey')): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;
-            <input type="checkbox" id="pgp_attach_pubkey" name="pgp_attach_pubkey" <?php echo ($prefs->getValue('pgp_attach_pubkey')) ? "checked=\"checked\"" : "" ?> />&nbsp;
-          </td>
-          <td class="item" align="left">
-            <label for="pgp_attach_pubkey"><?php echo _("Should your PGP public key to be attached to your messages by default?") ?></label>
-          </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-option-attach-pubkey') ?></td>
-        </tr>
+<input type="checkbox" id="pgp_attach_pubkey" name="pgp_attach_pubkey" <?php echo ($prefs->getValue('pgp_attach_pubkey')) ? "checked=\"checked\"" : "" ?> /> <label for="pgp_attach_pubkey"><?php echo _("Should your PGP public key to be attached to your messages by default?") ?></label>&nbsp;<?php echo Help::link('imp', 'pgp-option-attach-pubkey') ?><br />
 <?php endif; ?>
-
 <?php if (!$prefs->isLocked('pgp_scan_body')): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;
-            <input type="checkbox" id="pgp_scan_body" name="pgp_scan_body" <?php echo ($prefs->getValue('pgp_scan_body')) ? "checked=\"checked\"" : "" ?> />&nbsp;
-          </td>
-          <td class="item" align="left">
-            <label for="pgp_scan_body"><?php echo _("Should the body of text/plain messages be scanned for PGP data?") ?></label>
-          </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-option-scan-body') ?></td>
-        </tr>
+<input type="checkbox" id="pgp_scan_body" name="pgp_scan_body" <?php echo ($prefs->getValue('pgp_scan_body')) ? "checked=\"checked\"" : "" ?> /> <label for="pgp_scan_body"><?php echo _("Should the body of text/plain messages be scanned for PGP data?") ?></label>&nbsp;<?php echo Help::link('imp', 'pgp-option-scan-body') ?><br />
 <?php endif; ?>
+</div>
 
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td nowrap="nowrap" align="left" class="header" valign="middle">
-      <input type="submit" name="save" class="button" onclick="document.pgp.actionID.value='save_options';return true;" value="<?php echo _("Save Options") ?>" />
-    </td>
-    <td class="header"></td>
-  </tr>
-
-  <tr rowspan="2"><td>&nbsp;</td></tr>
+<br class="spacer" />
+<div class="header">
+  <ul><li><?php echo Help::link('imp', 'pgp-manage-pubkey') ?></li></ul>
+  <?php echo _("PGP Public Keyring") ?>
+</div>
 
-  <tr>
-    <td class="header" align="left" nowrap="nowrap"><b><?php echo _("PGP Public Keyring") ?></b></td>
-    <td class="header" align="right"><?php echo Help::link('imp', 'pgp-manage-pubkey') ?></td>
-  </tr>
-  <tr>
-    <td class="item" align="left" colspan="2">
-      <table border="0" cellspacing="0" cellpadding="0">
+<div class="item">
 <?php if (empty($pubkey_list)): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo _("No Keys in Keyring") ?></b></td>
-        </tr>
+<strong><?php echo _("No Keys in Keyring") ?></strong>
 <?php elseif (is_a($pubkey_list, 'PEAR_Error')): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo _("Error") ?>:</b> <?php echo $pubkey_list->getMessage() ?></td>
-        </tr>
+<strong><?php echo _("Error") ?>:</strong> <?php echo $pubkey_list->getMessage() ?>
 <?php else: ?>
-<?php
-  foreach ($pubkey_list as $val) {
-    $linkurl = Util::addParameter($selfURL, 'email', $val['email']);
-?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo $val['name'] ?> (<?php echo $val['email'] ?>)</b></td>
-          <td class="item" align="left">&nbsp;&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'view_public_key'), sprintf(_("View %s Public Key"), $val['name']), null, 'view_key'); ?><?php echo _("View") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'info_public_key'), sprintf(_("Information on %s Public Key"), $val['name']), null, 'info_key'); ?><?php echo _("Details") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'delete_public_key'), sprintf(_("Delete %s Public Key"), $val['name']), null, null, "if (confirm('" . addslashes(_("Are you sure you want to delete this public key?")) . "')) { return true; } else { return false; }"); ?><?php echo _("Delete") ?></a>]</td>
-        </tr>
-<?php } ?>
-<?php endif; ?>
-      </table>
-    </td>
-  </tr>
-<?php if ($imp['file_upload']): ?>
+<table>
+<?php foreach ($pubkey_list as $val): $linkurl = Util::addParameter($selfURL, 'email', $val['email']); ?>
   <tr>
-    <td class="header" colspan="2">
-      <table border="0" cellpadding="0" cellspacing="0" width="100%">
-        <tr>
-          <td nowrap="nowrap" align="left" valign="middle">
-<?php $public_import_url = Util::addParameter(Util::addParameter($selfURL, 'actionID', 'import_public_key'), 'reload', $selfURL); ?>
-            <input type="submit" name="save" class="button" onclick="open_pgp_import('<?php echo $public_import_url ?>');return false;" value="<?php echo _("Import Public Key") ?>" />
-          </td>
-          <td align="right"><?php echo Help::link('imp', 'pgp-import-pubkey') ?></td>
-        </tr>
-      </table>
-    </td>
+    <td><?php echo $val['name'] ?> (<?php echo $val['email'] ?>)</td>
+    <td>&nbsp;&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'view_public_key'), sprintf(_("View %s Public Key"), $val['name']), null, 'view_key'); ?><?php echo _("View") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'info_public_key'), sprintf(_("Information on %s Public Key"), $val['name']), null, 'info_key'); ?><?php echo _("Details") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'delete_public_key'), sprintf(_("Delete %s Public Key"), $val['name']), null, null, "if (confirm('" . addslashes(_("Are you sure you want to delete this public key?")) . "')) { return true; } else { return false; }"); ?><?php echo _("Delete") ?></a>]</td>
   </tr>
+<?php endforeach; ?>
+</table>
 <?php endif; ?>
+</div>
 
-  <tr rowspan="2"><td>&nbsp;</td></tr>
+<br class="spacer" />
+<?php if (!$imp['file_upload']): ?>
+  <span style="color:red"><?php echo _("Key import is not available. File upload is not enabled on this server.") ?></span>
+<?php elseif (!$GLOBALS['prefs']->getValue('add_source')): ?>
+  <strong><?php echo _("Key import is not available. You have no address book defined to add your contacts.") ?></strong>
+<?php else: ?>
+  <?php $public_import_url = Util::addParameter(Util::addParameter($selfURL, 'actionID', 'import_public_key'), 'reload', $selfURL); ?>
+  <input type="submit" name="save" class="button" onclick="popup_imp('<?php echo $public_import_url ?>',750,275); return false;" value="<?php echo _("Import Public Key") ?>" />
+  <?php echo Help::link('imp', 'pgp-import-pubkey') ?>
+<?php endif; ?>
 
-  <tr>
-    <td align="left" class="header" nowrap="nowrap"><b><?php echo _("Your PGP Public/Private Keys") ?></b></td>
-    <td class="header" align="right"><?php echo Help::link('imp', 'pgp-overview-personalkey') ?></td>
-  </tr>
+<br class="spacer" />
+<div class="header">
+  <ul><li><?php echo Help::link('imp', 'pgp-overview-personalkey') ?></li></ul>
+  <?php echo _("Your PGP Public/Private Keys") ?>
+</div>
 
-  <tr>
-    <td class="item" align="left" colspan="2">
-      <table border="0" cellpadding="0" width="100%">
+<div class="item">
 <?php if (is_a($secure_check, 'PEAR_Error')): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo _("PGP Personal Keypair support requires a secure web connection.") ?></b></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-<?php elseif ($prefs->getValue('pgp_public_key') && $prefs->getValue('pgp_private_key')): ?>
+<strong><?php echo _("PGP Personal Keypair support requires a secure web connection.") ?></strong>
+</div>
+
 <?php
-  $viewpublic_url = Util::addParameter($selfURL, 'actionID', 'view_personal_public_key');
-  $infopublic_url = Util::addParameter($selfURL, 'actionID', 'info_personal_public_key');
-  $sendpublic_url = Util::addParameter($selfURL, 'actionID', 'send_public_key');
-  $unload_url = Util::addParameter($selfURL, 'actionID', 'unset_passphrase');
-  $viewprivate_url = Util::addParameter($selfURL, 'actionID', 'view_personal_private_key');
-  $infoprivate_url = Util::addParameter($selfURL, 'actionID', 'info_personal_private_key');
+elseif ($prefs->getValue('pgp_public_key') &&
+        $prefs->getValue('pgp_private_key')):
+    $viewpublic_url = Util::addParameter($selfURL, 'actionID', 'view_personal_public_key');
+    $infopublic_url = Util::addParameter($selfURL, 'actionID', 'info_personal_public_key');
+    $sendpublic_url = Util::addParameter($selfURL, 'actionID', 'send_public_key');
+    $unload_url = Util::addParameter($selfURL, 'actionID', 'unset_passphrase');
+    $viewprivate_url = Util::addParameter($selfURL, 'actionID', 'view_personal_private_key');
+    $infoprivate_url = Util::addParameter($selfURL, 'actionID', 'info_personal_private_key');
 ?>
-        <tr>
-          <td class="item" align="left" rowspan="2">
-            <table border="0" cellspacing="0" cellpadding="0">
-              <tr nowrap="nowrap">
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Your Public Key") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;[<?php echo Horde::link($viewpublic_url, _("View Personal Public Key"), null, 'view_key') . _("View") ?></a>]&nbsp;[<?php echo Horde::link($infopublic_url, _("Information on Personal Public Key"), null, 'info_key') . _("Details") ?></a>]&nbsp;[<?php echo Horde::link($sendpublic_url, _("Send Key to Public Keyserver")) . _("Send Key to Public Keyserver") ?></a>]</td>
-              </tr>
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Your Private Key") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;[<?php echo (empty($passphrase)) ? Horde::link('', _("Enter Passphrase"), null, null, $openpgpwin . ' return false;') . _("Enter Passphrase") : Horde::link($unload_url, _("Unload Passphrase")) . _("Unload Passphrase") ?></a>]&nbsp;[<?php echo Horde::link($viewprivate_url, _("View Personal Private Key"), null, 'view_key') . _("View") ?></a>]&nbsp;[<?php echo Horde::link($infoprivate_url, _("Information on Personal Private Key"), null, 'info_key') . _("Details") ?></a>]</td>
-              </tr>
-            </table>
-          </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-public') ?></td>
-        </tr>
-
-        <tr>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-private') ?></td>
-        </tr>
-      </table>
-    </td>
+
+<table>
+  <tr>
+    <td><?php echo _("Your Public Key") ?>:</td>
+    <td>&nbsp;&nbsp;[<?php echo Horde::link($viewpublic_url, _("View Personal Public Key"), null, 'view_key') . _("View") ?></a>]&nbsp;[<?php echo Horde::link($infopublic_url, _("Information on Personal Public Key"), null, 'info_key') . _("Details") ?></a>]&nbsp;[<?php echo Horde::link($sendpublic_url, _("Send Key to Public Keyserver")) . _("Send Key to Public Keyserver") ?></a>]</td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-public') ?></td>
   </tr>
   <tr>
-    <td class="header" align="left" colspan="2">
-      <table border="0" cellspacing="0" cellpadding="0" width="100%">
-        <tr nowrap="nowrap">
-          <td align="left" valign="middle">
-            <input type="submit" name="delete" class="button" onclick="if (confirm('<?php echo addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")) ?>')) { document.pgp.actionID.value='delete_key'; return true; } else { return false; }" value="<?php echo _("Delete Current Keys") ?>" />
-          </td>
-          <td align="right"><?php echo Help::link('imp', 'pgp-personalkey-delete') ?></td>
-        </tr>
-      </table>
-    </td>
+    <td><?php echo _("Your Private Key") ?>:</td>
+    <td>&nbsp;&nbsp;[<?php echo (empty($passphrase)) ? Horde::link('#', _("Enter Passphrase"), null, null, htmlspecialchars($openpgpwin) . ' return false;') . _("Enter Passphrase") : Horde::link($unload_url, _("Unload Passphrase")) . _("Unload Passphrase") ?></a>]&nbsp;[<?php echo Horde::link($viewprivate_url, _("View Personal Private Key"), null, 'view_key') . _("View") ?></a>]&nbsp;[<?php echo Horde::link($infoprivate_url, _("Information on Personal Private Key"), null, 'info_key') . _("Details") ?></a>]</td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-private') ?></td>
   </tr>
+</table>
+</div>
+
+<br class="spacer" />
+<div class="nowrap">
+  <input type="submit" name="delete" class="button" onclick="if (confirm('<?php echo addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")) ?>')) { document.prefs.actionID.value='delete_key'; return true; } else { return false; }" value="<?php echo _("Delete Current Keys") ?>" />
+  <?php echo Help::link('imp', 'pgp-personalkey-delete') ?>
+</div>
+
 <?php else: ?>
+
 <?php
 require_once 'Horde/Identity.php';
 $imp_identity = &Identity::singleton(array('imp', 'imp'));
 $personal_import_url = Util::addParameter($selfURL, 'actionID', 'import_personal_public_key');
 ?>
-        <tr>
-          <td class="item" align="left" rowspan="6">
-            <table border="0" cellpadding="0">
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Your Name") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;<input type="text" name="generate_realname" size="30" maxlength="60" class="fixed" value="<?php echo $imp_identity->getFullname(); ?>"/></td>
-              </tr>
-
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Comment") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;<input type="text" name="generate_comment" size="30" maxlength="60" class="fixed" /></td>
-              </tr>
-
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("E-mail Address") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;<input type="text" name="generate_email" size="30" maxlength="60" class="fixed" value="<?php echo $imp_identity->getFromAddress(); ?>"/></td>
-              </tr>
-
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Key Length") ?>:</b></td>
-                <td class="item" align="left">&nbsp;
-                  <select name="generate_keylength">
-                    <option value="1024">1024</option>
-                    <option value="2048">2048</option>
-                  </select>
-                </td>
-              </tr>
-
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Passphrase") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;<input type="password" name="generate_passphrase1" size="30" maxlength="60" class="fixed" /></td>
-              </tr>
-
-              <tr>
-                <td class="item" align="left"><b>&nbsp;<?php echo _("Passphrase (Again)") ?>:</b></td>
-                <td class="item" align="left">&nbsp;&nbsp;<input type="password" name="generate_passphrase2" size="30" maxlength="60" class="fixed" /></td>
-              </tr>
-            </table>
-          </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-create-name') ?></td>
-        </tr>
-
-        <tr>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-create-comment') ?></td>
-        </tr>
-
-        <tr>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-create-email') ?></td>
-        </tr>
-
-        <tr>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-create-keylength') ?></td>
-        </tr>
-
-        <tr>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-personalkey-create-passphrase') ?></td>
-        </tr>
-
-        <tr>
-          <td class="item">&nbsp;</td>
-        </tr>
-      </table>
-    </td>
+<table>
+  <tr>
+    <td><?php echo _("Your Name") ?>:</td>
+    <td>&nbsp;&nbsp;<input type="text" name="generate_realname" size="30" maxlength="60" class="fixed" value="<?php echo $imp_identity->getFullname(); ?>"/></td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-create-name') ?></td>
   </tr>
-
   <tr>
-    <td colspan="2" class="header">
-      <table border="0" cellpadding="0" width="100%">
-        <tr nowrap="nowrap">
-          <td align="left" valign="middle">
-            <input type="submit" name="save" class="button" onclick="if (confirm('<?php echo addslashes(_("Key generation may take a long time to complete.  Continue with key generation?")) ?>')) { document.prefs.actionID.value='generate_key';return true; } else { return false; }" value="<?php echo _("Create Keys") ?>" />
-<?php if ($imp['file_upload']): ?>
-            <input type="submit" name="save" class="button" onclick="open_pgp_import('<?php echo $personal_import_url ?>');return false;" value="<?php echo _("Import Keypair") ?>" />
-<?php endif; ?>
-          </td>
-          <td align="right"><?php echo Help::link('imp', 'pgp-personalkey-create-actions') ?></td>
-        </tr>
-      </table>
-    </td>
+    <td><?php echo _("Comment") ?>:</td>
+    <td>&nbsp;&nbsp;<input type="text" name="generate_comment" size="30" maxlength="60" class="fixed" /></td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-create-comment') ?></td>
   </tr>
-<?php endif; ?>
-
-  <tr rowspan="2"><td>&nbsp;</td></tr>
-
   <tr>
-    <td class="header" align="left" nowrap="nowrap">
-      <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
+    <td><?php echo _("E-mail Address") ?>:</td>
+    <td>&nbsp;&nbsp;<input type="text" name="generate_email" size="30" maxlength="60" class="fixed" value="<?php echo $imp_identity->getFromAddress(); ?>"/></td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-create-email') ?></td>
+  </tr>
+  <tr>
+    <td><?php echo _("Key Length") ?>:</td>
+    <td>&nbsp;
+      <select name="generate_keylength">
+        <option value="1024">1024</option>
+        <option value="2048">2048</option>
+      </select>
     </td>
-    <td class="header">&nbsp;</td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-create-keylength') ?></td>
+  </tr>
+  <tr>
+    <td><?php echo _("Passphrase") ?>:</td>
+    <td>&nbsp;&nbsp;<input type="password" name="generate_passphrase1" size="30" maxlength="60" class="fixed" /></td>
+    <td><?php echo Help::link('imp', 'pgp-personalkey-create-passphrase') ?></td>
+  </tr>
+  <tr>
+    <td><?php echo _("Passphrase (Again)") ?>:</td>
+    <td>&nbsp;&nbsp;<input type="password" name="generate_passphrase2" size="30" maxlength="60" class="fixed" /></td>
+    <td>&nbsp;</td>
   </tr>
 </table>
+</div>
+
+<br class="spacer" />
+<div class="nowrap">
+  <input type="submit" name="save" class="button" onclick="if (confirm('<?php echo addslashes(_("Key generation may take a long time to complete.  Continue with key generation?")) ?>')) { document.prefs.actionID.value='generate_key';return true; } else { return false; }" value="<?php echo _("Create Keys") ?>" />
+  <?php if ($imp['file_upload']): ?>
+  <input type="submit" name="save" class="button" onclick="popup_imp('<?php echo $personal_import_url ?>',750,275);return false;" value="<?php echo _("Import Keypair") ?>" />
+  <?php endif; ?>
+  <?php echo Help::link('imp', 'pgp-personalkey-create-actions') ?>
+</div>
+
+<?php endif; ?>
+
+<br class="spacer" />
+<div class="nowrap">
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options';return true;" value="<?php echo _("Save Options") ?>" />
+  <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
+</div>
 
 </form>


--- orig/smime.php
+++ mod/smime.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/smime.php,v 2.48.4.1 2005/01/03 12:25:32 jan Exp $
+ * $Horde: imp/smime.php,v 2.48.4.7 2006/04/10 05:03:43 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
- * Copyright 2002-2005 Mike Cochrane <mike at graftonhall.co.nz>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Mike Cochrane <mike at graftonhall.co.nz>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -28,10 +28,7 @@
 
     $res = Browser::wasFileUploaded('upload_key', _("key"));
     if (!is_a($res, 'PEAR_Error')) {
-        $fp = fopen($_FILES['upload_key']['tmp_name'], 'r');
-        $key = fread($fp, filesize($_FILES['upload_key']['tmp_name']));
-        fclose($fp);
-        return $key;
+        return file_get_contents($_FILES['upload_key']['tmp_name']);
     } else {
         $GLOBALS['notification']->push($res, 'horde.error');
         return;
@@ -47,7 +44,6 @@
     }
 
     $title = _("S/MIME Passphrase Input");
-    $notification->push('document.passphrase_dialog.passphrase.focus();', 'javascript');
     require IMP_TEMPLATES . '/common-header.inc';
     $submit_url = Util::addParameter($selfURL, 'actionID', 'process_passphrase_dialog');
     IMP::status();
@@ -87,6 +83,7 @@
 
 
 @define('IMP_BASE', dirname(__FILE__));
+$authentication = OP_HALFOPEN;
 require_once IMP_BASE . '/lib/base.php';
 require_once IMP_BASE . '/lib/Crypt/SMIME.php';
 
@@ -251,20 +248,17 @@
 /* Get passphrase (if available). */
 $passphrase = $imp_smime->getPassphrase();
 
-$title = sprintf(_("%s S/MIME Administration"), _("Mail"));
-require IMP_TEMPLATES . '/common-header.inc';
-require IMP_TEMPLATES . '/menu.inc';
-IMP::status();
-require_once 'Horde/Prefs/UI.php';
 require IMP_BASE . '/config/prefs.php';
+require_once 'Horde/Prefs/UI.php';
+$app = 'imp';
+Prefs_UI::generateHeader('smime');
 
-/* If S/MIME preference not active, or openssl PHP extension not available,
-   do NOT show S/MIME Admin screen. */
+/* If S/MIME preference not active, or openssl PHP extension not available, do
+ * NOT show S/MIME Admin screen. */
 $openssl_check = $imp_smime->checkForOpenSSL();
 if (!is_a($openssl_check, 'PEAR_Error') && $prefs->getValue('use_smime')) {
     $opensmimewin = $imp_smime->getJSOpenWinCode('open_passphrase_dialog');
-    require_once IMP_TEMPLATES . '/smime/open_smime_win.js';
-    require_once IMP_TEMPLATES . '/smime/open_smime_import.js';
+    Horde::addScriptFile('popup.js');
     require IMP_TEMPLATES . '/smime/smime.inc';
 } else {
     require IMP_TEMPLATES . '/smime/notactive.inc';


--- orig/js/ieEscGuard.js
+++ mod/js/ieEscGuard.js
@@ -3,7 +3,7 @@
  * text input elements to prevent loss of data when the user hits the
  * ESC key.
  *
- * $Horde: imp/js/ieEscGuard.js,v 1.1.2.2 2005/04/11 01:25:28 chuck Exp $
+ * $Horde: imp/js/ieEscGuard.js,v 1.1.2.3 2005/10/18 12:13:30 jan Exp $
  *
  * See the enclosed file COPYING for license information (LGPL). If you did not
  * receive this file, see http://www.fsf.org/copyleft/lgpl.html.


--- orig/templates/compose/attachments.inc
+++ mod/templates/compose/attachments.inc
@@ -1,6 +1,6 @@
 <tr>
-  <td align="left"><img src="<?php echo $viewer->getIcon($mime->getType()) ?>" height="16" width="16" border="0" alt="[Icon]" />&nbsp;</td>
-  <td align="left"><b><?php echo ($file_num) ?>. <?php echo $mime->getName(true, true) ?></b>&nbsp;&nbsp;(<?php echo $mime->getType() ?>)&nbsp;&nbsp;&nbsp;<b><?php echo _("Size") ?>:</b>&nbsp;<?php echo $mime->getSize() ?> KB<?php if (isset($preview_url)): ?>&nbsp;&nbsp;&nbsp;[<?php echo Horde::link($preview_url, _("Preview") . ' ' . $mime->getName(), 'link', 'compose_preview_window') . _("Preview") ?></a>]<?php endif; ?></td>
+  <td class="leftAlign"><img src="<?php echo $viewer->getIcon($mime->getType()) ?>" height="16" width="16" border="0" alt="[Icon]" />&nbsp;</td>
+  <td class="leftAlign"><strong><?php echo ($file_num) ?>. <?php echo $mime->getName(true, true) ?></strong>&nbsp;&nbsp;(<?php echo $mime->getType() ?>)&nbsp;&nbsp;&nbsp;<strong><?php echo _("Size") ?>:</strong>&nbsp;<?php echo $mime->getSize() ?> KB<?php if (isset($preview_url)): ?>&nbsp;&nbsp;&nbsp;[<?php echo Horde::link($preview_url, _("Preview") . ' ' . $mime->getName(), 'link', 'compose_preview_window') . _("Preview") ?></a>]<?php endif; ?></td>
 </tr>
 
 <tr>
@@ -8,8 +8,8 @@
   <td>
     <table border="0" width="100%" cellpadding="0">
       <tr>
-        <td align="left" valign="middle"><b><?php echo _("Disposition") ?>:</b>&nbsp;</td>
-        <td align="left">
+        <td class="leftAlign" valign="middle"><strong><?php echo _("Disposition") ?>:</strong>&nbsp;</td>
+        <td class="leftAlign">
           <select name="file_disposition_<?php echo $file_num ?>">
             <option value="attachment"<?php if ($disposition == 'attachment') echo ' selected="selected"' ?>><?php echo _("Attachment") ?></option>
             <option value="inline"<?php if ($disposition == 'inline') echo ' selected="selected"' ?>><?php echo _("Inline") ?></option>
@@ -18,15 +18,15 @@
       </tr>
 
       <tr>
-        <td align="left" valign="middle"><b><?php echo _("Description") ?>:</b>&nbsp;</td>
-        <td align="left">
+        <td class="leftAlign" valign="middle"><strong><?php echo _("Description") ?>:</strong>&nbsp;</td>
+        <td class="leftAlign">
           <input type="text" size="40" name="file_description_<?php echo $file_num ?>" value="<?php echo $mime->getDescription() ?>" />
         </td>
       </tr>
 
       <tr>
-        <td align="left" valign="middle"><b><?php echo _("Delete") ?>?</b>&nbsp;</td>
-        <td align="left"><input type="checkbox" name="delattachments[]" value="<?php echo $file_num ?>" /></td>
+        <td class="leftAlign" valign="middle"><strong><?php echo _("Delete") ?>?</strong>&nbsp;</td>
+        <td class="leftAlign"><input type="checkbox" name="delattachments[]" value="<?php echo $file_num ?>" /></td>
       </tr>
     </table>
   </td>


--- orig/templates/mailbox/navbar.inc
+++ mod/templates/mailbox/navbar.inc
@@ -1,74 +1,73 @@
 <tr class="control">
-  <td colspan="6">
+ <td colspan="6">
 
-<table border="0" width="100%">
-<tr>
-  <td align="left" nowrap="nowrap" width="20%">
-    <form name="select<?php echo $navform ?>" action="javascript:void(0)" onsubmit="return false">
-    <select name="filter" onchange="makeSelection(<?php echo $navform ?>);">
-      <option value="" selected="selected"><?php echo _("Select") ?>:</option>
-      <option value="!<?php echo IMP_ALL ?>"><?php echo _("All") ?></option>
-      <option value="<?php echo IMP_ALL ?>"><?php echo _("None") ?></option>
-      <option value="+<?php echo IMP_ALL ?>"><?php echo _("Invert") ?></option>
+<table width="100%">
+ <tr>
+  <td class="leftAlign" nowrap="nowrap" width="20%">
+   <form name="select<?php echo $navform ?>" action="javascript:void(0)" onsubmit="return false">
+   <select name="filter" onchange="makeSelection(<?php echo $navform ?>);">
+    <option value="" selected="selected"><?php echo _("Select") ?>:</option>
+    <option value="!<?php echo IMP_ALL ?>"><?php echo _("All") ?></option>
+    <option value="<?php echo IMP_ALL ?>"><?php echo _("None") ?></option>
+    <option value="+<?php echo IMP_ALL ?>"><?php echo _("Invert") ?></option>
 <?php if (!strstr($imp['protocol'], 'pop3')): ?>
-      <option value="!<?php echo IMP_UNSEEN ?>"><?php echo _("Seen") ?></option>
-      <option value="<?php echo IMP_UNSEEN ?>"><?php echo _("Unseen") ?></option>
-      <option value="<?php echo IMP_FLAGGED ?>"><?php echo _("Important") ?></option>
-      <option value="!<?php echo IMP_FLAGGED ?>"><?php echo _("Not Important") ?></option>
-      <option value="<?php echo IMP_ANSWERED ?>"><?php echo _("Answered") ?></option>
-      <option value="!<?php echo IMP_ANSWERED ?>"><?php echo _("Unanswered") ?></option>
-      <option value="<?php echo IMP_DELETED ?>"><?php echo _("Deleted") ?></option>
-      <option value="!<?php echo IMP_DELETED ?>"><?php echo _("Not Deleted") ?></option>
-      <option value="<?php echo IMP_DRAFT ?>"><?php echo _("Draft") ?></option>
-      <option value="!<?php echo IMP_DRAFT ?>"><?php echo _("Not Draft") ?></option>
-      <option value="<?php echo IMP_PERSONAL ?>"><?php echo _("Personal") ?></option>
-      <option value="!<?php echo IMP_PERSONAL ?>"><?php echo _("Not Personal") ?></option>
+    <option value="!<?php echo IMP_UNSEEN ?>"><?php echo _("Seen") ?></option>
+    <option value="<?php echo IMP_UNSEEN ?>"><?php echo _("Unseen") ?></option>
+    <option value="<?php echo IMP_FLAGGED ?>"><?php echo _("Important") ?></option>
+    <option value="!<?php echo IMP_FLAGGED ?>"><?php echo _("Not Important") ?></option>
+    <option value="<?php echo IMP_ANSWERED ?>"><?php echo _("Answered") ?></option>
+    <option value="!<?php echo IMP_ANSWERED ?>"><?php echo _("Unanswered") ?></option>
+    <option value="<?php echo IMP_DELETED ?>"><?php echo _("Deleted") ?></option>
+    <option value="!<?php echo IMP_DELETED ?>"><?php echo _("Not Deleted") ?></option>
+    <option value="<?php echo IMP_DRAFT ?>"><?php echo _("Draft") ?></option>
+    <option value="!<?php echo IMP_DRAFT ?>"><?php echo _("Not Draft") ?></option>
+    <option value="<?php echo IMP_PERSONAL ?>"><?php echo _("Personal") ?></option>
+    <option value="!<?php echo IMP_PERSONAL ?>"><?php echo _("Not Personal") ?></option>
 <?php endif; ?>
-    </select>
+   </select>
 <?php if ($imp['base_protocol'] != 'pop3'): ?>
-    <select name="flag" onchange="flagMessages(<?php echo $navform ?>);">
-      <option value="" selected="selected"><?php echo _("Mark as:") ?></option>
-      <option value="Seen"><?php echo _("Seen") ?></option>
-      <option value="0Seen"><?php echo _("Unseen") ?></option>
-      <option value="Flagged"><?php echo _("Important") ?></option>
-      <option value="0Flagged"><?php echo _("Not Important") ?></option>
-      <option value="Answered"><?php echo _("Answered") ?></option>
-      <option value="0Answered"><?php echo _("Unanswered") ?></option>
-<?php if (!$use_trash): ?>
-      <option value="Deleted"><?php echo _("Deleted") ?></option>
-      <option value="0Deleted"><?php echo _("Not Deleted") ?></option>
+   <select name="flag" onchange="flagMessages(<?php echo $navform ?>);">
+    <option value="" selected="selected"><?php echo _("Mark as:") ?></option>
+    <option value="Seen"><?php echo _("Seen") ?></option>
+    <option value="0Seen"><?php echo _("Unseen") ?></option>
+    <option value="Flagged"><?php echo _("Important") ?></option>
+    <option value="0Flagged"><?php echo _("Not Important") ?></option>
+    <option value="Answered"><?php echo _("Answered") ?></option>
+    <option value="0Answered"><?php echo _("Unanswered") ?></option>
+<?php if (!$use_trash && !$use_vtrash): ?>
+    <option value="Deleted"><?php echo _("Deleted") ?></option>
+    <option value="0Deleted"><?php echo _("Not Deleted") ?></option>
 <?php endif; ?>
-      <option value="Draft"><?php echo _("Draft") ?></option>
-      <option value="0Draft"><?php echo _("Not Draft") ?></option>
-    </select>
+    <option value="Draft"><?php echo _("Draft") ?></option>
+    <option value="0Draft"><?php echo _("Not Draft") ?></option>
+   </select>
 <?php endif; ?>
-    </form>
+   </form>
   </td>
-  <td align="left" nowrap="nowrap" width="30%">
-    <?php if ($conf['user']['allow_folders']): ?>
-    <form method="post" name="copymove<?php echo $navform ?>" action="<?php echo Horde::applicationUrl('mailbox.php') ?>">
-    <?php echo Horde::widget('', _("Move to folder"), 'widget', '', "Transfer('move_messages', $navform); return false;", _("Move"), true) ?> |
-    <?php echo Horde::widget('', _("Copy to folder"), 'widget', '', "Transfer('copy_messages', $navform); return false;", _("Copy"), true) ?>
-    <select name="targetMailbox" onchange="updateFolders(<?php echo $navform ?>);">
-      <?php echo $folder_options ?>
-    </select>
-    </form>
-    <?php endif; ?>
+  <td class="leftAlign" nowrap="nowrap" width="30%">
+<?php if ($conf['user']['allow_folders']): ?>
+   <form method="post" name="copymove<?php echo $navform ?>" action="<?php echo Horde::applicationUrl('mailbox.php') ?>">
+   <?php echo Horde::widget('#', _("Move to folder"), 'widget', '', "Transfer('move_messages', $navform); return false;", _("Move"), true) ?> |
+   <?php echo Horde::widget('#', _("Copy to folder"), 'widget', '', "Transfer('copy_messages', $navform); return false;", _("Copy"), true) ?>
+   <select name="targetMailbox" onchange="updateFolders(<?php echo $navform ?>);">
+    <?php echo $folder_options ?>
+   </select>
+   </form>
+<?php endif; ?>
   </td>
 
-  <td width="50%" align="right" nowrap="nowrap">
-    <?php if ($pageOb->pagecount > 1): ?>
-    <form method="get" name="pagenav<?php echo $navform ?>" action="<?php echo Horde::applicationUrl('mailbox.php') ?>">
-    <?php Util::pformInput() ?>
-    <?php echo $pages_first . '&nbsp;' . $pages_prev ?>
-    <input type="text" name="page" value="<?php echo htmlspecialchars($pageOb->page) ?>" size="<?php echo String::length($pageOb->pagecount) ?>" />
-    <?php echo $pages_next . '&nbsp;' . $pages_last ?>
-    </form>
-    <?php endif; ?>
+  <td width="50%" class="rightAlign" nowrap="nowrap">
+<?php if ($pageOb->pagecount > 1): ?>
+   <form method="get" name="pagenav<?php echo $navform ?>" action="<?php echo Horde::applicationUrl('mailbox.php') ?>">
+   <?php Util::pformInput() ?>
+   <?php echo $pages_first . '&nbsp;' . $pages_prev ?>
+   <input type="text" name="page" value="<?php echo htmlspecialchars($pageOb->page) ?>" size="<?php echo String::length($pageOb->pagecount) ?>" />
+   <?php echo $pages_next . '&nbsp;' . $pages_last ?>
+   </form>
+<?php endif; ?>
   </td>
-
-</tr>
+ </tr>
 </table>
 
-</td>
+ </td>
 </tr>


--- orig/templates/smime/passphrase.inc
+++ mod/templates/smime/passphrase.inc
@@ -8,20 +8,19 @@
 <?php endif; ?>
 
 <table border="0" cellspacing="0" cellpadding="2">
-    <tr>
-        <td class="smallheader" align="left">
-            <?php echo sprintf(_("Please enter the passphrase for your S/MIME private key. You will only need to enter this passphrase once per %s session."), _("Mail")) ?>
-        </td>
-    </tr>
-
-    <tr>
-        <td class="light" align="left">
-            <b><?php echo _("Passphrase:") ?></b>&nbsp;
-            <input type="password" name="passphrase" size="15" maxlength="60" class="fixed" />&nbsp;
-            <input type="submit" name="submit" class="button" value="<?php echo _("Submit") ?>" />&nbsp;
-            <input type="button" class="button" onclick="window.close();" value="<?php echo _("Cancel") ?>" />
-        </td>
-    </tr>
+  <tr>
+    <td class="smallheader leftAlign">
+      <?php printf(_("Please enter the passphrase for your S/MIME private key. You will only need to enter this passphrase once per %s session."), _("Mail")) ?>
+    </td>
+  </tr>
+  <tr>
+    <td class="light leftAlign">
+      <strong><?php echo _("Passphrase:") ?></strong>&nbsp;
+      <input type="password" name="passphrase" size="15" maxlength="60" class="fixed" />&nbsp;
+      <input type="submit" name="submit" class="button" value="<?php echo _("Submit") ?>" />&nbsp;
+      <input type="button" class="button" onclick="window.close();" value="<?php echo _("Cancel") ?>" />
+    </td>
+  </tr>
 </table>
 
 </form>


--- orig/lib/MIME/Viewer/images.php
+++ mod/lib/MIME/Viewer/images.php
@@ -6,9 +6,9 @@
  * The IMP_MIME_Viewer_images class allows images to be displayed
  * inline in a message.
  *
- * $Horde: imp/lib/MIME/Viewer/images.php,v 1.43.10.11 2005/10/13 13:04:18 jan Exp $
+ * $Horde: imp/lib/MIME/Viewer/images.php,v 1.43.10.19 2006/01/02 06:05:04 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -40,42 +40,51 @@
 
         global $browser;
 
+        /* If calling page is asking us to output data, do that without any
+         * further delay and exit. */
+        if (Util::getFormData('img_data')) {
+            $this->_contentType = parent::getType();
+            return parent::render();
+        }
+
+        /* Convert the image to browser-viewable format and display. */
+        if (Util::getFormData('images_view_convert')) {
+            return $this->_viewConvert();
+        }
+
+        /* Create the thumbnail and display. */
+        if (Util::getFormData('images_view_thumbnail')) {
+            return $this->_viewConvert(true);
+        }
+
+        /* This page has been called with the thumbnail parameter. See if we
+         * can convert to an inline browser viewable form. */
+        if (Util::getFormData('view_thumbnail')) {
+            $img = $this->_getHordeImageOb();
+            if ($img) {
+                return $this->_popupImageWindow();
+            } else {
+                return $contents->formatStatusMsg(_("The server was not able to create a thumbnail of this image."));
+            }
+        }
+
+        if (Util::getFormData('images_load_convert')) {
+            return $this->_popupImageWindow();
+        }
+
         if ($contents->viewAsAttachment()) {
-            if (Util::getFormData('images_view_convert')) {
-                /* Convert the image to browser-viewable format and
-                 * display. */
-                return $this->_viewConvert();
-            } elseif (Util::getFormData('images_view_thumbnail')) {
-                /* Create the thumbnail and display. */
-                return $this->_viewConvert(true);
-            } elseif (!$browser->hasFeature('javascript') ||
-                      !$contents->viewAsAttachment(true) ||
-                      Util::getFormData('img_data')) {
+            if (!$browser->hasFeature('javascript') ||
+                !$contents->viewAsAttachment(true)) {
                 /* If either:
                    + The browser doesn't support javascript
                    + We are not viewing in a popup window
-                   + The calling URL wants to force us to output straight
-                     data ('img_data' parameter is set)
-                   Then we simply render the image data. */
+                   Then simply render the image data. */
+                $this->_contentType = parent::getType();
                 return parent::render();
-            } elseif (Util::getFormData('view_thumbnail')) {
-                /* This page has been called with the thumbnail parameter.
-                 * See if we can convert to an inline browser viewable
-                 * form. */
-                $img = $this->_getHordeImageOb();
-                if ($img) {
-                    return $this->_popupImageWindow();
-                } else {
-                    return $contents->formatStatusMsg(_("The server was not able to create a thumbnail of this image."));
-                }
-            } elseif (Util::getFormData('view_thumbnail') ||
-                      Util::getFormData('images_load_convert') ||
-                      $browser->isViewable(parent::getType())) {
-                /* If either:
-                   + This page has been called with the convert parameter
-                   + The browser can display the image type directly
-                   Than we output the javascript code to render the auto
-                   resize popup image window. */
+            } elseif ($browser->isViewable(parent::getType())) {
+                /* The browser can display the image type directly - just
+                   output the javascript code to render the auto resize popup
+                   image window. */
                 return $this->_popupImageWindow();
             }
         }
@@ -86,7 +95,7 @@
             $alt = $this->mime_part->getName(false, true);
             return Horde::img($contents->urlView($this->mime_part, 'view_attach'), $alt, null, '');
         } else {
-            /* If we have made it this far, than the browser can not view this
+            /* If we have made it this far, than the browser cannot view this
                image inline.  Inform the user of this and, possibly, ask user
                if we should convert to another image type. */
             $msg = _("Your browser does not support inline display of this image type.");
@@ -117,19 +126,11 @@
      */
     function getType()
     {
-        global $browser;
-
         if ($this->_contentType) {
             return $this->_contentType;
-        } elseif (MIME_Contents::viewAsAttachment() &&
-            (!$browser->hasFeature('javascript') ||
-             !MIME_Contents::viewAsAttachment(true) ||
-             Util::getFormData('img_data') ||
-             Util::getFormData('images_view_thumbnail'))) {
-            return parent::getType();
+        } else {
+            return 'text/html; charset=' . NLS::getCharset();
         }
-
-        return 'text/html; charset=' . NLS::getCharset();
     }
 
     /**
@@ -174,7 +175,17 @@
      */
     function _popupImageWindow()
     {
-        $self_url = Util::addParameter(Horde::selfUrl(true), array('img_data' => 1, 'images_view_thumbnail' => Util::getFormData('view_thumbnail'), 'images_view_convert' => Util::getFormData('images_load_convert')));
+        $params = $remove_params = array();
+        if (Util::getFormData('view_thumbnail')) {
+            $params['images_view_thumbnail'] = 1;
+            $remove_params[] = 'view_thumbnail';
+        } elseif (Util::getFormData('images_load_convert')) {
+            $params['images_view_convert'] = 1;
+            $remove_params[] = 'images_load_convert';
+        } else {
+            $params['img_data'] = 1;
+        }
+        $self_url = Util::addParameter(Util::removeParameter(Horde::selfUrl(true), $remove_params), $params);
         $title = MIME::decode($this->mime_part->getName(false, true));
         return parent::_popupImageWindow($self_url, $title);
     }
@@ -191,7 +202,7 @@
     function _viewConvert($thumb = false)
     {
         $mime = $this->mime_part;
-        $img = &$this->_getHordeImageOb();
+        $img = $this->_getHordeImageOb();
 
         if ($thumb) {
             $img->resize(96, 96, true);
@@ -211,13 +222,11 @@
      *
      * @return Horde_Image  The requested object.
      */
-    function &_getHordeImageOb()
+    function _getHordeImageOb()
     {
-        global $conf;
-
         include_once 'Horde/Image.php';
         $params = array('temp' => Horde::getTempdir());
-        if (!empty($conf['image']['convert'])) {
+        if (!empty($GLOBALS['conf']['image']['convert'])) {
             $img = &Horde_Image::singleton('im', $params);
         } elseif (Util::extensionExists('gd')) {
             $img = &Horde_Image::singleton('gd', $params);
@@ -225,9 +234,13 @@
             return false;
         }
 
+        if (is_a($img, 'PEAR_Error')) {
+            return false;
+        }
+
         $ret = $img->loadString(1, $this->mime_part->getContents());
         if (is_a($ret, 'PEAR_Error')) {
-            $img = false;
+            return false;
         }
 
         return $img;


--- orig/templates/compose/recompose.inc
+++ mod/templates/compose/recompose.inc
@@ -1,5 +1,5 @@
 <br />
-<table border="0" align="center" width="300">
+<table align="center" width="300">
 <tr>
   <td colspan="2" class="header"><span class="smallheader">
     <?php echo _("Here is the message you were composing:") ?>
@@ -7,22 +7,22 @@
 </tr>
 
 <tr>
-  <td width="5%" class="light" align="right" valign="top"><b><?php echo _("To") ?></b>&nbsp;</td>
+  <td width="5%" class="light rightAlign" valign="top"><strong><?php echo _("To") ?></strong>&nbsp;</td>
   <td width="95%" class="text"><?php echo htmlspecialchars(_getFormData('to')) ?></td>
 </tr>
 
 <tr>
-  <td class="light" align="right" valign="top"><b><?php echo _("Cc") ?></b>&nbsp;</td>
+  <td class="light rightAlign" valign="top"><strong><?php echo _("Cc") ?></strong>&nbsp;</td>
   <td class="text"><?php echo htmlspecialchars(_getFormData('cc')) ?></td>
 </tr>
 
 <tr>
-  <td class="light" align="right" valign="top"><b><?php echo _("Bcc") ?></b>&nbsp;</td>
+  <td class="light rightAlign" valign="top"><strong><?php echo _("Bcc") ?></strong>&nbsp;</td>
   <td class="text"><?php echo htmlspecialchars(_getFormData('bcc')) ?></td>
 </tr>
 
 <tr>
-  <td class="light" align="right" valign="top"><b><?php echo _("Subject") ?></b>&nbsp;</td>
+  <td class="light rightAlign" valign="top"><strong><?php echo _("Subject") ?></strong>&nbsp;</td>
   <td class="text"><?php echo htmlspecialchars(_getFormData('subject')) ?></td>
 </tr>
 


--- orig/templates/compose/compose.inc
+++ mod/templates/compose/compose.inc
@@ -13,11 +13,11 @@
 <?php endif; ?>
 <?php Util::pformInput() ?>
 <input type="hidden" name="actionID" value="" />
+<input type="hidden" name="__formToken_compose" value="<?php echo Horde_Token::generateId('compose'); ?>" />
 <?php if (isset($messageCacheID)): ?>
 <input type="hidden" name="messageCache" value="<?php echo $messageCacheID ?>" />
 <?php endif; ?>
 <input type="hidden" name="spellcheck" value="" />
-<input type="hidden" name="index" value="<?php echo htmlspecialchars(Util::getFormData('index')) ?>" />
 <input type="hidden" name="page" value="<?php echo htmlspecialchars(Util::getFormData('page')) ?>" />
 <input type="hidden" name="start" value="<?php echo htmlspecialchars(Util::getFormData('start')) ?>" />
 <input type="hidden" name="popup" value="<?php echo htmlspecialchars(Util::getFormData('popup')) ?>" />
@@ -46,12 +46,11 @@
 <input type="hidden" name="in_reply_to" value="<?php echo htmlspecialchars($header['inreplyto']) ?>" />
 <?php if ($reply_type == 'reply'): ?>
 <input type="hidden" name="references" value="<?php echo htmlspecialchars($header['references']) ?>" />
+<input type="hidden" name="reply_index" value="<?php echo htmlspecialchars($reply_index) ?>" />
 <?php endif; ?>
 <?php endif; ?>
 
-<div class="header">
- &nbsp;<?php echo htmlspecialchars($title) ?>
-</div>
+<h1 class="header"><?php echo htmlspecialchars($title) ?></h1>
 
 <br />
 <?php IMP::status(); ?>
@@ -62,14 +61,14 @@
     <td>
       <table width="100%" cellspacing="0">
         <tr>
-          <td nowrap="nowrap" align="left">
-            <input name="submitBtn1" type="button" <?php echo Horde::getAccessKeyAndTitle(_("_Send Message")) ?> class="button" onclick="if (<?php echo $imp['file_upload'] ? 'attachmentCheck()' : 'true' ?>) { document.compose.actionID.value='<?php echo $send_action; ?>'; uniqSubmit(); }" value="<?php echo _("Send Message") ?>" />
+          <td class="leftAlign" nowrap="nowrap">
+            <input name="btn_send_message" type="submit" <?php echo Horde::getAccessKeyAndTitle(_("_Send Message")) ?> class="button" onclick="return uniqSubmit('send_message');" value="<?php echo _("Send Message") ?>" />
 <?php if ($conf['user']['allow_folders']): ?>
-            <input name="submitBtn2" type="button" <?php echo Horde::getAccessKeyAndTitle(_("Save _Draft")) ?> class="button" onclick="document.compose.actionID.value='save_draft'; uniqSubmit();" value="<?php echo _("Save Draft") ?>" />
+            <input name="btn_save_draft" type="submit" <?php echo Horde::getAccessKeyAndTitle(_("Save _Draft")) ?> class="button" onclick="uniqSubmit('save_draft');" value="<?php echo _("Save Draft") ?>" />
 <?php endif; ?>
-            <input name="submitBtn3" type="button" title="<?php echo _("Cancel Message") ?>" class="button" onclick="confirmCancel();" value="<?php echo _("Cancel Message") ?>" />
+            <input name="btn_cancel_compose" type="submit" title="<?php echo _("Cancel Message") ?>" class="button" onclick="return confirmCancel();" value="<?php echo _("Cancel Message") ?>" />
           </td>
-          <td align="right" style="padding:2px"><?php echo Help::link('imp', 'compose-buttons') ?>&nbsp;</td>
+          <td class="rightAlign" style="padding:2px"><?php echo Help::link('imp', 'compose-buttons') ?>&nbsp;</td>
         </tr>
       </table>
     </td>
@@ -77,14 +76,14 @@
 
   <tr>
 <?php if (!$prefs->isLocked('default_identity')): ?>
-    <td class="light" valign="middle" align="right"><b><?php echo Horde::label('identity', _("_Identity")) ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo Horde::label('identity', _("_Identity")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
-          <td align="left">
+          <td class="leftAlign">
             <input type="hidden" name="last_identity" value="<?php echo $identity->getDefault() ?>" />
     <?php if (count($select_list) > 1): ?>
-        <select id="identity" name="identity" tabindex="<?php echo $tabindex++ ?>" onchange="change_identity(this.selectedIndex)">
+        <select id="identity" name="identity" tabindex="<?php echo $tabindex++ ?>" onchange="change_identity(this.selectedIndex)" style="direction:ltr">
         <?php foreach ($select_list as $key => $select): ?>
         <option value="<?php echo $key ?>"<?php if ($key == $identity->getDefault()) echo ' selected="selected"' ?>><?php echo htmlspecialchars($select) ?></option>
         <?php endforeach; ?>
@@ -95,65 +94,53 @@
     <?php endif; ?>
           </td>
 <?php else: ?>
-    <td class="light" align="right"><b><?php echo _("From") ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo _("From") ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
 <?php if (!$prefs->isLocked('from_addr')): ?>
-          <td align="left"><input type="text" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="from" value="<?php echo htmlspecialchars($from) ?>" /></td>
+          <td class="leftAlign"><input type="text" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="from" value="<?php echo htmlspecialchars($from) ?>" style="direction:ltr"/></td>
 <?php else: ?>
-          <td align="left"><b>&nbsp;<?php echo htmlspecialchars($from) ?></b></td>
+          <td class="leftAlign"><strong>&nbsp;<?php echo htmlspecialchars($from) ?></strong></td>
 <?php endif; ?>
 <?php endif; ?>
-          <td align="right"><?php echo Help::link('imp', 'compose-from') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-from') ?>&nbsp;</td>
         </tr>
       </table>
     </td>
   </tr>
 
   <tr>
-    <td class="light" align="right" valign="middle"><b><?php echo Horde::label('to', _("_To")) ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo Horde::label('to', _("_To")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
 <?php if (is_array($header['to'])): $first_to = true; ?>
 <?php foreach ($header['to'] as $to_item): ?>
         <tr>
 <?php if (count($to_item) > 1): ?>
-          <td align="left">
-            <table cellspacing="0">
-              <tr>
-                <td width="350">
-                  <select id="to" tabindex="<?php echo $tabindex++ ?>" name="to_list[<?php echo htmlspecialchars($to_item[0]) ?>]" style="width:350px">
+          <td class="leftAlign">
+                  <select id="to" tabindex="<?php echo $tabindex++ ?>" name="to_list[<?php echo htmlspecialchars($to_item[0]) ?>]" style="width:350px;direction:ltr">
                     <option value="" selected="selected"><?php echo _("Choose a match or edit the address to the right:") ?></option>
 <?php for ($i = 1; $i < count($to_item); $i++): ?>
                     <option value="<?php echo htmlspecialchars($to_item[$i]) ?>"><?php echo htmlspecialchars($to_item[$i]) ?></option>
 <?php endfor; ?>
                   </select>
-                </td>
-                <td width="150">
-                  <input type="text" size="15" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[<?php echo htmlspecialchars($to_item[0]) ?>]" value="<?php echo htmlspecialchars($to_item[0]) ?>" style="width:150px" />
-                </td>
-              </tr>
-            </table>
+                  <input type="text" size="15" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[<?php echo htmlspecialchars($to_item[0]) ?>]" value="<?php echo htmlspecialchars($to_item[0]) ?>" style="width:150px;direction:ltr" />
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" /></td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_field[]" value="<?php echo htmlspecialchars($to_item) ?>" style="direction:ltr" /></td>
 <?php endif; ?>
 <?php if ($first_to): $first_to = false; ?>
-          <td align="right"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
 <?php else: ?>
           <td>&nbsp;</td>
 <?php endif; ?>
         </tr>
 <?php endforeach; ?>
-        <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to_new" /></td>
-          <td>&nbsp;</td>
-        </tr>
 <?php else: ?>
         <tr>
-          <td align="left"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="to" value="<?php echo htmlspecialchars($header['to']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this);" /> <span id="expandingto" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>'; ?></td>
-          <td align="right"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
+          <td class="leftAlign"><input type="text" id="to" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" style="direction:ltr" name="to" value="<?php echo htmlspecialchars($header['to']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this);" /> <span id="expandingto" class="inProgress" style="visibility:hidden">' . _("Expanding") . '&hellip;</span>' : '/>' ?></td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-to') ?>&nbsp;</td>
         </tr>
 <?php endif; ?>
       </table>
@@ -162,18 +149,18 @@
 
 <?php if ($conf['compose']['allow_cc']): ?>
   <tr>
-    <td class="light" align="right" valign="middle"><b><?php echo Horde::label('cc', _("_Cc")) ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo Horde::label('cc', _("_Cc")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
 <?php if (is_array($header['cc'])): $first_cc = true; ?>
 <?php foreach ($header['cc'] as $cc_item): ?>
         <tr>
 <?php if (count($cc_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table cellspacing="0">
               <tr>
                 <td width="350">
-                  <select id="cc" tabindex="<?php echo $tabindex++ ?>" name="cc_list[<?php echo htmlspecialchars($cc_item[0]) ?>]" style="width:350px">
+                  <select id="cc" tabindex="<?php echo $tabindex++ ?>" name="cc_list[<?php echo htmlspecialchars($cc_item[0]) ?>]" style="width:350px;direction:ltr">
                     <option value="" selected="selected"><?php echo _("Choose a match or edit the address to the right:") ?></option>
 <?php for ($i = 1; $i < count($cc_item); $i++): ?>
                     <option value="<?php echo htmlspecialchars($cc_item[$i]) ?>"><?php echo htmlspecialchars($cc_item[$i]) ?></option>
@@ -181,29 +168,29 @@
                   </select>
                 </td>
                 <td width="150">
-                  <input type="text" size="15" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_field[<?php echo htmlspecialchars($cc_item[0]) ?>]" value="<?php echo htmlspecialchars($cc_item[0]) ?>" style="width:150px" />
+                  <input type="text" size="15" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_field[<?php echo htmlspecialchars($cc_item[0]) ?>]" value="<?php echo htmlspecialchars($cc_item[0]) ?>" style="width:150px;direction:ltr" />
                 </td>
               </tr>
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_field[]" value="<?php echo htmlspecialchars($cc_item) ?>" /></td>
+          <td class="leftAlign"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_field[]" value="<?php echo htmlspecialchars($cc_item) ?>" style="direction:ltr" /></td>
 <?php endif; ?>
 <?php if ($first_cc): $first_cc = false; ?>
-          <td align="right"><?php echo Help::link('imp', 'compose-cc') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-cc') ?>&nbsp;</td>
 <?php else: ?>
           <td>&nbsp;</td>
 <?php endif; ?>
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_new" /></td>
+          <td class="leftAlign"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc_new" style="direction:ltr" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
         <tr>
-          <td align="left"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="cc" value="<?php echo htmlspecialchars($header['cc']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this);" /> <span id="expandingcc" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>' ?></td>
-          <td align="right"><?php echo Help::link('imp', 'compose-cc') ?>&nbsp;</td>
+          <td class="leftAlign"><input type="text" id="cc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" style="direction:ltr" name="cc" value="<?php echo htmlspecialchars($header['cc']) ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this);" /> <span id="expandingcc" class="inProgress" style="visibility:hidden">' . _("Expanding") . '&hellip;</span>' : '/>' ?></td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-cc') ?>&nbsp;</td>
         </tr>
 <?php endif; ?>
       </table>
@@ -213,18 +200,18 @@
 
 <?php if ($conf['compose']['allow_bcc']): ?>
   <tr>
-    <td class="light" align="right" valign="middle"><b><?php echo Horde::label('bcc', _("_Bcc")) ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo Horde::label('bcc', _("_Bcc")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
 <?php if (is_array($header['bcc'])): $first_bcc = true; ?>
 <?php foreach ($header['bcc'] as $bcc_item): ?>
         <tr>
 <?php if (count($bcc_item) > 1): ?>
-          <td align="left">
+          <td class="leftAlign">
             <table cellspacing="0">
               <tr>
                 <td width="350">
-                  <select id="bcc" tabindex="<?php echo $tabindex++ ?>" name="bcc_list[<?php echo htmlspecialchars($bcc_item[0]) ?>]" style="width:350px">
+                  <select id="bcc" tabindex="<?php echo $tabindex++ ?>" name="bcc_list[<?php echo htmlspecialchars($bcc_item[0]) ?>]" style="width:350px;direction:ltr">
                     <option value="" selected="selected"><?php echo _("Choose a match or edit the address to the right:") ?></option>
 <?php for ($i = 1; $i < count($bcc_item); $i++): ?>
                     <option value="<?php echo htmlspecialchars($bcc_item[$i]) ?>"><?php echo htmlspecialchars($bcc_item[$i]) ?></option>
@@ -232,29 +219,29 @@
                   </select>
                 </td>
                 <td width="150">
-                  <input type="text" size="15" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_field[<?php echo htmlspecialchars($bcc_item[0]) ?>]" value="<?php echo htmlspecialchars($bcc_item[0]) ?>" style="width:150px" />
+                  <input type="text" size="15" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_field[<?php echo htmlspecialchars($bcc_item[0]) ?>]" value="<?php echo htmlspecialchars($bcc_item[0]) ?>" style="width:150px;direction:ltr" />
                 </td>
               </tr>
             </table>
           </td>
 <?php else: ?>
-          <td align="left"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_field[]" value="<?php echo htmlspecialchars($bcc_item) ?>" /></td>
+          <td class="leftAlign"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_field[]" value="<?php echo htmlspecialchars($bcc_item) ?>" style="direction:ltr" /></td>
 <?php endif; ?>
 <?php if ($first_bcc): $first_bcc = false; ?>
-          <td align="right"><?php echo Help::link('imp', 'compose-bcc') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-bcc') ?>&nbsp;</td>
 <?php else: ?>
           <td>&nbsp;</td>
 <?php endif; ?>
         </tr>
 <?php endforeach; ?>
         <tr>
-          <td align="left"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_new" /></td>
+          <td class="leftAlign"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc_new" style="direction:ltr" /></td>
           <td>&nbsp;</td>
         </tr>
 <?php else: ?>
         <tr>
-          <td align="left"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="bcc" value="<?php echo htmlspecialchars($header['bcc']); ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this);" /> <span id="expandingbcc" class="inProgress" style="visibility:hidden;">' . _("Expanding") . '&hellip;</span>' : '/>' ?></td>
-          <td align="right"><?php echo Help::link('imp', 'compose-bcc') ?>&nbsp;</td>
+          <td class="leftAlign"><input type="text" id="bcc" size="55" tabindex="<?php echo $tabindex++ ?>" class="fixed" style="direction:ltr" name="bcc" value="<?php echo htmlspecialchars($header['bcc']); ?>" <?php echo ($browser->hasFeature('iframes')) ? 'onchange="expandField(this);" /> <span id="expandingbcc" class="inProgress" style="visibility:hidden">' . _("Expanding") . '&hellip;</span>' : '/>' ?></td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-bcc') ?>&nbsp;</td>
         </tr>
 <?php endif; ?>
       </table>
@@ -263,12 +250,12 @@
 <?php endif; ?>
 
   <tr>
-    <td class="light" align="right" valign="middle"><b><?php echo Horde::label('subject', _("S_ubject")) ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo Horde::label('subject', _("S_ubject")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
-          <td align="left"><input type="text" id="subject" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="subject" value="<?php echo htmlspecialchars($header['subject']) ?>" size="55" <?php if ($browser->isBrowser('msie')) echo 'onkeydown="subjectTab();" ' ?>/></td>
-          <td align="right"><?php echo Help::link('imp', 'compose-subject') ?>&nbsp;</td>
+          <td class="leftAlign"><input type="text" id="subject" tabindex="<?php echo $tabindex++ ?>" class="fixed" name="subject" value="<?php echo htmlspecialchars($header['subject']) ?>" size="55" <?php if ($browser->isBrowser('msie')) echo 'onkeydown="subjectTab();" ' ?>/></td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-subject') ?>&nbsp;</td>
         </tr>
       </table>
     </td>
@@ -280,13 +267,13 @@
 ?>
 <?php if ($set_priority || !$locked_charset): ?>
   <tr>
-    <td class="light" valign="middle" align="right"><b><?php echo ($locked_charset) ? Horde::label('priority', _("_Priority")) : Horde::label('charset', _("C_harset")) ?>&nbsp;</b></td>
+    <td class="light rightAlign"><strong><?php echo ($locked_charset) ? Horde::label('priority', _("_Priority")) : Horde::label('charset', _("C_harset")) ?>&nbsp;</strong></td>
     <td class="item">
       <table width="100%">
         <tr>
 <?php if (!$locked_charset): ?>
           <td>
-            <select id="charset" name="charset" tabindex="<?php echo $tabindex++ ?>">
+            <select id="charset" name="charset" tabindex="<?php echo $tabindex++ ?>" style="direction:ltr">
 <?php foreach ($nls['encodings'] as $charset => $name): ?>
               <option value="<?php echo $charset ?>"<?php if (strtolower($charset) == strtolower($encoding)) echo ' selected="selected"' ?>><?php echo $name ?></option>
 <?php endforeach; ?>
@@ -297,9 +284,9 @@
 <?php if ($set_priority): ?>
 <?php $priority = substr(Util::getFormData('x_priority', '3'), 0, 1); ?>
 <?php if (!$locked_charset): ?>
-          <td align="right" valign="middle"><?php echo Horde::label('priority', _("_Priority")) ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Horde::label('priority', _("_Priority")) ?>&nbsp;</td>
 <?php endif; ?>
-          <td align="left">
+          <td class="leftAlign">
             <select id="priority" name="x_priority" tabindex="<?php echo $tabindex++ ?>">
               <option value="1 (Highest)"<?php if ($priority == '1)') echo ' selected="selected"' ?>>1 (<?php echo _("Highest") ?>)</option>
               <option value="2 (High)"<?php if ($priority == '2') echo ' selected="selected"' ?>>2 (<?php echo _("High") ?>)</option>
@@ -308,7 +295,7 @@
               <option value="5 (Lowest)"<?php if ($priority == '5') echo ' selected="selected"' ?>>5 (<?php echo _("Lowest") ?>)</option>
             </select>
           </td>
-          <td align="right"><?php echo Help::link('imp', 'compose-priority') ?>&nbsp;</td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-priority') ?>&nbsp;</td>
 <?php endif; ?>
 
         </tr>
@@ -317,6 +304,26 @@
   </tr>
 <?php endif; ?>
 
+<?php if (!$prefs->isLocked('stationery') && !empty($stationery_list)): ?>
+  <tr>
+    <td class="light rightAlign" valign="middle"><strong><?php echo Horde::label('stationery', _("Stationery")) ?>&nbsp;</strong></td>
+    <td class="item">
+      <table width="100%">
+        <tr>
+          <td class="leftAlign">
+             <select name="stationery" id="stationery" onchange="uniqSubmit('change_stationery');">
+               <option value=""><?php echo _("Select a stationery:") ?></option>
+<?php foreach ($stationery_list as $stationery_id => $stationery_choice): ?>
+               <option value="<?php echo $stationery_id ?>"<?php if ($stationery === $stationery_id) echo ' selected="selected"' ?>><?php echo $stationery_choice['n'] ?></option>
+<?php endforeach; ?>
+            </select>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+<?php endif; ?>
+
   <tr>
     <td>&nbsp;</td>
     <td class="item">
@@ -324,36 +331,39 @@
         <tr>
           <td>
             <table width="100%" cellspacing="0">
-              <tr valign="middle">
+              <tr>
 <?php if ($registry->hasMethod('contacts/search')): ?>
 <?php $contacts_url = Horde::applicationUrl('contacts.php'); ?>
-                <td align="center"><?php echo Horde::link('', _("Address Book"), 'widget', null, 'window.open(\'' . $contacts_url . '\', \'contacts\', \'toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=550,height=300,left=100,top=100\'); return false;') . Horde::img('addressbook-red.png') . '<br />' . _("Address Book") . '</a>' ?></td>
-                <td align="center"><?php echo Horde::link('', _("Expand Names"), 'widget', null, "document.compose.actionID.value='compose_expand_addr'; uniqSubmit(); return false;") . Horde::img('expand.png') . '<br />' . _("Expand Names") . '</a>' ?></td>
+                <td align="center"><?php echo Horde::link('#', '', 'widget', null, 'window.open(\'' . $contacts_url . '\', \'contacts\', \'toolbar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=550,height=300,left=100,top=100\'); return false;') . Horde::img('addressbook_browse.png') . '<br />' . _("Address Book") . '</a>' ?></td>
+                <td align="center"><?php echo Horde::link('#', '', 'widget', null, "uniqSubmit('compose_expand_addr'); return false;") . Horde::img('expand.png') . '<br />' . _("Expand Names") . '</a>' ?></td>
 <?php endif; ?>
 <?php if (!empty($conf['utils']['spellchecker'])): ?>
-                <td align="center"><?php echo Horde::link('', _("Spell Check"), 'widget', null, "document.compose.actionID.value='spell_check'; uniqSubmit(); return false;") . Horde::img('spellcheck.png') . '<br />' . _("Spell Check") . '</a>' ?></td>
+                <td align="center"><?php echo Horde::link('#', '', 'widget', null, "uniqSubmit('spell_check'); return false;") . Horde::img('spellcheck.png') . '<br />' . _("Spell Check") . '</a>' ?></td>
 <?php endif; ?>
-<?php if ($conf['compose']['special_characters']): ?>
-                <td align="center"><?php echo Horde::link('', _("Special Characters"), 'widget', null, 'window.open(\'' . Horde::url($registry->get('webroot', 'horde') . '/services/keyboard.php') . '\', \'chars\', \'height=220,width=400\'); return false;') . Horde::img('keyboard.png', null, null, $registry->getImageDir('horde')) . '<br />' . _("Special Characters") . '</a>' ?></td>
+<?php if ($browser->hasFeature('javascript') && $conf['compose']['special_characters']): ?>
+                <td align="center"><?php echo Horde::link('#', '', 'widget', null, 'window.open(\'' . Horde::url($registry->get('webroot', 'horde') . '/services/keyboard.php') . '\', \'chars\', \'height=220,width=400\'); return false;') . Horde::img('keyboard.png', null, null, $registry->getImageDir('horde')) . '<br />' . _("Special Characters") . '</a>' ?></td>
 <?php endif; ?>
 <?php if ($imp['file_upload']): ?>
-                <td align="center"><?php echo Horde::link('', _("Attachments"), 'widget', null, 'document.compose.upload_1.focus(); return false;') . Horde::img('manage_attachments.png') . '<br />' . _("Attachments") . '</a>' ?></td>
+                <td align="center"><?php echo Horde::link('#attachments', '', 'widget', null, 'document.compose.upload_1.focus(); return false;') . Horde::img('manage_attachments.png') . '<br />' . _("Attachments") . '</a>' ?></td>
 <?php endif; ?>
               </tr>
             </table>
           </td>
-          <td align="right" class="item" rowspan="2" valign="middle"><?php echo Help::link('imp', 'compose-options') ?>&nbsp;</td>
+          <td class="item rightAlign" rowspan="2"><?php echo Help::link('imp', 'compose-options') ?>&nbsp;</td>
         </tr>
         <tr>
           <td>
             <table width="100%" cellspacing="1">
               <tr>
-                <td valign="bottom" class="item" align="left">
+                <td class="item leftAlign" valign="bottom">
 <?php if ($conf['user']['allow_folders'] && !$prefs->isLocked('save_sent_mail')): ?>
                   <input id="ssm" type="checkbox" name="save_sent_mail"<?php if ($ssm_check) echo ' checked="checked"'; ?> />
                   <?php echo Horde::label('ssm', _("Sa_ve a copy in ")) ?>
 <?php
-    $sent_mail_folder = $identity->getSentmailFolder(null, Util::getFormData('sent_mail_folder'));
+    $sent_mail_folder = $identity->getValue('sent_mail_folder');
+    if (empty($sent_mail_folder)) {
+        $sent_mail_folder = Util::getFormData('sent_mail_folder');
+    }
     if ($conf['user']['select_sentmail_folder'] && !$prefs->isLocked('sent_mail_folder')) {
     $folders = IMP::flistSelect('', false, array('INBOX'), $sent_mail_folder);
     echo ' <select onchange="document.compose.save_sent_mail.checked=\'checked\'" tabindex="' . $tabindex++ . '" name="sent_mail_folder">' . $folders . '</select>';
@@ -373,12 +383,6 @@
 <?php if ($conf['compose']['allow_receipts'] && ($d_read != 'never')): ?>
                 <br /><input id="rrr" type="checkbox" name="request_read_receipt"<?php if (($d_read != 'ask') || (Util::getFormData('request_read_receipt') == 'on')) echo ' checked="checked"'; ?> /> <?php echo Horde::label('rrr', _("Request a _Read Receipt")) ?>
 <?php endif; ?>
-<?php if ($conf['compose']['allow_receipts'] && ($d_deliv != 'never')): ?>
-                <br /><input id="rdr" type="checkbox" name="request_delivery_confirmation"<?php if (($d_deliv != 'ask') || (Util::getFormData('request_delivery_confirmation') == 'on')) echo ' checked="checked"'; ?> /> <?php echo Horde::label('rdr', _("Re_quest Delivery Confirmation")) ?>
-<?php endif; ?>
-<?php if ($conf['compose']['link_attachments'] && !$conf['compose']['link_all_attachments']): ?>
-                <br /><input id="la" type="checkbox" name="link_attachments" <?php if (Util::getFormData('link_attachments')) echo 'checked="checked"'; ?> /> <?php echo Horde::label('la', _("Li_nk Attachments")) ?>
-<?php endif; ?>
                 </td>
               </tr>
 
@@ -387,11 +391,11 @@
                 <td colspan="2">
                   <table width="100%" cellspacing="0">
                     <tr>
-                      <td valign="middle" class="item" align="left" width="20px">
+                      <td class="item leftAlign" width="20">
                         <?php echo Horde::img('compose.png', _("Switch Composition Method"), 'align="middle"') ?>
                       </td>
-                      <td valign="middle" class="item" align="left">
-                        <?php echo Horde::link('', _("Switch Composition Method"), '', '', "document.compose.rtemode.value='" . ($rtemode ? 0 : 1) . "'; uniqSubmit(); return false;") ?>
+                      <td class="item leftAlign">
+                        <?php echo Horde::link('#', _("Switch Composition Method"), '', '', "document.compose.rtemode.value='" . ($rtemode ? 0 : 1) . "'; uniqSubmit(); return false;") ?>
                         <?php echo $rtemode ? _("Switch to plain text composition") : _("Switch to HTML composition") ?></a>
                       </td>
                     </tr>
@@ -407,9 +411,9 @@
   </tr>
 
   <tr>
-    <td class="light" align="right" valign="top"><b><?php echo Horde::label('message', _("Te_xt")) ?>&nbsp;</b></td>
+    <td class="light rightAlign" valign="top"><strong><?php echo Horde::label('message', _("Te_xt")) ?>&nbsp;</strong></td>
     <td class="item">
-      <textarea class="composebody" tabindex="<?php echo $tabindex++ ?>" name="message" id="message" rows="20" cols="<?php echo $prefs->getValue('wrap_width') ?>"><?php echo htmlspecialchars($msg) ?></textarea>
+      <textarea class="composebody" tabindex="<?php echo $tabindex++ ?>" name="message" id="message" rows="20" cols="80"><?php echo htmlspecialchars($msg) ?></textarea>
     </td>
   </tr>
 
@@ -418,18 +422,18 @@
     <td>
       <table width="100%" cellspacing="0">
         <tr>
-          <td nowrap="nowrap" align="left">
-            <input name="submitBtn4" type="button" <?php echo Horde::getAccessKeyAndTitle(_("_Send Message"), true) ?> class="button" onclick="if (<?php echo $imp['file_upload'] ? 'attachmentCheck()' : 'true' ?>) { document.compose.actionID.value='<?php echo $send_action; ?>'; uniqSubmit(); }" value="<?php echo _("Send Message") ?>" />
+          <td class="leftAlign" nowrap="nowrap">
+            <input name="btn_send_message" type="submit" <?php echo Horde::getAccessKeyAndTitle(_("_Send Message"), true) ?> class="button" onclick="return uniqSubmit('send_message');" value="<?php echo _("Send Message") ?>" />
 <?php if ($conf['user']['allow_folders']): ?>
-            <input name="submitBtn5" type="button" <?php echo Horde::getAccessKeyAndTitle(_("Save _Draft"), true) ?> class="button" onclick="document.compose.actionID.value='save_draft'; uniqSubmit();" value="<?php echo _("Save Draft") ?>" />
+            <input name="btn_save_draft" type="submit" <?php echo Horde::getAccessKeyAndTitle(_("Save _Draft"), true) ?> class="button" onclick="uniqSubmit('save_draft');" value="<?php echo _("Save Draft") ?>" />
 <?php endif; ?>
-            <input name="submitBtn6" type="button" title="<?php echo _("Cancel Message") ?>" class="button" onclick="confirmCancel();" value="<?php echo _("Cancel Message") ?>" />
+            <input name="btn_cancel_compose" type="submit" title="<?php echo _("Cancel Message") ?>" class="button" onclick="return confirmCancel();" value="<?php echo _("Cancel Message") ?>" />
           </td>
-          <td align="right" style="padding:2px"><?php echo Help::link('imp', 'compose-buttons') ?></td>
+          <td class="rightAlign" style="padding:2px"><?php echo Help::link('imp', 'compose-buttons') ?></td>
         </tr>
 <?php if ($prefs->getValue('use_pgp') || $prefs->getValue('use_smime')): ?>
         <tr>
-          <td class="item" nowrap="nowrap" align="left">
+          <td class="item leftAlign" nowrap="nowrap">
             &nbsp;<?php echo Horde::label('encrypt_options', _("Encr_yption Options")) ?>:&nbsp;
             <select id="encrypt_options" name="encrypt_options">
 <?php
@@ -438,15 +442,15 @@
 ?>
             </select>
           </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'compose-options-encrypt') ?>&nbsp;</td>
+          <td class="item rightAlign"><?php echo Help::link('imp', 'compose-options-encrypt') ?>&nbsp;</td>
         </tr>
 <?php if ($prefs->getValue('use_pgp') && $prefs->getValue('pgp_public_key')): ?>
         <tr>
-          <td class="item" nowrap="nowrap" align="left">
+          <td class="item leftAlign" nowrap="nowrap">
             <input id="pap" type="checkbox" name="pgp_attach_pubkey" <?php if (Util::getFormData('pgp_attach_pubkey', $prefs->getValue('pgp_attach_pubkey'))) echo 'checked="checked" ' ?>/>
             <?php echo Horde::label('pap', _("Attach a copy of your PGP public key to your message?")) ?>
           </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'pgp-compose-attach-pubkey') ?>&nbsp;</td>
+          <td class="item rightAlign"><?php echo Help::link('imp', 'pgp-compose-attach-pubkey') ?>&nbsp;</td>
         </tr>
 <?php endif; ?>
 <?php endif; ?>
@@ -461,9 +465,9 @@
 
   <tr class="header">
     <td colspan="2" height="25" class="header">
-      <b>&nbsp;<a name="attachments"></a><?php echo _("Attachments") ?></b>
+      <strong>&nbsp;<a id="attachments"></a><?php echo _("Attachments") ?></strong>
 <?php if ($GLOBALS['registry']->hasMethod('files/selectlistLink')): ?>
-<?php echo $GLOBALS['registry']->call('files/selectlistLink', array(_("Attach Files"), 'widget', 'compose', true)); ?>
+&nbsp;<?php echo $GLOBALS['registry']->call('files/selectlistLink', array(_("Attach Files"), 'widget', 'compose', true)); ?>
       <input type="hidden" name="selectlist_selectid" value="" />
 <?php endif; ?>
     </td>
@@ -475,23 +479,21 @@
       <table width="100%">
         <tr>
 <?php if (!$imp_compose->maxAttachmentSize()): ?>
-          <td align="left" colspan="2">
+          <td class="leftAlign" colspan="2">
             <?php echo _("Maximum total attachment size reached.") ?>
-            <input type="hidden" name="submitBtn7" />
           </td>
 <?php else: if (!isset($attachments)): ?>
-          <td align="left" colspan="2">
+          <td class="leftAlign" colspan="2">
             <?php echo _("Maximum number of attachments reached.") ?>
-            <input type="hidden" name="submitBtn7" />
           </td>
 <?php else: ?>
-          <td align="left">
+          <td class="leftAlign">
             <table>
               <tr id="attachment_row_1">
-                <td align="left">
-                  <b><?php echo _("File") ?> 1:</b>&nbsp;<input name="upload_1" tabindex="<?php echo $tabindex++ ?>" type="file" onchange="attachmentChanged()" size="25" class="fixed" />
+                <td class="leftAlign">
+                  <strong><?php echo _("File") ?> 1:</strong>&nbsp;<input name="upload_1" tabindex="<?php echo $tabindex++ ?>" type="file" onchange="attachmentChanged()" size="25" class="fixed" style="direction:ltr" />
                 </td>
-                <td align="left">
+                <td class="leftAlign">
                   <select name="upload_disposition_1">
                     <option value="attachment" selected="selected"><?php echo _("Attachment") ?></option>
                     <option value="inline"><?php echo _("Inline") ?></option>
@@ -505,47 +507,67 @@
               </tr>
             </table>
           </td>
-          <td valign="middle">
-            <input type="button" name="submitBtn7" class="button" onclick="attach('add_attachment', 'add');" value="<?php echo _("Attach") ?>" />
-          </td>
 <?php endif; ?>
 <?php endif; ?>
-          <td align="right" valign="middle"><?php echo Help::link('imp', 'compose-attach') ?>&nbsp;</td>
+          <td>
+            <input type="submit" name="btn_add_attachment" class="button" onclick="uniqSubmit('add_attachment');" value="<?php echo _("Update") ?>" />
+          </td>
+          <td class="rightAlign"><?php echo Help::link('imp', 'compose-attach') ?>&nbsp;</td>
         </tr>
       </table>
     </td>
   </tr>
 
-<?php if ($imp_compose->numberOfAttachments()): ?>
-<?php $save_attach = $prefs->getValue('save_attachments'); ?>
-<?php if ($ssm_check && (strpos($save_attach, 'prompt') === 0)): ?>
-<?php $save_attach_val = Util::getFormData('save_attachments_select', ($save_attach == 'prompt_yes')); ?>
+<?php
+    $save_attach = $prefs->getValue('save_attachments');
+    $show_link_attach = ($conf['compose']['link_attachments'] && !$conf['compose']['link_all_attachments']);
+    $show_save_attach = strpos($save_attach, 'prompt') === 0;
+?>
+<?php if ($show_link_attach || $show_save_attach): ?>
   <tr>
     <td>&nbsp;</td>
     <td class="item">
       <table width="100%" cellspacing="2">
+<?php if ($show_save_attach): ?>
+<?php $save_attach_val = Util::getFormData('save_attachments_select', ($save_attach == 'prompt_yes')); ?>
         <tr>
-          <td align="left" valign="middle"><b><?php echo _("Save Attachments with message in sent-mail folder?") ?></b>&nbsp;</td>
-          <td align="left">
+          <td class="leftAlign"><strong><?php echo _("Save Attachments with message in sent-mail folder?") ?></strong>&nbsp;</td>
+          <td class="leftAlign">
             <select name="save_attachments_select">
               <option value="1"<?php if ($save_attach_val == 1) echo ' selected="selected"' ?>><?php echo _("Yes") ?></option>
               <option value="0"<?php if ($save_attach_val == 0) echo ' selected="selected"' ?>><?php echo _("No") ?></option>
             </select>
           </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'compose-save-attachments') ?>&nbsp;</td>
+          <td class="item rightAlign"><?php echo Help::link('imp', 'compose-save-attachments') ?>&nbsp;</td>
+        </tr>
+<?php endif; ?>
+<?php if ($show_link_attach): ?>
+<?php $link_attach_val = Util::getFormData('link_attachments'); ?>
+        <tr>
+          <td class="leftAlign"><strong><?php echo _("Link Attachments?") ?></strong>&nbsp;</td>
+          <td class="leftAlign">
+            <select name="link_attachments">
+              <option value="1"<?php if ($link_attach_val == 1) echo ' selected="selected"' ?>><?php echo _("Yes") ?></option>
+              <option value="0"<?php if ($link_attach_val == 0) echo ' selected="selected"' ?>><?php echo _("No") ?></option>
+            </select>
+          </td>
+          <td class="item rightAlign"><?php echo Help::link('imp', 'compose-link-attachments') ?>&nbsp;</td>
         </tr>
+<?php endif; ?>
       </table>
     </td>
   </tr>
 <?php endif; ?>
+<?php if ($imp_compose->numberOfAttachments()): ?>
   <tr>
     <td>&nbsp;</td>
     <td class="item">
       <table width="100%">
         <tr>
-          <td align="left">
+          <td class="leftAlign">
             <table class="item" cellspacing="2">
 <?php
+    require_once 'Horde/MIME/Contents.php';
     $mime_contents = &new MIME_Contents(new MIME_Part());
     $localeinfo = NLS::getLocaleInfo();
 
@@ -556,6 +578,8 @@
         $linked = Util::getFormData (sprintf('file_linked_%d', $file_num));
         if ($mime->getType() != 'application/octet-stream') {
             $preview_url = Util::addParameter(Horde::applicationUrl('view.php'), array('actionID' => 'compose_attach_preview', 'id' => $file_num, 'messageCache' => $imp_compose->getMessageCacheId()));
+        } else {
+            $preview_url = null;
         }
         require IMP_TEMPLATES . '/compose/attachments.inc';
     }
@@ -564,21 +588,11 @@
                 <td>&nbsp;</td>
               </tr>
               <tr>
-                <td colspan="4" align="left"><b><?php echo _("Total Attachments Size:") ?></b> <?php echo number_format($imp_compose->sizeOfAttachments() / 1024, 2, $localeinfo['decimal_point'], '') ?> <?php echo _("KB") ?></th>
-              </tr>
-              <tr>
-                <td colspan="4">
-                  <table cellspacing="0">
-                    <tr>
-                      <td><?php echo Horde::img('reload.png', _("Refresh"), null, $registry->getImageDir('horde')) ?></td>
-                      <td>&nbsp;<a href="" onclick="attach('update_attachment', 'update'); return false;"><?php echo _("Update Attachment Information") ?></a></td>
-                    </tr>
-                  </table>
-                </td>
+                <td colspan="4" class="leftAlign"><strong><?php echo _("Total Attachments Size:") ?></strong> <?php echo number_format($imp_compose->sizeOfAttachments() / 1024, 2, $localeinfo['decimal_point'], '') ?> <?php echo _("KB") ?></th>
               </tr>
             </table>
           </td>
-          <td align="right" valign="top"><?php echo Help::link('imp', 'compose-attachments') ?>&nbsp;</td>
+          <td class="rightAlign" valign="top"><?php echo Help::link('imp', 'compose-attachments') ?>&nbsp;</td>
         </tr>
       </table>
     </td>


--- orig/lib/version.php
+++ mod/lib/version.php
@@ -1 +1 @@
-<?php define('IMP_VERSION', 'H3 (4.0.4)') ?>
+<?php define('IMP_VERSION', 'H3 (4.1.1)') ?>


--- orig/config/servers.php.dist
+++ mod/config/servers.php.dist
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Horde: imp/config/servers.php.dist,v 1.50.2.6 2005/08/03 16:47:57 selsky Exp $
+ * $Horde: imp/config/servers.php.dist,v 1.50.2.13 2006/02/07 07:50:24 slusarz Exp $
  *
  * This file is where you specify what mail servers people using your
  * installation of IMP can log in to.
@@ -19,16 +19,35 @@
  *            otherwise everything after and including the first @ in the
  *            username will be stripped off before attempting authentication.
  *
- * protocol: One of 'imap/notls' (or only 'imap' if you have a c-client
- *           version 2000c or older), 'pop3', 'imap/ssl', 'imap/tls', 
- *           'pop3/ssl', or 'pop3/tls'.  If using pop3 you will connect to a 
- *           POP3 mail server instead of of IMAP and all folder options will 
- *           be automatically turned off (POP3 does not support folders).
+ * protocol: One of the following strings:
+ *             + 'imap/notls'
+ *             + 'imap/ssl'
+ *             + 'imap/tls'
+ *             + 'pop3/notls'
+ *             + 'pop3/ssl'
+ *             + 'pop3/tls'
+ *
+ *           If using 'pop3/*' you will connect to a POP3 mail server and
+ *           all folder options will be automatically turned off (POP3 does
+ *           not support folders).  If you want folders (and for much
+ *           improved performance) it is HIGHLY RECOMMENDED that IMAP should
+ *           be used instead.
+ *
+ *           NOTE: Due to limitations within PHP, IMP can only support auto-
+ *                 detection of namespace parameters with IMAP TLS connections
+ *                 (e.g 'imap/tls') if using PHP version 5.1.0 or greater.
+ *                 If using a version of PHP less than 5.1.0, the following
+ *                 options are available:
+ *                 1. RECOMMENDED - If a secure IMAP connection is needed, use
+ *                    a direct connection to a SSL enabled IMAP port
+ *                    (e.g. 'imap/ssl').
+ *                 2. If you absolutely must use TLS, then it is REQUIRED to
+ *                    define the 'namespace' parameter (see below).
  *
  *           The ssl and tls options will only work if you've compiled PHP
  *           against a SSL-enabled version of c-client, used the
- *           --with-imap-ssl flag compiling PHP, and you have a mail server
- *           server which supports SSL.
+ *           --with-imap-ssl and --with-openssl flags when compiling PHP,
+ *           and you have a mail server server which supports SSL.
  *
  *           ** The test script can help automatically determine the   **
  *           ** correct protocol value to use.  See the 'Testing IMP'  **
@@ -56,48 +75,6 @@
  *       ** of imp/docs/INSTALL for instructions on how to access the **
  *       ** test script.                                              **
  *
- * folders: The folder path for the IMAP server.
- *          Common values:
- *            UW-IMAP               'mail/'  (note the trailing slash)
- *            Cyrus, Courier-IMAP   'INBOX.' (note the trailing dot)
- *            dovecot               ''
- *
- *          IMPORTANT: Use this only if you want to restrict users to this
- *          subfolder. If you set this to 'INBOX.' with Cyrus or
- *          Courier-IMAP, then users will not be able to use any shared
- *          folders - nothing outside of 'INBOX.' will be visible (except
- *          INBOX, which is always visible). If you simply want to mask out
- *          the 'INBOX.' (or another) prefix for display purposes, use the
- *          'namespace' attribute (see below).
- *
- *          *** If you use this option, DO NOT SET 'namespace' ALSO! ***
- *
- * namespace: This is where you put any paths that you want stripped out
- *            for presentation purposes (i.e. you don't want your users to
- *            have to know that their personal folders are actually
- *            subfolders of their INBOX). A common value for this with
- *            Cyrus/Courier-IMAP servers is 'INBOX.'.
- *
- *            NOTE: If you have shared folders, using this may create
- *            confusion between shared folders and personal folders if users
- *            have folders with the same name as a shared folder.
- *
- *            *** If you use this option, DO NOT SET 'folders' ALSO! ***
- *
- * delimiter: The delimiter the IMAP server uses to distinguish between levels.
- *
- *            *** This option should NOT be set unless you REALLY know what
- *                you are doing! FOR MOST PEOPLE, AUTO-DETECTION OF THE
- *                DELIMITER (the default if the 'delimiter' parameter is not
- *                set) SHOULD BE USED! ***
- *
- *            This parameter should only be manually set if you are using an
- *            IMAP server (i.e. UW-IMAP) that will return an excessive amount
- *            of folders when scanning the base directory.  If you find that
- *            your login is taking a long time to process and, once logged in,
- *            you notice no performance issues, you may want to try to set
- *            this parameter to possibly fix this login delay.
- *
  * maildomain: What to put after the @ when sending mail. i.e. if you want
  *             all mail to look like 'From: user at example.com' set
  *             maildomain to 'example.com'. It is generally useful when
@@ -171,20 +148,50 @@
  *      driver needs. Not all IMAP servers currently support this
  *      feature.
  *
- *      At present the only driver supported is 'rfc2086', which does not
- *      require any parameters.
+ *      At present the only drivers supported are 'rfc2086' and 'rfc4314' (in
+*       Horde 3.1+), neither of which require any parameters.
  *
- *      SECURTIY NOTE: If you do not have the PEAR Auth_SASL module
+ *      SECURITY NOTE: If you do not have the PEAR Auth_SASL module
  *      installed, the 'rfc2086' driver will send user passwords to the
  *      IMAP server in plain text when retrieving ACLs.
  *
- * dotfiles: Should files that begin with a '.' be shown in the folder lists?
- *           This should be either true or false.
  *
- * hierarchies: Should we enable any folder hierarchies that aren't shown by
- *              default? For instance, UW can be configured to serve out
- *              folder hierarchies. This entry must be an array.
- *              Example folder hierarchies: #shared/, #news/, #ftp/, #public/
+ * *** The following options should NOT be set unless you REALLY know what ***
+ * *** you are doing! FOR MOST PEOPLE, AUTO-DETECTION OF THESE PARAMETERS  ***
+ * *** (the default if the parameters are not set) SHOULD BE USED!         ***
+ *
+ * namespace: The list of namespaces that exist on the server.  This entry
+ *            must be an array. Example:
+ *            'namespace' => array('#shared/', '#news/', '#ftp/', '#public/')
+ *            This parameter must be set if using a TLS connection.
+ *            Additionally, this parameter may be set if not using a TLS
+ *            connection and you want to allow access to namespaces that may
+ *            not be publicly advertised by the IMAP server (see RFC
+ *            2342 [3]). These additional namespaces will be added to the list
+ *            of available namespaces returned by the server.
+ *
+ * imap_config: Manually set IMAP server configuration information. Please see
+ *              http://wiki.horde.org/ImpImapConfig for information on this
+ *              parameter.  THIS PARAMETER IS NOT OFFICIALLY SUPPORTED BY THE
+ *              HORDE PROJECT.  This entry must be an array with the following
+ *              elements:
+ *              'children' - (boolean) Whether the IMAP server supports the
+ *                           CHILDREN command.
+ *              'namespace' - (array) The namespace configuration of the
+ *                            server.  See the return from
+ *                            IMAP_Client::namespace() (located in
+ *                            imp/lib/IMAP/Client.php) for the structure of
+ *                            this array.
+ *              'search_charset' - (boolean) Whether the IMAP server supports
+ *                                 charset selection during searches.
+ *
+ * timeout: Manually set server timeouts. This option only works with PHP >=
+ *          4.3.3. This entry must be an array with the following possible
+ *          elements (if an element is missing, the default value is used):
+ *          IMAP_OPENTIMEOUT - (integer) The timeout for open actions.
+ *          IMAP_READTIMEOUT - (integer) The timeout for read actions.
+ *          IMAP_WRITETIMEOUT - (integer) The timeout for write actions.
+ *          IMAP_CLOSETIMEOUT - (integer) The timeout for close actions.
  */
 
 /* Any entries whose key value ('foo' in $servers['foo']) begin with '_'
@@ -203,15 +210,11 @@
     'hordeauth' => false,
     'protocol' => 'imap/notls',
     'port' => 143,
-    'folders' => 'mail/',
-    'namespace' => '',
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
     'realm' => '',
     'preferred' => '',
-    'dotfiles' => false,
-    'hierarchies' => array()
 );
 
 $servers['cyrus'] = array(
@@ -220,8 +223,6 @@
     'hordeauth' => false,
     'protocol' => 'imap/notls',
     'port' => 143,
-    'folders' => '',
-    'namespace' => 'INBOX.',
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
@@ -231,16 +232,7 @@
         'params' => array(
             'login' => 'cyrus',
             'password' => 'cyrus_pass',
-            // The 'userhierarchy' parameter defaults to 'user.'
-            // If you are using a nonstandard hierarchy for personal
-            // mailboxes, you will need to set it here.
-            'userhierarchy' => 'user.',
-            // Although these defaults are normally all that is required,
-            // you can modify the following parameters from their default
-            // values.
-            'protocol' => 'imap/notls',
-            'hostspec' => 'localhost',
-            'port' => 143
+            'userhierarchy' => 'user.'
         )
     ),
     'quota' => array(
@@ -248,23 +240,13 @@
         'params' => array(
             'login' => 'cyrus',
             'password' => 'cyrus_pass',
-            // The 'userhierarchy' parameter defaults to 'user.'
-            // If you are using a nonstandard hierarchy for personal
-            // mailboxes, you will need to set it here.
-            'userhierarchy' => 'user.',
-            // Although these defaults are normally all that is required,
-            // you can modify the following parameters from their default
-            // values.
-            'protocol' => 'imap/notls',
-            'hostspec' => 'localhost',
-            'port' => 143
+            'userhierarchy' => 'user.'
         )
     ),
     'acl' => array(
         'driver' => 'rfc2086',
     ),
-    'dotfiles' => false,
-    'hierarchies' => array());
+);
 
 $servers['pop'] = array(
     'name' => 'POP3 Server',
@@ -272,15 +254,11 @@
     'hordeauth' => false,
     'protocol' => 'pop3',
     'port' => 110,
-    'folders' => '',
-    'namespace' => '',
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
     'realm' => '',
     'preferred' => '',
-    'dotfiles' => false,
-    'hierarchies' => array()
 );
 
 $servers['exchange'] = array(
@@ -289,14 +267,10 @@
     'hordeauth' => false,
     'protocol' => 'imap',
     'port' => 143,
-    'folders' => '',
-    'namespace' => '',
     'maildomain' => '',
     'smtphost' => 'smtp.example.com',
     'realm' => '',
     'preferred' => '',
-    'dotfiles' => false,
-    'hierarchies' => array()
 );
 
 if ($GLOBALS['conf']['kolab']['enabled']) {
@@ -306,8 +280,6 @@
         'hordeauth' => 'full',
         'protocol' => 'imap/notls/novalidate-cert',
         'port' => $GLOBALS['conf']['kolab']['imap']['port'],
-        'folders' => '',
-        'namespace' => 'INBOX/',
         'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'],
         'realm' => '',
         'preferred' => '',
@@ -316,19 +288,11 @@
             'params' => array(
                 'login' => $GLOBALS['conf']['kolab']['imap']['adminuser'],
                 'password' => $GLOBALS['conf']['kolab']['imap']['adminpw'],
-                'userhierarchy' => 'user.',
-                // Although these defaults are normally all that is required,
-                // you can modify the following parameters from their default
-                // values.
-                'protocol' => 'imap/notls/novalidate-cert',
-                'hostspec' => 'localhost',
-                'port' => 143
+                'userhierarchy' => 'user.'
             )
         ),
         'acl' => array(
             'driver' => 'rfc2086',
         ),
-        'dotfiles' => false,
-        'hierarchies' => array()
     );
 }


--- orig/po/ja_JP.po
+++ mod/po/ja_JP.po
@@ -5,200 +5,207 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0.2\n"
-"POT-Creation-Date: 2005-02-10 02:08+0100\n"
-"PO-Revision-Date: 2005-02-21 15:00+0900\n"
+"Project-Id-Version: IMP 4.1.0\n"
+"POT-Creation-Date: 2006-03-06 12:47+0100\n"
+"PO-Revision-Date: 2006-03-25 10:00+0900\n"
 "Last-Translator: Hiromi Kimura <hiromi at tac.tsukuba.ac.jp>\n"
 "Language-Team: Japanese <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=SHIFT_JIS\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr ""
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "  ˆ¶æF"
 
-#: lib/Compose.php:241 lib/Compose.php:293
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "  “ú•tF"
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "·olF"
 
-#: mailbox.php:400
+#: mailbox.php:408 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
-msgstr ""
+msgstr "(ƒAƒNƒZƒXƒLƒC %s)"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr "  Œ–¼F"
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr "  "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
 #: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
-msgstr ""
+msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:197
+#: thread.php:156
 #, php-format
-msgid "%d message(s) have been deleted."
-msgstr "%d ŒÂ‚ÌƒƒbƒZ[ƒW‚ðíœ‚µ‚Ü‚µ‚½B"
+msgid "%d Messages"
+msgstr "%d ’Ê‚ÌƒƒbƒZ[ƒW"
 
-#: lib/Spam.php:168
+#: mailbox.php:175
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "%d ’Ê‚ÌƒƒbƒZ[ƒW‚ðíœ‚µ‚Ü‚µ‚½B"
+
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
-msgstr "%d ŒÂ‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚È‚¢‚ÆŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "%d ’Ê‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚È‚¢‚ÆŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Spam.php:148
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
-msgstr "%d ŒÂ‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚È‚¢‚Æ•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "%d ’Ê‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚È‚¢‚Æ•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Spam.php:160
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
-msgstr "%d ŒÂ‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚ ‚é‚ÆŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "%d ’Ê‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚ ‚é‚ÆŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Spam.php:140
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
-msgstr "%d ŒÂ‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚ ‚é‚Æ•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "%d ’Ê‚ÌƒƒbƒZ[ƒW‚ÍSPAM‚Å‚ ‚é‚Æ•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: mailbox.php:369
+#: mailbox.php:358
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr " %d - %d / %d ’Ê"
 
-#: mailbox.php:608
+#: mailbox.php:635
 #, php-format
 msgid "%s KB"
-msgstr ""
-
-#: pgp.php:340
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP ŠÇ—"
-
-#: smime.php:174
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME ŠÇ—"
+msgstr "%s KB"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ‚Í‚·‚Å‚É‘¶Ý‚µ‚Ü‚·B%s ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚Í•ÏX‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: lib/Message.php:643
+#: lib/Message.php:685
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s ‚Í³‚µ‚¢Œ`Ž®‚Ìƒ[ƒ‹ƒ{ƒbƒNƒX‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ÍA–ˆŒŽ‚Ì‰‚ß‚É•ÏX‚³‚ê‚Ü‚·B"
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s ‚ÍŽó—‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s ‚³‚ñ‚Í %s ‚ðƒLƒƒƒ“ƒZƒ‹‚µ‚Ü‚µ‚½B"
+msgid "%s has cancelled \"%s\"."
+msgstr "%s ‚³‚ñ‚Í \"%s\" ‚ðƒLƒƒƒ“ƒZƒ‹‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s ‚³‚ñ‚ÍŽ«‘Þ‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s ‚³‚ñ‚ª—\’èî•ñ‚Ì—v‹‚É•Ô“š‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s ‚³‚ñ‚ª %s ‚Ö‚Ìµ‘Ò‚É•ÔM‚µ‚Ü‚µ‚½B"
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s ‚³‚ñ‚ª \"%s\" ‚Ö‚Ìµ‘Ò‚É•ÔM‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s ‚³‚ñ‚ª—\’èî•ñ‚ð‘—‚Á‚Ä‚«‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s ‚³‚ñ‚ª‰¼Žó‘ø‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s ‚³‚ñ‚ª‚ ‚È‚½‚Ì—\’èî•ñ‚ð—v‹‚µ‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s ‚³‚ñ‚Í‚ ‚È‚½‚ª %s ‚ÉoÈ‚·‚é‚±‚Æ‚ð—v‹‚µ‚Ä‚¢‚Ü‚·B"
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s ‚³‚ñ‚Í‚ ‚È‚½‚ª \"%s\" ‚ÉoÈ‚·‚é‚±‚Æ‚ð—v‹‚µ‚Ä‚¢‚Ü‚·B"
 
-#: lib/Message.php:398
+#: lib/Message.php:461
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s ‚Í %s ‚É’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s ‚Í \"%s\" ‚É’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s ‚³‚ñ‚ª %s ‚Ì‰ü’è‚ðŠó–]‚µ‚Ä‚¢‚Ü‚·B"
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s ‚³‚ñ‚ª \"%s\" ‚Ì‰ü’è‚ðŠó–]‚µ‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s ‚³‚ñ‚Í‚ ‚È‚½‚ª %s ‚ð³’m‚·‚é‚±‚Æ‚ðŠó–]‚µ‚Ä‚¢‚Ü‚·B"
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s ‚³‚ñ‚Í‚ ‚È‚½‚ª \"%s\" ‚ð³’m‚·‚é‚±‚Æ‚ðŠó–]‚µ‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s ‚³‚ñ‚ª %s ‚É‚Â‚¢‚Ä‚ÌÅVî•ñ‚ðŠó–]‚µ‚Ä‚¢‚Ü‚·B"
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s ‚³‚ñ‚ª \"%s\" ‚É‚Â‚¢‚Ä‚ÌÅVî•ñ‚ðŠó–]‚µ‚Ä‚¢‚Ü‚·B"
 
-#: message.php:278 message.php:283
+#: message.php:292 message.php:297
 #, php-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s:%s (%d&nbsp;/&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "i•ÏX‚ð“K—p‚µ‚ÄAŽŸ‚Ì‰æ–Ê‚ÖˆÚ“®‚µ‚Ü‚·Bj"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "i•ÏX‚ð”pŠü‚µ‚ÄAƒ[ƒ‹ì¬‰æ–Ê‚Ö–ß‚è‚Ü‚·Bj"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Plain Text)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr "i‘S‚Ä‚Ì•ÏX‚ð”jŠü‚µ‚Äƒ[ƒ‹ì¬‰æ–Ê‚É–ß‚éBj"
 
-#: spelling.php:274
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -208,52 +215,52 @@
 msgid "* Add these by clicking OK *"
 msgstr "* OK‚ðƒNƒŠƒbƒN‚µ‚Ä’Ç‰Á‚µ‚Ü‚· *"
 
-#: templates/contacts/contacts.inc:207
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* ƒAƒhƒŒƒX‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢ *"
 
-#: lib/Spam.php:170
+#: mailbox.php:173
+msgid "1 message has been deleted."
+msgstr "‚P’Ê‚ÌƒƒbƒZ[ƒW‚ªíœ‚³‚ê‚Ü‚µ‚½B"
+
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
-msgstr "‚P‚Â‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Å‚È‚¢‚Æ‚µ‚ÄƒVƒXƒeƒ€ŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "‚P’Ê‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Å‚È‚¢‚Æ‚µ‚ÄƒVƒXƒeƒ€ŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Spam.php:150
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
-msgstr "‚P‚Â‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Å‚È‚¢‚Æ‚µ‚Ä•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "‚P’Ê‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Å‚È‚¢‚Æ‚µ‚Ä•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Spam.php:162
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
-msgstr "‚P‚Â‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Æ‚µ‚ÄƒVƒXƒeƒ€ŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "‚P’Ê‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Æ‚µ‚ÄƒVƒXƒeƒ€ŠÇ—ŽÒ‚É•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Spam.php:142
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
-msgstr "‚P‚Â‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Æ‚µ‚Ä•ñ‚³‚ê‚Ü‚µ‚½B"
+msgstr "‚P’Ê‚ÌƒƒbƒZ[ƒW‚ªSPAM‚Æ‚µ‚Ä•ñ‚³‚ê‚Ü‚µ‚½B"
 
-#: config/prefs.php.dist:787
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 •¶Žš"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 •¶Žš"
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 •¶Žš"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 •¶Žš"
 
-#: lib/MIME/Viewer/itip.php:62
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>—\’è•\‚Ìƒf[ƒ^‚ª•s³‚Å‚·</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "‘å‚«‚È‰æ‘œ %s ‚ª“Y•t‚³‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -263,107 +270,111 @@
 msgid "AND"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "—v‹‚ðŽó‘ø‚µŽ„‚Ì—\’è•\‚É’Ç‰Á‚·‚é"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "—v‹‚ðŽó‘ø‚·‚é"
 
-#: lib/MIME/Viewer/itip.php:740
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Žó‘øÏ‚Ý"
 
-#: lib/IMP.php:886 lib/IMP.php:888
-msgid "Acco_unts"
-msgstr "_UƒAƒJƒEƒ“ƒg"
+#: lib/MIME/Viewer/itip.php:258
+msgid "Accepted: "
+msgstr "Žó‘øÏ‚ÝF"
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "ƒAƒJƒEƒ“ƒg–¼F"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "ˆ’u"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "%s ‚ðƒAƒhƒŒƒX’ ‚É’Ç‰Á‚·‚é"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
-msgstr ""
+msgstr "ƒ\[ƒX‚ð’Ç‰Á"
 
-#: lib/MIME/Viewer/itip.php:535 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Ž„‚Ì—\’è•\‚É’Ç‰Á‚·‚é"
 
-#: lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "ƒAƒhƒŒƒX’ ‚É’Ç‰Ái%sj"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Ž„‚Ì—\’è•\‚É’Ç‰Á‚·‚é"
 
-#: compose.php:1080
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" ‚ð“Y•t‚µ‚Ü‚µ‚½B"
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr "í‚É•\Ž¦‚·‚éƒwƒbƒ_: iƒIƒvƒVƒ‡ƒ“B‚Ps‚É‚P‚Â‚Ìƒwƒbƒ_‚ðŽw’èj"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "’Ç‰Áî•ñ‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "’Ç‰Áî•ñ‚ÌÚ×"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "’Ç‰ÁƒƒbƒZ[ƒW‚ÌÚ×"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "’Ç‰ÁƒƒbƒZ[ƒW‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "X‚È‚éƒƒbƒZ[ƒWƒGƒ‰[‚ÌÚ×"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr "X‚È‚éƒƒbƒZ[ƒWƒGƒ‰[‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: contacts.php:95 templates/contacts/contacts.inc:174
-#: templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "ƒAƒhƒŒƒX’ "
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "ƒAƒhƒŒƒX’ "
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr "í‚ÉBCC‚Å‘—‚éƒAƒhƒŒƒX:iƒIƒvƒVƒ‡ƒ“B‚Ps‚É‚PƒAƒhƒŒƒX‚ðŽw’èj"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr "‚±‚Ì ID ‚É˜AŒ‹‚³‚¹‚éƒAƒhƒŒƒX:iƒIƒvƒVƒ‡ƒ“B‚Ps‚É‚PƒAƒhƒŒƒX‚ðŽw’èj"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:791
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "‚·‚×‚Ä"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "ƒtƒHƒ‹ƒ_“à‚Ìƒ[ƒ‹‚Í‚·‚×‚Ä”jŠü‚³‚ê‚Ü‚·I"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -371,7 +382,7 @@
 "ŽŸ‚ÌƒtƒHƒ‹ƒ_“à‚ÌƒƒbƒZ[ƒW‚Í‚·‚×‚Ä 1 ‚Â‚Ì MBOX ƒtƒ@ƒCƒ‹‚Éƒ_ƒEƒ“ƒ[ƒh‚³‚ê‚Ü"
 "‚·B"
 
-#: lib/Maintenance/Task/purge_trash.php:86
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -380,52 +391,56 @@
 "ì¬‚µ‚Ä‚©‚ç %2$s “úˆÈãŒo‚Á‚½m\"%1$s\"nƒtƒHƒ‹ƒ_“à‚ÌƒƒbƒZ[ƒW‚Í‚·‚×‚Äíœ"
 "‚³‚ê‚Ü‚·B"
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "%sƒ–ŒŽˆÈãŒo‰ß‚µ‚½ŒÃ‚¢ƒŠƒ“ƒNŒ^“Y•t‚Í‘S‚Äíœ‚³‚ê‚Ü‚·B"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "ì¬‚µ‚Ä‚©‚ç%sƒ–ŒŽˆÈãŒo‚Á‚½‘—MT‚¦ƒtƒHƒ‹ƒ_‚Í‘S‚Äíœ‚³‚ê‚Ü‚·B"
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
-msgstr ""
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "ƒtƒHƒ‹ƒ_ '%s' ‚Ìƒ†[ƒU '%s' ‚Ö‚ÌƒAƒNƒZƒXŒ ‚Í‘S‚Äíœ‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "ƒtƒHƒ‹ƒ_[‚Ìì¬‚ð‹–‰Â‚µ‚Ü‚·‚©H"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "ƒtƒBƒ‹ƒ^ƒ‹[ƒ‹‚ð‚Ç‚Ìƒ[ƒ‹ƒ{ƒbƒNƒX‚Å‚à“K—p‚Å‚«‚é‚æ‚¤‚É‚µ‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "‚±‚ÌƒZƒNƒVƒ‡ƒ“‚Ì‘ã‘Öƒp[ƒgF"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "í‚É"
 
-#: config/prefs.php.dist:549
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "“Y•t‚Íí‚É•Û‘¶‚·‚é"
 
-#: lib/Message.php:491
+#: lib/Message.php:551
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr "“Y•t‚ðíœ‚·‚éÛ‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BIMAPƒT[ƒo‚©‚ç‚Ì‰ž“š:"
 
-#: message.php:185 compose.php:951
-msgid "An unknown error occured adding the new entry."
-msgstr "V‹KƒGƒ“ƒgƒŠ‚Ì’Ç‰Á’†‚ÉŒ´ˆö•s–¾‚ÌƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
+msgstr "V‹Kƒm[ƒgì¬’†‚ÉŒ´ˆö•s–¾‚ÌƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
 
-#: lib/Message.php:385
+#: lib/Message.php:434
 msgid "An unknown error occured while creating the new task."
 msgstr "V‹Kƒ^ƒXƒNì¬’†‚ÉŒ´ˆö•s–¾‚ÌƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
 
-#: message.php:493 mailbox.php:668 templates/message/navbar_navigate.inc:9
+#: message.php:503 mailbox.php:708 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -444,27 +459,23 @@
 msgid "Apply Filters to %s"
 msgstr "%s ‚ÉƒtƒBƒ‹ƒ^‚ð“K—p"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "ƒƒOƒCƒ“Žž‚ÉƒtƒBƒ‹ƒ^ƒ‹[ƒ‹‚ð“K—p‚µ‚Ü‚·‚©H"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "INBOX‚ð•\Ž¦‚·‚é“x‚ÉƒtƒBƒ‹ƒ^‚ð“K—p‚µ‚Ü‚·‚©H"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "–{“–‚É‘€ì‚ð‘±‚¯‚Ü‚·‚©H"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "–{“–‚É‘€ì‚ð‘±‚¯‚Ä‚à‚æ‚ë‚µ‚¢‚Ì‚Å‚·‚©H"
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "–{“–‚É‚±‚Ì‰¼‘zƒtƒHƒ‹ƒ_‚Ì’è‹`‚ðÁ‹Ž‚µ‚Ü‚·‚©H"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "–{“–‚É‚±‚ÌŒöŠJŒ®‚ðÁ‹Ž‚µ‚Ü‚·‚©H"
 
-#: templates/smime/smime.inc:69 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "–{“–‚É‚±‚ÌŒ®ƒyƒA‚ðÁ‹Ž‚µ‚Ü‚·‚©Hi‚¨Š©‚ß‚µ‚Ü‚¹‚ñIj"
@@ -473,12 +484,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "–{“–‚ÉŽÀs‚µ‚Ä‚¢‚¢‚Å‚·‚©H"
 
-#: message.php:401 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:63
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "–{“–‚É‚±‚ê‚ç‚ÌƒƒbƒZ[ƒW‚ðŠ®‘S‚Éíœ‚µ‚Ä‚¢‚¢‚Å‚·‚©H"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "–{“–‚É‚±‚ê‚ç‚Ì“Y•t‚ðŠ®‘S‚Éíœ‚µ‚Ä‚¢‚¢‚Å‚·‚©H"
 
@@ -486,7 +496,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "–{“–‚É‚±‚ÌƒtƒHƒ‹ƒ_‚ð‹ó‚É‚µ‚Ä‚¢‚¢‚Å‚·‚©H"
 
-#: lib/IMP.php:877
+#: lib/IMP.php:951
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "–{“–‚ÉspamƒtƒHƒ‹ƒ_[‚ð‹ó‚É‚µ‚Ä‚¢‚¢‚Å‚·‚©H"
+
+#: lib/IMP.php:944
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "–{“–‚ÉƒSƒ~” ‚ð‹ó‚É‚µ‚Ä‚¢‚¢‚Å‚·‚©H"
 
@@ -494,30 +508,26 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "–{“–‚É‚±‚ê‚ç‚ÌƒƒbƒZ[ƒW‚ðŠ®‘S‚ÉÁ‹Ž‚µ‚Ä‚à‚¢‚¢‚Å‚·‚©H"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "–{“–‚É‚±‚ÌƒƒbƒZ[ƒW‚ð–³ŠQ‚Æ•ñ‚µ‚Ä‚à‚¢‚¢‚Å‚·‚©H"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "–{“–‚É‚±‚ÌƒƒbƒZ[ƒW‚ðSPAM‚Æ•ñ‚µ‚Ä‚à‚¢‚¢‚Å‚·‚©H"
 
-#: config/prefs.php.dist:886
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "“ž’…ŽžŠÔ"
 
-#: config/prefs.php.dist:901
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "¸‡"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "q‚Ë‚é"
 
-#: templates/compose/compose.inc:513
-msgid "Attach"
-msgstr "“Y•t"
-
 #: templates/compose/compose.inc:470
 msgid "Attach Files"
 msgstr "“Y•tƒtƒ@ƒCƒ‹"
@@ -526,88 +536,120 @@
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "‚ ‚È‚½‚Ì PGP ŒöŠJŒ®‚ð“Y•t‚µ‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "“Y•tƒtƒ@ƒCƒ‹F"
 
-#: lib/Compose.php:352 lib/Compose.php:439
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr "“Y•tƒtƒ@ƒCƒ‹ \"%s\" ‚ÌƒTƒCƒY‚ª‘å‚«‚·‚¬‚Ü‚·B“Y•t‚³‚ê‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/itip.php:342
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "“Y•tƒtƒ@ƒCƒ‹‚Í‚ ‚È‚½‚ª‘—‚Á‚½—\’è•\—v‹‚Ö‚Ì•ÔM‚Å‚·B"
 
-#: mailbox.php:702 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:500
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:498 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "“Y•t"
 
-#: compose.php:901 lib/Message.php:452
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "“Y•t %s ‚Ííœ‚³‚ê‚Ü‚µ‚½B"
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "“Y•t‚Ìî•ñ"
+
+#: compose.php:1105 lib/Message.php:513
 msgid "Attachment stripped: Original attachment type"
 msgstr "“Y•t‚ðŽæ‚èœ‚«‚Ü‚µ‚½: “Y•t‚ÌŒ^"
 
-#: templates/compose/compose.inc:468 lib/Compose.php:987
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "“Y•t"
 
-#: lib/MIME/Viewer/itip.php:669
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "ŽQ‰ÁŽÒ"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "’ˆÓ"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: •K—v‚È IMAP Šg’£‚ªŒ©‚Â‚©‚è‚Ü‚¹‚ñB"
 
-#: config/prefs.php.dist:642
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
-msgstr "ƒAƒhƒŒƒX’ ‚É“o˜^‚³‚ê‚Ä‚¢‚él‚©‚ç‚Ì HTML ƒƒCƒ‹‚Í‰æ‘œ‚ð•\Ž¦‚µ‚Ü‚·‚©H"
+msgstr "ƒAƒhƒŒƒX’ ‚É“o˜^‚³‚ê‚Ä‚¢‚él‚©‚ç‚Ì HTML ƒ[ƒ‹‚Í‰æ‘œ‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
 #: templates/prefs/sourceselect.inc:298
 msgid "Available Address books:"
 msgstr "Žg—p‰Â”\‚ÈƒAƒhƒŒƒX’ F"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "‰ž“š‘Ò‚¿"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
 msgstr "_K%s ‚É–ß‚é"
 
-#: thread.php:66 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "%s ‚É–ß‚é"
 
-#: message.php:259 search.php:153 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "ƒƒbƒZ[ƒWˆê——‚É–ß‚é"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "ƒXƒŒƒbƒh•\Ž¦‚É–ß‚é"
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "ƒƒOƒCƒ“–¼‚©ƒpƒXƒ[ƒh‚ªˆá‚¢‚Ü‚·B"
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "•s—Ç‚Ü‚½‚Í•s³‚È—v‹‚Å‚·BƒT[ƒo[‚Ì‰ž“šF%s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "•s—Ç‚È—v‹F%s"
+
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
 msgstr "ˆÈ‰º‚ªî•ñƒƒbƒZ[ƒW‚ÌŒ´•¶‚Å‚·B"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "ƒuƒ‰ƒbƒNƒŠƒXƒg"
 
-#: config/prefs.php.dist:630
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "HTMLƒ[ƒ‹’†‚Ì‰æ‘œ‚ÍŽwŽ¦‚·‚é‚Ü‚Å•\Ž¦‚µ‚È‚¢‚æ‚¤‚É‚µ‚Ü‚·‚©H"
 
-#: search.php:161
+#: lib/Search.php:609
 msgid "Body"
 msgstr "–{•¶"
 
@@ -616,72 +658,84 @@
 msgid "Both"
 msgstr "—¼•û"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "ƒwƒbƒ_•”‚Æ–{•¶‚É•\Ž¦"
 
-#: templates/compose/compose.inc:287
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr "CRAM-MD5 ‚â DIGEST-MD5 ‚É‚Í Auth_SASL ƒpƒbƒP[ƒW‚ª•K—v‚Å‚·B"
+
+#: templates/compose/compose.inc:270
 msgid "C_harset"
 msgstr "_H•¶ŽšƒZƒbƒg"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "—\’è•\"
 
-# msgstr "ƒJƒŒƒ“ƒ_"
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
-msgstr "ƒŠƒ‚[ƒg‚ÌƒƒCƒ‹ƒT[ƒo‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñB"
+msgstr "ƒŠƒ‚[ƒg‚Ìƒ[ƒ‹ƒT[ƒo‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñB"
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
-msgstr "ƒŠƒ‚[ƒg‚ÌƒƒCƒ‹ƒT[ƒo‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñ: "
+msgstr "ƒŠƒ‚[ƒg‚Ìƒ[ƒ‹ƒT[ƒo‚ÉÚ‘±‚Å‚«‚Ü‚¹‚ñ: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr "•\Ž¦•s”\ - ‚±‚Ìƒ[ƒ‹‚É‚Í %2$s ’†‚Ì %1$s ƒp[ƒg‚µ‚©‚ ‚è‚Ü‚¹‚ñB"
 
-#: templates/contacts/contacts.inc:252 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:57
-#: templates/compose/spelling.inc:106 templates/pgp/passphrase.inc:32
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "ƒLƒƒƒ“ƒZƒ‹"
 
-#: templates/compose/compose.inc:74 templates/compose/compose.inc:430
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
-msgstr "ƒƒbƒZ[ƒW‚ÌƒLƒƒƒ“ƒZƒ‹"
+msgstr "ƒƒbƒZ[ƒW‚ðƒLƒƒƒ“ƒZƒ‹"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "ƒƒbƒZ[ƒW‚ðƒLƒƒƒ“ƒZƒ‹‚·‚é‚ÆA“à—e‚Í‘S‚Ä”pŠü‚³‚ê‚Ü‚·B"
 
-#: message.php:258 search.php:149 templates/contacts/contacts.inc:222
-#: templates/compose/recompose.inc:15
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:687
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Ø–¾‘‚ÉƒCƒ“ƒ|[ƒg‚Í‚Å‚«‚Ü‚¹‚ñB‚±‚ÌƒT[ƒo[‚Íƒtƒ@ƒCƒ‹‚ÌƒAƒbƒvƒ[ƒh‚ð‹–‰Â‚µ"
+"‚Ä‚¢‚Ü‚¹‚ñB"
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "‹c’·"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "•ÏX"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "‚·‚×‚Ä•ÏX"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "ƒtƒHƒ‹ƒ_•ÏX"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -698,23 +752,23 @@
 "reply to your email."
 msgstr "ƒ[ƒ‹‚É•\Ž¦‚³‚ê‚é‚ ‚È‚½‚Ì–¼‘OAƒAƒhƒŒƒXA–¼‚ð•ÏX‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:792
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "•\Ž¦‚·‚é•¶ŽšF"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ƒtƒHƒ‹ƒ_“à‚ÌV’…ƒ[ƒ‹‚ðŠm”F"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr ""
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "ƒ[ƒ‹‚ðŽæ“¾‚·‚éƒT[ƒo‚ð‘I‘ðF"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "‘—M‚·‚é‘O‚ÉƒXƒyƒ‹ƒ`ƒFƒbƒN‚µ‚Ü‚·‚©H"
 
@@ -722,15 +776,16 @@
 msgid "Choose Action:"
 msgstr "ˆ’u‚ð‘I‘ðF"
 
-#: config/servers.php.dist:165
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "ƒ[ƒ‹ƒT[ƒo‚ð‘I‘ðF"
 
-#: lib/MIME/Viewer/itip.php:479 lib/MIME/Viewer/itip.php:718
-msgid "Choose an action:"
-msgstr "ˆ’u‚ð‘I‘ðF"
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
+msgid "Choose a match or edit the address to the right:"
+msgstr "ˆê’v‚Ü‚½‚Í•ÒW‚·‚éƒAƒhƒŒƒX‚ð‰E‚©‚ç‘I‘ðF"
 
-#: templates/prefs/sourceselect.inc:350
+#: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr "ƒAƒhƒŒƒX‚Ì’Ç‰ÁŽž‚ÉŽg‚¤ƒAƒhƒŒƒX’ ‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
@@ -738,41 +793,42 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "ƒAƒhƒŒƒX‚ð“WŠJ‚·‚éÛ‚ÉŒŸõ‚·‚éƒAƒhƒŒƒX’ ‚Ì‡˜‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ‰æ‘œ‚ðƒuƒ‰ƒEƒU‚Å•\Ž¦‰Â”\‚ÈŒ`Ž®‚É•ÏŠ·‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ‰æ‘œ‚ðƒ_ƒEƒ“ƒ[ƒh‚µ‚Ü‚·B"
 
-#: lib/Filter.php:103
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
-msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ%sŠÇ—ƒy[ƒW‚ÉˆÚ“®‚µ‚Ü‚·B"
+msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ %s ŠÇ—ƒy[ƒW‚ÉˆÚ“®‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚ÆHTML‚ð•ÊƒEƒCƒ“ƒh[‚É•\Ž¦‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ‰æ‘œ‚ÌƒTƒ€ƒlƒCƒ‹‚ð•\Ž¦‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:424
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ“Y•t‚ð•ÊƒEƒCƒ“ƒh[‚É•\Ž¦‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Click here to HIDE the Images"
-msgstr "‚±‚±‚ðƒNƒŠƒbƒN‚·‚é‚Æ‰æ‘œ‚ð‰B‚µ‚Ü‚·B"
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "%s ‚ðƒNƒŠƒbƒN‚·‚é‚Æ‚±‚Ìƒp[ƒg‚ð•ÊƒEƒCƒ“ƒh[‚É•\Ž¦‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "‚±‚±‚ðƒNƒŠƒbƒN‚·‚é‚Æ‰æ‘œ‚ð•\Ž¦‚µ‚Ü‚·B"
 
@@ -784,116 +840,116 @@
 "Žw’è‚µ‚½ƒAƒhƒŒƒX’ ‚Ì 1 ‚Â‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚çAŒŸõ‚·‚éƒtƒB[ƒ‹ƒh‚ð‚·‚×‚ÄŽw’è‚µ"
 "‚Ä‚‚¾‚³‚¢B"
 
-#: lib/MIME/Viewer/pgp.php:174
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "ƒNƒŠƒbƒN‚·‚é‚Æ PGP ŒöŠJŒ®‚ðƒAƒhƒŒƒX’ ‚É•Û‘¶‚µ‚Ü‚·"
 
-#: lib/MIME/Viewer/pkcs7.php:190
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr "ƒNƒŠƒbƒN‚·‚é‚Æ %s ‚Ì S/MIME Ø–¾‘‚ð‚ ‚È‚½‚ÌƒAƒhƒŒƒX’ ‚É•Û‘¶‚µ‚Ü‚·"
 
 # msgid "Click to Save S/MIME certificate in your Address book"
 # msgstr "ƒNƒŠƒbƒN‚·‚é‚Æ S/MIME Ø–¾‘‚ð‚ ‚È‚½‚ÌƒAƒhƒŒƒX’ ‚É•Û‘¶‚µ‚Ü‚·"
-#: lib/MIME/Viewer/pkcs7.php:208 config/prefs.php.dist:920
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "ƒAƒhƒŒƒX‚ðƒNƒŠƒbƒN‚·‚é‚Æ‘—MŽÒ‚Ö‚ÌV‹Kƒ[ƒ‹‚ðì¬‚µ‚Ü‚·"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "ƒAƒhƒŒƒX‚ðƒNƒŠƒbƒN‚·‚é‚ÆƒƒbƒZ[ƒW‚ð•\Ž¦‚µ‚Ü‚·"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "•Â‚¶‚é"
 
-#: templates/compose/success.inc:4
+#: compose.php:418
 msgid "Close this window"
 msgstr "‚±‚ÌƒEƒCƒ“ƒh‚ð•Â‚¶‚é"
 
-#: folders.php:387
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "•Â‚¶‚Ä‚¢‚éƒtƒHƒ‹ƒ_"
 
-#: folders.php:407
+#: folders.php:430
 msgid "Collapse"
 msgstr "‚½‚½‚Þ"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "‚·‚×‚Ä‚ð‚½‚½‚Þ"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "‚·‚×‚Ä‚ÌƒtƒHƒ‹ƒ_‚ð‚½‚½‚Þ"
 
-#: folders.php:407
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "ƒtƒHƒ‹ƒ_‚ð‚½‚½‚Þ"
 
 #: templates/fetchmail/manage.inc:51
 msgid "Color Indicator: "
-msgstr ""
+msgstr "F•WŽ¯F"
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "ƒRƒƒ“ƒg"
 
-#: lib/MIME/Viewer/itip.php:756
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Š®—¹"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "ƒ[ƒ‹ì¬"
-
-#: mailbox.php:732 lib/MIME/Headers.php:196
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "ƒ[ƒ‹ì¬i%sj"
-
-#: templates/compose/success.inc:3
+#: compose.php:417
 msgid "Compose another message"
 msgstr "•Ê‚Ìƒ[ƒ‹‚ðì¬"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "•Ê‚ÌƒEƒBƒ“ƒhƒE‚ÅV‹Kƒ[ƒ‹‚ðì¬‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr "ƒ[ƒ‹ì¬‚ðHTMLƒ‚[ƒh‚É‚µ‚Ü‚·‚©iƒuƒ‰ƒEƒU‚ªƒTƒ|[ƒg‚·‚é‚È‚çjH"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "ƒƒbƒZ[ƒW‚ð‚Ç‚¤•\Ž¦‚·‚é‚©‚ðÝ’è‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
-msgstr "ƒƒCƒ‹‚ÌƒvƒŒƒrƒ…[ƒIƒvƒVƒ‡ƒ“‚ðÝ’è‚µ‚Ü‚·B"
+msgstr "ƒ[ƒ‹‚ÌƒvƒŒƒrƒ…[ƒIƒvƒVƒ‡ƒ“‚ðÝ’è‚µ‚Ü‚·B"
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Ú‘±‚Í IMAP ƒT[ƒo‚É‚æ‚Á‚ÄØ’f‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Fetchmail/imap.php:237
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "ƒT[ƒo‚Ö‚ÌÚ‘±Ž¸”s"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "%s ‚Ì PGP ƒTƒ|[ƒg‚ðÝ’è‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "%s ‚Ì S/MIME ƒTƒ|[ƒg‚ðÝ’è‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "ƒƒbƒZ[ƒWŒŸõ‚ÉŠÖ‚·‚éƒIƒvƒVƒ‡ƒ“‚Å‚·B"
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "V’…ƒ[ƒ‹‚ð‰½ŽžŠm”F‚·‚é‚©AV’…ƒ[ƒ‹‚ð’Ê’m‚·‚é‚©‚Ç‚¤‚©‚ðÝ’è‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:699
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "ŠG•¶Žš‚ðƒAƒCƒRƒ“‚É•ÏX‚µ‚Ü‚·‚©H"
 
@@ -901,63 +957,80 @@
 msgid "Copy"
 msgstr "ƒRƒs["
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "ƒtƒHƒ‹ƒ_[‚ÉƒRƒs["
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "C³"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "C³Ï‚ÝƒeƒLƒXƒg"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "—v‹‚ÍŠ®—¹‚Å‚«‚Ü‚¹‚ñB——RF%s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
-msgstr ""
+msgstr "VFS ƒoƒbƒNƒGƒ“ƒh‚ªì¬‚Å‚«‚Ü‚¹‚ñF%s"
 
-#: lib/Message.php:634
+#: lib/Message.php:676
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "%s ‚ÌƒƒbƒZ[ƒW‚Ííœ‚Å‚«‚Ü‚¹‚ñBƒT[ƒo‚©‚ç‚Ì‰ž“šF %s"
 
-#: lib/Session.php:270
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "•ÛŽçì‹Æ‚ðŽÀs‚Å‚«‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "MS-TNEF “Y•t‚©‚ç—v‹‚³‚ê‚½ƒtƒ@ƒCƒ‹‚ðŽæ‚èo‚¹‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Zip ‘ŒÉ‚©‚çƒtƒ@ƒCƒ‹‚ðŽæ‚èo‚¹‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: search.php:351 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "IMAP ƒT[ƒo‚Ö‚ÌƒZƒLƒ…ƒA‚ÈÚ‘±‚ª‚Å‚«‚Ü‚¹‚ñB%sF%s"
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "IMAP ƒT[ƒo‚©‚ç–¼‘O‹óŠÔ‚Ìî•ñ‚ªŽæ“¾‚Å‚«‚Ü‚¹‚ñB"
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "ì¬"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "ƒtƒHƒ‹ƒ_‚ðì¬"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
-msgstr ""
+msgstr "Œ®‚ðì¬"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "‰¼‘zƒtƒHƒ‹ƒ_‚ðì¬"
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "ƒAƒJƒEƒ“ƒg‚ðV‹Kì¬"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Spam ƒtƒHƒ‹ƒ_‚ðV‹Kì¬"
 
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "‰º‘‚«ƒtƒHƒ‹ƒ_‚ðV‹Kì¬"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "‘—MT‚¦ƒtƒHƒ‹ƒ_‚ðV‹Kì¬"
 
@@ -965,7 +1038,7 @@
 msgid "Create a new trash folder"
 msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_‚ðV‹Kì¬"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -973,12 +1046,20 @@
 "ŽóMƒ[ƒ‹‚ðƒtƒHƒ‹ƒ_‚ÉU‚è•ª‚¯‚½‚èASPAM ƒ[ƒ‹‚ðíœ‚·‚éƒtƒBƒ‹ƒ^ƒ‹[ƒ‹‚ðì¬"
 "‚µ‚Ü‚·B"
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "’èŒ^‹å‚ðV‹Kì¬"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "’èŒ^‹å‚ðì¬‚µ‚Ü‚·B"
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
-msgstr ""
+msgstr "%s ‚Ö‚ÌŒ»Ý‚ÌƒAƒNƒZƒX"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "‘¼‚ÌƒT[ƒo‚©‚çƒ[ƒ‹‚ðŽæ“¾‚·‚é‚½‚ß‚ÌÝ’è‚ð‚µ‚Ü‚·B"
 
@@ -991,75 +1072,101 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "%s‚ÉƒƒOƒIƒ“‚µ‚½‚Æ‚«‚ÉŽÀs‚·‚éƒ^ƒXƒN‚ðƒJƒXƒ^ƒ}ƒCƒY‚µ‚Ü‚·B"
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "_E“ú•t"
 
-#: message.php:255 thread.php:72
+#: message.php:269 thread.php:153
 msgid "Date"
 msgstr "“ú•t"
 
-#: lib/MIME/Viewer/itip.php:744
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "ŽÓâÏ‚Ý"
 
-#: config/prefs.php.dist:893
+#: lib/MIME/Viewer/itip.php:264
+msgid "Declined: "
+msgstr "ŽÓâÏ‚ÝF"
+
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "ƒfƒtƒHƒ‹ƒg"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "ƒfƒtƒHƒ‹ƒg‚ÌŒŸõ€–Ú"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "ƒfƒtƒHƒ‹ƒg‚Ìƒ\[ƒgŠî€F"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "ƒfƒtƒHƒ‹ƒg‚Ìƒ\[ƒg•ûŒüF"
 
-#: lib/MIME/Viewer/itip.php:752
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "ˆÏ”CÏ‚Ý"
 
-#: folders.php:378 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:243 templates/message/navbar_actions.inc:6
+#: folders.php:400 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/compose/attachments.inc:28 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "íœ"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
-msgstr ""
+msgstr "%s ŒöŠJŒ®‚ðíœ"
 
-#: templates/smime/smime.inc:69 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
-msgstr ""
+msgstr "Œ»Ý‚ÌŒ®‚ðíœ"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "ƒtƒHƒ‹ƒ_‚ðíœ"
 
-#: folders.php:378
+#: folders.php:271
+msgid "Delete Selected Folders"
+msgstr "‘I‘ð‚µ‚½ƒtƒHƒ‹ƒ_‚ðíœ"
+
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "’èŒ^‹å‚ðíœ"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "‰¼‘zƒtƒHƒ‹ƒ_‚ðíœ"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "%s —p‚Ì‰¼‘zƒtƒHƒ‹ƒ_‚Ì’è‹`‚ðíœ"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "ƒŠƒ‚[ƒgƒT[ƒo‚©‚çŽæ‚èž‚ÝÏ‚Ý‚ÌƒƒbƒZ[ƒW‚ðíœ‚µ‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/itip.php:607
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "—\’è•\‚©‚çíœ"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "ŒÃ‚¢ƒŠƒ“ƒNŒ^“Y•t‚ðŒŽ‚Ì‰‚ß‚Éíœ‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Šù‘¶‚Ì‘—MT‚¦ƒtƒHƒ‹ƒ_‚ðŒŽ‚Ì‰‚ß‚Éíœ‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:620
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "SPAM •ñÏ‚Ý‚ÌƒƒbƒZ[ƒW‚ðíœ‚µ‚Ü‚·‚©H"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "SpamƒƒbƒZ[ƒW‚ðíœ"
 
-#: message.php:496 mailbox.php:692 templates/mailbox/navbar.inc:20
+#: message.php:506 mailbox.php:734 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "íœÏ"
@@ -1068,7 +1175,7 @@
 msgid "Deleted messages"
 msgstr "íœ‚³‚ê‚½ƒ[ƒ‹"
 
-#: compose.php:311
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "“Y•t \"%s\" ‚ðíœ‚µ‚Ü‚µ‚½B"
@@ -1077,28 +1184,33 @@
 msgid "Deleting and Moving Messages"
 msgstr "ƒ[ƒ‹‚Ìíœ‚ÆˆÚ“®"
 
-#: lib/MIME/Viewer/itip.php:549
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "—v‹‚ð‹‘”Û‚·‚é"
 
-#: lib/MIME/Viewer/itip.php:498
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "—\’èî•ñ‚Ì—v‹‚ð‹‘”Û‚·‚é"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "~‡"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:657
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "à–¾"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
-msgstr ""
+msgstr "Ú×"
+
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "ƒtƒ@ƒCƒ‹ \"%s\" ‚Í‹ó”’‚È‚Ì‚Å“Y•t‚µ‚Ü‚¹‚ñB"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "–¼‚ð”–‚•\Ž¦‚µ‚Ü‚·‚©H"
 
@@ -1106,47 +1218,55 @@
 msgid "Display"
 msgstr "•\Ž¦"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "‘—MŒã‚ÉŠm”F‰æ–Ê‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "–{•¶‚É•\Ž¦"
 
-#: config/prefs.php.dist:767
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "V’…ƒ[ƒ‹“ž’…Žž‚Éƒ|ƒbƒvƒAƒbƒv‚Å’Ê’m‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:732
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "ƒƒjƒ…[ƒo[‚ÉuSpam´‘|v‚ð•\Ž¦‚µ‚Ü‚·‚©H"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "ƒƒjƒ…[ƒo[‚ÉuƒSƒ~” ´‘|v‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "Œ`Ž®"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "ˆê’v‚µ‚È‚¢"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "ƒtƒHƒ‹ƒ_“à‚ÌV’…ƒ[ƒ‹‚ðŠm”F‚µ‚È‚¢"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "‰½‚àƒŠƒ“ƒN‚µ‚È‚¢"
 
-#: lib/IMP.php:979
+#: lib/IMP.php:1055
 msgid "Do you want to open that folder?"
 msgstr "ƒtƒHƒ‹ƒ_‚ðŠJ‚«‚Ü‚·‚©H"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "ƒAƒJƒEƒ“ƒg‚ðì‚è‚Ü‚·‚©H ƒTƒCƒ“ƒAƒbƒv‚µ‚Ä‰º‚³‚¢B"
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "I—¹"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "%s ‚ð zip Œ`Ž®‚Åƒ_ƒEƒ“ƒ[ƒh"
@@ -1155,25 +1275,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "“Y•t‚ð‘S‚Äƒ_ƒEƒ“ƒ[ƒhi.zip ƒtƒ@ƒCƒ‹‚Åj"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "ƒtƒHƒ‹ƒ_‚ðƒ_ƒEƒ“ƒ[ƒh"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "ƒtƒHƒ‹ƒ_‚ðƒ_ƒEƒ“ƒ[ƒhizip Œ`Ž®j"
 
-#: lib/MIME/Contents.php:214
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "zip Œ`Ž®‚Åƒ_ƒEƒ“ƒ[ƒh"
 
-#: message.php:494 mailbox.php:673 templates/message/navbar_navigate.inc:11
+#: message.php:504 mailbox.php:713 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "‰º‘‚«"
 
-#: folders.php:354
+#: folders.php:373
 msgid "Draft folder"
 msgstr "‰º‘‚«ƒtƒHƒ‹ƒ_"
 
@@ -1181,27 +1301,35 @@
 msgid "Drafts folder:"
 msgstr "‰º‘‚«ƒtƒHƒ‹ƒ_"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:316
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
 msgstr "ƒGƒ‰[Fƒ[ƒ‹‚ª”z’B‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: folders.php:379
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "•ÒW"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "ƒuƒ‰ƒbƒNƒŠƒXƒg‚ð•ÒW"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "ƒtƒBƒ‹ƒ^ƒ‹[ƒ‹‚ð•ÒW"
 
-#: folders.php:379 templates/search/header.inc:16
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "ŒŸõ—v‹‚ð•ÒW"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "‰¼‘zƒtƒHƒ‹ƒ_‚ð•ÒW"
 
@@ -1210,23 +1338,23 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "%s —p‚Ì‰¼‘zƒtƒHƒ‹ƒ_‚ð•ÒW"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "ƒzƒƒCƒgƒŠƒXƒg‚ð•ÒW"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "ƒuƒ‰ƒbƒNƒŠƒXƒg‚ð•ÒW"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "ƒtƒBƒ‹ƒ^ƒ‹[ƒ‹‚ð•ÒW"
 
-#: config/prefs.php.dist:829
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "‘¼‚ÌƒT[ƒo‚ÌƒAƒJƒEƒ“ƒg‚ðÝ’è‚µ‚Ä‰º‚³‚¢B"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "ƒzƒƒCƒgƒŠƒXƒg‚ð•ÒW"
 
@@ -1234,32 +1362,44 @@
 msgid "Email Address"
 msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX"
 
-#: lib/Message.php:651
+#: lib/Message.php:693
 #, php-format
 msgid "Emptied all messages from %s."
-msgstr ""
+msgstr "%s ‚Ìƒ[ƒ‹‚ð‘S‚Ä‹ó‚É‚µ‚Ü‚µ‚½B"
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "‰¼‘zƒSƒ~” ƒtƒHƒ‹ƒ_[‚ð‹ó‚É‚µ‚Ü‚µ‚½B"
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "ƒtƒHƒ‹ƒ_‚ð‹ó‚É‚·‚é"
 
+#: folders.php:272
+msgid "Empty Selected Folders"
+msgstr "‘I‘ð‚µ‚½ƒtƒHƒ‹ƒ_‚ðíœ‚·‚é"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "ƒSƒ~” ‚ð‹ó‚É‚·‚é"
 
-#: lib/IMP.php:877
+#: lib/IMP.php:951
+msgid "Empty _Spam"
+msgstr "_Spam´‘|"
+
+#: lib/IMP.php:944
 msgid "Empty _Trash"
 msgstr "_TƒSƒ~” ´‘|"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "PGP ‚ðŽg—p‚µ‚Ü‚·‚©H"
 
-#: templates/smime/smime.inc:15 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "S/MIME ‚ðŽg—p‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:779
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "ƒƒbƒZ[ƒW‚ÌƒvƒŒƒrƒ…[‚ðŽg—p‚µ‚Ü‚·‚©H"
 
@@ -1267,32 +1407,41 @@
 msgid "Encr_yption Options"
 msgstr "_YˆÃ†ƒIƒvƒVƒ‡ƒ“"
 
-#: lib/MIME/Viewer/itip.php:475 lib/MIME/Viewer/itip.php:645
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "ˆÃ†‰»Ï"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "I—¹"
 
-#: lib/Compose.php:318
+#: lib/Compose.php:395
 msgid "End forwarded message"
-msgstr "“]‘—ƒ[ƒ‹‚ÍˆÈã‚Å‚·"
+msgstr "“]‘—‚·‚éƒƒbƒZ[ƒW‚ÍˆÈã‚Å‚·"
 
-#: lib/Compose.php:259
+#: lib/Compose.php:352
 msgid "End message"
-msgstr ""
+msgstr "ƒƒbƒZ[ƒW‚ÍˆÈã‚Å‚·"
 
-#: lib/Compose.php:257
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
-msgstr ""
+msgstr "%s ‚©‚ç‚ÌƒƒbƒZ[ƒW‚ÍˆÈã‚Å‚·"
 
-#: templates/smime/smime.inc:54 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "ƒpƒXƒtƒŒ[ƒY‚ð“ü—Í"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "V‚µ‚¢ Spam ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "V‚µ‚¢‰º‘‚«ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "V‚µ‚¢‘—MT‚¦ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
@@ -1300,84 +1449,99 @@
 msgid "Enter the name for your new trash folder"
 msgstr "V‚µ‚¢ƒSƒ~” ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: message.php:187 compose.php:953
+# msgstr "ƒŠƒ_ƒCƒŒƒNƒg"
+#: lib/Search.php:613
+msgid "Entire Message"
+msgstr "ƒ[ƒ‹‘S‘Ì"
+
+#: message.php:194 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" ‚Æ‚¢‚¤ƒGƒ“ƒgƒŠ‚ªƒAƒhƒŒƒX’ ‚É’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/pgp/pgp.inc:84 lib/MIME/Viewer/pkcs7.php:185
-#: lib/MIME/Viewer/pgp.php:391 lib/MIME/Viewer/status.php:75
-#: lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "ƒGƒ‰["
 
-#: lib/MIME/Viewer/itip.php:278 lib/MIME/Viewer/itip.php:371
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "IMAP ƒT[ƒo‚Ö‚ÌÚ‘±ƒGƒ‰[‚Å‚·B%sF%s"
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "•ÔMƒGƒ‰[F %sB"
 
-#: lib/MIME/Viewer/itip.php:93
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "ƒCƒxƒ“ƒg‚Ííœ‚³‚ê‚Ü‚µ‚½B"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "15 •ª–ˆ"
 
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "30 •b–ˆ"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "5 •ª–ˆ"
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "30 •ª–ˆ"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "1 •ª–ˆ"
 
-#: folders.php:416
+#: folders.php:438
 msgid "Expand"
 msgstr "“WŠJ"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "‚·‚×‚Ä‚ð“WŠJ"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "‚·‚×‚Ä‚ÌƒtƒHƒ‹ƒ_‚ð“WŠJ"
 
-#: folders.php:416
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "ƒtƒHƒ‹ƒ_‚ð“WŠJ"
 
-#: templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "–¼‘O‚ð“WŠJ"
 
-#: config/prefs.php.dist:1045
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "ƒ[ƒ‹ì¬Žž‚É–¼‘O‚Ì“WŠJ‚ÍŽ©“®‚Ås‚¢‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:975
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "ƒtƒHƒ‹ƒ_‚ÌƒfƒtƒHƒ‹ƒg•\Ž¦‚ÅƒtƒHƒ‹ƒ_ƒcƒŠ[‘S‘Ì‚ð“WŠJ‚µ‚Ü‚·‚©H"
 
-#: templates/compose/compose.inc:159 templates/compose/compose.inc:209
-#: templates/compose/compose.inc:260 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:142 templates/compose/compose.inc:192
+#: templates/compose/compose.inc:243 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 msgid "Expanding"
 msgstr "“WŠJ’†"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:962 lib/IMP.php:964
+msgid "F_etch Mail"
+msgstr "_Eƒ[ƒ‹‚ÌŽæ‚èž‚Ý"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "ƒ[ƒ‹‚ÌŽæ‚èž‚Ý"
 
-#: config/prefs.php.dist:838
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "•ÊƒEƒCƒ“ƒh[‚ÅŽæ‚èž‚Ý‚ð‚µ‚Ü‚·‚©H"
 
@@ -1385,65 +1549,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "ƒƒOƒCƒ“Žž‚Éƒ[ƒ‹‚ðŽæ‚èž‚Ý‚Ü‚·‚©H"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:291
 #, php-format
-msgid "Fetched %d message(s) from %s"
+msgid "Fetched %d messages from %s"
 msgstr "%d ’Ê‚Ìƒ[ƒ‹‚ð %s ‚©‚çŽæ‚èž‚Ý‚Ü‚µ‚½"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "‚P’Ê‚Ìƒ[ƒ‹‚ð %s ‚©‚çŽæ‚èž‚Ý‚Ü‚µ‚½"
+
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
-msgstr ""
+msgstr "Fetchmail: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: V’…ƒ[ƒ‹‚È‚µB"
 
-#: lib/IMP.php:892
+#: lib/IMP.php:968
 msgid "Fi_lters"
 msgstr "_LƒtƒBƒ‹ƒ^"
 
-#: templates/compose/compose.inc:496 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:494 templates/compose/attachments.js:40
 msgid "File"
 msgstr "ƒtƒ@ƒCƒ‹"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "ƒtƒBƒ‹ƒ^ƒIƒvƒVƒ‡ƒ“"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "ƒtƒBƒ‹ƒ^Ý’è"
 
-#: config/prefs.php.dist:602
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
-msgstr "•s“KØ‚Èƒ[ƒ‹“à—e‚ðƒtƒBƒ‹ƒ^‚µ‚Ü‚·‚©H"
+msgstr "•s“KØ‚ÈƒƒbƒZ[ƒW‚Ì“à—e‚ðƒtƒBƒ‹ƒ^‚µ‚Ü‚·‚©H"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "ƒtƒBƒ‹ƒ^‚Í‚±‚ÌƒVƒXƒeƒ€‚Å‚Í–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·B"
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "ƒtƒBƒ‹ƒ^"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "ƒtƒBƒ‹ƒ^‚Í–³Œø"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "ƒtƒBƒ‹ƒ^F@%s ŠÇ—ƒy[ƒW"
 
-#: templates/contacts/contacts.inc:182
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "ŒŸõ"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX‚ÌÅ‰‚Ìƒy[ƒW"
 
-#: mailbox.php:341
+#: mailbox.php:330
 msgid "First Page"
 msgstr "Å‰‚Ìƒy[ƒW"
 
@@ -1451,89 +1620,77 @@
 msgid "Fo_rward"
 msgstr "_R“]‘—"
 
-#: folders.php:255 templates/folders/head.inc:2
+#: folders.php:252 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "ƒtƒHƒ‹ƒ_‘€ì ? Šm”F"
+
+#: folders.php:289 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "ƒtƒHƒ‹ƒ_‘€ì"
 
-#: templates/login/login.inc:195
-msgid "Folder Prefix"
-msgstr "ƒtƒHƒ‹ƒ_‚ÌÚ“ªŽ«"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "ƒtƒHƒ‹ƒ_ŠT—v"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "‹¤—LƒtƒHƒ‹ƒ_‚ÍŽg—p•s‰ÂB"
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "‹¤—LƒtƒHƒ‹ƒ_Žg—p‰Â”\B"
 
-#: config/prefs.php.dist:964
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
-msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX•\Ž¦‚É‚¨‚¯‚é¡“ú‚ÌƒƒbƒZ[ƒW‚ÌŽžŠÔ•\Ž¦Œ`Ž®"
+msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX•\Ž¦‚Å‚Ì¡“ú‚P“ú‚ÌŽžŠÔ•\Ž¦Œ`Ž®"
 
-#: compose.php:605 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "“]‘—"
 
-#: compose.php:590
+#: compose.php:805
 msgid "Forward:"
 msgstr "“]‘—:"
 
-#: lib/Compose.php:287
+#: lib/Compose.php:380
 msgid "Forwarded message"
-msgstr "“]‘—‚³‚ê‚½ƒ[ƒ‹"
+msgstr "“]‘—ƒ[ƒ‹"
 
-#: lib/Compose.php:285
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
-msgstr "%s ‚©‚ç“]‘—‚³‚ê‚½ƒ[ƒ‹"
-
-#: lib/MIME/Viewer/itip.php:443
-msgid "Free/Busy Information"
-msgstr "—\’èî•ñ"
-
-#: lib/MIME/Viewer/itip.php:454
-msgid "Free/Busy Reply"
-msgstr "—\’èî•ñ‰ž“š"
-
-#: lib/MIME/Viewer/itip.php:448
-msgid "Free/Busy Request"
-msgstr "—\’èî•ñ—v‹"
+msgstr "%s ‚©‚ç‚Ì“]‘—ƒ[ƒ‹"
 
-#: lib/MIME/Viewer/itip.php:365
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "—\’èî•ñ—v‹‰ž“š"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "_M·ol"
 
-#: message.php:256 search.php:141 thread.php:73
-#: templates/contacts/contacts.inc:186 templates/compose/compose.inc:102
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
-msgstr ""
+msgstr "From"
 
 # msgstr "·ol"
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "‘—MŒ³ƒAƒhƒŒƒX"
 
-#: compose.php:602 compose.php:606
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "“]‘—F"
 
-#: compose.php:1112
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "“]‘—: "
 
-#: compose.php:1114
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "“]‘—: %u ’Ê‚Ì“]‘—‚³‚ê‚½ƒ[ƒ‹"
@@ -1547,28 +1704,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "V’…ƒ[ƒ‹‚Ì‚ÝŽæ‚èž‚ÝiIMAP ƒT[ƒo‚Ì‚Ýj"
 
-#: thread.php:65
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "ˆÚ“®"
+
+#: thread.php:136
 msgid "Go to Message"
-msgstr ""
+msgstr "ƒ[ƒ‹‚ÉˆÚ“®"
+
+#: lib/IMP.php:502
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "ƒAƒhƒŒƒX’ ‚Ì %s ‚ÉˆÚ“®‚·‚é"
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "ƒAƒNƒZƒX‚ð‹–‰Â"
 
-#: message.php:549 lib/Filter.php:102 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/html.php:114
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:176
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:424
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "‚±‚±"
 
-#: lib/MIME/Viewer/html.php:115
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
-#: compose.php:263
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML Œ`Ž®"
 
@@ -1580,108 +1749,122 @@
 msgid "Here is the message you were composing:"
 msgstr "‚±‚ê‚ªì¬’†‚Ìƒ[ƒ‹‚Å‚·F"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "‰B‚·"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "ƒXƒŒƒbƒh•\Ž¦‚Å‚Í‰B‚·"
 
-#: mailbox.php:363
+#: mailbox.php:352
 msgid "Hide Deleted"
 msgstr "íœÏ‚Ý‚ð”ñ•\Ž¦"
 
-#: folders.php:250
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "”ñw“ÇŽÒ‚ð”ñ•\Ž¦"
 
-#: lib/MIME/Viewer/html.php:101
-msgid "Hide the Images"
-msgstr "‰æ‘œ‚ð‰B‚·"
-
-#: templates/compose/compose.inc:309
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr "‚"
 
-#: message.php:290 mailbox.php:678 templates/mailbox/legend.inc:12
+#: message.php:304 mailbox.php:718 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "—Dæ“x‚"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:291
 msgid "Highest"
 msgstr "Å‚"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "“Y•t‚ð‚Ç‚¤•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "•ÔMŽž‚Ìˆø—p‹å"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
-msgstr ""
+msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAPiŽ©“®”»•Êj"
 
-#: templates/login/login.inc:170 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP ƒT[ƒo‚ªÚ‘±‚ðØ’f‚µ‚Ü‚µ‚½BƒT[ƒo‚Ì‰ž“šF%s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
-msgstr ""
+msgstr "IMAP over SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
-msgstr ""
+msgstr "IMAP over SSL (self-signed certificate)"
 
-#: templates/login/login.inc:171
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
-msgstr ""
+msgstr "IMAP over SSL (self-signed)"
 
-#: templates/login/login.inc:169 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP ƒT[ƒo‚ªÚ‘±‚ðØ’f‚µ‚Ü‚µ‚½B"
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
-msgstr ""
+msgstr "IMAP, no TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
-msgstr ""
+msgstr "IMAP/POP3 ƒ[ƒ‹ƒT[ƒo"
 
-#: folders.php:346
-msgid "INBOX"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
 msgstr ""
+"SSL/TLS ‚ðŽg—p‚·‚é‚È‚çAPHP ‚Ì openssl Šg’£‚ðƒ[ƒh‚µ‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB"
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "‘±‚¯‚é‚ÆAƒtƒHƒ‹ƒ_“à‚Ìƒ[ƒ‹‚Í‚·‚×‚Ä”jŠü‚³‚ê‚Ü‚·I"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "–³Ž‹"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "‚·‚×‚Ä–³Ž‹"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "‰æ‘œ"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "ƒCƒ“ƒ|[ƒg"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Œ®‚ÌƒCƒ“ƒ|[ƒg"
 
-#: templates/smime/smime.inc:85 templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Œ®ƒyƒA‚ÌƒCƒ“ƒ|[ƒg"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "ƒ[ƒ‹‚ðƒCƒ“ƒ|[ƒg‚·‚é"
 
-#: pgp.php:46
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "PGP Œ®‚ÌƒCƒ“ƒ|[ƒg"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr "ŒÂl‚ÌØ–¾‘‚ðƒCƒ“ƒ|[ƒg"
 
 #: templates/pgp/import_key.inc:14
@@ -1692,11 +1875,11 @@
 msgid "Import Personal Public PGP Key"
 msgstr "ŒÂl‚Ì PGP ŒöŠJŒ®‚ðƒCƒ“ƒ|[ƒg"
 
-#: templates/smime/import_key.inc:14
+#: templates/smime/import_key.inc:4
 msgid "Import Personal S/MIME Certificates"
 msgstr "ŒÂl‚Ì S/MIME Ø–¾‘‚ðƒCƒ“ƒ|[ƒg"
 
-#: templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "ŒöŠJŒ®‚ÌƒCƒ“ƒ|[ƒg"
 
@@ -1712,7 +1895,7 @@
 msgid "Import S/MIME Key"
 msgstr "S/MIM Œ®‚ÌƒCƒ“ƒ|[ƒg"
 
-#: templates/folders/actions.inc:25 templates/folders/import.inc:9
+#: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "MBOXŒ`Ž®‚Ìƒtƒ@ƒCƒ‹‚ðƒCƒ“ƒ|[ƒg"
 
@@ -1721,7 +1904,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "MBOXŒ`Ž®‚Ìƒtƒ@ƒCƒ‹%s‚ð%s‚ÉƒCƒ“ƒ|[ƒg"
 
-#: message.php:495 mailbox.php:686 templates/message/navbar_navigate.inc:7
+#: message.php:505 mailbox.php:728 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1731,91 +1914,93 @@
 msgid "Important messages"
 msgstr "d—v‚Èƒ[ƒ‹"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
-msgstr "%d‚Ìƒ[ƒ‹‚ð%s‚©‚çƒCƒ“ƒ|[ƒg‚µ‚Ü‚µ‚½B"
+msgstr "%d ’Ê‚Ìƒ[ƒ‹‚ð %s ‚©‚çƒCƒ“ƒ|[ƒg‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:760
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "ˆ—’†"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:85
+#: lib/IMP.php:832 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "INBOX"
 
 # courier-imap ‚ðŽg‚Á‚Ä‚¢‚éê‡
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "•ÔMŽž‚Éƒwƒbƒ_‚Ìˆê•”‚ð•t‰Á‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
-msgstr "•ÔMŽž‚ÉŒ³‚Ìƒ[ƒ‹‚ðˆø—p‚µ‚Ü‚·‚©H"
+msgstr "•ÔMŽž‚ÉŒ³‚ÌƒƒbƒZ[ƒW‚ðˆø—p‚µ‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "î•ñ"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
-msgstr ""
+msgstr "%s ŒöŠJŒ®‚Ìî•ñ"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
-msgstr ""
+msgstr "ŒÂl‚Ì”é–§Œ®‚Ìî•ñ"
 
-#: templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
-msgstr ""
+msgstr "ŒÂl‚ÌŒöŠJŒ®‚Ìî•ñ"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:501
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:499
+#: templates/compose/attachments.js:56
 msgid "Inline"
-msgstr ""
+msgstr "ƒCƒ“ƒ‰ƒCƒ“"
 
 #: templates/smime/import_key.inc:9
 msgid "Insert Certificate Here"
-msgstr ""
+msgstr "Ø–¾‘‚ð‚±‚±‚É‘}“ü"
 
 #: templates/pgp/import_key.inc:15
 msgid "Insert Personal Private PGP Key Here"
-msgstr ""
+msgstr "ŒÂl‚Ì PGP ”é–§Œ®‚ð‚±‚±‚É‘}“ü"
 
 #: templates/pgp/import_key.inc:10
 msgid "Insert Personal Public PGP Key Here"
-msgstr ""
+msgstr "ŒÂl‚Ì PGPŒöŠJŒ®‚ð‚±‚±‚É‘}“ü"
 
 #: templates/pgp/import_key.inc:5
 msgid "Insert Public PGP Key Here"
-msgstr ""
+msgstr "PGPŒöŠJŒ®‚ð‚±‚±‚É‘}“ü"
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "•s³‚Èˆ’u‚ð‘I‘ð‚µ‚Ü‚µ‚½B"
 
-#: mailbox.php:546 mailbox.php:587
+#: mailbox.php:574 mailbox.php:621
 msgid "Invalid Address"
-msgstr ""
+msgstr "•s³‚ÈƒAƒhƒŒƒX"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
-msgstr ""
+msgstr "•s³‚ÈƒŠƒ‚[ƒgƒ[ƒ‹ƒ{ƒbƒNƒX"
 
-#: compose.php:147
-msgid "Invalid character in e-mail address."
-msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚É•s³‚È•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr "ƒ[ƒ‹ƒAƒhƒŒƒX‚É•s³‚È•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·F%s"
 
-#: pgp.php:18
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "•s³‚ÈŒ®"
 
-#: pgp.php:204
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "•s³‚È PGP ”é–§Œ®‚Å‚·B"
 
-#: pgp.php:179
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "•s³‚È PGP ŒöŠJŒ®‚Å‚·B"
 
@@ -1823,39 +2008,62 @@
 msgid "Invert"
 msgstr "”½“]"
 
-#: templates/compose/compose.inc:571
+#: templates/compose/compose.inc:591
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Œ®‚Ì’·‚³"
 
-#: pgp.php:326
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "Œ®‚Ì¶¬‚É‚ÍŽžŠÔ‚ª‚©‚©‚è‚Ü‚·B¶¬‚ð‘±‚¯‚Ü‚·‚©H"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Œ®‚ÌƒCƒ“ƒ|[ƒg‚Í‚Å‚«‚Ü‚¹‚ñB‚±‚ÌƒT[ƒo‚Å‚Íƒtƒ@ƒCƒ‹‚ÌƒAƒbƒvƒ[ƒh‚Í‹–‰Â‚³‚ê‚Ä"
+"‚¢‚Ü‚¹‚ñB"
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr "Œ®‚ÌƒCƒ“ƒ|[ƒg‚Í‚Å‚«‚Ü‚¹‚ñB‚ ‚È‚½‚ÍƒAƒhƒŒƒX’ ‚ð’è‹`‚µ‚Ä‚¢‚Ü‚¹‚ñB"
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Œ®‚ÍŒöŠJŒ®ƒT[ƒo‚É‘—‚ç‚ê‚Ü‚µ‚½B"
 
-#: templates/login/login.inc:223
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Œ¾ŒêÝ’è"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX‚ÌÅŒã‚Ìƒy[ƒW"
 
-#: mailbox.php:354
+#: mailbox.php:343
 msgid "Last Page"
 msgstr "ÅŒã‚Ìƒy[ƒW"
 
-#: templates/compose/compose.inc:384
-msgid "Li_nk Attachments"
-msgstr "_NƒŠƒ“ƒNŒ^“Y•t"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "“Y•t‚Ö‚ÌƒŠƒ“ƒNH"
 
-#: attachment.php:34 lib/Compose.php:977
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "ƒŠƒ“ƒNŒ^“Y•t‚ÍŽg—p‚Å‚«‚Ü‚¹‚ñB"
 
-#: config/prefs.php.dist:1064
+#: lib/Compose.php:1100
+#, php-format
+msgid "Links will expire on %s"
+msgstr "ƒŠƒ“ƒN‚Í %s ‚ÅŠúŒÀØ‚ê‚É‚È‚è‚Ü‚·"
+
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1863,7 +2071,7 @@
 "ƒAƒhƒŒƒX’ ‚Ì‰æ–Ê‚ð•\Ž¦‚µ‚½ŽžA‘SƒGƒ“ƒgƒŠ‚ð•\Ž¦‚µ‚Ü‚·‚©Hi‚±‚ê‚ªƒIƒt‚È‚çAŒŸ"
 "õ‚µ‚½ƒGƒ“ƒgƒŠ‚¾‚¯•\Ž¦‚³‚ê‚Ü‚·j"
 
-#: config/prefs.php.dist:687
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "ƒwƒbƒ_•”‚Éˆê——•\Ž¦"
 
@@ -1871,15 +2079,15 @@
 msgid "Local Mailbox:"
 msgstr "ƒ[ƒJƒ‹‚Ìƒ[ƒ‹ƒ{ƒbƒNƒX–¼F"
 
-#: lib/MIME/Viewer/itip.php:662
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "êŠ"
 
-#: templates/login/login.inc:231
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "ƒƒOƒCƒ“"
 
-#: lib/Block/summary.php:118
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "%s ‚ÉƒƒOƒCƒ“"
@@ -1892,47 +2100,47 @@
 msgid "Login Tasks"
 msgstr "ƒƒOƒCƒ“ƒ^ƒXƒN"
 
-#: templates/compose/compose.inc:311
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr "’á"
 
-#: message.php:292 mailbox.php:681 templates/mailbox/legend.inc:13
+#: message.php:306 mailbox.php:721 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "’á—Dæ“x"
 
-#: templates/compose/compose.inc:312
+#: templates/compose/compose.inc:295
 msgid "Lowest"
 msgstr "Å’á"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Macintosh ƒtƒ@ƒCƒ‹"
 
-#: smime.php:174 pgp.php:340 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
-msgstr ""
+msgstr "ƒ[ƒ‹"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
-msgstr ""
+msgstr "ƒ[ƒ‹ ƒvƒŒƒrƒ…["
 
 #: templates/fetchmail/driver_select.inc:16
 msgid "Mail server type to connect to:"
 msgstr "Ú‘±‚·‚éƒ[ƒ‹ƒT[ƒo‚ÌŽí—ÞF"
 
-#: folders.php:364
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX‚ÆƒtƒHƒ‹ƒ_‚Ì•\Ž¦ƒIƒvƒVƒ‡ƒ“"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "ƒtƒHƒ‹ƒ_“à‚Ìƒ[ƒ‹‚ð‘S‚ÄŠù“Ç‚Æ‚·‚é"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "ƒtƒHƒ‹ƒ_“à‚Ìƒ[ƒ‹‚ð‘S‚Ä–¢“Ç‚Æ‚·‚é"
 
@@ -1940,7 +2148,7 @@
 msgid "Mark as:"
 msgstr "ˆó‚ð•t‚¯‚éF"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "ˆø—p•”•ª‚ð•Ê‚ÌF‚Å•\Ž¦‚µ‚Ü‚·‚©H"
 
@@ -1948,23 +2156,27 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Šù“Ç‚É‚µ‚Ü‚·‚©HiIMAPƒT[ƒo‚Ì‚Ýj"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "‘¾ŽšA‰ºüAŽÎ‘Ì‚ð’Pƒ‚É•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "‘S‚Ä‚ªˆê’v‚·‚é"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "‚Ç‚ê‚©‚ªˆê’v‚·‚é"
 
-#: templates/compose/compose.inc:507
+#: templates/compose/compose.inc:505
 msgid "Maximum Attachment Size"
 msgstr "Å‘å“Y•tƒTƒCƒY"
 
-#: templates/compose/compose.inc:488
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Å‘åƒtƒHƒ‹ƒ_[”"
+
+#: templates/compose/compose.inc:487
 msgid "Maximum number of attachments reached."
 msgstr "“Y•t”‚ÌãŒÀ‚É’B‚µ‚Ü‚µ‚½B"
 
@@ -1972,70 +2184,42 @@
 msgid "Maximum total attachment size reached."
 msgstr "“Y•tƒTƒCƒY‚ÌãŒÀ‚É’B‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:605
-msgid "Meeting Cancellation"
-msgstr "‰ï‹c‚ÌŽæÁ‚µ"
-
-#: lib/MIME/Viewer/itip.php:533
-msgid "Meeting Information"
-msgstr "‰ï‹c‚Ìî•ñ"
-
-#: lib/MIME/Viewer/itip.php:543
-msgid "Meeting Proposal"
-msgstr "‰ï‹c‚Ì’ñˆÄ"
-
-#: lib/MIME/Viewer/itip.php:585
-msgid "Meeting Reply"
-msgstr "‰ï‹c‚Ì•ÔŽ–"
-
-#: lib/MIME/Viewer/itip.php:555
-msgid "Meeting Update"
-msgstr "‰ï‹c‚Ì•ÏX"
-
-#: lib/MIME/Viewer/itip.php:560
-msgid "Meeting Update Request"
-msgstr "‰ï‹c•ÏX‚Ì—v‹"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
-msgstr ""
+msgstr "ƒƒjƒ…[ƒtƒHƒ‹ƒ_ˆê——"
 
-#: lib/Compose.php:234
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "ƒ[ƒ‹"
 
-#: compose.php:407 compose.php:434 compose.php:467 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
-msgstr "ƒ[ƒ‹ì¬"
+msgstr "ƒƒbƒZ[ƒWì¬"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:906
 msgid "Message Date"
-msgstr "ƒ[ƒ‹‚Ì“ú•t"
+msgstr "ƒƒbƒZ[ƒW‚Ì“ú•t"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "ƒƒbƒZ[ƒWƒIƒvƒVƒ‡ƒ“"
 
-#: search.php:349
+#: search.php:302
 msgid "Message Search"
-msgstr "ƒ[ƒ‹‚ÌŒŸõ"
+msgstr "ƒƒbƒZ[ƒW‚ÌŒŸõ"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:910
 msgid "Message Size"
-msgstr "ƒ[ƒ‹ƒTƒCƒY"
+msgstr "ƒƒbƒZ[ƒWƒTƒCƒY"
 
-#: message.php:378
+#: message.php:391
 msgid "Message Source"
-msgstr "ƒ[ƒ‹ƒ\[ƒX"
+msgstr "ƒ[ƒ‹Œ´•¶"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
-msgstr "ƒ[ƒ‹•\Ž¦"
-
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "ƒ[ƒ‹ƒtƒB[ƒ‹ƒh"
+msgstr "ƒƒbƒZ[ƒW•\Ž¦"
 
 #: templates/search/main.inc:6
 msgid "Message flags"
@@ -2045,33 +2229,45 @@
 msgid "Message folders"
 msgstr "ƒ[ƒ‹ƒtƒHƒ‹ƒ_"
 
-#: lib/Compose.php:232
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "%s ‚©‚ç‚ÌƒƒbƒZ[ƒW"
 
-#: templates/search/header.inc:33
+#: mailbox.php:662
+msgid "Message has attachments"
+msgstr "ƒ[ƒ‹‚É“Y•t‚ ‚è"
+
+#: mailbox.php:653
+msgid "Message is encrypted"
+msgstr "ƒƒbƒZ[ƒW‚ÍˆÃ†‰»‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#: mailbox.php:648
+msgid "Message is signed"
+msgstr "ƒƒbƒZ[ƒW‚Í–¼‚³‚ê‚Ä‚¢‚Ü‚·"
+
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "ˆê’vðŒ"
 
-#: compose.php:648 compose.php:658
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "ƒƒbƒZ[ƒW‚Í“]‘—‚³‚ê‚Ü‚µ‚½B"
 
-#: compose.php:918
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "ƒƒbƒZ[ƒW‚Í‘—M‚³‚ê‚Ü‚µ‚½‚ªA%s ‚É•Û‘¶‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
 
-#: compose.php:962 compose.php:973
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "ƒƒbƒZ[ƒW‚Ì‘—M¬Œ÷"
 
-#: config/prefs.php.dist:911
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX•\Ž¦‚ÌŠeƒy[ƒW‚É•\Ž¦‚³‚ê‚éƒ[ƒ‹”"
 
-#: mailbox.php:318
+#: mailbox.php:310
 msgid "Messages to"
 msgstr "ƒ[ƒ‹‚ÌˆÚ“®æ"
 
@@ -2079,9 +2275,9 @@
 msgid "Modify"
 msgstr "C³"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
-msgid "More than one address found for field '%s'."
+msgid "More than one address found for field \"%s\"."
 msgstr "'%s'‚É‚P‚ÂˆÈã‚ÌƒAƒhƒŒƒX‚ª‚ ‚è‚Ü‚·B"
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2092,7 +2288,11 @@
 msgid "Move down"
 msgstr "‰º‚ÖˆÚ“®"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr "Spam ƒƒbƒZ[ƒW‚ð spam ƒtƒHƒ‹ƒ_[‚ÉˆÚ“®‚µ–³ŠQ‚ÈƒƒbƒZ[ƒW‚ð INBOX ‚Ö"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "ƒtƒHƒ‹ƒ_‚ÉˆÚ“®"
 
@@ -2100,52 +2300,70 @@
 msgid "Move up"
 msgstr "ã‚ÖˆÚ“®"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:48 templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "ƒ[ƒ‹ˆê——•\Ž¦"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr ""
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:674
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "–¼‘O"
 
-#: pgp.php:118
-msgid "Name and/or email can not be empty"
-msgstr ""
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
+msgstr "–¼‘O‚©ƒ[ƒ‹‚Í•K{‚Å‚·"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "ˆ’u‚ª•K—v‚Å‚·"
 
-#: config/prefs.php.dist:562 config/prefs.php.dist:583
-#: config/prefs.php.dist:753
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "‚È‚µ"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "“Y•t‚Í•Û‘¶‚µ‚È‚¢"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "V‹K"
 
-#: lib/IMP.php:569
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "V‹KƒtƒHƒ‹ƒ_"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "V’…ƒ[ƒ‹"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "V‹Kƒ[ƒ‹"
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "%s ‚Ö‚ÌV‹Kƒ[ƒ‹"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "V‹Kƒ[ƒ‹"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "ŽŸ‚Ö"
 
@@ -2153,15 +2371,16 @@
 msgid "Next Message"
 msgstr "ŽŸ‚Ìƒ[ƒ‹"
 
-#: mailbox.php:352
+#: mailbox.php:341
 msgid "Next Page"
 msgstr "ŽŸ‚Ìƒy[ƒW"
 
-#: templates/compose/compose.inc:536 config/prefs.php.dist:972
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966
 msgid "No"
-msgstr "‚È‚µ"
+msgstr "‚¢‚¢‚¦"
 
-#: smime.php:154
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Ø–¾‘‚ªŒ©•t‚©‚è‚Ü‚¹‚ñ"
 
@@ -2169,101 +2388,124 @@
 msgid "No Encryption"
 msgstr "ˆÃ†‰»‚µ‚È‚¢"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Œ®ƒŠƒ“ƒO‚Í‹ó‚Å‚·"
 
-#: mailbox.php:371
+#: mailbox.php:360
 #, php-format
 msgid "No Messages"
-msgstr ""
+msgstr "ƒ[ƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
 
-#: pgp.php:145
+#: pgp.php:133
 msgid "No PGP public key imported."
-msgstr ""
+msgstr "PGP ŒöŠJŒ®‚ÍƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "ŒÂl‚ÌØ–¾‘‚ª—^‚¦‚ç‚ê‚Ä‚¢‚Ü‚¹‚ñ"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:333
+msgid "No Preview Text"
+msgstr "ƒvƒŒƒrƒ…[‚È‚µ"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "ŒöŠJŒ®‚ª‚ ‚è‚Ü‚¹‚ñ"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "S/MIME ŒöŠJŒ®‚ÍƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "“Y•t‚ª‚ ‚è‚Ü‚¹‚ñB"
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "ŒöŠJŒ®‚Éƒ[ƒ‹‚Ìî•ñ‚ÍŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚¹‚ñB"
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "ƒtƒHƒ‹ƒ_‚ª‘I‘ð‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/Block/summary.php:131
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "V’…ƒ[ƒ‹‚ðƒ`ƒFƒbƒN‚·‚éƒtƒHƒ‹ƒ_‚ªŽw’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
 msgid "No folders were specified"
 msgstr "ƒtƒHƒ‹ƒ_‚ªŽw’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/Block/summary.php:137
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
-msgstr ""
+msgstr "‚Ç‚ÌƒtƒHƒ‹ƒ_‚É‚àV’…ƒ[ƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
 
-#: lib/Block/summary.php:134
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
-msgstr ""
+msgstr "‚Ç‚ÌƒtƒHƒ‹ƒ_‚É‚à–¢“Çƒ[ƒ‹‚Í‚ ‚è‚Ü‚¹‚ñ"
 
-#: lib/Compose.php:228
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "–{•¶‚È‚µ"
 
-#: lib/Mailbox.php:1134
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "•ÔM‚È‚µ"
+
+#: lib/Mailbox.php:375
 msgid "No messages matched your search."
 msgstr "ŒŸõðŒ‚Éˆê’v‚·‚éƒƒbƒZ[ƒW‚ÍŒ©‚Â‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: pgp.php:197
+#: pgp.php:185
 msgid "No personal PGP private key imported."
-msgstr ""
+msgstr "ŒÂl‚Ì PGP ”é–§Œ®‚ÍƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: pgp.php:173
+#: pgp.php:161
 msgid "No personal PGP public key imported."
-msgstr ""
+msgstr "ŒÂl‚Ì PGP ŒöŠJŒ®‚ÍƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
-msgstr ""
+msgstr "ŒÂl‚Ì S/MIME Ø–¾‘‚ÍƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B"
+
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr "”é–§Œ®‚ª–³‚¢‚Ì‚ÅAƒƒbƒZ[ƒW‚Ì•œ†‚Í‚Å‚«‚Ü‚¹‚ñB"
 
 #: spelling.php:220
 msgid "No spellchecking program configured."
-msgstr ""
+msgstr "ƒXƒyƒ‹ƒ`ƒFƒbƒN—pƒvƒƒOƒ‰ƒ€‚ªÝ’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "ƒXƒyƒ‹ƒGƒ‰[‚È‚µ"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Œó•â‚È‚µ"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr "ƒTƒ|[ƒg‚·‚é IMAP ”FØ‚ª‚ ‚è‚Ü‚¹‚ñB"
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
-msgstr ""
+msgstr "ƒ†[ƒU‚ªŽw’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/itip.php:695
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "ŽQ‰ÁŽÒˆÈŠO"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 lib/MIME/Viewer/itip.php:652
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "‚È‚µ"
 
-#: templates/compose/compose.inc:310
+#: templates/compose/compose.inc:293
 msgid "Normal"
 msgstr "’Êí"
 
@@ -2283,11 +2525,11 @@
 
 #: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
-msgstr "ŒÂl“I‚Å‚È‚¢"
+msgstr "Ž©•ªˆ¶‚Å‚È‚¢"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:176 lib/Crypt/SMIME.php:185
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
-msgstr ""
+msgstr "³‚µ‚¢ŒöŠJŒ®‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
 #: templates/search/main.inc:67
 msgid "Not deleted messages"
@@ -2297,119 +2539,122 @@
 msgid "Not important messages"
 msgstr "d—v‚Å‚È‚¢ƒ[ƒ‹"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
-msgstr ""
+msgstr "‚µŽžŠÔ‚ª‚©‚©‚è‚Ü‚·"
+
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "‰½‚à‚µ‚È‚¢"
 
-#: config/prefs.php.dist:371
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "’Ê’mFƒŠƒ“ƒN‚³‚ê‚½“Y•t‚ªƒ_ƒEƒ“ƒ[ƒh‚³‚ê‚Ü‚µ‚½"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr "ŒÃ‚¢ƒŠƒ“ƒNŒ^“Y•t‚ðíœ‚·‚éê‡A•Û‘¶‚·‚éŒŽ”"
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "–ˆŒŽíœ‚·‚éê‡‚É•Û‘¶‚µ‚Ä‚¨‚«‚½‚¢Šù‘¶‚Ìm‘—MT‚¦nƒtƒHƒ‹ƒ_‚Ì”"
 
-#: templates/contacts/contacts.inc:251 lib/MIME/Viewer/itip.php:510
-#: lib/MIME/Viewer/itip.php:720
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5 templates/pgp/import_key.inc:48
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
 msgid "OR"
-msgstr ""
+msgstr "‚Ü‚½‚Í"
 
 #: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Šù‘¶‚Ìƒ[ƒ‹"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "ŒÃ‚¢m‘—MT‚¦nƒtƒHƒ‹ƒ_‚ÌÁ‹Ž’†B"
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
-msgstr ""
+msgstr "–¢“Çƒ[ƒ‹‚ª‚ ‚éƒtƒHƒ‹ƒ_‚¾‚¯‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
-msgstr ""
+msgstr "ƒtƒHƒ‹ƒ_‚Í‚P‚Â‚¾‚¯Žw’è‚µ‚Ä‰º‚³‚¢B"
 
-#: templates/menu.inc:26 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "_NƒtƒHƒ‹ƒ_‘I‘ð"
-
-#: templates/menu.inc:17 templates/menu.inc:20
-msgid "Open Folder"
-msgstr "ƒtƒHƒ‹ƒ_‘I‘ð"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
+msgstr "_LƒtƒHƒ‹ƒ_‚ðŠJ‚"
 
-# msgstr "ƒtƒHƒ‹ƒ_‚ðŠJ‚"
-#: folders.php:385
+#: folders.php:408
 msgid "Opened Folder"
-msgstr ""
+msgstr "ƒtƒHƒ‹ƒ_‚ðŠJ‚"
 
-#: lib/MIME/Viewer/itip.php:691
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "”CˆÓ‚ÌŽQ‰ÁŽÒ"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "‘¼‚Ìƒ[ƒ‹ƒAƒJƒEƒ“ƒg"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "‚»‚Ì‘¼‚ÌƒIƒvƒVƒ‡ƒ“"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:208 lib/MIME/Viewer/pgp.php:294
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "‘—M—pƒT[ƒo"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
-msgstr ""
+msgstr "PGP"
 
 #: templates/compose/encrypt_list.inc:7
 msgid "PGP Encrypt Message"
 msgstr "PGP ˆÃ†‰»"
 
-#: compose.php:745
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP ƒGƒ‰[: "
 
-#: compose.php:722
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP ƒGƒ‰[: ”é–§Œ®‚ÌƒpƒXƒtƒŒ[ƒY‚ª•K—v‚Å‚·B"
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP ‚ÍŽg—p‰Â”\‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP ƒIƒvƒVƒ‡ƒ“"
 
-#: pgp.php:34
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "PGP ƒpƒXƒtƒŒ[ƒY‚Ì“ü—Í"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
-msgstr "PGP ŒÂlŒ®‚ÌƒTƒ|[ƒg‚É‚ÍˆÀ‘S‚È web Ú‘±‚ª•K—v‚Å‚·B"
+msgstr "PGP ŒÂlŒ®‚ÌŽg—p‚É‚ÍˆÀ‘S‚È web Ú‘±iSSL Ú‘±j‚ª•K—v‚Å‚·B"
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
-msgstr ""
+msgstr "PGP ŒöŠJŒ®"
 
-#: pgp.php:157
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr ""
+msgstr "\"%s (%s)\" ‚Ì PGP ŒöŠJŒ®‚ª’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: pgp.php:253
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr ""
+msgstr "\"%s\" ‚Ì PGP ŒöŠJŒ®‚Ííœ‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP ŒöŠJŒ®ƒŠƒ“ƒO"
 
@@ -2421,73 +2666,73 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "PGP “dŽq–¼^ˆÃ†‰»"
 
-#: pgp.php:210
+#: pgp.php:198
 msgid "PGP private key successfully added."
-msgstr ""
+msgstr "PGP ”é–§Œ®‚ª’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: pgp.php:185
+#: pgp.php:173
 msgid "PGP public key successfully added."
-msgstr ""
+msgstr "PGP ŒöŠJŒ®‚ª’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
-msgstr ""
+msgstr "‚±‚ÌƒVƒXƒeƒ€‚Å‚Í PGP ‚ÌƒTƒ|[ƒg‚Í–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/pgp.php:212
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 "PGP ‚ÌƒTƒ|[ƒg‚ÍŒ»Ý–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·‚Ì‚ÅA“dŽq–¼‚ÌŒŸØ‚Í‚Å‚«‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/pgp.php:299
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr "PGP ‚ÌƒTƒ|[ƒg‚ÍŒ»Ý–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·‚Ì‚ÅA•œ†‚Í‚Å‚«‚Ü‚¹‚ñB"
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "PGP ‚ÌƒTƒ|[ƒg‚É‚Íƒ|ƒbƒvƒAƒbƒvEƒEƒCƒ“ƒh[‚ª•K—v‚Å‚·B‚¨Žg‚¢‚Ìƒuƒ‰ƒEƒU‚ªƒ|ƒb"
 "ƒvƒAƒbƒv‚ð‹ÖŽ~‚É‚µ‚Ä‚ ‚é‚È‚çAPGP ‹@”\‚Í³‚µ‚“®ì‚µ‚Ü‚¹‚ñB"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
-msgstr ""
+msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3iŽ©“®”»•Êj"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
-msgstr ""
+msgstr "POP3 over SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
-msgstr ""
+msgstr "POP3 over SSL (self-signed certificate)"
 
-#: templates/login/login.inc:173
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
-msgstr ""
+msgstr "POP3 over SSL (self-signed)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
-msgstr ""
+msgstr "POP3, no TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "%d ^ %d ƒy[ƒW"
 
-#: config/prefs.php.dist:873
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Å‰‚Ì–¢“ÇƒƒbƒZ[ƒW‚ðŠÜ‚Þƒy[ƒW"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "ÅŒã‚Ì–¢“ÇƒƒbƒZ[ƒW‚ðŠÜ‚Þƒy[ƒW"
 
@@ -2495,31 +2740,32 @@
 msgid "Part(s)"
 msgstr "ƒp[ƒg"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
-msgstr ""
+msgstr "ƒpƒXƒtƒŒ[ƒY"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
-msgstr ""
+msgstr "ƒpƒXƒtƒŒ[ƒYiÄ“xj"
 
-#: smime.php:162 pgp.php:318
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
-msgstr ""
+msgstr "ƒpƒXƒtƒŒ[ƒY‚ÍƒAƒ“ƒ[ƒh‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
-msgstr ""
+msgstr "ƒpƒXƒtƒŒ[ƒYF"
 
-#: pgp.php:120
-msgid "Passphrases can not be empty"
-msgstr ""
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
+msgstr "ƒpƒXƒtƒŒ[ƒY‚Í‹ó‚Å‚Í‚¢‚¯‚Ü‚¹‚ñ"
 
-#: pgp.php:122
+#: pgp.php:110
 msgid "Passphrases do not match"
-msgstr ""
+msgstr "ƒpƒXƒtƒŒ[ƒY‚ªˆê’v‚µ‚Ü‚¹‚ñ"
 
-#: templates/fetchmail/manage.inc:20 templates/login/login.inc:217
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "ƒpƒXƒ[ƒh"
 
@@ -2527,11 +2773,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "ƒƒOƒCƒ“Žž‚É‚ð•ÛŽçì‹Æ‚ðŽÀs‚µ‚Ü‚·‚©H"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "‚±‚Ìƒ†[ƒU‚ÌƒAƒNƒZƒXŒ ‚Í•ÏX‚Å‚«‚Ü‚¹‚ñB"
 
-#: message.php:486 mailbox.php:657 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:697 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Ž©•ªˆ¶"
@@ -2541,39 +2787,49 @@
 msgid "Personal Information"
 msgstr "ŒÂlî•ñ"
 
-#: pgp.php:128
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
-msgstr ""
+msgstr "ŒÂl—p PGP Œ®‚ð¶¬‚µ‚Ü‚µ‚½B"
 
-#: pgp.php:135
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
-msgstr ""
+msgstr "ŒÂl—p PGP Œ®‚ðíœ‚µ‚Ü‚µ‚½B"
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
-msgstr ""
+msgstr "ŒÂl—p S/MIME Ø–¾‘‚ªƒCƒ“ƒ|[ƒg‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½F"
 
-#: smime.php:112
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
-msgstr ""
+msgstr "ŒÂl—p S/MIME Œ®‚Ííœ‚³‚ê‚Ü‚µ‚½B"
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "•ÔM‚Ü‚½‚Í“]‘—‚·‚é‘O‚É–¼‚ð’Ç‰Á‚µ‚Ü‚·‚©H"
+msgstr "•ÔM‚Ü‚½‚Í“]‘—‚·‚é–{•¶‚Ì‘O‚É–¼‚ð’Ç‰Á‚µ‚Ü‚·‚©H"
 
-#: compose.php:261
+#: compose.php:258
 msgid "Plaintext Version of Message"
-msgstr ""
+msgstr "ƒeƒLƒXƒg”Å‚ÌƒƒbƒZ[ƒW"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"V’…ƒ[ƒ‹‚ð‰¹‚Å’m‚ç‚¹‚Ü‚·‚©H‚»‚Ì‚½‚ß‚É‚Í‰¹Šy‘Î‰ž‚Ìƒuƒ‰ƒEƒU‚ª•K—v‚Å‚·B‘å’ï"
+"‚ÌWindows‚âMac‚Ìƒuƒ‰ƒEƒU‚Í‘Î‰ž‚µ‚Ä‚¢‚Ü‚·‚ªA‚»‚êˆÈŠO‚Ìƒvƒ‰ƒbƒgƒz[ƒ€‚Å‚Íƒvƒ‰"
+"ƒOƒCƒ“‚ª•K—v‚Å‚µ‚å‚¤B"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "V‹KƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢F"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "V‹KƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢F"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "V‚µ‚¢–¼‘O‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢F"
 
@@ -2583,6 +2839,8 @@
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per %s session."
 msgstr ""
+"‚ ‚È‚½‚Ì PGP ”é–§Œ®—p‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢BƒpƒXƒtƒŒ[ƒY‚Í %s ƒZƒb"
+"ƒVƒ‡ƒ“‚Åˆê“x‚¾‚¯“ü—Í‚µ‚Ü‚·B"
 
 #: templates/smime/passphrase.inc:13
 #, php-format
@@ -2590,83 +2848,74 @@
 "Please enter the passphrase for your S/MIME private key. You will only need "
 "to enter this passphrase once per %s session."
 msgstr ""
+"‚ ‚È‚½‚Ì S/MIME ”é–§Œ®—p‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚µ‚Ä‚‚¾‚³‚¢BƒpƒXƒtƒŒ[ƒY‚Í %s "
+"ƒZƒbƒVƒ‡ƒ“‚Åˆê“x‚¾‚¯“ü—Í‚µ‚Ü‚·B"
 
-#: recompose.php:88
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
 "log in again in your main window as well. This is to keep attackers from "
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
+"ƒ[ƒ‹‚Ìì¬‚ð‘±‚¯‚é‚½‚ß‚ÉƒƒOƒCƒ“‚µ’¼‚µ‚Ä‚‚¾‚³‚¢B‚à‚µ‚àƒNƒbƒL[‚ð‹ÖŽ~‚É‚µ"
+"‚Ä‚¢‚ÄAƒ|ƒbƒvƒAƒbƒvEƒEƒCƒ“ƒh[‚Åƒ[ƒ‹‚ðì¬‚µ‚Ä‚¢‚½‚È‚çAƒƒOƒCƒ“‚µ’¼‚·‚×"
+"‚«‚Å‚·B‚»‚ê‚ÅAˆ«ˆÓ‚Ì‚ ‚él‚©‚ç‚ÌƒZƒbƒVƒ‡ƒ“ID‚Ìæ‚ÁŽæ‚è‚ð–hŽ~‚·‚é‚±‚Æ‚ª‚Å‚«"
+"‚Ü‚·B‚²•s•Ö‚ð‚¨‚©‚¯‚µ‚ÄÏ‚Ý‚Ü‚¹‚ñB"
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "ƒpƒXƒ[ƒh‚ð‹L“ü‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "ƒ†[ƒU–¼‚ð‹L“ü‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: compose.php:79 lib/IMP.php:514
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
-msgstr "‚ ‚¢‚Ü‚¢‚È i‚Ü‚½‚Í–³Œø‚Èj ƒAƒhƒŒƒX‚ðC³‚µ‚Ä‚‚¾‚³‚¢B"
-
-#: lib/MIME/Viewer/itip.php:632
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr "ˆÈ‰º‚Ì“à—e‚ðŠm”F‚µ‚½‚Ì‚¿AˆÈ‰º‚Ìƒƒjƒ…[‚©‚çˆ’u‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢B"
+msgstr "žB–†‚È‚Ü‚½‚Í–³Œø‚ÈƒAƒhƒŒƒX‚ðC³‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: templates/folders/javascript.inc:56
-msgid "Please select a folder before you perform any actions."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
 msgstr "‘€ì‚ðŽÀs‚·‚é‘O‚ÉƒtƒHƒ‹ƒ_‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
-#: lib/MIME/Viewer/itip.php:462
-msgid "Please select an action from the menu below."
-msgstr "ˆÈ‰º‚Ìƒƒjƒ…[‚©‚ç“®ì‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢B"
-
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "ŒŸõ‚·‚éƒtƒHƒ‹ƒ_‚ð 1 ‚ÂˆÈã‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "‚±‚Ì‘€ì‚ðs‚¤ƒtƒHƒ‹ƒ_‚ð 1 ‚Â‚¾‚¯‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
-msgstr ""
-
-#: templates/compose/compose.inc:131 templates/compose/compose.inc:181
-#: templates/compose/compose.inc:232
-msgid "Please select or edit right next:"
-msgstr "ŽŸ‚ð‘I‘ð‚Ü‚½‚Í•ÒW‚µ‚Ä‚‚¾‚³‚¢F"
+msgstr "‰E‚©‚ç‘I‘ð‚·‚é‚©•ÒW‚µ‚Ä‰º‚³‚¢F"
 
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr ""
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "–¼‚Ì‘O‚É‚Íƒ_ƒbƒVƒ…i'-- 'j‚ð•t‚¯‚Ü‚·‚©H"
 
-#: smime.php:167 pgp.php:265 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 msgid "Preferences successfully updated."
-msgstr ""
+msgstr "Ý’è‚Í³í‚ÉXV‚³‚ê‚Ü‚µ‚½B"
 
 #: templates/compose/attachments.inc:3
 msgid "Preview"
-msgstr ""
+msgstr "ƒvƒŒƒrƒ…["
 
 #: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "‘O‚Ìƒ[ƒ‹"
 
-#: mailbox.php:343
+#: mailbox.php:332
 msgid "Previous Page"
 msgstr "‘O‚Ìƒy[ƒW"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "ˆóü"
 
@@ -2674,15 +2923,15 @@
 msgid "Priority"
 msgstr "—Dæ“x"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
-msgstr ""
+msgstr "”é–§Œ®ƒpƒXƒ[ƒh"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "“Y•t‚ð‘—M‚µ‚½Žž‚Íq‚Ë‚éGƒfƒtƒHƒ‹ƒgNO"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "“Y•t‚ð‘—M‚µ‚½Žž‚Íq‚Ë‚éGƒfƒtƒHƒ‹ƒgYES"
 
@@ -2690,77 +2939,78 @@
 msgid "Protocol:"
 msgstr "ƒvƒƒgƒRƒ‹F"
 
-#: lib/Crypt/PGP.php:451
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
-msgstr ""
+msgstr "ŒöŠJ PGP Œ®ƒT[ƒo‚ÌƒTƒ|[ƒg‚Í–³Œø‚É‚È‚Á‚Ä‚¢‚Ü‚·B"
 
-#: templates/mailbox/actions.inc:36
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "_GƒSƒ~” ‚ð‹ó‚É‚·‚é"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:9
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "ƒSƒ~” ‚ð‹ó‚É‚·‚é"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
-msgstr ""
+msgstr "ƒtƒHƒ‹ƒ_[‚ðƒp[ƒW"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "ƒSƒ~” ‚ð‹ó‚É‚·‚é•p“xF"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_“à‚Ìƒ[ƒ‹‚ð‹ó‚É‚·‚é‚Ü‚Å‚Ì“ú”"
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "ƒSƒ~” “à‚ÌŒÃ‚¢ƒ[ƒ‹‚ðÁ‹Ž‚µ‚Ü‚·‚©H"
 
-#: lib/Maintenance/Task/purge_trash.php:63
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_‚©‚ç%d’Ê‚Ìƒ[ƒ‹‚ðíœ‚µ‚Ü‚µ‚½"
+msgid "Purging %d messages from Trash folder."
+msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_‚©‚ç %d ’Ê‚Ìƒ[ƒ‹‚ðíœ‚µ‚Ü‚µ‚½"
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr "ƒfƒtƒHƒ‹ƒg‚Å‘—MƒƒCƒ‹ƒAƒhƒŒƒX‚ÉŽg—p‚³‚ê‚éƒhƒƒCƒ“–¼:"
+#: lib/Maintenance/Task/purge_trash.php:63
+msgid "Purging 1 message from Trash folder."
+msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_‚©‚ç‚P’Ê‚Ìƒ[ƒ‹‚ðíœ‚µ‚Ü‚µ‚½"
 
 #: templates/quota/quota.inc:17
 #, php-format
 msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
-msgstr ""
+msgstr "ƒNƒH[ƒ^‚Ìó‹µF %.2fMB / %.2fMB  (%.2f%%)"
 
 #: templates/quota/quota.inc:21
 #, php-format
 msgid "Quota status: %.2fMB / NO LIMIT"
-msgstr ""
+msgstr "ƒNƒH[ƒ^‚Ìó‹µF %.2fMB /–³§ŒÀ"
 
 #: templates/quota/quota.inc:24
 #, php-format
 msgid "Quota status: NO LIMIT"
-msgstr ""
+msgstr "ƒNƒH[ƒ^‚Ìó‹µF –³§ŒÀ"
 
-#: config/prefs.php.dist:492
-msgid "Quoting"
-msgstr "ˆø—p"
+#: config/prefs.php.dist:500
+#, php-format
+msgid "Quoting %f:"
+msgstr "ˆø—p %fF"
 
-#: templates/compose/compose.inc:381
-msgid "Re_quest Delivery Confirmation"
-msgstr "_Q”z’BŠm”F‚ð—v‹"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "ƒtƒHƒ‹ƒ_[ƒcƒŠ[‚ðÄ\’z"
 
-#: search.php:165
+#: lib/Search.php:617
 msgid "Received On"
-msgstr ""
+msgstr "ŽóM‚µ‚½“ú"
 
-#: search.php:173
+#: lib/Search.php:625
 msgid "Received Since"
-msgstr ""
+msgstr "‚±‚Ì“úˆÈ~‚ÉŽóM"
 
-#: search.php:169
+#: lib/Search.php:621
 msgid "Received Until"
-msgstr ""
+msgstr "‚±‚Ì“ú‚Ü‚Å‚ÉŽóM"
 
 #: templates/message/navbar_actions.inc:16
 msgid "Redirec_t"
@@ -2771,31 +3021,26 @@
 msgstr "‚»‚Ì‚Ü‚Ü“]‘—"
 
 # msgstr "ƒŠƒ_ƒCƒŒƒNƒg"
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "ƒ[ƒ‹‚ð‚»‚Ì‚Ü‚Ü“]‘—‚·‚é"
 
 # msgstr "ƒ[ƒ‹‚ðƒŠƒ_ƒCƒŒƒNƒg‚·‚é"
-#: compose.php:612
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "‚±‚Ìƒ[ƒ‹‚ð‚»‚Ì‚Ü‚Ü“]‘—‚·‚é"
 
 # msgstr "‚±‚Ìƒ[ƒ‹‚ðƒŠƒ_ƒCƒŒƒNƒg‚·‚é"
-#: compose.php:667
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "“]‘—‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-# msgstr "ƒŠƒ_ƒCƒŒƒNƒg‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
-#: templates/compose/compose.inc:577
-msgid "Refresh"
-msgstr "Ä•\Ž¦"
-
 # msgstr "ƒŠƒtƒŒƒbƒVƒ…"
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "ƒtƒHƒ‹ƒ_•\Ž¦‚ÌƒŠƒtƒŒƒbƒVƒ…:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "ƒŠƒ[ƒh"
 
@@ -2803,11 +3048,11 @@
 msgid "Reload View"
 msgstr "•\Ž¦‚ðƒŠƒ[ƒh"
 
-#: lib/MIME/Viewer/itip.php:484 lib/MIME/Viewer/itip.php:503
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "—\’èî•ñ‚ð‹L‰¯‚·‚éB"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "ÅŒã‚Ì•\Ž¦‚ð‹L‰¯"
 
@@ -2815,7 +3060,7 @@
 msgid "Remote Mailbox:"
 msgstr "ƒŠƒ‚[ƒg‚Ìƒ[ƒ‹ƒ{ƒbƒNƒX–¼F"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "ŒŸõ‚©‚çœŠO‚·‚é"
 
@@ -2823,15 +3068,15 @@
 msgid "Remove source"
 msgstr ""
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "ƒtƒHƒ‹ƒ_–¼‚ð•ÏX"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "‘—MT‚¦ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ð–ˆŒŽ‚Ì‰‚ß‚É•ÏX‚µ‚Ü‚·‚©H"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:425
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "\"%s\" ‚ð \"%s\" ‚É•ÏX‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BƒT[ƒo‚ÌƒGƒ‰[:"
@@ -2840,7 +3085,7 @@
 msgid "Repl_y to List"
 msgstr "_YƒŠƒXƒg‚É•ÔM"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "ŽŸ‚Æ’uŠ·F"
 
@@ -2848,7 +3093,7 @@
 msgid "Reply"
 msgstr "•ÔM"
 
-#: lib/MIME/Viewer/itip.php:280 lib/MIME/Viewer/itip.php:373
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "•ÔMŠ®—¹B"
 
@@ -2856,7 +3101,7 @@
 msgid "Reply to All"
 msgstr "‘Sˆõ‚É•ÔM"
 
-#: compose.php:559
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "‘Sˆõ‚É•ÔMF"
 
@@ -2864,7 +3109,7 @@
 msgid "Reply to List"
 msgstr "ƒŠƒXƒg‚É•ÔM"
 
-#: compose.php:561
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "ƒŠƒXƒg‚É•ÔMF"
 
@@ -2872,151 +3117,141 @@
 msgid "Reply to _All"
 msgstr "_A‘Sˆõ‚É•ÔM"
 
-#: lib/MIME/Viewer/itip.php:486 lib/MIME/Viewer/itip.php:495
-#: lib/MIME/Viewer/itip.php:505
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "ƒTƒ|[ƒgŠO‚ÌƒƒbƒZ[ƒW‚Å•ÔM"
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "2ƒ–ŒŽ•ª‚Ì—\’èî•ñ•t‚«‚Å•ÔM"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "—v‹‚³‚ê‚½—\’èî•ñ‚Å•ÔM"
 
-#: message.php:260
+#: message.php:274
 msgid "Reply-To"
-msgstr ""
+msgstr "Reply-To"
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "  •ÔMF"
 
-#: compose.php:557
+#: compose.php:769
 msgid "Reply:"
 msgstr "•ÔM:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
-msgstr ""
+msgstr "–³ŠQ‚Æ•ñ"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "SPAM‚Æ‚µ‚ÄƒŒƒ|[ƒg"
+msgstr "SPAM‚Æ•ñ"
 
-#: templates/compose/compose.inc:378
+#: templates/compose/compose.inc:384
 msgid "Request a _Read Receipt"
 msgstr "_RŠJ••Šm”F‚ð—v‹"
 
-#: config/prefs.php.dist:586
-msgid "Request delivery confirmation?"
-msgstr "”z’BŠm”F‚ð—v‹‚µ‚Ü‚·‚©H"
-
-#: config/prefs.php.dist:565
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "ŠJ••Šm”F‚ð—v‹‚µ‚Ü‚·‚©H"
 
-#: mailbox.php:204
+#: mailbox.php:188
 msgid "Requested message not found."
-msgstr ""
+msgstr "—v‹‚³‚ê‚½ƒ[ƒ‹‚ÍŒ©•t‚©‚è‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:683
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "•K{ŽQ‰ÁŽÒ"
 
-#: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:140 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "ƒŠƒZƒbƒg"
 
-#: lib/MIME/Viewer/itip.php:107
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "‰ñ“šŽÒ‚Ìó‹µ‚ðXV‚µ‚Ü‚µ‚½B"
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "ÄŠJ"
 
-#: recompose.php:89
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "ƒZƒbƒVƒ‡ƒ“‚ðÄŠJ"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "ƒ[ƒ‹ì¬‚É–ß‚é"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
-#: templates/fetchmail/account_select.inc:32
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
 msgstr "ƒ[ƒ‹‚ÌŽæ‚èž‚Ý‚É–ß‚é"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:98 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "ƒIƒvƒVƒ‡ƒ“‚É–ß‚é"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "ƒIƒvƒVƒ‡ƒ“‚É–ß‚é"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "ƒIƒvƒVƒ‡ƒ“‚É–ß‚é"
-
-#: config/prefs.php.dist:713
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "ƒƒbƒZ[ƒW‚ðíœAˆÚ“®AƒRƒs[‚µ‚½ŒãAƒ[ƒ‹ƒ{ƒbƒNƒXƒŠƒXƒg‚É–ß‚è‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "–ðŠ„"
 
-#: lib/MIME/Viewer/pkcs7.php:130 lib/MIME/Viewer/pkcs7.php:206
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:425
 msgid "S/MIME"
-msgstr ""
+msgstr "S/MIME"
 
 #: templates/compose/encrypt_list.inc:12
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME ˆÃ†‰»"
 
-#: compose.php:387
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME ƒGƒ‰[: "
 
-#: compose.php:760
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME ƒGƒ‰[: ”é–§Œ®‚ÌƒpƒXƒtƒŒ[ƒY‚ª•K—v‚Å‚·B"
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME ‚ÍŽg—p‰Â”\‚Å‚Í‚ ‚è‚Ü‚¹‚ñ"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
-msgstr "S/MIME ‚ÌƒIƒvƒVƒ‡ƒ“"
+msgstr "S/MIME ƒIƒvƒVƒ‡ƒ“"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "S/MIME ‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í"
 
-#: templates/smime/smime.inc:41
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
-msgstr "S/MIME ŒÂlŒ®‚ÌƒTƒ|[ƒg‚É‚ÍˆÀ‘S‚È web Ú‘±‚ª•K—v‚Å‚·B"
+msgstr "S/MIME ŒÂlŒ®‚ÌŽg—p‚É‚ÍˆÀ‘S‚È web Ú‘±iSSL Ú‘±j‚ª•K—v‚Å‚·B"
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
-msgstr ""
+msgstr "\"%s\" ‚Ì S/MIME ŒöŠJŒ®‚Ííœ‚³‚ê‚Ü‚µ‚½B"
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
-msgstr ""
+msgstr "S/MIME ŒöŠJŒ®‚Í’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "S/MIME ŒöŠJŒ®ƒŠƒ“ƒO"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "S/MIME ‚ÌŒöŠJŒ®^”é–§Œ®‚ÌƒyƒA‚Í’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
@@ -3028,112 +3263,129 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME –¼^ˆÃ†‰»"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "‚±‚ÌƒVƒXƒeƒ€‚Å‚Í S/MIME ‚ÍƒTƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 "S/MIME ƒTƒ|[ƒg‚ÍŒ»Ý–³Œø‚É‚È‚Á‚Ä‚¢‚é‚½‚ßAƒƒbƒZ[ƒW‚Ì•œ†ˆ—‚ª‚Å‚«‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 "S/MIME ƒTƒ|[ƒg‚ª–³Œø‚É‚È‚Á‚Ä‚¢‚é‚½‚ßA–¼‚³‚ê‚½ƒƒbƒZ[ƒW‚ð•\Ž¦‚Å‚«‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr "S/MIME ƒTƒ|[ƒg‚ª–³Œø‚É‚È‚Á‚Ä‚¢‚é‚½‚ßA“dŽq–¼‚ÌŒŸØ‚Í‚Å‚«‚Ü‚¹‚ñB"
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME ‚ÌƒTƒ|[ƒg‚É‚Íƒ|ƒbƒvƒAƒbƒvEƒEƒCƒ“ƒh[‚ª•K—v‚Å‚·B‚¨Žg‚¢‚Ìƒuƒ‰ƒEƒU‚ª"
 "ƒ|ƒbƒvƒAƒbƒv‚ð‹ÖŽ~‚É‚µ‚Ä‚ ‚é‚È‚çAS/MIME ‹@”\‚Í³‚µ‚“®ì‚µ‚Ü‚¹‚ñB"
 
-#: templates/compose/compose.inc:270
-msgid "S_ubject"
+#: templates/login/login.inc:204
+msgid "SMTP"
 msgstr ""
 
-#: templates/compose/compose.inc:358
+#: templates/compose/compose.inc:253
+msgid "S_ubject"
+msgstr "_UŒ–¼"
+
+#: templates/compose/compose.inc:361
 msgid "Sa_ve a copy in "
 msgstr "_VŽŸ‚ÌêŠ‚ÉƒRƒs[‚ð•Û‘¶ "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "_V•Û‘¶"
 
-#: search.php:353 templates/fetchmail/manage.inc:67
+#: search.php:304 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "•Û‘¶"
 
-#: templates/compose/compose.inc:532
+#: templates/compose/compose.inc:534
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "“Y•t‚àƒƒbƒZ[ƒW‚Æ‹¤‚É‘—MT‚¦ƒtƒHƒ‹ƒ_‚É•Û‘¶‚µ‚Ü‚·‚©H"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save Draft"
 msgstr "‰º‘‚«‚ð•Û‘¶"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:25
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "‰æ‘œ‚ð•Û‘¶"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "‰æ‘œ‚ðƒMƒƒƒ‰ƒŠ[‚É•Û‘¶"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "ƒIƒvƒVƒ‡ƒ“‚ð•Û‘¶"
 
-#: templates/compose/compose.inc:72 templates/compose/compose.inc:428
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "’èŒ^‹å‚ð•Û‘¶"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save _Draft"
 msgstr "_D‰º‘‚«‚ð•Û‘¶"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "–¼‘O‚ð•t‚¯‚Ä•Û‘¶"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "‰º‘‚«‚ð–¢“Ç‚Æ‚µ‚Ä•Û‘¶‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:1054
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr "ŽóMŽÒ‚ðŽ©“®“I‚ÉƒfƒtƒHƒ‹ƒg‚ÌƒAƒhƒŒƒX’ ‚É’Ç‰Á‚µ‚Ü‚·‚©H"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:123
 msgid "Save search as a virtual folder?"
 msgstr "ŒŸõŒ‹‰Ê‚ð‰¼‘zƒtƒHƒ‹ƒ_‚É•Û‘¶‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "‘—Mƒ[ƒ‹‚ÌT‚¦‚ð•Û‘¶‚µ‚Ü‚·‚©H"
 
-#: compose.php:1051
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "‰º‘‚«‚ð•Û‘¶‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF%s"
 
-#: templates/contacts/contacts.inc:196
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "ŒŸõ"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "ŒŸõ %s"
 
-#: lib/Block/tree_folders.php:170
-msgid "Search Mail"
-msgstr "ƒ[ƒ‹ŒŸõ"
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "ŒŸõƒIƒvƒVƒ‡ƒ“"
 
-#: search.php:306
+#: search.php:258
 msgid "Search Results"
 msgstr "ŒŸõŒ‹‰Ê"
 
@@ -3150,7 +3402,7 @@
 msgid "Select Another Account"
 msgstr "ƒAƒJƒEƒ“ƒg‚ð‘I‘ð"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "“ú•t‚ð‘I‘ð"
 
@@ -3158,7 +3410,11 @@
 msgid "Select a field"
 msgstr "ƒtƒB[ƒ‹ƒh‚ð‘I‘ð"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr "’èŒ^‹å‚ð‘I‘ð"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "ƒAƒhƒŒƒX‚Ì’Ç‰Á‚âŒŸõ‚ðs‚¤ƒAƒhƒŒƒX’ ‚Ìƒ\[ƒX‚ð‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
@@ -3168,7 +3424,7 @@
 
 #: templates/prefs/sourceselect.inc:323
 msgid "Select all fields to search when expanding addresses."
-msgstr ""
+msgstr "ƒAƒhƒŒƒX‚ðŠg’£‚·‚éÛ‚ÉŒŸõ‚·‚é—–‚ð‘S‚Ä‘I‘ð‚µ‚Ä‰º‚³‚¢B"
 
 #: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
@@ -3178,6 +3434,10 @@
 msgid "Select none"
 msgstr "‚Ç‚ê‚à‘I‘ð‚µ‚È‚¢"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "‰æ‘œ‚ð•Û‘¶‚·‚éƒMƒƒƒ‰ƒŠ[‚ð‘I‘ð‚µ‚Ä‰º‚³‚¢B"
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "ƒ[ƒ‹ƒT[ƒo‚ÌŽí—Þ‚ð‘I‘ð"
@@ -3186,33 +3446,37 @@
 msgid "Selected Address books:"
 msgstr "‘I‚Î‚ê‚Ä‚¢‚éƒAƒhƒŒƒX’ F"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
-msgstr ""
+msgstr "Œ®‚ðŒöŠJŒ®ƒT[ƒo‚É‘—‚é"
 
-#: lib/MIME/Viewer/itip.php:561
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "ÅV‚Ìî•ñ‚ð‘—‚é"
 
-#: config/prefs.php.dist:574
-msgid "Send MDN when requested by the sender?"
-msgstr "‘—MŽÒ‚É—v‹‚³‚ê‚½‚çMDN‚ð‘—M‚µ‚Ü‚·‚©H"
-
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "Send Message"
 msgstr "ƒ[ƒ‹‚Ì‘—M"
 
-#: folders.php:359
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Œ–¼‚È‚µ‚Å‘—M‚µ‚Ü‚·‚©H"
+
+#: config/prefs.php.dist:692
+msgid "Send read receipt when requested by the sender?"
+msgstr "‘—MŽÒ‚É—v‹‚³‚ê‚½‚çŠJ••Šm”F‚ð‘—M‚µ‚Ü‚·‚©H"
+
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "‘—MT‚¦ƒtƒHƒ‹ƒ_"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "‘—MT‚¦ƒtƒHƒ‹ƒ_F"
 
 # msgstr "‘—Mƒ{ƒbƒNƒXƒtƒHƒ‹ƒ_F"
-#: templates/login/login.inc:134 templates/login/login.inc:148
-#: templates/login/login.inc:155
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "ƒT[ƒo"
 
@@ -3228,7 +3492,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "ƒ[ƒ‹‚ðˆÚ“®Aíœ‚µ‚½ê‡‚Ìˆ’u‚ÉŠÖ‚·‚éÝ’è‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "V‹Kì¬Žžƒwƒbƒ_‚ÉX-Priority‚ð•t‚¯‚Ü‚·‚©H"
 
@@ -3238,27 +3502,27 @@
 
 #: templates/acl/acl.inc:86
 msgid "Share mail folders"
-msgstr "‹¤—LƒƒCƒ‹ƒtƒHƒ‹ƒ_"
+msgstr "‹¤—Lƒ[ƒ‹ƒtƒHƒ‹ƒ_"
 
 #: config/prefs.php.dist:32
 msgid "Share your mail folders with other users."
-msgstr "‚ ‚È‚½‚ÌƒƒCƒ‹ƒtƒHƒ‹ƒ_‚ð‘¼‚Ìƒ†[ƒU‚Æ‹¤—L‚µ‚Ü‚·B"
+msgstr "‚ ‚È‚½‚Ìƒ[ƒ‹ƒtƒHƒ‹ƒ_‚ð‘¼‚Ìƒ†[ƒU‚Æ‹¤—L‚µ‚Ü‚·B"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr "’·‚¢ˆø—p‚ð•\Ž¦‚µ‚Ü‚·‚©H‰B‚µ‚Ü‚·‚©H ‰½Žž‚Å‚àŠÈ’P‚É•ÏX‚Å‚«‚Ü‚·B"
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "ƒ[ƒ‹‚Ì–{•¶‚ð PGP ‚ÅŒŸØ‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "‰º‘‚«‚Ì•Û‘¶ŒãAƒ[ƒ‹ì¬ƒEƒBƒ“ƒhƒE‚ð•Â‚¶‚Ü‚·‚©H"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "ƒfƒtƒHƒ‹ƒg‚Å PGP ŒöŠJŒ®‚ðƒ[ƒ‹‚É“Y•t‚µ‚Ü‚·‚©H"
 
@@ -3270,7 +3534,7 @@
 msgid "Show All Headers"
 msgstr "ƒwƒbƒ_‚ð‘S‚Ä•\Ž¦"
 
-#: mailbox.php:361
+#: mailbox.php:350
 msgid "Show Deleted"
 msgstr "íœÏ‚Ý‚ð•\Ž¦"
 
@@ -3284,57 +3548,53 @@
 
 #: templates/search/main.inc:92
 msgid "Show Only Subscribed Folders"
-msgstr ""
+msgstr "w“ÇÏ‚Ý‚ÌƒtƒHƒ‹ƒ_[‚¾‚¯‚ð•\Ž¦"
 
-#: folders.php:250
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "”ñw“Ç‚È‚à‚Ì‚ð•\Ž¦"
 
 # msgstr "”ñw“ÇŽÒ‚ð•\Ž¦"
-#: config/prefs.php.dist:611
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
-msgstr "“Y•t‚ðíœ‚·‚é‚½‚ß‚ÌƒAƒCƒRƒ“‚ð•\Ž¦‚µ‚Ü‚·‚©H"
+msgstr "ƒ[ƒ‹‚©‚ç“Y•t‚ðíœ‚·‚é‚½‚ß‚ÌƒAƒCƒRƒ“‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:998
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "ƒ[ƒ‹ˆê——•\Ž¦‚Ì‰º‚Éà–¾i–¢“ÇA•ÔMÏ ...j‚ð•t‰Á‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:808
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
-msgstr ""
+msgstr "–¢“Çƒ[ƒ‹‚¾‚¯ƒvƒŒƒrƒ…[‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:816
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
-msgstr ""
+msgstr "ƒvƒŒƒrƒ…[‚ðƒc[ƒ‹ƒ`ƒbƒvƒX‚É•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:847
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
-msgstr "ƒƒjƒ…[ƒo[‚ÉƒƒCƒ‹Žæ‚èž‚Ý‚ÌƒAƒCƒRƒ“‚ð•\Ž¦‚µ‚Ü‚·‚©H"
+msgstr "ƒƒjƒ…[ƒo[‚Éƒ[ƒ‹Žæ‚èž‚Ý‚ÌƒAƒCƒRƒ“‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/html.php:104
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "‰æ‘œ‚ð•\Ž¦"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
-msgstr ""
+msgstr "ƒtƒBƒ‹ƒ^[‚ÌƒAƒCƒRƒ“‚ðƒƒjƒ…[‚É•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
-msgstr ""
+msgstr "ƒtƒHƒ‹ƒ_[“à‚Ìƒ[ƒ‹‚Ì‡Œv”‚ð•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:668
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "•\Ž¦"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "_ZƒTƒCƒY"
 
-#: templates/login/login.inc:237
-msgid "Sign up if not registered"
-msgstr ""
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "–¼•t"
@@ -3343,111 +3603,129 @@
 msgid "Size"
 msgstr "ƒTƒCƒY"
 
-#: templates/mailbox/message_headers.inc:3
-msgid "Sort Direction"
-msgstr "ƒ\[ƒg•ûŒü"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
-msgstr "“ž’…ŽžŠÔ‡"
+msgstr "ŽóMŽžŠÔ‡"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
 msgstr "“ú•t‡"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "‘—MŒ³ƒAƒhƒŒƒX‡"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "ƒTƒCƒY‡"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "ƒTƒuƒWƒFƒNƒg‡"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "ƒXƒŒƒbƒh‡"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "ƒAƒhƒŒƒX‡"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
-msgstr "SPAMƒƒCƒ‹—pƒtƒHƒ‹ƒ_"
+msgstr "SPAMƒ[ƒ‹—pƒtƒHƒ‹ƒ_"
 
-#: templates/compose/compose.inc:341
+#: templates/compose/compose.inc:344
 msgid "Special Characters"
 msgstr "“ÁŽê•¶Žš"
 
-#: templates/compose/compose.inc:338
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr "“ÁŽê‚È‰¼‘zƒtƒHƒ‹ƒ_[‚Í•ÒW‚Å‚«‚Ü‚¹‚ñB"
+
+#: templates/compose/compose.inc:341
 msgid "Spell Check"
 msgstr "ƒXƒyƒ‹ƒ`ƒFƒbƒN"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "ƒXƒyƒ‹ƒ`ƒFƒbƒJ["
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "ƒXƒyƒ‹ƒ`ƒFƒbƒNŠ®—¹"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "ƒXƒyƒ‹ƒ`ƒFƒbƒNŽž‚É•\Ž¦‚·‚éƒGƒ‰[”"
 
-#: lib/MIME/Viewer/itip.php:470 lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "ŠJŽn"
 
-#: lib/MIME/Viewer/itip.php:674
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr "’èŒ^‹å"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "’èŒ^‹å–¼F"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "’èŒ^‹å‚ÌŽí—ÞF"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "’èŒ^‹åF"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "ó‘Ô"
 
-#: lib/MIME/Contents.php:225
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "“Y•t‚ðœ‹Ž"
 
-#: config/prefs.php.dist:800
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "‰üs‚ðœ‹Ž‚µ‚Ü‚·‚©H"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "_JŒ–¼"
 
-#: message.php:261 search.php:157 templates/compose/recompose.inc:25
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Œ–¼"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Œ–¼—“"
 
 # msgstr "Œ–¼ƒtƒB[ƒ‹ƒh"
-#: search.php:355 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:306 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "ŽÀs"
 
 # msgstr "’ño"
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "ƒtƒHƒ‹ƒ_‚ðw“Ç"
 
-#: lib/MIME/Viewer/pkcs7.php:188 lib/MIME/Viewer/pgp.php:394
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "¬Œ÷"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "’ñˆÄ"
 
-#: lib/MIME/Viewer/itip.php:650 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "ŠT—v"
 
@@ -3467,28 +3745,44 @@
 msgid "Te_xt"
 msgstr "_X–{•¶"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:270
+msgid "Tentative: "
+msgstr "‰¼Žó‘øF"
+
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "—v‹‚ð‰¼Žó‘ø‚·‚é"
 
-#: lib/MIME/Viewer/itip.php:748
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "‰¼Žó‘ø"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
+msgstr "ƒT[ƒrƒXðŒ‚ð‹L“ü‚µ‚½ƒtƒ@ƒCƒ‹‚ª conf.php ‚ÅŽw’è‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ"
+
+#: templates/stationery/prefs.inc:30
+msgid "Text"
 msgstr ""
 
-#: config/prefs.php.dist:924
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "ƒƒbƒZ[ƒW‚Ì From: —“‚ÆƒŠƒ“ƒN‚·‚é‚Ì‚Í:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"IMAP ƒT[ƒo‚Í‘I‘ð‚³‚ê‚½”FØ•û–@‚ðƒTƒ|[ƒg‚µ‚Ä‚¢‚È‚¢‚æ‚¤‚Å‚·BŠÇ—ŽÒ‚É˜A—‚µ‚Ä"
+"‰º‚³‚¢B"
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintosh ƒŠƒ\[ƒXƒtƒH[ƒN"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr "Macintosh ƒŠƒ\[ƒXƒtƒH[ƒN‚Í %s ‚©‚çƒ_ƒEƒ“ƒ[ƒh‚Å‚«‚Ü‚·B"
@@ -3496,65 +3790,56 @@
 #: fetchmailprefs.php:81
 #, php-format
 msgid "The account \"%s\" has been deleted."
-msgstr ""
+msgstr "ƒAƒJƒEƒ“ƒg '%s' ‚Ííœ‚³‚ê‚Ü‚µ‚½B"
 
 #: fetchmailprefs.php:74
 #, php-format
 msgid "The account \"%s\" has been saved."
-msgstr ""
-
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr ""
+msgstr "ƒAƒJƒEƒ“ƒg '%s' ‚Í•Û‘¶‚³‚ê‚Ü‚µ‚½B"
 
 #: attachment.php:43
 msgid "The attachment was not found."
-msgstr ""
+msgstr "“Y•t‚ª‚ ‚è‚Ü‚¹‚ñB"
 
-#: templates/javascript/open_compose_win.js:34
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"ƒ[ƒ‹ì¬ƒEƒCƒ“ƒh[‚ªŠJ‚¯‚Ü‚¹‚ñBƒuƒ‰ƒEƒU‚Åƒ|ƒbƒvƒAƒbƒvƒEƒCƒ“ƒh[‚ðƒuƒƒbƒN"
-"‚µ‚Ä‚¢‚Ü‚¹‚ñ‚©H"
+#: lib/MIME/Viewer/itip.php:71
+msgid "The calendar data is invalid"
+msgstr "—\’è•\‚Ìƒf[ƒ^‚ª•s³‚Å‚·"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Macintosh ƒtƒ@ƒCƒ‹‚Ì“à—e‚ÍˆÈ‰º‚Ì’Ê‚è‚Å‚·B"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Œ»Ý‚ÌƒtƒHƒ‹ƒ_ \"%s\" ‚Í \"%s\" ‚Æ‚¢‚¤–¼‘O‚É•ÏX‚³‚ê‚Ü‚·B"
 
-# msgstr "Œ»Ý‚ÌƒtƒHƒ‹ƒ_ \"%s\" ‚ð \"%s\" ‚Æ‚¢‚¤–¼‘O‚É•ÏX‚·‚é"
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
+"Œ»Ý‚±‚ÌƒtƒHƒ‹ƒ_[‚ÉƒAƒNƒZƒX‚µ‚Ä‚¢‚éƒ†[ƒU‚Ìˆê——‚ÍŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: compose.php:1060
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
-msgstr ""
+msgstr "‰º‘‚«‚Í \"%s\" ƒtƒHƒ‹ƒ_[‚É•Û‘¶‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "ƒCƒxƒ“ƒg‚Í—\’è•\‚É’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
-msgstr ""
+msgid "The field \"%s\" can't be expanded."
+msgstr "€–Ú '%s' ‚ðŠg’£‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: lib/Folder.php:426
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "\"%s\" ‚Æ‚¢‚¤–¼‘O‚ÌƒtƒHƒ‹ƒ_‚ÍŠù‚É‘¶Ý‚µ‚Ä‚¢‚Ü‚·B"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:150
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3563,107 +3848,115 @@
 "\"%s\" ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚É‚ÍAŽg‚¦‚È‚¢•¶Žš‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B–â‘è‚Ì¶‚¶‚é‰Â”\«‚ª"
 "‚ ‚è‚Ü‚·‚Ì‚ÅAƒVƒXƒeƒ€ŠÇ—ŽÒ‚É‚²Šm”F‚‚¾‚³‚¢B"
 
-#: lib/Folder.php:445
+#: lib/Folder.php:312
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "\"%s\" ƒtƒHƒ‹ƒ_‚ªì¬‚³‚ê‚Ü‚µ‚½‚ªA‚±‚ÌƒtƒHƒ‹ƒ_‚ðw“Ç‚µ‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/Folder.php:380
+#: lib/Folder.php:229
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr ""
 "\"%s\" ƒtƒHƒ‹ƒ_‚ªíœ‚³‚ê‚Ü‚µ‚½‚ªA‚±‚ÌƒtƒHƒ‹ƒ_‚Ìw“Ç‚ð’†Ž~‚µ‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/Folder.php:432
+#: lib/Folder.php:299
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "\"%s\" ƒtƒHƒ‹ƒ_‚ðì¬‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“š:"
 
-#: lib/Folder.php:373
+#: lib/Folder.php:222
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "ƒtƒHƒ‹ƒ_ \"%s\" ‚Ííœ‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“š:"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:315
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "\"%s\" ƒtƒHƒ‹ƒ_‚ªì¬‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Folder.php:383
+#: lib/Folder.php:232
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "\"%s\" ƒtƒHƒ‹ƒ_‚ªíœ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/Folder.php:540
+#: lib/Folder.php:421
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "\"%s\" ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ª \"%s\" ‚É•ÏX‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "ˆÈ‰º‚Í‚±‚Ìƒp[ƒg‚Ì“Y•tƒtƒ@ƒCƒ‹‚Å‚·F"
 
-#: lib/MIME/Viewer/html.php:93
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"‰æ‘œ‚Ì•Û‘¶ƒEƒCƒ“ƒh[‚ªŠJ‚¯‚Ü‚¹‚ñBƒuƒ‰ƒEƒU‚Åƒ|ƒbƒvƒAƒbƒvƒEƒCƒ“ƒh[‚ðƒuƒƒbƒN"
+"‚µ‚Ä‚¢‚Ü‚¹‚ñ‚©H"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr "‘—MŽÒ‚ª‚ ‚È‚½‚ÌƒAƒhƒŒƒX’ ‚É“o˜^‚³‚ê‚Ä‚¢‚é‚Ì‚Å‰æ‘œ‚ð•\Ž¦‚µ‚Ü‚·B"
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr "ƒ[ƒ‹ƒT[ƒo‚ÍˆÈ‰º‚ÌƒGƒ‰[ƒƒbƒZ[ƒW‚ð¶¬‚µ‚Ü‚µ‚½F"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr "ƒ[ƒ‹ƒT[ƒo‚©‚ç‚Ìî•ñƒƒbƒZ[ƒWF"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr "ƒ[ƒ‹ƒT[ƒo‚©‚ç‚ÌƒƒbƒZ[ƒWF"
 
-#: lib/Message.php:645
+#: lib/Message.php:687
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX %s ‚ÍŠù‚É‹ó‚Å‚·B"
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
+"\"%2$s\" ‚©‚ç‚ÌƒƒbƒZ[ƒW \"%1$s\"i%3$d ƒoƒCƒgj‚ÍŽæ‚èž‚ÝƒTƒCƒY‚ÌãŒÀ‚ð’´‚¦"
+"‚Ä‚¢‚Ü‚·B"
 
 #: templates/contacts/contacts.inc:103
 msgid "The message being composed has been closed. Exiting."
 msgstr "ì¬’†‚ÌƒƒbƒZ[ƒW‚Í•Â‚¶‚ç‚ê‚Ü‚µ‚½BI—¹‚µ‚Ü‚·B"
 
-#: message.php:143
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "ƒƒbƒZ[ƒW‚ÌŒ–¼‚ª“ü—Í‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "ƒƒbƒZ[ƒW‚Ííœ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "ƒƒbƒZ[ƒW‚ÍŒŸØ‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/pkcs7.php:374
+#: lib/MIME/Viewer/pkcs7.php:390
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "ƒƒbƒZ[ƒW‚ÍŒŸØ‚³‚ê‚Ü‚µ‚½B‘—MŽÒF%s"
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "PGP ŒöŠJŒ®‚ÌŒ´•¶‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "—v‹‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í MS-TNEF ‚Ì“Y•t‚É‚ ‚è‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "—v‹‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í Zip ‚Ì“Y•t’†‚É‚ ‚è‚Ü‚¹‚ñB"
 
@@ -3677,54 +3970,73 @@
 "‚±‚Ìƒ[ƒ‹‚Ì‘—MŽÒ‚ÍŠJ••Šm”F‚ð—v‹‚µ‚Ä‚¢‚Ü‚·B%s ‚ðƒNƒŠƒbƒN‚µ‚Ä’Ê’m‚ð‘—M‚µ‚Ä"
 "‰º‚³‚¢B"
 
-#: templates/compose/compose.js:104
+#: lib/MIME/Viewer/images.php:67
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "ƒT[ƒo‚Í‚±‚Ì‰æ‘œ‚ÌƒTƒ€ƒlƒCƒ‹‚ðì¬‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
+
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "–¼‚ð’uŠ·‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B"
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "–¼‚Í’uŠ·‚³‚ê‚Ü‚µ‚½B"
 
 #: attachment.php:59
 msgid "The specified file does not exist."
-msgstr ""
+msgstr "Žw’è‚³‚ê‚½ƒtƒ@ƒCƒ‹‚Í‘¶Ý‚µ‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/itip.php:160
+#: stationery.php:85
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "’èŒ^‹å \"%s\" ‚Í’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "’èŒ^‹å \"%s\" ‚Ííœ‚³‚ê‚Ü‚µ‚½B"
+
+#: stationery.php:88
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "’èŒ^‹å \"%s\" ‚ÍXV‚³‚ê‚Ü‚µ‚½B"
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "ƒ^ƒXƒN‚Í‚ ‚È‚½‚Ìƒ^ƒXƒN•\‚É’Ç‰Á‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "ƒ[ƒ‹‚Ì“à—e"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
 msgstr "ƒ[ƒ‹‚Ì“à—e‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "•Ô‚³‚ê‚½ƒ[ƒ‹‚Ì“à—e"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
 msgstr "•Ô‚³‚ê‚½ƒ[ƒ‹‚Ì“à—e‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "‘—M‚µ‚½ƒ[ƒ‹‚Ì“à—e"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "‘—M‚µ‚½ƒ[ƒ‹‚Ì“à—e‚Í %s ‚Å•\Ž¦‚Å‚«‚Ü‚·B"
 
-#: lib/MIME/Viewer/itip.php:145
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "—\’èî•ñ‚Í•Û‘¶‚³‚ê‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr "ƒCƒ“ƒ‰ƒCƒ“•\Ž¦‰Â”\‚È‘ã‘Öƒp[ƒg‚Í‚ ‚è‚Ü‚¹‚ñB"
 
@@ -3732,28 +4044,23 @@
 msgid "There are no messages in this mailbox."
 msgstr "‚±‚Ìƒ[ƒ‹ƒ{ƒbƒNƒX‚É‚Íƒ[ƒ‹‚Í‚ ‚è‚Ü‚¹‚ñB"
 
-#: lib/Message.php:604
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "%s ‚Ìíœ’†‚É–â‘è‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF"
+#: thread.php:110
+msgid "There is no text that can be displayed inline."
+msgstr "ƒCƒ“ƒ‰ƒCƒ“•\Ž¦—p•¶Žš—ñ‚Í‚ ‚è‚Ü‚¹‚ñB"
 
-#: lib/Message.php:647
+#: lib/Message.php:689
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX‚Ìíœ’†‚É–â‘è‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF %s"
 
-#: lib/Message.php:613
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX‚Ìíœ’†‚É–â‘è‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF"
-
-#: lib/Message.php:107
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "\"%s\" ‚ð \"%s\" ‚ÉƒRƒs[’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF "
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3762,7 +4069,7 @@
 "\"%s\" ƒtƒHƒ‹ƒ_‚©‚çƒƒbƒZ[ƒW‚ðíœ’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž"
 "“šF"
 
-#: lib/Message.php:296
+#: lib/Message.php:318
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3771,175 +4078,174 @@
 "\"%s\" ƒtƒHƒ‹ƒ_“à‚ÌƒƒbƒZ[ƒW‚ðíœ’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž"
 "“šF"
 
-#: lib/Message.php:230
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "ƒƒbƒZ[ƒWíœƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF %s"
 
-#: lib/MIME/Viewer/itip.php:91
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "ƒCƒxƒ“ƒgíœ’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½F%s"
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "ƒƒbƒZ[ƒWƒp[ƒg‚Ì•\Ž¦‚ÅƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:591
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "ƒtƒHƒ‹ƒ_ %s ‚ÅƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF "
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "%s ‚ðƒCƒ“ƒ|[ƒg’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:127
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "ƒCƒxƒ“ƒg‚ðƒCƒ“ƒ|[ƒg’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½F%s"
 
-#: lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "ƒ^ƒXƒN‚ðƒCƒ“ƒ|[ƒg’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½F%s"
 
-#: lib/MIME/Viewer/itip.php:143
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "—\’èî•ñ‚ðƒCƒ“ƒ|[ƒg’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½F%s"
 
-#: lib/Message.php:102
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "\"%s\" ‚ð \"%s\" ‚ÉˆÚ“®’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF "
 
-#: compose.php:1068
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "‰º‘‚«‚Ì•Û‘¶’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½B"
 
-#: compose.php:982
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "ƒ[ƒ‹‚Ì‘—M’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½: %s"
 
-#: lib/MIME/Viewer/itip.php:105
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "ƒCƒxƒ“ƒg‚ÌXV’†‚ÉƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½F%s"
 
-#: lib/MIME/Viewer/plain.php:62
-msgid "There was no text in this message part"
-msgstr "–{•¶‚ª‹ó‚Å‚·"
-
-#: lib/MIME/Viewer/html.php:91
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "‚±‚Ì HTML ƒ[ƒ‹‚É‚Í‰æ‘œ‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/html.php:87
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr "‚±‚Ì HTML ƒ[ƒ‹‚É‚Í‰æ‘œ‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·BƒuƒƒbƒN‚µ‚½‰æ‘œ‚Í‚±‚ê‚Å‚·F"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
-msgstr ""
+msgstr "PGP ŒöŠJŒ®‚ÍƒƒbƒZ[ƒW‚É“Y•t‚³‚ê‚Ä‚¢‚Ü‚µ‚½B"
 
-#: lib/MIME/Viewer/itip.php:96 lib/MIME/Viewer/itip.php:110
-#: lib/MIME/Viewer/itip.php:134 lib/MIME/Viewer/itip.php:148
-#: lib/MIME/Viewer/itip.php:164 lib/MIME/Viewer/itip.php:283
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "‚±‚Ìˆ’u‚ÍƒTƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/itip.php:170 lib/MIME/Viewer/itip.php:383
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "‚±‚Ìˆ’u‚Í‚Ü‚¾ŽÀ‘•‚³‚ê‚Ä‚¢‚Ü‚¹‚ñB"
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "‚±‚Ì‘€ì‚É‚ÍŽžŠÔ‚ª‚©‚©‚è‚Ü‚·B‘€ì‚ð‘±‚¯‚Ü‚·‚©H"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
-msgstr ""
+msgstr "‚±‚Ìƒ[ƒ‹‚É‚Í Macintosh ‚Ìƒtƒ@ƒCƒ‹‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:416
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
-msgstr "‚±‚Ìƒ[ƒ‹‚É‚Í S/MIME ‚Ì“dŽq–¼‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
+msgstr "‚±‚ÌƒƒbƒZ[ƒW‚É‚Í S/MIME ‚Ì“dŽq–¼‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:420
 msgid "This message contains an attachment that has been encrypted via S/MIME."
-msgstr "‚±‚Ìƒ[ƒ‹‚É‚Í S/MIME ‚ÌˆÃ†•¶‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
+msgstr "‚±‚ÌƒƒbƒZ[ƒW‚É‚Í S/MIME ‚ÌˆÃ†•¶‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
-msgstr "‚±‚Ìƒ[ƒ‹‚É‚Í”z‘—î•ñ‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·‚ªAŒ`Ž®‚ª•s–¾‚Å‚·B"
+msgstr "‚±‚ÌƒƒbƒZ[ƒW‚É‚Í”z‘—î•ñ‚ªŠÜ‚Ü‚ê‚Ä‚¢‚Ü‚·‚ªAŒ`Ž®‚ª•s–¾‚Å‚·B"
 
 #: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
-msgstr "‚±‚Ìƒ[ƒ‹‚Í³‚µ‚¢ PGP ˆÃ†•¶‚Å‚Í‚ ‚è‚Ü‚¹‚ñBƒGƒ‰[F"
+msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í³‚µ‚¢ PGP ˆÃ†•¶‚Å‚Í‚ ‚è‚Ü‚¹‚ñBƒGƒ‰[F"
 
-#: lib/MIME/Viewer/pgp.php:244 lib/MIME/Viewer/pgp.php:355
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
-msgstr "‚±‚Ìƒ[ƒ‹‚Í³‚µ‚¢ PGP Œ`Ž®‚Å‚Í‚ ‚è‚Ü‚¹‚ñiRFC2015jB"
+msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í³‚µ‚¢ PGP Œ`Ž®‚Å‚Í‚ ‚è‚Ü‚¹‚ñiRFC2015jB"
 
-#: lib/MIME/Viewer/pkcs7.php:169
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
-msgstr "‚±‚Ìƒ[ƒ‹‚Í³‚µ‚¢ S/MIME Œ`Ž®‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
+msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í³‚µ‚¢ S/MIME Œ`Ž®‚Å‚Í‚ ‚è‚Ü‚¹‚ñB"
 
-#: lib/MIME/Viewer/pgp.php:209 lib/MIME/Viewer/pgp.php:421
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í PGP ‚Å–¼‚³‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í S/MIME ‚Å–¼‚³‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/pkcs7.php:234
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í S/MIME ‚ÅˆÃ†‰»‚³‚ê‚Ä‚¢‚Ü‚·B"
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "‚±‚ÌƒƒbƒZ[ƒW‚Í PGP ‚ÅˆÃ†‰»‚³‚ê‚Ä‚¢‚Ü‚·"
 
-#: message.php:204
+#: message.php:210
 msgid "This message to"
 msgstr "‚±‚Ìƒ[ƒ‹"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
-msgstr ""
+msgstr "‚±‚ÌƒT[ƒo‚Í‹¤—LƒtƒHƒ‹ƒ_‚ðƒTƒ|[ƒg‚µ‚Ä‚¢‚Ü‚¹‚ñB"
 
 #: templates/contacts/contacts.inc:109
 msgid "This window must be called from a compose window."
-msgstr ""
+msgstr "‚±‚ÌƒEƒCƒ“ƒh[‚Íƒ[ƒ‹ì¬‰æ–Ê‚©‚çŒÄ‚Î‚ê‚È‚¯‚ê‚Î‚È‚è‚Ü‚¹‚ñB"
+
+#: thread.php:157
+msgid "Thread Display"
+msgstr "ƒXƒŒƒbƒh•\Ž¦"
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:892
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "ƒXƒŒƒbƒh•\Ž¦"
 
-#: message.php:257 mailbox.php:567 search.php:145
-#: templates/contacts/contacts.inc:220
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:271 mailbox.php:601 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "To"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "ˆ¶æ"
 
@@ -3951,11 +4257,17 @@
 "•¡”‚Ì€–Ú‚ð‘I‘ð‚·‚é‚É‚ÍAPC‚Å‚ÍControlƒLƒCAMac‚È‚çCommandƒLƒC‚ð‰Ÿ‚µ‚È‚ª‚çƒN"
 "ƒŠƒbƒN‚µ‚Ü‚·B"
 
-#: templates/compose/compose.inc:571
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr "TLS Ú‘±‚ðŽg—p‚·‚é‚É‚ÍAPHP 5.1.0 ˆÈã‚Ìƒo[ƒWƒ‡ƒ“‚ª•K—v‚Å‚·B"
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "‡Œv‚Ì“Y•tƒTƒCƒY:"
 
-#: folders.php:350
+#: folders.php:369
 msgid "Trash folder"
 msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_"
 
@@ -3963,8 +4275,8 @@
 msgid "Trash folder:"
 msgstr "ƒSƒ~” ƒtƒHƒ‹ƒ_F"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "ƒNƒH[ƒ^‚ªŽæ“¾‚Å‚«‚Ü‚¹‚ñ"
 
@@ -3981,76 +4293,98 @@
 msgid "Undelete"
 msgstr "íœŽæ‚èÁ‚µ"
 
-#: mailbox.php:551 mailbox.php:563 lib/MIME/Headers.php:219
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
-msgstr "”ñŒöŠJ‚Ìˆ¶æ"
+msgstr "–¢ŒöŠJ‚Ìˆ¶æ"
 
-#: lib/MIME/Viewer/itip.php:409
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "AUTHENTICATE ƒRƒ}ƒ“ƒh‚ÅAƒT[ƒo‚©‚ç—\Šú‚µ‚È‚¢‰ž“š‚ª‚ ‚è‚Ü‚µ‚½B"
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Digest-MD5 ‰ž“š‚ÅAƒT[ƒo‚©‚ç—\Šú‚µ‚È‚¢‰ž“š‚ª‚ ‚è‚Ü‚µ‚½B"
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "LOGIN ƒRƒ}ƒ“ƒh‚ÅAƒT[ƒo‚©‚ç—\Šú‚µ‚È‚¢‰ž“š‚ª‚ ‚è‚Ü‚µ‚½B"
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "ˆµ‚¦‚È‚¢ƒf[ƒ^‚Å‚·F%s"
 
-#: mailbox.php:528
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "•s–¾‚È“ú•t"
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "ƒT[ƒo‚©‚ç•s–¾‚È‰ž“š‚ª‚ ‚è‚Ü‚µ‚½BƒT[ƒo‚©‚ç‚Ì‰ž“šF%s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "•s–¾‚È‰ï‹c"
 
-#: mailbox.php:579
+#: mailbox.php:613
 msgid "Unknown Recipient"
-msgstr ""
+msgstr "•s–¾‚ÈŽóMŽÒ"
 
-#: templates/smime/smime.inc:54 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
-msgstr ""
+msgstr "ƒpƒXƒtƒŒ[ƒY‚ð‰ðœ"
 
 #: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "–¼‘O‚È‚µ"
 
-#: message.php:492 mailbox.php:662 templates/message/navbar_navigate.inc:6
+#: message.php:502 mailbox.php:702 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "–¢“Ç"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "ƒtƒHƒ‹ƒ_‚Ìw“Ç’†Ž~"
 
-#: templates/compose/compose.inc:578
-msgid "Update Attachment Information"
-msgstr ""
+#: templates/compose/compose.inc:513
+msgid "Update"
+msgstr "XV"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "‰ñ“šŽÒ‚Ìó‹µ‚ðXV"
 
-#: templates/smime/import_key.inc:46 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "ƒAƒbƒvƒ[ƒh"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "ƒfƒtƒHƒ‹ƒg‚ðŽg—p"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "IMAP ƒtƒHƒ‹ƒ_‚ðw“Ç^”ñw“Ç‚Å‘I‘ð‚µ‚Ü‚·‚©H"
 
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "‰¼‘zƒtƒHƒ‹ƒ_‚ðŽg—p‚µ‚Ü‚·‚©H"
+
 # msgstr "IMAP ƒtƒHƒ‹ƒ_w“Ç‚ð—˜—p‚·‚é"
-#: templates/acl/acl.inc:140
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "ƒ†[ƒU"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
-msgstr ""
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "ƒ†[ƒU '%s' ‚ÉƒtƒHƒ‹ƒ_ '%s' ‚Ö‚ÌƒAƒNƒZƒXŒ ‚ªÝ’è‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/login/login.inc:205
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "ƒ†[ƒU–¼"
 
@@ -4058,90 +4392,127 @@
 msgid "Username:"
 msgstr "ƒ†[ƒU–¼F"
 
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "•\Ž¦"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "%s ‚ð•\Ž¦"
 
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "%s ‚ÌŒöŠJŒ®‚ð•\Ž¦"
 
-#: lib/MIME/Viewer/html.php:114
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "HTML‚Ì“à—e‚ð•Ê‚ÌƒEƒCƒ“ƒh[‚É•\Ž¦"
 
-#: templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "ƒ[ƒ‹•\Ž¦"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "ŒÂl‚Ì”é–§Œ®‚ð•\Ž¦"
 
-#: templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "ŒÂl‚ÌŒöŠJŒ®‚ð•\Ž¦"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "ƒXƒŒƒbƒh•\Ž¦"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "ƒTƒ€ƒlƒCƒ‹•\Ž¦"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "View attachment in a separate window"
 msgstr "“Y•t‚ð•ÊƒEƒCƒ“ƒh[‚Å•\Ž¦"
 
-#: lib/MIME/Viewer/itip.php:131
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "“à—e‚ð•ÊƒEƒCƒ“ƒh[‚Å•\Ž¦"
+
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "ƒCƒxƒ“ƒg‚ð•\Ž¦"
 
-#: folders.php:342 mailbox.php:497
+#: folders.php:361 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "%s ’†‚ÌƒƒbƒZ[ƒW‚ð•\Ž¦"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "ƒƒOƒCƒ“Œã‚Ì•\Ž¦F"
 
 # msgstr "ƒƒOƒCƒ“Œã‚É•\Ž¦‚·‚éƒ[ƒ‹ƒ{ƒbƒNƒX‚Ü‚½‚Í•\Ž¦‰æ–Ê"
-#: lib/MIME/Viewer/itip.php:161
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "ƒ^ƒXƒN•\Ž¦"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "‰æ‘œ‚ð•\Ž¦"
 
-#: search.php:304
+#: search.php:255
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "‰¼‘zƒtƒHƒ‹ƒ_ \"%s\" ‚ªì¬‚³‚ê‚Ü‚µ‚½B"
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:298 lib/IMAP/Tree.php:322
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "‰¼‘zƒtƒHƒ‹ƒ_"
 
-#: search.php:291
+#: search.php:247
 msgid "Virtual Folders require a label."
+msgstr "‰¼‘zƒtƒHƒ‹ƒ_‚É‚Íƒ‰ƒxƒ‹‚ª•K—v‚Å‚·B"
+
+#: lib/Search.php:420
+msgid "Virtual INBOX"
 msgstr ""
 
-#: templates/search/main.inc:133
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "‰¼‘zINBOXƒtƒHƒ‹ƒ_"
+
+#: lib/Mailbox.php:171 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "‰¼‘zƒSƒ~” "
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "‰¼‘zƒSƒ~” ƒtƒHƒ‹ƒ_["
+
+#: templates/search/main.inc:129
 msgid "Virtual folder label"
 msgstr "‰¼‘zƒtƒHƒ‹ƒ_‚Ìƒ‰ƒxƒ‹"
 
-#: login.php:141
+#: lib/MIME/Viewer/pkcs7.php:379
+msgid "Warning"
+msgstr "Œx"
+
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "%s ‚Ö‚æ‚¤‚±‚»"
 
-#: config/prefs.php.dist:723
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "SPAM ‚ ‚é‚¢‚Í–³ŠQ‚Æ•ñ‚µ‚½Œã‚ÅƒƒbƒZ[ƒW‚ð‚Ç‚¤‚µ‚Ü‚·‚©H"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4149,66 +4520,99 @@
 "ƒƒbƒZ[ƒW‚Ìíœ‚ÍAíœ‚Æ‚¢‚¤ˆó‚ð•t‚¯‚é‚Ì‚Å‚Í‚È‚AƒSƒ~” ƒtƒHƒ‹ƒ_‚ÉˆÚ“®‚µ‚Ü"
 "‚·‚©H"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒX‚ðŠJ‚¢‚½ŽžA‚Ç‚Ìƒy[ƒW‚©‚ç•\Ž¦‚µ‚Ü‚·‚©H"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "‘—MT‚¦‚ð•Û‘¶‚·‚éÛA“Y•t‚à•Û‘¶‚µ‚Ü‚·‚©H"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+"ƒ[ƒ‹‘—MŽž‚âƒAƒhƒŒƒX“WŠJŽž‚ÉƒhƒƒCƒ“‚ªÈ—ª‚³‚ê‚Ä‚¢‚½ê‡‚É•âŠ®‚·‚éƒhƒƒCƒ“"
+"–¼‚ÍH"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "ƒzƒƒCƒgƒŠƒXƒg"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "–{•¶‚ðÜ‚è•Ô‚·•¶Žš”"
-
-#: templates/compose/compose.inc:535 config/prefs.php.dist:973
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "‚Í‚¢"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
-msgstr ""
+msgstr "ˆÈ‰º‚ÌƒAƒJƒEƒ“ƒg‚©‚çƒ[ƒ‹‚ðŽæ“¾‚µ‚æ‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·F"
+
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_“à‚Ìƒ[ƒ‹‚ð‘S‚Äíœ‚µ‚æ‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·B"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_‚ðíœ‚µ‚æ‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·F"
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_‚ðíœ‚µ‚æ‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·B"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "V‚µ‚¢ƒtƒHƒ‹ƒ_‚ÉƒRƒs[^ˆÚ“®‚µ‚æ‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·B"
 
 # msgstr "ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ð•ÏX‚µ‚Ä‚¢‚Ü‚·F"
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_‚ÌƒTƒuƒtƒHƒ‹ƒ_‚ðì¬‚µ‚Ä‚¢‚Ü‚·F"
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "ÅãˆÊ‚ÌƒtƒHƒ‹ƒ_‚ðì¬‚µ‚æ‚¤‚Æ‚µ‚Ä‚¢‚Ü‚·B"
 
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr "‚ ‚È‚½‚ÍƒtƒHƒ‹ƒ_‚ðì¬‚Å‚«‚Ü‚¹‚ñB"
+
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "‚ ‚È‚½‚Í %d ŒÂˆÈã‚ÌƒtƒHƒ‹ƒ_[‚ðì¬‚Å‚«‚Ü‚¹‚ñB"
+
 # msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_‚ÌƒTƒuƒtƒHƒ‹ƒ_‚ðì¬‚µ‚Ä‚¢‚Ü‚·F"
-#: templates/folders/javascript.inc:144
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "ƒtƒHƒ‹ƒ_‚Ì–¼‘O‚ð•ÏX‚µ‚Ä‚¢‚Ü‚·F"
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr "’èŒ^‹å‚Ì’†‚Å‚ÍŽŸ‚Ì‹L†‚É‚æ‚é’uŠ·‚ª‚Å‚«‚Ü‚·F%c ‚ÅŒ»Ý‚Ì–{•¶A%s ‚Å–¼"
+
+#: lib/Folder.php:524
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "\"%s\" ‚Ìw“Ç‚ð’†Ž~‚Å‚«‚Ü‚¹‚ñB"
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
+"‚ ‚È‚½‚ÍƒT[ƒrƒX“¯ˆÓð€‚É‡ˆÓ‚µ‚Ä‚¢‚Ü‚¹‚ñ‚Ì‚ÅAƒƒOƒCƒ“‚Í‹–‰Â‚³‚ê‚Ü‚¹‚ñB"
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "‚ ‚È‚½‚É‚Í‚±‚ÌƒtƒHƒ‹ƒ_‚ð•ÏX‚·‚éƒAƒNƒZƒXŒ ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr ""
+msgstr "%%s ‚Éƒ[ƒ‹‚ðŽŸ‚Ìl‚É“]‘—‚µ‚Ü‚µ‚½F%s"
 
 #: templates/mailbox/alert.inc:3
 #, php-format
@@ -4219,22 +4623,20 @@
 msgid "You have 1 new message."
 msgstr "V’…ƒ[ƒ‹‚ª 1 ’Ê‚ ‚è‚Ü‚·B"
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "‚ ‚È‚½‚Í‚±‚Ìƒy[ƒW‚ðŠù‚É‘—M‚µ‚Ä‚¢‚Ü‚·B"
 
-#: lib/IMP.php:978
+#: lib/IMP.php:1054
 msgid "You have new mail in the following folder:"
 msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_‚ÉV’…ƒ[ƒ‹‚ª‚ ‚è‚Ü‚·:"
 
-#: lib/IMP.php:983
+#: lib/IMP.php:1059
 msgid "You have new mail in the following folders:"
 msgstr "‚±‚ê‚ç‚ÌƒtƒHƒ‹ƒ_‚ÉV’…ƒ[ƒ‹‚ª‚ ‚è‚Ü‚·F"
 
 # msgstr "ŽŸ‚ÌƒtƒHƒ‹ƒ_‚ÉV’…ƒ[ƒ‹‚ª‚ ‚è‚Ü‚·:"
-#: compose.php:142
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "1 lˆÈã‚Ìˆ¶æ‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
@@ -4242,18 +4644,18 @@
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
-"‚±‚Ìƒ[ƒ‹‚ð•\Ž¦‚·‚é‚É‚ÍA‚ ‚È‚½‚Ì PGP ”é–§Œ®‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚·‚é•K—v‚ª‚ "
-"‚è‚Ü‚·B"
+"‚±‚ÌƒƒbƒZ[ƒW‚ð•\Ž¦‚·‚é‚É‚ÍA‚ ‚È‚½‚Ì PGP ”é–§Œ®‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚·‚é•K—v"
+"‚ª‚ ‚è‚Ü‚·B"
 
-#: lib/MIME/Viewer/pkcs7.php:245
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
-"‚±‚Ìƒ[ƒ‹‚ð•\Ž¦‚·‚é‚É‚ÍA‚ ‚È‚½‚Ì S/MIME ”é–§Œ®‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚·‚é•K—v"
-"‚ª‚ ‚è‚Ü‚·B"
+"‚±‚ÌƒƒbƒZ[ƒW‚ð•\Ž¦‚·‚é‚É‚ÍA‚ ‚È‚½‚Ì S/MIME ”é–§Œ®‚ÌƒpƒXƒtƒŒ[ƒY‚ð“ü—Í‚·‚é"
+"•K—v‚ª‚ ‚è‚Ü‚·B"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "–Ú“I‚Ìƒ[ƒ‹ƒ{ƒbƒNƒX‚ðÅ‰‚É‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
@@ -4266,8 +4668,8 @@
 msgid "You must select an address first."
 msgstr "ƒAƒhƒŒƒX‚ðÅ‰‚É‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "1 ‚ÂˆÈã‚Ìƒ[ƒ‹‚ðÅ‰‚É‘I‚ñ‚Å‚‚¾‚³‚¢B"
 
@@ -4275,92 +4677,80 @@
 msgid "You must specify a recipient."
 msgstr "ˆ¶æ‚ðŽw’è‚µ‚Ä‚‚¾‚³‚¢B"
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr ""
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "ƒIƒvƒVƒ‡ƒ“‚Ì '%s' ‚ð—LŒø‚É‚·‚é‚±‚ÆB"
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "•ÛŽçƒIƒvƒVƒ‡ƒ“‚Ì '%s' ‚ð—LŒø‚É‚·‚é‚±‚Æ‚ª•K—v‚Å‚·B"
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
-msgstr ""
+msgstr "%%2$s ‚É %1$s ‚Ö‚»‚Ì‚Ü‚Ü“]‘—‚µ‚Ü‚µ‚½B"
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
-msgstr ""
+msgstr "%s ‚É•ÔM‚µ‚Ü‚µ‚½B"
 
-#: lib/Folder.php:590
+#: lib/Folder.php:474
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "\"%s\" ‚ðw“Ç‚µ‚Ä‚¢‚Ü‚¹‚ñBƒT[ƒo‚©‚ç‚Ì‰ž“šF "
 
-#: lib/Folder.php:641
+#: lib/Folder.php:526
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "\"%s\" ‚Ìw“Ç‚ð’†Ž~‚µ‚Ä‚¢‚Ü‚¹‚ñBƒT[ƒo‚©‚ç‚Ì‰ž“šF "
 
-#: lib/Folder.php:593
+#: lib/Folder.php:477
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "\"%s\" ‚Ìw“Ç‚ðŠJŽn‚µ‚Ü‚µ‚½B"
 
-#: lib/Folder.php:644
+#: lib/Folder.php:529
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "\"%s\" ‚Ìw“Ç‚ð’†Ž~‚µ‚Ü‚µ‚½B"
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
-msgstr ""
+msgstr "‚ ‚È‚½‚Ì–¼‘O"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "‚ ‚È‚½‚Ì PGP ŒöŠJŒ®‚Æ”é–§Œ®"
 
-#: templates/smime/smime.inc:53 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "‚ ‚È‚½‚Ì”é–§Œ®"
 
-#: templates/smime/smime.inc:49 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "‚ ‚È‚½‚ÌŒöŠJŒ®"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "•ÔMæ‚Æ‚µ‚Ä•\Ž¦‚³‚ê‚éƒAƒhƒŒƒXF<i>iÈ—ª‰Âj</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "•ÔMæ‚Æ‚µ‚Ä•\Ž¦‚³‚ê‚éƒAƒhƒŒƒXF<em>iƒIƒvƒVƒ‡ƒ“j</em>"
 
-#: templates/smime/smime.inc:32
-msgid "Your S/MIME Public/Private Keys"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
 msgstr "‚ ‚È‚½‚Ì S/MIME ŒöŠJŒ®‚Æ”é–§Œ®"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "‚ ‚È‚½‚ÌƒAƒJƒEƒ“ƒg"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
-msgstr "‚ ‚È‚½‚Ì•Ê–¼ƒAƒhƒŒƒX:iƒIƒvƒVƒ‡ƒ“B‚Ps‚É‚PƒAƒhƒŒƒX‚ðŽw’èj"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr "‚ ‚È‚½‚Ì•Ê–¼ƒAƒhƒŒƒX:<em>iƒIƒvƒVƒ‡ƒ“B‚Ps‚É‚PƒAƒhƒŒƒX‚ðŽw’èj</em>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "‚¨Žg‚¢‚Ìƒuƒ‰ƒEƒU‚Å‚Í‚±‚ÌŽí—Þ‚Ì‰æ‘œ‚ÌƒCƒ“ƒ‰ƒCƒ“•\Ž¦‚ðƒTƒ|[ƒg‚µ‚Ä‚¢‚Ü‚¹‚ñ"
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"‚¨Žg‚¢‚Ìƒuƒ‰ƒEƒU‚Å‚ÍA‚±‚ÌˆóüƒIƒvƒVƒ‡ƒ“‚ÍƒTƒ|[ƒg‚³‚ê‚Ä‚¢‚Ü‚¹‚ñBCtrl/"
-"Option + P ‚ð‰Ÿ‚µ‚Äˆóü‚µ‚Ä‚‚¾‚³‚¢B"
-
-#: config/prefs.php.dist:531
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "‘—MŽž‚ÌƒfƒtƒHƒ‹ƒg•¶ŽšƒZƒbƒg:"
 
@@ -4368,68 +4758,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "‘—MŽž‚ÌƒfƒtƒHƒ‹ƒg‚ÌˆÃ†•û–@:"
 
-#: lib/MIME/Viewer/status.php:92
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"‚ ‚È‚½‚ÌƒŠƒ“ƒN‚µ‚½“Y•tƒtƒ@ƒCƒ‹‚Í‚È‚‚Æ‚à‚Pl‚ªƒ_ƒEƒ“ƒ[ƒh‚µ‚Ü‚µ‚½B\n"
+"\n"
+"“Y•tƒtƒ@ƒCƒ‹–¼: %s\n"
+"“Y•t‚µ‚½“ú•t: %s\n"
+"\n"
+"ˆÈ‰º‚ÌƒŠƒ“ƒN‚ðƒNƒŠƒbƒN‚·‚ê‚ÎƒAƒbƒvƒ[ƒh‚µ‚½“Y•tƒtƒ@ƒCƒ‹‚ðíœ‚Å‚«‚Ü‚·F\n"
+"%s"
+
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "‚ ‚È‚½‚Ìƒ[ƒ‹‚Í”z’B‚³‚ê‚Ü‚µ‚½B"
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "–¼:"
 
-#: message.php:281 compose.php:1102 mailbox.php:512 lib/Compose.php:728
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[ƒAƒhƒŒƒX‚ð‰B‚·]"
+
+#: message.php:295 compose.php:1301 mailbox.php:535 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Œ–¼‚È‚µ]"
 
-#: templates/compose/compose.inc:220
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[ƒAƒhƒŒƒX‚ð•\Ž¦ -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[ƒAƒhƒŒƒX‚ð•\Ž¦ - %s ŽóM]"
+
+#: templates/compose/compose.inc:203
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "_Bƒuƒ‰ƒbƒNƒŠƒXƒg"
 
-#: templates/compose/compose.inc:169
+#: templates/compose/compose.inc:152
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:879
-msgid "_Compose"
-msgstr "_Cƒ[ƒ‹ì¬"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Díœ"
 
-#: lib/IMP.php:881
+#: lib/IMP.php:957
 msgid "_Folders"
 msgstr "_FƒtƒHƒ‹ƒ_"
 
-#: templates/compose/compose.inc:84
+#: templates/compose/compose.inc:79
 msgid "_Identity"
 msgstr "_ID"
 
-#: lib/IMP.php:872
+#: lib/IMP.php:926
 msgid "_Inbox"
 msgstr "_INBOX"
 
-#: lib/IMP.php:922
+#: lib/IMP.php:998
 msgid "_Log out"
 msgstr "_LƒƒOƒAƒEƒg"
 
-#: message.php:378
+#: message.php:391
 msgid "_Message Source"
-msgstr "_MŒ´•¶"
+msgstr "_Mƒ[ƒ‹Œ´•¶"
+
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr "_NV‹Kƒ[ƒ‹"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Pˆóü"
 
-#: templates/compose/compose.inc:287 templates/compose/compose.inc:304
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
 msgid "_Priority"
 msgstr "_P—Dæ“x"
 
-#: mailbox.php:396
+#: mailbox.php:404
 #, php-format
 msgid "_Refresh %s"
 msgstr "_RÄ•\Ž¦%s"
@@ -4438,19 +4860,19 @@
 msgid "_Reply"
 msgstr "_R•ÔM"
 
-#: lib/IMP.php:883
+#: lib/IMP.php:959
 msgid "_Search"
 msgstr "_SŒŸõ"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "_Send Message"
 msgstr "_S‘—M"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_TƒXƒŒƒbƒh"
 
-#: templates/compose/compose.inc:119
+#: templates/compose/compose.inc:114
 msgid "_To"
 msgstr "_To"
 
@@ -4458,62 +4880,131 @@
 msgid "_Undelete"
 msgstr "_UíœŽæÁ"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_VƒXƒŒƒbƒh•\Ž¦"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "_WƒzƒƒCƒgƒŠƒXƒg"
 
-#: lib/Compose.php:341
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "ƒAƒhƒŒƒX•s–¾"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "“Y•t"
 
-#: view.php:102
+#: view.php:97
 msgid "attachments.zip"
-msgstr ""
+msgstr "attachments.zip"
 
-#: templates/compose/compose.inc:507
+#: templates/compose/compose.inc:505
 msgid "bytes"
-msgstr ""
+msgstr "ƒoƒCƒg"
+
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "o—Íƒtƒ@ƒCƒ‹‚ªì¬‚Å‚«‚Ü‚¹‚ñ"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "“ü—Íƒtƒ@ƒCƒ‹‚ªŠJ‚¯‚Ü‚¹‚ñ"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "ƒRƒ}ƒ“ƒhsŽg—p‚ÌƒGƒ‰["
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "Ý’èƒGƒ‰["
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "d—v‚ÈƒVƒXƒeƒ€ƒtƒ@ƒCƒ‹‚ÌŒ‡—Ž"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "ƒf[ƒ^Œ`Ž®ƒGƒ‰["
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "€–Ú‚ª‚ ‚è‚Ü‚¹‚ñ"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr ""
 
-#: smime.php:29 pgp.php:75
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "ƒzƒXƒg–¼•s–¾"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "“üo—ÍƒGƒ‰["
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "ƒ\ƒtƒgƒEƒFƒA“à•”‚ÌƒGƒ‰["
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr ""
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
-msgstr ""
+msgstr "ƒ[ƒ‹ƒ{ƒbƒNƒXEƒtƒ@ƒCƒ‹"
 
-#: compose.php:901 lib/Message.php:452
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr "–¼‘O"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "‚È‚µ"
 
-#: templates/compose/spelling.inc:90
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "‚Ü‚½‚Í"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "ƒAƒNƒZƒX‚Í‹‘”Û‚³‚ê‚Ü‚µ‚½"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "ŽóMŽÒ]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "ƒŠƒ‚[ƒg‚Å‚ÌƒvƒƒgƒRƒ‹ƒGƒ‰["
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "ƒT[ƒrƒX•s”\"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ƒXƒyƒ‹ƒGƒ‰["
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ƒXƒyƒ‹ƒGƒ‰["
 
-#: lib/Filter.php:56
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "ƒVƒXƒeƒ€ƒGƒ‰["
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "ˆêŽž“I‚ÈƒGƒ‰["
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "ƒuƒ‰ƒbƒNƒŠƒXƒg"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "ƒzƒƒCƒgƒŠƒXƒg"


--- orig/lib/Quota/logfile.php
+++ mod/lib/Quota/logfile.php
@@ -28,7 +28,7 @@
  * midocc     --  String between usage and total storage space.
  * endocc     --  String after the storage number.
  *
- * $Horde: imp/lib/Quota/logfile.php,v 1.5.10.3 2005/07/03 03:42:46 selsky Exp $
+ * $Horde: imp/lib/Quota/logfile.php,v 1.5.10.4 2005/10/18 12:13:36 jan Exp $
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/themes/cornflower/screen.css
+++ mod/themes/cornflower/screen.css
@@ -1,5 +1,5 @@
 /**
- * $Horde: imp/themes/cornflower/screen.css,v 1.1.2.1 2005/07/06 17:36:26 jan Exp $
+ * $Horde: imp/themes/cornflower/screen.css,v 1.1.2.2 2005/10/18 12:14:14 jan Exp $
  */
 
 .folders {


--- orig/locale/it_IT/help.xml
+++ mod/locale/it_IT/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Horde: imp/locale/it_IT/help.xml,v 1.18.6.1 2005/01/25 22:05:53 jan Exp $ -->
+<!-- $Horde: imp/locale/it_IT/help.xml,v 1.18.6.5 2006/03/23 00:24:11 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Composizione Messaggio: Azioni</title>
@@ -219,6 +219,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Ricerca Messaggio </title>
     <heading>Criterio di Ricerca</heading>
@@ -676,6 +682,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -694,6 +706,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -723,4 +750,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/po/fi_FI.po
+++ mod/po/fi_FI.po
@@ -1,41 +1,45 @@
 # Finnish translation for Imp.
 # Copyright (C)
-# Leena Heino <liinu at uta.fi>, 2001-2004.
+# Leena Heino <liinu at uta.fi>, 2001-2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Imp 4.0-cvs\n"
+"Project-Id-Version: Imp 4.1-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-09-09 10:20+0300\n"
-"PO-Revision-Date: 2004-12-10 12:59+0200\n"
+"POT-Creation-Date: 2006-02-27 19:51+0200\n"
+"PO-Revision-Date: 2006-02-26 12:59+0200\n"
 "Last-Translator: Leena Heino <liinu at uta.fi>\n"
 "Language-Team: Finnish <i18n at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "        Kopio: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr " Vastaanottaja: "
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "       Päiväys: "
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "     Lähettäjä: "
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:408 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Pikanäppäin %s)"
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr "       Otsikko: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " "
 
@@ -43,156 +47,159 @@
 msgid "#"
 msgstr "Nro"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:196
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d viestiä"
+
+#: mailbox.php:175
 #, php-format
 msgid "%d messages have been deleted."
 msgstr "poistettiin %d viestiä."
 
-#: lib/Spam.php:178
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "%d viestiä on raportoitu ei-roskapostina järjestelmän ylläpidolle."
 
-#: lib/Spam.php:158
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d viestiä on raportoitu ei-roskapostina."
 
-#: lib/Spam.php:170
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d viestiä on raportoitu roskapostina järjestelmän ylläpidolle."
 
-#: lib/Spam.php:150
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d viestiä on raportoitu roskapostina."
 
-#: mailbox.php:369
+#: mailbox.php:358
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "Viestit %d - %d (yhteensä: %d)"
 
-#: mailbox.php:619
+#: mailbox.php:635
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP ylläpito"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME ylläpito"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s on jo olemassa. Kansiotasi %s ei nimetty uudelleen."
 
-#: lib/Message.php:612
+#: lib/Message.php:685
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s ei vaikuta olevan postikansio."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s kansio nimetään uudelleen kuukauden alussa."
 
-#: lib/MIME/Viewer/itip.php:252
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s on hyväksynyt."
 
-#: lib/MIME/Viewer/itip.php:621
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s on peruuttanut %s:n."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s on peruuttanut \"%s\":n."
 
-#: lib/MIME/Viewer/itip.php:258
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
-msgstr "%s on kieltäytynt."
+msgstr "%s on kieltäytynyt."
 
-#: lib/MIME/Viewer/itip.php:489
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s on vastannut vapaa/varattu pyyntöön."
 
-#: lib/MIME/Viewer/itip.php:612
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s on vastannut kutsuun %s."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s on vastannut kutsuun \"%s\":stä."
 
-#: lib/MIME/Viewer/itip.php:478
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s on lähettänyt sinulle vapaa/varattu tietoja."
 
-#: lib/MIME/Viewer/itip.php:264
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s on alustavasti hyväksytty"
 
-#: lib/MIME/Viewer/itip.php:483
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s pyytää sinulta vapaa/varattu tietoja."
 
 #: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s pyytää sinua olemaan paikalla %s:ssä."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s pyytää sinua olemaan paikalla \"%s\":ssä."
 
-#: lib/Message.php:377
+#: lib/Message.php:461
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s lisättiin %s:ään."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s lisättiin \"%s\":ään."
 
-#: lib/MIME/Viewer/itip.php:593
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s haluaa muuttaa %s:ää."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s haluaa muuttaa \"%s\":ää."
 
-#: lib/MIME/Viewer/itip.php:570
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s haluaa ilmoittaa sinulle %s:stä."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s haluaa ilmoittaa sinulle \"%s\":stä."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s haluaa saada uusimmat tiedot %s:stä."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s haluaa saada uusimmat tiedot \"%s\":stä."
 
-#: message.php:269 message.php:274
+#: message.php:292 message.php:297
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;/&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Aseta muutokset voimaan ja siirry seuraavalle sivulle.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Hylkää kaikki muutokset ja siirry viestinkirjoitussivulle.)"
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Pelkkä teksti)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -200,7 +207,7 @@
 "(Palaa takaisin viestinkirjoitussivulle ja aseta voimaan kaikki tähän asti "
 "tehdyt muutokset. Nykyiselle sivulle tehtyjä muutoksia ei aseteta voimaan.)"
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -208,51 +215,51 @@
 "(Lähetä viesti kun kaikki muutokset on asetettu voimaan. Muutokset eivät näy "
 "nykyisellä sivulla.)"
 
-#: templates/contacts/contacts.inc:222
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Lisää nämä napsauttamalla OK-painiketta *"
 
-#: templates/contacts/contacts.inc:201
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Valitse osoitteet *"
 
-#: mailbox.php:194
+#: mailbox.php:173
 msgid "1 message has been deleted."
 msgstr "1 viesti on poistettu."
 
-#: lib/Spam.php:180
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "1 viesti on raportoitu ei-roskapostina järjestelmän ylläpidolle."
 
-#: lib/Spam.php:160
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "1 viesti on raportoitu ei-roskapostina."
 
-#: lib/Spam.php:172
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 viesti on raportoitu roskapostina järjestelmän ylläpidolle."
 
-#: lib/Spam.php:152
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "1 viesti on raportoitu roskapostina."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 merkkiä"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 merkkiä"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 merkkiä"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 merkkiä"
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "Tämän viestiin on liitetty suuri kuvatiedosto %s."
@@ -267,19 +274,19 @@
 msgid "AND"
 msgstr "JA"
 
-#: lib/MIME/Viewer/itip.php:586
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Hyväksy ja lisää tapahtuma kalenteriisi."
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Hyväksy pyyntö"
 
-#: lib/MIME/Viewer/itip.php:583
-msgid "Accept request and add it to my calendar"
-msgstr "Hyväksy pyyntö ja lisää se kalenteriini"
-
-#: lib/MIME/Viewer/itip.php:749
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: lib/MIME/Viewer/itip.php:253
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "Hyväksytty: "
 
@@ -287,35 +294,39 @@
 msgid "Account's name:"
 msgstr "Sähköpostitilin nimi:"
 
-#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:726
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Toiminnot"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Lisää %s osoitekirjaani"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "lisää lähde"
 
-#: lib/MIME/Viewer/itip.php:573 lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Lisää tämä kalenteriini"
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Lisää osoitekirjaan (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Lisää kalenteriini"
 
-#: compose.php:1191
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
-msgstr "Lisättiin \"%s\" liitetiedostoksi."
+msgstr "Liitettiin \"%s\" liitetiedostoksi."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Näytettävät lisäotsakkeet: <i>(vapaaehtoinen, laita jokainen otsake omalle "
-"rivilleen)</i>"
+"Näytettävät lisäotsakkeet: <em>(vapaaehtoinen, laita jokainen otsake omalle "
+"rivilleen)</em>"
 
 #: lib/MIME/Viewer/notification.php:62
 #, php-format
@@ -344,43 +355,43 @@
 msgid "Additional message error details can be viewed %s."
 msgstr "Viestin virheilmoituksen voit katsoa %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Osoitekirjat"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Osoitteet, jotka liitetään piilokopioina jokaiseen viestiin: <i>"
-"(vapaaehtoinen, laita jokainen osoite omalle rivilleen)</i>"
+"Osoitteet, jotka liitetään piilokopioina (BCC) jokaiseen viestiin: <em>"
+"(vapaaehtoinen, laita jokainen osoite omalle rivilleen)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Osoitteet jotka liittyvät tähän profiiliin: <i>(vapaaehtoinen, laita "
-"jokainen osoite omalle rivilleen)</i>"
+"Osoitteet jotka liittyvät tähän profiiliin: <em>(vapaaehtoinen, laita "
+"jokainen osoite omalle rivilleen)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "Kaikki"
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Kaikki viestit seuraavista kansioista tallennetaan yhdeksi MBOX-tiedostoksi:"
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -392,7 +403,7 @@
 #: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
-msgstr "Kaikki %s kuukautta vanhemmat talletetut liitetiedostot poistetaan."
+msgstr "Kaikki %s kuukautta vanhemmat linkitetyt liitetiedostot poistetaan."
 
 #: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
@@ -400,12 +411,16 @@
 msgstr ""
 "Kaikki %s kuukautta vanhemmat lähetettyjen viestien kansiot poistetaan."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Kansiosta \"%s\" poistettiin kaikki oikeudet käyttäjältä \"%s\"."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Sallitaanko kansioiden luonti?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Suodatussäännöt koskevat kaikkia postilaatikoita."
 
@@ -413,15 +428,15 @@
 msgid "Alternative parts for this section:"
 msgstr "Vaihtoehtoiset osat tälle osiolle:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "Aina"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Talleta aina liitetiedostot"
 
-#: lib/Message.php:468
+#: lib/Message.php:551
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -429,11 +444,15 @@
 "Tapahtui virhe poistettaessa liitetiedostoa. IMAP-palvelimen virheilmoitus "
 "oli: "
 
-#: lib/Message.php:364
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
+msgstr "Uuden muistiinpanon luonnissa tapahtui tuntematon virhe."
+
+#: lib/Message.php:434
 msgid "An unknown error occured while creating the new task."
-msgstr "Uuden tehtävän lisäyksessä tapahtui tuntematon virhe."
+msgstr "Uuden tehtävän luonnissa tapahtui tuntematon virhe."
 
-#: mailbox.php:693 message.php:484 templates/message/navbar_navigate.inc:9
+#: mailbox.php:708 message.php:503 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/legend.inc:6 templates/mailbox/navbar.inc:18
 #: templates/mailbox/navbar.inc:35
 msgid "Answered"
@@ -452,19 +471,23 @@
 msgid "Apply Filters to %s"
 msgstr "Käytä suodattimia kansiossa %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Suodata viestit sisäänkirjautumisen yhteydessä."
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
-msgstr "Suodata viestit kun INBOX postikansioa päivitetään."
+msgstr "Suodata viestit kun INBOX postikansiota päivitetään."
+
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr "Oletko varma, että haluat poistaa tämän Virtuaalikansiomääritelmän?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Oletko varma, että haluat poistaa tämän julkisen avaimen?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr "Oletko varma, että haluat poistaa oman avainparisi? (EI suositella!)"
@@ -473,11 +496,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Oletko varma, että haluat tehdä tämän toimenpiteen?"
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Oletko aivan varma, että haluat LOPULLISESTI poistaa nämä viestit?"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Oletko varma, että haluat LOPULLISESTI poistaa tämän liitetiedoston?"
 
@@ -485,7 +508,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Oletko varma, että haluat tyhjentää tämän kansion?"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:953
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Oletko varma, että haluat tyhjentää roskapostikansion?"
+
+#: lib/IMP.php:946
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Oletko varma, että haluat tyhjentää roskakorikansion?"
 
@@ -493,43 +520,39 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Oletko aivan varma, että haluat lopullisesti poistaa nämä viestit?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Oletko varma, että haluat raportoida tämän viestin viattomana?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Oletko varma että haluat raportoida tämän viestin roskapostina?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Saapumisaika"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Nouseva"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Kysy"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Liitä"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:470
 msgid "Attach Files"
 msgstr "Liitä tiedostot"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:451
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr "Liitä viestiin kopio julkisesta PGP-avaimestasi."
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Liitetty tiedosto:"
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -537,22 +560,30 @@
 "Tiedosto \"%s\" ylittää liitetiedostojen suurimman sallitun koon. Tiedostoa "
 "EI liitetty."
 
-#: lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Liitteenä on vastaus lähettämääsi kalenteritietopyyntöön."
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/attachments.js:98
-#: templates/compose/compose.inc:496
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/attachments.js:55 templates/compose/compose.inc:498
 msgid "Attachment"
 msgstr "Liite"
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Liite %s on poistettu."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Liitteen tiedot"
+
+#: compose.php:1105 lib/Message.php:513
 msgid "Attachment stripped: Original attachment type"
 msgstr "Liite poistettu: Alkuperäisen liitetiedoston tyyppi"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -568,7 +599,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Tarvittavaa IMAP-laajennusta ei löytynyt."
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -580,7 +611,7 @@
 msgid "Available Address books:"
 msgstr "Käytettävissä olevat osoitekirjat:"
 
-#: lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Odotetaan vastausta"
 
@@ -589,13 +620,36 @@
 msgid "Bac_k to %s"
 msgstr "Palaa _takaisin %s"
 
-#: thread.php:86 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Palaa takaisin %s"
 
-#: message.php:250 search.php:147 templates/contacts/contacts.inc:217
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Takaisin usean viestin hakemistonäkymään"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Takaisin keskustelusäienäkymään"
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "Väärä käyttäjätunnus tai salasana."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Väärä tai virheellinen pyyntö. Palvelimen ilmoitus oli: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Epäkelpo pyyntö: %s."
+
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Piilokopio"
 
@@ -603,15 +657,15 @@
 msgid "Below is the raw text of the status information message."
 msgstr "Alla on tilatietoviesti raakamuodossa."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Musta lista"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Älä näytä HTML-viestien kuvia, ellet niitä erikseen pyydä."
 
-#: search.php:155
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Sisältö"
 
@@ -620,11 +674,16 @@
 msgid "Both"
 msgstr "Molemmat"
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Viestin otsikko ja viestin sisältö"
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
+"CRAM-MD5 tai DIGEST-MD5 vaativat että Auth_SASL laajennus on asennettu."
+
+#: templates/compose/compose.inc:270
 msgid "C_harset"
 msgstr "Me_rkistö"
 
@@ -649,15 +708,16 @@
 "Ei voi näyttää - Postilaatikossa oli viestistä vain %s osiota ja pitäisi "
 "olla %s"
 
-#: folders.php:272 templates/smime/import_key.inc:85
-#: templates/smime/passphrase.inc:22 templates/pgp/import_key.inc:66
-#: templates/pgp/passphrase.inc:32 templates/folders/import.inc:21
-#: templates/contacts/contacts.inc:250 templates/compose/spelling.inc:127
+#: folders.php:270 templates/smime/import_key.inc:86
+#: templates/smime/passphrase.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/pgp/import_key.inc:66 templates/pgp/passphrase.inc:32
+#: templates/folders/import.inc:21 templates/contacts/contacts.inc:255
+#: templates/compose/spelling.inc:120
 msgid "Cancel"
 msgstr "Peru"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Peru viesti"
 
@@ -665,28 +725,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Jos perut viestin, niin viestin sisältö tuhoutuu."
 
-#: message.php:249 search.php:143 templates/contacts/contacts.inc:216
-#: templates/compose/recompose.inc:15
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Kopio"
 
-#: lib/MIME/Viewer/itip.php:697
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Sertifikaattien tuonti ei ole käytettävissä. Tiedostoja ei voi tuota tälle "
+"palvelimelle."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Puheenjohtaja"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Muuta"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Muuta kaikki"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Muuta kansiota"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -707,23 +775,23 @@
 "Voit muuttaa lähettämissäsi sähköposteissa näkyviä nimi- tai osoitetietoja "
 "ja käyttämääsi allekirjoitusta."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Näytettävien merkkien määrä:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Tarkista kansioiden uudet sähköpostit"
 
-#: templates/mailbox/message_headers.inc:71 templates/folders/actions.inc:2
+#: templates/mailbox/message_headers.inc:75 templates/folders/actions.inc:2
 msgid "Check _All/None"
 msgstr "Valitse _kaikki/ei mitään"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Valitse kaikki postipalvelimet, joilta haluat hakea viestejä:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Tarkista viestin oikeinkirjoitus ennen lähettämistä."
 
@@ -731,18 +799,14 @@
 msgid "Choose Action:"
 msgstr "Valitse toiminto:"
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Valitse postipalvelin:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
 msgid "Choose a match or edit the address to the right:"
-msgstr "Valitse osoite oikealta tai muokkaa osoitetta:"
-
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:727
-msgid "Choose an action:"
-msgstr "Valitse toiminto:"
+msgstr "Valitse tai muokkaa osoitteita oikean puoleisessa laatikossa:"
 
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
@@ -754,49 +818,45 @@
 "Valitse osoitteiden laajennuksen yhteydessä käytettävien osoitekirjojen "
 "hakujärjestys:"
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
-"Napsauta %s muuttaksesi kuvan sellaiseen muotoon, jonka selaimesi pystyy "
+"Napsauta %s muuttaaksesi kuvan sellaiseen muotoon, jonka selaimesi pystyy "
 "näyttämään."
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Napsauta %s tallentaaksesi kuvan."
 
-#: lib/Filter.php:107
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Napsauta %s mennäksesi %s hallintasivulle."
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Napsauta %s katsoaksesi HTML-muotoisen sisällön erillisessä ikkunassa."
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Napsauta %s katsoaksesi tämän kuvan pikkukuvana"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Napsauta %s katsoaksesi liitteen erillisessä ikkunassa."
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 #, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr ""
 "Napsauta %s katsoaksesi tämän multipart/related osion erillisessä ikkunassa."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Napsauta tästä PIILOTTAAKSESI kuvat"
-
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Napsauta tästä NÄYTTÄÄKSESI kuvat"
 
@@ -808,48 +868,48 @@
 "Valitse ensin osoitekirja ja valitse sen jälkeen ne kentät, joista tietoja "
 "haetaan."
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr "Napsauta tästä tallettaaksesi julkisen PGP-avaimen osoitekirjaasi"
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
-msgstr "Napsauta tästä tallettaaksesi %s:n S/MIME varmenteen osoitekirjaasi"
+msgstr "Napsauta tästä tallettaaksesi %s:n S/MIME-varmenteen osoitekirjaasi"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Napsauttamalla osoitetta voit kirjoittaa uuden viestin lähettäjälle."
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Napsauttamalla osoitetta voit aukaista viestin luettavaksi."
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Sulje"
 
-#: compose.php:775 compose.php:1082
+#: compose.php:418
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
-#: folders.php:415
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Suljettu kansio"
 
-#: folders.php:435
+#: folders.php:430
 msgid "Collapse"
 msgstr "Pienennä"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Pienennä kaikki"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Pienennä kaikki kansiot"
 
-#: folders.php:435
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Pienennä kansio"
 
@@ -857,62 +917,61 @@
 msgid "Color Indicator: "
 msgstr "Värimerkintä: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Kommentti"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Suoritettu"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Kirjoita"
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Kirjoita viesti (%s)"
-
-#: compose.php:774 compose.php:1081
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Kirjoita toinen viesti"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Kirjoita viestit erillisessä ikkunassa."
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
-"Oletuksen kirjoita viestit HTML käyttöliittymällä (Jos selaimesi tukee tätä "
+"Oletuksena kirjoita viestit HTML käyttöliittymällä (Jos selaimesi tukee tätä "
 "toimintoa)."
 
 #: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Voit määritellä kuinka viestit näytetään."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Voit muuttaa viestien esikatseluun liittyviä asetuksia."
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Yhteys IMAP-palvelimeen katkesi."
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Yhteys palvelimeen epäonnistui."
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Voit muuttaa %s:n PGP-asetuksia."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Voit muuttaa %s:n S/MIME-asetuksia."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Voit asettaa hakuun liittyviä asetuksia."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -920,7 +979,7 @@
 "Voit määrittää miten usein tarkistetaan uusien viestien saapuminen ja "
 "ilmoitetaanko sinulle uusista viesteistä."
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Muuta tekstimuotoiset hymiöt graafisiksi."
 
@@ -932,26 +991,31 @@
 msgid "Copy to folder"
 msgstr "Kopioi kansioon"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Korjaa"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Korjattu teksti"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Pyyntöä ei voi suorittaa: Palvelimen imoitus: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Ei voida luoda VFS-taustajärjestelmää: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:676
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr ""
 "Viestejä ei voitu poistaa kansiosta %s. Palvelimen virheilmoitus oli: %s"
 
-#: lib/Session.php:293
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Ylläpitotoimenpiteitä ei voitu suorittaa."
 
@@ -963,23 +1027,28 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Valittua tiedostoa ei voitu purkaa Zip-tiedostosta."
 
-#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr "Ei voitu muodostaa salattua yhteyttä IMAP-palvelimelle. %s: %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr "IMAP-palvelimelta ei voitu hakea tietoja nimiavaruudesta."
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Luo"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Luo kansio"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Luo avaimet"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Luo virtuaalikansio"
-
 #: templates/fetchmail/account_select.inc:26
 msgid "Create a New Account"
 msgstr "Luo uusi sähköpostitili"
@@ -992,7 +1061,7 @@
 msgid "Create a new drafts folder"
 msgstr "Luo uusi luonnoskansio"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Luo uusi lähetettyjen viestien kansio"
 
@@ -1000,7 +1069,7 @@
 msgid "Create a new trash folder"
 msgstr "Luo uusi roskakorikansio"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1008,12 +1077,20 @@
 "Voit luoda suodatinsääntöjä, joilla voit siirtää saapuvan viestin kansioihin "
 "tai poistaa roskaposteja."
 
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Luo uusi kirjepohja"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Luo kirjepohjia ja valmisvastauksia."
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Nykyiset oikeudet kansioon %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Voit muuttaa miten viestejä haetaan toisilta sähköpostitileiltä."
 
@@ -1032,79 +1109,96 @@
 msgid "Dat_e"
 msgstr "Päivä_ys"
 
-#: message.php:246 thread.php:92
+#: message.php:269 thread.php:153
 msgid "Date"
 msgstr "Päiväys"
 
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
-msgstr "Kieltäydy"
+msgstr "Kieltäytyi"
 
-#: lib/MIME/Viewer/itip.php:259
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
-msgstr "Kieltäydy: "
+msgstr "Kieltäytyi: "
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+msgid "Default"
+msgstr "Oletus"
+
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Oletushakukenttä"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Oletusjärjestys:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Oletusjärjestyksen suunta:"
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Valtuutettu"
 
-#: folders.php:406 templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: folders.php:400 templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:239 templates/compose/attachments.inc:28
+#: templates/contacts/contacts.inc:244 templates/compose/attachments.inc:28
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Poista %s julkinen avain"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Poista nykyiset avaimet"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Poista kansiot"
 
-#: folders.php:273
+#: folders.php:271
 msgid "Delete Selected Folders"
 msgstr "Poista valitut kansiot"
 
-#: folders.php:406
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Poista kirjepohja"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Poista virtuaalikansio"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Muokkaa virtuaalisen kansion määrittelyä %s"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Poista haetut viestit etäpostipalvelimelta."
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Poista kalenteristani"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
-msgstr "Poista vanhat talletetut liitetiedostot kuukauden alussa."
+msgstr "Poista vanhat linkitetyt liitetiedostot kuukauden alussa."
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Poista kuukauden alussa vanhat lähetettyjen viestien kansiot."
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Poista roskapostina raportoidut viestit."
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Poistetut roskapostiviestit"
 
-#: mailbox.php:719 message.php:487 templates/mailbox/legend.inc:8
+#: mailbox.php:734 message.php:506 templates/mailbox/legend.inc:8
 #: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
 msgid "Deleted"
 msgstr "Poistettu"
@@ -1113,7 +1207,7 @@
 msgid "Deleted messages"
 msgstr "Poistetut viestit"
 
-#: compose.php:280
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Poistettiin liitetiedosto \"%s\"."
@@ -1122,51 +1216,59 @@
 msgid "Deleting and Moving Messages"
 msgstr "Viestien poistaminen ja siirtäminen"
 
-#: lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Kiellä pyyntö"
 
-#: lib/MIME/Viewer/itip.php:536
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Kiellä vapaa/varattu tietojen pyyntö"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Laskeva"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:665
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Kuvaus"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Tarkemmat tiedot"
 
-#: config/prefs.php.dist:671
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "Tiedostoa \"%s\" ei liitetty, koska se oli tyhjä."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Himmennä allekirjoitukset."
 
-#: templates/contacts/contacts.inc:231
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Näytä"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
-msgstr "Näytä varmistus kun viesti lähetetetty."
+msgstr "Näytä varmistus kun viesti on lähetetty."
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Näytä viestin sisältö"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Ilmoita uusista viesteistä erillisessä ikkunassa."
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Näytä 'tyhjennä roskakori'-linkki muiden ikonien joukossa."
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Näytä '\"tyhjennä roskapostit\"-linkki muiden ikonien joukossa."
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Näytä \"tyhjennä roskakori\"-linkki muiden ikonien joukossa."
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
@@ -1176,23 +1278,27 @@
 msgid "Do NOT match"
 msgstr "EI täsmää"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Älä tarkista onko kansioon tullut uusia sähköpostiviestejä"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "Älä muodosta linkkejä Lähettäjä: sarakkeessa"
 
-#: lib/IMP.php:1031
+#: lib/IMP.php:1057
 msgid "Do you want to open that folder?"
 msgstr "Haluatko avata kansion?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Sinulla ei ole tunnusta. Kirjaudu käyttäjäksi."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Valmis"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Tallenna %s .zip muodossa"
@@ -1201,25 +1307,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Tallenna kaikki liitetiedostot (.zip tiedostoksi)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Tallenna kansiot"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Tallenna kansiot [.zip muodossa]"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Tallenna .zip muodossa"
 
-#: mailbox.php:698 message.php:485 templates/message/navbar_navigate.inc:11
+#: mailbox.php:713 message.php:504 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/legend.inc:9 templates/mailbox/navbar.inc:22
 #: templates/mailbox/navbar.inc:41
 msgid "Draft"
 msgstr "Luonnos"
 
-#: folders.php:386
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Luonnoskansio:"
 
@@ -1227,11 +1333,11 @@
 msgid "Drafts folder:"
 msgstr "Luonnoskansio:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Sähköpostiosoite"
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:316
 msgid "END"
 msgstr "LOPPU"
 
@@ -1239,20 +1345,23 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr "VIRHE: Viestiäsi ei voitu toimittaa perille."
 
-#: folders.php:407
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Muokkaa mustaa listaa"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Muokkaa suodattimia"
 
-#: folders.php:407 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Muokkaa hakukyselyä"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Muokkaa virtuaalista kansiota"
 
@@ -1261,40 +1370,44 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Muokkaa virtuaalisen kansion määrittelyä %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
-msgstr "Muokkaa sallittujen listaa"
+msgstr "Muokkaa valkoista listaa"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Muokkaa mustaa listaasi"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Muokkaa suodatinsääntöjäsi"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Muokkaa etäpostilaatikoihin liittyviä asetuksia."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
-msgstr "Muokkaa sallittujen listaasi"
+msgstr "Muokkaa valkoista listaasi"
 
-#: templates/contacts/contacts.inc:234
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Sähköpostiosoite"
 
-#: lib/Message.php:620
+#: lib/Message.php:693
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Tyhjennettiin kaikki viestit kohteesta %s."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Tyhjennettiin kaikki viestit virtuaalisesta roskakorikansiosta."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Tyhjennä kansiot"
 
-#: folders.php:274
+#: folders.php:272
 msgid "Empty Selected Folders"
 msgstr "Tyhjennä valitut kansiot"
 
@@ -1302,44 +1415,53 @@
 msgid "Empty Trash folder"
 msgstr "Tyhjennä roskakorikansio"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:953
+msgid "Empty _Spam"
+msgstr "Tyhjennä ro_skaposti"
+
+#: lib/IMP.php:946
 msgid "Empty _Trash"
 msgstr "_Tyhjennä roskakori"
 
-#: templates/pgp/notactive.inc:16 templates/pgp/pgp.inc:20
+#: templates/pgp/notactive.inc:6 templates/pgp/pgp.inc:1
 msgid "Enable PGP functionality?"
 msgstr "Käytä PGP-toimintoa."
 
-#: templates/smime/notactive.inc:16 templates/smime/smime.inc:20
+#: templates/smime/notactive.inc:6 templates/smime/smime.inc:1
 msgid "Enable S/MIME functionality?"
 msgstr "Käytä S/MIME-toimintoa."
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Käytä viestien esikatselua."
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:437
 msgid "Encr_yption Options"
 msgstr "Salau_ksen asetukset"
 
-#: lib/MIME/Viewer/itip.php:513 lib/MIME/Viewer/itip.php:653
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Salattu"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Päättyy"
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Välitetty viesti päättyy"
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Viestin loppu"
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "%s lähettämän viestin loppu."
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Anna salasanateksti"
 
@@ -1351,7 +1473,7 @@
 msgid "Enter the name for your new drafts folder"
 msgstr "Anna nimi uudelle luonnoskansiollesi"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Anna nimi uudelle lähetettyjen viestien kansiollesi"
 
@@ -1359,92 +1481,98 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Anna nimi uudelle roskakorikansiollesi"
 
-#: search.php:159
+#: lib/Search.php:613
 msgid "Entire Message"
 msgstr "Koko viesti"
 
-#: compose.php:1068 message.php:178 thread.php:39
+#: compose.php:1172 message.php:194 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" lisättiin onnistuneesti osoitekirjaan"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:387
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Virhe"
 
-#: lib/MIME/Viewer/itip.php:305 lib/MIME/Viewer/itip.php:403
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Virhe yhdistettäessä IMAP-palvelimelle. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Virhe lähetettäessä vastausta: %s."
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Tapahtuman poisto onnistui."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "15 minuutin välein"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "30 sekunnin välein"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "5 minuutin välein"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Puolen tunnin välein"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Minuutin välein"
 
-#: folders.php:444
+#: folders.php:438
 msgid "Expand"
 msgstr "Laajenna"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Laajenna kaikki"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Laajenna kaikki kansiot"
 
-#: folders.php:444
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Laajenna kansio"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Laajenna nimet"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Laajenna nimet automaattisesti taustalla viestinkirjoitusikkunassa."
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Laajenna oletuksena koko kansiopuu kansioiden hallinnassa."
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose_expand.js:49 templates/compose/compose.inc:142
+#: templates/compose/compose.inc:192 templates/compose/compose.inc:243
+#: templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Laajennetaan"
 
-#: lib/IMP.php:940 lib/IMP.php:942
+#: lib/IMP.php:964 lib/IMP.php:966
 msgid "F_etch Mail"
 msgstr "Ha_e viestit"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Hae viestit"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "Hae viestit erillisessä ikkunassa."
 
@@ -1452,70 +1580,70 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Hae viestit sisäänkirjautumisen yhteydessä"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
 #, php-format
 msgid "Fetched %d messages from %s"
 msgstr "Haettiin %d viestiä palvelimelta %s"
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr "Haettiin 1 viesti palvelimelta %s"
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Hae viestit: "
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: ei uusia viestejä."
 
-#: lib/IMP.php:946
+#: lib/IMP.php:970
 msgid "Fi_lters"
 msgstr "Suo_dattimet"
 
-#: templates/compose/attachments.js:83 templates/compose/compose.inc:492
+#: templates/compose/attachments.js:40 templates/compose/compose.inc:494
 msgid "File"
 msgstr "Tiedosto"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Suodatin asetukset"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Suodatin asetukset"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Suodata viesti loukkaavista sanoista."
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Tässä järjestelmässä ei voi käyttää suodattimia."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Suodattimet ovat POIS PÄÄLTÄ"
 
-#: lib/Filter.php:106
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Suodatus: %s hallintasivu"
 
-#: templates/contacts/contacts.inc:181
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Haku"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Postilaatikon ensimmäinen sivu"
 
-#: mailbox.php:341
+#: mailbox.php:330
 msgid "First Page"
 msgstr "Ensimmäinen sivu"
 
@@ -1523,67 +1651,51 @@
 msgid "Fo_rward"
 msgstr "Väl_itä"
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:252 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
-msgstr "Kansioiden toimenpiteet - Varmistus"
+msgstr "Kansioon liittyvä toiminto - Varmistus"
 
-#: folders.php:291 templates/prefs/initialpageselect.inc:6
+#: folders.php:289 templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:9
 msgid "Folder Navigator"
 msgstr "Kansioiden hallinta"
 
-#: templates/login/login.inc:172
-msgid "Folder Prefix"
-msgstr "Kansioiden etuliite"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Kansioiden yhteenveto"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "Kansioiden jakaminen ei ole käytössä."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "Kansioita ei voi käyttää."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr ""
 "Ajan esitystapa niille viesteille, joissa on kuluvan päivän päivämäärä."
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Välitä edelleen"
 
-#: compose.php:712
+#: compose.php:805
 msgid "Forward:"
 msgstr "Välitä edelleen:"
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Edelleenvälitetty viesti"
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Edelleenvälitetty viesti lähettäjältä %s"
 
-#: lib/MIME/Viewer/itip.php:479
-msgid "Free/Busy Information"
-msgstr "Vapaa/varattu tiedot"
-
-#: lib/MIME/Viewer/itip.php:490
-msgid "Free/Busy Reply"
-msgstr "Vapaa/varattu vastaus"
-
-#: lib/MIME/Viewer/itip.php:484
-msgid "Free/Busy Request"
-msgstr "Vapaa/varattu pyyntö"
-
-#: lib/MIME/Viewer/itip.php:397
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Vastaus vapaa/varattu pyyntöön"
 
@@ -1591,24 +1703,24 @@
 msgid "Fro_m"
 msgstr "Lähettä_jä"
 
-#: message.php:247 search.php:135 thread.php:93
-#: templates/compose/compose.inc:98
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
 msgstr "Lähettäjä"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "Lähettäjän osoite"
 
-#: compose.php:724 compose.php:728
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1229
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "Fwd: "
 
-#: compose.php:1231
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Fwd: %u edelleenvälitettyä viestiä"
@@ -1622,34 +1734,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Hae vain uudet viestit (vain IMAP)"
 
-#: thread.php:85
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Mene"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Mene viestiin"
 
-#: lib/IMP.php:553
+#: lib/IMP.php:502
 #, php-format
 msgid "Go to address book entry of \"%s\""
-msgstr "Siirry osoitekirjan merkintään \"%s\""
+msgstr "Mene osoitekirja merkintään \"%s\""
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Anna oikeudet"
 
-#: message.php:540 lib/Filter.php:106 lib/MIME/Viewer/notification.php:62
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/notification.php:62
 #: lib/MIME/Viewer/notification.php:68 lib/MIME/Viewer/appledouble.php:41
-#: lib/MIME/Viewer/html.php:128 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/pkcs7.php:407
-#: lib/MIME/Viewer/pgp.php:173 lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/html.php:119 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/pkcs7.php:423
+#: lib/MIME/Viewer/pgp.php:172 lib/MIME/Viewer/related.php:79
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "TÄSTÄ"
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:62
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "Viesti HTML-muodossa"
 
@@ -1661,43 +1779,39 @@
 msgid "Here is the message you were composing:"
 msgstr "Tässä on viesti, jota olit kirjoittamassa:"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Piilotettu keskustelusäienäkymässä"
 
-#: mailbox.php:363
+#: mailbox.php:352
 msgid "Hide Deleted"
 msgstr "Piilota poistetut"
 
-#: folders.php:286
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "Piilota tilaamattomat"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Piilota kuvat"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr "Korkea"
 
-#: mailbox.php:703 message.php:281 templates/mailbox/legend.inc:12
+#: mailbox.php:718 message.php:304 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Korkea prioriteetti"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:291
 msgid "Highest"
 msgstr "Korkein"
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Miten liitetiedostot näytetään?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Miten vastaukseen merkitään kenelle lainatut rivit kuuluvat"
 
@@ -1709,7 +1823,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Tunnista protokolla automaattisesti)"
 
-#: templates/login/login.inc:160 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "IMAP-palvelin sulki yhteyden. Palvelimen ilmoitus: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP ja SSL-salaus"
 
@@ -1717,11 +1836,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP ja SSL-salaus (itse allekirjoitettu varmenne)"
 
-#: templates/login/login.inc:161
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP ja SSL-salaus (itse allekirjoitettu varmenne)"
 
-#: templates/login/login.inc:159 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "IMAP-palvelin sulki yhteyden."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP ei TLS-salausta"
 
@@ -1729,45 +1852,51 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 sähköpostipalvelimet"
 
-#: lib/IMP.php:886
-msgid "INBOX"
-msgstr "INBOX"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Jos käytät SSL tai TLS salausta, niin sinulla pitää olla käytettävissä PHP:n "
+"openssl-laajennus."
 
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
-msgstr "Jos jatkat eteenpäin, niin kaikki viestit kansioissa tuhoutuvat!"
+msgstr "Jos jatkat, niin kaikki viestit kansioissa tuhoutuvat!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Älä huomioi"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Jätä kaikki huomioimatta"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Kuva"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Tuo"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Tuo avain"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Tuo avainpari"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Tuo viestit"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "Tuo PGP-avain"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Tuo henkilökohtaiset sertifikaatit"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Tuo henkilökohtainen sertifikaatti"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1781,7 +1910,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Tuo henkilökohtaiset S/MIME-sertifikaatit"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Tuo julkinen avain"
 
@@ -1806,7 +1935,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Tuo mbox-tiedosto %s kansioon %s."
 
-#: mailbox.php:713 message.php:486 templates/message/navbar_navigate.inc:7
+#: mailbox.php:728 message.php:505 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/legend.inc:7 templates/mailbox/navbar.inc:16
 #: templates/mailbox/navbar.inc:33
 msgid "Important"
@@ -1816,25 +1945,25 @@
 msgid "Important messages"
 msgstr "Tärkeät viestit"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "Tuotiin %d viestiä lähteestä %s."
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "Tekeillä"
 
-#: folders.php:378 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:85
+#: lib/IMP.php:832 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Inbox"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Liitä vastaukseen lyhyt yhteenveto otsaketiedoista."
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Liitä alkuperäinen viesti vastaukseen."
 
@@ -1842,21 +1971,21 @@
 msgid "Info"
 msgstr "Info"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Tietoja %s:n julkisesta avaimesta"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Tietoja omasta salaisesta avaimesta"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Tietoja omasta julkisesta avaimestasi"
 
-#: templates/compose/attachments.inc:15 templates/compose/attachments.js:99
-#: templates/compose/compose.inc:497
+#: templates/compose/attachments.inc:15 templates/compose/attachments.js:56
+#: templates/compose/compose.inc:499
 msgid "Inline"
 msgstr "Viestin yhteydessä"
 
@@ -1876,11 +2005,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Laita julkinen PGP-avain tähän"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Tälle komponentille on valittu väärä toiminto."
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:574 mailbox.php:621
 msgid "Invalid Address"
 msgstr "Epäkelpo osoite"
 
@@ -1888,20 +2017,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr "Virheellinen etäpostilaatikko"
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Epäkelpo merkki sähköpostiosoitteessa: %s."
 
-#: pgp.php:16 smime.php:82
+#: pgp.php:16 smime.php:78
 msgid "Invalid key"
 msgstr "Virheellinen avain"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Virheellinen henkilökohtainen salainen PGP-avain."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Virheellinen henkilökohtainen julkinen PGP-avain."
 
@@ -1909,52 +2038,72 @@
 msgid "Invert"
 msgstr "Käänteinen"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Avaimen pituus"
 
-#: pgp.php:318
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "Avaimen luonti voi viedä pitkän ajan. Jatketaanko avaimen luontia?"
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Avaimien tuonti ei ole käytettävissä. Tälle palvelimelle ei voi tuoda "
+"tiedostoja."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Avaimien tuonti ei ole käytettävissä. Sinulla ei ole osoitekirjaa "
+"määriteltynä yhteystiedoissa."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr "Avaimen lähetys onnistui julkiselle avainpalvelimelle."
 
-#: templates/login/login.inc:196
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Kieli"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Postilaatikon viimeinen sivu"
 
-#: mailbox.php:354
+#: mailbox.php:343
 msgid "Last Page"
 msgstr "Viimeinen sivu"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "Lähetä liitteet linkkinä"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "Linkitä liitetiedostot."
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
-msgstr "Liitetiedostojen tallettaminen on kielletty."
+msgstr "Linkitetyt liitetiedostot on kielletty."
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
-msgstr "Liitteet merkitään poistettaviksi %s"
+msgstr "Linkit vanhentuvat %s"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
-"Näytä kaikki yhteystiedot yhteystiedot ikkunassa (Jos tämä asetus on pois "
+"Näytä kaikki yhteystiedot yhteystiedot-näkymässä (Jos tämä asetus on pois "
 "päältä, niin näytetään vain haetut yhteystiedot)"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Otsikkotietojen tulostus"
 
@@ -1962,20 +2111,20 @@
 msgid "Local Mailbox:"
 msgstr "Paikallinen postikansio:"
 
-#: lib/MIME/Viewer/itip.php:670
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Paikka"
 
-#: templates/login/login.inc:204
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Kirjaudu sisään ohjelmaan %s"
 
-#: templates/login/login.inc:133
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -1983,27 +2132,27 @@
 msgid "Login Tasks"
 msgstr "Tehtävät sisäänkirjautumisessa"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr "Matala"
 
-#: mailbox.php:706 message.php:283 templates/mailbox/legend.inc:13
+#: mailbox.php:721 message.php:306 templates/mailbox/legend.inc:13
 msgid "Low Priority"
-msgstr "Matala prioriteetti"
+msgstr "Alhainen prioriteetti"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:295
 msgid "Lowest"
-msgstr "Matalin"
+msgstr "Alhaisin"
 
 #: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
 msgstr "Macintosh tiedosto"
 
-#: pgp.php:332 smime.php:254 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Viestien esikatselu"
 
@@ -2011,19 +2160,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Postipalvelimen tyyppi, johon otetaan yhteyttä:"
 
-#: folders.php:396
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Kansio"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Postikansio- ja kansionäkymän asetukset"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Merkitse kaikki viestit kansiossa vanhoiksi"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Merkitse kaikki viestit kansiossa uusiksi"
 
@@ -2031,7 +2180,7 @@
 msgid "Mark as:"
 msgstr "Merkitse:"
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Merkitse eri lainaukset eri väreillä."
 
@@ -2039,84 +2188,64 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Merkitse viestit vanhoiksi? (vain IMAP)"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Merkitse yksinkertaisella merkinnällä."
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
-msgstr "Täyttää kaikki hakuehdot"
+msgstr "Täsmäävät kaikki hakuehdot"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
-msgstr "Sopii joihinkin hakuehtoihin"
+msgstr "Sopivat joihinkin hakuehtoihin"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "Maximum Attachment Size"
 msgstr "Liitetiedoston suurin sallittu koko"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Kansioiden enimmäismäärä"
+
+#: templates/compose/compose.inc:487
 msgid "Maximum number of attachments reached."
 msgstr "Liitetiedostoja on suurin sallittu määrä."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:483
 msgid "Maximum total attachment size reached."
 msgstr "Liitetiedostojen yhteenlaskettu koko on suurin sallittu."
 
-#: lib/MIME/Viewer/itip.php:622
-msgid "Meeting Cancellation"
-msgstr "Tapaamisen peruutus"
-
-#: lib/MIME/Viewer/itip.php:571
-msgid "Meeting Information"
-msgstr "Tapaamisen tiedot"
-
-#: lib/MIME/Viewer/itip.php:581
-msgid "Meeting Proposal"
-msgstr "Tapaamisehdotus"
-
-#: lib/MIME/Viewer/itip.php:613
-msgid "Meeting Reply"
-msgstr "Vastaus tapaamiseen"
-
-#: lib/MIME/Viewer/itip.php:594
-msgid "Meeting Update"
-msgstr "Tapaamisen päivitys"
-
-#: lib/MIME/Viewer/itip.php:599
-msgid "Meeting Update Request"
-msgstr "Tapaamisen päivityspyyntö"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Valikko kansiolista"
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Viesti"
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Viestin kirjoitus"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Viestin päiväys"
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Viestiasetukset"
 
-#: search.php:359
+#: search.php:302
 msgid "Message Search"
 msgstr "Haku viestistä"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Viestin koko"
 
-#: message.php:368
+#: message.php:391
 msgid "Message Source"
 msgstr "Viesti raakamuodossa"
 
@@ -2124,10 +2253,6 @@
 msgid "Message Viewing"
 msgstr "Viestin luku"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Viestin kentät"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Viestin tilatiedot"
@@ -2136,45 +2261,45 @@
 msgid "Message folders"
 msgstr "Viestikansiot"
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Viesti lähettäjältä %s"
 
-#: mailbox.php:646
+#: mailbox.php:662
 msgid "Message has attachments"
-msgstr "Viestissä on liitetiedostoja"
+msgstr "Viestissä on liitteitä"
 
-#: mailbox.php:637
+#: mailbox.php:653
 msgid "Message is encrypted"
 msgstr "Viesti on salattu"
 
-#: mailbox.php:632
+#: mailbox.php:648
 msgid "Message is signed"
-msgstr "Viesti on allekirjoitettu"
+msgstr "Viestin on allekirjoitettu"
 
-#: templates/search/header.inc:33
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Viesti täsmää"
 
-#: compose.php:771 compose.php:785
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Viestin ohjaus onnistui."
 
-#: compose.php:1018
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Viestin lähetys onnistui, mutta sitä ei talletettu kansioon %s"
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Viestin lähetys onnistui."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Viestien lukumäärä postikansionäkymässä."
 
-#: mailbox.php:318
+#: mailbox.php:310
 msgid "Messages to"
 msgstr "Viestit kansioon"
 
@@ -2182,10 +2307,10 @@
 msgid "Modify"
 msgstr "Muuta"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
 msgid "More than one address found for field \"%s\"."
-msgstr "Laajennettavalle \"%s\" löytyi useampi kuin yksi vaihtoehto."
+msgstr "Laajennettavalle kentälle \"%s\" löytyi useampi kuin yksi vaihtoehto."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
@@ -2195,6 +2320,12 @@
 msgid "Move down"
 msgstr "Siirrä alaspäin"
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"Siirrä roskapostiviestit roskapostikansioon ja ei roskapostiviestit INBOX "
+"kansioon"
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Siirrä kansioon"
@@ -2207,49 +2338,66 @@
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/smime/smime.inc:24 templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Moniviestinäkymä"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "EI MITÄÄN"
+
+#: templates/smime/smime.inc:2 templates/pgp/pgp.inc:2
 #: templates/fetchmail/manage.inc:48
 msgid "NOTE"
 msgstr "HUOMAA"
 
-#: templates/contacts/contacts.inc:233 lib/MIME/Viewer/itip.php:684
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Nimi"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "Nimi tai sähköpostiosoite ei saa olla tyhjä"
 
-#: lib/MIME/Viewer/itip.php:774
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Vaatii toimenpidettä"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Älä talleta liitetiedostoja"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Uusi"
 
-#: lib/IMP.php:615
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Uusi kansio"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
-msgstr "Uudet viestit"
+msgstr "Tulevat viestit"
+
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Uusi viesti"
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Uusi viesti %s:lle"
 
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Uudet viestit"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2257,15 +2405,16 @@
 msgid "Next Message"
 msgstr "Seuraava viesti"
 
-#: mailbox.php:352
+#: mailbox.php:341
 msgid "Next Page"
 msgstr "Seuraava sivu"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr "Ei"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Varmennetta ei löytynyt"
 
@@ -2273,106 +2422,125 @@
 msgid "No Encryption"
 msgstr "Ei salausta"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Ei ainuttakaan avainta avainrenkaassa"
 
-#: mailbox.php:371
+#: mailbox.php:360
 #, php-format
 msgid "No Messages"
 msgstr "Ei viestejä"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Ei tuotu ainuttakaan julkista PGP-avainta."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Henkilökohtaista varmennetta ei ole saatavilla"
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:333
 msgid "No Preview Text"
-msgstr "Ei esikatseltavaa tekstiä"
+msgstr "Ei esikatselua"
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Julkisia avaimia ei löytynyt"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Ei tuotu ainuttakaan julkista S/MIME-avainta."
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Liitetiedostoja ei löytynyt."
 
-#: acl.php:72 acl.php:98
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Sähköpostitietoja ei ollut julkisessa avaimessa."
+
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Ei kansioita valittuna."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "Yhdestäkään kansioista ei tarkasteta uusia viestejä."
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
 msgid "No folders were specified"
 msgstr "Ei kansioita määritettynä"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "Yhdessäkään kansiossa ei ole uusia viestejä"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "Yhdessäkään kansiossa ei ole lukemattomia viestejä"
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "Ei tekstiä viestin viestiosiossa"
 
-#: lib/Mailbox.php:365
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Viestistä ei tullut sisältöä."
+
+#: lib/Mailbox.php:375
 msgid "No messages matched your search."
 msgstr "Hakuehdoilla ei löytynyt yhtäkään viestiä."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Ei tuotu ainuttakaan salaista PGP-avainta"
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Ei tuotu ainuttakaan julkista PGP-avainta"
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Ei tuotu ainuttakaan henkilökohtaista S/MIME-sertifikaattia."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Salaista avainta ei ole olemassa, joten salattua viestiä ei voi aukaista."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Kirjoitusvirheiden tarkistusohjelmaa ei ole määritelty."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Ei kirjoitusvirheitä"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Ei ehdotuksia"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr "Tuettua IMAP-autentikaatiotapaa ei löytynyt."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Ei käyttäjää määriteltynä."
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Ei osallistuja"
 
-#: templates/prefs/sentmailselect.inc:41 templates/prefs/sourceselect.inc:35
-#: templates/prefs/spamselect.inc:24 templates/mailbox/navbar.inc:11
-#: lib/MIME/Viewer/itip.php:660
+#: templates/prefs/folderselect.inc:24 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: templates/prefs/trashselect.inc:24 templates/mailbox/navbar.inc:11
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Ei mitään"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:293
 msgid "Normal"
 msgstr "Normaali"
 
@@ -2394,10 +2562,9 @@
 msgid "Not Personal"
 msgstr "Ei henkilökohtainen"
 
-#: lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:140 lib/Crypt/SMIME.php:149
-#: lib/Crypt/PGP.php:139
+#: lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149 lib/Crypt/PGP.php:139
 msgid "Not a valid public key."
-msgstr "Epäkelpo julkinen aivain."
+msgstr "Epäkelpo julkinen avain."
 
 #: templates/search/main.inc:67
 msgid "Not deleted messages"
@@ -2411,24 +2578,31 @@
 msgid "Note that this can take some time"
 msgstr "Huomaathan, että tämä voi kestää jonkin aikaa"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Ei mitään"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Ilmoitus: Talletettiin linkitetty liitetiedosto"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Jos viestit poistetaan kuukausittain, niin kuinka monta kuukautta "
-"säilytetään vanhoja talletettuja liitetiedostoja."
+"säilytetään vanhoja linkitettyjä liitetiedostoja."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Jos viestit poistetaan kuukausittain, niin kuinka monta vanhaa lähetettyjen "
 "viestien kansiota säilytetään."
 
-#: templates/contacts/contacts.inc:249 lib/MIME/Viewer/itip.php:548
-#: lib/MIME/Viewer/itip.php:729
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/smime/import_key.inc:47 templates/search/fields.inc:5
+#: templates/smime/import_key.inc:49 templates/search/fields.inc:5
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "TAI"
@@ -2441,43 +2615,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr "Poistetaan viestejä vanhoista lähetettyjen viestien kansioista."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Näytä vain ne kansiot, joissa on lukemattomia viestejä."
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Valitse vain yksi kansio tähän toimintoon."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
 msgstr "Avaa ka_nsio"
 
-#: templates/menu.inc:23
-msgid "Open Folder"
-msgstr "Avaa kansio"
-
-#: folders.php:413
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Avaa kansio"
 
-#: lib/MIME/Viewer/itip.php:701
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Mahdollinen osallistuja"
 
-#: fetchmail.php:33 templates/fetchmail/fetchmail.inc:6
-#: templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/fetchmail.inc:6
+#: templates/fetchmail/top.inc:3
 msgid "Other Mail Accounts"
 msgstr "Muut sähköpostitilit"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Muut asetukset"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:291
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Lähtevä palvelin"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2485,19 +2659,15 @@
 msgid "PGP Encrypt Message"
 msgstr "PGP-salattu viesti"
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP virhe: "
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP virhe: Salainen avain vaatii salasanatekstin"
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP EI ole käytössä"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP Asetukset"
 
@@ -2505,25 +2675,25 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP syotä salasanateksti"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Henkilökohtainen PGP-avainpari vaatii salattua WWW-yhteyttä."
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Julkisen PGP-avaimen teksti"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Julkinen PGP-avain lisäys onnistui osoitteelle: \"%s (%s)\""
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Julkinen PGP-avain poistettiin osoitteelta: \"%s\""
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Julkinen PGP-avainrengas"
 
@@ -2535,35 +2705,35 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "PGP-salaa ja allekirjoita viesti"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Salaisen PGP-avaimen lisäys onnistui."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Julkisen PGP-avaimen lisäys onnistui."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
-msgstr "PGP käyttö on estetty tässä järjestestelmässä."
+msgstr "PGP käyttö on estetty tässä järjestelmässä."
 
-#: lib/MIME/Viewer/pgp.php:209
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 "PGP ei ole käytössä, joten digitaalisia allekirjoituksia ei voi tarkistaa."
 
-#: lib/MIME/Viewer/pgp.php:296
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr "PGP ei ole käytössä, joten salattuja viestejä ei voi aukaista."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "PGP:n käyttö edellyttää ponnahdusikkunoita. Jos selaimesi asetukset estävät "
 "erillisten ikkunoiden avaamisen, niin sinun pitää muuttaa näitä asetuksia "
@@ -2585,7 +2755,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 ja SSL-salaus (itse allekirjoitettu varmenne)"
 
-#: templates/login/login.inc:163
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 ja SSL-salaus (itse allekirjoitettu varmenne)"
 
@@ -2593,16 +2763,16 @@
 msgid "POP3, no TLS"
 msgstr "POP3, ei TLS-salausta"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Sivu %d / %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Sivu, jossa ensimmäinen uusi viesti"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Sivu, jossa on viimeinen uusi viesti"
 
@@ -2610,31 +2780,31 @@
 msgid "Part(s)"
 msgstr "Osa(t)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Salasanateksti"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Salasanateksti (Uudestaan)"
 
-#: pgp.php:310 smime.php:235
+#: pgp.php:306 smime.php:231
 msgid "Passphrase successfully unloaded."
 msgstr "Salasanatekstin poisto onnistui."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Salasanateksti:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr "Salasanateksti ei saa olla tyhjä"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Salasanatekstit eivät täsmää "
 
-#: templates/smime/import_key.inc:69 templates/login/login.inc:190
+#: templates/smime/import_key.inc:71 templates/login/login.inc:191
 #: templates/fetchmail/manage.inc:20
 msgid "Password"
 msgstr "Salasana"
@@ -2643,11 +2813,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Suorita ylläpitotoimenpiteet sisäänkirjautumisen yhteydessä."
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "Tämän käyttäjän oikeuksia ei voi muuttaa."
 
-#: mailbox.php:682 message.php:477 templates/mailbox/legend.inc:10
+#: mailbox.php:697 message.php:493 templates/mailbox/legend.inc:10
 #: templates/mailbox/navbar.inc:24
 msgid "Personal"
 msgstr "Henkilökohtainen"
@@ -2656,39 +2826,49 @@
 msgid "Personal Information"
 msgstr "Omat tiedot"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Henkilökohtaisen PGP-avainparin luonti onnistui."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Henkilökohtaisten PGP-avaimien poisto onnistui."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
-msgstr "Henkilökohtaisia S/MIME-sertifikaatteja EI tuotu: "
+msgstr "Henkilökohtaisia S/MIME-varmenteita EI tuotu: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Henkilökohtaisten S/MIME-avaimien poisto onnistui."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Laita allekirjoitus vastausviestien ja välitettävien viestien alkuun."
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Viesti tekstimuodossa."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Soita ääni uusista viesteistä? Tämä toiminto vaatii selaimeen liitettyjä "
+"äänitiedostoja. Lähes kaikki selaimet Windows ja Mac alustalla sisältävät "
+"äänitiedostoja, mutta muilla alustoilla saatetaan tarvita laajennuksia."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Anna uuden kansion nimi:"
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Anna uuden kansion nimi:"
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Anna uusi nimi:"
 
@@ -2710,7 +2890,7 @@
 "Anna salaisen S/MIME-avaimen salasanateksti. Sinun pitää antaa tämä teksti "
 "vain kerran %s-istunnon aikana."
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2723,43 +2903,31 @@
 "mahdolliset hyökkääjät eivät saa tietää session ID tietojasi. Pyydämme jo "
 "etukäteen anteeksi aiheuttamaamme häiriötä."
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Anna salasanasi."
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Anna käyttäjätunnuksesi."
 
-#: compose.php:79 lib/IMP.php:509
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Korjaa epämääräinen tai virheellinen osoite."
 
-#: lib/MIME/Viewer/itip.php:638
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Tarkista seuraavat tiedot ja valitse sen jälkeen toiminto allaolevasta "
-"valikosta."
-
-#: templates/folders/javascript.inc:53
-msgid "Please select a folder before you perform any actions."
-msgstr "Valitse kansio ennen tehtävän suorittamista."
-
-#: lib/MIME/Viewer/itip.php:498
-msgid "Please select an action from the menu below."
-msgstr "Valitse toiminto allaolevasta valikosta."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Valitse kansio ennen tämän toiminnon suorittamista."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Valitse ainakin yksi kansio, josta haetaan."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Valitse tälle operaatiolle vain yksi kansio."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Valitse tai muokkaa oikean puoleisessa laatikossa:"
 
@@ -2767,11 +2935,11 @@
 msgid "Powered by Horde"
 msgstr "Käyttää Hordea"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Laita allekirjoituksen eteen erottimet ('-- ')"
 
-#: filterprefs.php:40 pgp.php:257 smime.php:241
+#: filterprefs.php:39 pgp.php:253 smime.php:237
 msgid "Preferences successfully updated."
 msgstr "Asetuksien päivitys onnistui."
 
@@ -2783,11 +2951,11 @@
 msgid "Previous Message"
 msgstr "Edellinen viesti"
 
-#: mailbox.php:343
+#: mailbox.php:332
 msgid "Previous Page"
 msgstr "Edellinen sivu"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Tulosta"
 
@@ -2795,56 +2963,56 @@
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Salaisen avaimesi salasana"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
-msgstr "Kysy joka kerta kun lähetetään liitetidosto; Oletuksena EI"
+msgstr "Kysy joka kerta kun lähetetään liitetiedosto; Oletuksena EI"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
-msgstr "Kysy joka kerta kun lähetetään liitetidosto; Oletuksena KYLLÄ"
+msgstr "Kysy joka kerta kun lähetetään liitetiedosto; Oletuksena KYLLÄ"
 
 #: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Julkisen PGP-avainpalvelimen käyttö on estetty."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Tu_hoa poistetut"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Tuhoa poistetut"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Tuhoa poistetut kansioista"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Miten usein roskakori kansio tyhjennetään:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Poista näin monen päivän ikäiset viestit roskakorikansiosta."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Poista vanhat viestit roskakorikansiosta."
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr "Poistettiin %d viestiä roskakorikansiosta."
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr "Poistettiin 1 viesti roskakorikansiosta."
 
@@ -2863,24 +3031,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Postikiintiö: EI RAJOITUSTA"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Lainaus %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "Py_ydä ilmoitus viestin perillemenosta"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Rakkenna kansiopuu uudelleen"
 
-#: search.php:163
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Saapui perille"
 
-#: search.php:171
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Saapui perille jälkeen"
 
-#: search.php:167
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Saapui perille ennen"
 
@@ -2892,23 +3060,19 @@
 msgid "Redirect"
 msgstr "Uudelleenohjaa"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Uudelleenohjaa viesti"
 
-#: compose.php:734
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Uudelleenohjaa tämä viesti"
 
-#: compose.php:794
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Uudelleenohjaus epäonnistui."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Päivitä"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Päivitä postikansionäkymää:"
 
@@ -2920,11 +3084,11 @@
 msgid "Reload View"
 msgstr "Lataa näkymä uudestaan"
 
-#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Muista vapaa/varattu tiedot."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Muista edellinen näkymä"
 
@@ -2940,15 +3104,15 @@
 msgid "Remove source"
 msgstr "poista lähde"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Nimeä kansiot uudelleen"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Nimeä lähetettyjen viestien kansio uudelleen kuukauden alussa."
 
-#: lib/Folder.php:440
+#: lib/Folder.php:425
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -2958,7 +3122,7 @@
 msgid "Repl_y to List"
 msgstr "Vasta_a listalle"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Korvaa vaihtoehdolla:"
 
@@ -2966,7 +3130,7 @@
 msgid "Reply"
 msgstr "Vastaa"
 
-#: lib/MIME/Viewer/itip.php:307 lib/MIME/Viewer/itip.php:405
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Vastaus lähetetty."
 
@@ -2974,7 +3138,7 @@
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: compose.php:680
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Vastaa kaikille:"
 
@@ -2982,7 +3146,7 @@
 msgid "Reply to List"
 msgstr "Vastaa listalle"
 
-#: compose.php:682
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Vastaa listalle:"
 
@@ -2990,107 +3154,101 @@
 msgid "Reply to _All"
 msgstr "_Vastaa kaikille"
 
-#: lib/MIME/Viewer/itip.php:524 lib/MIME/Viewer/itip.php:533
-#: lib/MIME/Viewer/itip.php:543
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Lähetä vastausviesti ei-tuetussa muodossa."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr ""
 "Lähetä vastauksena vapaa/varattu tiedot seuraavalle kahdelle kuukaudelle."
 
-#: lib/MIME/Viewer/itip.php:530
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Lähetä vastauksena pyydetyt vapaa/varattu tiedot."
 
-#: message.php:251
+#: message.php:274
 msgid "Reply-To"
 msgstr "Vastausosoite"
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Vastausosoite: "
 
-#: compose.php:678
+#: compose.php:769
 msgid "Reply:"
 msgstr "Vastaus:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Ilmoita harmittomana"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Ilmoita roskapostina"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:384
 msgid "Request a _Read Receipt"
 msgstr "_Pyydä ilmoitus viestin lukemisesta"
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr "Pyydä ilmoitus viestin perillemenosta."
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Pyydä ilmoitus viestin lukemisesta."
 
-#: mailbox.php:204
+#: mailbox.php:188
 msgid "Requested message not found."
-msgstr "Pyydettyä viestieä ei löytynyt."
+msgstr "Pyydettyä viestiä ei löytynyt."
 
-#: lib/MIME/Viewer/itip.php:693
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Pakollinen osallistuja"
 
-#: templates/search/header.inc:26 templates/search/main.inc:143
-#: templates/acl/acl.inc:158
+#: templates/search/header.inc:29 templates/search/main.inc:140
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Tyhjennä"
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Vastaajan tilatiedot on päivitetty"
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Jatka"
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Jatka istuntoasi"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Palaa \"Viestin kirjoitukseen\""
+
 #: templates/fetchmail/driver_select.inc:31
-#: templates/fetchmail/account_select.inc:32 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:31 templates/fetchmail/manage.inc:69
 msgid "Return to Fetch Mail"
 msgstr "Palaa takaisin Hae viesteihin"
 
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-#: templates/filters/notactive.inc:13 templates/filters/prefs.inc:70
-msgid "Return to Main Preferences Screen"
-msgstr "Palaa asetuksien pääsivulle"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/smime/notactive.inc:15 templates/smime/smime.inc:101
+#: templates/pgp/notactive.inc:15 templates/pgp/pgp.inc:149
+#: templates/filters/notactive.inc:22 templates/filters/prefs.inc:60
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Palaa asetuksiin"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Palaa edelliselle sivulle."
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Palaa postikansiosivulle kun viesti on poistettu, siirretty tai kopioitu."
 
-#: lib/MIME/Viewer/itip.php:684
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Rooli"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3098,44 +3256,40 @@
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME salattu viesti"
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME virhe: "
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr "S/MIME Virhe: Salainen avain vaatii salasanatekstin"
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME EI ole käytössä"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
-msgstr "S/MIME-Asetukset"
+msgstr "S/MIME-asetukset"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
-msgstr "S/MIME syotä salasanateksti"
+msgstr "S/MIME syötä salasanateksti"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr "Henkilökohtainen S/MIME-avainpari vaatii salattua WWW-yhteyttä."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr "Julkinen S/MIME-avain poistettiin osoitteelta \"%s\""
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Julkisen S/MIME-avaimen lisäys onnistui."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Julkinen S/MIME-avainrengas"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Julkinen/Salainen S/MIME-avainparin lisäys onnistui."
 
@@ -3147,25 +3301,25 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "S/MIME-salaa ja allekirjoita viesti"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
-msgstr "S/MIME käyttö on estetty tässä järjestestelmässä."
+msgstr "S/MIME käyttö on estetty tässä järjestelmässä."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr "S/MIME ei ole käytössä, joten salattuja viestejä ei voida aukaista."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 "S/MIME ei ole käytössä, joten tämän digitaalisesti allekirjoitetun viestin "
 "sisältöä ei voida näyttää."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3173,86 +3327,106 @@
 "S/MIME ei ole käytössä, joten digitaalisia allekirjoituksia ei voida "
 "tarkistaa."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "S/MIME:n käyttö edellyttää ponnahdusikkunoita. Jos selaimesi asetukset "
 "estävät erillisten ikkunoiden avaamisen, niin sinun pitää muuttaa näitä "
 "asetusta tai et voi käyttää S/MIME-toimintoja."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
+
+#: templates/compose/compose.inc:253
 msgid "S_ubject"
 msgstr "Ot_sikko"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:361
 msgid "Sa_ve a copy in "
 msgstr "Ta_lleta kopio kansioon "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Ta_lleta nimellä"
 
-#: search.php:363 templates/fetchmail/manage.inc:67
+#: search.php:304 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Talleta"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:534
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Talleta liitetiedostot viestien mukana lähetettyjen viestien kansioon."
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save Draft"
 msgstr "Talleta luonnos"
 
-#: templates/smime/notactive.inc:23 templates/smime/smime.inc:37
-#: templates/pgp/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/filters/prefs.inc:69
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Talleta kuva"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "talleta kuva galleriaan"
+
+#: templates/smime/notactive.inc:13 templates/smime/smime.inc:100
+#: templates/pgp/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/filters/prefs.inc:59
 msgid "Save Options"
 msgstr "Talleta asetukset"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Talleta kirjepohja"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save _Draft"
 msgstr "Talleta _luonnos"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Talleta nimellä"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Talleta luonnokset tilatiedolla uusi"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr "Talleta vastaanottajat automaattisesti oletusosoitekirjaan."
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:123
 msgid "Save search as a virtual folder?"
 msgstr "Talletetaanko haku virtuaaliseen kansioon?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Talleta lähtevä viesti."
 
-#: compose.php:1162
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Luonnosviestin talletus epäonnistui. Palvelimen virheilmoitus oli: %s"
 
-#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:194
-#: lib/Block/tree_folders.php:50
+#: templates/mailbox/header.inc:11 templates/contacts/contacts.inc:199
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Haku"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Haku %s"
 
-#: search.php:316
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Haun asetukset"
+
+#: search.php:258
 msgid "Search Results"
 msgstr "Haun tulokset"
 
@@ -3276,7 +3450,11 @@
 msgid "Select a field"
 msgstr "Valitse kenttä"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr "Valitse kirjepohja:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 "Voit valita osoitekirjat, joihin lisätään ja joista haetaan osoitteita."
@@ -3297,6 +3475,10 @@
 msgid "Select none"
 msgstr "Poista valinnat"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Valitse galleria, johon kuva talletetaan."
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Valitse postipalvelimen tyyppi"
@@ -3305,32 +3487,36 @@
 msgid "Selected Address books:"
 msgstr "Valitse osoitekirjat:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Lähetä avain julkiselle avainpalvelimelle"
 
-#: lib/MIME/Viewer/itip.php:600
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: config/prefs.php.dist:698
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Lähetä viesti ilman otsikkoa?"
+
+#: config/prefs.php.dist:692
 msgid "Send read receipt when requested by the sender?"
-msgstr "Lähetä lukuilmoitus kun lähettäjä on sitä pyytänyt."
+msgstr "Lähetä lukukuittaus kun lähettäjä on sitä pyytänyt."
 
-#: folders.php:391
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "Lähetettyjen viestien kansio"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Lähetettyjen viestien kansio:"
 
-#: templates/login/login.inc:129 templates/login/login.inc:142
-#: templates/login/login.inc:149
+#: templates/login/login.inc:133 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Palvelin"
 
@@ -3347,7 +3533,7 @@
 msgstr ""
 "Voit muuttaa viestin kopioimiseen tai siirtämiseen liittyviä asetuksia."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Aseta X-Priority kenttä viestin kirjoituksessa."
 
@@ -3363,7 +3549,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Voit antaa toisille käyttäjille oikeuksia kansioihisi."
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3371,15 +3557,15 @@
 "Näytä tai piilota oletuksena viestistä suuret tekstilainaukset. Asetuksen "
 "voi muuttaa helposti milloin tahansa."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Etsi text/plain tyyppisistä viesteistä PGP-tietoja."
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Sulje viestinkirjoitusikkuna kun viesti on talletettu luonnoskansioon."
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr "Liitä oletuksena julkinen PGP-avaimesi lähteviin viesteihin."
 
@@ -3391,7 +3577,7 @@
 msgid "Show All Headers"
 msgstr "Näytä kaikki otsikkotiedot"
 
-#: mailbox.php:361
+#: mailbox.php:350
 msgid "Show Deleted"
 msgstr "Näytä poistetut"
 
@@ -3407,43 +3593,43 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Näytä vain tilatut kansiot"
 
-#: folders.php:286
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Näytä tilaamattomat"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Näytä ikoni, jos liitteen voi poistaa viestistä."
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "Näytä viestin tilojen selite postikansionäkymässä."
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Käytä esikatselua vain lukemattomiin viesteihin."
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr "Näytä esikatselu tooltips:eissä."
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Näytä \"Hae viestit\"-ikoni muiden ikonien joukossa."
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Näytä kuvat"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Näytä \"Suodatin\"-ikoni muiden ikonien joukossa."
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Näytä viestien lukumäärä kansiossa."
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Näytetty"
 
@@ -3451,10 +3637,6 @@
 msgid "Si_ze"
 msgstr "Ko_ko"
 
-#: templates/login/login.inc:210
-msgid "Sign up if not registered"
-msgstr "Kirjaudu, jos et ole vielä rekisteröitynyt"
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Allekirjoitettu"
@@ -3463,10 +3645,6 @@
 msgid "Size"
 msgstr "Koko"
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr "Järjestyksen suunta"
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Järjestä tuloajan mukaan"
@@ -3499,39 +3677,60 @@
 msgid "Spam folder:"
 msgstr "Roskapostikansio:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:344
 msgid "Special Characters"
 msgstr "Erikoismerkit"
 
-#: templates/compose/compose.inc:334
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Erityisiä virtuaalikansioita ei voi muokata."
+
+#: templates/compose/compose.inc:341
 msgid "Spell Check"
 msgstr "Tarkista oikeinkirjoitus"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Oikeinkirjoitus"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Oikeinkirjoitus on tarkistettu"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Montako kirjoitusvirhettä näytetään yhdeltä sivulta?"
 
-#: lib/MIME/Viewer/itip.php:508 lib/MIME/Viewer/itip.php:648
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Alkaa"
 
-#: lib/MIME/Viewer/itip.php:684
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr "Kirjepohja"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Kirjepohjan nimi:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Kirjepohjan tyyppi"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Kirjepohja:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Tila"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Poista liitetiedosto"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Poista rivinvaihdot."
 
@@ -3539,61 +3738,62 @@
 msgid "Sub_ject"
 msgstr "Ots_ikko"
 
-#: message.php:252 search.php:151 templates/compose/recompose.inc:25
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Otsikko"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Otsikkokenttä"
 
-#: search.php:365 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:306 templates/smime/passphrase.inc:20
+#: templates/saveimage/saveimage.inc:18 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Lähetä"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Tilaa kansiot"
 
-#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:390
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Onnistui"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Ehdotukset"
 
-#: lib/MIME/Viewer/itip.php:658 lib/MIME/Viewer/itip.php:660
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
 msgid "Switch Composition Method"
 msgstr "Vaihda kirjoitustilaa"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to HTML composition"
 msgstr "Vaihda HTML-tilaan"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to plain text composition"
 msgstr "Vaihda tekstitilaan"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:414
 msgid "Te_xt"
 msgstr "Te_ksti"
 
-#: lib/MIME/Viewer/itip.php:265
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
-msgstr "Alustavasti hyväksytty: "
+msgstr "Alustavasti: "
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Hyväksy pyyntö alustavasti"
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
@@ -3602,10 +3802,22 @@
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Terms of Service -tiedostoa ei ole määritelty conf.php tiedostossa"
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Teksti"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "Viestin Lähettäjä: rivi on linkki: "
 
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"IMAP-palvelin ei näytä tukevan valittua autentikointitapaa. Ota yhteyttä "
+"järjestelmä ylläpitoon."
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Macintosh tiedoston resurssiosio"
@@ -3625,48 +3837,35 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Sähköpostitili \"%s\" on talletettu."
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Sähköpostiosoite \"%s\" on lisätty %s:ään."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Liitetiedostoa ei löytynyt"
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "Epäkelpo kalenteritieto"
 
-#: templates/javascript/open_compose_win.js:37
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Viestinkirjoitusikkunaa ei voitu avata. Oletko mahdollisesti kieltänyt "
-"selaintasi aukaisemasta ponnahdusikkunoita?"
-
 #: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Macintosh tiedoston sisältö on alla."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Nykyiset kansiot \"%s\" nimetään uudelleen \"%s\":ksi."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "Ei voitu hakea listaa niistä käyttäjistä, joilla on oikeus tähän kansioon."
 
-#: compose.php:1171
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Luonnos on talletettu kansioon \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Tapahtuma lisättiin kalenteriisi."
 
@@ -3675,12 +3874,12 @@
 msgid "The field \"%s\" can't be expanded."
 msgstr "Kenttää \"%s\" ei voi laajentaa."
 
-#: lib/Folder.php:328
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Kansio \"%s\" on jo olemassa"
 
-#: lib/Folder.php:171
+#: lib/Folder.php:150
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3689,46 +3888,54 @@
 "Kansion nimessä \"%s\" on kiellettyjä kirjaimia. Nämä kirjaimet voivat "
 "aiheuttaa ongelmia. Ota yhteyttä järjestelmän ylläpitäjään."
 
-#: lib/Folder.php:347
+#: lib/Folder.php:312
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Kansio \"%s\" on luotu, mutta et ole vielä tilannut sitä."
 
-#: lib/Folder.php:285
+#: lib/Folder.php:229
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Kansio \"%s\" on poistettu mutta sen tilausta ei lopetettu."
 
-#: lib/Folder.php:334
+#: lib/Folder.php:299
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Kansiota \"%s\" ei voitu luoda. Palvelimen virheilmoitus oli"
 
-#: lib/Folder.php:278
+#: lib/Folder.php:222
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Kansiota \"%s\" ei poistettu. Palvelimen virheilmoitus oli"
 
-#: lib/Folder.php:350
+#: lib/Folder.php:315
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Kansio \"%s\" on luotu."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:232
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Kansio \"%s\" on poistettu."
 
-#: lib/Folder.php:438
+#: lib/Folder.php:421
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Kansio \"%s\" on nimetty \"%s\":ksi."
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Tähän osioon on liitetty liitetiedostot:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Viestinkirjoitusikkunaa ei voitu avata. Oletko mahdollisesti kieltänyt "
+"selaintasi aukaisemasta ponnahdusikkunoita?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3746,12 +3953,12 @@
 msgid "The mail server generated the following message:"
 msgstr "Postipalvelimelta tuli viesti:"
 
-#: lib/Message.php:614
+#: lib/Message.php:687
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Postikansio %s on jo tyhjä."
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3762,28 +3969,24 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Kirjoittamasi viesti on suljettu.  Poistutaan."
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Viestissä ei ole otsikkoa."
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Viesti on poistettu."
 
-#: lib/MIME/Viewer/pgp.php:394
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Viesti on tarkastettu."
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:389
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Viesti on tarkastettu. Lähettäjä: %s."
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Salasanatekstin ikkunaan ei voida aukaista. Oletko mahdollisesti kieltänyt "
-"selaintasi aukaisemasta ponnahdusikkunoita?"
-
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr "Lukeaksesi julkisen PGP-avaimen tekstin raakamuodossa %s."
@@ -3796,7 +3999,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Valittua tiedostoa ei ollut Zip-tiedostossa."
 
-#: message.php:541
+#: message.php:550
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3807,15 +4010,15 @@
 "ilmoitusviestiä kun olet lukenut tämän viestin. Napsauta %s lähettääksesi "
 "tämän ilmoitusviestin."
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
-msgstr "Palvelin ei pystynyt muodostamaan pikkukuvaa tästä kuvasta."
+msgstr "Palvelin ei voinut luoda pikkukuvaa tästä kuvasta."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "Allekirjoitusta ei voitu korvata."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Allekirjoitus on korvattu uudella."
 
@@ -3823,7 +4026,22 @@
 msgid "The specified file does not exist."
 msgstr "Valittua tiedostoa ei ole olemassa."
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:85
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Kirjepohja \"%s\" on lisätty."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Kirjepohja \"%s\" on poistettu."
+
+#: stationery.php:88
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Kirjepohja \"%s\" on päivitetty."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "Tehtävä on lisätty tehtävälistaasi."
 
@@ -3847,14 +4065,14 @@
 
 #: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
-msgstr "Lähetetyn viestin teksti"
+msgstr "Lähetetyn viestit teksti"
 
 #: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
 msgstr "Voit katsoa lähetetyn viestin tekstin %s."
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Käyttäjän vapaa/varattu tietojen talletus onnistui."
 
@@ -3866,25 +4084,16 @@
 msgid "There are no messages in this mailbox."
 msgstr "Tässä kansiossa ei ole viestejä."
 
-#: thread.php:69
+#: thread.php:110
 msgid "There is no text that can be displayed inline."
-msgstr "Ei ole tekstiosio osia, jotka voidaan näyttää viestien yhteydessä."
+msgstr "Ei ole tekstiä, joka voidaan näyttää viestien yhteydessä."
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Kansion %s tyhjentämisessä oli ongelmia. Palvelimen virheilmoitus oli"
-
-#: lib/Message.php:616
+#: lib/Message.php:689
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Kansion tyhjentämisessä oli ongelmia. Palvelimen virheilmoitus oli: %s"
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Kansion tyhjentämisessä oli ongelmia. Palvelimen virheilmoitus oli"
-
-#: lib/Message.php:92
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3893,7 +4102,7 @@
 "Tapahtui virhe kopioidessa viestejä kansiosta \"%s\" kansioon \"%s\". "
 "Palvelimen virheilmoitus oli"
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3902,7 +4111,7 @@
 "Tapahtui virhe poistettaessa viestejä kansiosta \"%s\". Palvelimen "
 "virheilmoitus oli"
 
-#: lib/Message.php:277
+#: lib/Message.php:318
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3911,13 +4120,13 @@
 "Tapahtui virhe poistettaessa viestejä kansiossa \"%s\". Palvelimen "
 "virheilmoitus oli"
 
-#: lib/Message.php:213
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr ""
 "Tapahtui virhe poistettaessa viestejä. Palvelimen virheilmoitus oli: %s"
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Tapahtui virhe poistettaessa tapahtumaa: %s"
@@ -3926,7 +4135,7 @@
 msgid "There was an error displaying this message part"
 msgstr "Tapahtui virhe näytettäessä viestin tätä osiota"
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:591
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3935,27 +4144,27 @@
 "Tapahtui jokin virhe asetettaessa merkkilippuja kansion \"%s\" viesteihin. "
 "Palvelimen virheilmoitus oli"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Tapahtui jokin virhe tuotaessa lähteestä %s."
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Tapahtui virhe tuotaessa tapahtumaa: %s."
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Tapahtui virhe tuotaessa tätä tehtävää: %s."
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "Käyttäjän vapaa/varattu tietojen tuonnissa tapahtui virhe: %s."
 
-#: lib/Message.php:87
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3964,51 +4173,47 @@
 "Tapahtui jokin virhe siirettäessä viestejä kansiosta \"%s\" kansioon \"%s\". "
 "Palvelimen virheilmoitus oli"
 
-#: compose.php:1179
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr "Tapahtui jokin virhe luonnosviestiä tallettaessa."
 
-#: compose.php:940
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Tapahtui virhe lähetettäessä viestiäsi: %s"
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Tapahtui virhe päivitettäessä tapahtumaa: %s"
 
-#: lib/MIME/Viewer/plain.php:59
-msgid "There was no text in this message part"
-msgstr "Tässä osiossa ei ollut tekstiä"
-
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "Tässä HTML-viestissä on kuvia upotettuina."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
-"Tässä HTML-viestissä on kuvia upotettuina. Upotetut kuvat näyttävät "
-"tälläisilta: "
+"Tässä HTML-viestissä on kuvia upotettuina. Estetetyt kuvat näyttävät "
+"tämänlaisina: "
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Tämä julkinen PGP-avain oli liitetty viestiin."
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:310
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Tämä toiminto ei ole tuettu."
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:415
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Tämä toiminto ei ole vielä toteutettu."
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "Tämä voi kestää jonkin aikaa. Oletko aivan varma?"
 
@@ -4016,7 +4221,7 @@
 msgid "This message contains a Macintosh file."
 msgstr "Tämä viesti sisältää Macintosh tiedoston."
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:415
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
@@ -4024,7 +4229,7 @@
 "Tässä viestissä on liitetiedosto, joka on digitaalisesti allerkirjoitettu S/"
 "MIME:llä."
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr "Tässä viestissä on liitetiedosto, joka on salattu käyttäen S/MIME:ä."
 
@@ -4036,12 +4241,12 @@
 "Tämä viesti sisältää viestin perillemenoon liittyvää tietoa, mutta viestin "
 "muoto on tuntematon."
 
-#: lib/MIME/Viewer/pgp.php:316
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Tämä viesti ei vaikuta PGP-salatulta viestiltä. Virheilmoitus: "
 
-#: lib/MIME/Viewer/pgp.php:241 lib/MIME/Viewer/pgp.php:351
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
@@ -4049,31 +4254,31 @@
 "Tämä viesti ei näytä olevan oikeassa PGP-muodossa (muoto on määritelty RFC "
 "2015 dokumentissa)."
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
-msgstr "Tämä viesti ei näytä olevan oikeassa S/MIME-formaatissa."
+msgstr "Tämä viesti ei näytä olevan oikeassa S/MIME-muodossa."
 
-#: lib/MIME/Viewer/pgp.php:206 lib/MIME/Viewer/pgp.php:417
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Tämä on PGP:llä digitaalisesti allekirjoitettu viesti."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Tämä on S/MIME:llä digitaalisesti allekirjoitettu viesti."
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Tämä S/MIME:llä salattu viesti."
 
-#: lib/MIME/Viewer/pgp.php:202 lib/MIME/Viewer/pgp.php:292
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Tämä PGP:llä salattu viesti."
 
-#: message.php:195
+#: message.php:210
 msgid "This message to"
 msgstr "Tämä viesti kansioon"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Tämä palvelin ei tue kansioiden jakamista."
 
@@ -4081,18 +4286,21 @@
 msgid "This window must be called from a compose window."
 msgstr "Tämän ikkunan voi aukaista vain viestinkirjoitusikkunasta"
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Keskustelusäienäkymä"
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Keskustelusäikeittäin"
 
-#: mailbox.php:585 message.php:248 search.php:139
-#: templates/mailbox/message_headers.inc:22
-#: templates/contacts/contacts.inc:214 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: mailbox.php:601 message.php:271 templates/mailbox/message_headers.inc:22
+#: templates/contacts/contacts.inc:219 templates/compose/recompose.inc:10
+#: templates/compose/redirect.inc:61 lib/Search.php:593
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "Vastaanottajan osoite"
 
@@ -4104,11 +4312,19 @@
 "Voidaksesi valita useampia vaihtoehtoja, pidä pohjassa Control/Option -"
 "näppäintä kun napsautat hiiren painiketta."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"Käyttääksesi TLS-yhteyttä sinulla pitää olla käytössä PHP versio 5.1.0 tai "
+"sitä uudempi."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Liitetiedostojen koko yhteensä:"
 
-#: folders.php:382
+#: folders.php:369
 msgid "Trash folder"
 msgstr "Roskakorikansio"
 
@@ -4116,8 +4332,8 @@
 msgid "Trash folder:"
 msgstr "Roskakorikansio:"
 
-#: lib/Quota/courier.php:53 lib/Quota/command.php:72 lib/Quota/logfile.php:88
-#: lib/Quota/cyrus.php:65 lib/Quota/cyrusgqr.php:44 lib/Quota/cyrusgqr.php:77
+#: lib/Quota/courier.php:53 lib/Quota/command.php:71 lib/Quota/logfile.php:88
+#: lib/Quota/cyrus.php:64 lib/Quota/cyrusgqr.php:44 lib/Quota/cyrusgqr.php:77
 #: lib/Quota/mdaemon.php:48 lib/Quota/mercury32.php:79
 msgid "Unable to retrieve quota"
 msgstr "Postikiintiötietoja ei voitu hakea."
@@ -4135,28 +4351,45 @@
 msgid "Undelete"
 msgstr "Palauta"
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Salatuille vastaanottajille"
 
-#: lib/MIME/Viewer/itip.php:443
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Palvelin lähetti odottamattoman vastauksen AUTHENTICATE komentoon."
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Palvelin lähetti odottamattoman Digest-MD5 vastauksen."
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Palvelin lähetti odottamattoman vastauksen LOGIN komentoon."
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Komponenttityypille ei ole käsittelijää: %s"
 
-#: mailbox.php:544
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "Tuntematon päivämäärä"
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Tuntematon vastaus IMAP-palvelimelta. Palvelimen ilmoitus oli: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Tuntematon tapaaminen"
 
-#: mailbox.php:597
+#: mailbox.php:613
 msgid "Unknown Recipient"
 msgstr "Tuntematon vastaanottaja"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Poista salasanateksti"
 
@@ -4164,47 +4397,51 @@
 msgid "Unnamed"
 msgstr "Nimetön"
 
-#: mailbox.php:687 message.php:483 templates/message/navbar_navigate.inc:6
+#: mailbox.php:702 message.php:502 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/legend.inc:5 templates/mailbox/navbar.inc:15
 #: templates/mailbox/navbar.inc:32
 msgid "Unseen"
 msgstr "Uusi"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Lopeta kansioiden tilaus"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Päivitä liitetiedoston tiedot"
+#: templates/compose/compose.inc:513
+msgid "Update"
+msgstr "Päivitä"
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tilatiedot"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Tuo"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Käytä oletusarvoa"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Käytä IMAP-protokollan kansioiden tilausta."
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Käytä virtuaalista roskakorikansiota."
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Käyttäjä"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr "Käyttäjälle \"%s\" onnistuttiin antamaan oikeudet kansioon \"%s\"."
 
-#: templates/login/login.inc:178
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
@@ -4212,100 +4449,128 @@
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Näytä"
 
-#: lib/MIME/Viewer/tnef.php:108 lib/MIME/Viewer/zip.php:92
+#: lib/MIME/Viewer/tnef.php:110 lib/MIME/Viewer/zip.php:92
 #, php-format
 msgid "View %s"
 msgstr "Näytä %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Näytä julkinen avain %s"
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "Näytä viestien HTML-muotoinen sisältö erillisessä ikkunassa"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Näytä viestit"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Näytä henkilökohtainen salainen avain"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Näytä henkilökohtainen julkinen avain"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Näytä Keskustelusäie"
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Näytä pikkukuva"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:423
 msgid "View attachment in a separate window"
 msgstr "Näytä liite erillisessä ikkunassa"
 
-#: lib/MIME/Viewer/related.php:61
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "Näytä viestin sisältö erillisessä ikkunassa"
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Näytä tapahtuma"
 
-#: folders.php:374 mailbox.php:513
+#: folders.php:361 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "Näytä viestit kansiossa %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Näkymä tai postikansio, joka näytetään sisäänkirjautumisen jälkeen:"
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Näytä tehtävä"
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Näytä kuvat"
 
-#: search.php:314
+#: search.php:255
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Virtuaalikansio \"%s\" on luotu."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtuaalikansiot"
 
-#: search.php:296
+#: search.php:247
 msgid "Virtual Folders require a label."
 msgstr "Virtuaalikansioille pitää antaa nimi."
 
-#: templates/search/main.inc:133
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Virtuaalinen INBOX"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Virtuaalinen INBOX-kansio"
+
+#: lib/Mailbox.php:171 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Virtuaalinen roskakori"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Virtuaalinen roskakorikansio"
+
+#: templates/search/main.inc:129
 msgid "Virtual folder label"
 msgstr "Virtuaalikansion nimi"
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr "Varoitus"
 
-#: login.php:130
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Tervetuloa ohjelmaan %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Mitä tehdään roskapostiviesteille kun ne on raportoitu joko roskapostina tai "
+"ei roskapostina."
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4313,33 +4578,30 @@
 "Kun viestejä poistetaan, siirrä ne roskakorikansioon sen sijaan, että ne "
 "merkittäisiin poistetuksi."
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Kun uusi postikansio aukaistaan, niin miltä sivulta haluat aloittaa?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr ""
 "Talletettaessa lähteviä viestejä, talleta myös lähetetty liitetiedosto."
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
 msgstr ""
-"Kun viestejä lähetetään tai kun osoitetteita laajennetaan, niin mikä "
-"toimialue lisätään epämääräisen (osoite ilman \"@\"-merkkiä) osoitteen "
-"perään?"
+"Kun lähetetään viestiä laajentamattomiin osoitteisiin, niin mikä domain-"
+"tieto lisätään epämääräisiin osoitteisiin (sähköpostiosoitteet ilman \"@\"-"
+"merkkiä)?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
-msgstr "Sallittujen lista"
-
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Katkaise rivi näin monen merkin jälkeen."
+msgstr "Valkoinen lista"
 
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -4357,25 +4619,43 @@
 msgid "You are attempting to delete the following folder(s)."
 msgstr "Olet poistamassa seuraavia kansioita."
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Olet kopioimassa/siirtämässä viestejä uuteen kansioon."
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "Olet tekemässä alikansiota kansiolle "
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "Olet tekemässä ylimmän tason kansiota."
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr "Ylimmän tason kansioiden luonti on estetty."
+
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Et voi luoda enempää kuin %d kansiota."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "Olet nimeämässä uudelleen kansiota: "
 
-#: lib/Folder.php:537
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Voit käyttää seuraavia merkkijonoja erikoismerkityksessä kirjepohjassa: %c "
+"tarkoittaa viestin sen hetkistä sisältöä; %s allekirjoitusta."
+
+#: lib/Folder.php:524
 #, php-format
-msgid "You can not unsubscribe from \"%s\"."
+msgid "You cannot unsubscribe from \"%s\"."
 msgstr "Et voi lopettaa tilausta kansioon \"%s\"."
 
 #: lib/Maintenance/Task/tos_agreement.php:34
@@ -4385,11 +4665,11 @@
 msgstr ""
 "Et hyväksynyt järjestelmän käyttöehtoja, joten et voi kirjautua sisään."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr "Sinulla ei ole oikeuksia muuttaa tämän kansion oikeuksia"
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr "Välitit tämän viestin %%s päivänä vastaanottajille: %s."
@@ -4403,35 +4683,30 @@
 msgid "You have 1 new message."
 msgstr "Sinulle on 1 uusi viesti."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Sinulla on valittuna ainakin yksi sellainen liitetiedosto, jota et ole "
-"lähettänyt palvelimelle. Oletko aivan varma että haluat lähettää tämän "
-"viestin, vaikka siitä puuttuu liitetiedosto?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Olet jo lähettänyt tämän sivun."
 
-#: lib/IMP.php:1030
+#: lib/IMP.php:1056
 msgid "You have new mail in the following folder:"
 msgstr "Sinulle on uusia viestejä kansiossa:"
 
-#: lib/IMP.php:1035
+#: lib/IMP.php:1061
 msgid "You have new mail in the following folders:"
 msgstr "Sinulle on uusia viestejä kansioissa:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Sinun pitää määritellä ainakin yksi vastaanottaja."
 
-#: lib/MIME/Viewer/pgp.php:303
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Sinun pitää antaa salasanateksti voidaksesi käyttää salaista PGP-avainta "
 "tämän viestin avaamiseksi"
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4439,7 +4714,7 @@
 "Sinun pitää antaa salasanateksti voidaksesi käyttää salaista S/MIME-avainta "
 "tämän viestin avaamiseksi"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Sinun pitää valita kohdekansio."
 
@@ -4451,8 +4726,8 @@
 msgid "You must select an address first."
 msgstr "Sinun pitää ensin valita osoite."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Sinun pitää valita ainakin yksi viesti."
 
@@ -4460,88 +4735,84 @@
 msgid "You must specify a recipient."
 msgstr "Sinun pitää määritellä vastaanottaja."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Sinun pitää määritellä ainakin yksi liitettävä tiedosto."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Huom: Sinulla pitää olla ylläpitotoimissa valittuna \"%s\"."
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Ohjasit tämän viestin vastaanottajalle %s %%s päivänä."
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Vastasit tähän viestiin %s päivänä."
 
-#: lib/Folder.php:487
+#: lib/Folder.php:474
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Kansion \"%s\" tilaaminen epäonnistui. Palvelimen virheilmoitus oli"
 
-#: lib/Folder.php:539
+#: lib/Folder.php:526
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 "Tilauksen lopettaminen kansioon \"%s\" epäonnistui. Palvelimen virheilmoitus "
 "oli"
 
-#: lib/Folder.php:490
+#: lib/Folder.php:477
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Kansion \"%s\" tilaus onnistui"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:529
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Tilauksen lopettaminen kansioon \"%s\" onnistui"
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Nimesi"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Julkinen ja salainen PGP-avaimesi"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Salainen avaimesi"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Julkinen avaimesi"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Vastausosoitteesi: <i>(vapaaehtoinen)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Vastausosoitteesi: <em>(vapaaehtoinen)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
-msgstr "Julkinen ja salainen S/MIME-sertfikaattisi"
+msgstr "Julkinen ja salainen S/MIME-varmenteesi"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "Sähköpostitilisi:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Sähköpostialiaksesi: <i>(vapaaehtoinen, laita jokainen osoite omalle "
-"rivilleen)</i>"
+"Sähköpostialiaksesi: <em>(vapaaehtoinen, laita jokainen osoite omalle "
+"rivilleen)</em>"
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr ""
 "Selaimesi ei tue tämän tyyppisten kuvien näyttämistä viestien yhteydessä"
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Oletuksena viestin lähetyksessä käytettävä merkistö:"
 
@@ -4549,68 +4820,100 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Oletuksena käytettävä viestien salaustapa:"
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Linkittämäsi liitteen on tallentanut ainakin yksi käyttäjä.\n"
+"\n"
+"Liitetiedoston nimi: %s\n"
+"Liitetiedoston päivämäärä: %s\n"
+"\n"
+"Napsauta seuraavasta linkistä poistaaksesi liitteen pysyvästi:\n"
+"%s"
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Viestisi on mennyt perille."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Allekirjoituksesi:"
 
-#: compose.php:1219 mailbox.php:528 message.php:272 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Piilota osoitteet]"
+
+#: compose.php:1301 mailbox.php:535 message.php:295 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Ei otsikkoa]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Näytä osoitteet -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Näytä osoitteet - %s vastaanottajina]"
+
+#: templates/compose/compose.inc:203
 msgid "_Bcc"
 msgstr "_Piilokopio"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "_Musta lista"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:152
 msgid "_Cc"
 msgstr "_Kopio"
 
-#: lib/IMP.php:933
-msgid "_Compose"
-msgstr "_Kirjoita"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Poista"
 
-#: lib/IMP.php:935
+#: lib/IMP.php:959
 msgid "_Folders"
 msgstr "_Kansiot"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:79
 msgid "_Identity"
 msgstr "_Profiili"
 
-#: lib/IMP.php:926
+#: lib/IMP.php:928
 msgid "_Inbox"
 msgstr "_Inbox"
 
-#: lib/IMP.php:976
+#: lib/IMP.php:1000
 msgid "_Log out"
 msgstr "_Kirjaudu ulos"
 
-#: message.php:368
+#: message.php:391
 msgid "_Message Source"
 msgstr "_Viesti raakamuodossa"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:956
+msgid "_New Message"
+msgstr "_Uusi viesti"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
 msgid "_Priority"
 msgstr "_Prioriteetti"
 
-#: mailbox.php:402
+#: mailbox.php:404
 #, php-format
 msgid "_Refresh %s"
 msgstr "_Päivitä %s"
@@ -4619,11 +4922,11 @@
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: lib/IMP.php:937
+#: lib/IMP.php:961
 msgid "_Search"
 msgstr "_Haku"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
@@ -4631,7 +4934,7 @@
 msgid "_Thread"
 msgstr "_Keskustelusäie"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:114
 msgid "_To"
 msgstr "_Vastaanottaja"
 
@@ -4639,62 +4942,131 @@
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Näytä Keskustelusäie"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
-msgstr "_Sallittujen lista"
+msgstr "_Valkoinen lista"
+
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "tuntematon osoite"
 
-#: lib/Compose.php:351
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "liitetiedosto"
 
-#: view.php:98
+#: view.php:97
 msgid "attachments.zip"
 msgstr "attachments.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "bytes"
 msgstr "tavua"
 
-#: templates/contacts/contacts.inc:185
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "ei voi luoda tulostiedostoa"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "ei voi aukaista lähdettä"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "virhe komentorivillä"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "asetusvirhe"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "kriittinen järjestelmätiedosto puuttuu"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "muotovirhe tiedoissa"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "tietuetta ei löytynyt"
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "lähde"
 
-#: pgp.php:69 smime.php:29
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "tuntematon palvelimen nimi"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "io-virhe"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "ohjelmiston sisäinen virhe"
+
+#: pgp.php:68 smime.php:29
 msgid "key"
 msgstr "avain"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "mailbox-tiedosto"
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr "nimi"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ei mitään"
 
-#: templates/compose/spelling.inc:111
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "tai"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "käyttö kielletty"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "vastaanottajat]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "etävirhe protokollassa"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "palvelu ei ole käytettävissä"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "kirjoitusvirhe"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "kirjoitusvirheitä"
 
-#: lib/Filter.php:51
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "järjestelmävirhe"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "väliaikainen virhe"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "musta listasi"
 
-#: lib/Filter.php:61
+#: lib/Filter.php:89
 msgid "your whitelist"
-msgstr "sallittujen listasi"
+msgstr "valkoinen listasi"


--- orig/templates/prefs/folderselect.inc
+++ mod/templates/prefs/folderselect.inc
@@ -1,15 +1,15 @@
 <?php if (!$prefs->isLocked('drafts_folder')): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function newDraftsFolderName()
 {
     document.prefs.drafts.onchange = null;
-    if (document.prefs.drafts.selectedIndex == 0) {
+    if (document.prefs.drafts[document.prefs.drafts.selectedIndex].value == '') {
         var folder = window.prompt('<?php echo addslashes(_("Enter the name for your new drafts folder")) ?>', document.prefs.drafts_new . value ? document.prefs.drafts_new.value : '');
-        if (folder != '' && folder != null) {
+        if (folder != '') {
             document.prefs.drafts_new.value = folder;
-            document.prefs.drafts[0].text = '<?php echo addslashes(_("Create a new drafts folder")) ?> [' + document.prefs.drafts_new.value + ']';
+            document.prefs.drafts[1].text = '<?php echo addslashes(_("Create a new drafts folder")) ?> [' + document.prefs.drafts_new.value + ']';
         }
     }
     document.prefs.drafts.onchange = newDraftsFolderName;
@@ -21,7 +21,7 @@
 <table border="0">
  <tr>
   <td><?php echo _("Drafts folder:") ?><br />
-   <select name="drafts" onchange="newDraftsFolderName();"><?php echo IMP::flistSelect(_("Create a new drafts folder"), true, array('INBOX'), IMP::addPreambleString($prefs->getValue('drafts_folder'))) ?></select>
+   <select name="drafts" onchange="newDraftsFolderName();"><option value="<?php echo IMP_PREF_NO_FOLDER ?>"><?php echo _("None") ?></option><?php echo IMP::flistSelect(_("Create a new drafts folder"), true, array('INBOX'), IMP::folderPref($prefs->getValue('drafts_folder'), true)) ?></select>
    <input type="hidden" name="drafts_new" value="" />
   </td>
  </tr>


--- orig/templates/compose/expand.inc
+++ mod/templates/compose/expand.inc
@@ -1,16 +1,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
 <html>
-<head></head>
+<head><title></title></head>
 <body>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 <?php if (isset($address)): ?>
 <?php if (is_a($address, 'PEAR_Error')): ?>
-alert('<?php echo addslashes(sprintf(_("The field \"%s\" can't be expanded."), htmlspecialchars($field_name))) ?>');
-window.setTimeout('var status = window.parent.document.getElementById(\'expanding<?php echo htmlspecialchars($field_name) ?>\'); status.style.visibility = \'hidden\'', 10);
+window.parent.document.getElementById('expanding<?php echo htmlspecialchars($field_name) ?>').innerHTML='<?php echo addslashes(sprintf(_("The field \"%s\" can't be expanded."), htmlspecialchars($field_name))) ?>';
 <?php elseif (is_array($address)): ?>
-alert('<?php echo addslashes(sprintf(_("More than one address found for field \"%s\"."), htmlspecialchars($field_name))) ?>');
-window.setTimeout('var status = window.parent.document.getElementById(\'expanding<?php echo htmlspecialchars($field_name) ?>\'); status.style.visibility = \'hidden\'', 10);
+window.parent.document.getElementById('expanding<?php echo htmlspecialchars($field_name) ?>').innerHTML='<?php echo addslashes(sprintf(_("More than one address found for field \"%s\"."), htmlspecialchars($field_name))) ?>';
 <?php else: ?>
 window.setTimeout('var status = window.parent.document.getElementById(\'expanding<?php echo htmlspecialchars($field_name) ?>\'); status.style.visibility = \'hidden\';window.parent.document.<?php echo htmlspecialchars($form_name . '.' . $field_name) ?>.value = \'<?php echo addslashes(addslashes($address)) ?>\';', 10);
 <?php endif; ?>


--- orig/locale/es_ES/help.xml
+++ mod/locale/es_ES/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/es_ES/help.xml,v 1.24.4.1 2005/01/25 22:05:54 jan Exp $ -->
+<!-- $Horde: imp/locale/es_ES/help.xml,v 1.24.4.6 2006/03/23 00:24:12 jan Exp $ -->
 <help>
   <entry id="compose-buttons" md5="3259ba00a198559c7faa76e7867600d9" state="uptodate">
     <title>Redacci&#xF3;n del mensaje: Acciones</title>
@@ -83,7 +83,7 @@
     Puede que no desee almacenar todos y cada uno de los correos que env&#xED;e puesto que podr&#xED;a tener problemas con el r&#xE1;pido agotamiento del espacio asignado en disco, sobre todo al enviar adjuntos de gran tama&#xF1;o. Un buz&#xF3;n que haya agotado el espacio asignado en disco no podr&#xE1; recibir correo nuevo.
     </warn>
 </entry>
-  <entry id="compose-attach" md5="98dd30f32af1fa86a9f0fea3124c4ee1" state="uptodate">
+  <entry id="compose-attach" md5="e806e5e1641fb2531cc95d2df277851f" state="uptodate">
     <title>Redacci&#xF3;n del mensaje: Adjuntos</title>
     <heading>Adjuntos</heading>
     <para>
@@ -95,9 +95,6 @@
     <para>
     Paso 2: Elija si desea que el archivo se vea como un adjunto o directamente en l&#xED;nea en el cuerpo del mensaje. El cliente de correo del destinatario tendr&#xE1; que poder manejar la visualizaci&#xF3;n en l&#xED;nea del tipo de archivo adjuntado o de lo contrario lo ver&#xE1; como un adjunto.
     </para>
-    <para>
-    Paso 3: Pulse el bot&#xF3;n "Adjuntar". Se a&#xF1;adir&#xE1; el nombre del archivo y su tama&#xF1;o a la lista de Adjuntos.
-    </para>
     <tip>
     Tenga en cuenta que en el caso de archivos grandes o conexiones a Internet lentas, el proceso de carga y adjuntado del archivo al mensaje puede llevar bastante tiempo. Tenga paciencia y no pulse otros v&#xED;nculos o botones mientras est&#xE9; esperando la carga de un archivo.
     </tip>
@@ -152,6 +149,12 @@
     Determina si los adjuntos del mensaje se guardar&#xE1;n con el mismo en la carpeta de correo enviado. Si se selecciona "S&#xED;", se guardar&#xE1;n los datos de los adjuntos. Si se selecciona "No", los datos de los adjuntos se eliminar&#xE1;n del mensaje tras enviarlo a los destinatarios. Seleccionar "No" le ayudar&#xE1; a conservar el espacio de disco al eliminar la informaci&#xF3;n de los adjuntos (potencialmente grande) de los mensajes almacenados.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="uptodate" md5="a7bb0412b033abdbba2f55b8b84d6c76">
+    <title>Redacci&#xF3;n del mensaje: Adjuntos vinculados</title>
+    <para>
+    Determina si los adjuntos de la redacci&#xF3;n se enviar&#xE1;n como parte del mensaje o si se dejar&#xE1;n en un servidor local. Si los adjuntos se vinculan, el/los destinatario(s) del mensaje dispondr&#xE1;n de un v&#xED;nculo web mediante el que podr&#xE1;n descargar el/los adjunto(s). Los adjuntos vinculados tienen la ventaja de reducir considerablemente el tama&#xF1;o de los mensajes enviados. Tienen la desventaja de que no se puede garantizar que el contenido del adjunto se mantenga disponible en el futuro ya que los datos del adjunto no est&#xE1;n incluidos en el interior del mensaje de correo.
+    </para>
+</entry>
   <entry id="search" md5="86b2ef57b1194890833d9dd49ebc9b32" state="uptodate">
     <title>B&#xFA;squeda de mensajes</title>
     <heading>Criterio de b&#xFA;squeda</heading>
@@ -174,7 +177,7 @@
     Si alg&#xFA;n mensaje cumple el criterio de b&#xFA;squeda, los asuntos de esos mensajes se mostrar&#xE1;n en la vista de "Resultados de la b&#xFA;squeda"
     </para>
 </entry>
-  <entry id="folder-options" md5="6dacfa974548b8c2fe68c6426ed41576" state="changed">
+  <entry id="folder-options" md5="30687ec475765ba4467d2ef6dcec40c3" state="uptodate">
     <title>Gesti&#xF3;n de carpetas: Opciones</title>
     <heading>Opciones de carpetas</heading>
     <para>
@@ -187,22 +190,8 @@
     <para>
       Esta opci&#xF3;n importar&#xE1; a la carpeta de su elecci&#xF3;n un archivo de formato mbox. Seleccione 1 (una) carpeta a la que importar los mensajes y elija esta opci&#xF3;n. Se le mostrar&#xE1; una p&#xE1;gina que le pedir&#xE1; que indique el archivo mbox que desee importar.
     </para>
-<!-- English entry:
-<entry id="folder-options">
-    <title>Folder Navigator: Actions</title>
-    <heading>Folder Actions</heading>
-    <para>
-      You can select a folder by using the radio buttons along the left column. Once you have done this, select the action you wish to perform on the folder via the select box to the left.
-    </para>
-    <para>
-      You may be prompted for further options. Be careful with the delete option, as you can lose all the messages in a folder if you delete it by mistake!
-    </para>
-    <heading>Import Messages</heading>
-    <para>
-      This option will import mbox format or .eml files into the folder of your choice. Choose one folder to import the messages into and then select this option. You will then be taken to a page that will prompt for the mbox or .eml file to import.
-    </para>
-</entry>--></entry>
-  <entry id="folder-widgets" md5="d2f58063352d072d02714488914b53dd" state="changed">
+</entry>
+  <entry id="folder-widgets" md5="b9bc689402f7575771d74570e7f6f80a" state="uptodate">
     <title>Gesti&#xF3;n de carpetas: Mostrar</title>
     <heading>Mostrar/Ocultar no suscritos</heading>
     <para>
@@ -216,22 +205,7 @@
     <para>
     Colapsa todas las carpetas.
     </para>
-<!-- English entry:
-<entry id="folder-widgets">
-    <title>Folder Navigator: Display</title>
-    <heading>Show/Hide Unsubscribed</heading>
-    <para>
-    If using IMAP folder subscriptions, show/hide the unsubscribed folders. To subscribe/unsubscribe to a folder, select the checkbox next to the foldername and use the Subscribe/Unsubscribe action in the Folder Action drop-down menu.
-    </para>
-    <heading>Expand All</heading>
-    <para>
-    Expand all folder entries.
-    </para>
-    <heading>Collapse All</heading>
-    <para>
-    Collapse all folder entries.
-    </para>
-</entry>--></entry>
+</entry>
   <entry id="filters" md5="5ef60786767e638fbf5ba8fc5bd5d9d2" state="uptodate">
     <title>Filtros: Aplicar</title>
     <heading>Aplicar reglas de filtrado</heading>
@@ -443,7 +417,7 @@
     La direcci&#xF3;n de correo que quiere asociar con sus claves personales. Es un campo necesario.
     </para>
 </entry>
-  <entry id="pgp-personalkey-create-keylength" md5="546a087650cada2d1d4a01b478311bb9" state="uptodate">
+  <entry id="pgp-personalkey-create-keylength" md5="24ca641c63fb5ff310a39ee0d3b1ee55" state="uptodate">
     <title>PGP: Crear claves personales - Tama&#xF1;o de clave</title>
     <heading>Tama&#xF1;o de clave</heading>
     <para>
@@ -613,6 +587,12 @@
      <para> %% : El car&#xE1;cter '%'</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" md5="89e92c4d68224b2345b59959878a7174" state="uptodate">
     <title>Preferencias: Solicitar acuses de recibo</title>
     <para>
@@ -631,6 +611,21 @@
     "Solicitar confirmaci&#xF3;n del env&#xED;o" env&#xED;a una solicitud al servidor del destinatario de que le informe cuando haya distribuido el mensaje al buz&#xF3;n de destino. No significa que el mensaje haya sido le&#xED;do, simplemente que ha llegado a un buz&#xF3;n en alguna parte. No todos los servidores de correo soportan &#xE9;sto.
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="uptodate" md5="cefa8b52e09b0ada90e0889a3959efea">
+    <title>Preferencias: Eliminar spam tras comunicarlo</title>
+    <para>
+    Tras comunicar un mensaje como spam o inofensivo, puede optar por una de entre tres opciones.
+    </para>
+    <para>
+    La primera, puede decidir no hacer nada en absoluto - el mensaje se comunicar&#xE1; bien como spam o como inofensivo pero se mantendr&#xE1; sin cambios en su buz&#xF3;n.
+    </para>
+    <para>
+    La segunda, si se comunica el mensaje como spam, puede hacer que se borre inmediatamente. Esta opci&#xF3;n carece de efecto si se comunica el mensaje como inofensivo.
+    </para>
+    <para>
+    La tercera, tras comunicar un mensaje como spam, el mensaje se borrar&#xE1; del buz&#xF3;n actual y se trasladar&#xE1; a la carpeta de spam. De forma alternativa, si se comunica como inofensivo, se eliminar&#xE1; del buz&#xF3;n actual y se trasladar&#xE1; al buz&#xF3;n de Entrada.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" md5="28e1cf08e328345a8e7274c853492d4f" state="uptodate">
     <title>Preferencias: Sustituci&#xF3;n de im&#xE1;genes HTML</title>
     <para>
@@ -660,4 +655,16 @@
      <para>* "Consultar cada vez que se env&#xED;e un adjunto; NO por omisi&#xF3;n" - Consultar SIEMPRE el almacenamiento de los adjuntos en la ventana de redacci&#xF3;n; por omisi&#xF3;n los adjuntos no se guardar&#xE1;n.</para>
      <para>* "Nunca guardar adjuntos" - NUNCA consultar el almacenamiento de los adjuntos en la ventana de redacci&#xF3;n; los adjuntos no se guardar&#xE1;n NUNCA con el mensaje.</para>
 </entry>
+  <entry id="virtual_inbox" state="uptodate" md5="4d1969e640f6e0bed4f8958f018c2d07">
+    <title>Carpetas Virtuales: Entrada virtual</title>
+    <para>
+    La Entrada virtual es una b&#xFA;squeda almacenada que evita la necesidad de buscar manualmente en cada buz&#xF3;n los mensajes marcados como nuevos. En su lugar, se buscan autom&#xE1;ticamente los nuevos mensajes en todos los buzones suscritos actualmente y los resultados se muestran en un &#xFA;nico buz&#xF3;n.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="uptodate" md5="11f91811b9b2af90fe68740f6a86cef6">
+    <title>Carpetas Virtuales: Papelera virtual</title>
+    <para>
+    La Papelera virtual es una b&#xFA;squeda almacenada que evita la necesidad de disponer de una carpeta Papelera independiente. En lugar de trasladar los mensajes a una carpeta papelera centralizada, simplemente se marcan como borrados en la carpeta en la que se encuentren. Si 'Mostrar los mensajes eliminados' est&#xE1; desactivado, &#xE9;sto se traduce en que estos mensajes no aparecen en la vista del buz&#xF3;n. Cuando un usuario pulsa la Papelera virtual, se buscan los mensajes marcados como borrados en *todos* los buzones y se muestran en un &#xFA;nico buz&#xF3;n.
+    </para>
+</entry>
 </help>


--- orig/locale/fa_IR/help.xml
+++ mod/locale/fa_IR/help.xml
@@ -1,694 +1,476 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/fa_IR/help.xml,v 1.1.2.1 2005/04/13 21:58:35 jan Exp $ -->
+<!-- $Horde: imp/locale/fa_IR/help.xml,v 1.1.2.6 2006/03/23 00:24:13 jan Exp $ -->
 <help>
-
-<entry id="compose-buttons" md5="3259ba00a198559c7faa76e7867600d9" state="uptodate">
-    <title> &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; </title>
-    <heading> &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; </heading>
+  <entry id="compose-buttons" md5="3259ba00a198559c7faa76e7867600d9" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;</title> 
+  <heading>&#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;</heading> 
+  <para>"&#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;" &#x60C; &#x627;&#x632; &#x627;&#x64A;&#x646; &#x637;&#x631;&#x64A;&#x642; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x200C;&#x6AF;&#x627;&#x646; &#x627;&#x631;&#x633;&#x627;&#x644; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x627;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x628;&#x627;&#x64A;&#x633;&#x62A; &#x642;&#x628;&#x644; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x627;&#x632; &#x622;&#x646;&#x686;&#x647; &#x6A9;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F; &#x627;&#x637;&#x645;&#x64A;&#x646;&#x627;&#x646; &#x6A9;&#x627;&#x641;&#x6CC; &#x6A9;&#x633;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x627;&#x64A;&#x646; &#x639;&#x645;&#x644; &#x628;&#x631;&#x6AF;&#x634;&#x62A; &#x67E;&#x630;&#x64A;&#x631; &#x646;&#x64A;&#x633;&#x62A;.</para> 
+  <para>"&#x630;&#x62E;&#x64A;&#x631;&#x647; &#x67E;&#x64A;&#x634; &#x646;&#x648;&#x64A;&#x633;" &#x60C; &#x642;&#x631;&#x627;&#x631;&#x62F;&#x627;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x6CC; &#x6A9;&#x647; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x622;&#x646; &#x62E;&#x627;&#x62A;&#x645;&#x647; &#x646;&#x64A;&#x627;&#x641;&#x62A;&#x647; &#x627;&#x633;&#x62A; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x628;&#x647; &#x646;&#x627;&#x645; "drafts" . &#x644;&#x637;&#x641;&#x627;&#x652; &#x642;&#x628;&#x644; &#x627;&#x632; &#x62D;&#x641;&#x638; &#x67E;&#x64A;&#x634;&#x200C;&#x646;&#x648;&#x64A;&#x633; &#x646;&#x627;&#x645;&#x6CC; &#x62F;&#x631; &#x639;&#x646;&#x648;&#x627;&#x646; &#x622;&#x646; &#x642;&#x631;&#x627;&#x631; &#x62F;&#x647;&#x64A;&#x62F; &#x62A;&#x627; &#x62A;&#x6A9;&#x645;&#x64A;&#x644; &#x622;&#x646; &#x631;&#x627;&#x62D;&#x62A;&#x200C;&#x200C;&#x62A;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x6AF;&#x64A;&#x631;&#x62F;. &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x6AF;&#x634;&#x648;&#x62F;&#x646;&#x6CC; &#x628;&#x627;&#x632;&#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x60C; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x628;&#x627;&#x644;&#x627;&#x6CC; &#x633;&#x645;&#x62A; &#x631;&#x627;&#x633;&#x62A; &#x635;&#x641;&#x62D;&#x647;&#x60C; &#x642;&#x627;&#x628;&#x644; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x633;&#x62A;. &#x634;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x628;&#x627; &#x631;&#x641;&#x62A;&#x646; &#x628;&#x647; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x648; &#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631;&#x60C; &#x622;&#x646;&#x631;&#x627; &#x62A;&#x6A9;&#x645;&#x64A;&#x644; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <tip>&#x628;&#x633;&#x62A;&#x647; &#x628;&#x647; &#x646;&#x648;&#x639; &#x646;&#x635;&#x628;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62A;&#x631;&#x62C;&#x64A;&#x62D; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x628;&#x627;&#x632;&#x6AF;&#x634;&#x62A; &#x628;&#x647; &#x622;&#x62E;&#x631;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x634;&#x62F;&#x647; &#x648; &#x64A;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x647;&#x645;&#x627;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x6CC; &#x6A9;&#x647; &#x67E;&#x64A;&#x634;&#x200C;&#x646;&#x648;&#x64A;&#x633; &#x622;&#x646;&#x631;&#x627; &#x62D;&#x641;&#x638; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; &#x628;&#x639;&#x62F; &#x627;&#x632; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x639;&#x645;&#x644; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x633;&#x627;&#x632;&#x6CC;&#x60C; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</tip> 
+  <para>"&#x627;&#x646;&#x635;&#x631;&#x627;&#x641; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;" &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x645;&#x644;&#x63A;&#x6CC; &#x646;&#x645;&#x648;&#x62F;&#x647; &#x648; &#x634;&#x645;&#x627; &#x631;&#x627; &#x628;&#x647; &#x622;&#x62E;&#x631;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x62F;&#x631; &#x62D;&#x627;&#x644; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x622;&#x646; &#x628;&#x648;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; &#x628;&#x631;&#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x627;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="compose-from" md5="82cf24d31a667a5b94e481cd5179c529" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</title> 
+  <heading>&#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x62A;&#x648;&#x633;&#x637; &#x633;&#x631;&#x67E;&#x631;&#x633;&#x62A; &#x633;&#x627;&#x645;&#x627;&#x646;&#x647;&#x654; &#x634;&#x645;&#x627; &#x627;&#x62C;&#x627;&#x632;&#x647; &#x62F;&#x627;&#x62F;&#x647; &#x634;&#x648;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x67E;&#x631; &#x6A9;&#x631;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x627;&#x632; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x6AF;&#x634;&#x648;&#x62F;&#x646;&#x6CC; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x64A;&#x6A9;&#x6CC; &#x627;&#x632; &#x647;&#x648;&#x64A;&#x62A;&#x647;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x6A9;&#x647; &#x62F;&#x631; &#x628;&#x62E;&#x634; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x634;&#x62E;&#x635;&#x6CC; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x622;&#x62F;&#x631;&#x633; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="compose-to" md5="31cba17f169572c367aa8014831eb8f8" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x628;&#x647;</title> 
+  <heading>To</heading> 
+  <para>&#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x635;&#x62D;&#x64A;&#x62D; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647;&#x60C; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x635;&#x62D;&#x64A;&#x62D; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x622;&#x62F;&#x631;&#x633;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x654; &#x6A9;&#x627;&#x645;&#x627; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x62C;&#x62F;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="compose-cc" md5="97571433ab037ef9c4d101a56bf74e25" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;</title> 
+  <heading>&#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;</heading> 
+  <para>&#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x635;&#x62D;&#x64A;&#x62D; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x6CC; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x62F;&#x64A;&#x6AF;&#x631;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x635;&#x62D;&#x64A;&#x62D; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x622;&#x62F;&#x631;&#x633;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x654; &#x6A9;&#x627;&#x645;&#x627; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x62C;&#x62F;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+  <para>&#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x200C;&#x647;&#x627; &#x645;&#x639;&#x645;&#x648;&#x644;&#x627; &#x628;&#x647; &#x627;&#x641;&#x631;&#x627;&#x62F;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x646;&#x62F; &#x6A9;&#x647; &#x646;&#x64A;&#x627;&#x632;&#x6CC; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x633;&#x62A;&#x642;&#x64A;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x622;&#x646;&#x647;&#x627; &#x646;&#x64A;&#x633;&#x62A;&#x60C; &#x628;&#x644;&#x6A9;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x646;&#x647;&#x627; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x637;&#x644;&#x627;&#x639; &#x62D;&#x627;&#x635;&#x644; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F;. &#x644;&#x627;&#x632;&#x645; &#x628;&#x647; &#x62A;&#x630;&#x6A9;&#x631; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x627;&#x635;&#x644;&#x6CC; &#x648; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x628;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;&#x654; &#x646;&#x627;&#x645;&#x647;&#x60C; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x627;&#x637;&#x644;&#x627;&#x639; &#x62D;&#x627;&#x635;&#x644; &#x62E;&#x648;&#x627;&#x647;&#x646;&#x62F; &#x646;&#x645;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="compose-bcc" md5="aa8f9e2d44fdb74def0fa15240ff687b" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x645;&#x62E;&#x641;&#x6CC;</title> 
+  <heading>&#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x645;&#x62E;&#x641;&#x6CC;</heading> 
+  <para>&#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x635;&#x62D;&#x64A;&#x62D; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x6CC; &#x645;&#x62E;&#x641;&#x6CC; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647;&#x60C; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x635;&#x62D;&#x64A;&#x62D; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x622;&#x62F;&#x631;&#x633;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x654; &#x6A9;&#x627;&#x645;&#x627; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x62C;&#x62F;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+  <para>&#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x200C;&#x647;&#x627;&#x6CC; &#x645;&#x62E;&#x641;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x627;&#x652; &#x628;&#x647; &#x627;&#x641;&#x631;&#x627;&#x62F;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F; &#x6A9;&#x647; &#x644;&#x627;&#x632;&#x645; &#x627;&#x633;&#x62A; &#x627;&#x632; &#x645;&#x641;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x637;&#x644;&#x627;&#x639; &#x64A;&#x627;&#x628;&#x646;&#x62F; &#x648;&#x644;&#x6CC; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x62F;&#x64A;&#x6AF;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x646;&#x628;&#x627;&#x64A;&#x62F; &#x627;&#x632; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62A;&#x648;&#x633;&#x637; &#x622;&#x646;&#x647;&#x627; &#x627;&#x637;&#x644;&#x627;&#x639; &#x64A;&#x627;&#x628;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="compose-subject" md5="0639a8790e306acc9e19b4d1ce342d53" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x645;&#x648;&#x636;&#x648;&#x639;</title> 
+  <heading>&#x645;&#x648;&#x636;&#x648;&#x639;</heading> 
+  <para>&#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x645;&#x648;&#x636;&#x648;&#x639; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62F;&#x631;&#x62C; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. &#x645;&#x648;&#x636;&#x648;&#x639; &#x646;&#x627;&#x645;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x633;&#x627;&#x62F;&#x647; &#x648; &#x6A9;&#x648;&#x62A;&#x627;&#x647; &#x628;&#x648;&#x62F;&#x647; &#x648; &#x645;&#x639;&#x631;&#x641; &#x628;&#x62F;&#x646;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x627;&#x634;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x633;&#x62A;&#x647;&#x200C;&#x628;&#x646;&#x62F;&#x6CC; &#x648; &#x64A;&#x627;&#x641;&#x62A;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x647; &#x622;&#x633;&#x627;&#x646;&#x6CC; &#x645;&#x645;&#x6A9;&#x646; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+  <para>&#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x6CC; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x67E;&#x627;&#x633;&#x62E; &#x645;&#x64A;&#x200C;&#x62F;&#x647;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x628;&#x647; &#x62F;&#x64A;&#x6AF;&#x631;&#x627;&#x646; &#x627;&#x631;&#x62C;&#x627;&#x639; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x645;&#x648;&#x636;&#x648;&#x639; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x639;&#x64A;&#x646;&#x627;&#x652; &#x62F;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62C;&#x62F;&#x64A;&#x62F; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;&#x60C; &#x628;&#x647; &#x647;&#x645;&#x64A;&#x646; &#x62F;&#x644;&#x64A;&#x644; &#x627;&#x6AF;&#x631; &#x67E;&#x627;&#x633;&#x62E; &#x648; &#x64A;&#x627; &#x627;&#x631;&#x62C;&#x627;&#x639;&#x6CC; &#x62D;&#x627;&#x648;&#x6CC; &#x627;&#x64A;&#x62F;&#x647;&#x654; &#x62C;&#x62F;&#x64A;&#x62F;&#x6CC; &#x628;&#x627;&#x634;&#x62F; &#x628;&#x647;&#x62A;&#x631; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x645;&#x648;&#x636;&#x648;&#x639; &#x622;&#x646;&#x631;&#x627; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62F;&#x647;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="compose-options" md5="5f1d50a733c8b7e46aecece28822ff70" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;</title> 
+  <heading>&#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;</heading> 
+  <para>&#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x647; &#x634;&#x645;&#x627; &#x6A9;&#x645;&#x6A9; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F; &#x62A;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x622;&#x645;&#x627;&#x62F;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x628;&#x631;&#x631;&#x633;&#x6CC; &#x627;&#x645;&#x644;&#x627;&#x64A;&#x64A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; "&#x628;&#x631;&#x631;&#x633;&#x6CC; &#x6A9;&#x646;&#x646;&#x62F;&#x647;&#x654; &#x627;&#x645;&#x644;&#x627;&#x64A;&#x64A;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x628;&#x627; &#x6A9;&#x644;&#x64A;&#x6A9; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x631; &#x631;&#x648;&#x6CC; "&#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;" &#x628;&#x647; &#x627;&#x646;&#x62A;&#x647;&#x627;&#x6CC; &#x635;&#x641;&#x62D;&#x647;&#x60C; &#x62C;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x631;&#x627; &#x628;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x631;&#x627;&#x647;&#x646;&#x645;&#x627;&#x64A;&#x64A; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x64A;&#x62F;.</para> 
+  <para>&#x627;&#x6AF;&#x631; &#x62D;&#x641;&#x638; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x62A;&#x648;&#x633;&#x637; &#x633;&#x631;&#x67E;&#x631;&#x633;&#x62A; &#x633;&#x627;&#x645;&#x627;&#x646;&#x647;&#x654; &#x634;&#x645;&#x627; &#x641;&#x639;&#x627;&#x644; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x654; "&#x630;&#x62E;&#x6CC;&#x631;&#x647;&#x654; &#x64A;&#x6A9; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;" &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x67E;&#x64A;&#x634;&#x200C;&#x641;&#x631;&#x636; &#x648; &#x64A;&#x627; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x62F;&#x631; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x634;&#x62E;&#x635;&#x6CC; &#x634;&#x645;&#x627;&#x60C; &#x645;&#x634;&#x62E;&#x635; &#x634;&#x62F;&#x647; &#x627;&#x633;&#x62A; &#x630;&#x62E;&#x6CC;&#x631;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x627;&#x6AF;&#x631; &#x633;&#x631;&#x67E;&#x631;&#x633;&#x62A; &#x633;&#x627;&#x645;&#x627;&#x646;&#x647;&#x654; &#x634;&#x645;&#x627; &#x627;&#x62C;&#x627;&#x632;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x62F;&#x627;&#x62F;&#x647; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; &#x64A;&#x6A9; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x6AF;&#x634;&#x648;&#x62F;&#x646;&#x6CC; &#x6A9;&#x647; &#x62F;&#x631; &#x6A9;&#x646;&#x627;&#x631; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x654; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x64A;&#x6A9; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x642;&#x631;&#x627;&#x631; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x62F;&#x627;&#x634;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x62F;&#x631; &#x642;&#x633;&#x645;&#x62A; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x62A;&#x646;&#x638;&#x64A;&#x645; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x64A;&#x6A9; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x645;&#x634;&#x62E;&#x635; &#x62E;&#x627;&#x644;&#x6CC; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x64A;&#x627; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x62F;&#x647;&#x62F;. &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x648; &#x64A;&#x627; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x634;&#x645;&#x627; &#x62F;&#x631; &#x62F;&#x646;&#x628;&#x627;&#x644; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x628;&#x62D;&#x62B;&#x200C;&#x647;&#x627;&#x6CC; &#x62F;&#x631; &#x62C;&#x631;&#x64A;&#x627;&#x646;&#x60C; &#x6A9;&#x645;&#x6A9; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.</para> 
+  <warn>&#x645;&#x645;&#x6A9;&#x646; &#x627;&#x633;&#x62A; &#x634;&#x645;&#x627; &#x628;&#x647; &#x62E;&#x627;&#x637;&#x631; &#x648;&#x62C;&#x648;&#x62F; &#x645;&#x62D;&#x62F;&#x648;&#x62F;&#x64A;&#x62A;&#x647;&#x627;&#x6CC; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x200C;&#x633;&#x627;&#x632;&#x6CC;&#x60C; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x62A;&#x645;&#x627;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x60C; &#x628;&#x647; &#x62E;&#x635;&#x648;&#x635; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x628;&#x632;&#x631;&#x6AF;&#x6CC; &#x62F;&#x627;&#x631;&#x646;&#x62F; &#x646;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x627;&#x6AF;&#x631; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x631; &#x627;&#x62E;&#x62A;&#x64A;&#x627;&#x631; &#x634;&#x645;&#x627; &#x62A;&#x648;&#x633;&#x637; &#x627;&#x64A;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x627;&#x634;&#x63A;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x634;&#x645;&#x627; &#x62F;&#x64A;&#x6AF;&#x631; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62C;&#x62F;&#x64A;&#x62F; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.</warn> 
+</entry>
+  <entry id="compose-attach" md5="98dd30f32af1fa86a9f0fea3124c4ee1" state="changed">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x67E;&#x6CC;&#x648;&#x633;&#x62A;</title> 
+  <heading>&#x67E;&#x6CC;&#x648;&#x633;&#x62A;</heading> 
+  <para>&#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x628;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x627;&#x626;&#x6CC;&#x62F;. &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x6CC; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x634;&#x645;&#x627;&#x60C; &#x62F;&#x631; &#x622;&#x646; &#x648;&#x627;&#x62D;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x62A;&#x648;&#x627;&#x646;&#x633;&#x62A; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x646;&#x627;&#x645; &#x648; &#x645;&#x633;&#x64A;&#x631; &#x6A9;&#x627;&#x645;&#x644; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x654; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x631;&#x627; &#x62F;&#x631; &#x641;&#x64A;&#x644;&#x62F; &#x646;&#x627;&#x645; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x628;&#x627; &#x641;&#x634;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; "&#x645;&#x631;&#x648;&#x631;" &#x627;&#x632; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x634;&#x62F;&#x647; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x654; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x6A9;&#x647; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x647;&#x645;&#x631;&#x627;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x634;&#x645;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x648;&#x646;&#x62F; &#x648; &#x64A;&#x627; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x62F;&#x631; &#x628;&#x62F;&#x646;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x642;&#x631;&#x627;&#x631; &#x6AF;&#x64A;&#x631;&#x646;&#x62F; &#x62A;&#x635;&#x645;&#x64A;&#x645;&#x200C;&#x6AF;&#x64A;&#x631;&#x6CC; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x627;&#x644;&#x628;&#x62A;&#x647; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x62D;&#x627;&#x644;&#x62A; &#x622;&#x62E;&#x631;&#x60C; &#x628;&#x631;&#x646;&#x627;&#x645;&#x647;&#x654; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6A9;&#x646;&#x646;&#x62F;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62F;&#x631; &#x633;&#x645;&#x62A; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x641;&#x631;&#x645; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x631;&#x627; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x6CC; &#x646;&#x645;&#x627;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646;&#x635;&#x648;&#x631;&#x62A; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x633;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x67E;&#x6CC;&#x648;&#x633;&#x62A;" &#x641;&#x634;&#x627;&#x631; &#x62F;&#x647;&#x64A;&#x62F; &#x62A;&#x627; &#x646;&#x627;&#x645; &#x648; &#x627;&#x646;&#x62F;&#x627;&#x632;&#x647; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x654; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x634;&#x62F;&#x647; &#x628;&#x647; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x647; &#x634;&#x648;&#x62F;.</para> 
+  <tip>&#x644;&#x637;&#x641;&#x627;&#x652; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x648;&#x62C;&#x648;&#x62F; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x64A; &#x628;&#x627; &#x627;&#x646;&#x62F;&#x627;&#x632;&#x647;&#x654; &#x628;&#x632;&#x631;&#x6AF; &#x648; &#x644;&#x64A;&#x646;&#x6A9;&#x647;&#x627;&#x6CC; &#x6A9;&#x645; &#x633;&#x631;&#x639;&#x62A; &#x627;&#x64A;&#x646;&#x62A;&#x631;&#x646;&#x62A; &#x628;&#x627;&#x639;&#x62B; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F; &#x6A9;&#x647; &#x67E;&#x631;&#x648;&#x633;&#x647;&#x654; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x627; &#x6A9;&#x646;&#x62F;&#x6CC; &#x635;&#x648;&#x631;&#x62A; &#x6AF;&#x64A;&#x631;&#x62F; &#x628;&#x647; &#x647;&#x645;&#x64A;&#x646; &#x62F;&#x644;&#x64A;&#x644; &#x628;&#x627;&#x64A;&#x62F; &#x635;&#x628;&#x648;&#x631; &#x628;&#x648;&#x62F; &#x648; &#x62F;&#x631; &#x645;&#x62F;&#x62A; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x646;&#x645;&#x648;&#x62F;.</tip> 
+<!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
     <para>
-    "&#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;" &#x60C; &#x627;&#x632; &#x627;&#x64A;&#x646; &#x637;&#x631;&#x64A;&#x642; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x200C;&#x6AF;&#x627;&#x646; &#x627;&#x631;&#x633;&#x627;&#x644; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x627;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x628;&#x627;&#x64A;&#x633;&#x62A; &#x642;&#x628;&#x644; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x627;&#x632; &#x622;&#x646;&#x686;&#x647; &#x6A9;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F; &#x627;&#x637;&#x645;&#x64A;&#x646;&#x627;&#x646; &#x6A9;&#x627;&#x641;&#x6CC; &#x6A9;&#x633;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x627;&#x64A;&#x646; &#x639;&#x645;&#x644; &#x628;&#x631;&#x6AF;&#x634;&#x62A; &#x67E;&#x630;&#x64A;&#x631; &#x646;&#x64A;&#x633;&#x62A;.
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
     </para>
-    <para>
-    "&#x630;&#x62E;&#x64A;&#x631;&#x647; &#x67E;&#x64A;&#x634; &#x646;&#x648;&#x64A;&#x633;" &#x60C; &#x642;&#x631;&#x627;&#x631;&#x62F;&#x627;&#x62F;&#x646;  &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x6CC; &#x6A9;&#x647; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x622;&#x646; &#x62E;&#x627;&#x62A;&#x645;&#x647; &#x646;&#x64A;&#x627;&#x641;&#x62A;&#x647; &#x627;&#x633;&#x62A; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x628;&#x647; &#x646;&#x627;&#x645; "drafts" . &#x644;&#x637;&#x641;&#x627; &#x642;&#x628;&#x644; &#x627;&#x632; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x67E;&#x64A;&#x634; &#x646;&#x648;&#x64A;&#x633; &#x646;&#x627;&#x645;&#x6CC; &#x62F;&#x631; &#x639;&#x646;&#x648;&#x627;&#x646; &#x622;&#x646; &#x642;&#x631;&#x627;&#x631; &#x62F;&#x647;&#x64A;&#x62F; &#x62A;&#x627; &#x62A;&#x6A9;&#x645;&#x64A;&#x644; &#x622;&#x646; &#x631;&#x627;&#x62D;&#x62A;&#x200C;&#x200C;&#x62A;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x6AF;&#x64A;&#x631;&#x62F;. &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x6AF;&#x634;&#x648;&#x62F;&#x646;&#x6CC; &#x628;&#x627;&#x632;&#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x60C; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x628;&#x627;&#x644;&#x627;&#x6CC; &#x633;&#x645;&#x62A; &#x631;&#x627;&#x633;&#x62A; &#x635;&#x641;&#x62D;&#x647;&#x60C; &#x642;&#x627;&#x628;&#x644; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x633;&#x62A;. &#x634;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x628;&#x627; &#x631;&#x641;&#x62A;&#x646; &#x628;&#x647; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x648; &#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631;&#x60C; &#x622;&#x646;&#x631;&#x627; &#x62A;&#x6A9;&#x645;&#x64A;&#x644; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
+    </para>
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
     </para>
     <tip>
-    &#x628;&#x633;&#x62A;&#x647; &#x628;&#x647; &#x646;&#x648;&#x639; &#x646;&#x635;&#x628;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62A;&#x631;&#x62C;&#x64A;&#x62D; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x628;&#x627;&#x632;&#x6AF;&#x634;&#x62A; &#x628;&#x647; &#x622;&#x62E;&#x631;&#x64A;&#x646;  &#x67E;&#x648;&#x634;&#x647; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x634;&#x62F;&#x647; &#x648; &#x64A;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x647;&#x645;&#x627;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x6CC; &#x6A9;&#x647; &#x67E;&#x64A;&#x634; &#x646;&#x648;&#x64A;&#x633; &#x622;&#x646;&#x631;&#x627; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; &#x628;&#x639;&#x62F; &#x627;&#x632; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x639;&#x645;&#x644; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x633;&#x627;&#x632;&#x6CC;&#x60C; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.    
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
     </tip>
+</entry>--><!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
     <para>
-    "&#x627;&#x646;&#x635;&#x631;&#x627;&#x641; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;" &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x645;&#x644;&#x63A;&#x6CC; &#x646;&#x645;&#x648;&#x62F;&#x647; &#x648; &#x634;&#x645;&#x627; &#x631;&#x627; &#x628;&#x647; &#x622;&#x62E;&#x631;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x62F;&#x631; &#x62D;&#x627;&#x644; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x622;&#x646; &#x628;&#x648;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; &#x628;&#x631;&#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x627;&#x646;&#x62F;.
-    </para>
-</entry>
-
-<entry id="compose-from" md5="82cf24d31a667a5b94e481cd5179c529" state="uptodate">
-    <title> &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647; </title>
-    <heading>&#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x62F;&#x64A;&#x631; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x634;&#x645;&#x627; &#x627;&#x62C;&#x627;&#x632;&#x647; &#x62F;&#x627;&#x62F;&#x647; &#x634;&#x648;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x67E;&#x631; &#x6A9;&#x631;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x627;&#x632; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x6AF;&#x634;&#x648;&#x62F;&#x646;&#x6CC; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x64A;&#x6A9;&#x6CC; &#x627;&#x632; &#x647;&#x648;&#x64A;&#x62A;&#x647;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x6A9;&#x647; &#x62F;&#x631; &#x628;&#x62E;&#x634; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x634;&#x62E;&#x635;&#x6CC; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x622;&#x62F;&#x631;&#x633; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-    </para>
-</entry>
-
-<entry id="compose-to" md5="31cba17f169572c367aa8014831eb8f8" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x628;&#x647;</title>
-    <heading>To</heading>
-    <para>
-    &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x635;&#x62D;&#x64A;&#x62D; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647;&#x60C; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x635;&#x62D;&#x64A;&#x62D; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x622;&#x62F;&#x631;&#x633;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x646;&#x648;&#x64A;&#x633;&#x647; &#x6A9;&#x627;&#x645;&#x627; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x62C;&#x62F;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;.
-    </para>
-</entry>
-
-<entry id="compose-cc" md5="97571433ab037ef9c4d101a56bf74e25" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;</title>
-    <heading>&#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;</heading>
-    <para>
-    &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x635;&#x62D;&#x64A;&#x62D; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x6CC; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x62F;&#x64A;&#x6AF;&#x631;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x635;&#x62D;&#x64A;&#x62D; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x622;&#x62F;&#x631;&#x633;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x646;&#x648;&#x64A;&#x633;&#x647; &#x6A9;&#x627;&#x645;&#x627; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x62C;&#x62F;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;.
-    </para>
-    <para>
-    &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x200C;&#x647;&#x627; &#x645;&#x639;&#x645;&#x648;&#x644;&#x627; &#x628;&#x647; &#x627;&#x641;&#x631;&#x627;&#x62F;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x646;&#x62F; &#x6A9;&#x647; &#x646;&#x64A;&#x627;&#x632;&#x6CC; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x633;&#x62A;&#x642;&#x64A;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x622;&#x646;&#x647;&#x627; &#x646;&#x64A;&#x633;&#x62A;&#x60C; &#x628;&#x644;&#x6A9;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x646;&#x647;&#x627; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x637;&#x644;&#x627;&#x639; &#x62D;&#x627;&#x635;&#x644; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F;. &#x644;&#x627;&#x632;&#x645; &#x628;&#x647; &#x62A;&#x630;&#x6A9;&#x631; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x627;&#x635;&#x644;&#x6CC; &#x648; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x628;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x646;&#x627;&#x645;&#x647;&#x60C; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x627;&#x637;&#x644;&#x627;&#x639; &#x62D;&#x627;&#x635;&#x644; &#x62E;&#x648;&#x627;&#x647;&#x646;&#x62F; &#x646;&#x645;&#x648;&#x62F;.  
-    </para>
-</entry>
-
-<entry id="compose-bcc" md5="aa8f9e2d44fdb74def0fa15240ff687b" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x645;&#x62E;&#x641;&#x6CC;</title>
-    <heading>&#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x645;&#x62E;&#x641;&#x6CC;</heading>
-    <para>
-    &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x635;&#x62D;&#x64A;&#x62D; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x6CC; &#x645;&#x62E;&#x641;&#x6CC; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647;&#x60C; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x635;&#x62D;&#x64A;&#x62D; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x622;&#x62F;&#x631;&#x633;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x646;&#x648;&#x64A;&#x633;&#x647; &#x6A9;&#x627;&#x645;&#x627; &#x627;&#x632; &#x64A;&#x6A9;&#x62F;&#x64A;&#x6AF;&#x631; &#x62C;&#x62F;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;.
-      </para>
-    <para>
-    &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;&#x200C;&#x647;&#x627;&#x6CC; &#x645;&#x62E;&#x641;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x627; &#x628;&#x647; &#x627;&#x641;&#x631;&#x627;&#x62F;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F; &#x6A9;&#x647; &#x644;&#x627;&#x632;&#x645; &#x627;&#x633;&#x62A; &#x627;&#x632; &#x645;&#x641;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x637;&#x644;&#x627;&#x639; &#x64A;&#x627;&#x628;&#x646;&#x62F; &#x648;&#x644;&#x6CC; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x62F;&#x64A;&#x6AF;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x646;&#x628;&#x627;&#x64A;&#x62F; &#x627;&#x632; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62A;&#x648;&#x633;&#x637; &#x622;&#x646;&#x647;&#x627; &#x627;&#x637;&#x644;&#x627;&#x639; &#x64A;&#x627;&#x628;&#x646;&#x62F;.   
-    </para>
-</entry>
-
-<entry id="compose-subject" md5="0639a8790e306acc9e19b4d1ce342d53" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x645;&#x648;&#x636;&#x648;&#x639;</title>
-    <heading>&#x645;&#x648;&#x636;&#x648;&#x639;</heading>
-    <para>
-    &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x645;&#x648;&#x636;&#x648;&#x639; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62F;&#x631;&#x62C; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. &#x645;&#x648;&#x636;&#x648;&#x639; &#x646;&#x627;&#x645;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x633;&#x627;&#x62F;&#x647; &#x648; &#x6A9;&#x648;&#x62A;&#x627;&#x647; &#x628;&#x648;&#x62F;&#x647; &#x648; &#x645;&#x639;&#x631;&#x641; &#x628;&#x62F;&#x646;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x627;&#x634;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x633;&#x62A;&#x647;&#x200C;&#x628;&#x646;&#x62F;&#x6CC; &#x648; &#x64A;&#x627;&#x641;&#x62A;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x647; &#x622;&#x633;&#x627;&#x646;&#x6CC; &#x645;&#x64A;&#x633;&#x631; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;.
-    </para>
-    <para>
-    &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x6CC; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x67E;&#x627;&#x633;&#x62E; &#x645;&#x64A;&#x200C;&#x62F;&#x647;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631;&#x627;&#x646; &#x67E;&#x64A;&#x634;&#x628;&#x631;&#x62F; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x645;&#x648;&#x636;&#x648;&#x639; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x639;&#x64A;&#x646;&#x627; &#x62F;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62C;&#x62F;&#x64A;&#x62F; &#x6A9;&#x67E;&#x64A; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;&#x60C; &#x628;&#x647; &#x647;&#x645;&#x64A;&#x646; &#x62F;&#x644;&#x64A;&#x644; &#x627;&#x6AF;&#x631; &#x67E;&#x627;&#x633;&#x62E; &#x648; &#x64A;&#x627; &#x67E;&#x64A;&#x634;&#x628;&#x631;&#x62F;&#x6CC; &#x62D;&#x627;&#x648;&#x6CC; &#x627;&#x64A;&#x62F;&#x647; &#x62C;&#x62F;&#x64A;&#x62F;&#x6CC; &#x628;&#x627;&#x634;&#x62F; &#x628;&#x647;&#x62A;&#x631; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x645;&#x648;&#x636;&#x648;&#x639; &#x622;&#x646;&#x631;&#x627; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62F;&#x647;&#x64A;&#x62F;. 
-      </para>
-</entry>
-
-<entry id="compose-options" md5="5f1d50a733c8b7e46aecece28822ff70" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;</title>
-    <heading>&#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;</heading>
-    <para>
-     &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x647; &#x634;&#x645;&#x627; &#x6A9;&#x645;&#x6A9; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F; &#x62A;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x622;&#x645;&#x627;&#x62F;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
     </para>
-    <para>
-    &#x628;&#x631;&#x627;&#x6CC; &#x628;&#x631;&#x631;&#x633;&#x6CC; &#x627;&#x645;&#x644;&#x627;&#x64A;&#x64A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; "&#x628;&#x631;&#x631;&#x633;&#x6CC; &#x6A9;&#x646;&#x646;&#x62F;&#x647; &#x627;&#x645;&#x644;&#x627;&#x64A;&#x64A;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.     
-    </para>
-    <para>
-    &#x628;&#x627; &#x6A9;&#x644;&#x64A;&#x6A9; &#x6A9;&#x631;&#x62F;&#x646; &#x628;&#x631; &#x631;&#x648;&#x6CC; "&#x636;&#x645;&#x64A;&#x645;&#x647;&#x200C;&#x647;&#x627;" &#x628;&#x647; &#x627;&#x646;&#x62A;&#x647;&#x627;&#x6CC; &#x635;&#x641;&#x62D;&#x647;&#x60C; &#x62C;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x631;&#x627; &#x628;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x631;&#x627;&#x647;&#x646;&#x645;&#x627;&#x64A;&#x64A; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x64A;&#x62F;.   
-    </para>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x62F;&#x64A;&#x631; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x634;&#x645;&#x627; &#x641;&#x639;&#x627;&#x644; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6AF;&#x632;&#x64A;&#x646;&#x647; "&#x630;&#x62E;&#x64A;&#x631;&#x647; &#x64A;&#x6A9; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A;" &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647; &#x67E;&#x64A;&#x634; &#x641;&#x631;&#x636; &#x648; &#x64A;&#x627; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x62F;&#x631; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x634;&#x62E;&#x635;&#x6CC; &#x634;&#x645;&#x627;&#x60C; &#x645;&#x634;&#x62E;&#x635; &#x634;&#x62F;&#x647; &#x627;&#x633;&#x62A; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x627;&#x6AF;&#x631; &#x645;&#x62F;&#x64A;&#x631; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x634;&#x645;&#x627; &#x627;&#x62C;&#x627;&#x632;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x62F;&#x627;&#x62F;&#x647; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x648;&#x634;&#x647; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; &#x64A;&#x6A9; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x6AF;&#x634;&#x648;&#x62F;&#x646;&#x6CC; &#x6A9;&#x647; &#x62F;&#x631; &#x6A9;&#x646;&#x627;&#x631; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x64A;&#x6A9; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x642;&#x631;&#x627;&#x631; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x62F;&#x627;&#x634;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.    
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
     </para>
-    <para>
-    &#x62F;&#x631; &#x642;&#x633;&#x645;&#x62A; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x62A;&#x646;&#x638;&#x64A;&#x645; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627; &#x631;&#x627; &#x628;&#x627; &#x64A;&#x6A9; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x645;&#x634;&#x62E;&#x635; &#x62E;&#x627;&#x644;&#x6CC; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x64A;&#x627; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x62F;&#x647;&#x62F;. &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x648; &#x64A;&#x627; &#x631;&#x648;&#x646;&#x648;&#x634;&#x62A; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x634;&#x645;&#x627; &#x62F;&#x631; &#x62F;&#x646;&#x628;&#x627;&#x644; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x628;&#x62D;&#x62B;&#x200C;&#x647;&#x627;&#x6CC; &#x62F;&#x631; &#x62C;&#x631;&#x64A;&#x627;&#x646;&#x60C; &#x6A9;&#x645;&#x6A9; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;. 
-    </para>
-    <warn>
-    &#x645;&#x645;&#x6A9;&#x646; &#x627;&#x633;&#x62A; &#x634;&#x645;&#x627; &#x628;&#x647; &#x62E;&#x627;&#x637;&#x631; &#x648;&#x62C;&#x648;&#x62F; &#x645;&#x62D;&#x62F;&#x648;&#x62F;&#x64A;&#x62A;&#x647;&#x627;&#x6CC; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x200C;&#x633;&#x627;&#x632;&#x6CC;&#x60C; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x62A;&#x645;&#x627;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x60C; &#x628;&#x647; &#x62E;&#x635;&#x648;&#x635; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x628;&#x632;&#x631;&#x6AF;&#x6CC; &#x62F;&#x627;&#x631;&#x646;&#x62F; &#x646;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x627;&#x6AF;&#x631; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x631; &#x627;&#x62E;&#x62A;&#x64A;&#x627;&#x631; &#x634;&#x645;&#x627; &#x62A;&#x648;&#x633;&#x637; &#x627;&#x64A;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x627;&#x634;&#x63A;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x634;&#x645;&#x627; &#x62F;&#x64A;&#x6AF;&#x631; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62C;&#x62F;&#x64A;&#x62F; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.
-     </warn>
-</entry>
-
-<entry id="compose-attach" md5="98dd30f32af1fa86a9f0fea3124c4ee1" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x631;&#x62F;&#x646;</title>
-    <heading> &#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x631;&#x62F;&#x646;</heading>
-    <para>
-    &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x628;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;. &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x6CC; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x634;&#x645;&#x627;&#x60C; &#x62F;&#x631; &#x622;&#x646; &#x648;&#x627;&#x62D;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x62A;&#x648;&#x627;&#x646;&#x633;&#x62A; &#x628;&#x64A;&#x634; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x6A9;&#x646;&#x64A;&#x62F;.
-    </para>
-    <para>&#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x646;&#x627;&#x645; &#x648; &#x645;&#x633;&#x64A;&#x631; &#x6A9;&#x627;&#x645;&#x644; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x631;&#x627; &#x62F;&#x631; &#x641;&#x64A;&#x644;&#x62F; &#x646;&#x627;&#x645; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x628;&#x627; &#x641;&#x634;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; "Browse" &#x627;&#x632; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x634;&#x62F;&#x647; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-    </para>
-    <para>&#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x6A9;&#x647; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x634;&#x645;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x648;&#x646;&#x62F; &#x648; &#x64A;&#x627; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x62F;&#x631; &#x628;&#x62F;&#x646;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x642;&#x631;&#x627;&#x631; &#x6AF;&#x64A;&#x631;&#x646;&#x62F; &#x62A;&#x635;&#x645;&#x64A;&#x645;&#x200C;&#x6AF;&#x64A;&#x631;&#x6CC; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x627;&#x644;&#x628;&#x62A;&#x647; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A;  &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x62D;&#x627;&#x644;&#x62A; &#x622;&#x62E;&#x631;&#x60C; &#x628;&#x631;&#x646;&#x627;&#x645;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6A9;&#x646;&#x646;&#x62F;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62F;&#x631; &#x633;&#x645;&#x62A; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x641;&#x631;&#x645; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x631;&#x627; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x6CC; &#x646;&#x645;&#x627;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646;&#x635;&#x648;&#x631;&#x62A; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.
-    </para>
-    <para>&#x6AF;&#x627;&#x645; &#x633;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x636;&#x645;&#x64A;&#x645;&#x647;" &#x641;&#x634;&#x627;&#x631; &#x62F;&#x647;&#x64A;&#x62F;  &#x62A;&#x627; &#x646;&#x627;&#x645; &#x648; &#x627;&#x646;&#x62F;&#x627;&#x632;&#x647; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x634;&#x62F;&#x647; &#x628;&#x647; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x647; &#x634;&#x648;&#x62F;.
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
     </para>
     <tip>
-     &#x644;&#x637;&#x641;&#x627; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x648;&#x62C;&#x648;&#x62F; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x64A; &#x628;&#x627; &#x627;&#x646;&#x62F;&#x627;&#x632;&#x647; &#x628;&#x632;&#x631;&#x6AF; &#x648; &#x644;&#x64A;&#x646;&#x6A9;&#x647;&#x627;&#x6CC; &#x6A9;&#x645; &#x633;&#x631;&#x639;&#x62A; &#x627;&#x64A;&#x646;&#x62A;&#x631;&#x646;&#x62A; &#x628;&#x627;&#x639;&#x62B; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F; &#x6A9;&#x647; &#x67E;&#x631;&#x648;&#x633;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x627; &#x6A9;&#x646;&#x62F;&#x6CC; &#x635;&#x648;&#x631;&#x62A; &#x6AF;&#x64A;&#x631;&#x62F; &#x628;&#x647; &#x647;&#x645;&#x64A;&#x646; &#x62F;&#x644;&#x64A;&#x644; &#x628;&#x627;&#x64A;&#x62F; &#x635;&#x628;&#x648;&#x631; &#x628;&#x648;&#x62F; &#x648; &#x62F;&#x631; &#x645;&#x62F;&#x62A; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x646;&#x645;&#x648;&#x62F;.  
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
     </tip>
-</entry>
-
-<entry id="compose-attachments" md5="8ac032c4ac182f3f0d6446c20f0089dd" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x636;&#x645;&#x627;&#x626;&#x645;</title>
-    <heading>&#x636;&#x645;&#x627;&#x626;&#x645;</heading>
-    <para>
-    &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x628;&#x62E;&#x634; &#x641;&#x647;&#x631;&#x633;&#x62A;&#x6CC; &#x627;&#x632; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x642;&#x628;&#x644;&#x627; &#x628;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x634;&#x645;&#x627; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x634;&#x62F;&#x647; &#x627;&#x633;&#x62A; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;.
-    </para>
-    <heading>&#x62D;&#x630;&#x641; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;(&#x647;&#x627;&#x6CC;) &#x636;&#x645;&#x64A;&#x645;&#x647; &#x634;&#x62F;&#x647;</heading>
-    <para>
-    &#x628;&#x631;&#x627;&#x6CC; &#x62D;&#x630;&#x641; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;(&#x647;&#x627;&#x6CC;) &#x636;&#x645;&#x64A;&#x645;&#x647; &#x634;&#x62F;&#x647; &#x628;&#x627;&#x64A;&#x62F;:
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x6A9;&#x646;&#x627;&#x631; &#x646;&#x627;&#x645; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x622;&#x646;&#x647;&#x627; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x631;&#x627;&#x60C; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x628;&#x647; &#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. 
-    </para>
-    <heading>&#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62D;&#x627;&#x644;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645;</heading>
+</entry>--><!-- English entry:
+<entry id="compose-attach">
+    <title>Message Composition: Attach</title>
+    <heading>Attach</heading>
     <para>
-    &#x628;&#x631;&#x627;&#x6CC; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62D;&#x627;&#x644;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x628;&#x627;&#x64A;&#x62F;:
+    You may attach files to your message if your browser supports uploading of files. More than 1 file can be uploaded at once.
     </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x62D;&#x627;&#x644;&#x62A; &#x647;&#x631; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x631;&#x627; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x62A;&#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; "&#x636;&#x645;&#x64A;&#x645;&#x647;" &#x648; &#x64A;&#x627; "&#x628;&#x631;&#x62E;&#x637;" &#x62F;&#x631;&#x622;&#x648;&#x631;&#x64A;&#x62F;.
-     </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x628;&#x647; &#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
+    <para>Step 1: Either type the path and name of a file that you want attached to this message or click the "Browse" button and select the file to be attatched. The path and name of that file now appears in the Attachment box.
     </para>
-    <heading>&#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645;</heading>
-    <para>
-    &#x628;&#x631;&#x627;&#x6CC; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x62E;&#x648;&#x62F;( &#x645;&#x646;&#x638;&#x648;&#x631; &#x627;&#x632; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A;&#x60C; &#x645;&#x62A;&#x646;&#x6CC; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x628;&#x647; &#x639;&#x646;&#x648;&#x627;&#x646; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x6CC; &#x628;&#x631; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x636;&#x645;&#x64A;&#x645;&#x647; &#x634;&#x62F;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x646;&#x645;&#x648;&#x62F;) &#x628;&#x627;&#x64A;&#x62F;:
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x641;&#x64A;&#x644;&#x62F; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x628;&#x647; &#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x636;&#x645;&#x627;&#x64A;&#x645;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-    </para>
-</entry>
-
-<entry id="compose-priority" md5="b023367c36de3ce1567d27ccaa45640c" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x627;&#x648;&#x644;&#x648;&#x64A;&#x62A;</title>
-    <heading>&#x627;&#x648;&#x644;&#x648;&#x64A;&#x62A;</heading>
-    <para>
-    &#x627;&#x648;&#x644;&#x648;&#x64A;&#x62A;&#x647;&#x627; &#x62F;&#x631; &#x648;&#x627;&#x642;&#x639; &#x627;&#x634;&#x627;&#x631;&#x647; &#x628;&#x631; &#x633;&#x631;&#x622;&#x645;&#x62F; "X-Priority" &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x634;&#x645;&#x627; &#x62F;&#x627;&#x631;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x633;&#x631;&#x622;&#x645;&#x62F; &#x62F;&#x631; &#x648;&#x627;&#x642;&#x639; &#x634;&#x628;&#x647; &#x627;&#x633;&#x62A;&#x627;&#x646;&#x62F;&#x627;&#x631;&#x62F;&#x6CC; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x632;&#x64A;&#x644;&#x627;&#x60C; &#x646;&#x62A;&#x200C;&#x627;&#x633;&#x6A9;&#x64A;&#x67E;&#x60C; &#x627;&#x67E;&#x631;&#x627; &#x648; ... &#x67E;&#x630;&#x64A;&#x631;&#x641;&#x62A;&#x647; &#x634;&#x62F;&#x647; &#x627;&#x633;&#x62A;. &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x627;&#x632; &#x627;&#x64A;&#x646; &#x634;&#x628;&#x647; &#x627;&#x633;&#x62A;&#x627;&#x646;&#x62F;&#x627;&#x631;&#x62F; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x6CC; &#x646;&#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x646;&#x62F;&#x60C; &#x62A;&#x646;&#x647;&#x627; &#x622;&#x646;&#x631;&#x627; &#x646;&#x627;&#x62F;&#x64A;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6AF;&#x64A;&#x631;&#x646;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="compose-save-attachments" md5="db89972c4ebb0b41ab691b6a7744a81d" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x636;&#x645;&#x627;&#x64A;&#x645;</title>
-    <para>
-    &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F; &#x6A9;&#x647; &#x622;&#x64A;&#x627; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x646;&#x64A;&#x632; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x6AF;&#x631;&#x62F;&#x62F; &#x648; &#x64A;&#x627; &#x62E;&#x64A;&#x631;. &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x645;&#x648;&#x631;&#x62F; &#x622;&#x62E;&#x631; &#x628;&#x647; &#x634;&#x645;&#x627; &#x62F;&#x631; &#x62D;&#x641;&#x638; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x633;&#x6A9; &#x62F;&#x631;&#x627;&#x62E;&#x62A;&#x64A;&#x627;&#x631;&#x62A;&#x627;&#x646; &#x6A9;&#x645;&#x6A9; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.
-    </para>
-</entry>
-
-<entry id="search" md5="86b2ef57b1194890833d9dd49ebc9b32" state="uptodate">
-    <title>&#x62C;&#x633;&#x62A;&#x62C;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;</title>
-    <heading>&#x62D;&#x648;&#x632;&#x647; &#x62C;&#x633;&#x62A;&#x62C;&#x648;</heading>
-    <para>
-    &#x634;&#x645;&#x627; &#x645;&#x645;&#x6A9;&#x646; &#x627;&#x633;&#x62A; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x62D;&#x648;&#x632;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x645;&#x62E;&#x62A;&#x644;&#x641;&#x6CC; &#x62C;&#x633;&#x62A;&#x62C;&#x648; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x62F;&#x647;&#x64A;&#x62F;.  
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x62F;&#x631; &#x641;&#x64A;&#x644;&#x62F;&#x647;&#x627;&#x6CC; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62C;&#x633;&#x62A;&#x62C;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x645;&#x648;&#x627;&#x631;&#x62F; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
+    <para>Step 2: Decide whether you want the file to be viewed as an attachment or inline with the rest of the message. The recipient's mail reading software must be able to handle the inline display of the file type, otherwise this part will be viewed as an attachment instead.
     </para>
+    <tip>
+    Please note that for large files and/or slower Internet connections, the process of uploading and attaching your file to the email may take a while. Please be patient and do not click other links or buttons while you are waiting for a file to upload.
+    </tip>
+</entry>--></entry>
+  <entry id="compose-attachments" md5="8ac032c4ac182f3f0d6446c20f0089dd" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;</title> 
+  <heading>&#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;</heading> 
+  <para>&#x62F;&#x631; &#x627;&#x64A;&#x646; &#x628;&#x62E;&#x634; &#x641;&#x647;&#x631;&#x633;&#x62A;&#x6CC; &#x627;&#x632; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x642;&#x628;&#x644;&#x627; &#x628;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x634;&#x645;&#x627; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x634;&#x62F;&#x647; &#x627;&#x633;&#x62A; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;.</para> 
+  <heading>&#x62D;&#x630;&#x641; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;(&#x647;&#x627;&#x6CC;) &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x634;&#x62F;&#x647;</heading> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x62D;&#x630;&#x641; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;(&#x647;&#x627;&#x6CC;) &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x634;&#x62F;&#x647; &#x628;&#x627;&#x64A;&#x62F;:</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x6A9;&#x646;&#x627;&#x631; &#x646;&#x627;&#x645; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x622;&#x646;&#x647;&#x627; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x631;&#x627;&#x60C; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x628;&#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <heading>&#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62D;&#x627;&#x644;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;</heading> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62D;&#x627;&#x644;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x628;&#x627;&#x64A;&#x62F;:</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x62D;&#x627;&#x644;&#x62A; &#x647;&#x631; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x631;&#x627; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x62A;&#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; "&#x67E;&#x6CC;&#x648;&#x633;&#x62A;" &#x648; &#x64A;&#x627; "&#x628;&#x631;&#x62E;&#x637;" &#x62F;&#x631;&#x622;&#x648;&#x631;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x628;&#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <heading>&#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;</heading> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F;( &#x645;&#x646;&#x638;&#x648;&#x631; &#x627;&#x632; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A;&#x60C; &#x645;&#x62A;&#x646;&#x6CC; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x628;&#x647; &#x639;&#x646;&#x648;&#x627;&#x646; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x6CC; &#x628;&#x631; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x654; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x634;&#x62F;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x646;&#x645;&#x648;&#x62F;) &#x628;&#x627;&#x64A;&#x62F;:</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x641;&#x64A;&#x644;&#x62F; &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x628;&#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x6CC; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="compose-priority" md5="b023367c36de3ce1567d27ccaa45640c" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x627;&#x648;&#x644;&#x648;&#x64A;&#x651;&#x62A;</title> 
+  <heading>&#x627;&#x648;&#x644;&#x648;&#x64A;&#x651;&#x62A;</heading> 
+  <para>&#x627;&#x648;&#x644;&#x648;&#x64A;&#x651;&#x62A;&#x647;&#x627; &#x62F;&#x631; &#x648;&#x627;&#x642;&#x639; &#x627;&#x634;&#x627;&#x631;&#x647; &#x628;&#x631; &#x633;&#x631;&#x622;&#x645;&#x62F; "X-Priority" &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x634;&#x645;&#x627; &#x62F;&#x627;&#x631;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x633;&#x631;&#x622;&#x645;&#x62F; &#x62F;&#x631; &#x648;&#x627;&#x642;&#x639; &#x634;&#x628;&#x647; &#x627;&#x633;&#x62A;&#x627;&#x646;&#x62F;&#x627;&#x631;&#x62F;&#x6CC; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x632;&#x64A;&#x644;&#x627;&#x60C; &#x646;&#x62A;&#x200C;&#x627;&#x633;&#x6A9;&#x64A;&#x67E;&#x60C; &#x627;&#x67E;&#x631;&#x627; &#x648; ... &#x67E;&#x630;&#x64A;&#x631;&#x641;&#x62A;&#x647; &#x634;&#x62F;&#x647; &#x627;&#x633;&#x62A;. &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631;&#x647;&#x627;&#x64A;&#x64A; &#x6A9;&#x647; &#x627;&#x632; &#x627;&#x64A;&#x646; &#x634;&#x628;&#x647; &#x627;&#x633;&#x62A;&#x627;&#x646;&#x62F;&#x627;&#x631;&#x62F; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x6CC; &#x646;&#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x646;&#x62F;&#x60C; &#x62A;&#x646;&#x647;&#x627; &#x622;&#x646;&#x631;&#x627; &#x646;&#x627;&#x62F;&#x64A;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6AF;&#x64A;&#x631;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="compose-save-attachments" md5="db89972c4ebb0b41ab691b6a7744a81d" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x636;&#x645;&#x627;&#x64A;&#x645;</title> 
+  <para>&#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F; &#x6A9;&#x647; &#x622;&#x64A;&#x627; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x646;&#x64A;&#x632; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x6AF;&#x631;&#x62F;&#x646;&#x62F; &#x648; &#x64A;&#x627; &#x62E;&#x64A;&#x631;. &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x645;&#x648;&#x631;&#x62F; &#x622;&#x62E;&#x631; &#x628;&#x647; &#x634;&#x645;&#x627; &#x62F;&#x631; &#x62D;&#x641;&#x638; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x633;&#x6A9; &#x62F;&#x631;&#x627;&#x62E;&#x62A;&#x64A;&#x627;&#x631;&#x62A;&#x627;&#x646; &#x6A9;&#x645;&#x6A9; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
+  <entry id="search" md5="86b2ef57b1194890833d9dd49ebc9b32" state="uptodate">
+  <title>&#x62C;&#x633;&#x62A;&#x62C;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;</title> 
+  <heading>&#x62D;&#x648;&#x632;&#x647;&#x654; &#x62C;&#x633;&#x62A;&#x62C;&#x648;</heading> 
+  <para>&#x634;&#x645;&#x627; &#x645;&#x645;&#x6A9;&#x646; &#x627;&#x633;&#x62A; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x62D;&#x648;&#x632;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x645;&#x62E;&#x62A;&#x644;&#x641;&#x6CC; &#x62C;&#x633;&#x62A;&#x62C;&#x648; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x62F;&#x647;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x627;&#x648;&#x644;: &#x62F;&#x631; &#x641;&#x64A;&#x644;&#x62F;&#x647;&#x627;&#x6CC; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62C;&#x633;&#x62A;&#x62C;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x645;&#x648;&#x627;&#x631;&#x62F; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x639;&#x644;&#x627;&#x645;&#x62A; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x646; &#x628;&#x647; &#x62D;&#x648;&#x632;&#x647;&#x654; &#x62C;&#x633;&#x62A;&#x62C;&#x648;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x633;&#x648;&#x645;: &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x6CC; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644;&#x64A;&#x62F; &#x62F;&#x631; &#x622;&#x646;&#x647;&#x627; &#x62C;&#x633;&#x62A;&#x62C;&#x648; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x67E;&#x630;&#x64A;&#x631;&#x62F;.</para> 
+  <para>&#x6AF;&#x627;&#x645; &#x686;&#x647;&#x627;&#x631;&#x645;: &#x641;&#x634;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; "&#x62C;&#x633;&#x62A;&#x62C;&#x648;" .</para> 
+  <para>&#x627;&#x6AF;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x64A;&#x64A; &#x645;&#x646;&#x637;&#x628;&#x642; &#x628;&#x627; &#x62D;&#x648;&#x632;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x631;&#x62F; &#x62C;&#x633;&#x62A;&#x62C;&#x648;&#x6CC; &#x634;&#x645;&#x627; &#x64A;&#x627;&#x641;&#x62A;&#x647; &#x634;&#x648;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62F;&#x631; &#x628;&#x62E;&#x634; "&#x646;&#x62A;&#x627;&#x64A;&#x62C; &#x62C;&#x633;&#x62A;&#x62C;&#x648;" &#x639;&#x646;&#x627;&#x648;&#x64A;&#x646; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="folder-options" md5="30687ec475765ba4467d2ef6dcec40c3" state="uptodate">
+  <title>&#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x67E;&#x648;&#x634;&#x647; : &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;</title> 
+  <heading>&#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; &#x67E;&#x648;&#x634;&#x647;</heading> 
+  <para>&#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627; &#x628;&#x647; &#x6A9;&#x645;&#x6A9; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x631;&#x627;&#x62F;&#x64A;&#x648;&#x64A;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x633;&#x645;&#x62A; &#x631;&#x627;&#x633;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x639;&#x62F; &#x627;&#x632; &#x622;&#x646;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;&#x64A; &#x631;&#x627; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x627;&#x62C;&#x631;&#x627;&#x6CC; &#x622;&#x646; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x628;&#x647; &#x6A9;&#x645;&#x6A9; &#x62C;&#x639;&#x628;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x633;&#x645;&#x62A; &#x631;&#x627;&#x633;&#x62A;&#x60C; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+  <para>&#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x632;&#x64A;&#x627;&#x62F;&#x6CC; &#x631;&#x627; &#x645;&#x645;&#x6A9;&#x646; &#x627;&#x633;&#x62A; &#x634;&#x645;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C;&#x627;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x654; &#x62D;&#x630;&#x641; &#x62F;&#x642;&#x62A; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x628;&#x627;&#x639;&#x62B; &#x627;&#x632; &#x628;&#x64A;&#x646; &#x631;&#x641;&#x62A;&#x646; &#x6A9;&#x644;&#x64A;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x634;&#x645;&#x627; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.</para> 
+  <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x641;&#x627;&#x64A;&#x644;&#x647;&#x627;&#x64A;&#x64A; &#x628;&#x627; &#x627;&#x646;&#x634;&#x639;&#x627;&#x628; eml &#x631;&#x627; &#x628;&#x647; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x6CC; &#x634;&#x645;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x646;&#x645;&#x648;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x627;&#x64A;&#x646; &#x6A9;&#x627;&#x631;&#x60C; &#x627;&#x628;&#x62A;&#x62F;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x648; &#x633;&#x67E;&#x633; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6A9;&#x646;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x634;&#x62F;&#x647; &#x631;&#x627; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="folder-widgets" md5="b9bc689402f7575771d74570e7f6f80a" state="uptodate">
+  <title>&#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x67E;&#x648;&#x634;&#x647; : &#x646;&#x645;&#x627;&#x64A;&#x634;</title> 
+  <heading>&#x646;&#x645;&#x627;&#x64A;&#x634;/&#x67E;&#x646;&#x647;&#x627;&#x646; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x639;&#x62F;&#x645; &#x639;&#x636;&#x648;&#x64A;&#x651;&#x62A;Show/Hide Unsubscribed</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x627;&#x632; &#x639;&#x636;&#x648;&#x64A;&#x62A; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; IMAP &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x63A;&#x64A;&#x631; &#x639;&#x636;&#x648; &#x631;&#x627; &#x67E;&#x646;&#x647;&#x627;&#x646;/&#x62D;&#x627;&#x636;&#x631; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x639;&#x636;&#x648;&#x64A;&#x651;&#x62A; &#x64A;&#x627; &#x639;&#x62F;&#x645; &#x639;&#x636;&#x648;&#x64A;&#x651;&#x62A; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x628;&#x627; &#x639;&#x644;&#x627;&#x645;&#x62A; &#x6AF;&#x630;&#x627;&#x631;&#x6CC; &#x62F;&#x631; &#x62C;&#x639;&#x628;&#x647; &#x6A9;&#x646;&#x627;&#x631;&#x6CC; &#x647;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x60C; &#x627;&#x632; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x647;&#x631; &#x67E;&#x648;&#x634;&#x647; &#x639;&#x645;&#x644; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x631;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x628;&#x631;&#x627;&#x6CC; &#x622;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x648;&#x62F;.</para> 
+  <heading>&#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F;&#x646; &#x647;&#x645;&#x647;</heading> 
+  <para>&#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F;&#x646; &#x64A;&#x627; &#x6AF;&#x633;&#x62A;&#x631;&#x62F;&#x646; &#x62A;&#x645;&#x627;&#x645; &#x648;&#x631;&#x648;&#x62F;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x67E;&#x648;&#x634;&#x647;.</para> 
+  <heading>&#x628;&#x633;&#x62A;&#x646; &#x647;&#x645;&#x647;</heading> 
+  <para>&#x628;&#x633;&#x62A;&#x646; &#x647;&#x645;&#x647; &#x648;&#x631;&#x648;&#x62F;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x67E;&#x648;&#x634;&#x647;</para> 
+</entry>
+  <entry id="filters" md5="5ef60786767e638fbf5ba8fc5bd5d9d2" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x627;&#x639;&#x645;&#x627;&#x644;</title> 
+  <heading>&#x627;&#x639;&#x645;&#x627;&#x644; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646;</heading> 
+  <para>&#x628;&#x631; &#x631;&#x648;&#x6CC; &#x622;&#x64A;&#x6A9;&#x648;&#x646; "&#x627;&#x639;&#x645;&#x627;&#x644; &#x641;&#x64A;&#x644;&#x62A;&#x631;" &#x62F;&#x631; &#x645;&#x62C;&#x627;&#x648;&#x631;&#x62A; &#x6A9;&#x644;&#x645;&#x647; INBOX &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x637;&#x628;&#x642; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x645;&#x634;&#x62E;&#x635; &#x634;&#x62F;&#x647;&#x60C; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x639;&#x645;&#x627;&#x644; &#x634;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="filter-edit-rules" md5="5baa5708ac9449e797f967313a9e1a27" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646;</title> 
+  <heading>&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646; &#x62E;&#x648;&#x62F;</heading> 
+  <para>&#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x634;&#x645;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x647; &#x635;&#x641;&#x62D;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x647;&#x646;&#x645;&#x648;&#x646; &#x634;&#x648;&#x64A;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62D;&#x630;&#x641;&#x60C; &#x627;&#x636;&#x627;&#x641;&#x647; &#x648; &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x641;&#x639;&#x627;&#x644; &#x641;&#x639;&#x644;&#x64A; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="filter-edit-blacklist" md5="80ff7803c66599c7035f7f8811d218cc" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x64A;&#x627;&#x647;</title> 
+  <heading>&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x64A;&#x627;&#x647; &#x634;&#x645;&#x627;</heading> 
+  <para>&#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x64A;&#x627;&#x647; &#x634;&#x645;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x647; &#x635;&#x641;&#x62D;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627;&#x647;&#x646;&#x645;&#x627;&#x64A;&#x64A; &#x634;&#x648;&#x64A;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62D;&#x630;&#x641;&#x60C; &#x627;&#x636;&#x627;&#x641;&#x647; &#x648; &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x64A;&#x64A; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x6A9;&#x647; &#x62A;&#x645;&#x627;&#x64A;&#x644;&#x6CC; &#x628;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x632; &#x622;&#x646;&#x647;&#x627; &#x646;&#x62F;&#x627;&#x631;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="filter-edit-whitelist" md5="330c3a8fad198c7afe855c101c63cd0f" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x641;&#x64A;&#x62F;</title> 
+  <heading>&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x641;&#x64A;&#x62F; &#x634;&#x645;&#x627;</heading> 
+  <para>&#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x641;&#x64A;&#x62F; &#x634;&#x645;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x647; &#x635;&#x641;&#x62D;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627;&#x647;&#x646;&#x645;&#x627;&#x64A;&#x64A; &#x634;&#x648;&#x64A;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62D;&#x630;&#x641;&#x60C; &#x627;&#x636;&#x627;&#x641;&#x647; &#x648; &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x64A;&#x64A; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x62A;&#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x627;&#x632; &#x622;&#x646;&#x647;&#x627; &#x62F;&#x627;&#x631;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="filter-on-login" md5="37d9297d1cca46435e36b6e38e45dcdb" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x632;&#x645;&#x627;&#x646; &#x648;&#x631;&#x648;&#x62F;</title> 
+  <heading>&#x622;&#x64A;&#x627; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x62F;&#x631; &#x632;&#x645;&#x627;&#x646; &#x648;&#x631;&#x648;&#x62F; &#x627;&#x639;&#x645;&#x627;&#x644; &#x6AF;&#x631;&#x62F;&#x62F;&#x61F;</heading> 
+  <para>&#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x627;&#x639;&#x645;&#x627;&#x644; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x648;&#x631;&#x648;&#x62F; &#x628;&#x647; IMP &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;.</para> 
+</entry>
+  <entry id="filter-on-display" md5="f5afc305402ef52bad108933f3f33291" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x62F;&#x631; &#x647;&#x631; &#x628;&#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x64A;</title> 
+  <heading>&#x622;&#x64A;&#x627; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x62F;&#x631; &#x647;&#x631; &#x632;&#x645;&#x627;&#x646; &#x6A9;&#x647; INBOX &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F; &#x627;&#x639;&#x645;&#x627;&#x644; &#x6AF;&#x631;&#x62F;&#x62F;&#x61F;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6A9;&#x646;&#x64A;&#x62F; &#x62A;&#x627; &#x62F;&#x631; &#x647;&#x631; &#x632;&#x645;&#x627;&#x646; &#x6A9;&#x647; INBOX &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x6A9;&#x646;&#x64A;&#x62F;&#x60C; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x627;&#x639;&#x645;&#x627;&#x644; &#x634;&#x648;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="filter-any-mailbox" md5="71c51e83909f9d0bd440d220772ee3c6" state="uptodate">
+  <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646;</title> 
+  <heading>&#x622;&#x64A;&#x627; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x628;&#x647; &#x647;&#x631; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646; &#x627;&#x639;&#x645;&#x627;&#x644; &#x634;&#x648;&#x646;&#x62F;&#x61F;</heading> 
+  <para>&#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; &#x62A;&#x627; &#x634;&#x645;&#x627; &#x628;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x631;&#x627; &#x628;&#x647; &#x647;&#x631; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646; &#x627;&#x639;&#x645;&#x627;&#x644; &#x6A9;&#x646;&#x64A;&#x62F;( &#x628;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x60C; &#x622;&#x64A;&#x6A9;&#x648;&#x646;&#x6CC; &#x62F;&#x631; &#x6A9;&#x646;&#x627;&#x631; &#x647;&#x631; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x634;&#x645;&#x627; &#x627;&#x62C;&#x627;&#x632;&#x647; &#x627;&#x639;&#x645;&#x627;&#x644; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x631;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x622;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627;&#x60C; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x62F;&#x627;&#x62F;). &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x64A;&#x634;&#x200C;&#x641;&#x631;&#x636; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x631;&#x633;&#x64A;&#x62F;&#x647; &#x627;&#x639;&#x645;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x646;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x627;&#x639;&#x645;&#x627;&#x644; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631; &#x646;&#x62A;&#x627;&#x64A;&#x62C; &#x63A;&#x64A;&#x631; &#x645;&#x646;&#x62A;&#x638;&#x631;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x647;&#x645;&#x686;&#x648;&#x646; &#x627;&#x646;&#x62A;&#x642;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x60C; &#x62D;&#x630;&#x641; &#x63A;&#x64A;&#x631; &#x645;&#x646;&#x62A;&#x638;&#x631;&#x647; &#x622;&#x646;&#x647;&#x627; &#x648; &#x64A;&#x627;... &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-compose-attach-pubkey" md5="97446dbbb27616b4fa39be801e10df2d" state="uptodate">
+  <title>PGP : &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title> 
+  <heading>&#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x627;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x628;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x646;&#x627;&#x645;&#x647; &#x62E;&#x627;&#x631;&#x62C; &#x634;&#x62F;&#x647;&#x60C; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. &#x637;&#x631;&#x64A;&#x642;&#x647; &#x639;&#x645;&#x644;&#x6A9;&#x631;&#x62F; &#x67E;&#x64A;&#x634;&#x200C;&#x641;&#x631;&#x636; &#x631;&#x627; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; &#x635;&#x641;&#x62D;&#x647; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; PGP &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x62A;&#x646;&#x638;&#x64A;&#x645; &#x646;&#x645;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-option-scan-body" md5="6baaada0d46dc1ab0941087f235f359b" state="uptodate">
+  <title>PGP : &#x628;&#x631;&#x631;&#x633;&#x64A; &#x628;&#x62F;&#x646;&#x647;&#x654; &#x645;&#x62A;&#x646;</title> 
+  <heading>&#x628;&#x631;&#x631;&#x633;&#x64A; &#x628;&#x62F;&#x646;&#x647;&#x654; &#x645;&#x62A;&#x646;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x650;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; IMP &#x628;&#x62F;&#x646;&#x647;&#x654; &#x62A;&#x645;&#x627;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x64A;&#x627;&#x641;&#x62A;&#x646; &#x62F;&#x627;&#x62F;&#x647; PGP &#x62C;&#x633;&#x62A;&#x62C;&#x648; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x646;&#x62A;&#x627;&#x64A;&#x62C; &#x631;&#x627; &#x646;&#x634;&#x627;&#x646; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x62F;&#x627;&#x62F;. &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x6A9;&#x646;&#x62F;&#x6CC; &#x633;&#x627;&#x645;&#x627;&#x646;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x6AF;&#x634;&#x62A;.</para> 
+</entry>
+  <entry id="compose-options-encrypt" md5="1012144f749f19f5a24cef38601daa71" state="uptodate">
+  <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC;</title> 
+  <heading>&#x628;&#x62F;&#x648;&#x646; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC;</heading> 
+  <para>&#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x62A;&#x646; &#x628;&#x62F;&#x648;&#x646; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; : &#x645;&#x62A;&#x646; &#x633;&#x627;&#x62F;&#x647;</para> 
+  <heading>&#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; PGP &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>&#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x641;&#x639;&#x644;&#x6CC; &#x631;&#x627; &#x628;&#x627; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x627;&#x632; PGP &#x648; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x631;&#x645;&#x632; &#x646;&#x645;&#x648;&#x62F;&#x647; &#x648; &#x633;&#x67E;&#x633; &#x622;&#x646;&#x631;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x6A9;&#x631;&#x62F;. &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x62D;&#x627;&#x644;&#x62A; &#x634;&#x645;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;. &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62D;&#x62A;&#x645;&#x627;&#x652; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647;&#x654; &#x62E;&#x648;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F; &#x62A;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x62F;&#x631;&#x633;&#x62A;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x648;&#x62F;.</para> 
+  <heading>&#x627;&#x645;&#x636;&#x627;&#x621; PGP &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>&#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F; &#x62A;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62C;&#x627;&#x631;&#x6CC; &#x628;&#x627; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x627;&#x632; PGP &#x648; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC; &#x634;&#x645;&#x627; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6AF;&#x631;&#x62F;&#x62F;. &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x627; &#x6A9;&#x645;&#x6A9; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x634;&#x646;&#x627;&#x633;&#x627;&#x64A;&#x64A; &#x634;&#x645;&#x627; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+  <heading>&#x627;&#x645;&#x636;&#x627;&#x621;/&#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; PGP &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>&#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x628;&#x62A;&#x62F;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x633;&#x67E;&#x633; &#x646;&#x62A;&#x64A;&#x62C;&#x647; &#x631;&#x627; &#x631;&#x645;&#x632; &#x645;&#x6CC;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.</para> 
+  <heading>&#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>TODO</para> 
+  <heading>&#x627;&#x645;&#x636;&#x627;&#x621; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>TODO</para> 
+  <heading>&#x627;&#x645;&#x636;&#x627;&#x621;/&#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>TODO</para> 
+</entry>
+  <entry id="pgp-overview" md5="24b5138b4b53f73b5f2f2739e4c1858d" state="uptodate">
+  <title>PGP : &#x645;&#x631;&#x648;&#x631;</title> 
+  <heading>PGP &#x686;&#x64A;&#x633;&#x62A;&#x61F;</heading> 
+  <para>PGP &#x627;&#x628;&#x632;&#x627;&#x631;&#x6CC; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x62A;&#x628;&#x627;&#x637;&#x627;&#x62A; &#x648; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x200C;&#x633;&#x627;&#x632;&#x6CC; &#x627;&#x645;&#x646; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x645;&#x6CC;&#x200C;&#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x62E;&#x635;&#x648;&#x635;&#x627; &#x62F;&#x631; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9; &#x628;&#x647; &#x6A9;&#x627;&#x631; &#x6AF;&#x631;&#x641;&#x62A;&#x647; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F;. &#x627;&#x632; &#x627;&#x64A;&#x646; &#x627;&#x628;&#x632;&#x627;&#x631; &#x628;&#x631;&#x627;&#x6CC; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; &#x648; &#x627;&#x645;&#x636;&#x627;&#x621; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;. IMP &#x627;&#x632; GnuPG &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x631;&#x627;&#x647;&#x645; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x627;&#x645;&#x6A9;&#x627;&#x646; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.</para> 
+  <heading>&#x622;&#x64A;&#x627; &#x627;&#x645;&#x6A9;&#x627;&#x646;&#x627;&#x62A; PGP &#x641;&#x639;&#x627;&#x644; &#x634;&#x648;&#x62F;&#x61F;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x641;&#x639;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x64A;&#x62C;&#x627;&#x62F;/&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; PGP &#x62E;&#x648;&#x62F;&#x60C; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x646; &#x648; &#x62D;&#x630;&#x641; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631;&#x627;&#x646;&#x60C; &#x62E;&#x648;&#x627;&#x646;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647;&#x654; &#x622;&#x646;&#x647;&#x627;&#x60C; &#x62A;&#x634;&#x62E;&#x64A;&#x635; &#x627;&#x645;&#x636;&#x627;&#x621; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x648; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; &#x648; &#x627;&#x645;&#x636;&#x627;&#x621; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-option-attach-pubkey" md5="561ce43370ac4afbcc3f9818c8fbc2f6" state="uptodate">
+  <title>PGP : &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;- &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title> 
+  <heading>&#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627; : - &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x62C;&#x648;&#x62F;&#x60C; &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x627;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x645;&#x627; &#x628;&#x647; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-manage-pubkey" md5="b289ea5824b7f69f35c0751497f4e1c3" state="uptodate">
+  <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title> 
+  <heading>&#x645;&#x631;&#x648;&#x631;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x635;&#x641;&#x62D;&#x647; &#x641;&#x647;&#x631;&#x633;&#x62A;&#x6CC; &#x627;&#x632; &#x6A9;&#x627;&#x631;&#x628;&#x631;&#x627;&#x646; &#x641;&#x639;&#x644;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647;&#x654; &#x622;&#x62F;&#x631;&#x633; &#x634;&#x645;&#x627;&#x60C; &#x6A9;&#x647; &#x62F;&#x627;&#x631;&#x627;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x646;&#x62F;&#x60C; &#x627;&#x631;&#x627;&#x626;&#x647; &#x645;&#x64A;&#x200C;&#x62F;&#x647;&#x62F;. &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x62F;&#x627;&#x634;&#x62A; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x62A;&#x646;&#x647;&#x627; &#x62D;&#x627;&#x648;&#x6CC; &#x6A9;&#x627;&#x631;&#x628;&#x631;&#x627;&#x646;&#x6CC; &#x627;&#x633;&#x62A; &#x6A9;&#x647; 1)&#x634;&#x645;&#x627; &#x628;&#x647; &#x622;&#x646;&#x647;&#x627; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F; - &#x648; &#x64A;&#x627; - 2) &#x627;&#x645;&#x636;&#x627;&#x621; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x634;&#x646;&#x627;&#x633;&#x627;&#x64A;&#x64A; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F;.</para> 
+  <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading> 
+  <para>&#x628;&#x627;&#x632;&#x6A9;&#x631;&#x62F;&#x646; &#x64A;&#x6A9; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP.</para> 
+  <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading> 
+  <para>&#x646;&#x645;&#x627;&#x64A;&#x634; &#x628;&#x631;&#x62E;&#x6CC; &#x627;&#x632; &#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A; &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP.</para> 
+  <heading>&#x62D;&#x630;&#x641;</heading> 
+  <para>&#x62D;&#x630;&#x641; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x627;&#x632; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647;&#x654; &#x622;&#x62F;&#x631;&#x633;.</para> 
+</entry>
+  <entry id="pgp-import-pubkey" md5="6ee1130b46e9ff1ca9ad3a3a47e7b382" state="uptodate">
+  <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC; - &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A;</title> 
+  <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x628;&#x627;&#x632; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x646;&#x645;&#x648;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62B;&#x628;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;. &#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x62F; &#x62F;&#x631;&#x648;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x645;&#x62A;&#x646; &#x62F;&#x631;&#x62C; &#x634;&#x648;&#x62F; &#x648; &#x64A;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x62F;&#x631; &#x631;&#x627;&#x64A;&#x627;&#x646;&#x647; &#x634;&#x62E;&#x635;&#x6CC; &#x634;&#x645;&#x627; &#x642;&#x631;&#x627;&#x631; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x62F;. &#x62F;&#x631; &#x647;&#x631; &#x62D;&#x627;&#x644;&#x60C; &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x645;&#x639;&#x62A;&#x628;&#x631; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x628;&#x647; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647;&#x654; &#x622;&#x62F;&#x631;&#x633; &#x634;&#x645;&#x627; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x647; &#x634;&#x62F;&#x647; &#x648; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x654; &#x628;&#x627;&#x632; &#x634;&#x62F;&#x647; &#x628;&#x633;&#x62A;&#x647; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F; &#x648; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646;&#x635;&#x648;&#x631;&#x62A; &#x62F;&#x644;&#x627;&#x64A;&#x644; &#x639;&#x62F;&#x645; &#x627;&#x639;&#x62A;&#x628;&#x627;&#x631; &#x6A9;&#x644;&#x64A;&#x62F; &#x628;&#x64A;&#x627;&#x646; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-overview-personalkey" md5="220af2b74a58f430efd72d6d6b1f993f" state="uptodate">
+  <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title> 
+  <heading>&#x645;&#x631;&#x648;&#x631;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x628;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x6A9;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6A9;&#x646;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x627;&#x632; &#x62F;&#x64A;&#x6AF;&#x631;&#x627;&#x646; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x62F;&#x627;&#x631;&#x64A;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; / &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;.</para> 
+  <heading>&#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x645;&#x627;</heading> 
+  <para>&#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x62F;&#x633;&#x62A;&#x631;&#x633; &#x647;&#x631; &#x641;&#x631;&#x62F;&#x6CC; &#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x628;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x62F;&#x633;&#x62A;&#x631;&#x633; &#x627;&#x641;&#x631;&#x627;&#x62F;&#x6CC; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x64A;&#x64A; &#x628;&#x627; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x628;&#x631;&#x627;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x646;&#x64A;&#x632; &#x642;&#x631;&#x627;&#x631; &#x6AF;&#x64A;&#x631;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627;&#x60C; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x64A;&#x627;&#x632; &#x627;&#x633;&#x62A;.</para> 
+  <heading>&#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC; &#x634;&#x645;&#x627;</heading> 
+  <para>&#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x6AF;&#x634;&#x627;&#x64A;&#x64A; &#x647;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x628;&#x627; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x627;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x645;&#x627;&#x60C; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x64A;&#x627;&#x632; &#x627;&#x633;&#x62A;. &#x628;&#x647; &#x639;&#x644;&#x627;&#x648;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x646;&#x64A;&#x632; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x642;&#x631;&#x627;&#x631; &#x645;&#x64A;&#x200C;&#x6AF;&#x64A;&#x631;&#x62F;. &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x634;&#x645;&#x627; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; passphrase &#x646;&#x6AF;&#x627;&#x647;&#x62F;&#x627;&#x631;&#x6CC; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; &#x648; &#x62F;&#x631; &#x647;&#x631; &#x646;&#x634;&#x633;&#x62A; IMP &#x634;&#x645;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x64A;&#x6A9;&#x628;&#x627;&#x631; &#x645;&#x62C;&#x628;&#x648;&#x631; &#x628;&#x647; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; passphrase &#x62E;&#x648;&#x62F;&#x60C; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x639;&#x644;&#x627;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;. &#x628;&#x647; &#x647;&#x645;&#x64A;&#x646; &#x62F;&#x644;&#x64A;&#x644; &#x62F;&#x631; &#x627;&#x646;&#x62A;&#x647;&#x627;&#x6CC; &#x64A;&#x6A9; &#x646;&#x634;&#x633;&#x62A; &#x62D;&#x62A;&#x645;&#x627;&#x64B; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x632; IMP &#x62E;&#x627;&#x631;&#x62C; &#x634;&#x648;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-personalkey-public" md5="3c844d4ff8fdda3e0d446b47a63117e0" state="uptodate">
+  <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC; - &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title> 
+  <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading> 
+  <para>&#x64A;&#x6A9; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x628;&#x627;&#x632; &#x645;&#x6CC;&#x200C;&#x6A9;&#x646;&#x62F;.</para> 
+  <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading> 
+  <para>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x646;&#x634;&#x627;&#x646; &#x645;&#x6CC;&#x200C;&#x62F;&#x647;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-personalkey-private" md5="1851b67a1aeef1242fc3a2b94af75c03" state="uptodate">
+  <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; - &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC;</title> 
+  <heading>&#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631;</heading> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x628;&#x627;&#x64A;&#x62F; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x654; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x631;&#x627; &#x628;&#x627;&#x632; &#x6A9;&#x646;&#x64A;&#x62F;. &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x631;&#x627; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x646;&#x64A;&#x62F;. &#x627;&#x6AF;&#x631; &#x635;&#x62D;&#x64A;&#x62D; &#x628;&#x648;&#x62F;&#x60C; IMP &#x622;&#x646;&#x631;&#x627; &#x62A;&#x627; &#x627;&#x646;&#x62A;&#x647;&#x627;&#x6CC; &#x646;&#x634;&#x633;&#x62A; &#x646;&#x6AF;&#x627;&#x647; &#x645;&#x64A;&#x200C;&#x62F;&#x627;&#x631;&#x62F;.</para> 
+  <heading>&#x62D;&#x630;&#x641; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631;</heading> 
+  <para>&#x628;&#x627; &#x62D;&#x630;&#x641; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x634;&#x62F;&#x647; &#x62F;&#x631; IMP&#x60C; &#x647;&#x631; &#x67E;&#x631;&#x648;&#x633;&#x647; &#x62C;&#x62F;&#x64A;&#x62F;&#x6CC; &#x6A9;&#x647; &#x646;&#x64A;&#x627;&#x632; &#x628;&#x647; &#x622;&#x646; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x622;&#x646;&#x631;&#x627; &#x627;&#x632; &#x634;&#x645;&#x627; &#x62F;&#x631; &#x62E;&#x648;&#x627;&#x633;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;.</para> 
+  <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading> 
+  <para>&#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; PGP &#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F; &#x648;&#x644;&#x64A; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x642;&#x62A; &#x6A9;&#x646;&#x64A;&#x62F; &#x6A9;&#x647; &#x647;&#x631; &#x6AF;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x647; &#x634;&#x62E;&#x635; &#x62F;&#x64A;&#x6AF;&#x631;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x646;&#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+  <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading> 
+  <para>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;&#x6CC; &#x631;&#x627; &#x631;&#x627;&#x62C;&#x639; &#x628;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC; &#x646;&#x634;&#x627;&#x646; &#x645;&#x6CC;&#x200C;&#x62F;&#x647;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-personalkey-delete" md5="dbd8cbe6bce71c4fb592dd1b3b27b7ce" state="uptodate">
+  <title>PGP :&#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; - &#x62D;&#x630;&#x641;</title> 
+  <heading>&#x62D;&#x630;&#x641; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A;/ &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x631;&#x627; &#x627;&#x632;IMP &#x62D;&#x630;&#x641; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-personalkey-create-name" md5="748cb124b7ff52820792e278037a8c27" state="uptodate">
+  <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x646;&#x627;&#x645;</title> 
+  <heading>&#x646;&#x627;&#x645;</heading> 
+  <para>&#x646;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x62F;&#x631;&#x62C; &#x6A9;&#x646;&#x64A;&#x62F; (&#x627;&#x62C;&#x628;&#x627;&#x631;&#x6CC;)</para> 
+</entry>
+  <entry id="pgp-personalkey-create-comment" md5="e666eb9f0ee4b49fe04f74fc18db8640" state="uptodate">
+  <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A;</title> 
+  <heading>&#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A;</heading> 
+  <para>&#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x6CC; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62F;&#x631;&#x62C; &#x622;&#x646; &#x628;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;(&#x627;&#x62E;&#x62A;&#x64A;&#x627;&#x631;&#x6CC;).</para> 
+</entry>
+  <entry id="pgp-personalkey-create-email" md5="c729f70fdb3a73cbb7ba5ef5888e3092" state="uptodate">
+  <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x622;&#x62F;&#x631;&#x633;&#x200C;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;</title> 
+  <heading>&#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;</heading> 
+  <para>&#x622;&#x62F;&#x631;&#x633; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x627; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x645;&#x631;&#x62A;&#x628;&#x637; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F; (&#x627;&#x62C;&#x628;&#x627;&#x631;&#x6CC;)</para> 
+</entry>
+  <entry id="pgp-personalkey-create-keylength" md5="24ca641c63fb5ff310a39ee0d3b1ee55" state="uptodate">
+  <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x637;&#x648;&#x644; &#x6A9;&#x644;&#x64A;&#x62F;</title> 
+  <heading>&#x637;&#x648;&#x644; &#x6A9;&#x644;&#x64A;&#x62F;</heading> 
+  <para>&#x637;&#x648;&#x644; &#x6A9;&#x644;&#x64A;&#x62F; &#x62A;&#x648;&#x644;&#x64A;&#x62F; &#x634;&#x62F;&#x647; &#x634;&#x645;&#x627; &#x628;&#x647; &#x628;&#x627;&#x64A;&#x62A;. &#x647;&#x631; &#x686;&#x647; &#x627;&#x64A;&#x646; &#x637;&#x648;&#x644; &#x628;&#x632;&#x631;&#x6AF;&#x62A;&#x631; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x627;&#x631;&#x62A;&#x628;&#x627;&#x637; &#x627;&#x645;&#x646; &#x62A;&#x631; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;. &#x627;&#x644;&#x628;&#x62A;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x6A9;&#x646;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x627;&#x645;&#x631; &#x628;&#x627;&#x639;&#x62B; &#x628;&#x627;&#x644;&#x627;&#x631;&#x641;&#x62A;&#x646; &#x632;&#x645;&#x627;&#x646; &#x62A;&#x648;&#x644;&#x64A;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x632;&#x645;&#x627;&#x646; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. &#x637;&#x648;&#x644; 1024 &#x628;&#x627;&#x64A;&#x62A; &#x637;&#x648;&#x644; &#x67E;&#x64A;&#x634;&#x200C;&#x641;&#x631;&#x636; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x627;&#x645;&#x646;&#x64A;&#x62A; &#x62E;&#x648;&#x628;&#x64A; &#x631;&#x627; &#x641;&#x631;&#x627;&#x647;&#x645; &#x645;&#x64A;&#x200C;&#x622;&#x648;&#x631;&#x62F;.</para> 
+</entry>
+  <entry id="pgp-personalkey-create-passphrase" md5="2fb9372970bf33f51e988ba39dbd7193" state="uptodate">
+  <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631;</title> 
+  <heading>&#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631;</heading> 
+  <para>&#x627;&#x632; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x62D;&#x627;&#x641;&#x638;&#x62A; &#x648; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;. &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x628;&#x627;&#x64A;&#x62F; &#x62D;&#x62F;&#x627;&#x642;&#x644; 6 &#x646;&#x648;&#x64A;&#x633;&#x647; &#x628;&#x627;&#x634;&#x62F;. &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x646;&#x628;&#x627;&#x64A;&#x62F; &#x645;&#x639;&#x627;&#x62F;&#x644; &#x64A;&#x6A9; &#x6A9;&#x644;&#x645;&#x647; &#x62F;&#x631; &#x62F;&#x64A;&#x6A9;&#x634;&#x646;&#x631;&#x6CC; &#x628;&#x648;&#x62F;&#x647; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646;&#x64A; &#x646;&#x628;&#x627;&#x64A;&#x62F; &#x645;&#x639;&#x627;&#x62F;&#x644; &#x627;&#x633;&#x645; &#x631;&#x645;&#x632; &#x634;&#x645;&#x627; &#x628;&#x627;&#x634;&#x62F; &#x648; &#x628;&#x627;&#x64A;&#x62F; &#x647;&#x645; &#x634;&#x627;&#x645;&#x644; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x62D;&#x631;&#x641;&#x64A; &#x648; &#x647;&#x645; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x200C;&#x647;&#x627;&#x64A; &#x639;&#x62F;&#x62F;&#x6CC; &#x628;&#x627;&#x634;&#x62F;. &#x644;&#x627;&#x632;&#x645; &#x628;&#x647; &#x630;&#x6A9;&#x631; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x6AF;&#x630;&#x631; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x62A;&#x623;&#x64A;&#x64A;&#x62F;&#x60C; &#x62F;&#x648;&#x628;&#x627;&#x631; &#x628;&#x627;&#x64A;&#x62F; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F; (&#x627;&#x62C;&#x628;&#x627;&#x631;&#x6CC;)</para> 
+</entry>
+  <entry id="pgp-personalkey-create-actions" md5="0f8234935b964c83533b4ec4c15eb712" state="uptodate">
+  <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;</title> 
+  <heading>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;</heading> 
+  <para>&#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x648; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x631;&#x627; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x648; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;.</para> 
+  <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x64A;&#x6A9; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; / &#x639;&#x645;&#x648;&#x645;&#x64A; &#x631;&#x627; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F; &#x648; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x64A;&#x646; &#x645;&#x646;&#x638;&#x648;&#x631; &#x64A;&#x6A9; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x631;&#x627; &#x628;&#x627;&#x632; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x633;&#x62A;&#x64A; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; / &#x639;&#x645;&#x648;&#x645;&#x64A; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x645;&#x639;&#x631;&#x641;&#x64A; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F;. &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x62A;&#x646; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x646;&#x62F; &#x62F;&#x631;&#x62C; &#x634;&#x648;&#x646;&#x62F; &#x64A;&#x627; &#x627;&#x6AF;&#x631; &#x62F;&#x627;&#x62E;&#x644; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x627;&#x645;&#x67E;&#x64A;&#x648;&#x62A;&#x631; &#x645;&#x62D;&#x644;&#x651;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x627;&#x634;&#x646;&#x62F; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62A;&#x646;&#x647;&#x627; &#x646;&#x627;&#x645; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; &#x635;&#x62D;&#x64A;&#x62D; &#x628;&#x627;&#x634;&#x646;&#x62F; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x633;&#x62A;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F; &#x648; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x637;&#x627; &#x6A9;&#x647; &#x646;&#x648;&#x639; &#x62E;&#x637;&#x627; &#x62F;&#x631; &#x622;&#x646; &#x62A;&#x648;&#x636;&#x64A;&#x62D; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;&#x60C; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;.</para> 
+</entry>
+  <entry id="smime-overview" md5="d3c752b1345fb2eccfe575c07461963f" state="uptodate">
+  <title>S/MIME : &#x645;&#x631;&#x648;&#x631;</title> 
+  <heading>S/MIME &#x686;&#x64A;&#x633;&#x62A;&#x61F;</heading> 
+  <para>S/MIME &#x64A;&#x6A9; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A;/&#x639;&#x645;&#x648;&#x645;&#x64A; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x631;&#x627; &#x645;&#x645;&#x6A9;&#x646; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; S/MIME &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x648; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x633;&#x627;&#x632;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x648; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x628;&#x648;&#x62F;&#x647; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62A;&#x634;&#x62E;&#x64A;&#x635; &#x62A;&#x62D;&#x631;&#x64A;&#x641;&#x647;&#x627;&#x6CC; &#x635;&#x648;&#x631;&#x62A; &#x6AF;&#x631;&#x641;&#x62A;&#x647; &#x62F;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x639;&#x62F; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x622;&#x646;&#x647;&#x627;&#x60C; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F;.</para> 
+  <heading>&#x622;&#x64A;&#x627; &#x642;&#x627;&#x628;&#x644;&#x64A;&#x62A;&#x647;&#x627;&#x6CC; S/MIME &#x641;&#x639;&#x627;&#x644; &#x634;&#x648;&#x62F;&#x61F;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x64A; S/MIME &#x62E;&#x648;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x637;&#x628;&#x639; &#x622;&#x646; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62E;&#x648;&#x627;&#x646;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647;&#x60C; &#x62A;&#x634;&#x62E;&#x64A;&#x635; &#x627;&#x645;&#x636;&#x627;&#x647;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x631;&#x645;&#x632;&#x628;&#x646;&#x62F;&#x6CC; &#x648; &#x627;&#x645;&#x636;&#x627;&#x621; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="smime-overview-personalkey" md5="9f4f36ae72cb4abc731067d338be3b98" state="uptodate">
+  <title>S/MIME : &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title> 
+  <heading>&#x645;&#x631;&#x648;&#x631;</heading> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x628;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x6A9;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x64A; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6A9;&#x646;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A;/&#x639;&#x645;&#x648;&#x645;&#x64A; S/MIME &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="smime-import-personal-certs" md5="cf0ed2e3e24d30dedf8cfef2c2645759" state="uptodate">
+  <title>S/MIME : &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title> 
+  <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</heading> 
+  <para>&#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F;&#x60C; &#x6AF;&#x648;&#x627;&#x647;&#x64A;&#x647;&#x627;&#x6CC; &#x62A;&#x623;&#x64A;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x628;&#x627; &#x641;&#x631;&#x645;&#x62A; PKCS#12 &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;. &#x627;&#x64A;&#x646; &#x641;&#x631;&#x645;&#x62A; &#x63A;&#x627;&#x644;&#x628;&#x627; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631;&#x647;&#x627; &#x648; &#x64A;&#x627; &#x628;&#x631;&#x62E;&#x64A; &#x627;&#x632; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x639;&#x627;&#x645;&#x644;&#x647;&#x627; ( &#x645;&#x627;&#x646;&#x646;&#x62F; &#x648;&#x64A;&#x646;&#x62F;&#x648;&#x632; XP ) &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;. &#x627;&#x6AF;&#x631; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x645;&#x639;&#x62A;&#x628;&#x631; &#x628;&#x627;&#x634;&#x646;&#x62F;&#x60C; &#x62B;&#x628;&#x62A; &#x634;&#x62F;&#x647; &#x648; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x633;&#x62A;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x637;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.</para> 
+</entry>
+  <entry id="smime-delete-personal-certs" md5="018bb6b61a7e416892de288ad1c880f4" state="uptodate">
+  <title>S/MIME : &#x62D;&#x630;&#x641; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title> 
+  <heading>&#x62D;&#x630;&#x641; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</heading> 
+  <para>&#x628;&#x627; &#x62D;&#x630;&#x641; &#x6AF;&#x648;&#x627;&#x647;&#x64A;&#x647;&#x627;&#x6CC; &#x62A;&#x623;&#x6CC;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x64A;&#x60C; &#x634;&#x645;&#x627; &#x62F;&#x64A;&#x6AF;&#x631; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x645;&#x636;&#x627;&#x6CC; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x647;&#x64A;&#x686; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647;&#x200C; S/MIME &#x631;&#x627; &#x646;&#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="smime-manage-pubkey" md5="8b6c63684d3d73b3d084025a78fe7e88" state="uptodate">
+  <title>S/MIME : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title> 
+  <heading>S/MIME : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading> 
+  <para>&#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; S/MIME &#x634;&#x645;&#x627;</para> 
+  <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading> 
+  <para>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;&#x654; &#x645;&#x62A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</para> 
+  <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading> 
+  <para>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;&#x654; &#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A; &#x641;&#x646;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</para> 
+  <heading>&#x62D;&#x630;&#x641;</heading> 
+  <para>&#x628;&#x627; &#x627;&#x64A;&#x646; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x60C; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x62F;&#x647; &#x627;&#x632; &#x62F;&#x64A;&#x633;&#x6A9; &#x634;&#x645;&#x627; &#x62D;&#x630;&#x641; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F;. &#x628;&#x627; &#x62D;&#x630;&#x641; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x64A;&#x6A9; &#x6A9;&#x627;&#x631;&#x628;&#x631;&#x60C; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x628;&#x647; &#x622;&#x646; &#x6A9;&#x627;&#x631;&#x628;&#x631; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="printing" md5="f233c11b6b4a6bedeb68f1d5a2a976db" state="uptodate">
+  <title>&#x686;&#x627;&#x67E;</title> 
+  <heading>&#x686;&#x627;&#x67E; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x686;&#x627;&#x67E; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x686;&#x627;&#x67E;"&#x60C; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x628;&#x633;&#x62A;&#x647; &#x628;&#x647; &#x646;&#x648;&#x639; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x654; &#x686;&#x627;&#x67E; &#x628;&#x631;&#x627;&#x6CC; &#x634;&#x645;&#x627; &#x6AF;&#x634;&#x648;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;. &#x627;&#x6AF;&#x631; &#x627;&#x62D;&#x64A;&#x627;&#x646;&#x627;&#x652; &#x627;&#x64A;&#x646; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x627;&#x632; &#x646;&#x634;&#x62F;&#x60C; &#x627;&#x632; &#x6AF;&#x632;&#x6CC;&#x646;&#x6AF;&#x627;&#x646; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647;&#x654; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x62E;&#x648;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x639;&#x627;&#x644; &#x6A9;&#x631;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="sorting" md5="18cdeac38027fe5c42bab693f2a4260a" state="uptodate">
+  <title>&#x645;&#x631;&#x62A;&#x628; &#x633;&#x627;&#x632;&#x6CC; / &#x6AF;&#x631;&#x648;&#x647; &#x200C;&#x628;&#x646;&#x62F;&#x6CC;</title> 
+  <heading>&#x645;&#x631;&#x62A;&#x628; &#x6A9;&#x631;&#x62F;&#x646; &#x648;&#x631;&#x648;&#x62F;&#x6CC;&#x200C;&#x647;&#x627;</heading> 
+  <para>&#x647;&#x646;&#x6AF;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x64A;&#x62F;&#x60C; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x645;&#x631;&#x62A;&#x628; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x631; &#x627;&#x633;&#x627;&#x633; &#x62A;&#x645;&#x627;&#x645; &#x633;&#x62A;&#x648;&#x646;&#x647;&#x627; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x64A;&#x646; &#x645;&#x646;&#x638;&#x648;&#x631; &#x62A;&#x646;&#x647;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x639;&#x646;&#x648;&#x627;&#x646; &#x633;&#x62A;&#x648;&#x646; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x628;&#x627; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x6A9;&#x644;&#x64A;&#x6A9; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x639;&#x644;&#x627;&#x645;&#x62A; &#x641;&#x644;&#x634; &#x6A9;&#x646;&#x627;&#x631; &#x647;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x645;&#x631;&#x62A;&#x628; &#x633;&#x627;&#x632;&#x6CC; &#x631;&#x627; &#x627;&#x632; &#x635;&#x639;&#x648;&#x62F;&#x6CC; &#x628;&#x647; &#x646;&#x632;&#x648;&#x644;&#x64A; &#x648; &#x64A;&#x627; &#x628;&#x631; &#x639;&#x6A9;&#x633;&#x60C; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62F;&#x627;&#x62F;.</para> 
+  <heading>&#x646;&#x645;&#x627;&#x6CC;&#x634; &#x633;&#x644;&#x633;&#x644;&#x647;&#x200C;&#x627;&#x6CC;&#x6CC;</heading> 
+  <para>&#x628;&#x631;&#x627;&#x6CC; &#x6AF;&#x631;&#x648;&#x647;&#x200C;&#x628;&#x646;&#x62F;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x631; &#x627;&#x633;&#x627;&#x633; &#x645;&#x648;&#x636;&#x648;&#x639; ( &#x647;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62D;&#x62F;&#x627;&#x642;&#x644; &#x628;&#x627; &#x67E;&#x627;&#x633;&#x62E;&#x647;&#x627;&#x6CC; &#x645;&#x631;&#x628;&#x648;&#x637; &#x628;&#x647; &#x622;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x60C; &#x6AF;&#x631;&#x648;&#x647; &#x628;&#x646;&#x62F;&#x6CC; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;)&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x648;&#x646;&#x62F; [&#x633;&#x627;&#x633;&#x644;&#x647;&#x200C;&#x627;&#x6CC;&#x6CC;] &#x6A9;&#x647; &#x62F;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x642;&#x631;&#x627;&#x631; &#x62F;&#x627;&#x62F;&#x60C; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x632; &#x628;&#x64A;&#x646; &#x628;&#x631;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x646;&#x62D;&#x648;&#x647;&#x654; &#x646;&#x645;&#x627;&#x6CC;&#x634; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631;&#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x648;&#x646;&#x62F; [&#x645;&#x648;&#x636;&#x648;&#x639;] &#x62F;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x645;&#x648;&#x636;&#x648;&#x639;&#x60C; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="alternative-msg" md5="4978073f76977b6af6b69810e4d22a65" state="uptodate">
+  <title>&#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x686;&#x646;&#x62F;&#x642;&#x633;&#x645;&#x62A;&#x6CC;/&#x62C;&#x627;&#x64A;&#x6AF;&#x632;&#x64A;&#x646;</title> 
+  <para>&#x628;&#x631;&#x62E;&#x64A; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x200C;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x686;&#x646;&#x62F; &#x642;&#x633;&#x645;&#x62A;&#x64A;/&#x62C;&#x627;&#x64A;&#x6AF;&#x632;&#x64A;&#x646; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x646;&#x62F;. &#x627;&#x64A;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x62D;&#x627;&#x648;&#x6CC; &#x686;&#x646;&#x62F; &#x642;&#x633;&#x645;&#x62A; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x646;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646;&#x647;&#x627; &#x62A;&#x645;&#x627;&#x645; &#x642;&#x633;&#x645;&#x62A;&#x647;&#x627;&#x60C; &#x645;&#x62D;&#x62A;&#x648;&#x627;&#x6CC; &#x64A;&#x6A9;&#x633;&#x627;&#x646; &#x628;&#x627; &#x642;&#x627;&#x644;&#x628;&#x647;&#x627;&#x6CC; &#x645;&#x62A;&#x641;&#x627;&#x648;&#x62A;&#x64A; &#x631;&#x627; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x645;&#x64A;&#x200C;&#x62F;&#x647;&#x646;&#x62F; &#x6A9;&#x647; &#x639;&#x645;&#x648;&#x645;&#x627;&#x652; &#x62A;&#x646;&#x647;&#x627; &#x642;&#x633;&#x645;&#x62A; &#x622;&#x62E;&#x631; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x646;&#x634;&#x627;&#x646; &#x62F;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; ( &#x62A;&#x641;&#x627;&#x648;&#x62A; &#x642;&#x627;&#x644;&#x628; &#x627;&#x64A;&#x646; &#x642;&#x633;&#x645;&#x62A;&#x647;&#x627; &#x645;&#x62B;&#x644;&#x627; &#x62F;&#x631; &#x642;&#x627;&#x644;&#x628; &#x645;&#x62A;&#x646; &#x648; &#x64A;&#x627; &#x642;&#x627;&#x644;&#x628; HTML &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x648; ... &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F;).</para> 
+</entry>
+  <entry id="prefs-rename_sentmail_monthly" md5="530fa20e0afbc25ffd40877948832899" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x645;&#x627;&#x647;&#x627;&#x646;&#x647; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x62F;&#x647;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x62F;&#x647; &#x62F;&#x631; &#x627;&#x628;&#x62A;&#x62F;&#x627;&#x6CC; &#x647;&#x631; &#x645;&#x627;&#x647; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x628;&#x647; &#x646;&#x627;&#x645;&#x64A; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F; &#x6A9;&#x647; &#x62D;&#x627;&#x648;&#x6CC; &#x646;&#x627;&#x645; &#x645;&#x627;&#x647; &#x648; &#x633;&#x627;&#x644; &#x628;&#x627;&#x634;&#x62F; &#x648; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x62C;&#x62F;&#x64A;&#x62F; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x646;&#x64A;&#x632; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-delete_sentmail_monthly" md5="0beed16dfd68e2f25e0c66871fd546df" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x627;&#x646;&#x647;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x62F;&#x631; &#x627;&#x628;&#x62A;&#x62F;&#x627;&#x6CC; &#x647;&#x631; &#x645;&#x627;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x634;&#x645;&#x627; &#x645;&#x62D;&#x62F;&#x648;&#x62F;&#x64A;&#x651;&#x62A; &#x62F;&#x631; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x633;&#x6A9; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x645;&#x641;&#x64A;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-delete_sentmail_monthly_keep" md5="71ed1c2eab48b91a25b5bcd4b14ccea9" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x627;&#x646;&#x647; - &#x645;&#x627;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62E;&#x648;&#x62F; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x645;&#x644;&#x627;&#x6A9; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x642;&#x62F;&#x645;&#x62A; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x639;&#x62F; &#x627;&#x632; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x62A;&#x639;&#x62F;&#x627;&#x62F; &#x645;&#x627;&#x647;&#x647;&#x627; &#x648; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x60C; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62D;&#x630;&#x641; &#x62E;&#x648;&#x627;&#x647;&#x646;&#x62F; &#x634;&#x62F;.</para> 
+  </entry>
+  <entry id="prefs-delete_attachments_monthly" md5="373ea02ede6df5fc345caf632e19a75f" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x646;&#x627;&#x645;&#x647;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x627;&#x628;&#x62A;&#x62F;&#x627;&#x6CC; &#x647;&#x631; &#x645;&#x627;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x634;&#x645;&#x627; &#x645;&#x62D;&#x62F;&#x648;&#x62F;&#x64A;&#x651;&#x62A; &#x62F;&#x631; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x633;&#x6A9; &#x62F;&#x631; &#x62F;&#x633;&#x62A;&#x631;&#x633; &#x62E;&#x648;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x645;&#x641;&#x64A;&#x62F; &#x627;&#x633;&#x62A;.</para> 
+</entry>
+  <entry id="prefs-delete_attachments_monthly_keep" md5="1b340a60214dffd04aec02cc1127df5d" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x646;&#x627;&#x645;&#x647; - &#x645;&#x627;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x647;&#x631; &#x645;&#x627;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x645;&#x644;&#x627;&#x6A9; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x642;&#x62F;&#x645;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x631;&#x627; &#x628;&#x647; &#x645;&#x627;&#x647; &#x645;&#x634;&#x62E;&#x635; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x6A9;&#x647; &#x642;&#x62F;&#x64A;&#x645;&#x64A;&#x200C;&#x62A;&#x631; &#x627;&#x632; &#x645;&#x644;&#x627;&#x6A9; &#x645;&#x634;&#x62E;&#x635; &#x634;&#x62F;&#x647; &#x62A;&#x648;&#x633;&#x637; &#x634;&#x645;&#x627; &#x628;&#x627;&#x634;&#x646;&#x62F;&#x60C; &#x62D;&#x630;&#x641; &#x62E;&#x648;&#x627;&#x647;&#x646;&#x62F; &#x634;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-purge_trash" md5="dc71871146be3e46ade0087a8cf18273" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62E;&#x627;&#x644;&#x6CC; &#x6A9;&#x631;&#x62F;&#x646; &#x633;&#x637;&#x644; &#x622;&#x634;&#x63A;&#x627;&#x644;</title> 
+  <para>&#x622;&#x64A;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62E;&#x627;&#x644;&#x64A; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x622;&#x634;&#x63A;&#x627;&#x644; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x64A;&#x6A9; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x64A; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-purge_trash_interval" md5="7be91fbeb05b2d87289d4c5602d5a32f" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x62E;&#x627;&#x644;&#x6CC; &#x6A9;&#x631;&#x62F;&#x646; &#x633;&#x637;&#x644; &#x622;&#x634;&#x63A;&#x627;&#x644;</title> 
+  <para>&#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62E;&#x627;&#x644;&#x64A; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x622;&#x634;&#x63A;&#x627;&#x644; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x64A;&#x6A9; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x64A; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x64A; &#x631;&#x627; &#x645;&#x634;&#x62E;&#x635; &#x6A9;&#x646;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-purge_trash_keep" md5="3cb5a2b5b80b7ac1179ae005f983970e" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x645;&#x62F;&#x62A; &#x632;&#x645;&#x627;&#x646; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; &#x622;&#x634;&#x63A;&#x627;&#x644;&#x647;&#x627;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62E;&#x627;&#x644;&#x64A; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647;&#x654; &#x622;&#x634;&#x63A;&#x627;&#x644; &#x62E;&#x648;&#x62F; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x645;&#x644;&#x627;&#x6A9; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x642;&#x62F;&#x645;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627; (&#x628;&#x647; &#x631;&#x648;&#x632;) &#x645;&#x634;&#x62E;&#x635; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-attrib_text" md5="721a09d7ca028c97e3bd2b38c597fff7" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x62A;&#x631;&#x6A9;&#x64A;&#x628;&#x200C;&#x647;&#x627;&#x6CC; &#x62E;&#x627;&#x635;</title> 
+  <para>&#x627;&#x64A;&#x646;&#x62C;&#x627; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x639;&#x628;&#x627;&#x631;&#x62A;&#x64A; &#x631;&#x627; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x638;&#x627;&#x647;&#x631; &#x634;&#x62F;&#x646; &#x622;&#x646; &#x642;&#x628;&#x644; &#x627;&#x632; &#x647;&#x631; &#x645;&#x62A;&#x646; &#x646;&#x642;&#x644; &#x642;&#x648;&#x644; &#x634;&#x62F;&#x647; &#x62F;&#x631; &#x67E;&#x627;&#x633;&#x62E;&#x647;&#x627; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x631;&#x627;&#x60C; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;.</para> 
+  <para>&#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x627;&#x632; &#x64A;&#x6A9; &#x64A;&#x627; &#x686;&#x646;&#x62F; &#x62A;&#x631;&#x6A9;&#x64A;&#x628; &#x62E;&#x627;&#x635; &#x62F;&#x631; &#x62F;&#x627;&#x62E;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x627;&#x633;&#x62E; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62F;&#x631; &#x632;&#x64A;&#x631; &#x641;&#x647;&#x631;&#x633;&#x62A;&#x64A; &#x627;&#x632; &#x627;&#x64A;&#x646; &#x62A;&#x631;&#x6A9;&#x64A;&#x628;&#x627;&#x62A; &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;:</para> 
+  <para>f% : &#x646;&#x627;&#x645; &#x648; &#x622;&#x62F;&#x631;&#x633; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</para> 
+  <para>a% : &#x622;&#x62F;&#x631;&#x633; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</para> 
+  <para>p% : &#x646;&#x627;&#x645; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</para> 
+  <para>r% : &#x641;&#x631;&#x645;&#x62A; &#x6A9;&#x627;&#x645;&#x644; &#x62A;&#x627;&#x631;&#x64A;&#x62E; &#x648; &#x632;&#x645;&#x627;&#x646; &#x62F;&#x631; RFC &#x6F2;&#x6F8;&#x6F2;&#x6F2;</para> 
+  <para>d% : &#x62A;&#x627;&#x631;&#x64A;&#x62E; &#x62F;&#x631; &#x641;&#x631;&#x645;&#x62A; dd mmm yyyy</para> 
+  <para>x% : &#x632;&#x645;&#x627;&#x646; &#x62F;&#x631; &#x645;&#x62D;&#x644;&#x651;&#x64A;&#x62A; &#x62C;&#x627;&#x631;&#x6CC;</para> 
+  <para>c% : &#x62A;&#x627;&#x631;&#x64A;&#x62E; &#x648; &#x632;&#x645;&#x627;&#x646; &#x62F;&#x631; &#x645;&#x62D;&#x644;&#x651;&#x64A;&#x62A; &#x62C;&#x627;&#x631;&#x6CC;</para> 
+  <para>m% : &#x645;&#x634;&#x62E;&#x635;&#x647; (ID) &#x67E;&#x64A;&#x63A;&#x627;&#x645;</para> 
+  <para>s% : &#x645;&#x648;&#x636;&#x648;&#x639;</para> 
+  <para>n% : &#x62E;&#x637; &#x62C;&#x62F;&#x64A;&#x62F;</para> 
+  <para>%% : &#x646;&#x648;&#x64A;&#x633;&#x647; &#x66A;</para> 
+</entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
+  <entry id="prefs-disposition_request_read" md5="89e92c4d68224b2345b59959878a7174" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x631;&#x633;&#x64A;&#x62F; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647;</title> 
+  <para>&#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6AF;&#x632;&#x64A;&#x646;&#x647; "&#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x631;&#x633;&#x64A;&#x62F; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647;"&#x60C; &#x62F;&#x631; &#x648;&#x627;&#x642;&#x639; &#x64A;&#x6A9; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x628;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x627;&#x632; &#x622;&#x646;&#x647;&#x627; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647; &#x627;&#x648;&#x644;&#x64A;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x60C; &#x634;&#x645;&#x627; &#x631;&#x627; &#x627;&#x632; &#x622;&#x646; &#x645;&#x637;&#x644;&#x639; &#x633;&#x627;&#x632;&#x646;&#x62F;. &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F; &#x6A9;&#x647; &#x62A;&#x645;&#x627;&#x645;&#x64A; &#x6A9;&#x627;&#x631;&#x633;&#x627;&#x632;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x64A; &#x627;&#x64A;&#x646; &#x639;&#x645;&#x644; &#x631;&#x627; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x64A; &#x646;&#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-disposition_send_mdn" md5="1fe04e5dc3de68d172da284895973ea9" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x627;&#x631;&#x633;&#x627;&#x644; MDN</title> 
+  <para>&#x6AF;&#x632;&#x64A;&#x646;&#x647; "&#x627;&#x631;&#x633;&#x627;&#x644; MDN"&#x60C; &#x64A;&#x6A9; &#x62A;&#x630;&#x6A9;&#x651;&#x631; MDN (&#x62D;&#x627;&#x644;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;) &#x631;&#x627; &#x628;&#x647; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;&#x654; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;. &#x627;&#x64A;&#x646; &#x62A;&#x630;&#x6A9;&#x651;&#x631; &#x645;&#x627;&#x646;&#x646;&#x62F; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x631;&#x633;&#x64A;&#x62F; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x6AF;&#x627;&#x647;&#x64A; &#x628;&#x647; &#x637;&#x648;&#x631; &#x627;&#x62A;&#x648;&#x645;&#x627;&#x62A;&#x64A;&#x6A9; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x62F;&#x647; &#x648; &#x6AF;&#x627;&#x647;&#x64A; &#x646;&#x64A;&#x632; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x627;&#x631;&#x633;&#x627;&#x644; &#x622;&#x646;&#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x633;&#x62A;&#x64A; &#x645;&#x644;&#x63A;&#x64A; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-disposition_request_delivery" md5="26598e29af05a07de5e13644669be712" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x62A;&#x623;&#x64A;&#x64A;&#x62F; &#x62A;&#x62D;&#x648;&#x64A;&#x644;</title> 
+  <para>"&#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x62A;&#x623;&#x6CC;&#x64A;&#x62F; &#x627;&#x631;&#x633;&#x627;&#x644;"&#x60C; &#x64A;&#x6A9; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x628;&#x631;&#x627;&#x6CC; &#x6A9;&#x627;&#x631;&#x633;&#x627;&#x632; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x64A; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F; &#x62A;&#x627; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x622;&#x6AF;&#x627;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x62F;. &#x627;&#x644;&#x628;&#x62A;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x627;&#x64A;&#x646; &#x631;&#x633;&#x64A;&#x62F; &#x628;&#x647; &#x645;&#x639;&#x646;&#x64A; &#x62E;&#x648;&#x627;&#x646;&#x62F;&#x647; &#x634;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62A;&#x648;&#x633;&#x637; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x646;&#x64A;&#x633;&#x62A;. &#x628;&#x631;&#x62E;&#x64A; &#x627;&#x632; &#x6A9;&#x627;&#x631;&#x633;&#x627;&#x632;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x654; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x64A; &#x627;&#x64A;&#x646; &#x642;&#x627;&#x628;&#x644;&#x64A;&#x651;&#x62A; &#x631;&#x627; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x64A; &#x646;&#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
+  <entry id="prefs-html_image_replacement" md5="28e1cf08e328345a8e7274c853492d4f" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62C;&#x627;&#x64A;&#x6AF;&#x630;&#x627;&#x631;&#x6CC; &#x62A;&#x635;&#x648;&#x64A;&#x631; &#x62F;&#x631; HTML</title> 
+  <para>&#x622;&#x64A;&#x627; &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x62F;&#x631; &#x641;&#x631;&#x645;&#x62A; HTML &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62A;&#x635;&#x627;&#x648;&#x64A;&#x631; &#x628;&#x644;&#x648;&#x6A9;&#x647; &#x628;&#x627;&#x634;&#x646;&#x62F; &#x62A;&#x627; &#x634;&#x645;&#x627; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x62A;&#x623;&#x6CC;&#x64A;&#x62F; &#x6A9;&#x646;&#x64A;&#x62F;&#x61F;</para> 
+</entry>
+  <entry id="prefs-html_image_addrbook" md5="759fa3df24e0a3cd89f320102252f91a" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62C;&#x627;&#x64A;&#x6AF;&#x630;&#x627;&#x631;&#x6CC; &#x62A;&#x635;&#x648;&#x64A;&#x631; &#x62F;&#x631;HTML / &#x62D;&#x636;&#x648;&#x631; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647;&#x654; &#x622;&#x62F;&#x631;&#x633;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x62A;&#x635;&#x627;&#x648;&#x64A;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; HTML &#x631;&#x627; &#x628;&#x644;&#x648;&#x6A9;&#x647; &#x6A9;&#x631;&#x62F;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x622;&#x64A;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x645;&#x633;&#x626;&#x644;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x6AF;&#x627;&#x646;&#x64A; &#x6A9;&#x647; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647;&#x654; &#x622;&#x62F;&#x631;&#x633; &#x634;&#x645;&#x627; &#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x627;&#x631;&#x646;&#x62F; &#x645;&#x633;&#x62A;&#x62B;&#x646;&#x64A; &#x634;&#x648;&#x62F;&#x61F;</para> 
+</entry>
+  <entry id="prefs-mailbox_start" md5="3d1196f265d8b7cc465ebf21512acc05" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x635;&#x641;&#x62D;&#x647;&#x654; &#x622;&#x63A;&#x627;&#x632;&#x64A;&#x646; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646;</title> 
+  <para>&#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x645;&#x634;&#x62E;&#x635; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F; &#x6A9;&#x647; &#x6A9;&#x62F;&#x627;&#x645; &#x635;&#x641;&#x62D;&#x647; &#x62F;&#x631; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x62F;&#x627;&#x646; &#x634;&#x645;&#x627;&#x60C; &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x628;&#x627;&#x631; &#x627;&#x648;&#x644; &#x628;&#x647; &#x622;&#x646; &#x62F;&#x633;&#x62A;&#x631;&#x633;&#x64A; &#x645;&#x64A;&#x200C;&#x64A;&#x627;&#x628;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x634;&#x648;&#x62F;&#x61F;</para> 
+</entry>
+  <entry id="prefs-save_attachments" md5="35b46334cdcc7fa416b9f9fca5874e80" state="uptodate">
+  <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x654; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC;</title> 
+  <para>&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x634;&#x62F;&#x647; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;&#x60C; &#x622;&#x64A;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x646;&#x64A;&#x632; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x634;&#x648;&#x646;&#x62F;&#x61F; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x647;&#x627;&#x6CC; &#x632;&#x64A;&#x631; &#x628;&#x631;&#x627;&#x6CC; &#x634;&#x645;&#x627; &#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x627;&#x631;&#x62F;:</para> 
+  <para>* "&#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x634;&#x648;&#x646;&#x62F;" &#x2013; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x62D;&#x627;&#x644;&#x62A; &#x628;&#x631;&#x627;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x654; &#x67E;&#x6CC;&#x648;&#x633;&#x62A; &#x627;&#x632; &#x634;&#x645;&#x627; &#x633;&#x648;&#x627;&#x644; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.</para> 
+  <para>* "&#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x628;&#x631;&#x627;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x654; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x633;&#x624;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x648; &#x62C;&#x648;&#x627;&#x628; &#x67E;&#x64A;&#x634;&#x200C;&#x641;&#x631;&#x636; &#x628;&#x644;&#x647; &#x628;&#x627;&#x634;&#x62F;."</para> 
+  <para>* "&#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x628;&#x631;&#x627;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x654; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x633;&#x624;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x648; &#x62C;&#x648;&#x627;&#x628; &#x67E;&#x64A;&#x634;&#x200C;&#x641;&#x631;&#x636; &#x646;&#x647; &#x628;&#x627;&#x634;&#x62F;."</para> 
+  <para>* "&#x647;&#x631;&#x6AF;&#x632; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x646;&#x634;&#x648;&#x646;&#x62F;" &#x2013; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x62D;&#x627;&#x644;&#x62A; &#x627;&#x632; &#x634;&#x645;&#x627; &#x633;&#x624;&#x627;&#x644;&#x64A; &#x646;&#x634;&#x62F;&#x647; &#x648; &#x67E;&#x6CC;&#x648;&#x633;&#x62A;&#x647;&#x627; &#x647;&#x631;&#x6AF;&#x632; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x646;&#x645;&#x64A;&#x200C;&#x634;&#x648;&#x646;&#x62F;.</para> 
+</entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
     <para>
-    &#x6AF;&#x627;&#x645; &#x62F;&#x648;&#x645;: &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x639;&#x644;&#x627;&#x645;&#x62A; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x646; &#x628;&#x647; &#x62D;&#x648;&#x632;&#x647; &#x62C;&#x633;&#x62A;&#x62C;&#x648;. 
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x633;&#x648;&#x645;: &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x64A;&#x6CC; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644;&#x64A;&#x62F; &#x62F;&#x631; &#x622;&#x646;&#x647;&#x627; &#x62C;&#x633;&#x62A;&#x62C;&#x648; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x67E;&#x630;&#x64A;&#x631;&#x62F;.
-    </para>
-    <para>
-    &#x6AF;&#x627;&#x645; &#x686;&#x647;&#x627;&#x631;&#x645;: &#x641;&#x634;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; "&#x62C;&#x633;&#x62A;&#x62C;&#x648;" .
-    </para>
-    <para>
-   &#x627;&#x6AF;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x64A;&#x64A; &#x645;&#x646;&#x637;&#x628;&#x642; &#x628;&#x627; &#x62D;&#x648;&#x632;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x631;&#x62F; &#x62C;&#x633;&#x62A;&#x62C;&#x648;&#x6CC; &#x634;&#x645;&#x627; &#x64A;&#x627;&#x641;&#x62A;&#x647; &#x634;&#x648;&#x62F;&#x60C; &#x634;&#x645;&#x627;&#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62F;&#x631; &#x628;&#x62E;&#x634; "&#x646;&#x62A;&#x627;&#x64A;&#x62C; &#x62C;&#x633;&#x62A;&#x62C;&#x648;" &#x639;&#x646;&#x627;&#x648;&#x64A;&#x646; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;.
-     </para>
-</entry>
-
-<entry id="folder-options" md5="30687ec475765ba4467d2ef6dcec40c3" state="uptodate">
-    <title>&#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x67E;&#x648;&#x634;&#x647; : &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;</title>
-    <heading>&#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; &#x67E;&#x648;&#x634;&#x647;</heading>
-    <para>
-    &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627; &#x628;&#x647; &#x6A9;&#x645;&#x6A9; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x631;&#x627;&#x62F;&#x64A;&#x648;&#x64A;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x633;&#x645;&#x62A; &#x631;&#x627;&#x633;&#x62A; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x639;&#x62F; &#x627;&#x632; &#x622;&#x646;&#x60C; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;&#x64A; &#x631;&#x627; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x627;&#x62C;&#x631;&#x627;&#x6CC; &#x622;&#x646; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x628;&#x647; &#x6A9;&#x645;&#x6A9; &#x62C;&#x639;&#x628;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x633;&#x645;&#x62A; &#x631;&#x627;&#x633;&#x62A;&#x60C; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-    </para>
-    <para>
-    &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x632;&#x64A;&#x627;&#x62F;&#x6CC; &#x631;&#x627; &#x645;&#x645;&#x6A9;&#x646; &#x627;&#x633;&#x62A; &#x634;&#x645;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C;&#x627;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x62D;&#x630;&#x641; &#x62F;&#x642;&#x62A; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x628;&#x627;&#x639;&#x62B; &#x627;&#x632; &#x628;&#x64A;&#x646; &#x631;&#x641;&#x62A;&#x646; &#x6A9;&#x644;&#x64A;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x634;&#x645;&#x627; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.  
-    </para>
-    <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;</heading>
-    <para>
-    &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x641;&#x627;&#x64A;&#x644;&#x647;&#x627;&#x64A;&#x64A; &#x628;&#x627; &#x627;&#x646;&#x634;&#x639;&#x627;&#x628; eml &#x631;&#x627; &#x628;&#x647; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x6CC; &#x634;&#x645;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x646;&#x645;&#x648;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x627;&#x64A;&#x646; &#x6A9;&#x627;&#x631;&#x60C; &#x627;&#x628;&#x62A;&#x62F;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x648; &#x633;&#x67E;&#x633; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6A9;&#x646;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x634;&#x62F;&#x647; &#x631;&#x627; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.  
-    </para>
-</entry>
-
-<entry id="folder-widgets" md5="b9bc689402f7575771d74570e7f6f80a" state="uptodate">
-    <title>&#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x67E;&#x648;&#x634;&#x647; : &#x646;&#x645;&#x627;&#x64A;&#x634;</title>
-    <heading>&#x646;&#x645;&#x627;&#x64A;&#x634;/&#x67E;&#x646;&#x647;&#x627;&#x646; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x639;&#x62F;&#x645; &#x639;&#x636;&#x648;&#x64A;&#x62A;Show/Hide Unsubscribed</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x627;&#x632; &#x639;&#x636;&#x648;&#x64A;&#x62A; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; IMAP &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x63A;&#x64A;&#x631; &#x639;&#x636;&#x648; &#x631;&#x627; &#x67E;&#x646;&#x647;&#x627;&#x646;/&#x62D;&#x627;&#x636;&#x631; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x639;&#x636;&#x648;&#x64A;&#x62A; &#x64A;&#x627; &#x639;&#x62F;&#x645; &#x639;&#x636;&#x648;&#x64A;&#x62A; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x628;&#x627; &#x639;&#x644;&#x627;&#x645;&#x62A; &#x6AF;&#x630;&#x627;&#x631;&#x6CC; &#x62F;&#x631; &#x62C;&#x639;&#x628;&#x647; &#x6A9;&#x646;&#x627;&#x631;&#x6CC; &#x647;&#x631; &#x67E;&#x648;&#x634;&#x647;&#x60C; &#x627;&#x632; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x647;&#x631; &#x67E;&#x648;&#x634;&#x647; &#x639;&#x645;&#x644; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x638;&#x631; &#x631;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x628;&#x631;&#x627;&#x6CC; &#x622;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x648;&#x62F;. 
-    </para>
-    <heading>&#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F;&#x646; &#x647;&#x645;&#x647;</heading>
-    <para>
-    &#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F;&#x646; &#x64A;&#x627; &#x6AF;&#x633;&#x62A;&#x631;&#x62F;&#x646; &#x62A;&#x645;&#x627;&#x645; &#x648;&#x631;&#x648;&#x62F;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x67E;&#x648;&#x634;&#x647;.
-    </para>
-    <heading>&#x628;&#x633;&#x62A;&#x646; &#x647;&#x645;&#x647;</heading>
-    <para>
-    &#x628;&#x633;&#x62A;&#x646; &#x647;&#x645;&#x647; &#x648;&#x631;&#x648;&#x62F;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x67E;&#x648;&#x634;&#x647;
-    </para>
-</entry>
-
-<entry id="filters" md5="5ef60786767e638fbf5ba8fc5bd5d9d2" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x627;&#x639;&#x645;&#x627;&#x644;</title>
-    <heading>&#x627;&#x639;&#x645;&#x627;&#x644; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646;</heading>
-    <para>
-    &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x622;&#x64A;&#x6A9;&#x648;&#x646; "&#x627;&#x639;&#x645;&#x627;&#x644; &#x641;&#x64A;&#x644;&#x62A;&#x631;" &#x62F;&#x631; &#x645;&#x62C;&#x627;&#x648;&#x631;&#x62A; &#x6A9;&#x644;&#x645;&#x647; INBOX &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x637;&#x628;&#x642; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x645;&#x634;&#x62E;&#x635; &#x634;&#x62F;&#x647;&#x60C; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x67E;&#x648;&#x634;&#x647; &#x627;&#x639;&#x645;&#x627;&#x644; &#x634;&#x648;&#x62F;.   
-    </para>
-</entry>
-
-<entry id="filter-edit-rules" md5="5baa5708ac9449e797f967313a9e1a27" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646;</title>
-    <heading>&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646; &#x62E;&#x648;&#x62F;</heading>
-    <para>
-    &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x634;&#x645;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x647; &#x635;&#x641;&#x62D;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x647;&#x646;&#x645;&#x648;&#x646; &#x634;&#x648;&#x64A;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62D;&#x630;&#x641;&#x60C; &#x627;&#x636;&#x627;&#x641;&#x647; &#x648; &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x641;&#x639;&#x627;&#x644; &#x641;&#x639;&#x644;&#x64A; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.
-    </para>
-</entry>
-
-<entry id="filter-edit-blacklist" md5="80ff7803c66599c7035f7f8811d218cc" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x64A;&#x627;&#x647;</title>
-    <heading>&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x64A;&#x627;&#x647; &#x634;&#x645;&#x627;</heading>
-    <para>
-     &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x64A;&#x627;&#x647; &#x634;&#x645;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x647; &#x635;&#x641;&#x62D;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627;&#x647;&#x646;&#x645;&#x627;&#x64A;&#x64A; &#x634;&#x648;&#x64A;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62D;&#x630;&#x641;&#x60C; &#x627;&#x636;&#x627;&#x641;&#x647; &#x648; &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x64A;&#x64A; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x6A9;&#x647; &#x62A;&#x645;&#x627;&#x64A;&#x644;&#x6CC; &#x628;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x632; &#x622;&#x646;&#x647;&#x627; &#x646;&#x62F;&#x627;&#x631;&#x64A;&#x62F;.   
-    </para>
-</entry>
-
-<entry id="filter-edit-whitelist" md5="330c3a8fad198c7afe855c101c63cd0f" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x641;&#x64A;&#x62F;</title>
-    <heading>&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x641;&#x64A;&#x62F; &#x634;&#x645;&#x627;</heading>
-    <para>
-    &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x644;&#x64A;&#x633;&#x62A; &#x633;&#x641;&#x64A;&#x62F; &#x634;&#x645;&#x627;" &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x627; &#x628;&#x647; &#x635;&#x641;&#x62D;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627;&#x647;&#x646;&#x645;&#x627;&#x64A;&#x64A; &#x634;&#x648;&#x64A;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62D;&#x630;&#x641;&#x60C; &#x627;&#x636;&#x627;&#x641;&#x647; &#x648; &#x648;&#x64A;&#x631;&#x627;&#x64A;&#x634; &#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x64A;&#x64A; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x62A;&#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x627;&#x632; &#x622;&#x646;&#x647;&#x627; &#x62F;&#x627;&#x631;&#x64A;&#x62F;.     
-    </para>
-</entry>
-
-<entry id="filter-on-login" md5="37d9297d1cca46435e36b6e38e45dcdb" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x632;&#x645;&#x627;&#x646; &#x648;&#x631;&#x648;&#x62F;</title>
-    <heading>&#x622;&#x64A;&#x627; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x62F;&#x631; &#x632;&#x645;&#x627;&#x646; &#x648;&#x631;&#x648;&#x62F; &#x627;&#x639;&#x645;&#x627;&#x644; &#x6AF;&#x631;&#x62F;&#x62F;&#x61F;</heading>
-    <para>
-    &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x627;&#x639;&#x645;&#x627;&#x644; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x648;&#x631;&#x648;&#x62F; &#x628;&#x647; IMP &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="filter-on-display" md5="f5afc305402ef52bad108933f3f33291" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x64A;&#x646;&#x6AF; &#x62F;&#x631; &#x647;&#x631; &#x628;&#x647; &#x631;&#x648;&#x632;&#x631;&#x633;&#x627;&#x646;&#x64A;</title>
-    <heading>&#x622;&#x64A;&#x627; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x62F;&#x631; &#x647;&#x631; &#x632;&#x645;&#x627;&#x646; &#x6A9;&#x647; INBOX &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F; &#x627;&#x639;&#x645;&#x627;&#x644; &#x6AF;&#x631;&#x62F;&#x62F;&#x61F;</heading>
-    <para>
-    &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6A9;&#x646;&#x64A;&#x62F; &#x62A;&#x627; &#x62F;&#x631; &#x647;&#x631; &#x632;&#x645;&#x627;&#x646; &#x6A9;&#x647; INBOX &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x6A9;&#x646;&#x64A;&#x62F;&#x60C; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x627;&#x639;&#x645;&#x627;&#x644; &#x634;&#x648;&#x646;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="filter-any-mailbox" md5="71c51e83909f9d0bd440d220772ee3c6" state="uptodate">
-    <title>&#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; : &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x6A9;&#x631;&#x62F;&#x646; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x64A;</title>
-    <heading>&#x622;&#x64A;&#x627; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x628;&#x647; &#x647;&#x631; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x64A; &#x627;&#x639;&#x645;&#x627;&#x644; &#x634;&#x648;&#x646;&#x62F;&#x61F;</heading>
-    <para>
-   &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; &#x62A;&#x627; &#x634;&#x645;&#x627; &#x628;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x631;&#x627; &#x628;&#x647; &#x647;&#x631; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x6CC; &#x627;&#x639;&#x645;&#x627;&#x644; &#x6A9;&#x646;&#x64A;&#x62F;( &#x628;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x60C; &#x622;&#x64A;&#x6A9;&#x648;&#x646;&#x6CC; &#x62F;&#x631; &#x6A9;&#x646;&#x627;&#x631; &#x647;&#x631; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x6CC; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x634;&#x645;&#x627; &#x627;&#x62C;&#x627;&#x632;&#x647; &#x627;&#x639;&#x645;&#x627;&#x644; &#x642;&#x648;&#x627;&#x646;&#x64A;&#x646; &#x641;&#x64A;&#x644;&#x62A;&#x631; &#x631;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x622;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627;&#x60C; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x62F;&#x627;&#x62F;). &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x64A;&#x634; &#x641;&#x631;&#x636; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x631;&#x633;&#x64A;&#x62F;&#x647; &#x627;&#x639;&#x645;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x646;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x627;&#x639;&#x645;&#x627;&#x644; &#x641;&#x64A;&#x644;&#x62A;&#x631;&#x647;&#x627; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631; &#x646;&#x62A;&#x627;&#x64A;&#x62C; &#x63A;&#x64A;&#x631; &#x645;&#x646;&#x62A;&#x638;&#x631;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x647;&#x645;&#x686;&#x648;&#x646; &#x62C;&#x627;&#x628;&#x647;&#x200C;&#x62C;&#x627;&#x64A;&#x64A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x60C; &#x62D;&#x630;&#x641; &#x63A;&#x64A;&#x631; &#x645;&#x646;&#x62A;&#x638;&#x631;&#x647; &#x622;&#x646;&#x647;&#x627; &#x648; &#x64A;&#x627;... &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x62F;.  
-    </para>
-</entry>
-
-<entry id="pgp-compose-attach-pubkey" md5="97446dbbb27616b4fa39be801e10df2d" state="uptodate">
-    <title>PGP : &#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title>
-    <heading>&#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x627;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x628;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x646;&#x627;&#x645;&#x647; &#x62E;&#x627;&#x631;&#x62C; &#x634;&#x62F;&#x647;&#x60C; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. &#x637;&#x631;&#x64A;&#x642;&#x647; &#x639;&#x645;&#x644;&#x6A9;&#x631;&#x62F; &#x67E;&#x64A;&#x634; &#x641;&#x631;&#x636; &#x631;&#x627; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; &#x635;&#x641;&#x62D;&#x647; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; PGP &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x62A;&#x646;&#x638;&#x64A;&#x645; &#x646;&#x645;&#x648;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="pgp-option-scan-body" md5="6baaada0d46dc1ab0941087f235f359b" state="uptodate">
-    <title>PGP : &#x628;&#x631;&#x631;&#x633;&#x64A; &#x628;&#x62F;&#x646;&#x647; &#x645;&#x62A;&#x646;</title>
-    <heading> &#x628;&#x631;&#x631;&#x633;&#x64A; &#x628;&#x62F;&#x646;&#x647; &#x645;&#x62A;&#x646;</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x650;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; IMP &#x628;&#x62F;&#x646;&#x647; &#x62A;&#x645;&#x627;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x64A;&#x627;&#x641;&#x62A;&#x646; &#x62F;&#x627;&#x62F;&#x647; PGP &#x62C;&#x633;&#x62A;&#x62C;&#x648; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x646;&#x62A;&#x627;&#x64A;&#x62C; &#x631;&#x627; &#x646;&#x634;&#x627;&#x646; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x62F;&#x627;&#x62F;. &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x6A9;&#x646;&#x62F;&#x6CC; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x6AF;&#x634;&#x62A;.      
-    </para>
-</entry>
-
-<entry id="compose-options-encrypt" md5="1012144f749f19f5a24cef38601daa71" state="uptodate">
-    <title>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC;</title>
-    <heading>&#x628;&#x62F;&#x648;&#x646; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC;</heading>
-    <para>
-    &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x62A;&#x646; &#x628;&#x62F;&#x648;&#x646; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; : &#x645;&#x62A;&#x646; &#x633;&#x627;&#x62F;&#x647;
-    </para>
-    <heading>&#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; PGP &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x641;&#x639;&#x644;&#x6CC; &#x631;&#x627; &#x628;&#x627; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x627;&#x632; PGP &#x648; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x631;&#x645;&#x632; &#x646;&#x645;&#x648;&#x62F;&#x647; &#x648; &#x633;&#x67E;&#x633; &#x622;&#x646;&#x631;&#x627; &#x627;&#x631;&#x633;&#x627;&#x644; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x6A9;&#x631;&#x62F;. &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x62D;&#x627;&#x644;&#x62A; &#x634;&#x645;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x64A;&#x6A9; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;. &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62D;&#x62A;&#x645;&#x627; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647; &#x62E;&#x648;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F; &#x62A;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x62F;&#x631;&#x633;&#x62A;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x648;&#x62F;.    
-    </para>
-    <heading>&#x627;&#x645;&#x636;&#x627;&#x621; PGP &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x628;&#x627;&#x639;&#x62B; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F; &#x62A;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62C;&#x627;&#x631;&#x6CC; &#x628;&#x627; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x627;&#x632; PGP &#x648; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC; &#x634;&#x645;&#x627; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6AF;&#x631;&#x62F;&#x62F;. &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x627; &#x6A9;&#x645;&#x6A9; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x634;&#x646;&#x627;&#x633;&#x627;&#x64A;&#x64A; &#x634;&#x645;&#x627; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;. 
-    </para>
-    <heading>&#x627;&#x645;&#x636;&#x627;&#x621;/&#x631;&#x645;&#x632; &#x6A9;&#x631;&#x62F;&#x646; PGP &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x628;&#x62A;&#x62F;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x633;&#x67E;&#x633; &#x646;&#x62A;&#x64A;&#x62C;&#x647; &#x631;&#x627; &#x631;&#x645;&#x632; &#x645;&#x6CC;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.     
-    </para>
-    <heading>&#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    TODO
-    </para>
-    <heading>&#x627;&#x645;&#x636;&#x627;&#x621; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    TODO
-    </para>
-    <heading>&#x627;&#x645;&#x636;&#x627;&#x621;/&#x631;&#x645;&#x632;&#x6A9;&#x631;&#x62F;&#x646; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    TODO
-    </para>
-</entry>
-
-<entry id="pgp-overview" md5="24b5138b4b53f73b5f2f2739e4c1858d" state="uptodate">
-    <title>PGP : &#x645;&#x631;&#x648;&#x631;</title>
-    <heading>PGP &#x686;&#x64A;&#x633;&#x62A;&#x61F;</heading>
-    <para>
-    PGP &#x627;&#x628;&#x632;&#x627;&#x631;&#x6CC; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x631;&#x62A;&#x628;&#x627;&#x637;&#x627;&#x62A; &#x648; &#x630;&#x62E;&#x64A;&#x631;&#x647;&#x200C;&#x633;&#x627;&#x632;&#x6CC; &#x627;&#x645;&#x646; &#x627;&#x637;&#x644;&#x627;&#x639;&#x627;&#x62A; &#x645;&#x6CC;&#x200C;&#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x62E;&#x635;&#x648;&#x635;&#x627; &#x62F;&#x631; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9; &#x628;&#x647; &#x6A9;&#x627;&#x631; &#x6AF;&#x631;&#x641;&#x62A;&#x647; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F;. &#x627;&#x632; &#x627;&#x64A;&#x646; &#x627;&#x628;&#x632;&#x627;&#x631; &#x628;&#x631;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x648; &#x627;&#x645;&#x636;&#x627;&#x621; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;. IMP &#x627;&#x632; GnuPG  &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x631;&#x627;&#x647;&#x645; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x627;&#x645;&#x6A9;&#x627;&#x646; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;.     
-    </para>
-    <heading>&#x622;&#x64A;&#x627; &#x627;&#x645;&#x6A9;&#x627;&#x646;&#x627;&#x62A; PGP &#x641;&#x639;&#x627;&#x644; &#x634;&#x648;&#x62F;&#x61F;</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x641;&#x639;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x64A;&#x62C;&#x627;&#x62F;/&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; PGP &#x62E;&#x648;&#x62F;&#x60C; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x646; &#x648; &#x62D;&#x630;&#x641; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x62F;&#x64A;&#x6AF;&#x631;&#x627;&#x646;&#x60C; &#x62E;&#x648;&#x627;&#x646;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x622;&#x646;&#x647;&#x627;&#x60C; &#x62A;&#x634;&#x62E;&#x64A;&#x635; &#x627;&#x645;&#x636;&#x627;&#x621; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x648; &#x631;&#x645;&#x632; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x648; &#x627;&#x645;&#x636;&#x627;&#x621; &#x646;&#x645;&#x648;&#x62F;&#x646; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.
-    </para>
-</entry>
-
-<entry id="pgp-option-attach-pubkey" md5="561ce43370ac4afbcc3f9818c8fbc2f6" state="uptodate">
-    <title>PGP : &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627;- &#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title>
-    <heading>&#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x200C;&#x647;&#x627; : - &#x636;&#x645;&#x64A;&#x645;&#x647; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; </heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; &#x62F;&#x631; &#x635;&#x648;&#x631;&#x62A; &#x648;&#x62C;&#x648;&#x62F;&#x60C; &#x64A;&#x6A9; &#x646;&#x633;&#x62E;&#x647; &#x627;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x645;&#x627; &#x628;&#x647; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.
-    </para>
-</entry>
-
-<entry id="pgp-manage-pubkey" md5="b289ea5824b7f69f35c0751497f4e1c3" state="uptodate">
-    <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title>
-    <heading>Overview</heading>
-    <para>
-    &#x627;&#x64A;&#x646; &#x635;&#x641;&#x62D;&#x647; &#x641;&#x647;&#x631;&#x633;&#x62A;&#x6CC; &#x627;&#x632; &#x6A9;&#x627;&#x631;&#x628;&#x631;&#x627;&#x646; &#x641;&#x639;&#x644;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647; &#x622;&#x62F;&#x631;&#x633; &#x634;&#x645;&#x627;&#x60C; &#x6A9;&#x647; &#x62F;&#x627;&#x631;&#x627;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x646;&#x62F;&#x60C; &#x627;&#x631;&#x627;&#x626;&#x647; &#x645;&#x64A;&#x200C;&#x62F;&#x647;&#x62F;. &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x62F;&#x627;&#x634;&#x62A; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x62A;&#x646;&#x647;&#x627; &#x62D;&#x627;&#x648;&#x6CC; &#x6A9;&#x627;&#x631;&#x628;&#x631;&#x627;&#x646;&#x6CC; &#x627;&#x633;&#x62A; &#x6A9;&#x647; 1)&#x634;&#x645;&#x627; &#x628;&#x647; &#x622;&#x646;&#x647;&#x627; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F;   - &#x648; &#x64A;&#x627; -  2) &#x627;&#x645;&#x636;&#x627;&#x621; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x634;&#x646;&#x627;&#x633;&#x627;&#x64A;&#x64A; &#x6A9;&#x631;&#x62F;&#x647;&#x200C;&#x627;&#x64A;&#x62F;.
-    </para>
-    <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading>
-    <para>
-    &#x628;&#x627;&#x632;&#x6A9;&#x631;&#x62F;&#x646; &#x64A;&#x6A9; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP.
-    </para>
-    <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading>
-    <para>
-    &#x646;&#x645;&#x627;&#x64A;&#x634; &#x628;&#x631;&#x62E;&#x6CC; &#x627;&#x632; &#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A; &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP.
-    </para>
-    <heading>&#x62D;&#x630;&#x641;</heading>
-    <para>
-    &#x62D;&#x630;&#x641; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x627;&#x632; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647; &#x622;&#x62F;&#x631;&#x633;.
-    </para>
-</entry>
-
-<entry id="pgp-import-pubkey" md5="6ee1130b46e9ff1ca9ad3a3a47e7b382" state="uptodate">
-    <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC; - &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; </title>
-    <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading>
-    <para>
-    &#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x628;&#x627;&#x632; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x646;&#x645;&#x648;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62B;&#x628;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;. &#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x62F; &#x62F;&#x631;&#x648;&#x646; &#x641;&#x64A;&#x644;&#x62F; &#x645;&#x62A;&#x646; &#x62F;&#x631;&#x62C; &#x634;&#x648;&#x62F; &#x648; &#x64A;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x62F;&#x631; &#x631;&#x627;&#x64A;&#x627;&#x646;&#x647; &#x634;&#x62E;&#x635;&#x6CC; &#x634;&#x645;&#x627; &#x642;&#x631;&#x627;&#x631; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x62F;. &#x62F;&#x631; &#x647;&#x631; &#x62D;&#x627;&#x644;&#x60C; &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x645;&#x639;&#x62A;&#x628;&#x631; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x628;&#x647;  &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647; &#x622;&#x62F;&#x631;&#x633; &#x634;&#x645;&#x627; &#x627;&#x641;&#x632;&#x648;&#x62F;&#x647; &#x634;&#x62F;&#x647; &#x648; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x627;&#x632; &#x634;&#x62F;&#x647; &#x628;&#x633;&#x62A;&#x647; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F; &#x648; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646;&#x635;&#x648;&#x631;&#x62A; &#x62F;&#x644;&#x627;&#x64A;&#x644; &#x639;&#x62F;&#x645; &#x627;&#x639;&#x62A;&#x628;&#x627;&#x631; &#x6A9;&#x644;&#x64A;&#x62F; &#x628;&#x64A;&#x627;&#x646; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="pgp-overview-personalkey" md5="220af2b74a58f430efd72d6d6b1f993f" state="uptodate">
-    <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title>
-    <heading>&#x645;&#x631;&#x648;&#x631;</heading>
-    <para>
-    	&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x628;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x6A9;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x627;&#x645;&#x636;&#x627;&#x621; &#x6A9;&#x646;&#x64A;&#x62F; &#x648; &#x64A;&#x627; &#x627;&#x64A;&#x646;&#x6A9;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x627;&#x632; &#x62F;&#x64A;&#x6AF;&#x631;&#x627;&#x646; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x62F;&#x627;&#x631;&#x64A;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; / &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;. 
-    </para>
-    <heading>&#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x634;&#x645;&#x627;</heading>
-    <para>
-    &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x62F;&#x633;&#x62A;&#x631;&#x633; &#x647;&#x631; &#x641;&#x631;&#x62F;&#x6CC; &#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x628;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x631; &#x62F;&#x633;&#x62A;&#x631;&#x633; &#x627;&#x641;&#x631;&#x627;&#x62F;&#x6CC; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x64A;&#x64A; &#x628;&#x627; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x628;&#x631;&#x627;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x646;&#x64A;&#x632; &#x642;&#x631;&#x627;&#x631; &#x6AF;&#x64A;&#x631;&#x62F; &#x632;&#x64A;&#x631;&#x627; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627;&#x60C; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x64A;&#x627;&#x632; &#x627;&#x633;&#x62A;.
-     </para>
-    <heading>&#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC; &#x634;&#x645;&#x627;</heading>
-    <para>
-    &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x6AF;&#x634;&#x627;&#x64A;&#x64A; &#x647;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x628;&#x627; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x627;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x645;&#x627;&#x60C; &#x645;&#x648;&#x631;&#x62F; &#x646;&#x64A;&#x627;&#x632; &#x627;&#x633;&#x62A;. &#x628;&#x647; &#x639;&#x644;&#x627;&#x648;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x646;&#x64A;&#x632; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x642;&#x631;&#x627;&#x631; &#x645;&#x64A;&#x200C;&#x6AF;&#x64A;&#x631;&#x62F;. &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x634;&#x645;&#x627; &#x627;&#x632; &#x637;&#x631;&#x64A;&#x642; passphrase &#x646;&#x6AF;&#x627;&#x647;&#x62F;&#x627;&#x631;&#x6CC; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; &#x648; &#x62F;&#x631; &#x647;&#x631; &#x646;&#x634;&#x633;&#x62A; IMP &#x634;&#x645;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x64A;&#x6A9;&#x628;&#x627;&#x631; &#x645;&#x62C;&#x628;&#x648;&#x631; &#x628;&#x647; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; passphrase &#x62E;&#x648;&#x62F;&#x60C; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x639;&#x644;&#x627;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;. &#x628;&#x647; &#x647;&#x645;&#x64A;&#x646; &#x62F;&#x644;&#x64A;&#x644; &#x62F;&#x631; &#x627;&#x646;&#x62A;&#x647;&#x627;&#x6CC; &#x64A;&#x6A9; &#x646;&#x634;&#x633;&#x62A; &#x62D;&#x62A;&#x645;&#x627;&#x64B; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x632; IMP &#x62E;&#x627;&#x631;&#x62C; &#x634;&#x648;&#x64A;&#x62F;.
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-public" md5="3c844d4ff8fdda3e0d446b47a63117e0" state="uptodate">
-    <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC; - &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title>
-    <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading>
-    <para>
-    &#x64A;&#x6A9; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x628;&#x627;&#x632; &#x645;&#x6CC;&#x200C;&#x6A9;&#x646;&#x62F;.  
-    </para>
-    <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading>
-    <para>
-    &#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;&#x6CC; &#x631;&#x627; &#x62F;&#x631; &#x645;&#x648;&#x631;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; PGP &#x646;&#x634;&#x627;&#x646; &#x645;&#x6CC;&#x200C;&#x62F;&#x647;&#x62F;.
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-private" md5="1851b67a1aeef1242fc3a2b94af75c03" state="uptodate">
-    <title>PGP : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; - &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC;</title>
-    <heading>&#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; Passphrase</heading>
-    <para>
-     	&#x628;&#x631;&#x627;&#x6CC; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; Passphrase &#x628;&#x627;&#x64A;&#x62F; &#x67E;&#x646;&#x62C;&#x631;&#x647; Passphrase &#x631;&#x627; &#x628;&#x627;&#x632; &#x6A9;&#x646;&#x64A;&#x62F;. Passphrase &#x631;&#x627; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x646;&#x64A;&#x62F;. &#x627;&#x6AF;&#x631; &#x635;&#x62D;&#x64A;&#x62D; &#x628;&#x648;&#x62F;&#x60C; IMP &#x622;&#x646;&#x631;&#x627; &#x62A;&#x627; &#x627;&#x646;&#x62A;&#x647;&#x627;&#x6CC; &#x646;&#x634;&#x633;&#x62A; &#x646;&#x6AF;&#x627;&#x647; &#x645;&#x64A;&#x200C;&#x62F;&#x627;&#x631;&#x62F;.
-    </para>
-    <heading>&#x62D;&#x630;&#x641; Passphrase</heading>
-    <para>
-	 &#x628;&#x627; &#x62D;&#x630;&#x641; &#x6A9;&#x631;&#x62F;&#x646; passphease &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x634;&#x62F;&#x647; &#x62F;&#x631; IMP&#x60C; &#x647;&#x631; &#x67E;&#x631;&#x648;&#x633;&#x647; &#x62C;&#x62F;&#x64A;&#x62F;&#x6CC; &#x6A9;&#x647; &#x646;&#x64A;&#x627;&#x632; &#x628;&#x647; &#x622;&#x646; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x622;&#x646;&#x631;&#x627; &#x627;&#x632; &#x634;&#x645;&#x627; &#x62F;&#x631; &#x62E;&#x648;&#x627;&#x633;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;. 
-    </para>
-    <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading>
-    <para>
-    &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x67E;&#x646;&#x62C;&#x631;&#x647;&#x200C;&#x627;&#x64A;&#x64A; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; PGP &#x628;&#x627;&#x632; &#x6A9;&#x631;&#x62F; &#x648;&#x644;&#x64A; &#x628;&#x627;&#x64A;&#x62F; &#x62F;&#x642;&#x62A; &#x6A9;&#x646;&#x64A;&#x62F; &#x6A9;&#x647; &#x647;&#x631; &#x6AF;&#x632; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x647; &#x634;&#x62E;&#x635; &#x62F;&#x64A;&#x6AF;&#x631;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x646;&#x6A9;&#x646;&#x64A;&#x62F;. 
-    </para>
-    <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading>
-    <para>
-    &#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;&#x6CC; &#x631;&#x627; &#x631;&#x627;&#x62C;&#x639; &#x628;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x6CC; &#x646;&#x634;&#x627;&#x646; &#x645;&#x6CC;&#x200C;&#x62F;&#x647;&#x62F;.
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-delete" md5="dbd8cbe6bce71c4fb592dd1b3b27b7ce" state="uptodate">
-    <title>PGP :&#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; - &#x62D;&#x630;&#x641;</title>
-    <heading>&#x62D;&#x630;&#x641; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</heading>
-    <para>
-    &#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A;/ &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x631;&#x627; &#x627;&#x632;IMP &#x62D;&#x630;&#x641; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;.
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-create-name" md5="748cb124b7ff52820792e278037a8c27" state="uptodate">
-    <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x646;&#x627;&#x645;</title>
-    <heading>&#x646;&#x627;&#x645;</heading>
-    <para>
-	&#x646;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x62F;&#x631;&#x62C; &#x6A9;&#x646;&#x64A;&#x62F; (&#x627;&#x62C;&#x628;&#x627;&#x631;&#x6CC;) 
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-create-comment" md5="e666eb9f0ee4b49fe04f74fc18db8640" state="uptodate">
-    <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A;</title>
-    <heading>&#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x627;&#x62A;</heading>
-    <para>
-   &#x62A;&#x648;&#x636;&#x64A;&#x62D;&#x6CC; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62F;&#x631;&#x62C; &#x622;&#x646; &#x628;&#x647; &#x647;&#x645;&#x631;&#x627;&#x647; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;(&#x627;&#x62E;&#x62A;&#x64A;&#x627;&#x631;&#x6CC;). 
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-create-email" md5="c729f70fdb3a73cbb7ba5ef5888e3092" state="uptodate">
-    <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x622;&#x62F;&#x631;&#x633;&#x200C;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;</title>
-    <heading>&#x622;&#x62F;&#x631;&#x633;&#x647;&#x627;&#x6CC; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;</heading>
-    <para>
-   &#x622;&#x62F;&#x631;&#x633; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x6A9;&#x647; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x627; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x645;&#x631;&#x62A;&#x628;&#x637; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F; (&#x627;&#x62C;&#x628;&#x627;&#x631;&#x6CC;)
-    </para>
-</entry>
-
-<entry id="pgp-personalkey-create-keylength" md5="24ca641c63fb5ff310a39ee0d3b1ee55" state="uptodate">
-    <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x637;&#x648;&#x644; &#x6A9;&#x644;&#x64A;&#x62F;</title>
-    <heading>&#x637;&#x648;&#x644; &#x6A9;&#x644;&#x64A;&#x62F;</heading>
-    <para>
-    &#x637;&#x648;&#x644; &#x6A9;&#x644;&#x64A;&#x62F; &#x62A;&#x648;&#x644;&#x64A;&#x62F; &#x634;&#x62F;&#x647; &#x634;&#x645;&#x627; &#x628;&#x647; &#x628;&#x627;&#x64A;&#x62A;. &#x647;&#x631; &#x686;&#x647; &#x627;&#x64A;&#x646; &#x637;&#x648;&#x644; &#x628;&#x632;&#x631;&#x6AF;&#x62A;&#x631; &#x628;&#x627;&#x634;&#x62F;&#x60C; &#x627;&#x631;&#x62A;&#x628;&#x627;&#x637; &#x627;&#x645;&#x646; &#x62A;&#x631; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;. &#x627;&#x644;&#x628;&#x62A;&#x647; &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x6A9;&#x646;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x627;&#x645;&#x631; &#x628;&#x627;&#x639;&#x62B; &#x628;&#x627;&#x644;&#x627;&#x631;&#x641;&#x62A;&#x646; &#x632;&#x645;&#x627;&#x646; &#x62A;&#x648;&#x644;&#x64A;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x632;&#x645;&#x627;&#x646; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;. &#x637;&#x648;&#x644; 1024 &#x628;&#x627;&#x64A;&#x62A; &#x637;&#x648;&#x644; &#x67E;&#x64A;&#x634; &#x641;&#x631;&#x636; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x627;&#x645;&#x646;&#x64A;&#x62A; &#x62E;&#x648;&#x628;&#x64A; &#x631;&#x627; &#x641;&#x631;&#x627;&#x647;&#x645; &#x645;&#x64A;&#x200C;&#x622;&#x648;&#x631;&#x62F;.
-     </para>
-</entry>
-
-<entry id="pgp-personalkey-create-passphrase" md5="2fb9372970bf33f51e988ba39dbd7193" state="uptodate">
-    <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - Passphrase</title>
-    <heading>Passphrase</heading>
-    <para>
-    &#x627;&#x632; Passphrase &#x628;&#x631;&#x627;&#x6CC; &#x645;&#x62D;&#x627;&#x641;&#x638;&#x62A; &#x648; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;. Passphrase &#x628;&#x627;&#x64A;&#x62F; &#x62D;&#x62F;&#x627;&#x642;&#x644; 6 &#x646;&#x648;&#x64A;&#x633;&#x647; &#x628;&#x627;&#x634;&#x62F;. &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x639;&#x628;&#x627;&#x631;&#x62A; &#x646;&#x628;&#x627;&#x64A;&#x62F; &#x645;&#x639;&#x627;&#x62F;&#x644; &#x64A;&#x6A9; &#x6A9;&#x644;&#x645;&#x647; &#x62F;&#x631; &#x62F;&#x64A;&#x6A9;&#x634;&#x646;&#x631;&#x6CC; &#x628;&#x648;&#x62F;&#x647; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646;&#x64A; &#x646;&#x628;&#x627;&#x64A;&#x62F; &#x645;&#x639;&#x627;&#x62F;&#x644; &#x631;&#x645;&#x632; &#x639;&#x628;&#x648;&#x631; &#x634;&#x645;&#x627; &#x628;&#x627;&#x634;&#x62F; &#x648; &#x628;&#x627;&#x64A;&#x62F; &#x647;&#x645; &#x634;&#x627;&#x645;&#x644; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x62D;&#x631;&#x641;&#x64A; &#x648; &#x647;&#x645; &#x646;&#x648;&#x64A;&#x633;&#x647;&#x200C;&#x647;&#x627;&#x64A; &#x639;&#x62F;&#x62F;&#x6CC; &#x628;&#x627;&#x634;&#x62F;. &#x644;&#x627;&#x632;&#x645; &#x628;&#x647; &#x630;&#x6A9;&#x631; &#x627;&#x633;&#x62A; &#x6A9;&#x647; Passphrase &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x62A;&#x627;&#x64A;&#x64A;&#x62F;&#x60C; &#x62F;&#x648;&#x628;&#x627;&#x631; &#x628;&#x627;&#x64A;&#x62F; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F; (&#x627;&#x62C;&#x628;&#x627;&#x631;&#x6CC;)
-     </para>
-</entry>
-
-<entry id="pgp-personalkey-create-actions" md5="0f8234935b964c83533b4ec4c15eb712" state="uptodate">
-    <title>PGP : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x6CC; - &#x639;&#x645;&#x644;&#x64A;&#x627;&#x62A;</title>
-    <heading>&#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;</heading>
-    <para>
-    &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x648; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x634;&#x645;&#x627; &#x631;&#x627; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x648; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;. 
-    </para>
-    <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F;</heading>
-    <para>
-   &#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x64A;&#x6A9; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; / &#x639;&#x645;&#x648;&#x645;&#x64A; &#x631;&#x627; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F; &#x648; &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x64A;&#x646; &#x645;&#x646;&#x638;&#x648;&#x631; &#x64A;&#x6A9; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x631;&#x627; &#x628;&#x627;&#x632; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F; &#x6A9;&#x647; &#x62F;&#x631;  &#x622;&#x646; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x633;&#x62A;&#x64A; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A; / &#x639;&#x645;&#x648;&#x645;&#x64A; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x645;&#x639;&#x631;&#x641;&#x64A; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F;. &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x62A;&#x646; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x646;&#x62F; &#x62F;&#x631;&#x62C; &#x634;&#x648;&#x646;&#x62F; &#x64A;&#x627; &#x627;&#x6AF;&#x631; &#x62F;&#x627;&#x62E;&#x644; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x627;&#x645;&#x67E;&#x64A;&#x648;&#x62A;&#x631; &#x645;&#x62D;&#x644;&#x64A; &#x634;&#x645;&#x627; &#x628;&#x627;&#x634;&#x646;&#x62F; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x62A;&#x646;&#x647;&#x627; &#x646;&#x627;&#x645; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x62F;&#x631;&#x62C; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627; &#x635;&#x62D;&#x64A;&#x62D; &#x628;&#x627;&#x634;&#x646;&#x62F; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x633;&#x62A;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F; &#x648; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x637;&#x627; &#x6A9;&#x647; &#x646;&#x648;&#x639; &#x62E;&#x637;&#x627; &#x62F;&#x631; &#x622;&#x646; &#x62A;&#x648;&#x636;&#x64A;&#x62D; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;&#x60C; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x6CC;&#x200C;&#x6AF;&#x631;&#x62F;&#x62F;.  
-     </para>
-</entry>
-
-<entry id="smime-overview" md5="d3c752b1345fb2eccfe575c07461963f" state="uptodate">
-    <title>S/MIME : &#x645;&#x631;&#x648;&#x631;</title>
-    <heading>S/MIME &#x686;&#x64A;&#x633;&#x62A;&#x61F;</heading>
-    <para>
-   	S/MIME &#x64A;&#x6A9; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A;/&#x639;&#x645;&#x648;&#x645;&#x64A; &#x627;&#x633;&#x62A; &#x6A9;&#x647; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x631;&#x627; &#x645;&#x645;&#x6A9;&#x646; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; S/MIME &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x648; &#x62E;&#x635;&#x648;&#x635;&#x64A; &#x633;&#x627;&#x632;&#x6CC; &#x622;&#x646;&#x647;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x648; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x628;&#x648;&#x62F;&#x647; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62A;&#x634;&#x62E;&#x64A;&#x635; &#x62A;&#x62D;&#x631;&#x64A;&#x641;&#x647;&#x627;&#x6CC; &#x635;&#x648;&#x631;&#x62A; &#x6AF;&#x631;&#x641;&#x62A;&#x647; &#x62F;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x639;&#x62F; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x622;&#x646;&#x647;&#x627;&#x60C; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F;. 
-    </para>
-    <heading> &#x622;&#x64A;&#x627; &#x642;&#x627;&#x628;&#x644;&#x64A;&#x62A;&#x647;&#x627;&#x6CC; S/MIME &#x641;&#x639;&#x627;&#x644; &#x634;&#x648;&#x62F;&#x61F;</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x648;&#x62F;&#x60C; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x648;&#x627;&#x631;&#x62F; &#x6A9;&#x631;&#x62F;&#x646; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x64A; S/MIME &#x62E;&#x648;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x637;&#x628;&#x639; &#x622;&#x646; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x62E;&#x648;&#x627;&#x646;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647;&#x60C; &#x62A;&#x634;&#x62E;&#x64A;&#x635; &#x627;&#x645;&#x636;&#x627;&#x647;&#x627;&#x6CC; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x631;&#x645;&#x632;&#x646;&#x6AF;&#x627;&#x631;&#x6CC; &#x648; &#x627;&#x645;&#x636;&#x627;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.
-    </para>
-</entry>
-
-<entry id="smime-overview-personalkey" md5="9f4f36ae72cb4abc731067d338be3b98" state="uptodate">
-    <title>S/MIME : &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title>
-    <heading>&#x645;&#x631;&#x648;&#x631;</heading>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x628;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x6A9;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x64A; &#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x64A;&#x62C;&#x64A;&#x62A;&#x627;&#x644;&#x64A; &#x627;&#x645;&#x636;&#x627; &#x6A9;&#x646;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x632;&#x648;&#x62C; &#x6A9;&#x644;&#x64A;&#x62F; &#x62E;&#x635;&#x648;&#x635;&#x64A;/&#x639;&#x645;&#x648;&#x645;&#x64A; S/MIME &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="smime-import-personal-certs" md5="cf0ed2e3e24d30dedf8cfef2c2645759" state="uptodate">
-    <title>S/MIME : &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title>
-    <heading>&#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</heading>
-    <para>
-    	&#x627;&#x64A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F;&#x60C; &#x6AF;&#x648;&#x627;&#x647;&#x64A;&#x647;&#x627;&#x6CC; &#x62A;&#x627;&#x626;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x64A; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x627;&#x632; &#x64A;&#x6A9; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x628;&#x627; &#x641;&#x631;&#x645;&#x62A; PKCS#12 &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;. &#x627;&#x64A;&#x646; &#x641;&#x631;&#x645;&#x62A; &#x63A;&#x627;&#x644;&#x628;&#x627; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631;&#x647;&#x627; &#x648; &#x64A;&#x627; &#x628;&#x631;&#x62E;&#x64A; &#x627;&#x632; &#x633;&#x64A;&#x633;&#x62A;&#x645; &#x639;&#x627;&#x645;&#x644;&#x647;&#x627; ( &#x645;&#x627;&#x646;&#x646;&#x62F; &#x648;&#x64A;&#x646;&#x62F;&#x648;&#x632; XP ) &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;. &#x627;&#x6AF;&#x631; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x67E;&#x631;&#x648;&#x646;&#x62F;&#x647; &#x645;&#x639;&#x62A;&#x628;&#x631; &#x628;&#x627;&#x634;&#x646;&#x62F;&#x60C; &#x62B;&#x628;&#x62A; &#x634;&#x62F;&#x647; &#x648; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x633;&#x62A;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; &#x62F;&#x631; &#x63A;&#x64A;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x637;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;.  
-    </para>
-</entry>
-
-<entry id="smime-delete-personal-certs" md5="018bb6b61a7e416892de288ad1c880f4" state="uptodate">
-    <title>S/MIME : &#x62D;&#x630;&#x641; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</title>
-    <heading>&#x62D;&#x630;&#x641; &#x6AF;&#x648;&#x627;&#x647;&#x6CC;&#x200C;&#x647;&#x627;&#x6CC; &#x634;&#x62E;&#x635;&#x6CC;</heading>
-    <para>
-    &#x628;&#x627; &#x62D;&#x630;&#x641; &#x6AF;&#x648;&#x627;&#x647;&#x64A;&#x647;&#x627;&#x6CC; &#x62A;&#x627;&#x626;&#x64A;&#x62F; &#x634;&#x62E;&#x635;&#x64A;&#x60C; &#x634;&#x645;&#x627; &#x62F;&#x64A;&#x6AF;&#x631; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x645;&#x636;&#x627;&#x6CC; S/MIME &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x62E;&#x648;&#x62F; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F; &#x648; &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x647;&#x64A;&#x686; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647;&#x200C; S/MIME &#x631;&#x627; &#x646;&#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;.  
-    </para>
-</entry>
-
-<entry id="smime-manage-pubkey" md5="8b6c63684d3d73b3d084025a78fe7e88" state="uptodate">
-    <title>S/MIME : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</title>
-    <heading>S/MIME : &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F;&#x647;&#x627;&#x6CC; &#x639;&#x645;&#x648;&#x645;&#x6CC;</heading>
-    <para>
-    &#x645;&#x62F;&#x64A;&#x631;&#x64A;&#x62A; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; S/MIME &#x634;&#x645;&#x627; 
-    </para>
-    <heading>&#x645;&#x634;&#x627;&#x647;&#x62F;&#x647;</heading>
-    <para>
-    &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x62A;&#x646; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;  
-    </para>
-    <heading>&#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A;</heading>
-    <para>
-    &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x62C;&#x632;&#x626;&#x64A;&#x627;&#x62A; &#x641;&#x646;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC;
-    </para>
-    <heading>&#x62D;&#x630;&#x641;</heading>
-    <para>
-     &#x628;&#x627; &#x627;&#x64A;&#x646; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x60C; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x6CC; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x634;&#x62F;&#x647; &#x627;&#x632; &#x62F;&#x64A;&#x633;&#x6A9; &#x634;&#x645;&#x627; &#x62D;&#x630;&#x641; &#x645;&#x6CC;&#x200C;&#x634;&#x648;&#x62F;. &#x628;&#x627; &#x62D;&#x630;&#x641; &#x6A9;&#x644;&#x64A;&#x62F; &#x639;&#x645;&#x648;&#x645;&#x64A; &#x64A;&#x6A9; &#x6A9;&#x627;&#x631;&#x628;&#x631;&#x60C; &#x634;&#x645;&#x627; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x645;&#x632; &#x634;&#x62F;&#x647; &#x628;&#x647; &#x622;&#x646; &#x6A9;&#x627;&#x631;&#x628;&#x631; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;.  
-     </para>
-</entry>
-
-<entry id="printing" md5="f233c11b6b4a6bedeb68f1d5a2a976db" state="uptodate">
-    <title>&#x686;&#x627;&#x67E;</title>
-    <heading>&#x686;&#x627;&#x67E; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645;</heading>
-    <para>
-    &#x628;&#x631;&#x627;&#x6CC; &#x686;&#x627;&#x67E; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x6A9;&#x644;&#x64A;&#x62F; "&#x686;&#x627;&#x67E;"&#x60C; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x628;&#x633;&#x62A;&#x647; &#x628;&#x647; &#x646;&#x648;&#x639; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x686;&#x627;&#x67E; &#x628;&#x631;&#x627;&#x6CC; &#x634;&#x645;&#x627; &#x6AF;&#x634;&#x648;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;. &#x627;&#x6AF;&#x631; &#x627;&#x62D;&#x64A;&#x627;&#x646;&#x627; &#x627;&#x64A;&#x646; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x628;&#x627;&#x632; &#x646;&#x634;&#x62F;&#x60C; &#x627;&#x632; &#x645;&#x646;&#x648;&#x6CC; &#x641;&#x627;&#x64A;&#x644; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x62E;&#x648;&#x62F; &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x639;&#x627;&#x644; &#x6A9;&#x631;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x67E;&#x646;&#x62C;&#x631;&#x647; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x6A9;&#x646;&#x64A;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="sorting" md5="18cdeac38027fe5c42bab693f2a4260a" state="uptodate">
-    <title>&#x645;&#x631;&#x62A;&#x628; &#x633;&#x627;&#x632;&#x6CC; / &#x6AF;&#x631;&#x648;&#x647; &#x200C;&#x628;&#x646;&#x62F;&#x6CC;</title>
-    <heading>&#x645;&#x631;&#x62A;&#x628; &#x6A9;&#x631;&#x62F;&#x646; &#x648;&#x631;&#x648;&#x62F;&#x6CC;&#x200C;&#x647;&#x627;</heading>
-    <para>
-    &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x641;&#x647;&#x631;&#x633;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x64A;&#x62F;&#x60C; &#x642;&#x627;&#x62F;&#x631; &#x628;&#x647; &#x645;&#x631;&#x62A;&#x628; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x631; &#x627;&#x633;&#x627;&#x633; &#x62A;&#x645;&#x627;&#x645; &#x633;&#x62A;&#x648;&#x646;&#x647;&#x627; &#x62E;&#x648;&#x627;&#x647;&#x64A;&#x62F; &#x628;&#x648;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x64A;&#x646; &#x645;&#x646;&#x638;&#x648;&#x631; &#x62A;&#x646;&#x647;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x639;&#x646;&#x648;&#x627;&#x646; &#x633;&#x62A;&#x648;&#x646; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x646;&#x62F;. &#x647;&#x645;&#x686;&#x646;&#x64A;&#x646; &#x628;&#x627; &#x627;&#x646;&#x62C;&#x627;&#x645; &#x6A9;&#x644;&#x64A;&#x6A9; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x639;&#x644;&#x627;&#x645;&#x62A; &#x641;&#x644;&#x634; &#x6A9;&#x646;&#x627;&#x631; &#x647;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x645;&#x6CC;&#x200C;&#x62A;&#x648;&#x627;&#x646; &#x645;&#x631;&#x62A;&#x628; &#x633;&#x627;&#x632;&#x6CC; &#x631;&#x627; &#x627;&#x632; &#x635;&#x639;&#x648;&#x62F;&#x6CC; &#x628;&#x647; &#x646;&#x632;&#x648;&#x644;&#x64A; &#x648; &#x64A;&#x627; &#x628;&#x631; &#x639;&#x6A9;&#x633;&#x60C; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x62F;&#x627;&#x62F;.
-     </para>
-    <heading>&#x6AF;&#x631;&#x648;&#x647;&#x200C;&#x628;&#x646;&#x62F;&#x6CC;</heading>
-    <para>
-    &#x628;&#x631;&#x627;&#x6CC; &#x6AF;&#x631;&#x648;&#x647;&#x200C;&#x628;&#x646;&#x62F;&#x6CC; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x628;&#x631; &#x627;&#x633;&#x627;&#x633; &#x645;&#x648;&#x636;&#x648;&#x639; ( &#x647;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62D;&#x62F;&#x627;&#x642;&#x644; &#x628;&#x627; &#x67E;&#x627;&#x633;&#x62E;&#x647;&#x627;&#x6CC; &#x645;&#x631;&#x628;&#x648;&#x637; &#x628;&#x647; &#x622;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x60C; &#x6AF;&#x631;&#x648;&#x647; &#x628;&#x646;&#x62F;&#x6CC; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F;)&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631; &#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x648;&#x646;&#x62F; [&#x645;&#x648;&#x631;&#x62F;] &#x6A9;&#x647; &#x62F;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x642;&#x631;&#x627;&#x631; &#x62F;&#x627;&#x62F;&#x60C; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x631;&#x627;&#x6CC; &#x627;&#x632; &#x628;&#x64A;&#x646; &#x628;&#x631;&#x62F;&#x646; &#x627;&#x64A;&#x646; &#x6AF;&#x631;&#x648;&#x647; &#x628;&#x646;&#x62F;&#x6CC; &#x628;&#x627;&#x64A;&#x62F; &#x628;&#x631;&#x631;&#x648;&#x6CC; &#x67E;&#x64A;&#x648;&#x646;&#x62F; [&#x645;&#x648;&#x636;&#x648;&#x639;] &#x62F;&#x631; &#x633;&#x62A;&#x648;&#x646; &#x645;&#x648;&#x636;&#x648;&#x639;&#x60C; &#x6A9;&#x644;&#x64A;&#x6A9; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;.
-     </para>
-</entry>
-
-<entry id="alternative-msg" md5="4978073f76977b6af6b69810e4d22a65" state="uptodate">
-    <title>&#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x686;&#x646;&#x62F;&#x642;&#x633;&#x645;&#x62A;&#x6CC;/&#x62C;&#x627;&#x64A;&#x6AF;&#x632;&#x64A;&#x646;</title>
-    <para>
-    	&#x628;&#x631;&#x62E;&#x64A; &#x627;&#x632; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x200C;&#x647;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x686;&#x646;&#x62F; &#x642;&#x633;&#x645;&#x62A;&#x64A;/&#x62C;&#x627;&#x64A;&#x6AF;&#x632;&#x64A;&#x646; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x6AF;&#x631;&#x62F;&#x646;&#x62F;. &#x627;&#x64A;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627; &#x62D;&#x627;&#x648;&#x6CC; &#x686;&#x646;&#x62F; &#x642;&#x633;&#x645;&#x62A; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x646;&#x62F; &#x6A9;&#x647; &#x62F;&#x631; &#x622;&#x646;&#x647;&#x627; &#x62A;&#x645;&#x627;&#x645; &#x642;&#x633;&#x645;&#x62A;&#x647;&#x627; &#x645;&#x62D;&#x62A;&#x648;&#x627;&#x6CC; &#x64A;&#x6A9;&#x633;&#x627;&#x646; &#x628;&#x627; &#x642;&#x627;&#x644;&#x628;&#x647;&#x627;&#x6CC; &#x645;&#x62A;&#x641;&#x627;&#x648;&#x62A;&#x64A; &#x631;&#x627; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x645;&#x64A;&#x200C;&#x62F;&#x647;&#x646;&#x62F; &#x6A9;&#x647; &#x639;&#x645;&#x648;&#x645;&#x627; &#x62A;&#x646;&#x647;&#x627; &#x642;&#x633;&#x645;&#x62A; &#x622;&#x62E;&#x631; &#x62A;&#x648;&#x633;&#x637; &#x645;&#x631;&#x648;&#x631;&#x6AF;&#x631; &#x646;&#x634;&#x627;&#x646; &#x62F;&#x627;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x634;&#x648;&#x62F; ( &#x62A;&#x641;&#x627;&#x648;&#x62A; &#x642;&#x627;&#x644;&#x628; &#x627;&#x64A;&#x646; &#x642;&#x633;&#x645;&#x62A;&#x647;&#x627; &#x645;&#x62B;&#x644;&#x627; &#x62F;&#x631; &#x642;&#x627;&#x644;&#x628; &#x645;&#x62A;&#x646; &#x648; &#x64A;&#x627; &#x642;&#x627;&#x644;&#x628; HTML &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x648; ... &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F;). 
-    </para>
-</entry>
-
-<entry id="prefs-rename_sentmail_monthly" md5="530fa20e0afbc25ffd40877948832899" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x645;&#x627;&#x647;&#x627;&#x646;&#x647; &#x67E;&#x648;&#x634;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x62F;&#x647;</title>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x67E;&#x648;&#x634;&#x647; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x62F;&#x647; &#x62F;&#x631; &#x627;&#x628;&#x62A;&#x62F;&#x627;&#x6CC; &#x647;&#x631; &#x645;&#x627;&#x647; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x628;&#x647; &#x646;&#x627;&#x645;&#x64A; &#x62A;&#x63A;&#x64A;&#x64A;&#x631; &#x646;&#x627;&#x645; &#x62F;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F; &#x6A9;&#x647; &#x62D;&#x627;&#x648;&#x6CC; &#x646;&#x627;&#x645; &#x645;&#x627;&#x647; &#x648; &#x633;&#x627;&#x644; &#x628;&#x627;&#x634;&#x62F; &#x648; &#x64A;&#x6A9; &#x67E;&#x648;&#x634;&#x647; &#x62C;&#x62F;&#x64A;&#x62F; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x646;&#x64A;&#x632; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;. 
-     </para>
-</entry>
-
-<entry id="prefs-delete_sentmail_monthly" md5="0beed16dfd68e2f25e0c66871fd546df" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x627;&#x646;&#x647;</title>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x62F;&#x631; &#x627;&#x628;&#x62A;&#x62F;&#x627;&#x6CC; &#x647;&#x631; &#x645;&#x627;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x634;&#x645;&#x627; &#x645;&#x62D;&#x62F;&#x648;&#x62F;&#x64A;&#x62A; &#x62F;&#x631; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x633;&#x6A9; &#x645;&#x648;&#x631;&#x62F; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x62E;&#x648;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x645;&#x641;&#x64A;&#x62F; &#x62E;&#x648;&#x627;&#x647;&#x62F; &#x628;&#x648;&#x62F;. 
-     </para>
-</entry>
-
-<entry id="prefs-delete_sentmail_monthly_keep" md5="71ed1c2eab48b91a25b5bcd4b14ccea9" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x627;&#x646;&#x647; - &#x645;&#x627;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC;</title>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62E;&#x648;&#x62F; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x645;&#x644;&#x627;&#x6A9; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x628;&#x631;&#x627;&#x6CC; &#x642;&#x62F;&#x645;&#x62A; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x646;&#x645;&#x627;&#x64A;&#x64A;&#x62F;. &#x628;&#x639;&#x62F; &#x627;&#x632; &#x62A;&#x639;&#x64A;&#x64A;&#x646; &#x62A;&#x639;&#x62F;&#x627;&#x62F; &#x645;&#x627;&#x647;&#x647;&#x627; &#x648; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647;&#x60C; &#x67E;&#x648;&#x634;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62D;&#x630;&#x641; &#x62E;&#x648;&#x627;&#x647;&#x646;&#x62F; &#x634;&#x62F;.
-     </para>
-</entry>
-
-<entry id="prefs-delete_attachments_monthly" md5="373ea02ede6df5fc345caf632e19a75f" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x646;&#x627;&#x645;&#x647;</title>
-    <para>
-    &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x636;&#x645;&#x627;&#x626;&#x645; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x627;&#x628;&#x62A;&#x62F;&#x627;&#x6CC; &#x647;&#x631; &#x645;&#x627;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x631;&#x627; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x634;&#x645;&#x627; &#x645;&#x62D;&#x62F;&#x648;&#x62F;&#x64A;&#x62A; &#x62F;&#x631; &#x641;&#x636;&#x627;&#x6CC; &#x62F;&#x64A;&#x633;&#x6A9; &#x62F;&#x631; &#x62F;&#x633;&#x62A;&#x631;&#x633; &#x62E;&#x648;&#x62F; &#x62F;&#x627;&#x634;&#x62A;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x645;&#x641;&#x64A;&#x62F; &#x627;&#x633;&#x62A;.   
-     </para>
-</entry>
-
-<entry id="prefs-delete_attachments_monthly_keep" md5="1b340a60214dffd04aec02cc1127df5d" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62D;&#x630;&#x641; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x645;&#x627;&#x647;&#x646;&#x627;&#x645;&#x647; - &#x645;&#x627;&#x647;&#x200C;&#x647;&#x627;&#x6CC; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC;</title>
-    <para>
-  &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62D;&#x630;&#x641; &#x636;&#x645;&#x627;&#x626;&#x645; &#x642;&#x62F;&#x64A;&#x645;&#x64A; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x647;&#x631; &#x645;&#x627;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x645;&#x644;&#x627;&#x6A9; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x642;&#x62F;&#x645;&#x62A; &#x636;&#x645;&#x627;&#x626;&#x645; &#x631;&#x627; &#x628;&#x647; &#x645;&#x627;&#x647; &#x645;&#x634;&#x62E;&#x635; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x635;&#x648;&#x631;&#x62A; &#x636;&#x645;&#x627;&#x626;&#x645;&#x64A; &#x6A9;&#x647; &#x642;&#x62F;&#x64A;&#x645;&#x64A;&#x200C;&#x62A;&#x631; &#x627;&#x632; &#x645;&#x644;&#x627;&#x6A9; &#x645;&#x634;&#x62E;&#x635; &#x634;&#x62F;&#x647; &#x62A;&#x648;&#x633;&#x637; &#x634;&#x645;&#x627; &#x628;&#x627;&#x634;&#x646;&#x62F;&#x60C; &#x62D;&#x630;&#x641; &#x62E;&#x648;&#x627;&#x647;&#x646;&#x62F; &#x634;&#x62F;.  
-     </para>
-</entry>
-
-<entry id="prefs-purge_trash" md5="dc71871146be3e46ade0087a8cf18273" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62E;&#x627;&#x644;&#x6CC; &#x6A9;&#x631;&#x62F;&#x646; &#x633;&#x637;&#x644; &#x622;&#x634;&#x63A;&#x627;&#x644;</title>
-    <para>
-    &#x622;&#x64A;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62E;&#x627;&#x644;&#x64A; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x622;&#x634;&#x63A;&#x627;&#x644; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x64A;&#x6A9; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x64A; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F;.  
-     </para>
-</entry>
-
-<entry id="prefs-purge_trash_interval" md5="7be91fbeb05b2d87289d4c5602d5a32f" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x62E;&#x627;&#x644;&#x6CC; &#x6A9;&#x631;&#x62F;&#x646; &#x633;&#x637;&#x644; &#x622;&#x634;&#x63A;&#x627;&#x644;</title>
-    <para>
-    &#x686;&#x646;&#x627;&#x646;&#x686;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62E;&#x627;&#x644;&#x64A; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x622;&#x634;&#x63A;&#x627;&#x644; &#x62E;&#x648;&#x62F; &#x62F;&#x631; &#x64A;&#x6A9; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x64A; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x627;&#x64A;&#x646; &#x62A;&#x631;&#x62A;&#x64A;&#x628; &#x632;&#x645;&#x627;&#x646;&#x64A; &#x631;&#x627; &#x645;&#x634;&#x62E;&#x635; &#x6A9;&#x646;&#x64A;&#x62F;.
-     </para>
-</entry>
-
-<entry id="prefs-purge_trash_keep" md5="3cb5a2b5b80b7ac1179ae005f983970e" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; : &#x645;&#x62F;&#x62A; &#x632;&#x645;&#x627;&#x646; &#x646;&#x6AF;&#x647;&#x62F;&#x627;&#x631;&#x6CC; &#x622;&#x634;&#x63A;&#x627;&#x644;&#x647;&#x627;</title>
-    <para>
-   &#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x62E;&#x627;&#x644;&#x64A; &#x6A9;&#x631;&#x62F;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x622;&#x634;&#x63A;&#x627;&#x644; &#x62E;&#x648;&#x62F; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x628;&#x627;&#x64A;&#x62F; &#x645;&#x644;&#x627;&#x6A9; &#x632;&#x645;&#x627;&#x646;&#x6CC; &#x642;&#x62F;&#x645;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x645;&#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x67E;&#x648;&#x634;&#x647; &#x631;&#x627; (&#x628;&#x647; &#x631;&#x648;&#x632;) &#x645;&#x634;&#x62E;&#x635; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. 
-     </para>
-</entry>
-
-<entry id="prefs-attrib_text" md5="721a09d7ca028c97e3bd2b38c597fff7" state="uptodate">
-     <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x67E;&#x64A;&#x63A;&#x627;&#x645; : &#x62A;&#x631;&#x6A9;&#x64A;&#x628;&#x200C;&#x647;&#x627;&#x6CC; &#x62E;&#x627;&#x635;</title>
-     <para>
-     &#x627;&#x64A;&#x646;&#x62C;&#x627; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x639;&#x628;&#x627;&#x631;&#x62A;&#x64A; &#x631;&#x627; &#x6A9;&#x647; &#x645;&#x627;&#x64A;&#x644; &#x628;&#x647; &#x638;&#x627;&#x647;&#x631; &#x634;&#x62F;&#x646; &#x622;&#x646; &#x642;&#x628;&#x644; &#x627;&#x632; &#x647;&#x631; &#x645;&#x62A;&#x646; &#x646;&#x642;&#x644; &#x642;&#x648;&#x644; &#x634;&#x62F;&#x647; &#x62F;&#x631; &#x67E;&#x627;&#x633;&#x62E;&#x647;&#x627; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x64A;&#x62F; &#x631;&#x627;&#x60C; &#x648;&#x627;&#x631;&#x62F; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;.    
-     </para>
-     <para>
-     &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x627;&#x632; &#x64A;&#x6A9; &#x64A;&#x627; &#x686;&#x646;&#x62F; &#x62A;&#x631;&#x6A9;&#x64A;&#x628; &#x62E;&#x627;&#x635; &#x62F;&#x631; &#x62F;&#x627;&#x62E;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62E;&#x648;&#x62F; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x627;&#x633;&#x62E; &#x627;&#x633;&#x62A;&#x641;&#x627;&#x62F;&#x647; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62F;&#x631; &#x632;&#x64A;&#x631; &#x641;&#x647;&#x631;&#x633;&#x62A;&#x64A; &#x627;&#x632; &#x627;&#x64A;&#x646; &#x62A;&#x631;&#x6A9;&#x64A;&#x628;&#x627;&#x62A; &#x631;&#x627; &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;: 
-      </para>
-
-     <para> f% : &#x646;&#x627;&#x645; &#x648; &#x622;&#x62F;&#x631;&#x633; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</para>
-     <para> a% : &#x622;&#x62F;&#x631;&#x633; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</para>
-     <para> p% : &#x646;&#x627;&#x645; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647;</para>
-     <para> r% : &#x641;&#x631;&#x645;&#x62A; &#x6A9;&#x627;&#x645;&#x644; &#x62A;&#x627;&#x631;&#x64A;&#x62E; &#x648; &#x632;&#x645;&#x627;&#x646; &#x62F;&#x631; RFC &#x6F2;&#x6F8;&#x6F2;&#x6F2;</para>
-     <para> d% : &#x62A;&#x627;&#x631;&#x64A;&#x62E; &#x62F;&#x631; &#x641;&#x631;&#x645;&#x62A; dd mmm yyyy</para>
-     <para> x% : &#x632;&#x645;&#x627;&#x646; &#x62F;&#x631; &#x645;&#x62D;&#x644;&#x64A;&#x62A; &#x62C;&#x627;&#x631;&#x6CC;</para>
-     <para> c% : &#x62A;&#x627;&#x631;&#x64A;&#x62E; &#x648; &#x632;&#x645;&#x627;&#x646; &#x62F;&#x631; &#x645;&#x62D;&#x644;&#x64A;&#x62A; &#x62C;&#x627;&#x631;&#x6CC;</para>
-     <para> m% : &#x645;&#x634;&#x62E;&#x635;&#x647; (ID) &#x67E;&#x64A;&#x63A;&#x627;&#x645;</para>
-     <para> s% : &#x645;&#x648;&#x636;&#x648;&#x639;</para>
-     <para> n% : &#x62E;&#x637; &#x62C;&#x62F;&#x64A;&#x62F;</para>
-     <para> %% : &#x646;&#x648;&#x64A;&#x633;&#x647; &#x66A;</para>
-
-</entry>
-
-<entry id="prefs-disposition_request_read" md5="89e92c4d68224b2345b59959878a7174" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x631;&#x633;&#x64A;&#x62F; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647;</title>
-    <para>
-    &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628; &#x6AF;&#x632;&#x64A;&#x646;&#x647; "&#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x631;&#x633;&#x64A;&#x62F; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647;"&#x60C; &#x62F;&#x631; &#x648;&#x627;&#x642;&#x639; &#x64A;&#x6A9; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x628;&#x647; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x6AF;&#x627;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644; &#x6A9;&#x631;&#x62F;&#x647; &#x648; &#x627;&#x632; &#x622;&#x646;&#x647;&#x627; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F; &#x6A9;&#x647; &#x628;&#x647; &#x647;&#x646;&#x6AF;&#x627;&#x645; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647; &#x627;&#x648;&#x644;&#x64A;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x60C; &#x634;&#x645;&#x627; &#x631;&#x627; &#x627;&#x632; &#x622;&#x646; &#x645;&#x637;&#x644;&#x639; &#x633;&#x627;&#x632;&#x646;&#x62F;. &#x628;&#x627;&#x64A;&#x62F; &#x62A;&#x648;&#x62C;&#x647; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F; &#x6A9;&#x647; &#x62A;&#x645;&#x627;&#x645;&#x64A; &#x62E;&#x62F;&#x645;&#x62A; &#x6AF;&#x632;&#x627;&#x631;&#x647;&#x627;&#x64A; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x64A; &#x627;&#x64A;&#x646; &#x639;&#x645;&#x644; &#x631;&#x627; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x64A; &#x646;&#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x646;&#x62F;.
-     </para>
-</entry>
-
-<entry id="prefs-disposition_send_mdn" md5="1fe04e5dc3de68d172da284895973ea9" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x627;&#x631;&#x633;&#x627;&#x644; MDN</title>
-    <para>
-    &#x6AF;&#x632;&#x64A;&#x646;&#x647; "&#x627;&#x631;&#x633;&#x627;&#x644; MDN"&#x60C; &#x64A;&#x6A9; &#x62A;&#x630;&#x6A9;&#x631; MDN (&#x62D;&#x627;&#x644;&#x62A; &#x67E;&#x64A;&#x63A;&#x627;&#x645;) &#x631;&#x627; &#x628;&#x647; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x62F;. &#x627;&#x64A;&#x646; &#x62A;&#x630;&#x6A9;&#x631; &#x645;&#x627;&#x646;&#x646;&#x62F; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x631;&#x633;&#x64A;&#x62F; &#x645;&#x637;&#x627;&#x644;&#x639;&#x647; &#x645;&#x64A;&#x200C;&#x628;&#x627;&#x634;&#x62F; &#x6A9;&#x647; &#x6AF;&#x627;&#x647;&#x64A; &#x628;&#x647; &#x637;&#x648;&#x631; &#x627;&#x62A;&#x648;&#x645;&#x627;&#x62A;&#x64A;&#x6A9; &#x627;&#x631;&#x633;&#x627;&#x644; &#x634;&#x62F;&#x647; &#x648; &#x6AF;&#x627;&#x647;&#x64A; &#x646;&#x64A;&#x632; &#x634;&#x645;&#x627; &#x645;&#x64A;&#x200C;&#x62A;&#x648;&#x627;&#x646;&#x64A;&#x62F; &#x627;&#x631;&#x633;&#x627;&#x644; &#x622;&#x646;&#x631;&#x627; &#x628;&#x647; &#x635;&#x648;&#x631;&#x62A; &#x62F;&#x633;&#x62A;&#x64A; &#x645;&#x644;&#x63A;&#x64A; &#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;.  
-     </para>
-</entry>
-
-<entry id="prefs-disposition_request_delivery" md5="26598e29af05a07de5e13644669be712" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x62A;&#x627;&#x64A;&#x64A;&#x62F; &#x62A;&#x62D;&#x648;&#x64A;&#x644;</title>
-    <para>
-   "&#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x62A;&#x627;&#x626;&#x64A;&#x62F; &#x627;&#x631;&#x633;&#x627;&#x644;"&#x60C; &#x64A;&#x6A9; &#x62F;&#x631;&#x62E;&#x648;&#x627;&#x633;&#x62A; &#x628;&#x631;&#x627;&#x6CC; &#x633;&#x631;&#x648;&#x631; &#x67E;&#x633;&#x62A; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x64A; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x627;&#x631;&#x633;&#x627;&#x644; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F; &#x62A;&#x627; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x647; &#x631;&#x627; &#x627;&#x632; &#x627;&#x631;&#x633;&#x627;&#x644; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x628;&#x647; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x64A; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x622;&#x6AF;&#x627;&#x647; &#x646;&#x645;&#x627;&#x64A;&#x62F;. &#x627;&#x644;&#x628;&#x62A;&#x647; &#x62F;&#x631;&#x64A;&#x627;&#x641;&#x62A; &#x627;&#x64A;&#x646; &#x631;&#x633;&#x64A;&#x62F; &#x628;&#x647; &#x645;&#x639;&#x646;&#x64A; &#x62E;&#x648;&#x627;&#x646;&#x62F;&#x647; &#x634;&#x62F;&#x646; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x62A;&#x648;&#x633;&#x637; &#x6AF;&#x64A;&#x631;&#x646;&#x62F;&#x647; &#x646;&#x64A;&#x633;&#x62A;. &#x628;&#x631;&#x62E;&#x64A; &#x627;&#x632; &#x633;&#x631;&#x648;&#x631;&#x647;&#x627;&#x6CC; &#x646;&#x627;&#x645;&#x647; &#x627;&#x644;&#x6A9;&#x62A;&#x631;&#x648;&#x646;&#x64A;&#x6A9;&#x64A; &#x627;&#x64A;&#x646; &#x642;&#x627;&#x628;&#x644;&#x64A;&#x62A; &#x631;&#x627; &#x67E;&#x634;&#x62A;&#x64A;&#x628;&#x627;&#x646;&#x64A; &#x646;&#x645;&#x64A;&#x200C;&#x6A9;&#x646;&#x646;&#x62F;. 
-    </para>
-</entry>
-
-<entry id="prefs-html_image_replacement" md5="28e1cf08e328345a8e7274c853492d4f" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62C;&#x627;&#x64A;&#x6AF;&#x630;&#x627;&#x631;&#x6CC; &#x62A;&#x635;&#x648;&#x64A;&#x631; &#x62F;&#x631; HTML</title>
-    <para>
-    &#x622;&#x64A;&#x627; &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x64A;&#x6A9; &#x67E;&#x64A;&#x63A;&#x627;&#x645; &#x631;&#x627; &#x62F;&#x631; &#x641;&#x631;&#x645;&#x62A; HTML &#x645;&#x634;&#x627;&#x647;&#x62F;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;. &#x62A;&#x635;&#x627;&#x648;&#x64A;&#x631; &#x628;&#x644;&#x648;&#x6A9;&#x647; &#x628;&#x627;&#x634;&#x646;&#x62F; &#x62A;&#x627; &#x634;&#x645;&#x627; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x622;&#x646;&#x647;&#x627; &#x631;&#x627; &#x62A;&#x627;&#x626;&#x64A;&#x62F;  &#x6A9;&#x646;&#x64A;&#x62F;&#x61F;
-    </para>
-</entry>
-
-<entry id="prefs-html_image_addrbook" md5="759fa3df24e0a3cd89f320102252f91a" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x62C;&#x627;&#x64A;&#x6AF;&#x630;&#x627;&#x631;&#x6CC; &#x62A;&#x635;&#x648;&#x64A;&#x631; &#x62F;&#x631;HTML / &#x62D;&#x636;&#x648;&#x631; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647; &#x622;&#x62F;&#x631;&#x633; </title>
-    <para>
-	&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x62A;&#x635;&#x627;&#x648;&#x64A;&#x631; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; HTML &#x631;&#x627; &#x628;&#x644;&#x648;&#x6A9;&#x647; &#x6A9;&#x631;&#x62F;&#x647; &#x628;&#x627;&#x634;&#x64A;&#x62F;&#x60C; &#x622;&#x64A;&#x627; &#x645;&#x627;&#x64A;&#x644; &#x647;&#x633;&#x62A;&#x64A;&#x62F; &#x6A9;&#x647; &#x627;&#x64A;&#x646; &#x645;&#x633;&#x626;&#x644;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x641;&#x631;&#x633;&#x62A;&#x646;&#x62F;&#x6AF;&#x627;&#x646;&#x64A; &#x6A9;&#x647; &#x62F;&#x631; &#x6A9;&#x62A;&#x627;&#x628;&#x686;&#x647; &#x622;&#x62F;&#x631;&#x633; &#x634;&#x645;&#x627; &#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x627;&#x631;&#x646;&#x62F; &#x645;&#x633;&#x62A;&#x62B;&#x646;&#x64A; &#x634;&#x648;&#x62F;&#x61F;
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
     </para>
 </entry>
-
-<entry id="prefs-mailbox_start" md5="3d1196f265d8b7cc465ebf21512acc05" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x635;&#x641;&#x62D;&#x647; &#x622;&#x63A;&#x627;&#x632;&#x64A;&#x646; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x6CC;</title>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
     <para>
-    &#x627;&#x64A;&#x646; &#x6AF;&#x632;&#x64A;&#x646;&#x647; &#x645;&#x634;&#x62E;&#x635; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x64A;&#x62F; &#x6A9;&#x647; &#x6A9;&#x62F;&#x627;&#x645; &#x635;&#x641;&#x62D;&#x647; &#x62F;&#x631; &#x635;&#x646;&#x62F;&#x648;&#x642; &#x67E;&#x633;&#x62A;&#x64A; &#x634;&#x645;&#x627;&#x60C; &#x647;&#x646;&#x6AF;&#x627;&#x645;&#x64A; &#x6A9;&#x647; &#x628;&#x631;&#x627;&#x6CC; &#x628;&#x627;&#x631; &#x627;&#x648;&#x644; &#x628;&#x647; &#x622;&#x646; &#x62F;&#x633;&#x62A;&#x631;&#x633;&#x64A; &#x645;&#x64A;&#x200C;&#x64A;&#x627;&#x628;&#x64A;&#x62F;&#x60C; &#x628;&#x627;&#x64A;&#x62F; &#x646;&#x645;&#x627;&#x64A;&#x634; &#x62F;&#x627;&#x62F;&#x647; &#x634;&#x648;&#x62F;&#x61F;  
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
     </para>
 </entry>
-
-<entry id="prefs-save_attachments" md5="35b46334cdcc7fa416b9f9fca5874e80" state="uptodate">
-    <title>&#x62A;&#x631;&#x62C;&#x64A;&#x62D;&#x627;&#x62A; : &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x636;&#x645;&#x627;&#x64A;&#x645; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x6CC;</title>
-    <para>
-   	&#x627;&#x6AF;&#x631; &#x634;&#x645;&#x627; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x64A;&#x62C;&#x627;&#x62F; &#x634;&#x62F;&#x647; &#x62E;&#x648;&#x62F; &#x631;&#x627; &#x62F;&#x631; &#x67E;&#x648;&#x634;&#x647; &#x67E;&#x64A;&#x63A;&#x627;&#x645;&#x647;&#x627;&#x6CC; &#x627;&#x631;&#x633;&#x627;&#x644;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x645;&#x64A;&#x200C;&#x646;&#x645;&#x627;&#x626;&#x64A;&#x62F;&#x60C; &#x622;&#x64A;&#x627; &#x628;&#x627;&#x64A;&#x62F; &#x636;&#x645;&#x627;&#x626;&#x645; &#x622;&#x646;&#x647;&#x627; &#x646;&#x64A;&#x632; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x634;&#x648;&#x646;&#x62F;&#x61F; &#x627;&#x646;&#x62A;&#x62E;&#x627;&#x628;&#x647;&#x627;&#x6CC; &#x632;&#x64A;&#x631; &#x628;&#x631;&#x627;&#x6CC; &#x634;&#x645;&#x627; &#x648;&#x62C;&#x648;&#x62F; &#x62F;&#x627;&#x631;&#x62F;: 
-     </para>
-
-     <para>* "&#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x636;&#x645;&#x627;&#x626;&#x645; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x634;&#x648;&#x646;&#x62F;" &#x2013; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x62D;&#x627;&#x644;&#x62A; &#x628;&#x631;&#x627;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x636;&#x645;&#x627;&#x626;&#x645; &#x627;&#x632; &#x634;&#x645;&#x627; &#x633;&#x648;&#x627;&#x644; &#x646;&#x62E;&#x648;&#x627;&#x647;&#x62F; &#x634;&#x62F;. </para>
-     <para>* "&#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x628;&#x631;&#x627;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x636;&#x645;&#x627;&#x626;&#x645; &#x633;&#x648;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x648; &#x62C;&#x648;&#x627;&#x628; &#x67E;&#x64A;&#x634; &#x641;&#x631;&#x636; &#x628;&#x644;&#x647; &#x628;&#x627;&#x634;&#x62F;."</para>
-     <para>* "&#x647;&#x645;&#x648;&#x627;&#x631;&#x647; &#x628;&#x631;&#x627;&#x64A; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x636;&#x645;&#x627;&#x626;&#x645; &#x633;&#x648;&#x627;&#x644; &#x634;&#x648;&#x62F; &#x648; &#x62C;&#x648;&#x627;&#x628; &#x67E;&#x64A;&#x634; &#x641;&#x631;&#x636; &#x646;&#x647; &#x628;&#x627;&#x634;&#x62F;."</para>
-     <para>* "&#x647;&#x631;&#x6AF;&#x632; &#x636;&#x645;&#x627;&#x626;&#x645; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x646;&#x634;&#x648;&#x646;&#x62F;" &#x2013; &#x62F;&#x631; &#x627;&#x64A;&#x646; &#x62D;&#x627;&#x644;&#x62A; &#x627;&#x632; &#x634;&#x645;&#x627; &#x633;&#x648;&#x627;&#x644;&#x64A; &#x646;&#x634;&#x62F;&#x647; &#x648; &#x636;&#x645;&#x627;&#x626;&#x645; &#x647;&#x631;&#x6AF;&#x632; &#x630;&#x62E;&#x64A;&#x631;&#x647; &#x646;&#x645;&#x64A;&#x200C;&#x634;&#x648;&#x646;&#x62F;.</para>
-</entry>
-
 </help>


--- orig/themes/bluewhite/screen.css
+++ mod/themes/bluewhite/screen.css
@@ -1,10 +1,10 @@
 /**
- * $Horde: imp/themes/bluewhite/screen.css,v 1.1.10.1 2005/07/06 17:20:44 jan Exp $
+ * $Horde: imp/themes/bluewhite/screen.css,v 1.1.10.2 2005/10/18 12:14:13 jan Exp $
  */
 
 .folders {
     font-size: 11px;
 }
 .answered {
-    background-color: #aaccaa;
+    background: #aca;
 }


--- orig/po/de_DE.po
+++ mod/po/de_DE.po
@@ -4,40 +4,45 @@
 # Jan Schneider <jan at horde.org>, 2001-2005.
 #
 # attachment: Anhang
+# stationery: Vorlage(n)
 msgid ""
 msgstr ""
-"Project-Id-Version: IMP 4.0-cvs\n"
+"Project-Id-Version: IMP 4.1-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-10-13 17:13+0200\n"
-"PO-Revision-Date: 2005-09-28 15:24+0200\n"
+"POT-Creation-Date: 2006-03-06 12:47+0100\n"
+"PO-Revision-Date: 2006-03-06 12:52+0100\n"
 "Last-Translator: Jan Schneider <jan at horde.org>\n"
 "Language-Team: German <dev at lists.horde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: lib/Compose.php:265 lib/Compose.php:317
+#: lib/Compose.php:429
+msgid "      Cc: "
+msgstr "        Cc: "
+
+#: lib/Compose.php:426
 msgid "      To: "
 msgstr "        An: "
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:414
 msgid "    Date: "
 msgstr "     Datum: "
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:417
 msgid "    From: "
 msgstr "       Von: "
 
-#: mailbox.php:406 templates/folders/head.inc:7
+#: mailbox.php:408 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Zugriffstaste %s)"
 
-#: lib/Compose.php:262 lib/Compose.php:314
+#: lib/Compose.php:423
 msgid " Subject: "
 msgstr "   Betreff: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " in "
 
@@ -45,158 +50,161 @@
 msgid "#"
 msgstr "Nr."
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:72
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:196
+#: thread.php:156
+#, php-format
+msgid "%d Messages"
+msgstr "%d Nachrichten"
+
+#: mailbox.php:175
 #, php-format
 msgid "%d messages have been deleted."
 msgstr "%d Nachrichten wurden gelöscht."
 
-#: lib/Spam.php:178
+#: lib/Spam.php:196
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr ""
 "%d Nachrichten wurden bei Ihrem Systemadministrator als kein Spam gemeldet."
 
-#: lib/Spam.php:158
+#: lib/Spam.php:176
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d Nachrichten wurde als kein Spam gemeldet."
 
-#: lib/Spam.php:170
+#: lib/Spam.php:188
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d Nachrichten wurden bei Ihrem Systemadministrator als Spam gemeldet."
 
-#: lib/Spam.php:150
+#: lib/Spam.php:168
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d Nachrichten wurde als Spam gemeldet."
 
-#: mailbox.php:369
+#: mailbox.php:358
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d bis %d von %d Nachrichten"
 
-#: mailbox.php:619
+#: mailbox.php:635
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP-Verwaltung"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME-Verwaltung"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s existiert bereits. Der Ordner %s wurde nicht umbenannt."
 
-#: lib/Message.php:612
+#: lib/Message.php:685
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s ist anscheinend kein gültiger Ordnername."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Der Ordner %s wird zum Monatsbeginn umbenannt."
 
-#: lib/MIME/Viewer/itip.php:256
+#: lib/MIME/Viewer/itip.php:257
 #, php-format
 msgid "%s has accepted."
 msgstr "%s hat zugestimmt."
 
-#: lib/MIME/Viewer/itip.php:625
+#: lib/MIME/Viewer/itip.php:617
 #, php-format
-msgid "%s has cancelled %s."
-msgstr "%s hat %s abgesagt."
+msgid "%s has cancelled \"%s\"."
+msgstr "%s hat \"%s\" abgesagt."
 
-#: lib/MIME/Viewer/itip.php:262
+#: lib/MIME/Viewer/itip.php:263
 #, php-format
 msgid "%s has declined."
 msgstr "%s hat abgelehnt."
 
-#: lib/MIME/Viewer/itip.php:493
+#: lib/MIME/Viewer/itip.php:492
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s hat auf eine Frei/Gebucht-Anfrage geantwortet."
 
-#: lib/MIME/Viewer/itip.php:616
+#: lib/MIME/Viewer/itip.php:609
 #, php-format
-msgid "%s has replied to the invitation to %s."
-msgstr "%s hat auf die Einladung zu %s geantwortet."
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s hat auf die Einladung zu \"%s\" geantwortet."
 
-#: lib/MIME/Viewer/itip.php:482
+#: lib/MIME/Viewer/itip.php:483
 #, php-format
 msgid "%s has sent you free/busy information."
 msgstr "%s hat Ihnen Frei/Gebucht-Informationen geschickt."
 
-#: lib/MIME/Viewer/itip.php:268
+#: lib/MIME/Viewer/itip.php:269
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr "%s hat vorläufig zugestimmt."
 
-#: lib/MIME/Viewer/itip.php:487
+#: lib/MIME/Viewer/itip.php:488
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s bittet um Ihre Frei/Gebucht-Informationen."
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:580
 #, php-format
-msgid "%s requests your presence at %s."
-msgstr "%s bittet um Ihre Anwesenheit bei %s."
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s bittet um Ihre Anwesenheit bei \"%s\"."
 
-#: lib/Message.php:377
+#: lib/Message.php:461
 #, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s wurde erfolgreich zu %s hinzugefügt."
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s wurde erfolgreich zu \"%s\" hinzugefügt."
 
-#: lib/MIME/Viewer/itip.php:597
+#: lib/MIME/Viewer/itip.php:592
 #, php-format
-msgid "%s wishes to ammend %s."
-msgstr "%s möchte %s ändern."
+msgid "%s wishes to ammend \"%s\"."
+msgstr "%s möchte \"%s\" ändern."
 
-#: lib/MIME/Viewer/itip.php:574
+#: lib/MIME/Viewer/itip.php:571
 #, php-format
-msgid "%s wishes to make you aware of %s."
-msgstr "%s möchte Sie auf %s aufmerksam machen."
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s möchte Sie auf \"%s\" aufmerksam machen."
 
-#: lib/MIME/Viewer/itip.php:602
+#: lib/MIME/Viewer/itip.php:596
 #, php-format
-msgid "%s wishes to receive the latest information about %s."
-msgstr "%s möchte die neuesten Informationen über %s erhalten."
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s möchte die neuesten Informationen über \"%s\" erhalten."
 
-#: message.php:269 message.php:274
+#: message.php:292 message.php:297
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: templates/message/navbar_top.inc:13
+#: templates/message/navbar_top.inc:20
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;von&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Änderungen anwenden und zur nächsten Seite springen.)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr ""
 "(Alle Änderungen verwerfen und zur Nachrichtenerstellung zurück springen)"
 
-#: spelling.php:280
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr "(HTML)"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr "(Einfacher Text)"
+
+#: spelling.php:279
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -204,7 +212,7 @@
 "(Alle bisherigen Änderungen anwenden und zur Nachrichtenerstellung zurück "
 "springen. Änderungen auf dieser Seite werden NICHT angewendet.)"
 
-#: spelling.php:277
+#: spelling.php:276
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -220,44 +228,44 @@
 msgid "* Please select address(es) *"
 msgstr "* Bitte Adresse(n) auswählen *"
 
-#: mailbox.php:194
+#: mailbox.php:173
 msgid "1 message has been deleted."
 msgstr "1 Nachricht wurde gelöscht."
 
-#: lib/Spam.php:180
+#: lib/Spam.php:198
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr ""
 "1 Nachricht wurde bei Ihrem Systemadministrator als kein Spam gemeldet."
 
-#: lib/Spam.php:160
+#: lib/Spam.php:178
 msgid "1 message has been reported as not spam."
 msgstr "1 Nachricht wurde als kein Spam gemeldet."
 
-#: lib/Spam.php:172
+#: lib/Spam.php:190
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 Nachricht wurde bei Ihrem Systemadministrator als Spam gemeldet."
 
-#: lib/Spam.php:152
+#: lib/Spam.php:170
 msgid "1 message has been reported as spam."
 msgstr "1 Nachricht wurde als Spam gemeldet."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:808
 msgid "100 characters"
 msgstr "100 Zeichen"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:811
 msgid "1000 characters"
 msgstr "1000 Zeichen"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:809
 msgid "250 characters"
 msgstr "250 Zeichen"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:810
 msgid "500 characters"
 msgstr "500 Zeichen"
 
-#: lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr ""
@@ -275,19 +283,19 @@
 msgid "AND"
 msgstr "UND"
 
-#: lib/MIME/Viewer/itip.php:590
+#: lib/MIME/Viewer/itip.php:582
+msgid "Accept and add to my calendar"
+msgstr "Anfrage akzeptieren und zu meinem Kalender hinzufügen"
+
+#: lib/MIME/Viewer/itip.php:585
 msgid "Accept request"
 msgstr "Anfrage akzeptieren"
 
-#: lib/MIME/Viewer/itip.php:587
-msgid "Accept request and add it to my calendar"
-msgstr "Anfrage akzeptieren und zu meinem Kalender hinzufügen"
-
-#: lib/MIME/Viewer/itip.php:753
+#: lib/MIME/Viewer/itip.php:746
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: lib/MIME/Viewer/itip.php:257
+#: lib/MIME/Viewer/itip.php:258
 msgid "Accepted: "
 msgstr "Angenommen: "
 
@@ -295,35 +303,39 @@
 msgid "Account's name:"
 msgstr "Kontoname:"
 
-#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:522 lib/MIME/Viewer/itip.php:725
 msgid "Actions"
 msgstr "Aktionen"
 
+#: lib/MIME/Headers.php:192 lib/MIME/Headers.php:193
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "%s zu meinem Adressbuch hinzufügen"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Quelle hinzufügen"
 
-#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+#: lib/MIME/Viewer/itip.php:573
 msgid "Add this to my calendar"
 msgstr "Zu meinem Kalender hinzufügen"
 
-#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Zum Adressbuch hinzufügen (%s)"
+#: lib/MIME/Viewer/itip.php:583
+msgid "Add to my calendar"
+msgstr "Zu meinem Kalender hinzufügen"
 
-#: compose.php:1191
+#: compose.php:590
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "\"%s\" als Anhang hinzugefügt."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"In der Nachrichtenansicht zusätzlich anzuzeigende Kopfeinträge: <i>"
-"(optional, jeden Eintrag in einer eigenen Zeile eintragen)</i>"
+"In der Nachrichtenansicht zusätzlich anzuzeigende Kopfeinträge: <em>"
+"(optional, jeden Eintrag in einer eigenen Zeile eintragen)</em>"
 
 #: lib/MIME/Viewer/notification.php:62
 #, php-format
@@ -352,36 +364,36 @@
 msgid "Additional message error details can be viewed %s."
 msgstr "Zusätzliche Fehlerdetails können %s angeschaut werden."
 
-#: contacts.php:90 templates/contacts/contacts.inc:180
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:337 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adressbücher"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Adressen für Bcc-Kopien aller Nachrichten: <i>(optional, jede Adresse in "
-"einer eigenen Zeile eintragen)</i>"
+"Adressen für Bcc-Kopien aller Nachrichten: <em>(optional, jede Adresse in "
+"einer eigenen Zeile eintragen)</em>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Adressen, die an diese Identität gebunden sind: <i>(optional, jede Adresse "
-"in einer eigenen Zeile eintragen)</i>"
+"Adressen, die an diese Identität gebunden sind: <em>(optional, jede Adresse "
+"in einer eigenen Zeile eintragen)</em>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:812
 msgid "All"
 msgstr "Alle"
 
-#: templates/folders/javascript.inc:5
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
@@ -389,7 +401,7 @@
 "Alle Nachrichten in den folgenden Ordnern werden als eine MBOX-Datei "
 "heruntergeladen:"
 
-#: lib/Maintenance/Task/purge_trash.php:81
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -410,14 +422,18 @@
 "Alle alten Ordner für gesendete Nachrichten, die älter als %s Monate sind, "
 "werden gelöscht."
 
-#: acl.php:85
+#: acl.php:84
 #, php-format
 msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr ""
 "Alle Rechte von Benutzer \"%2$s\" am Ordner \"%1$s\" wurden erfolgreich "
 "entfernt."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr "Erstellen von Ordnern erlauben?"
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "Anwendung von Filterregeln in allen Ordnern erlauben?"
 
@@ -425,15 +441,15 @@
 msgid "Alternative parts for this section:"
 msgstr "Alternative Nachrichtenteile:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:577
+#: config/prefs.php.dist:572
 msgid "Always"
 msgstr "Immer"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Anhänge immer speichern"
 
-#: lib/Message.php:468
+#: lib/Message.php:551
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
@@ -441,11 +457,15 @@
 "Beim Entfernen des Anhangs ist ein Fehler aufgetreten. Meldung des Email-"
 "Servers: "
 
-#: lib/Message.php:364
+#: lib/Message.php:435
+msgid "An unknown error occured while creating the new note."
+msgstr "Beim Anlegen der neuen Notiz ist ein unbekannter Fehler aufgetreten."
+
+#: lib/Message.php:434
 msgid "An unknown error occured while creating the new task."
 msgstr "Beim Anlegen der neuen Aufgabe ist ein unbekannter Fehler aufgetreten."
 
-#: message.php:484 mailbox.php:693 templates/message/navbar_navigate.inc:9
+#: message.php:503 mailbox.php:708 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -464,20 +484,26 @@
 msgid "Apply Filters to %s"
 msgstr "Filterregeln auf %s anwenden"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Filterregeln beim Anmelden anwenden?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Filterregeln immer anwenden, wenn INBOX angezeigt wird?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/mailbox/header.inc:14
+msgid "Are you sure you want to delete this Virtual Folder Definition?"
+msgstr ""
+"Sind Sie sicher, dass Sie die Suchkriterien für diesen Virtuellen Ordner "
+"löschen möchten?"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen öffentlichen Schlüssel löschen möchten?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
@@ -488,11 +514,11 @@
 msgid "Are you sure you want to do this?"
 msgstr "Sind Sie sicher, dass Sie fortfahren möchten?"
 
-#: message.php:391 templates/mailbox/javascript.inc:68
+#: message.php:408 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Sind Sie sicher, dass Sie diese Nachrichten ENDGÜLTIG löschen möchten?"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
 msgstr "Sind Sie sicher, dass Sie diesen Anhang ENDGÜLTIG löschen möchten?"
 
@@ -500,7 +526,11 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Sind Sie sicher, dass Sie diesen Ordner leeren möchten?"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:951
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Sind Sie sicher, dass Sie den Spam-Ordner leeren möchten?"
+
+#: lib/IMP.php:944
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Sind Sie sicher, dass Sie den Papierkorb leeren möchten?"
 
@@ -517,36 +547,32 @@
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Sind Sie sicher, dass Sie diese Nachricht als Spam melden möchten?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:905
 msgid "Arrival Time"
 msgstr "Eingangszeit"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:920
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:576
+#: config/prefs.php.dist:571
 msgid "Ask"
 msgstr "Nachfragen"
 
-#: templates/compose/compose.inc:509
-msgid "Attach"
-msgstr "Anhängen"
-
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:470
 msgid "Attach Files"
 msgstr "Dateien anhängen"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:451
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr ""
 "Eine Kopie Ihres öffentlichen PGP-Schlüssels an Ihre Nachricht anhängen?"
 
-#: lib/MIME/Viewer/tnef.php:109
+#: lib/MIME/Viewer/tnef.php:111
 msgid "Attached File:"
 msgstr "Angehängte Datei:"
 
-#: lib/Compose.php:362 lib/Compose.php:447
+#: lib/Compose.php:462 lib/Compose.php:557
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -554,28 +580,36 @@
 "Die Datei \"%s\" hat die erlaubte Größe für Anhänge überschritten. Die Datei "
 "wurde NICHT angehängt."
 
-#: lib/MIME/Viewer/itip.php:376
+#: lib/MIME/Viewer/itip.php:377
 msgid "Attached is a reply to a calendar request you sent."
 msgstr ""
 "Im Anhang finden Sie eine Anwort auf eine Terminanfrage, die Sie gestellt "
 "haben."
 
-#: mailbox.php:729 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:498 templates/compose/attachments.js:55
 msgid "Attachment"
 msgstr "Anhang"
 
-#: compose.php:1001 lib/Message.php:429
+#: attachment.php:70
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Anlage %s wurde gelöscht."
+
+#: lib/Compose.php:1125
+msgid "Attachment Information"
+msgstr "Anhangsinformationen"
+
+#: compose.php:1105 lib/Message.php:513
 msgid "Attachment stripped: Original attachment type"
 msgstr "Anhang entfernt: Ehemaliger Anhangstyp"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:984
+#: templates/compose/compose.inc:347 templates/compose/compose.inc:468
+#: lib/Compose.php:1093
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:678
 msgid "Attendees"
 msgstr "Teilnehmer"
 
@@ -587,7 +621,7 @@
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr "Auth_imp: Die benötigte IMAP-Erweiterung wurde nicht gefunden."
 
-#: config/prefs.php.dist:634
+#: config/prefs.php.dist:628
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -599,7 +633,7 @@
 msgid "Available Address books:"
 msgstr "Verfügbare Adressbücher:"
 
-#: lib/MIME/Viewer/itip.php:719
+#: lib/MIME/Viewer/itip.php:714
 msgid "Awaiting Response"
 msgstr "Auf Antwort wartend"
 
@@ -608,13 +642,36 @@
 msgid "Bac_k to %s"
 msgstr "_Zurück zu %s"
 
-#: thread.php:86 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Zurück zu %s"
 
-#: message.php:250 search.php:147 templates/contacts/contacts.inc:222
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr "Zurück zum Nachrichtenindex"
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr "Zurück zur Themenliste"
+
+#: lib/IMAP/Client.php:572
+#, php-format
+msgid "Bad login name or password."
+msgstr "Falscher Benutzername oder Passwort."
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr "Ungültige oder fehlerhafte Anfrage. Serverantwort: %s"
+
+#: lib/IMAP/Client.php:576
+#, php-format
+msgid "Bad request: %s."
+msgstr "Ungültige Anfrage: %s."
+
+#: message.php:273 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:601
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -623,17 +680,17 @@
 msgstr ""
 "Unten befindet sich der Quelltext der Nachricht mit der Statusinformation."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Ausschlussliste"
 
-#: config/prefs.php.dist:622
+#: config/prefs.php.dist:617
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr ""
 "Keine Bilder in HMTL-Nachrichten anzeigen, außer wenn ausdrücklich "
 "angefordert?"
 
-#: search.php:155
+#: lib/Search.php:609
 msgid "Body"
 msgstr "Text"
 
@@ -642,11 +699,16 @@
 msgid "Both"
 msgstr "Beides"
 
-#: config/prefs.php.dist:681
+#: config/prefs.php.dist:684
 msgid "Both Header Listing and Body of Message"
 msgstr "Im Nachrichtenkopf und im Nachrichtentext"
 
-#: templates/compose/compose.inc:283
+#: lib/IMAP/Client.php:501
+msgid "CRAM-MD5 or DIGEST-MD5 requires the Auth_SASL package to be installed."
+msgstr ""
+"Für CRAM-MD5 oder DIGEST-MD5 muss das Auth_SASL-Paket installiert sein."
+
+#: templates/compose/compose.inc:270
 msgid "C_harset"
 msgstr "_Zeichensatz"
 
@@ -671,15 +733,16 @@
 "Darstellung nicht möglich - nur %s von %s Teilen dieser Nachricht im "
 "aktuellen Ordner gefunden."
 
-#: folders.php:273 templates/contacts/contacts.inc:255
-#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
-#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
-#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
+#: folders.php:270 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:430
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Nachricht verwerfen"
 
@@ -687,28 +750,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Wenn Sie diese Nachricht verwerfen, geht der Inhalt engültig verloren."
 
-#: message.php:249 search.php:143 templates/contacts/contacts.inc:221
-#: templates/compose/recompose.inc:15
+#: message.php:272 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:597
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:701
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+"Sie können keine Zertifikate importieren, weil das Hochladen von Dateien auf "
+"diesen Server nicht möglich ist."
+
+#: lib/MIME/Viewer/itip.php:696
 msgid "Chair Person"
 msgstr "Besprechungsleiter"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Ändern"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Alle Ändern"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Ordner wechseln"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -728,24 +799,24 @@
 "Ändern Sie den Namen, die Emailadresse oder die Signatur, die die Empfänger "
 "Ihrer Emails sehen, wenn diese Ihre Emails lesen oder darauf anworten."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:813
 msgid "Characters to display:"
 msgstr "Anzuzeigende Zeichen:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Ordner auf neue Nachrichten überprüfen"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr "_Alle/Keine auswählen"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr ""
 "Markieren Sie alle Emailserver, von denen Sie Emails herunterladen möchten:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Rechtschreibung vor dem Versenden von Nachrichten überprüfen?"
 
@@ -753,19 +824,15 @@
 msgid "Choose Action:"
 msgstr "Aktion auswählen:"
 
-#: config/servers.php.dist:195
+#: config/servers.php.dist:202
 msgid "Choose a mail server:"
 msgstr "Wählen Sie einen Email-Server:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
+#: templates/compose/compose.inc:123 templates/compose/compose.inc:164
+#: templates/compose/compose.inc:215
 msgid "Choose a match or edit the address to the right:"
 msgstr "Bitte wählen Sie aus oder editieren Sie rechts:"
 
-#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
-msgid "Choose an action:"
-msgstr "Aktion auswählen:"
-
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
 msgstr ""
@@ -778,34 +845,34 @@
 "Wählen Sie die Reihenfolge der Adressbücher aus, in denen nach Namen gesucht "
 "werden soll."
 
-#: lib/MIME/Viewer/images.php:106
+#: lib/MIME/Viewer/images.php:115
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 "Klicken Sie %s, um die Bilddatei in ein Format umzuwandeln, das Ihr Browser "
 "darstellen kann"
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:104
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Klicken Sie %s, um das Bild herunterzuladen."
 
-#: lib/Filter.php:107
+#: lib/Filter.php:132
 #, php-format
 msgid "Click %s to go to %s management page."
 msgstr "Klicken Sie %s, um zu %s-Verwaltung zu gelangen."
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "Klicken Sie %s, um den HTML-Inhalt in einem neuen Fenster anzuzeigen."
 
-#: lib/MIME/Viewer/images.php:163
+#: lib/MIME/Viewer/images.php:164
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "Klicken Sie %s, um eine Vorschau dieses Bildes anzuzeigen."
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:424
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Klicken Sie %s, um den Anhang in einem neuen Fenster anzuzeigen."
@@ -817,11 +884,7 @@
 "Klicken Sie %s, um diesen multipart/related Nachrichtenteil in einem neuen "
 "Fenster anzuzeigen."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Hier klicken, um Bilder zu blockieren"
-
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Click here to SHOW the Images"
 msgstr "Hier klicken, um Bilder anzuzeigen"
 
@@ -833,54 +896,54 @@
 "Klicken Sie auf eines der ausgewählten Adressbücher und markieren Sie alle "
 "Felder, die durchsucht werden sollen."
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:170
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 "Hier klicken, um den öffentlichen PGP-Schlüssel in Ihrem Adressbuch zu "
 "speichern"
 
-#: lib/MIME/Viewer/pkcs7.php:191
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 "Hier klicken, um das S/MIME-Zertifikat von %s in Ihrem Adressbuch zu "
 "speichern"
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:939
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr ""
 "Klick auf die Adresse öffnet Fenster zum Erstellen einer neuen Nachricht an "
 "den Absender"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:940
 msgid "Clicking on the address will open the message to be read"
 msgstr "Klick auf die Adresse öffnet die Nachricht zum Lesen"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Schließen"
 
-#: compose.php:775 compose.php:1082
+#: compose.php:418
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: folders.php:416
+#: folders.php:410
 msgid "Closed Folder"
 msgstr "Geschlossener Ordner"
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse"
 msgstr "Schließen"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All"
 msgstr "Alle s_chließen"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:40
 msgid "Collapse All Folders"
 msgstr "Alle Ordner schließen"
 
-#: folders.php:436
+#: folders.php:430
 msgid "Collapse Folder"
 msgstr "Ordner schließen"
 
@@ -888,32 +951,23 @@
 msgid "Color Indicator: "
 msgstr "Farbmarkierung: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Kommentar"
 
-#: lib/MIME/Viewer/itip.php:769
+#: lib/MIME/Viewer/itip.php:762
 msgid "Completed"
 msgstr "Erledigt"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Neue Nachricht"
-
-#: mailbox.php:756 lib/MIME/Headers.php:192
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Neue Nachricht (%s)"
-
-#: compose.php:774 compose.php:1081
+#: compose.php:417
 msgid "Compose another message"
 msgstr "Weitere Nachricht verfassen"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Neue Nachrichten in separatem Fenster verfassen?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
@@ -925,25 +979,33 @@
 msgid "Configure how messages are displayed."
 msgstr "Legen Sie fest, wie Nachrichten angezeigt werden."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Ändern Sie die Einstellungen für die Nachrichtenvorschau."
 
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr "Verbindung zum IMAP-Server unterbrochen."
+
 #: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "Verbindung zum Server fehlgeschlagen"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "PGP-Unterstützung für %s konfigurieren."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "S/MIME-Unterstützung für %s konfigurieren."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr "Nachrichtensuche konfigurieren."
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
@@ -951,7 +1013,7 @@
 "Legen Sie fest, wie oft auf neue Nachrichten überpüft werden soll, und ob "
 "Sie über neue Nachrichten benachrichtigt werden wollen."
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:674
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Text-Emoticons in grafische umwandeln?"
 
@@ -963,25 +1025,30 @@
 msgid "Copy to folder"
 msgstr "Kopieren nach"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Korrigiere"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Korrigierter Text"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Anfrage konnte nicht abgeschlossen werden. Angegebener Grund: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Das VFS-Backend konnte nicht aufgerufen werden: %s"
 
-#: lib/Message.php:603
+#: lib/Message.php:676
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Nachrichten konnten nicht aus %s gelöscht werden: %s"
 
-#: lib/Session.php:293
+#: lib/Session.php:333
 msgid "Could not execute maintenance operations."
 msgstr "Die Wartungsaufgaben konnten nicht durchgeführt werden."
 
@@ -994,23 +1061,30 @@
 msgid "Could not extract the requested file from the Zip archive."
 msgstr "Die ausgewählte Datei konnte nicht aus dem ZIP-Archiv gelesen werden."
 
-#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/IMAP/Client.php:446
+#, php-format
+msgid "Could not open secure connection to the IMAP server. %s : %s."
+msgstr ""
+"Sichere Verbindung zum IMAP-Server kann nicht hergestellt werden. %s : %s."
+
+#: lib/Session.php:280
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+"Die Namespace-Informationen konnten nicht vom IMAP-Server ausgelesen werden."
+
+#: templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:161
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Ordner erstellen"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Schlüssel erstellen"
 
-#: templates/search/header.inc:14
-msgid "Create Virtual Folder"
-msgstr "Virtuellen Ordner erstellen"
-
 #: templates/fetchmail/account_select.inc:26
 msgid "Create a New Account"
 msgstr "Ein neues Konto anlegen"
@@ -1023,7 +1097,7 @@
 msgid "Create a new drafts folder"
 msgstr "Einen neuen Ordner für Entwürfe anlegen"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Einen neuen Ordner für gesendete Nachrichten anlegen"
 
@@ -1031,20 +1105,28 @@
 msgid "Create a new trash folder"
 msgstr "Einen neuen Ordner für den Papierkorb anlegen"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
 "Legen Sie Filterregeln an, um Ihre eingehenden Nachrichten zu organisieren, "
-"in Ordner zu sortieren und unerwünschte Nachrichten zu löschen."
+"in Ordner zu sortieren und Spam zu löschen."
+
+#: templates/stationery/prefs.inc:14
+msgid "Create new stationery"
+msgstr "Neue Vorlage anlegen"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr "Erstellen Sie Formatvorlagen und Standardantworten."
 
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Aktuelle Rechte von %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
 "Legen Sie die Konten fest, von denen Emails eingesammelt werden sollen."
@@ -1064,84 +1146,97 @@
 msgid "Dat_e"
 msgstr "Dat_um"
 
-#: message.php:246 thread.php:92
+#: message.php:269 thread.php:153
 msgid "Date"
 msgstr "Datum"
 
-#: lib/MIME/Viewer/itip.php:757
+#: lib/MIME/Viewer/itip.php:750
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: lib/MIME/Viewer/itip.php:263
+#: lib/MIME/Viewer/itip.php:264
 msgid "Declined: "
 msgstr "Abgelehnt: "
 
-#: config/prefs.php.dist:530
+#: config/prefs.php.dist:537
 msgid "Default"
 msgstr "Standard"
 
-#: config/prefs.php.dist:894
+#: templates/prefs/defaultsearchselect.inc:21
+msgid "Default Search Field"
+msgstr "Standardsuchfeld"
+
+#: config/prefs.php.dist:912
 msgid "Default sorting criteria:"
 msgstr "Sortierreihenfolge:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:922
 msgid "Default sorting direction:"
 msgstr "Sortierrichtung:"
 
-#: lib/MIME/Viewer/itip.php:765
+#: lib/MIME/Viewer/itip.php:758
 msgid "Delegated"
 msgstr "Delegiert"
 
-#: folders.php:407 templates/fetchmail/manage.inc:68
+#: folders.php:400 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
 msgstr "Öffentlichen Schlüssel %s löschen"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Aktuellen Schlüssel löschen"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Ordner löschen"
 
-#: folders.php:274
+#: folders.php:271
 msgid "Delete Selected Folders"
 msgstr "Ausgewählte Ordner löschen"
 
-#: folders.php:407
+#: templates/stationery/prefs.inc:42
+msgid "Delete Stationery"
+msgstr "Vorlage löschen"
+
+#: folders.php:400
 msgid "Delete Virtual Folder"
 msgstr "Virtuellen Ordner löschen"
 
+#: templates/mailbox/header.inc:14
+#, php-format
+msgid "Delete Virtual Folder Definition for %s"
+msgstr "Virtuellen Ordner %s löschen"
+
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
 msgstr "Vom Server heruntergeladene Nachrichten löschen?"
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:619
 msgid "Delete from my calendar"
 msgstr "Aus meinem Kalender entfernen"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Alte verlinkte Anhänge am Monatsbeginn löschen?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Alte Ordner für gesendete Nachrichten am Monatsbeginn löschen?"
 
-#: config/prefs.php.dist:612
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Spam-Nachrichten löschen, nachdem sie als Spam gemeldet worden sind?"
+#: config/prefs.php.dist:605
+msgid "Delete spam messages"
+msgstr "Spam-Nachrichten löschen"
 
-#: message.php:487 mailbox.php:719 templates/mailbox/navbar.inc:20
+#: message.php:506 mailbox.php:734 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Gelöscht"
@@ -1150,7 +1245,7 @@
 msgid "Deleted messages"
 msgstr "Gelöschte Nachrichten"
 
-#: compose.php:280
+#: compose.php:570
 #, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Der Anhang \"%s\" wurde gelöscht."
@@ -1159,29 +1254,33 @@
 msgid "Deleting and Moving Messages"
 msgstr "Nachrichten löschen und verschieben"
 
-#: lib/MIME/Viewer/itip.php:592
+#: lib/MIME/Viewer/itip.php:587
 msgid "Deny request"
 msgstr "Anfrage ablehnen"
 
-#: lib/MIME/Viewer/itip.php:540
+#: lib/MIME/Viewer/itip.php:542
 msgid "Deny request for free/busy information"
 msgstr "Anfrage für Frei/Gebucht-Informationen ablehnen"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:921
 msgid "Descending"
 msgstr "Absteigend"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:666
 msgid "Description"
 msgstr "Beschreibung"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Details"
 
-#: config/prefs.php.dist:671
+#: compose.php:582
+#, php-format
+msgid "Did not attach \"%s\" as the file was empty."
+msgstr "\"%s\" wurde nicht angehängt, weil die Datei leer war."
+
+#: config/prefs.php.dist:665
 msgid "Dim signatures?"
 msgstr "Signaturen abblenden?"
 
@@ -1189,21 +1288,25 @@
 msgid "Display"
 msgstr "Anzeige"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Bestätigung nach dem Versenden von Nachrichten anzeigen?"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:683
 msgid "Display in Body of Message"
 msgstr "Eingebettet im Nachrichtentext"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:781
 msgid "Display pop-up notification of new mail?"
 msgstr "Auf neue Nachrichten durch Popup-Fenster hinweisen?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "'Papierkorb leeren'-Eintrag in der Menüzeile anzeigen?"
+#: config/prefs.php.dist:747
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "\"Spam Löschen\"-Eintrag in der Menüzeile anzeigen?"
+
+#: config/prefs.php.dist:739
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "\"Papierkorb leeren\"-Eintrag in der Menüzeile anzeigen?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
@@ -1213,23 +1316,27 @@
 msgid "Do NOT match"
 msgstr "Trifft NICHT zu"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Ordner nicht auf neue Nachrichten überprüfen"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:941
 msgid "Do not generate a link in the From: column"
 msgstr "Kein Verweis in der Von: Spalte erzeugen"
 
-#: lib/IMP.php:1031
+#: lib/IMP.php:1055
 msgid "Do you want to open that folder?"
 msgstr "Möchten Sie diesen Ordner öffnen?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:231
+msgid "Don't have an account? Sign up."
+msgstr "Noch keinen Zugang? Hier anmelden."
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Fertig"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "%s als ZIP-Datei herunterladen"
@@ -1238,25 +1345,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Alle Anhänge (als ZIP-Datei) herunterladen"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Ordner herunterladen"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Ordner herunterladen (als ZIP-Datei)"
 
-#: lib/MIME/Contents.php:191
+#: lib/MIME/Contents.php:216
 msgid "Download in .zip Format"
 msgstr "Als ZIP-Datei herunterladen"
 
-#: message.php:485 mailbox.php:698 templates/message/navbar_navigate.inc:11
+#: message.php:504 mailbox.php:713 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Entwurf"
 
-#: folders.php:387
+#: folders.php:373
 msgid "Draft folder"
 msgstr "Entwürfe-Ordner"
 
@@ -1264,11 +1371,11 @@
 msgid "Drafts folder:"
 msgstr "Entwürfe-Ordner:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "Emailadresse"
 
-#: lib/Mailbox.php:303
+#: lib/Mailbox.php:316
 msgid "END"
 msgstr "ENDE"
 
@@ -1276,20 +1383,23 @@
 msgid "ERROR: Your message could not be delivered."
 msgstr "FEHLER: Ihre Nachricht konnte nicht verschickt werden."
 
-#: folders.php:408
+#: folders.php:401 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Ausschlussliste bearbeiten"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
-#: folders.php:408 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: templates/search/header.inc:19 templates/mailbox/header.inc:16
+msgid "Edit Search Query"
+msgstr "Suchanfrage bearbeiten"
+
+#: folders.php:401 templates/search/header.inc:17
 msgid "Edit Virtual Folder"
 msgstr "Virtuellen Ordner bearbeiten"
 
@@ -1298,23 +1408,23 @@
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "Virtuellen Ordner %s bearbeiten"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Positivliste bearbeiten"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Ausschlussliste bearbeiten"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Filterregeln bearbeiten"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:850
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "Einstellungen für den Zugriff auf andere Konten bearbeiten."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Positivliste bearbeiten"
 
@@ -1322,16 +1432,20 @@
 msgid "Email Address"
 msgstr "Emailadresse"
 
-#: lib/Message.php:620
+#: lib/Message.php:693
 #, php-format
 msgid "Emptied all messages from %s."
 msgstr "Alle Nachrichten aus %s gelöscht."
 
-#: templates/folders/actions.inc:20
+#: lib/Message.php:669
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Alle Nachrichten aus dem Virtuellen Papierkorb gelöscht."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Ordner leeren"
 
-#: folders.php:275
+#: folders.php:272
 msgid "Empty Selected Folders"
 msgstr "Ausgewählte Ordner leeren"
 
@@ -1339,44 +1453,53 @@
 msgid "Empty Trash folder"
 msgstr "Papierkorb leeren"
 
-#: lib/IMP.php:931
+#: lib/IMP.php:951
+msgid "Empty _Spam"
+msgstr "Spam löschen"
+
+#: lib/IMP.php:944
 msgid "Empty _Trash"
 msgstr "Pap_ierkorb leeren"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "PGP-Funktionen aktivieren?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "S/MIME-Funktionen aktivieren?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:800
 msgid "Enable message previews?"
 msgstr "Nachrichtenvorschau aktivieren?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:437
 msgid "Encr_yption Options"
 msgstr "_Verschlüsselungs-Einstellungen"
 
-#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+#: templates/mailbox/legend.inc:18
+msgid "Encrypted"
+msgstr "Verschlüsselt"
+
+#: lib/MIME/Viewer/itip.php:516 lib/MIME/Viewer/itip.php:518
+#: lib/MIME/Viewer/itip.php:651 lib/MIME/Viewer/itip.php:653
 msgid "End"
 msgstr "Ende"
 
-#: lib/Compose.php:330
+#: lib/Compose.php:395
 msgid "End forwarded message"
 msgstr "Ende der weitergeleiteten Nachricht"
 
-#: lib/Compose.php:271
+#: lib/Compose.php:352
 msgid "End message"
 msgstr "Ende der Nachricht"
 
-#: lib/Compose.php:269
+#: lib/Compose.php:350
 #, php-format
 msgid "End message from %s"
 msgstr "Ende der Nachricht von %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Passwort eingeben"
 
@@ -1388,7 +1511,7 @@
 msgid "Enter the name for your new drafts folder"
 msgstr "Geben Sie einen Namen für Ihren neuen Entwürfe-Ordner ein"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr ""
 "Geben Sie einen Namen für den Ordner an, in dem Ihre gesendeten Nachrichten "
@@ -1398,94 +1521,100 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Geben Sie einen Namen für Ihren neuen \"Papierkorb\"-Ordner ein"
 
-#: search.php:159
+#: lib/Search.php:613
 msgid "Entire Message"
 msgstr "Gesamte Nachricht"
 
-#: message.php:178 compose.php:1068 thread.php:39
+#: message.php:194 compose.php:1172 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Der Eintrag \"%s\" wurde erfolgreich dem Adressbuch hinzugefügt"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:386
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:381 lib/MIME/Viewer/pgp.php:390
 #: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#: lib/IMAP/Client.php:431 lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr "Verbindung zum IMAP-Server kann nicht hergestellt werden. %s : %s."
+
+#: lib/MIME/Viewer/itip.php:310 lib/MIME/Viewer/itip.php:408
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Fehler beim Versenden der Antwort: %s"
 
-#: lib/MIME/Viewer/itip.php:101
+#: lib/MIME/Viewer/itip.php:102
 msgid "Event successfully deleted."
 msgstr "Termin erfolgreich gelöscht."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:771
 msgid "Every 15 minutes"
 msgstr "Alle 15 Minuten"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:768
 msgid "Every 30 seconds"
 msgstr "Alle 30 Sekunden"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:770
 msgid "Every 5 minutes"
 msgstr "Alle 5 Minuten"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:772
 msgid "Every half hour"
 msgstr "Alle halbe Stunde"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:769
 msgid "Every minute"
 msgstr "Alle 60 Sekunden"
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand"
-msgstr "Öffnen"
+msgstr "Vergrößern"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All"
 msgstr "Alle ö_ffnen"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:39
 msgid "Expand All Folders"
 msgstr "Alle Ordner öffnen"
 
-#: folders.php:445
+#: folders.php:438
 msgid "Expand Folder"
 msgstr "Ordner öffnen"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:338 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Namen suchen"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1052
 msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
 "Namen beim Erstellen neuer Nachrichten automatisch im Hintergrund "
 "vervollständigen?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:969
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "In der Ordneransicht alle Ordner öffnen?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:142 templates/compose/compose.inc:192
+#: templates/compose/compose.inc:243 templates/compose/redirect.inc:101
+#: templates/compose/compose_expand.js:49
 msgid "Expanding"
 msgstr "Suche"
 
-#: lib/IMP.php:940 lib/IMP.php:942
+#: lib/IMP.php:962 lib/IMP.php:964
 msgid "F_etch Mail"
 msgstr "Nachrichten sammeln"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Nachrichten sammeln"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:858
 msgid "Fetch Mail in a separate window?"
 msgstr "Nachrichten in einem neuen Fenster einsammeln?"
 
@@ -1493,57 +1622,57 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Nachrichten beim Anmelden einsammeln?"
 
-#: lib/Fetchmail.php:289
+#: lib/Fetchmail.php:291
 #, php-format
 msgid "Fetched %d messages from %s"
 msgstr "%d Nachrichten von %s eingesammelt."
 
-#: lib/Fetchmail.php:287
+#: lib/Fetchmail.php:289
 #, php-format
 msgid "Fetched 1 message from %s"
 msgstr "1 Nachricht von %s eingesammelt."
 
-#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#: lib/Fetchmail.php:287 lib/Fetchmail.php:289 lib/Fetchmail.php:291
 msgid "Fetchmail: "
 msgstr "Nachrichten sammeln: "
 
-#: lib/Fetchmail.php:291
+#: lib/Fetchmail.php:293
 msgid "Fetchmail: no new messages."
 msgstr "Nachrichten sammeln: Sie haben keine neue Nachrichten."
 
-#: lib/IMP.php:946
+#: lib/IMP.php:968
 msgid "Fi_lters"
 msgstr "_Filter"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:494 templates/compose/attachments.js:40
 msgid "File"
 msgstr "Datei"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Filter-Einstellungen"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Filter-Einstellungen"
 
-#: config/prefs.php.dist:594
+#: config/prefs.php.dist:588
 msgid "Filter message content for profanity?"
 msgstr "Nachrichten nach unerwünschten Inhalten filtern?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Die Filter-Unterstützung wurde auf diesem System deaktiviert."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filter"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filter sind NICHT aktiviert"
 
-#: lib/Filter.php:106
+#: lib/Filter.php:131
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filter: %s-Verwaltung"
@@ -1552,11 +1681,11 @@
 msgid "Find"
 msgstr "Suche"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:894
 msgid "First Mailbox Page"
 msgstr "Erste Ordnerseite"
 
-#: mailbox.php:341
+#: mailbox.php:330
 msgid "First Page"
 msgstr "Erste Seite"
 
@@ -1564,67 +1693,51 @@
 msgid "Fo_rward"
 msgstr "_Weiterleiten"
 
-#: folders.php:255 templates/folders/folders_confirm.html:5
+#: folders.php:252 templates/folders/folders_confirm.html:5
 msgid "Folder Actions - Confirmation"
 msgstr "Ordneraktionen - Bestätigung"
 
-#: folders.php:292 templates/folders/head.inc:9
+#: folders.php:289 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Ordner Navigation"
 
-#: templates/login/login.inc:175
-msgid "Folder Prefix"
-msgstr "Ordner Präfix"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Ordnerübersicht"
 
-#: acl.php:24
+#: acl.php:23
 msgid "Folder sharing is not enabled."
 msgstr "Die gemeinsame Nutzung von Ordnern ist nicht möglich."
 
-#: folders.php:52
+#: folders.php:47
 msgid "Folder use is not enabled."
 msgstr "Die Benutzung von Ordnern ist nicht aktiviert."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:958
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Datumsformat für Nachrichten von heute in der Ordneransicht"
 
-#: compose.php:727 templates/message/navbar_actions.inc:15
+#: compose.php:820 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: compose.php:712
+#: compose.php:805
 msgid "Forward:"
 msgstr "Weiterleiten:"
 
-#: lib/Compose.php:299
+#: lib/Compose.php:380
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: lib/Compose.php:297
+#: lib/Compose.php:378
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Weitergeleitete Nachricht von %s"
 
-#: lib/MIME/Viewer/itip.php:483
-msgid "Free/Busy Information"
-msgstr "Frei/Gebucht-Informationen"
-
-#: lib/MIME/Viewer/itip.php:494
-msgid "Free/Busy Reply"
-msgstr "Frei/Gebucht-Antwort"
-
-#: lib/MIME/Viewer/itip.php:488
-msgid "Free/Busy Request"
-msgstr "Frei/Gebucht-Anfrage"
-
-#: lib/MIME/Viewer/itip.php:401
+#: lib/MIME/Viewer/itip.php:402
 msgid "Free/Busy Request Response"
 msgstr "Antwort auf Frei/Gebucht-Anfrage"
 
@@ -1632,24 +1745,24 @@
 msgid "Fro_m"
 msgstr "_Von"
 
-#: message.php:247 search.php:135 thread.php:93
-#: templates/compose/compose.inc:98
+#: message.php:270 thread.php:154 templates/compose/compose.inc:97
+#: lib/Search.php:589
 msgid "From"
 msgstr "Von"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:907
 msgid "From Address"
 msgstr "Von Adresse"
 
-#: compose.php:724 compose.php:728
+#: compose.php:817 compose.php:821
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1229
+#: compose.php:1311
 msgid "Fwd: "
 msgstr "WG: "
 
-#: compose.php:1231
+#: compose.php:1313
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "WG: %u weitergeleitete Nachrichten"
@@ -1663,34 +1776,40 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "Nur neue Nachrichten abrufen? (nur IMAP)"
 
-#: thread.php:85
+#: templates/folders/actions.inc:32 lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:728
+msgid "Go"
+msgstr "Los"
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Zu dieser Nachricht"
 
-#: lib/IMP.php:553
+#: lib/IMP.php:502
 #, php-format
 msgid "Go to address book entry of \"%s\""
-msgstr "Den Adressbucheintrag von \"%s\" anzeigen"
+msgstr "Zum Adressbucheintrag von \"%s\""
 
-#: templates/acl/acl.inc:135
+#: templates/acl/acl.inc:136
 msgid "Grant access"
 msgstr "Zugriff erlauben"
 
-#: message.php:530 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
-#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: message.php:549 lib/Filter.php:131 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:111 lib/MIME/Viewer/images.php:113
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/html.php:119
 #: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
-#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:407
-#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:424
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:172
 #: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "HIER"
 
-#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:80
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:120
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:229
+#: compose.php:260
 msgid "HTML Version of Message"
 msgstr "HTML-Version der Nachricht"
 
@@ -1702,43 +1821,39 @@
 msgid "Here is the message you were composing:"
 msgstr "Hier finden Sie den Text der Nachricht, die Sie erstellt haben:"
 
-#: config/prefs.php.dist:662
+#: config/prefs.php.dist:656
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:655
 msgid "Hidden in Thread View"
 msgstr "Versteckt in der Themenansicht"
 
-#: mailbox.php:363
+#: mailbox.php:352
 msgid "Hide Deleted"
 msgstr "Verstecke gelöschte"
 
-#: folders.php:287
+#: folders.php:284
 msgid "Hide Unsubscribed"
 msgstr "_Ausgeblendete Ordner verstecken"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Bilder blockieren"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:292
 msgid "High"
 msgstr "Hoch"
 
-#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+#: message.php:304 mailbox.php:718 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Hohe Priorität"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:291
 msgid "Highest"
 msgstr "Höchste"
 
-#: config/prefs.php.dist:682
+#: config/prefs.php.dist:685
 msgid "How do you want to display attachments?"
 msgstr "Wie sollen Anhänge angezeigt werden?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Wie sollen Zitatantworten markiert werden?"
 
@@ -1750,7 +1865,12 @@
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Automatische Protokollerkennung)"
 
-#: templates/login/login.inc:163 lib/Fetchmail/imap.php:146
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr "Der IMAP-Server hat die Verbindung unterbrochen. Serverantwort: %s"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP über SSL"
 
@@ -1758,11 +1878,15 @@
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP über SSL (self-signed Zertifikat)"
 
-#: templates/login/login.inc:164
+#: templates/login/login.inc:166
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP über SSL (self-signed)"
 
-#: templates/login/login.inc:162 lib/Fetchmail/imap.php:140
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr "Der IMAP-Server hat die Verbindung unterbrochen."
+
+#: templates/login/login.inc:164 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP ohne TLS"
 
@@ -1770,9 +1894,11 @@
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 Emailserver"
 
-#: lib/IMP.php:886
-msgid "INBOX"
-msgstr "Posteingang"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+"Um SSL oder TLS benutzen zu können, muss die OpenSSL-Erweiterung für PHP "
+"geladen sein."
 
 #: templates/folders/folders_confirm.html:12
 msgid "If you continue, all messages in the folder(s) will be lost!"
@@ -1780,37 +1906,41 @@
 "Wenn Sie fortfahren, werden alle Nachrichten in dem Ordner/den Ordnern "
 "endgültig gelöscht!"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Alle Ignorieren"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr "Bild"
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Importieren"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Schlüssel importieren"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Schlüsselpaar importieren"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Nachrichten importieren"
 
-#: pgp.php:42
+#: pgp.php:41
 msgid "Import PGP Key"
 msgstr "PGP-Schlüssel importieren"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Persönliche Zertifikate importieren"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr "Persönliches Zertifikat importieren"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
@@ -1824,7 +1954,7 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr "Persönliches S/MIME-Zertifikat importieren"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Öffentlichen Schlüssel importieren"
 
@@ -1849,7 +1979,7 @@
 msgid "Import mbox file %s into folder %s."
 msgstr "Mbox-Datei %s in den Ordner %s importieren."
 
-#: message.php:486 mailbox.php:713 templates/message/navbar_navigate.inc:7
+#: message.php:505 mailbox.php:728 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1859,25 +1989,25 @@
 msgid "Important messages"
 msgstr "Wichtige Nachrichten"
 
-#: folders.php:157
+#: folders.php:151
 #, php-format
 msgid "Imported %d messages from %s."
 msgstr "%d Nachrichten aus %s importiert."
 
-#: lib/MIME/Viewer/itip.php:773
+#: lib/MIME/Viewer/itip.php:766
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
-#: lib/IMAP/Tree.php:204
+#: folders.php:365 templates/prefs/initialpageselect.inc:14 lib/Folder.php:85
+#: lib/IMP.php:832 lib/IMAP/Tree.php:119 lib/IMAP/Tree.php:222
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Nachrichtenkopf in die Antwort einfügen?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Originalnachricht in die Antwort einfügen?"
 
@@ -1885,21 +2015,21 @@
 msgid "Info"
 msgstr "Information"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
 msgstr "Informationen über %s öffentlichen Schlüssel"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Informationen über den persönlichen privaten Schlüssel"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Informationen über den persönlichen öffentlichen Schlüssel"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:499
+#: templates/compose/attachments.js:56
 msgid "Inline"
 msgstr "Im Text"
 
@@ -1919,11 +2049,11 @@
 msgid "Insert Public PGP Key Here"
 msgstr "Öffentlichen PGP-Schlüssel hier einfügen"
 
-#: lib/MIME/Viewer/itip.php:412
+#: lib/MIME/Viewer/itip.php:413
 msgid "Invalid Action selected for this component."
 msgstr "Ungültige Aktion für diese Komponente ausgewählt."
 
-#: mailbox.php:563 mailbox.php:605
+#: mailbox.php:574 mailbox.php:621
 msgid "Invalid Address"
 msgstr "Ungültige Adresse"
 
@@ -1931,20 +2061,20 @@
 msgid "Invalid Remote Mailbox"
 msgstr "Ungültiges Postfach"
 
-#: compose.php:131
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Ungültiges Zeichen in der Emailadresse: %s."
 
-#: smime.php:82 pgp.php:16
+#: smime.php:78 pgp.php:16
 msgid "Invalid key"
 msgstr "Ungültiger Schlüssel"
 
-#: pgp.php:196
+#: pgp.php:192
 msgid "Invalid personal PGP private key."
 msgstr "Ungültiger persönlicher privater PGP-Schlüssel."
 
-#: pgp.php:171
+#: pgp.php:167
 msgid "Invalid personal PGP public key."
 msgstr "Ungültiger persönlicher öffentlicher PGP-Schlüssel."
 
@@ -1952,15 +2082,15 @@
 msgid "Invert"
 msgstr "Umkehren"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:591
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Schlüssellänge"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid ""
 "Key generation may take a long time to complete.  Continue with key "
 "generation?"
@@ -1968,37 +2098,51 @@
 "Die Erzeugung von Schlüsseln kann sehr lange dauern. Schlüsselerzeugung "
 "fortsetzen?"
 
-#: pgp.php:318
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Sie können keine Schlüssel importieren, weil das Hochladen von Dateien auf "
+"diesen Server nicht möglich ist."
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Sie können keine Schlüssel importieren, weil Sie kein Adressbuch angegeben "
+"haben, das zum Hinzufügen neuer Kontakte verwendet werden soll."
+
+#: pgp.php:314
 msgid "Key successfully sent to the public keyserver."
 msgstr ""
 "Der Schlüssel wurde erfolgreich zum öffentlichen Schlüsselserver geschickt."
 
-#: templates/login/login.inc:199
+#: templates/login/login.inc:215
 msgid "Language"
 msgstr "Sprache"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:895
 msgid "Last Mailbox Page"
 msgstr "Letzte Ordnerseite"
 
-#: mailbox.php:354
+#: mailbox.php:343
 msgid "Last Page"
 msgstr "Letzte Seite"
 
-#: templates/compose/compose.inc:380
-msgid "Li_nk Attachments"
-msgstr "Anhänge _verlinken"
+#: templates/compose/compose.inc:547
+msgid "Link Attachments?"
+msgstr "Anhänge verlinken?"
 
-#: attachment.php:34 lib/Compose.php:974
+#: attachment.php:34 lib/Compose.php:1084
 msgid "Linked attachments are forbidden."
 msgstr "Verlinkte Anhänge sind deaktiviert."
 
-#: lib/Compose.php:991
+#: lib/Compose.php:1100
 #, php-format
 msgid "Links will expire on %s"
 msgstr "Die Links sind bis zum %s gültig"
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1071
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -2006,7 +2150,7 @@
 "Alle Kontakte beim Öffnen der Kontaktliste anzeigen? (Falls deaktiviert, "
 "werden nur die Kontakte angezeigt, nach denen Sie ausdrücklich suchen)"
 
-#: config/prefs.php.dist:679
+#: config/prefs.php.dist:682
 msgid "Listing in the Header"
 msgstr "Als Liste im Nachrichtenkopf"
 
@@ -2014,20 +2158,20 @@
 msgid "Local Mailbox:"
 msgstr "Lokaler Ordner:"
 
-#: lib/MIME/Viewer/itip.php:674
+#: lib/MIME/Viewer/itip.php:671
 msgid "Location"
 msgstr "Ort"
 
-#: templates/login/login.inc:207
+#: templates/login/login.inc:224
 msgid "Log in"
 msgstr "Anmelden"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:119
 #, php-format
 msgid "Log in to %s"
 msgstr "Anmelden bei %s"
 
-#: templates/login/login.inc:136
+#: templates/login/login.inc:138
 msgid "Login"
 msgstr "Anmelden"
 
@@ -2035,15 +2179,15 @@
 msgid "Login Tasks"
 msgstr "Anmeldeaufgaben"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:294
 msgid "Low"
 msgstr "Niedrig"
 
-#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+#: message.php:306 mailbox.php:721 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Niedrige Priorität"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:295
 msgid "Lowest"
 msgstr "Niedrigste"
 
@@ -2051,11 +2195,11 @@
 msgid "Macintosh File"
 msgstr "Macintosh-Datei"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Webmail"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Nachrichtenvorschau"
 
@@ -2063,19 +2207,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Zu verwendender Emailservertyp:"
 
-#: folders.php:397
+#: folders.php:369 folders.php:383
 msgid "Mailbox"
 msgstr "Ordner"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Anzeigeeinstellungen für die Ordneransicht und -übersicht"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Alle Nachrichten im Ordner als ungelesen markieren"
 
@@ -2083,7 +2227,7 @@
 msgid "Mark as:"
 msgstr "Markieren als:"
 
-#: config/prefs.php.dist:644
+#: config/prefs.php.dist:638
 msgid "Mark different levels of quoting with different colors?"
 msgstr ""
 "Unterschiedliche Zitateinrückungen in unterschiedlichen Farben anzeigen?"
@@ -2092,84 +2236,64 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "Nachrichten als gelesen markieren? (nur IMAP)"
 
-#: config/prefs.php.dist:652
+#: config/prefs.php.dist:646
 msgid "Mark simple markup?"
 msgstr "Einfache Auszeichnung hervorheben?"
 
-#: templates/search/header.inc:46
+#: templates/search/header.inc:49
 msgid "Match All Queries"
 msgstr "allen Kriterien"
 
-#: templates/search/header.inc:42
+#: templates/search/header.inc:45
 msgid "Match Any Query"
 msgstr "einem Kriterium"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "Maximum Attachment Size"
 msgstr "Maximale Anhanggröße"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr "Maximale Anzahl an Ordnern"
+
+#: templates/compose/compose.inc:487
 msgid "Maximum number of attachments reached."
 msgstr "Maximale Anzahl der Anhänge erreicht."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:483
 msgid "Maximum total attachment size reached."
 msgstr "Maximale Gesamtgröße der Anhänge erreicht."
 
-#: lib/MIME/Viewer/itip.php:626
-msgid "Meeting Cancellation"
-msgstr "Besprechungsabsage"
-
-#: lib/MIME/Viewer/itip.php:575
-msgid "Meeting Information"
-msgstr "Besprechungs-Informationen"
-
-#: lib/MIME/Viewer/itip.php:585
-msgid "Meeting Proposal"
-msgstr "Besprechungsvorschlag"
-
-#: lib/MIME/Viewer/itip.php:617
-msgid "Meeting Reply"
-msgstr "Besprechungsantwort"
-
-#: lib/MIME/Viewer/itip.php:598
-msgid "Meeting Update"
-msgstr "Besprechungsaktualisierung"
-
-#: lib/MIME/Viewer/itip.php:603
-msgid "Meeting Update Request"
-msgstr "Anfrage für Besprechungsaktualisierung"
-
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
 msgstr "Menü-Ordnerliste"
 
-#: lib/Compose.php:246
+#: lib/Compose.php:342
 msgid "Message"
 msgstr "Nachricht"
 
-#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
+#: compose.php:598 compose.php:625 compose.php:679 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Neue Nachricht"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:906
 msgid "Message Date"
 msgstr "Nachrichten Datum"
 
 #: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Nachrichten-Einstellungen"
 
-#: search.php:359
+#: search.php:302
 msgid "Message Search"
 msgstr "Nachrichten Suche"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:910
 msgid "Message Size"
 msgstr "Nachrichten Größe"
 
-#: message.php:368
+#: message.php:391
 msgid "Message Source"
 msgstr "_Quelltext"
 
@@ -2177,10 +2301,6 @@
 msgid "Message Viewing"
 msgstr "Nachrichtenansicht"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Nachrichtenfelder"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Nachrichtenstatus"
@@ -2189,45 +2309,45 @@
 msgid "Message folders"
 msgstr "Nachrichtenordner"
 
-#: lib/Compose.php:244
+#: lib/Compose.php:340
 #, php-format
 msgid "Message from %s"
 msgstr "Nachricht von %s"
 
-#: mailbox.php:646
+#: mailbox.php:662
 msgid "Message has attachments"
-msgstr "Nachricht hat Anhänge"
+msgstr "Nachricht mit Anhängen"
 
-#: mailbox.php:637
+#: mailbox.php:653
 msgid "Message is encrypted"
-msgstr "Nachricht ist verschlüsselt"
+msgstr "Verschlüsselte Nachricht"
 
-#: mailbox.php:632
+#: mailbox.php:648
 msgid "Message is signed"
-msgstr "Nachricht ist unterschrieben"
+msgstr "Unterschriebene Nachricht"
 
-#: templates/search/header.inc:33
+#: templates/search/header.inc:36
 msgid "Message matches"
 msgstr "Nachricht entspricht"
 
-#: compose.php:771 compose.php:785
+#: compose.php:864 compose.php:871
 msgid "Message redirected successfully."
 msgstr "Nachricht wurde erfolgreich umgeleitet."
 
-#: compose.php:1018
+#: compose.php:1122
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Nachricht wurde erfolgreich versendet, aber nicht in %s gespeichert"
 
-#: compose.php:1077 compose.php:1092
+#: compose.php:1181 compose.php:1189
 msgid "Message sent successfully."
 msgstr "Nachricht wurde erfolgreich versendet."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:930
 msgid "Messages per page in the mailbox view."
 msgstr "Nachrichten pro Seite"
 
-#: mailbox.php:318
+#: mailbox.php:310
 msgid "Messages to"
 msgstr "Nachrichten nach"
 
@@ -2235,7 +2355,7 @@
 msgid "Modify"
 msgstr "Ändere"
 
-#: templates/compose/expand.inc:12
+#: templates/compose/expand.inc:11
 #, php-format
 msgid "More than one address found for field \"%s\"."
 msgstr "Es wurde mehr als eine Adresse für das \"%s\"-Feld gefunden."
@@ -2248,6 +2368,12 @@
 msgid "Move down"
 msgstr "Nach unten"
 
+#: config/prefs.php.dist:606
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+"Spam-Nachrichten in den Spam-Ordner und Nicht-Spam-Nachrichten in den "
+"Posteingang verschieben"
+
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Verschieben nach"
@@ -2260,49 +2386,66 @@
 msgid "Multipart/alternative"
 msgstr "Multipart/alternative"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:157
+msgid "Multiple Message View"
+msgstr "Ansicht für mehrere Nachrichten"
+
+#: templates/prefs/defaultsearchselect.inc:8
+msgid "NONE"
+msgstr "KEIN"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "HINWEIS"
 
-#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:683
 msgid "Name"
 msgstr "Name"
 
-#: pgp.php:110
-msgid "Name and/or email can not be empty"
+#: pgp.php:106
+msgid "Name and/or email cannot be empty"
 msgstr "Der Name und/oder die Emailadresse dürfen nicht leer sein"
 
-#: lib/MIME/Viewer/itip.php:778
+#: lib/MIME/Viewer/itip.php:771
 msgid "Needs Action"
 msgstr "Aktion benötigt"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:575
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:767
 msgid "Never"
 msgstr "Nie"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Anhänge nie speichern"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Neu"
 
-#: lib/IMP.php:615
+#: lib/IMP.php:595
 msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nachrichteneingang"
 
+#: lib/Block/summary.php:21 lib/Block/summary.php:22
+#: lib/Block/tree_folders.php:46
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: mailbox.php:770 lib/MIME/Headers.php:184
+#, php-format
+msgid "New Message to %s"
+msgstr "Neue Nachricht an %s"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Neue Nachrichten"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Weiter"
 
@@ -2310,15 +2453,16 @@
 msgid "Next Message"
 msgstr "Nächste Nachricht"
 
-#: mailbox.php:352
+#: mailbox.php:341
 msgid "Next Page"
 msgstr "Seite vor"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:538 templates/compose/compose.inc:551
+#: config/prefs.php.dist:966
 msgid "No"
 msgstr "Nein"
 
-#: smime.php:226
+#: smime.php:222
 msgid "No Certificate found"
 msgstr "Kein Zertifikat gefunden"
 
@@ -2326,36 +2470,36 @@
 msgid "No Encryption"
 msgstr "Keine Verschlüsselung"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Keine Schlüssel im Schlüsselbund"
 
-#: mailbox.php:371
+#: mailbox.php:360
 #, php-format
 msgid "No Messages"
 msgstr "Keine Nachrichten"
 
-#: pgp.php:137
+#: pgp.php:133
 msgid "No PGP public key imported."
 msgstr "Es wurde kein öffentlicher PGP-Schlüssel importiert."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr "Kein persönliches Zertifikat vorhanden"
 
-#: lib/Mailbox.php:323
+#: lib/Mailbox.php:333
 msgid "No Preview Text"
 msgstr "Kein Vorschautext"
 
-#: templates/smime/smime.inc:54
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
 msgstr "Keine öffentlichen Schlüssel gefunden"
 
-#: smime.php:151
+#: smime.php:147
 msgid "No S/MIME public key imported."
 msgstr "Es wurde kein öffentlicher S/MIME-Schlüssel importiert."
 
-#: lib/MIME/Viewer/tnef.php:90
+#: lib/MIME/Viewer/tnef.php:92
 msgid "No attachments found."
 msgstr "Keine Anhänge gefunden."
 
@@ -2363,73 +2507,90 @@
 msgid "No email information located in the public key."
 msgstr "Keine Emailadresse im öffentlichen Schlüssel gefunden."
 
-#: acl.php:72 acl.php:98
+#: acl.php:71 acl.php:97
 msgid "No folder selected."
 msgstr "Kein Ordner ausgewählt."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:149
 msgid "No folders are being checked for new mail."
 msgstr "Es werden keine Ordner auf neue Nachrichten überprüft."
 
-#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
+#: folders.php:201 lib/Folder.php:467 lib/Folder.php:517
 msgid "No folders were specified"
 msgstr "Kein Ordner angegeben"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:155
 msgid "No folders with new messages"
 msgstr "Keine Ordner mit neuen Nachrichten"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:152
 msgid "No folders with unseen messages"
 msgstr "Keine Ordner mit ungelesenen Nachrichten"
 
-#: lib/Compose.php:240
+#: lib/Compose.php:336
 msgid "No message body text"
 msgstr "Kein Nachrichtentext"
 
-#: lib/Mailbox.php:365
+#: lib/IMAP/Client.php:568
+msgid "No message returned."
+msgstr "Keine Nachricht gefunden."
+
+#: lib/Mailbox.php:375
 msgid "No messages matched your search."
 msgstr "Es wurden keine passenden Nachrichten gefunden."
 
-#: pgp.php:189
+#: pgp.php:185
 msgid "No personal PGP private key imported."
 msgstr "Es wurde kein persönlicher privater PGP-Schlüssel importiert."
 
-#: pgp.php:165
+#: pgp.php:161
 msgid "No personal PGP public key imported."
 msgstr "Es wurde kein persönlicher öffentlicher PGP-Schlüssel importiert."
 
-#: smime.php:201
+#: smime.php:197
 msgid "No personal S/MIME certificates imported."
 msgstr "Es wurden keine privaten S/MIME-Zertifikate importiert."
 
+#: lib/MIME/Viewer/pkcs7.php:246 lib/MIME/Viewer/pgp.php:299
+msgid ""
+"No personal private key exists so the message is unable to be decrypted."
+msgstr ""
+"Sie haben zur Zeit keinen privaten Schlüssel, so dass die Nachricht nicht "
+"entschlüsselt werden kann."
+
 #: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "Es wurde kein Rechtschreibprogramm konfiguriert."
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Keine Schreibfehler"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Keine Vorschläge"
 
-#: acl.php:68 acl.php:94
+#: lib/IMAP/Client.php:560
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+"Es wurde keine unterstützte Authentifizierungsmethode für IMAP gefunden."
+
+#: acl.php:67 acl.php:93
 msgid "No user specified."
 msgstr "Kein Benutzer angegeben."
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:704
 msgid "Non Participant"
 msgstr "Kein Teilnehmer"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
-#: lib/MIME/Viewer/itip.php:664
+#: templates/mailbox/navbar.inc:11 templates/prefs/folderselect.inc:24
+#: templates/prefs/sentmailselect.inc:40 templates/prefs/sourceselect.inc:35
+#: templates/prefs/spamselect.inc:24 templates/prefs/trashselect.inc:24
+#: lib/MIME/Viewer/itip.php:661
 msgid "None"
 msgstr "Keine"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:293
 msgid "Normal"
 msgstr "Normal"
 
@@ -2467,24 +2628,31 @@
 msgid "Note that this can take some time"
 msgstr "Beachten Sie, dass dieser Vorgang einige Zeit dauern kann"
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:604
+msgid "Nothing"
+msgstr "Nichts"
+
+#: attachment.php:89
+msgid "Notification: Linked attachment downloaded"
+msgstr "Hinweis: Verlinkter Anhang heruntergeladen"
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Anzahl der Monate, für die alte verlinkte Anhänge aufgehoben werden sollen, "
 "falls diese monatlich gelöscht werden."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Anzahl der Ordner für gesendete Nachrichten, die bei monatlicher Löschung "
 "behalten werden sollen."
 
-#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
-#: lib/MIME/Viewer/itip.php:733
+#: templates/contacts/contacts.inc:254
 msgid "OK"
 msgstr "OK"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "ODER"
@@ -2497,43 +2665,43 @@
 msgid "Old sent-mail folders being purged."
 msgstr "Ordner für gesendete Nachrichten, die gelöscht werden."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:28
 msgid "Only display folders with unread messages in them?"
 msgstr "Nur Ordner, die ungelesene Nachrichten enthalten, anzeigen?"
 
-#: templates/folders/javascript.inc:71
+#: templates/javascript/folders.js:81
 msgid "Only one folder should be selected for this action."
 msgstr "Für diese Aktion darf nur ein Ordner ausgewählt sein."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+msgid "Open Fo_lder"
 msgstr "Or_dner anzeigen"
 
-#: templates/menu.inc:23
-msgid "Open Folder"
-msgstr "Ordner anzeigen"
-
-#: folders.php:414
+#: folders.php:408
 msgid "Opened Folder"
 msgstr "Geöffneter Ordner"
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:700
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:43 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Andere Emailkonten"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Sonstige Einstellungen"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
-#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+#: templates/login/login.inc:200
+msgid "Outbound Server"
+msgstr "Postausgangs-Server"
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:164
+#: lib/MIME/Viewer/pgp.php:203 lib/MIME/Viewer/pgp.php:289
 msgid "PGP"
 msgstr "PGP"
 
@@ -2541,21 +2709,17 @@
 msgid "PGP Encrypt Message"
 msgstr "Verschlüsseln (PGP)"
 
-#: compose.php:331
+#: compose.php:335
 msgid "PGP Error: "
 msgstr "PGP-Fehler: "
 
-#: compose.php:310
+#: compose.php:314
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr ""
 "PGP Fehler: Für den persönlichen privaten Schlüssel wird ein Passwort "
 "benötigt."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP ist NICHT aktiviert"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP-Einstellungen"
 
@@ -2563,28 +2727,28 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP Passworteingabe"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 "Für den Zugriff auf das persönliche Schlüsselpaar wird eine sichere "
 "Serververbindung benötigt."
 
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 msgid "PGP Public Key Text"
 msgstr "Text des öffentlichen PGP-Schlüssels"
 
-#: pgp.php:149
+#: pgp.php:145
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr ""
 "Der öffentliche PGP-Schlüssel für \"%s (%s)\" wurde erfolgreich gespeichert."
 
-#: pgp.php:245
+#: pgp.php:241
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Der öffentliche PGP-Schlüssel für \"%s\" wurde erfolgreich gelöscht."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Öffentlicher PGP-Schlüsselbund"
 
@@ -2596,19 +2760,19 @@
 msgid "PGP Sign/Encrypt Message"
 msgstr "Unterzeichnen und verschlüsseln (PGP)"
 
-#: pgp.php:202
+#: pgp.php:198
 msgid "PGP private key successfully added."
 msgstr "Der private PGP-Schlüssel wurde erfolgreich gespeichert."
 
-#: pgp.php:177
+#: pgp.php:173
 msgid "PGP public key successfully added."
 msgstr "Der öffentliche PGP-Schlüssel wurde erfolgreich gespeichert."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Die PGP-Unterstützung wurde auf diesem System deaktiviert."
 
-#: lib/MIME/Viewer/pgp.php:208
+#: lib/MIME/Viewer/pgp.php:207
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2616,18 +2780,18 @@
 "Die PGP-Unterstützung ist zur Zeit deaktiviert, so dass die digitale "
 "Unterschrift nicht überprüft werden kann."
 
-#: lib/MIME/Viewer/pgp.php:295
+#: lib/MIME/Viewer/pgp.php:294
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "Die PGP-Unterstützung ist zur Zeit deaktiviert, so dass die Nachricht nicht "
 "entschlüsselt werden kann."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 "Die PGP-Unterstüzung benötigt Popup-Fenster, um zu funktionieren. Wenn Ihr "
 "Browser zur Zeit so eingestellt ist, dass Popop-Fenster unterdrückt werden, "
@@ -2650,7 +2814,7 @@
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 über SSL (self-signed Zertifikat)"
 
-#: templates/login/login.inc:166
+#: templates/login/login.inc:168
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 über SSL (self-signed)"
 
@@ -2658,16 +2822,16 @@
 msgid "POP3, no TLS"
 msgstr "POP3 ohne TLS"
 
-#: templates/mailbox/header.inc:19
+#: templates/mailbox/header.inc:22
 #, php-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:892
 msgid "Page with the First Unseen Message"
 msgstr "Seite mit der ersten ungelesenen Nachricht"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:893
 msgid "Page with the Last Unseen Message"
 msgstr "Seite mit der letzten ungelesenen Nachricht"
 
@@ -2675,32 +2839,32 @@
 msgid "Part(s)"
 msgstr "Teil(e)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Passwort"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Passwort (Wiederholen)"
 
-#: smime.php:235 pgp.php:310
+#: smime.php:231 pgp.php:306
 msgid "Passphrase successfully unloaded."
 msgstr "Das Passwort wurde für diese Sitzung gelöscht."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Passwort:"
 
-#: pgp.php:112
-msgid "Passphrases can not be empty"
+#: pgp.php:108
+msgid "Passphrases cannot be empty"
 msgstr "Passwörter dürfen nicht leer sein"
 
-#: pgp.php:114
+#: pgp.php:110
 msgid "Passphrases do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:193
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:191
 msgid "Password"
 msgstr "Passwort"
 
@@ -2708,11 +2872,11 @@
 msgid "Perform maintenance operations on login?"
 msgstr "Wartungsarbeiten nach der Anmeldung durchführen?"
 
-#: acl.php:76 acl.php:102
-msgid "Permissions for this user can not be changed."
+#: acl.php:75 acl.php:101
+msgid "Permissions for this user cannot be changed."
 msgstr "Die Rechte für diesen Benutzer können nicht geändert werden."
 
-#: message.php:477 mailbox.php:682 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:697 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Persönlich"
@@ -2721,39 +2885,50 @@
 msgid "Personal Information"
 msgstr "Persönliche Angaben"
 
-#: pgp.php:120
+#: pgp.php:116
 msgid "Personal PGP keypair generated successfully."
 msgstr "Das persönliche PGP-Schlüsselpaar wurde erfolgreich erzeugt."
 
-#: pgp.php:127
+#: pgp.php:123
 msgid "Personal PGP keys deleted successfully."
 msgstr "Die persönlichen PGP-Schlüssel wurden erfolgreich gelöscht."
 
-#: smime.php:207
+#: smime.php:203
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr "Es wurden KEINE persönlichen S/MIME-Zertifikate importiert: "
 
-#: smime.php:132
+#: smime.php:128
 msgid "Personal S/MIME keys deleted successfully."
 msgstr "Die persönlichen S/MIME-Schlüssel wurden erfolgreich gelöscht."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Signatur vor Antworten und weitergeleiteten Nachrichten einfüge?"
 
-#: compose.php:227
+#: compose.php:258
 msgid "Plaintext Version of Message"
 msgstr "Textversion der Nachricht"
 
+#: config/prefs.php.dist:788
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+"Audiosignal bei neuen Nachrichten abspielen? Dazu benötigen Sie einen "
+"Browser, der eingebettete Audiodateien unterstützt. Fast alle Windows- und "
+"Mac-Browser können dies, auf anderen Plattformen werden unter Umständen "
+"Plugins benötigt."
+
 #: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "Bitte geben Sie einen Namen für den neuen Ordner an:"
 
-#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:104 templates/javascript/folders.js:106
 msgid "Please enter the name of the new folder:"
 msgstr "Bitte geben Sie den Namen für den neuen Ordner an:"
 
-#: templates/folders/javascript.inc:129
+#: templates/javascript/folders.js:139
 msgid "Please enter the new name:"
 msgstr "Bitte den neuen Namen eingeben:"
 
@@ -2775,7 +2950,7 @@
 "Bitte geben Sie das Passwort für Ihren privaten S/MIME-Schlüssel an. Sie "
 "müssen dieses Passwort nur einmal pro %s-Sitzung angeben."
 
-#: recompose.php:97
+#: recompose.php:96
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2786,45 +2961,33 @@
 "fortzusetzen. Wenn Sie KEINE Cookies zulassen UND die Nachricht in einem "
 "eigenen Fenster erstellen, müssen Sie sich auch im Hauptfenster wieder "
 "anmelden. Dies ist nötig, um potentielle Angreifer davon abzuhalten Ihre "
-"Sitzung zu übernehmen. Bitte entschuldigen Sie diese Unanehmlichkeiten."
+"Sitzung zu übernehmen. Bitte entschuldigen Sie diese Unannehmlichkeiten."
 
-#: templates/login/login.inc:72
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Bitte geben Sie Ihr Passwort an."
 
-#: templates/login/login.inc:68
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Bitte geben Sie Ihren Benutzernamen an."
 
-#: compose.php:79 lib/IMP.php:509
+#: compose.php:106 lib/IMP.php:463
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Bitte mehrdeutige oder ungültige Adressen korrigieren."
 
-#: lib/MIME/Viewer/itip.php:642
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr ""
-"Bitte überprüfen Sie die folgenden Informationen und wählen Sie anschließend "
-"ein Aktion aus dem unteren Menü."
-
-#: templates/folders/javascript.inc:53
-msgid "Please select a folder before you perform any actions."
-msgstr "Bitte einen Ordner auswählen, bevor Sie eine Aktion durchführen."
-
-#: lib/MIME/Viewer/itip.php:502
-msgid "Please select an action from the menu below."
-msgstr "Bitte wählen Sie eine Aktion aus dem Menü aus."
+#: templates/javascript/folders.js:63
+msgid "Please select a folder before you perform this action."
+msgstr "Bitte einen Ordner auswählen, bevor Sie diese Aktion durchführen."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Bitte mindestens einen Ordner für die Suche angeben."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Bitte nur einen Ordner für diese Aktion auswählen."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Bitte wählen Sie aus oder editieren Sie rechts:"
 
@@ -2832,11 +2995,11 @@
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Striche ('-- ') vor der Signatur einfügen?"
 
-#: smime.php:241 pgp.php:257 filterprefs.php:40
+#: smime.php:237 pgp.php:253 filterprefs.php:39
 msgid "Preferences successfully updated."
 msgstr "Die Einstellungen wurden erfolgreich gespeichert."
 
@@ -2848,11 +3011,11 @@
 msgid "Previous Message"
 msgstr "Vorherige Nachricht"
 
-#: mailbox.php:343
+#: mailbox.php:332
 msgid "Previous Page"
 msgstr "Seite zurück"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Drucken"
 
@@ -2860,15 +3023,15 @@
 msgid "Priority"
 msgstr "Priorität"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Passwort für privaten Schlüssel"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Jedesmal nachfragen; standardmäßig NEIN"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Jedesmal nachfragen; standardmäßig JA"
 
@@ -2876,41 +3039,41 @@
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: lib/Crypt/PGP.php:429
+#: lib/Crypt/PGP.php:430
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 "Die Unterstützung für öffentliche PGP-Schlüsselserver ist deaktiviert worden."
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Pur_ge Deleted"
 msgstr "Endgültig löschen"
 
-#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:7
 msgid "Purge Deleted"
 msgstr "Endgültig löschen"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Ordner aufräumen"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Wie oft soll der Papierkorb geleert werden:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Nachrichten im Papierkorb nach so vielen Tagen endgültig löschen."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Alte Nachrichten im Papierkorb endgültig löschen?"
 
-#: lib/Maintenance/Task/purge_trash.php:66
+#: lib/Maintenance/Task/purge_trash.php:65
 #, php-format
 msgid "Purging %d messages from Trash folder."
 msgstr "%d Nachrichten im Papierkorb gelöscht."
 
-#: lib/Maintenance/Task/purge_trash.php:64
+#: lib/Maintenance/Task/purge_trash.php:63
 msgid "Purging 1 message from Trash folder."
 msgstr "1 Nachricht im Papierkorb gelöscht."
 
@@ -2929,24 +3092,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Speicherplatz-Kontingent: Keine Begrenzung"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Zitat von %f:"
 
-#: templates/compose/compose.inc:377
-msgid "Re_quest Delivery Confirmation"
-msgstr "_Empfangsbestätigung anfordern"
+#: templates/folders/actions.inc:29
+msgid "Rebuild Folder Tree"
+msgstr "Ordnerbaum neu aufbauen"
 
-#: search.php:163
+#: lib/Search.php:617
 msgid "Received On"
 msgstr "Empfangen am"
 
-#: search.php:171
+#: lib/Search.php:625
 msgid "Received Since"
 msgstr "Empfangen seit"
 
-#: search.php:167
+#: lib/Search.php:621
 msgid "Received Until"
 msgstr "Empfangen bis"
 
@@ -2958,23 +3121,19 @@
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Nachricht umleiten"
 
-#: compose.php:734
+#: compose.php:827
 msgid "Redirect this message"
 msgstr "Diese Nachricht umleiten"
 
-#: compose.php:794
+#: compose.php:880
 msgid "Redirecting failed."
 msgstr "Umleitung fehlgeschlagen."
 
-#: templates/compose/compose.inc:573
-msgid "Refresh"
-msgstr "Aktualisiere"
-
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:773
 msgid "Refresh Folder Views:"
 msgstr "Ordnerübersicht aktualisieren:"
 
@@ -2986,11 +3145,11 @@
 msgid "Reload View"
 msgstr "Ansicht a_ktualisieren"
 
-#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:547
 msgid "Remember the free/busy information."
 msgstr "Frei/Gebucht-Informationen merken."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:968
 msgid "Remember the last view"
 msgstr "Die letzte Ansicht merken"
 
@@ -3006,15 +3165,15 @@
 msgid "Remove source"
 msgstr "Quelle entfernen"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Ordner umbenennen"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Ordner für gesendete Nachrichten am Monatsbeginn umbenennen?"
 
-#: lib/Folder.php:440
+#: lib/Folder.php:425
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr ""
@@ -3025,7 +3184,7 @@
 msgid "Repl_y to List"
 msgstr "L_iste Antworten"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "ersetzen durch:"
 
@@ -3033,7 +3192,7 @@
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#: lib/MIME/Viewer/itip.php:312 lib/MIME/Viewer/itip.php:410
 msgid "Reply Sent."
 msgstr "Antwort versendet."
 
@@ -3041,7 +3200,7 @@
 msgid "Reply to All"
 msgstr "Allen Antworten"
 
-#: compose.php:680
+#: compose.php:771
 msgid "Reply to All:"
 msgstr "Allen Antworten:"
 
@@ -3049,7 +3208,7 @@
 msgid "Reply to List"
 msgstr "Liste Antworten"
 
-#: compose.php:682
+#: compose.php:773
 msgid "Reply to List:"
 msgstr "Liste Antworten:"
 
@@ -3057,101 +3216,101 @@
 msgid "Reply to _All"
 msgstr "_Allen Antworten"
 
-#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:530 lib/MIME/Viewer/itip.php:539
+#: lib/MIME/Viewer/itip.php:549
 msgid "Reply with Not Supported Message"
 msgstr "Mit \"Nicht unterstützt\"-Nachricht antworten."
 
-#: lib/MIME/Viewer/itip.php:535
+#: lib/MIME/Viewer/itip.php:537
 msgid "Reply with free/busy for next 2 months."
 msgstr "Mit Frei/Gebucht-Informationen für die nächsten zwei Monate antworten."
 
-#: lib/MIME/Viewer/itip.php:534
+#: lib/MIME/Viewer/itip.php:536
 msgid "Reply with requested free/busy information."
 msgstr "Mit erfragten Frei/Gebucht-Informationen antworten."
 
-#: message.php:251
+#: message.php:274
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: lib/Compose.php:259 lib/Compose.php:311
+#: lib/Compose.php:420
 msgid "Reply-To: "
 msgstr "Antwort an: "
 
-#: compose.php:678
+#: compose.php:769
 msgid "Reply:"
 msgstr "Antworten:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Als kein Spam melden"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Als Spam _melden"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:384
 msgid "Request a _Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: config/prefs.php.dist:578
-msgid "Request delivery confirmation?"
-msgstr "Empfangsbestätigungen anfordern?"
-
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Lesebestätigungen anfordern?"
 
-#: mailbox.php:204
+#: mailbox.php:188
 msgid "Requested message not found."
 msgstr "Angegebene Nachricht nicht gefunden."
 
-#: lib/MIME/Viewer/itip.php:697
+#: lib/MIME/Viewer/itip.php:692
 msgid "Required Participant"
 msgstr "Erforderlicher Teilnehmer"
 
-#: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/search/main.inc:140 templates/search/header.inc:29
+#: templates/acl/acl.inc:162
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: lib/MIME/Viewer/itip.php:115
+#: lib/MIME/Viewer/itip.php:116
 msgid "Respondent Status Updated."
 msgstr "Status des Antwortenden aktualisiert."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "_Fortführen"
 
-#: recompose.php:98
+#: recompose.php:97
 msgid "Resume your session"
 msgstr "Wiederherstellung der Sitzung"
 
+#: templates/stationery/prefs.inc:44
+msgid "Return to \"Message Composition\""
+msgstr "Zurück zu \"Neue Nachricht\""
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
-#: templates/fetchmail/account_select.inc:32
+#: templates/fetchmail/account_select.inc:31
 msgid "Return to Fetch Mail"
 msgstr "Zurück zu 'Nachrichten sammeln'"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/smime/notactive.inc:33
-#: templates/pgp/pgp.inc:268 templates/pgp/notactive.inc:33
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:15
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:163 templates/acl/acl.inc:175
 msgid "Return to Options"
 msgstr "Zurück zu Einstellungen"
 
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:707
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Nach dem Löschen, Verschieben oder Kopieren von Nachrichten zum Ordner "
 "zurückkehren?"
 
-#: lib/MIME/Viewer/itip.php:688
+#: lib/MIME/Viewer/itip.php:683
 msgid "Role"
 msgstr "Rolle"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
-#: lib/MIME/Viewer/pkcs7.php:408
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:425
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3159,49 +3318,45 @@
 msgid "S/MIME Encrypt Message"
 msgstr "Verschlüsseln (S/MIME)"
 
-#: compose.php:367
+#: compose.php:371
 msgid "S/MIME Error: "
 msgstr "S/MIME-Fehler: "
 
-#: compose.php:346
+#: compose.php:350
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr ""
 "S/MIME Fehler: Für den persönlichen privaten Schlüssel wird ein Passwort "
 "benötigt."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME ist NICHT aktiviert"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME-Einstellungen"
 
-#: smime.php:49
+#: smime.php:46
 msgid "S/MIME Passphrase Input"
 msgstr "S/MIME Passworteingabe"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 "Für den Zugriff auf das persönliche Schlüsselpaar wird eine sichere "
 "Serververbindung benötigt."
 
-#: smime.php:140
+#: smime.php:136
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
 msgstr ""
 "Der öffentliche S/MIME-Schlüssel für \"%s\" wurde erfolgreich gelöscht."
 
-#: smime.php:162
+#: smime.php:158
 msgid "S/MIME Public Key successfully added."
 msgstr "Der öffentliche S/MIME-Schlüssel wurde erfolgreich gespeichert."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
 msgstr "Öffentlicher S/MIME-Schlüsselbund"
 
-#: smime.php:211
+#: smime.php:207
 msgid "S/MIME Public/Private Keypair successfully added."
 msgstr "Das öffentliche/private Schlüsselpaar wurde erfolgreich gespeichert."
 
@@ -3213,11 +3368,11 @@
 msgid "S/MIME Sign/Encrypt Message"
 msgstr "Unterzeichnen und verschlüsseln (S/MIME)"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr "Die S/MIME-Unterstützung wurde auf diesem System deaktiviert."
 
-#: lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
@@ -3225,15 +3380,15 @@
 "Die S/MIME-Unterstützung ist zur Zeit deaktiviert, so dass die Nachricht "
 "nicht entschlüsselt werden kann."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
-"S/MIME support is not enabled so the contents of this signed message can not "
+"S/MIME support is not enabled so the contents of this signed message cannot "
 "be displayed."
 msgstr ""
 "Die S/MIME-Unterstützung ist zur Zeit deaktiviert, so dass der Inhalt dieser "
 "unterschriebenen Nachricht nicht angezeigt werden kann."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
@@ -3241,90 +3396,110 @@
 "Die S/MIME-Unterstützung ist zur Zeit deaktiviert, so dass die digitale "
 "Unterschrift nicht überprüft werden kann."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 "Die S/MIME-Unterstüzung benötigt Popup-Fenster, um zu funktionieren. Wenn "
 "Ihr Browser zur Zeit so eingestellt ist, dass Popop-Fenster unterdrückt "
 "werden, müssen sie diese Einstellung ändern, oder die S/MIME-Funktionen "
 "werden nicht richtig funktionieren."
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:204
+msgid "SMTP"
+msgstr "SMTP"
+
+#: templates/compose/compose.inc:253
 msgid "S_ubject"
 msgstr "Betre_ff"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:361
 msgid "Sa_ve a copy in "
 msgstr "_Kopie speichern in "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "Speichern unter"
 
-#: search.php:363 templates/fetchmail/manage.inc:67
+#: search.php:304 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:534
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 "Anhänge zusammen mit Nachrichten im Ordner für gesendete Nachrichten "
 "speichern?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+msgid "Save Image"
+msgstr "Bild speichern"
+
+#: lib/MIME/Contents.php:228
+msgid "Save Image in Gallery"
+msgstr "Bild in Galerie speichern"
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:13 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Einstellungen speichern"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr "Vorlage speichern"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:428
 msgid "Save _Draft"
 msgstr "_Entwurf speichern"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Speichern unter"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Enwürfe als ungelesen speichern?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1061
 msgid "Save recipients automatically to the default address book?"
 msgstr "Empfänger automatisch im Standardadressbuch speichern?"
 
-#: templates/search/main.inc:127
+#: templates/search/main.inc:123
 msgid "Save search as a virtual folder?"
 msgstr "Suche als virtuellen Ordner speichern?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Gesendete Nachrichten speichern?"
 
-#: compose.php:1162
+#: compose.php:1263
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr ""
 "Der Entwurf konnte nicht gespeichert werden. Meldung des Email-Servers: %s"
 
 #: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
-#: lib/Block/tree_folders.php:50
+#: lib/Block/tree_folders.php:54
 msgid "Search"
 msgstr "Suche"
 
-#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#: templates/search/header.inc:21 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
 msgstr "Suchen in %s"
 
-#: search.php:316
+#: config/prefs.php.dist:120
+msgid "Search Options"
+msgstr "Sucheinstellungen"
+
+#: search.php:258
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
@@ -3348,7 +3523,11 @@
 msgid "Select a field"
 msgstr "Wählen Sie ein Feld aus"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:315
+msgid "Select a stationery:"
+msgstr "Vorlage auswählen:"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr ""
 "Wählen Sie die Adressbücher zum Suchen nach und Hinzufügen von neuen "
@@ -3370,6 +3549,10 @@
 msgid "Select none"
 msgstr "Keinen auswählen"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr "Wählen Sie die Galerie, in der das Bild gespeichert werden soll"
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "Wählen Sie den Servertyp aus"
@@ -3378,31 +3561,35 @@
 msgid "Selected Address books:"
 msgstr "Ausgewählte Adressbücher:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr "Schlüssel zum öffentlichen Schlüsselserver schicken"
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:597
 msgid "Send Latest Information"
 msgstr "Aktuelle Informationen versenden"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "Send Message"
 msgstr "Senden"
 
-#: config/prefs.php.dist:698
+#: templates/compose/compose.js:126
+msgid "Send message without a Subject?"
+msgstr "Die Nachricht ohne ein Betreff verschicken?"
+
+#: config/prefs.php.dist:692
 msgid "Send read receipt when requested by the sender?"
 msgstr "Lesebestätigung schicken, wenn vom Absender gewünscht?"
 
-#: folders.php:392
+#: folders.php:378
 msgid "Sent mail folder"
 msgstr "Ordner für gesendete Nachrichten"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Ordner für gesendete Nachrichten:"
 
-#: templates/login/login.inc:132 templates/login/login.inc:145
+#: templates/login/login.inc:133 templates/login/login.inc:145
 #: templates/login/login.inc:152
 msgid "Server"
 msgstr "Email-Server"
@@ -3421,7 +3608,7 @@
 "Legen Sie fest, was nach dem Löschen und Verschieben von Nachrichten "
 "passieren soll."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Priorität beim Erstellen von neuen Nachrichten setzen?"
 
@@ -3437,7 +3624,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Teilen Sie Ihre Ordner mit anderen Benutzern."
 
-#: config/prefs.php.dist:663
+#: config/prefs.php.dist:657
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3446,17 +3633,17 @@
 "versteckt werden? Sie können die Ansicht im Text umschalten, egal welche "
 "Einstellung Sie wählen."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr "Soll im Inhalt von Textnachrichten nach PGP-Daten gesucht werden?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
 "Soll das Nachrichtenfenster nach dem Speichern eines Entwurfes geschlossen "
 "werden?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 "Soll Ihr öffentlicher PGP-Schlüssel standardmäßig an Ihre Nachrichten "
@@ -3470,7 +3657,7 @@
 msgid "Show All Headers"
 msgstr "Alle"
 
-#: mailbox.php:361
+#: mailbox.php:350
 msgid "Show Deleted"
 msgstr "Zeige gelöschte"
 
@@ -3486,43 +3673,43 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Nur eingeblendete Ordner anzeigen"
 
-#: folders.php:287
+#: folders.php:284
 msgid "Show Unsubscribed"
 msgstr "Ausge_blendete Ordner anzeigen"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:596
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Symbol zum Entfernen von Anhängen einer Nachricht anzeigen?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:991
 msgid "Show legend in the mailbox view?"
 msgstr "Farblegende in der Ordneransicht anzeigen?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:829
 msgid "Show previews for unread messages only?"
 msgstr "Vorschau nur für ungelesene Nachrichten anzeigen?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:837
 msgid "Show previews in tooltips?"
 msgstr "Vorschau in einem Tooltip anzeigen?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:866
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "\"Konten\"-Symbol in der Menüzeile anzeigen?"
 
-#: lib/MIME/Viewer/html.php:108
+#: lib/MIME/Viewer/html.php:98
 msgid "Show the Images"
 msgstr "Bilder anzeigen"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Filtersymbol in der Menüzeile anzeigen?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:31
 msgid "Show total number of mails in folder?"
 msgstr "Gesamtzahl der Nachrichten im Ordner anzeigen?"
 
-#: config/prefs.php.dist:660
+#: config/prefs.php.dist:654
 msgid "Shown"
 msgstr "Angezeigt"
 
@@ -3530,10 +3717,6 @@
 msgid "Si_ze"
 msgstr "_Größe"
 
-#: templates/login/login.inc:213
-msgid "Sign up if not registered"
-msgstr "Noch kein Zugang? Hier registrieren."
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Unterschrieben"
@@ -3542,10 +3725,6 @@
 msgid "Size"
 msgstr "Größe"
 
-#: templates/mailbox/message_headers.inc:81
-msgid "Sort Direction"
-msgstr "Sortierrichtung"
-
 #: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
 msgstr "Sortieren nach Ankunft"
@@ -3578,39 +3757,60 @@
 msgid "Spam folder:"
 msgstr "Spam-Ordner:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:344
 msgid "Special Characters"
 msgstr "Sonderzeichen"
 
-#: templates/compose/compose.inc:334
+#: search.php:137
+msgid "Special Virtual Folders cannot be edited."
+msgstr "Virtuelle Spezialordner können nicht bearbeitet werden."
+
+#: templates/compose/compose.inc:341
 msgid "Spell Check"
 msgstr "Rechtschreibung"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Rechtschreibprüfung"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Rechtschreibprüfung beendet"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Rechtschreibfehler pro Seite bei der Rechtschreibprüfung."
 
-#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+#: lib/MIME/Viewer/itip.php:507 lib/MIME/Viewer/itip.php:509
+#: lib/MIME/Viewer/itip.php:642 lib/MIME/Viewer/itip.php:644
 msgid "Start"
 msgstr "Beginn"
 
-#: lib/MIME/Viewer/itip.php:688
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:309
+msgid "Stationery"
+msgstr "Vorlagen"
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr "Vorlagenname:"
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr "Vorlagentyp:"
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr "Vorlage:"
+
+#: lib/MIME/Viewer/itip.php:683
 msgid "Status"
 msgstr "Status"
 
-#: lib/MIME/Contents.php:202
+#: lib/MIME/Contents.php:239
 msgid "Strip Attachment"
 msgstr "Anhang entfernen"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:821
 msgid "Strip linebreaks?"
 msgstr "Zeilenümbrüche entfernen?"
 
@@ -3618,61 +3818,62 @@
 msgid "Sub_ject"
 msgstr "Bet_reff"
 
-#: message.php:252 search.php:151 templates/compose/recompose.inc:25
+#: message.php:275 thread.php:155 templates/compose/recompose.inc:25
+#: lib/Search.php:605
 msgid "Subject"
 msgstr "Betreff"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:909
 msgid "Subject Field"
 msgstr "Betreffzeile"
 
-#: search.php:365 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:306 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Abschicken"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Ordner einblenden"
 
-#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/pkcs7.php:385 lib/MIME/Viewer/pgp.php:393
 #: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Erfolg"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Vorschläge"
 
-#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+#: lib/MIME/Viewer/itip.php:659 lib/MIME/Viewer/itip.php:661
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:395 templates/compose/compose.inc:398
 msgid "Switch Composition Method"
 msgstr "Editiermodus umschalten"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to HTML composition"
 msgstr "Zum HTML-Modus wechseln"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:399
 msgid "Switch to plain text composition"
 msgstr "Zum Text-Modus wechseln"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:414
 msgid "Te_xt"
 msgstr "_Text"
 
-#: lib/MIME/Viewer/itip.php:269
+#: lib/MIME/Viewer/itip.php:270
 msgid "Tentative: "
 msgstr "Unter Vorbehalt: "
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/MIME/Viewer/itip.php:586
 msgid "Tentatively Accept request"
 msgstr "Anfrage vorläufig annehmen"
 
-#: lib/MIME/Viewer/itip.php:761
+#: lib/MIME/Viewer/itip.php:754
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
@@ -3681,10 +3882,22 @@
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Die Nutzungsbedingungen wurden in conf.php nicht angegeben."
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+msgid "Text"
+msgstr "Text"
+
+#: config/prefs.php.dist:943
 msgid "The From: column of the message should be linked:"
 msgstr "Die Von: Spalte der Nachricht soll so verlinkt werden:"
 
+#: lib/IMAP/Client.php:525
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+"Der IMAP-Server scheint die ausgewählte Anmeldemethode nicht zu "
+"unterstützen. Bitte kontaktieren Sie Ihren Systemadministrator."
+
 #: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr "Die Macintosh resource fork"
@@ -3704,50 +3917,36 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Das Konto \"%s\" wurde gespeichert."
 
-#: lib/Filter.php:97
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Die Adresse \"%s\" wurde zu %s hinzugefügt."
-
 #: attachment.php:43
 msgid "The attachment was not found."
 msgstr "Der Anhang wurde nicht gefunden."
 
-#: lib/MIME/Viewer/itip.php:69
+#: lib/MIME/Viewer/itip.php:71
 msgid "The calendar data is invalid"
 msgstr "Die Kalenderdaten sind ungültig"
 
-#: templates/javascript/open_compose_win.js:37
-msgid ""
-"The compose window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Das Fenster zum Erstellen neuer Nachrichten konnte nicht geöffnet werden. "
-"Vielleicht haben Sie Ihren Browser so eingestellt, dass er Popup-Fenster "
-"blockiert?"
-
 #: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr "Der Inhalt der Macintoshdatei befindet sich unten."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:85
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Die aktuellen Ordner \"%s\" werden nach \"%s\" umbenannt."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "Die aktuelle Liste der Benutzer, die Zugriff auf diesen Ordner haben, konnte "
 "nicht ausgelesen werden"
 
-#: compose.php:1171
+#: compose.php:1272
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Der Entwurf wurde im Ordner \"%s\" gespeichert."
 
-#: lib/MIME/Viewer/itip.php:139
+#: lib/MIME/Viewer/itip.php:140
 msgid "The event was added to your calendar."
 msgstr "Der Termin wurde Ihrem Kalender hinzugefügt."
 
@@ -3756,12 +3955,12 @@
 msgid "The field \"%s\" can't be expanded."
 msgstr "Das \"%s\"-Feld konnte nicht vervollständigt werden."
 
-#: lib/Folder.php:328
+#: lib/Folder.php:293
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Der Ordner \"%s\" existiert bereits"
 
-#: lib/Folder.php:171
+#: lib/Folder.php:150
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3770,48 +3969,57 @@
 "Der Name des Ordners \"%s\" enthält ungültige Zeichen, was zu Problemen "
 "führen könnte. Bitte wenden Sie sich an Ihren System-Administrator."
 
-#: lib/Folder.php:347
+#: lib/Folder.php:312
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Der Ordner \"%s\" wurde erstellt, aber noch nicht eingeblendet."
 
-#: lib/Folder.php:285
+#: lib/Folder.php:229
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Der Ordner \"%s\" wurde gelöscht, aber noch nicht ausgeblendet."
 
-#: lib/Folder.php:334
+#: lib/Folder.php:299
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr ""
 "Der Ordner \"%s\" konnte nicht erstellt werden. Meldung des Email-Servers"
 
-#: lib/Folder.php:278
+#: lib/Folder.php:222
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr ""
 "Der Ordner \"%s\" konnte nicht gelöscht werden. Meldung des Email-Servers:"
 
-#: lib/Folder.php:350
+#: lib/Folder.php:315
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Der Ordner \"%s\" wurde erfolgreich erstellt."
 
-#: lib/Folder.php:288
+#: lib/Folder.php:232
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Der Ordner \"%s\" wurde erfolgreich gelöscht."
 
-#: lib/Folder.php:438
+#: lib/Folder.php:421
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Der Ordner \"%s\" wurde erfolgreich nach \"%s\" umbenannt."
 
-#: lib/MIME/Viewer/tnef.php:92
+#: lib/MIME/Viewer/tnef.php:94
 msgid "The following files were attached to this part:"
 msgstr "Folgende Dateien waren an diesen Teil angehängt:"
 
-#: lib/MIME/Viewer/html.php:96
+#: templates/javascript/popup.js:59
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Das Dialogfenster zum Speichern des Bildes konnte nicht geöffnet werden. "
+"Vielleicht haben Sie Ihren Browser so eingestellt, dass er Popup-Fenster "
+"blockiert?"
+
+#: lib/MIME/Viewer/html.php:100
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
@@ -3831,12 +4039,12 @@
 msgid "The mail server generated the following message:"
 msgstr "Der Email-Server hat folgende Nachricht erzeugt:"
 
-#: lib/Message.php:614
+#: lib/Message.php:687
 #, php-format
 msgid "The mailbox %s is already empty."
 msgstr "Der Ordner %s ist bereits leer."
 
-#: lib/Fetchmail.php:245
+#: lib/Fetchmail.php:247
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
@@ -3847,28 +4055,24 @@
 msgid "The message being composed has been closed. Exiting."
 msgstr "Die Nachricht, die erstellt wurde, ist geschlossen worden. Abbruch."
 
-#: message.php:142
+#: templates/compose/compose.js:126
+msgid "The message does not have a Subject entered."
+msgstr "Sie haben für diese Nachricht keinen Betreff angegeben."
+
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "Die Nachricht wurde gelöscht."
 
-#: lib/MIME/Viewer/pgp.php:393
+#: lib/MIME/Viewer/pgp.php:397
 msgid "The message has been verified."
 msgstr "Die Nachricht wurde überprüft und bestätigt."
 
-#: lib/MIME/Viewer/pkcs7.php:373
+#: lib/MIME/Viewer/pkcs7.php:390
 #, php-format
 msgid "The message has been verified. Sender: %s."
 msgstr "Die Nachricht wurde überprüft und bestätigt. Absender: %s."
 
-#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
-msgid ""
-"The passphrase window can't be opened. Perhaps you have set your browser to "
-"block popup windows?"
-msgstr ""
-"Das Passwortfenster konnte nicht geöffnet werden. Vielleicht haben Sie Ihren "
-"Browser so eingestellt, dass er Popup-Fenster blockiert?"
-
-#: lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/pgp.php:172
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr ""
@@ -3882,7 +4086,7 @@
 msgid "The requested file does not exist in the Zip attachment."
 msgstr "Die ausgewählte Datei existiert nicht in dem ZIP-Anhang."
 
-#: message.php:531
+#: message.php:550
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
@@ -3893,15 +4097,15 @@
 "erhalten, wenn Sie diese Nachricht gelesen haben. Bitte klicken Sie %s, um "
 "die Bestätigung zurück zu schicken."
 
-#: lib/MIME/Viewer/images.php:69
+#: lib/MIME/Viewer/images.php:67
 msgid "The server was not able to create a thumbnail of this image."
 msgstr "Der Server konnte keine Vorschau dieses Bildes zu erzeugen."
 
-#: templates/compose/compose.js:104
+#: templates/compose/compose.js:90
 msgid "The signature could not be replaced."
 msgstr "Die Signatur konnte nicht ersetzt werden."
 
-#: templates/compose/compose.js:102
+#: templates/compose/compose.js:88
 msgid "The signature was successfully replaced."
 msgstr "Die Signatur wurde erfolgreich ersetzt."
 
@@ -3909,7 +4113,22 @@
 msgid "The specified file does not exist."
 msgstr "Die angegebene Datei existiert nicht."
 
-#: lib/MIME/Viewer/itip.php:169
+#: stationery.php:85
+#, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Die Vorlage \"%s\" wurde hinzugefügt."
+
+#: stationery.php:63
+#, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Die Vorlage \"%s\" wurde gelöscht."
+
+#: stationery.php:88
+#, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Die Vorlage \"%s\" wurde aktualisiert."
+
+#: lib/MIME/Viewer/itip.php:170
 msgid "The task has been added to your tasklist."
 msgstr "Die Aufgabe wurde Ihrer Aufgabenliste hinzugefügt."
 
@@ -3940,7 +4159,7 @@
 msgid "The text of the sent message can be viewed %s."
 msgstr "Der Text der verschickten Nachricht kann %s eingesehen werden."
 
-#: lib/MIME/Viewer/itip.php:154
+#: lib/MIME/Viewer/itip.php:155
 msgid "The user's free/busy information was sucessfully stored."
 msgstr ""
 "Die Frei/Gebucht-Information des Benutzers wurde erfolgreich gespeichert."
@@ -3954,31 +4173,18 @@
 msgid "There are no messages in this mailbox."
 msgstr "In diesem Ordner sind keine Nachrichten vorhanden"
 
-#: thread.php:69
+#: thread.php:110
 msgid "There is no text that can be displayed inline."
 msgstr "Es gibt keine anzeigbaren Nachrichtenteile."
 
-#: lib/Message.php:575
-#, php-format
-msgid "There was a problem expunging %s. This is what the server said"
-msgstr ""
-"Beim endgültigen Löschen der Nachrichten im Ordner %s ist ein Fehler "
-"aufgetreten. Meldung des Email-Servers"
-
-#: lib/Message.php:616
+#: lib/Message.php:689
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr ""
 "Beim endgültigen Löschen der Nachrichten im diesem Ordner ist ein Fehler "
 "aufgetreten. Meldung des Email-Servers: %s"
 
-#: lib/Message.php:584
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-"Beim endgültigen Löschen der Nachrichten im diesem Ordner ist ein Fehler "
-"aufgetreten. Meldung des Email-Servers"
-
-#: lib/Message.php:92
+#: lib/Message.php:110
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3987,7 +4193,7 @@
 "Beim Kopieren von Nachrichten nach \"%s\" nach \"%s\" ist ein Fehler "
 "aufgetreten. Meldung des Email-Servers"
 
-#: lib/Message.php:200 lib/Message.php:215
+#: lib/Message.php:226 lib/Message.php:244
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3996,7 +4202,7 @@
 "Beim Löschen von Nachrichten im Ordner \"%s\" ist ein Fehler aufgetreten. "
 "Meldung des Email-Servers"
 
-#: lib/Message.php:277
+#: lib/Message.php:318
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -4005,14 +4211,14 @@
 "Beim Löschen von Nachrichten im Ordner \"%s\" ist ein Fehler aufgetreten. "
 "Meldung des Email-Servers"
 
-#: lib/Message.php:213
+#: lib/Message.php:242
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr ""
 "Beim Löschen von Nachrichten ist ein Fehler aufgetreten. Meldung des Email-"
 "Servers: %s"
 
-#: lib/MIME/Viewer/itip.php:99
+#: lib/MIME/Viewer/itip.php:100
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Beim Löschen des Termins ist ein Fehler aufgetreten: %s."
@@ -4021,7 +4227,7 @@
 msgid "There was an error displaying this message part"
 msgstr "Beim Anzeigen dieses Nachrichtenteils ist ein Fehler aufgetreten."
 
-#: lib/Message.php:508 lib/Message.php:548
+#: lib/Message.php:591
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -4030,29 +4236,29 @@
 "Beim Markieren von Nachrichten im Ordner \"%s\" ist ein Fehler aufgetreten. "
 "Meldung des Email-Servers"
 
-#: folders.php:155
+#: folders.php:149
 #, php-format
 msgid "There was an error importing %s."
 msgstr "Beim Importieren von %s ist ein Fehler aufgetreten."
 
-#: lib/MIME/Viewer/itip.php:136
+#: lib/MIME/Viewer/itip.php:137
 #, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Beim Importieren des Termins ist ein Fehler aufgetreten: %s."
 
-#: lib/MIME/Viewer/itip.php:166
+#: lib/MIME/Viewer/itip.php:167
 #, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Beim Importieren der Aufgabe ist ein Fehler aufgetreten: %s."
 
-#: lib/MIME/Viewer/itip.php:152
+#: lib/MIME/Viewer/itip.php:153
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
 "Beim Importieren der Frei/Gebucht-Informationen ist ein Fehler aufgetreten: %"
 "s."
 
-#: lib/Message.php:87
+#: lib/Message.php:105
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -4061,30 +4267,26 @@
 "Beim Verschieben der Nachrichten von \"%s\" nach \"%s\" ist ein Fehler "
 "aufgetreten. Meldung des Email-Servers"
 
-#: compose.php:1179
+#: compose.php:1280
 msgid "There was an error saving this message as a draft."
 msgstr ""
 "Beim Speichern dieser Nachricht als Entwurf ist ein Fehler aufgetreten."
 
-#: compose.php:940
+#: compose.php:1039
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Beim Versenden der Nachricht ist ein Fehler aufgetreten: %s"
 
-#: lib/MIME/Viewer/itip.php:113
+#: lib/MIME/Viewer/itip.php:114
 #, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Beim Aktualisieren des Termins ist ein Fehler aufgetreten: %s."
 
-#: lib/MIME/Viewer/plain.php:59
-msgid "There was no text in this message part"
-msgstr "Kein Text in diesem Nachrichtenteil"
-
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:100
 msgid "This HTML message has images embedded in it."
 msgstr "In diese HTML-Nachricht wurden Bilder eingebettet."
 
-#: lib/MIME/Viewer/html.php:90
+#: lib/MIME/Viewer/html.php:93
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
@@ -4092,21 +4294,21 @@
 "In diese HTML-Nachricht wurden Bilder eingebettet. Blockierte Bilder "
 "erscheinen so: "
 
-#: lib/MIME/Viewer/pgp.php:166
+#: lib/MIME/Viewer/pgp.php:165
 msgid "This PGP Public Key was attached to the message."
 msgstr "Dieser öffentliche PGP-Schlüssel wurde an die Nachricht angehängt."
 
-#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
-#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
-#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+#: lib/MIME/Viewer/itip.php:105 lib/MIME/Viewer/itip.php:119
+#: lib/MIME/Viewer/itip.php:144 lib/MIME/Viewer/itip.php:158
+#: lib/MIME/Viewer/itip.php:174 lib/MIME/Viewer/itip.php:315
 msgid "This action is not supported."
 msgstr "Diese Aktion wird nicht unterstützt."
 
-#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+#: lib/MIME/Viewer/itip.php:180 lib/MIME/Viewer/itip.php:420
 msgid "This action is not yet implemented."
 msgstr "Diese Aktion ist noch nicht implementiert."
 
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr ""
 "Dieser Vorgang kann eine Weile dauern. Sind Sie sicher, dass Sie fortfahren "
@@ -4116,7 +4318,7 @@
 msgid "This message contains a Macintosh file."
 msgstr "Diese Nachricht enthält eine Macintosh-Datei."
 
-#: lib/MIME/Viewer/pkcs7.php:399
+#: lib/MIME/Viewer/pkcs7.php:416
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
@@ -4124,7 +4326,7 @@
 "Diese Nachricht enthält einen Anhang, der mit S/MIME digital unterschrieben "
 "wurde."
 
-#: lib/MIME/Viewer/pkcs7.php:403
+#: lib/MIME/Viewer/pkcs7.php:420
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 "Diese Nachricht enthält einen Anhang, der mit S/MIME verschlüsselt wurde."
@@ -4137,13 +4339,13 @@
 "Diese Nachricht enthält Statusinformationen zur Auslieferung einer Email "
 "aber in einem unbekannten Format."
 
-#: lib/MIME/Viewer/pgp.php:315
+#: lib/MIME/Viewer/pgp.php:319
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr ""
 "Dies scheint keine gültige PGP-verschlüsselte Nachricht zu sein. Fehler:"
 
-#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+#: lib/MIME/Viewer/pgp.php:239 lib/MIME/Viewer/pgp.php:354
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
@@ -4151,31 +4353,31 @@
 "Diese Nachricht ist anscheinend nicht im korrekten PGP-Format (nach RFC "
 "2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:159
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr "Diese Nachricht scheint nicht im korrekten S/MIME-Format zu sein."
 
-#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:420
 msgid "This message has been digitally signed via PGP."
 msgstr "Diese Nachricht wurde mit PGP digital unterschrieben."
 
-#: lib/MIME/Viewer/pkcs7.php:132
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
 msgstr "Diese Nachricht wurde mit S/MIME digital unterschrieben."
 
-#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
 msgstr "Diese Nachricht wurde mit S/MIME verschlüsselt."
 
-#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+#: lib/MIME/Viewer/pgp.php:200 lib/MIME/Viewer/pgp.php:290
 msgid "This message has been encrypted with PGP."
 msgstr "Diese Nachricht wurde mit PGP verschlüsselt."
 
-#: message.php:195
+#: message.php:210
 msgid "This message to"
 msgstr "diese Nachricht nach"
 
-#: acl.php:46
+#: acl.php:45
 msgid "This server does not support sharing folders."
 msgstr "Dieser Server unterstützt keine gemeinsamen Ordner."
 
@@ -4183,18 +4385,21 @@
 msgid "This window must be called from a compose window."
 msgstr "Dieses Fenster muss vom Fenster für neue Nachrichten geöffnet werden."
 
-#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:157
+msgid "Thread Display"
+msgstr "Themenliste"
+
+#: thread.php:76 config/prefs.php.dist:911
 msgid "Thread View"
 msgstr "Themenansicht"
 
-#: message.php:248 mailbox.php:585 search.php:139
-#: templates/contacts/contacts.inc:219
-#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:271 mailbox.php:601 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:593
 msgid "To"
 msgstr "An"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:908
 msgid "To Address"
 msgstr "Empfängeradresse"
 
@@ -4206,11 +4411,19 @@
 "Halten Sie beim Klicken Strg (PC) bzw. Command (Mac) gedrückt, um mehrere "
 "Einträge auszuwählen."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.1.0 or "
+"higher."
+msgstr ""
+"Um eine TLS-Verbindung benutzen zu können, müssen Sie PHP Version 5.1.0 oder "
+"höher einsetzen."
+
+#: templates/compose/compose.inc:591
 msgid "Total Attachments Size:"
 msgstr "Gesamtgröße der Anhänge:"
 
-#: folders.php:383
+#: folders.php:369
 msgid "Trash folder"
 msgstr "\"Papierkorb\"-Ordner"
 
@@ -4218,7 +4431,7 @@
 msgid "Trash folder:"
 msgstr "\"Papierkorb\"-Ordner:"
 
-#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/cyrus.php:64 lib/Quota/mercury32.php:79 lib/Quota/command.php:71
 #: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr "Speicherplatz-Kontingent konnte nicht gelesen werden"
@@ -4236,28 +4449,45 @@
 msgid "Undelete"
 msgstr "Wiederherstellen"
 
-#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
+#: mailbox.php:579 mailbox.php:597 lib/MIME/Headers.php:204
 msgid "Undisclosed Recipients"
 msgstr "Unbekannte Empfänger"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/IMAP/Client.php:556
+msgid "Unexpected response from server to AUTHENTICATE command."
+msgstr "Unerwartete Antwort des Servers auf AUTHENTICATE Kommando."
+
+#: lib/IMAP/Client.php:520
+msgid "Unexpected response from server to Digest-MD5 response."
+msgstr "Unerwartete Antwort des Servers auf Digest-MD5 Anfrage."
+
+#: lib/IMAP/Client.php:536
+msgid "Unexpected response from server to LOGIN command."
+msgstr "Unerwartete Antwort des Servers auf LOGIN Kommando."
+
+#: lib/MIME/Viewer/itip.php:448
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Nicht verarbeitete Komponente des Typs: %s"
 
-#: mailbox.php:544
+#: mailbox.php:557
 msgid "Unknown Date"
 msgstr "Unbekanntes Datum"
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr "Unbekannte IMAP-Antwort des Servers. Serverantwort: %s"
+
+#: lib/MIME/Viewer/itip.php:626
 msgid "Unknown Meeting"
 msgstr "Unbekannte Besprechung"
 
-#: mailbox.php:597
+#: mailbox.php:613
 msgid "Unknown Recipient"
 msgstr "Unbekannter Empfänger"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Passwort \"vergessen\""
 
@@ -4265,41 +4495,45 @@
 msgid "Unnamed"
 msgstr "Unbenannt"
 
-#: message.php:483 mailbox.php:687 templates/message/navbar_navigate.inc:6
+#: message.php:502 mailbox.php:702 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Nicht gelesen"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Ordner ausblenden"
 
-#: templates/compose/compose.inc:574
-msgid "Update Attachment Information"
-msgstr "Anhangsinformationen aktualisieren"
+#: templates/compose/compose.inc:513
+msgid "Update"
+msgstr "Aktualisierung"
 
-#: lib/MIME/Viewer/itip.php:620
+#: lib/MIME/Viewer/itip.php:612
 msgid "Update respondent status"
 msgstr "Status der Teilnehmer aktualisieren"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Hochladen"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Standardwert verwenden"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "IMAP Ordnerabonnement benutzen?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:724
+msgid "Use Virtual Trash Folder?"
+msgstr "Virtuellen Papierkorb benutzen?"
+
+#: templates/acl/acl.inc:143
 msgid "User"
 msgstr "Benutzer"
 
-#: acl.php:87
+#: acl.php:86
 #, php-format
 msgid ""
 "User \"%s\" successfully given the specified rights for the folder \"%s\"."
@@ -4307,7 +4541,7 @@
 "Dem Benutzer \"%s\" wurden erfolgreich die angegebenen Rechte für den Ordner "
 "\"%s\" zugewiesen."
 
-#: templates/login/login.inc:181
+#: templates/login/login.inc:176
 msgid "Username"
 msgstr "Benutzername"
 
@@ -4315,43 +4549,47 @@
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Anzeigen"
 
-#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:110
 #, php-format
 msgid "View %s"
 msgstr "%s anzeigen"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
 msgstr "Öffentlichen %s Schlüssel anzeigen"
 
-#: lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/html.php:119
 msgid "View HTML content in a separate window"
 msgstr "HTML-Inhalt in einem neuen Fenster anzeigen"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+msgid "View Messages"
+msgstr "Nachrichten an_zeigen"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Persönlichen privaten Schlüssel anzeigen"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Persönlichen öffentlichen Schlüssel anzeigen"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Thema Anzeigen"
 
-#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#: lib/MIME/Viewer/images.php:164 lib/MIME/Viewer/images.php:166
 msgid "View Thumbnail"
 msgstr "Vorschau anzeigen"
 
-#: lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/pkcs7.php:424
 msgid "View attachment in a separate window"
 msgstr "Anhang in einem neuen Fenster anzeigen"
 
@@ -4359,56 +4597,80 @@
 msgid "View content in a separate window"
 msgstr "Inhalt in einem neuen Fenster anzeigen"
 
-#: lib/MIME/Viewer/itip.php:140
+#: lib/MIME/Viewer/itip.php:141
 msgid "View event"
 msgstr "Termin anzeigen"
 
-#: folders.php:375 mailbox.php:513
+#: folders.php:361 mailbox.php:520
 #, php-format
 msgid "View messages in %s"
 msgstr "Nachrichten in %s anzeigen"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Ansicht oder Ordner, der nach der Anmeldung angezeigt werden soll:"
 
-#: lib/MIME/Viewer/itip.php:170
+#: lib/MIME/Viewer/itip.php:171
 msgid "View task"
 msgstr "Aufgabe anzeigen"
 
-#: lib/MIME/Viewer/html.php:113
+#: lib/MIME/Viewer/html.php:104
 msgid "View the Images"
 msgstr "Bilder anzeigen"
 
-#: search.php:314
+#: search.php:255
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Virtueller Ordner \"%s\" wurde erfolgreich erstellt."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
-#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
-#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+#: templates/search/main.inc:112 lib/IMAP/Tree.php:141 lib/IMAP/Tree.php:154
+#: lib/IMAP/Tree.php:156 lib/IMAP/Tree.php:160 lib/IMAP/Tree.php:161
+#: lib/IMAP/Tree.php:371 lib/IMAP/Tree.php:395 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
-#: search.php:296
+#: search.php:247
 msgid "Virtual Folders require a label."
 msgstr "Virtuelle Ordner müssen einen Namen haben."
 
-#: templates/search/main.inc:133
+#: lib/Search.php:420
+msgid "Virtual INBOX"
+msgstr "Virtueller Posteingang"
+
+#: folders.php:397
+msgid "Virtual INBOX Folder"
+msgstr "Virtueller Posteingangsordner"
+
+#: lib/Mailbox.php:171 lib/Search.php:366
+msgid "Virtual Trash"
+msgstr "Virtueller Papierkorb"
+
+#: folders.php:394
+msgid "Virtual Trash Folder"
+msgstr "Virtueller Papierkorb"
+
+#: templates/search/main.inc:129
 msgid "Virtual folder label"
 msgstr "Name des virtuellen Ordners"
 
-#: lib/MIME/Viewer/pkcs7.php:363
+#: lib/MIME/Viewer/pkcs7.php:379
 msgid "Warning"
 msgstr "Warnung"
 
-#: login.php:130
+#: login.php:152
 #, php-format
 msgid "Welcome to %s"
 msgstr "Willkommen bei %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:607
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+"Was soll mit Nachrichten geschehen, nachdem sie als Spam oder kein Spam "
+"gemeldet worden sind?"
+
+#: config/prefs.php.dist:716
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4416,18 +4678,18 @@
 "Beim Löschen von Nachrichten diese in den Papierkorb verschieben, anstatt "
 "sie als gelöscht zu markieren?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:896
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr ""
 "Wenn Sie einen Ordner öffnen, welche Seite soll zuerst angezeigt werden?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr ""
 "Sollen Anhänge mitgespeichert werden, wenn gesendete Nachrichten gespeichert "
 "werden?"
 
-#: config/prefs.php.dist:421
+#: config/prefs.php.dist:426
 msgid ""
 "When sending mail or expanding addresses, what domain should we append to "
 "unqualified addresses (email addresses without \"@\")?"
@@ -4435,15 +4697,12 @@
 "Welche Domain soll beim Verschicken von Nachrichten oder Suchen von Adressen "
 "an unvollständige Adressen (ohne \"@\"-Zeichen) gehängt werden?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Positivliste"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Zeilen nach so vielen Zeichen umbrechen."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:537 templates/compose/compose.inc:550
+#: config/prefs.php.dist:967
 msgid "Yes"
 msgstr "Ja"
 
@@ -4465,21 +4724,39 @@
 msgid "You are copying/moving to a new folder."
 msgstr "Sie kopieren/verschieben zu einem neuen Ordner."
 
-#: templates/folders/javascript.inc:94
+#: templates/javascript/folders.js:104
 msgid "You are creating a sub-folder to "
 msgstr "Sie erzeugen einen Unterordner von "
 
-#: templates/folders/javascript.inc:96
+#: templates/javascript/folders.js:106
 msgid "You are creating a top-level folder."
 msgstr "Sie erzeugen einen Hauptordner."
 
-#: templates/folders/javascript.inc:127
+#: lib/Folder.php:276
+msgid "You are not allowed to create folders."
+msgstr "Sie dürfen keine Ordner erstellen."
+
+#: lib/Folder.php:283
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr "Sie dürfen nicht mehr als %d Ordner erstellen."
+
+#: templates/javascript/folders.js:137
 msgid "You are renaming the folder: "
 msgstr "Sie benennen folgenden Ordner um:"
 
-#: lib/Folder.php:537
+#: templates/stationery/prefs.inc:35
 #, php-format
-msgid "You can not unsubscribe from \"%s\"."
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+"Sie können folgende Platzhalter im Vorlagentext verwenden: %c für den "
+"aktuellen Nachrichtentext; %s für die Signatur."
+
+#: lib/Folder.php:524
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
 msgstr "Sie können \"%s\" nicht ausblenden."
 
 #: lib/Maintenance/Task/tos_agreement.php:34
@@ -4490,13 +4767,13 @@
 "Sie haben den Benutzungsbedingungen nicht zugestimmt und dürfen sich "
 "deswegen nicht anmelden."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:170
 msgid "You do not have permission to change access to this folder"
 msgstr ""
 "Sie haben selbst nicht genügend Rechte, um die Rechte für diesen Ordner zu "
 "ändern."
 
-#: lib/Maillog.php:129
+#: lib/Maillog.php:130
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
 msgstr ""
@@ -4511,35 +4788,30 @@
 msgid "You have 1 new message."
 msgstr "Sie haben 1 neue Nachricht."
 
-#: templates/compose/attachments.js:116
-msgid ""
-"You have at least one attachment selected that you didn't upload yet. Are "
-"you sure you want to send this message without these attachments?"
-msgstr ""
-"Sie haben mindestens einen Anhang ausgewählt, aber noch nicht hochgeladen. "
-"Sind Sie sicher, dass Sie die Nachricht ohne diese Anhänge verschicken "
-"möchten?"
+#: compose.php:482
+msgid "You have already submitted this page."
+msgstr "Sie haben diese Seite bereits abgeschickt."
 
-#: lib/IMP.php:1030
+#: lib/IMP.php:1054
 msgid "You have new mail in the following folder:"
 msgstr "Sie haben neue Nachrichten in dem folgenden Ordner:"
 
-#: lib/IMP.php:1035
+#: lib/IMP.php:1059
 msgid "You have new mail in the following folders:"
 msgstr "Sie haben neue Nachrichten in den folgenden Ordnern:"
 
-#: compose.php:126
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "Sie müssen mindestens einen Empfänger angeben."
 
-#: lib/MIME/Viewer/pgp.php:302
+#: lib/MIME/Viewer/pgp.php:306
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 "Sie müssen das Passwort für Ihren privaten PGP-Schlüssel angeben, um diese "
 "Nachricht lesen zu können"
 
-#: lib/MIME/Viewer/pkcs7.php:238
+#: lib/MIME/Viewer/pkcs7.php:254
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
@@ -4568,69 +4840,65 @@
 msgid "You must specify a recipient."
 msgstr "Sie müssen einen Empfänger angeben."
 
-#: templates/compose/attachments.js:29
-msgid "You must specify at least one file to attach."
-msgstr "Sie müssen erst mindestens eine anzuhängende Datei angeben."
-
 #: templates/fetchmail/manage.inc:48
 #, php-format
 msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "Sie müssen \"%s\" in Ihren Wartungseinstellungen aktivieren."
 
-#: lib/Maillog.php:137
+#: lib/Maillog.php:138
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Sie haben diese Nachricht am %%s nach %s umgeleitet."
 
-#: lib/Maillog.php:141
+#: lib/Maillog.php:142
 #, php-format
 msgid "You replied to this message on %s."
 msgstr "Sie haben auf diese Nachricht am %s geantwortet."
 
-#: lib/Folder.php:487
+#: lib/Folder.php:474
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr ""
 "Beim Einblenden des Ordners \"%s\" ist ein Fehler aufgetreten. Meldung des "
 "Email-Servers"
 
-#: lib/Folder.php:539
+#: lib/Folder.php:526
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
 "Der Ordner \"%s\" wurde nicht ausgeblendet. Die Meldung des Email-Servers"
 
-#: lib/Folder.php:490
+#: lib/Folder.php:477
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Der Ordner \"%s\" wurde erfolgreich eingeblendet."
 
-#: lib/Folder.php:542
+#: lib/Folder.php:529
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Der Ordner \"%s\" wurde erfolgreich ausgeblendet."
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Ihr Name"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Ihre öffentlichen/privaten PGP-Schlüssel"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Ihr privater Schlüssel"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Ihr öffentlicher Schlüssel"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Ihre &quot;Antwort an:&quot; Adresse: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Ihre &quot;Antwort an:&quot; Adresse: <em>(optional)</em>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr "Ihre öffentlichen/privaten S/MIME-Zertifikate"
 
@@ -4638,18 +4906,18 @@
 msgid "Your accounts:"
 msgstr "Ihre Konten:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
-"Ihre Alias-Adressen: <i>(optional, jede Adresse in einer eigenen Zeile "
-"eintragen)</i>"
+"Ihre Alias-Adressen: <em>(optional, jede Adresse in einer eigenen Zeile "
+"eintragen)</em>"
 
-#: lib/MIME/Viewer/images.php:92
+#: lib/MIME/Viewer/images.php:101
 msgid "Your browser does not support inline display of this image type."
 msgstr "Ihr Browser kann diesen Bildtyp nicht direkt anzeigen."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Ihr Standardzeichensatz beim Erstellen von neuen Nachrichten:"
 
@@ -4658,44 +4926,72 @@
 msgstr ""
 "Ihre Standard-Verschlüsselungsmethode beim Verschicken von Nachrichten:"
 
+#: attachment.php:94
+#, php-format
+msgid ""
+"Your linked attachment has been downloaded by at least one user.\n"
+"\n"
+"Attachment name: %s\n"
+"Attachment date: %s\n"
+"\n"
+"Click on the following link to permanently delete the attachment:\n"
+"%s"
+msgstr ""
+"Ihr verlinkter Anhang wurde von mindestens einer Person heruntergeladen.\n"
+"\n"
+"Name des Anhangs: %s\n"
+"Datum des Anhangs: %s\n"
+"\n"
+"Klicken Sie auf den folgenden Link, um den Anhang endgültig zu löschen:\n"
+"%s"
+
 #: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "Ihre Nachricht wurde erfolgreich verschickt."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Ihre Signatur:"
 
-#: message.php:272 compose.php:1219 mailbox.php:528 lib/Compose.php:729
+#: templates/javascript/addressesBlocks.js:7
+msgid "[Hide Addresses]"
+msgstr "[Adressen verstecken]"
+
+#: message.php:295 compose.php:1301 mailbox.php:535 lib/Compose.php:838
 msgid "[No Subject]"
 msgstr "[Kein Betreff]"
 
-#: templates/compose/compose.inc:216
+#: templates/javascript/addressesBlocks.js:8
+msgid "[Show Addresses -"
+msgstr "[Adressen anzeigen -"
+
+#: lib/MIME/Headers.php:213
+#, php-format
+msgid "[Show addresses - %s recipients]"
+msgstr "[Adressen anzeigen - %s Empfänger]"
+
+#: templates/compose/compose.inc:203
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "Auss_chlussliste"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:152
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:933
-msgid "_Compose"
-msgstr "_Neue Nachricht"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: lib/IMP.php:935
+#: lib/IMP.php:957
 msgid "_Folders"
 msgstr "_Ordner"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:79
 msgid "_Identity"
 msgstr "_Identität"
 
@@ -4703,23 +4999,27 @@
 msgid "_Inbox"
 msgstr "_Posteingang"
 
-#: lib/IMP.php:976
+#: lib/IMP.php:998
 msgid "_Log out"
 msgstr "Ab_melden"
 
-#: message.php:368
+#: message.php:391
 msgid "_Message Source"
 msgstr "_Quelltext"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:954
+msgid "_New Message"
+msgstr "_Neue Nachricht"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "D_rucken"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:270 templates/compose/compose.inc:287
 msgid "_Priority"
 msgstr "_Priorität"
 
-#: mailbox.php:402
+#: mailbox.php:404
 #, php-format
 msgid "_Refresh %s"
 msgstr "A_ktualisiere %s"
@@ -4728,11 +5028,11 @@
 msgid "_Reply"
 msgstr "An_tworten"
 
-#: lib/IMP.php:937
+#: lib/IMP.php:959
 msgid "_Search"
 msgstr "_Suche"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:65 templates/compose/compose.inc:426
 msgid "_Send Message"
 msgstr "_Senden"
 
@@ -4740,7 +5040,7 @@
 msgid "_Thread"
 msgstr "_Thema"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:114
 msgid "_To"
 msgstr "_An"
 
@@ -4748,62 +5048,131 @@
 msgid "_Undelete"
 msgstr "W_iederherstellen"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "Thema Anzei_gen"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "Positivliste"
 
-#: lib/Compose.php:351
+#: lib/Compose.php:175
+msgid "addressee unknown"
+msgstr "Adressat unbekannt"
+
+#: lib/Compose.php:451
 msgid "attachment"
 msgstr "Anhang"
 
-#: view.php:99
+#: view.php:97
 msgid "attachments.zip"
 msgstr "anhaenge.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:505
 msgid "bytes"
 msgstr "Bytes"
 
+#: lib/Compose.php:199
+msgid "cannot create output file"
+msgstr "Ausgabedatei konnte nicht erstellt werden"
+
+#: lib/Compose.php:171
+msgid "cannot open input"
+msgstr "Eingabe kann nicht geöffnet werden"
+
+#: lib/Compose.php:163
+msgid "command line usage error"
+msgstr "Ungültige Benutzung der Kommandozeile"
+
+#: lib/Compose.php:219
+msgid "configuration error"
+msgstr "Konfigurationsfehler"
+
+#: lib/Compose.php:195
+msgid "critical system file missing"
+msgstr "Kritische Systemdatei fehlt"
+
+#: lib/Compose.php:167
+msgid "data format error"
+msgstr "Datenformatfehler"
+
+#: lib/Compose.php:223
+msgid "entry not found"
+msgstr "Eintrag nicht gefunden"
+
 #: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "von"
 
-#: smime.php:29 pgp.php:69
+#: lib/Compose.php:179
+msgid "host name unknown"
+msgstr "Hostname unbekannt"
+
+#: lib/Compose.php:203
+msgid "input/output error"
+msgstr "Ein-/Ausgabefehler"
+
+#: lib/Compose.php:187
+msgid "internal software error"
+msgstr "Interner Softwarefehler"
+
+#: smime.php:29 pgp.php:68
 msgid "key"
 msgstr "Schlüssel"
 
-#: folders.php:151
+#: folders.php:145
 msgid "mailbox file"
 msgstr "Ordnerdatei"
 
-#: compose.php:1001 lib/Message.php:429
+#: compose.php:1105 lib/Message.php:513
 msgid "name"
 msgstr "Name"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "keine"
 
-#: templates/compose/spelling.inc:111
+#: templates/fetchmail/account_select.inc:25
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "oder"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:215
+msgid "permission denied"
+msgstr "Zugriff verweigert"
+
+#: templates/javascript/addressesBlocks.js:8
+msgid "recipients]"
+msgstr "Empfänger]"
+
+#: lib/Compose.php:211
+msgid "remote error in protocol"
+msgstr "Remotefehler im Protokoll"
+
+#: lib/Compose.php:183
+msgid "service unavailable"
+msgstr "Service nicht verfügbar"
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "Rechtschreibfehler"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "Rechtschreibfehler"
 
-#: lib/Filter.php:51
+#: lib/Compose.php:191
+msgid "system error"
+msgstr "Systemfehler"
+
+#: lib/Compose.php:207
+msgid "temporary failure"
+msgstr "Vorübergehender Fehler"
+
+#: lib/Filter.php:79
 msgid "your blacklist"
 msgstr "Ihrer Ausschlussliste"
 
-#: lib/Filter.php:61
+#: lib/Filter.php:89
 msgid "your whitelist"
 msgstr "Ihrer Positivliste"


--- orig/docs/UPGRADING
+++ mod/docs/UPGRADING
@@ -1,17 +1,65 @@
-======================
- Upgrading to IMP 4.0
-======================
+===============
+ Upgrading IMP
+===============
 
-:Last update:   $Date: 2004/11/16 22:49:18 $
-:Revision:      $Revision: 1.7 $
+:Last update:   $Date: 2006/01/06 10:29:45 $
+:Revision:      $Revision: 1.7.8.8 $
 :Contact:       imp at lists.horde.org
 
+
+
+Upgrading IMP From 4.0.x To 4.1.x
+=================================
+
+This is a non-exhaustive, quick explanation of what has changed between an IMP
+4.0.x installation to IMP 4.1.x.
+
+
+Automatic Namespace Detection
+-----------------------------
+
+The ``namespace``, ``hierarchies``, ``folders``, ``delimiter``, and
+``dotfiles`` parameters were removed from ``config/servers.php``.  Namespaces
+are now automatically configured pursuant to RFC 2342.
+
+If using the UW IMAP daemon, you may notice a bunch of additional namespaces
+that were not displayed before as well as the ability of the user to
+view all files that live in their home directory via the folders screen.
+Information on how to correct your IMAP server configuration can be found at
+
+  http://wiki.horde.org/ImpUWIMAPNamespaces
+
+
+User-Defined Headers
+--------------------
+
+The ``config/headers.txt`` file has been removed and replaced by
+``config/headers.php``.  Any user-defined headers should be migrated to this
+file.  The new file has the advantage of allowing any valid PHP expression
+to be executed at run-time when generating the headers.  See the top of
+the ``headers.php`` file for the new format required.
+
+
+Removed Preferences
+-------------------
+
+The following preferences are no longer used and may be safely removed from
+your ``config/prefs.php`` file and your preferences backend::
+
+   'disposition_request_delivery'
+   'disposition_send_mdn'
+   'wrap_width'
+
+
+Upgrading IMP From 3.x To 4.0.x
+===============================
+
 This is a non-exhaustive, quick explanation of what has changed between an IMP
-3.x installation to IMP 4.0.
+3.x installation to IMP 4.0.x.
 
 
 Filters
-=======
+-------
 
 Filtering code has been removed from IMP.  To have the same features as the
 old code, you should install the Ingo_ module.  See the INSTALL_ file for more


--- orig/templates/compose/attachments.js
+++ mod/templates/compose/attachments.js
@@ -1,59 +1,16 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
-function attachmentFields()
+function attachmentChanged()
 {
-    fields = new Array();
+    var usedFields = 0;
+    var fields = new Array();
     for (var i = 0; i < document.compose.elements.length; i++) {
         if (document.compose.elements[i].type == 'file' &&
             document.compose.elements[i].name.substr(0, 7) == 'upload_') {
             fields[fields.length] = document.compose.elements[i];
         }
     }
-    return fields;
-}
-
-function attachmentsExist()
-{   
-    if (document.compose.attachmentAction.value) {
-        if (document.compose.attachmentAction.value == 'add') {
-<?php if ($browser->hasQuirk('empty_file_input_value')): ?>
-            return true;
-<?php else: ?>
-            var fields = attachmentFields();
-            for (var i = 0; i < fields.length; i++) {
-                if (fields[i].value.length > 0) {
-                    return true;
-                }
-            }
-            alert('<?php echo addslashes(_("You must specify at least one file to attach.")) ?>');
-            document.compose.upload_1.focus();
-            return false;
-<?php endif; ?>
-        } else if (document.compose.attachmentAction.value == 'update') {
-            return true;
-        }
-    }
-}
-
-function attach(actionid, action)
-{
-    document.compose.actionID.value = actionid;
-    document.compose.attachmentAction.value = action;
-    if (attachmentsExist()) {
-        uniqSubmit();
-    }
-}
-
-function attachmentChanged()
-{
-<?php if ($browser->hasQuirk('empty_file_input_value') ||
-          !$browser->hasFeature('dom')): ?>
-    return;
-<?php else: ?>
-
-    var usedFields = 0;
-    var fields = attachmentFields();
 
 <?php
 $max_attachments = $imp_compose->additionalAttachmentsAllowed();
@@ -78,9 +35,9 @@
             var td = document.createElement('TD');
             newRow.appendChild(td);
             td.align = 'left';
-            var b = document.createElement('B');
-            td.appendChild(b);
-            b.appendChild(document.createTextNode('<?php echo _("File") ?> ' + (usedFields + 1) + ':'));
+            var strong = document.createElement('STRONG');
+            td.appendChild(strong);
+            strong.appendChild(document.createTextNode('<?php echo _("File") ?> ' + (usedFields + 1) + ':'));
             td.appendChild(document.createTextNode(' '));
             var file = document.createElement('INPUT');
             file.type = 'file';
@@ -100,22 +57,6 @@
             lastRow.parentNode.insertBefore(newRow, lastRow.nextSibling);
         }
     }
-<?php endif; ?>
-}
-
-function attachmentCheck()
-{
-    var notUploaded = false;
-    var fields = attachmentFields();
-    for (var i = 0; i < fields.length; i++) {
-        if (fields[i].value.length > 0) {
-            notUploaded = true;
-        }
-    }
-    if (notUploaded) {
-        return confirm('<?php echo addslashes(_("You have at least one attachment selected that you didn't upload yet. Are you sure you want to send this message without these attachments?")) ?>');
-    }
-    return true;
 }
 
 if (document.compose.to && document.compose.to.value == "") {


--- orig/templates/message/navbar_navigate.inc
+++ mod/templates/message/navbar_navigate.inc
@@ -1,5 +1,5 @@
 <tr class="control">
-  <td nowrap="nowrap" align="left">
+  <td nowrap="nowrap" class="leftAlign">
 <?php if ($imp['base_protocol'] != 'pop3'): ?>
     <select name="flag<?php echo $nav_id ?>" onchange="flagMessage(<?php echo $nav_id ?>);">
       <option value="" selected="selected"><?php echo _("Mark as:") ?></option>
@@ -13,24 +13,24 @@
     </select>
   </td>
 <?php endif; ?>
-  <td nowrap="nowrap" align="left">
+  <td nowrap="nowrap" class="leftAlign">
 <?php if ($conf['user']['allow_folders']): ?>
-    <?php echo Horde::widget('', _("Move to folder"), 'widget', '', "Transfer('move_message'," . $nav_id . "); return false;", _("Move"), true) ?> |
-    <?php echo Horde::widget('', _("Copy to folder"), 'widget', '', "Transfer('copy_message'," . $nav_id . "); return false;", _("Copy"), true) ?>
+    <?php echo Horde::widget('#', _("Move to folder"), 'widget', '', "Transfer('move_message'," . $nav_id . "); return false;", _("Move"), true) ?> |
+    <?php echo Horde::widget('#', _("Copy to folder"), 'widget', '', "Transfer('copy_message'," . $nav_id . "); return false;", _("Copy"), true) ?>
     <select name="target<?php echo $nav_id ?>" onchange="updateFolders(<?php echo $nav_id ?>);">
       <?php echo $options ?>
     </select>
 <?php endif; ?>
   </td>
-  <td width="65%" align="right" nowrap="nowrap">
+  <td width="65%" class="rightAlign" nowrap="nowrap">
     <?php echo Horde::widget($mailbox_url, sprintf(_("Back to %s"), $page_label), 'widget', '', '', sprintf(_("Bac_k to %s"), $page_label), true) ?>&nbsp;&nbsp;
 <?php if (!empty($prev_url)): ?>
-    <?php echo Horde::link($prev_url, _("Previous Message"), '', '', '', '', '<', empty($navbar_included) ? array('id' => 'prev') : array()) . Horde::img('nav/left.png', '<', array('title' => _("Previous Message"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $registry->getImageDir('horde')) ?></a>
+    <?php echo Horde::link($prev_url, _("Previous Message"), '', '', '', '', '<', empty($navbar_included) ? array('id' => 'prev') : array()) . Horde::img('nav/left.png', '<', array('width' => '16', 'height' => '16', 'align' => 'middle'), $registry->getImageDir('horde')) ?></a>
 <?php else: ?>
     <?php echo Horde::img('nav/left-grey.png', '', 'width="16" height="16" align="middle"', $registry->getImageDir('horde')) ?>
 <?php endif; ?>
 <?php if (!empty($next_url)): ?>
-    <?php echo Horde::link($next_url, _("Next Message"), '', '', '', '', '>', empty($navbar_included) ? array('id' => 'next') : array()) . Horde::img('nav/right.png', '>', array('title' => _("Next Message"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $registry->getImageDir('horde')) ?></a>
+    <?php echo Horde::link($next_url, _("Next Message"), '', '', '', '', '>', empty($navbar_included) ? array('id' => 'next') : array()) . Horde::img('nav/right.png', '>', array('width' => '16', 'height' => '16', 'align' => 'middle'), $registry->getImageDir('horde')) ?></a>
 <?php else: ?>
     <?php echo Horde::img('nav/right-grey.png', '', 'width="16" height="16" align="middle"', $registry->getImageDir('horde')) ?>
 <?php endif; $navbar_included = true; ?>


--- orig/lib/IMP.php
+++ mod/lib/IMP.php
@@ -102,12 +102,7 @@
 /**
  * The mailbox name to use for search results.
  */
-define('IMP_SEARCH_MBOX', '**search');
-
-/**
- * The mailbox prefix to use for virtual folder selection.
- */
-define('IMP_VFOLDER_PREFIX', '**vfolder_');
+define('IMP_SEARCH_MBOX', '**search_');
 
 // IMP internal indexing strings
 /**
@@ -123,11 +118,11 @@
 /**
  * IMP Base Class.
  *
- * $Horde: imp/lib/IMP.php,v 1.449.4.28 2005/09/01 10:29:22 jan Exp $
+ * $Horde: imp/lib/IMP.php,v 1.449.4.58 2006/03/18 08:40:21 jan Exp $
  *
- * Copyright 1999-2005 Chuck Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 1999-2006 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you did not
  * receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -269,51 +264,6 @@
     }
 
     /**
-     * Returns any prefixes that need to be put at the beginning of the folder
-     * path.
-     *
-     * @return string  The prefix, if any.
-     */
-    function preambleString()
-    {
-        return $_SESSION['imp']['folders'] . $_SESSION['imp']['namespace'];
-    }
-
-    /**
-     * Tacks on any prefixes that need to be put at the beginning of the
-     * folder path, but don't add it to INBOX, and return the full mailbox
-     * name.
-     *
-     * @param string $mailbox   The folder path that needs the prefixes to be
-     *                          prepended.
-     *
-     * @return string  The full folder path with prefixes if needed.
-     */
-    function addPreambleString($mailbox)
-    {
-        if (empty($mailbox) || ($mailbox == 'INBOX')) {
-            return $mailbox;
-        }
-        return IMP::preambleString() . $mailbox;
-    }
-
-    /**
-     * Removes any prefixes from a full folder path.
-     *
-     * @param string $mailbox  The folder path to strip the prefix from
-     *
-     * @return string  The folder path without prefixes.
-     */
-    function stripPreambleString($mailbox)
-    {
-        $preamble = IMP::preambleString();
-        if (substr($mailbox, 0, strlen($preamble)) == $preamble) {
-            $mailbox = substr($mailbox, strlen($preamble));
-        }
-        return $mailbox;
-    }
-
-    /**
      * Generates a full c-client server specification string.
      *
      * @param string $mbox      The mailbox to append to end of the server
@@ -354,19 +304,11 @@
     {
         $label = '';
 
-        if ($_SESSION['imp']['mailbox'] == 'INBOX') {
-            $label = _("Inbox");
-        } elseif ($_SESSION['imp']['mailbox'] == IMP_SEARCH_MBOX) {
-            require_once IMP_BASE . '/lib/Search.php';
-            $label = IMP_Search::searchLabel();
+        if (isset($GLOBALS['imp_search']) &&
+            $GLOBALS['imp_search']->searchMboxID()) {
+            $label = $GLOBALS['imp_search']->getLabel();
         } else {
-            $label = String::convertCharset($_SESSION['imp']['mailbox'], 'UTF7-IMAP');
-            if (strcmp($_SESSION['imp']['folders'], String::substr($label, 0, String::length($_SESSION['imp']['folders']))) == 0) {
-                $label = String::substr($label, String::length($_SESSION['imp']['folders']));
-            }
-            if (strcmp($_SESSION['imp']['namespace'], String::substr($label, 0, String::length($_SESSION['imp']['namespace']))) == 0) {
-                $label = String::substr($label, String::length($_SESSION['imp']['namespace']));
-            }
+            $label = IMP::displayFolder($_SESSION['imp']['mailbox']);
         }
 
         return $label;
@@ -446,6 +388,17 @@
             return $results;
         }
 
+        /* Remove any results with empty email addresses. */
+        $keys = array_keys($results);
+        foreach ($keys as $key) {
+            $subTotal = count($results[$key]);
+            for ($i = 0; $i < $subTotal; ++$i) {
+                if (empty($results[$key][$i]['email'])) {
+                    unset($results[$key][$i]);
+                }
+            }
+        }
+
         $ambiguous = false;
         $error = false;
         $missing = array();
@@ -453,7 +406,8 @@
         foreach ($arr as $i => $tmp) {
             $address = MIME::encodeAddress($tmp, null, '');
             if (!is_a($address, 'PEAR_Error') &&
-                ($parser->validateMailbox($address))) {
+                ($parser->validateMailbox($address) ||
+                 $parser->_isGroup($address))) {
                 // noop
             } elseif (!isset($results[$tmp]) || !count($results[$tmp])) {
                 /* Handle the missing/invalid case - we should return error
@@ -543,23 +497,45 @@
         if (is_a($result, 'PEAR_Error')) {
             return $result;
         } else {
-            if (!preg_match('/[^a-z0-9]/', $result)) {
-                /* Broken contacts/import implementation that returns the
-                 * source key intead of the UID. */
-                $contact_link = @htmlspecialchars($newName, ENT_COMPAT, NLS::getCharset());
+            $contact_link = $registry->link('contacts/show', array('uid' => $result, 'source' => $prefs->getValue('add_source')));
+            if (!empty($contact_link) && !is_a($contact_link, 'PEAR_Error')) {
+                $contact_link = Horde::link(Horde::url($contact_link), sprintf(_("Go to address book entry of \"%s\""), $newName)) . @htmlspecialchars($newName, ENT_COMPAT, NLS::getCharset()) . '</a>';
             } else {
-                $contact_link = $registry->link('contacts/show', array('uid' => $result, 'source' => $prefs->getValue('add_source')));
-                if (!empty($contact_link) && !is_a($contact_link, 'PEAR_Error')) {
-                    $contact_link = Horde::link(Horde::url($contact_link), sprintf(_("Go to address book entry of \"%s\""), $newName)) . @htmlspecialchars($newName, ENT_COMPAT, NLS::getCharset()) . '</a>';
-                } else {
-                    $contact_link = @htmlspecialchars($newName, ENT_COMPAT, NLS::getCharset());
-                }
+                $contact_link = @htmlspecialchars($newName, ENT_COMPAT, NLS::getCharset());
             }
             return $contact_link;
         }
     }
 
     /**
+     * Parses an address or address list into the address components,
+     * automatically choosing the best suited parsing method.
+     *
+     * @param string $address  An address or address list.
+     *
+     * @return array  A list of address objects.
+     */
+    function parseAddressList($address)
+    {
+        static $parser;
+
+        if (Util::extensionExists('imap') &&
+            strpos($address, ':') === false) {
+            $result = @imap_rfc822_parse_adrlist($address, '');
+            if (is_array($result)) {
+                return $result;
+            }
+        }
+
+        if (!isset($parser)) {
+            require_once 'Mail/RFC822.php';
+            $parser = &new Mail_RFC822();
+        }
+
+        return $parser->parseAddressList($address, '', false, false);
+    }
+
+    /**
      * Wrapper around IMP_Folder::flist() which generates the body of a
      * &lt;select&gt; form input from the generated folder list. The
      * &lt;select&gt; and &lt;/select&gt; tags are NOT included in the output
@@ -570,12 +546,7 @@
      * @param boolean $abbrev         If true, abbreviate long mailbox names
      *                                by replacing the middle of the name with
      *                                '...'.
-     * @param array $filter           An array of mailboxes to ignore. If the
-     *                                first element in the array is null, then
-     *                                the mailbox will be shown in the
-     *                                resulting list, but there will be an
-     *                                empty value argument (i.e.
-     *                                non-selectable).
+     * @param array $filter           An array of mailboxes to ignore.
      * @param string $selected        The mailbox to have selected by default.
      * @param boolean $new_folder     If true, display an option to create a
      *                                new folder.
@@ -583,16 +554,17 @@
      *                                included in the list?
      * @param boolean $inc_vfolder    Should the user's virtual folders be
      *                                included in the list?
+     * @param boolean $inc_tasklists  Should the user's editable notepads be
+     *                                included in the list?
      *
      * @return string  A string containing <option> elements for each mailbox
      *                 in the list.
      */
     function flistSelect($heading = '', $abbrev = true, $filter = array(),
                          $selected = null, $new_folder = false,
-                         $inc_tasklists = false, $inc_vfolder = false)
+                         $inc_tasklists = false, $inc_vfolder = false,
+                         $inc_notepads = false)
     {
-        global $registry;
-
         require_once 'Horde/Text.php';
         require_once IMP_BASE . '/lib/Folder.php';
 
@@ -610,22 +582,19 @@
             $text .= '<option value="">' . $heading . "</option>\n";
         }
 
-        if ($new_folder) {
+        if ($new_folder &&
+            (!empty($GLOBALS['conf']['hooks']['permsdenied']) ||
+             (IMP::hasPermission('create_folders') &&
+              IMP::hasPermission('max_folders')))) {
             $text .= '<option value="">----</option>' . "\n";
             $text .= '<option value="*new*">' . _("New Folder") . "</option>\n";
             $text .= '<option value="">----</option>' . "\n";
         }
 
         /* Add the list of mailboxes to the lists. */
-        $showmbox = false;
-        if (!empty($filter) && is_null($filter[0])) {
-            $showmbox = true;
-            array_shift($filter);
-        }
-
         $filter = array_flip($filter);
         foreach ($mailboxes as $mbox) {
-            if (isset($filter[$mbox['val']]) && !$showmbox) {
+            if (isset($filter[$mbox['val']])) {
                 continue;
             }
 
@@ -636,21 +605,21 @@
         }
 
         /* Add the list of virtual folders to the list. */
-        if ($inc_vfolder && !empty($_SESSION['imp']['vfolder'])) {
-            $vfolders = IMP_VFolder::listVFolders();
+        if ($inc_vfolder) {
+            $vfolders = $GLOBALS['imp_search']->listQueries(true);
             if (!empty($vfolders)) {
+                $vfolder_sel = $GLOBALS['imp_search']->searchMboxID();
                 $text .= '<option value="">----</option>' . "\n";
                 foreach ($vfolders as $id => $val) {
-                    $sel = (($_SESSION['imp']['mailbox'] == IMP_SEARCH_MBOX) && ($id == $_SESSION['imp']['search']['vfolder_id'])) ? ' selected="selected"' : '';
-                    $text .= sprintf('<option value="%s"%s>%s</option>%s', IMP_VFOLDER_PREFIX . $id, $sel, Text::htmlSpaces($val), "\n");
+                    $text .= sprintf('<option value="%s"%s>%s</option>%s', IMP_SEARCH_MBOX . $id, ($vfolder_sel == $id) ? ' selected="selected"' : '', Text::htmlSpaces($val), "\n");
                 }
             }
         }
 
         /* Add the list of editable tasklists to the list. */
         if ($inc_tasklists && $_SESSION['imp']['tasklistavail']) {
-            $tasklists = $registry->call('tasks/listTasklists',
-                                         array(false, PERMS_EDIT));
+            $tasklists = $GLOBALS['registry']->call('tasks/listTasklists',
+                                                    array(false, PERMS_EDIT));
 
             if (!is_a($tasklists, 'PEAR_Error') && count($tasklists)) {
                 $text .= '<option value="">----</option>' . "\n";
@@ -664,26 +633,24 @@
             }
         }
 
-        return $text;
-    }
+        /* Add the list of editable notepads to the list. */
+        if ($inc_notepads && $_SESSION['imp']['notepadavail']) {
+            $notepads = $GLOBALS['registry']->call('notes/listNotepads',
+                                                    array(false, PERMS_EDIT));
 
-    /**
-     * Returns the current mailbox.
-     *
-     * @param integer $array_index  The array index of the current message.
-     *
-     * @return string  The current mailbox name.
-     */
-    function getThisMailbox($array_index = null)
-    {
-        if (!is_null($array_index) && ($_SESSION['imp']['mailbox'] == IMP_SEARCH_MBOX)) {
-            $msgs = explode(IMP_MSG_SEP, $_SESSION['imp']['msgl']);
-            if (isset($msgs[$array_index])) {
-                return substr($msgs[$array_index], strpos($msgs[$array_index], IMP_IDX_SEP) + 1);
+            if (!is_a($notepads, 'PEAR_Error') && count($notepads)) {
+                $text .= '<option value="">----</option>' . "\n";
+
+                foreach ($notepads as $id => $notepad) {
+                    $text .= sprintf('<option value="%s">%s</option>%s',
+                                     '_notepad_' . $id,
+                                     Text::htmlSpaces($notepad->get('name')),
+                                     "\n");
+                }
             }
         }
 
-        return isset($_SESSION['imp']['thismailbox']) ? $_SESSION['imp']['thismailbox'] : '';
+        return $text;
     }
 
     /**
@@ -727,35 +694,6 @@
     }
 
     /**
-     * Returns the initial URL.
-     *
-     * @param string $actionID  The action ID to perform on the initial page.
-     * @param boolean $encode   If true the argument separator gets encoded.
-     *
-     * @return string  The initial URL.
-     */
-    function getInitialUrl($actionID = null, $encode = true)
-    {
-        global $prefs;
-
-        $init_url = $prefs->getValue('initial_page');
-        if ($init_url == 'folders.php') {
-            $url = Horde::applicationUrl($init_url, !$encode);
-            $url = Util::addParameter($url, IMP::getComposeArgs(), null, $encode);
-        } else {
-            $url = Horde::applicationUrl('mailbox.php', !$encode);
-            $url = Util::addParameter($url, 'mailbox', IMP::addPreambleString($init_url), $encode);
-            $url = Util::addParameter($url, IMP::getComposeArgs(), null, $encode);
-        }
-
-        if (!empty($actionID)) {
-            $url = Util::addParameter($url, 'actionID', $actionID, $encode);
-        }
-
-        return $url;
-    }
-
-    /**
      * Open a compose window.
      */
     function openComposeWin($options = array())
@@ -791,8 +729,10 @@
 
         /* Make sure the compose window always knows which mailbox it's in,
            for replying, forwarding, marking as answered, etc. */
-        if (!isset($extra['thismailbox'])) {
-            $extra['thismailbox'] = IMP::getThisMailbox((isset($extra['array_index'])) ? $extra['array_index'] : null);
+        /* $_SESSION['imp'] may not be available here. */
+        if (!isset($extra['thismailbox']) &&
+            isset($_SESSION['imp']['thismailbox'])) {
+            $extra['thismailbox'] = $_SESSION['imp']['thismailbox'];
         }
 
         if (is_string($args)) {
@@ -807,23 +747,19 @@
         }
 
         /* Merge the two argument arrays. */
-        $args = array_merge($args, $extra);
+        if (is_array($extra)) {
+            $args = array_merge($args, $extra);
+        }
 
         /* Convert the $args hash into proper URL parameters. */
-        $url = '';
-        foreach ($args as $key => $val) {
-            if (!empty($val) || is_int($val)) {
-                $url = Util::addParameter($url, $key, $val);
-            }
-        }
-        $url = substr($url, 1);
+        $url = substr(Util::addParameter('', array_diff($args, array('')), null, false), 1);
 
         if ($prefs->getValue('compose_popup') &&
             $browser->hasFeature('javascript')) {
-            Horde::addScriptFile('open_compose_win.js');
-            return 'javascript:open_compose_win(\'' . addslashes($url) . '\');';
+            Horde::addScriptFile('popup.js');
+            return "javascript:popup_imp('" . Horde::applicationUrl('compose.php') . "',700,650,'" . htmlspecialchars($browser->escapeJSCode(addslashes($url))) . "');";
         } else {
-            return Horde::applicationUrl('compose.php?' . $url);
+            return Horde::applicationUrl(empty($url) ? 'compose.php' : 'compose.php?' . $url);
         }
     }
 
@@ -837,28 +773,30 @@
     function logoutUrl()
     {
         $params = array(
-            'imapuser' => isset($_SESSION['imp']['user']) ? $_SESSION['imp']['user'] :
-                                                            Util::getFormData('imapuser'),
-            'server'   => isset($_SESSION['imp']['server']) ? $_SESSION['imp']['server'] :
-                                                              Util::getFormData('server'),
-            'port'     => isset($_SESSION['imp']['port']) ? $_SESSION['imp']['port'] :
-                                                            Util::getFormData('port'),
-            'protocol' => isset($_SESSION['imp']['protocol']) ? $_SESSION['imp']['protocol'] :
-                                                                Util::getFormData('protocol'),
-            'folders'  => isset($_SESSION['imp']['folders']) ? $_SESSION['imp']['folders'] :
-                                                               Util::getFormData('folders'),
-            'language' => isset($_SESSION['imp']['language']) ? $_SESSION['imp']['language'] :
-                                                                Util::getFormData('language')
+            'imapuser' => isset($_SESSION['imp']['user']) ?
+                          $_SESSION['imp']['user'] :
+                          Util::getFormData('imapuser'),
+            'server'   => isset($_SESSION['imp']['server']) ?
+                          $_SESSION['imp']['server'] :
+                          Util::getFormData('server'),
+            'port'     => isset($_SESSION['imp']['port']) ?
+                          $_SESSION['imp']['port'] :
+                          Util::getFormData('port'),
+            'protocol' => isset($_SESSION['imp']['protocol']) ?
+                          $_SESSION['imp']['protocol'] :
+                          Util::getFormData('protocol'),
+            'language' => isset($_SESSION['imp']['language']) ?
+                          $_SESSION['imp']['language'] :
+                          Util::getFormData('language'),
+            'smtphost' => isset($_SESSION['imp']['smtphost']) ?
+                          $_SESSION['imp']['smtphost'] :
+                          Util::getFormData('smtphost'),
+            'smtpport' => isset($_SESSION['imp']['smtpport']) ?
+                          $_SESSION['imp']['smtpport'] :
+                          Util::getFormData('smtpport'),
         );
 
-        $url = 'login.php';
-
-        foreach ($params as $key => $val) {
-            if (!empty($val)) {
-                $url = Util::addParameter($url, $key, $val, false);
-            }
-        }
-
+        $url = Util::addParameter('login.php', array_diff($params, array('')), null, false);
         return Horde::applicationUrl($url, true);
     }
 
@@ -867,26 +805,35 @@
      * mailbox names that shouldn't be displayed to the user, then use it to
      * strip that prefix out.
      *
-     * @param string $folder   The folder name to display.
-     * @param boolean $decode  Whether or not the folder needs to be decoded
-     *                         from UTF7-IMAP.
+     * @param string $folder  The folder name to display.
      *
      * @return string  The folder, with any prefix gone.
      */
-    function displayFolder($folder, $decode = true)
+    function displayFolder($folder)
     {
-        $prefix = IMP::preambleString();
-        if (substr($folder, 0, ($prefixLen = strlen($prefix))) == $prefix) {
-            $folder = substr($folder, $prefixLen);
-        }
-        if ($decode) {
-            $folder = String::convertCharset($folder, 'UTF7-IMAP');
+        static $cache = array();
+
+        if (isset($cache[$folder])) {
+            return $cache[$folder];
         }
+
         if ($folder == 'INBOX') {
-            $folder = _("INBOX");
+            $cache[$folder] = _("Inbox");
+        } else {
+            $namespace_info = IMP::getNamespace($folder);
+            if (!is_null($namespace_info) &&
+                !empty($namespace_info['name']) &&
+                ($namespace_info['type'] == 'personal') &&
+                substr($folder, 0, strlen($namespace_info['name'])) == $namespace_info['name']) {
+                $cache[$folder] = substr($folder, strlen($namespace_info['name']));
+            } else {
+                $cache[$folder] = $folder;
+            }
+
+            $cache[$folder] = String::convertCharset($cache[$folder], 'UTF7-IMAP');
         }
 
-        return $folder;
+        return $cache[$folder];
     }
 
     /**
@@ -909,6 +856,46 @@
     }
 
     /**
+     * Returns the specified permission for the current user.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $permission  A permission, either 'create_folders' or
+     *                            'max_folders'.
+     * @param boolean $value      If true, the method returns the value of a
+     *                            scalar permission, otherwise whether the
+     *                            permission limit has been hit already.
+     *
+     * @return mixed  The value of the specified permission.
+     */
+    function hasPermission($permission, $value = false)
+    {
+        global $perms;
+
+        if (!$perms->exists('imp:' . $permission)) {
+            return true;
+        }
+
+        $allowed = $perms->getPermissions('imp:' . $permission);
+        if (is_array($allowed)) {
+            switch ($permission) {
+            case 'create_folders':
+                $allowed = array_reduce($allowed, create_function('$a, $b', 'return $a | $b;'), false);
+                break;
+            case 'max_folders':
+                $allowed = array_reduce($allowed, create_function('$a, $b', 'return max($a, $b);'), 0);
+                break;
+            }
+        }
+        if ($permission == 'max_folders' && !$value) {
+            $folder = &IMP_Folder::singleton();
+            $allowed = $allowed > count($folder->flist_IMP(array(), false));
+        }
+
+        return $allowed;
+    }
+
+    /**
      * Build IMP's list of menu items.
      */
     function getMenu($returnType = 'object')
@@ -921,23 +908,47 @@
         $menu_mailbox_url = Horde::applicationUrl('mailbox.php');
         $menu_allow_folders = ($conf['user']['allow_folders'] && isset($menu_folders));
 
+        $spam_folder = IMP::folderPref($prefs->getValue('spam_folder'), true);
+
         $menu = &new Menu(HORDE_MENU_MASK_ALL & ~HORDE_MENU_MASK_LOGIN);
 
         $menu->add(Util::addParameter($menu_mailbox_url, 'mailbox', 'INBOX'), _("_Inbox"), 'folders/inbox.png');
-        if (($_SESSION['imp']['base_protocol'] != 'pop3') && $prefs->getValue('use_trash') && ($prefs->getValue('trash_folder') !== null) && $prefs->getValue('empty_trash_menu')) {
-            $menu_trash_url = Util::addParameter($menu_mailbox_url, 'thismailbox', IMP::preambleString() . $prefs->getValue('trash_folder'));
-            $menu_trash_url = Util::addParameter($menu_trash_url, 'actionID', 'empty_mailbox');
-            $menu_trash_url = Util::addParameter($menu_trash_url, 'return_url', Util::addParameter($menu_mailbox_url, 'mailbox', $_SESSION['imp']['mailbox']));
-            $menu->add($menu_trash_url, _("Empty _Trash"), 'empty_trash.png', null, null, "d = new Date(); if (d.getTime() - menu_trash_confirmed > 100) { menu_trash_cvalue = window.confirm('" . addslashes(_("Are you sure you wish to empty your trash folder?")) . "'); d = new Date(); menu_trash_confirmed = d.getTime(); } return menu_trash_cvalue;", '__noselection');
+        if (($_SESSION['imp']['base_protocol'] != 'pop3') &&
+            ($prefs->getValue('use_trash') || $prefs->getValue('use_vtrash')) &&
+            $prefs->getValue('empty_trash_menu')) {
+            $mailbox = null;
+            if ($prefs->getValue('use_vtrash')) {
+                $mailbox = IMP_SEARCH_MBOX .  $prefs->getValue('vtrash_id');
+            } else {
+                $trash_folder = IMP::folderPref($prefs->getValue('trash_folder'), true);
+                if (!is_null($trash_folder)) {
+                    $mailbox = $trash_folder;
+                }
+            }
+
+            if (!is_null($mailbox)) {
+                $menu_trash_url = Util::addParameter($menu_mailbox_url,
+                                                     array('mailbox' => $mailbox,
+                                                           'actionID' => 'empty_mailbox'));
+                $menu->add($menu_trash_url, _("Empty _Trash"), 'empty_trash.png', null, null, "return window.confirm('" . addslashes(_("Are you sure you wish to empty your trash folder?")) . "');", '__noselection');
+            }
         }
-        $menu->add(IMP::composeLink(), _("_Compose"), 'compose.png');
+
+        if (($_SESSION['imp']['base_protocol'] != 'pop3') && ($spam_folder !== null) && $prefs->getValue('empty_spam_menu')) {
+            $menu_spam_url = Util::addParameter($menu_mailbox_url, array('mailbox' => $spam_folder,
+                                                                         'actionID' => 'empty_mailbox'));
+            $menu->add($menu_spam_url, _("Empty _Spam"), 'empty_spam.png', null, null, "return window.confirm('" . addslashes(_("Are you sure you wish to empty your spam folder?")) . "');", '__noselection');
+        }
+
+        $menu->add(IMP::composeLink(), _("_New Message"), 'compose.png');
+
         if ($conf['user']['allow_folders']) {
             $menu->add(Util::nocacheUrl(Horde::applicationUrl('folders.php')), _("_Folders"), 'folders/folder.png');
         }
         $menu->add($menu_search_url, _("_Search"), 'search.png', $registry->getImageDir('horde'));
         if ($prefs->getValue('fetchmail_menu')) {
             if ($prefs->getValue('fetchmail_popup')) {
-                $menu->add('#', _("F_etch Mail"), 'fetchmail.png', null, 'fetchmail', 'window.open(\'' . Horde::applicationUrl('fetchmail.php'). '\', \'fetchmail\', \'toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=300,height=450,left=100,top=100\'); return false;');
+                $menu->add(Horde::applicationUrl('fetchmail.php'), _("F_etch Mail"), 'fetchmail.png', null, 'fetchmail', 'window.open(\'' . Horde::applicationUrl('fetchmail.php'). '\', \'fetchmail\', \'toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=300,height=450,left=100,top=100\'); return false;');
             } else {
                 $menu->add(Horde::applicationUrl('fetchmail.php'), _("F_etch Mail"), 'fetchmail.png');
             }
@@ -994,13 +1005,17 @@
         if (isset($_SESSION['imp']['stream'])) {
             $alerts = imap_alerts();
             if (is_array($alerts)) {
+                $alerts = str_replace('[ALERT] ', '', $alerts);
                 foreach ($alerts as $alert) {
-                    $notification->push($alert, 'horde.message');
+                    $notification->push($alert, 'horde.warning');
                 }
             }
         }
 
-        $notification->notify(array('listeners' => 'status'));
+        /* BC check. */
+        if (class_exists('Notification_Listener_audio')) {
+            $notification->notify(array('listeners' => array('status', 'audio')));
+        }
     }
 
     /**
@@ -1024,8 +1039,7 @@
         if (!empty($_alert)) {
             if ($count == 1) {
                 $mailboxOpenUrl = Horde::applicationUrl('mailbox.php', true);
-                $mailboxOpenUrl = Util::addParameter($mailboxOpenUrl, 'no_newmail_popup', 1);
-                $mailboxOpenUrl = Util::addParameter($mailboxOpenUrl, 'mailbox', $_mailbox_message);
+                $mailboxOpenUrl = Util::addParameter($mailboxOpenUrl, array('no_newmail_popup' => 1, 'mailbox' => $_mailbox_message));
 
                 return "if (confirm('" . addslashes(_("You have new mail in the following folder:")) . '\n' .
                     $_alert . addslashes(_("Do you want to open that folder?")) .
@@ -1092,12 +1106,11 @@
         $msgList = array();
 
         if (is_a($indices, 'IMP_Mailbox')) {
-            $msgIdx = $indices->getIndex(true);
+            $msgIdx = $indices->getIMAPIndex();
             if (empty($msgIdx)) {
                 return false;
             }
-            $parts = explode(IMP_IDX_SEP, $msgIdx);
-            $msgList[$parts[1]][] = $parts[0];
+            $msgList[$msgIdx['mailbox']][] = $msgIdx['index'];
             return $msgList;
         }
 
@@ -1156,4 +1169,188 @@
         return isset($_SESSION['imp']['_logintasks']) ? $_SESSION['imp']['_logintasks'] : 0;
     }
 
+    /**
+     * Get namespace info for a full folder path.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $mailbox  The folder path.
+     * @param boolean $empty   If true and no matching namespace is found,
+     *                         return the empty namespace, if it exists.
+     *
+     * @return mixed  The namespace info for the folder path or null if the
+     *                path doesn't exist.
+     */
+    function getNamespace($mailbox, $empty = true)
+    {
+        static $cache = array();
+
+        if ($_SESSION['imp']['base_protocol'] == 'pop3') {
+            return null;
+        }
+
+        $key = (int)$empty;
+        if (isset($cache[$key][$mailbox])) {
+            return $cache[$key][$mailbox];
+        }
+
+        foreach ($_SESSION['imp']['namespace'] as $key => $val) {
+            if (!empty($key) && (strpos($mailbox, $key) === 0)) {
+                $cache[$key][$mailbox] = $val;
+                return $val;
+            }
+        }
+
+        if ($empty && isset($_SESSION['imp']['namespace'][''])) {
+            $cache[$key][$mailbox] = $_SESSION['imp']['namespace'][''];
+        } else {
+            $cache[$key][$mailbox] = null;
+        }
+
+        return $cache[$key][$mailbox];
+    }
+
+    /**
+     * Get the default personal namespace.
+     *
+     * @since IMP 4.1
+     *
+     * @return mixed  The default personal namespace info.
+     */
+    function defaultNamespace()
+    {
+        static $default = null;
+
+        if ($_SESSION['imp']['base_protocol'] == 'pop3') {
+            return null;
+        }
+
+        if (!$default) {
+            foreach ($_SESSION['imp']['namespace'] as $val) {
+                if ($val['type'] == 'personal') {
+                    $default = $val;
+                    break;
+                }
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Convert a preference value to/from the value stored in the preferences.
+     *
+     * Preferences that need to call this function before storing/retrieving:
+     *   trash_folder, spam_folder, drafts_folder, sent_mail_folder
+     * To allow folders from the personal namespace to be stored without this
+     * prefix for portability, we strip the personal namespace. To tell apart
+     * folders from the personal and any empty namespace, we prefix folders
+     * from the empty namespace with the delimiter.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $mailbox  The folder path.
+     * @param boolean $append  True - convert from preference value.
+     *                         False - convert to preference value.
+     *
+     * @return string  The folder name.
+     */
+    function folderPref($folder, $append)
+    {
+        $def_ns = IMP::defaultNamespace();
+        $empty_ns = IMP::getNamespace('');
+        if ($append) {
+            /* Converting from preference value. */
+            if (!is_null($empty_ns) &&
+                strpos($folder, $empty_ns['delimiter']) === 0) {
+                /* Prefixed with delimiter => from empty namespace. */
+                $folder = substr($folder, strlen($empty_ns['delimiter']));
+            } elseif (is_null($ns = IMP::getNamespace($folder, false))) {
+                /* No namespace prefix => from personal namespace. */
+                $folder = $def_ns['name'] . $folder;
+            }
+        } elseif (!$append && !is_null($ns = IMP::getNamespace($folder))) {
+            /* Converting to preference value. */
+            if ($ns['name'] == $def_ns['name']) {
+                /* From personal namespace => strip namespace. */
+                $folder = substr($folder, strlen($def_ns['name']));
+            } elseif ($ns['name'] == $empty_ns['name']) {
+                /* From empty namespace => prefix with delimiter. */
+                $folder = $empty_ns['delimiter'] . $folder;
+            }
+        }
+        return $folder;
+    }
+
+    /**
+     * Make sure a user-entered mailbox contains namespace information.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $mbox  The user-entered mailbox string.
+     *
+     * @return string  The mailbox string with any necessary namespace info
+     *                 added.
+     */
+    function appendNamespace($mbox)
+    {
+        $ns_info = IMP::getNamespace($mbox, false);
+        if (is_null($ns_info)) {
+            $ns_info = IMP::defaultNamespace();
+        }
+        return $ns_info['name'] . $mbox;
+    }
+
+    /**
+     * Generates a URL with any necessary information required for handling a
+     * search mailbox added to the parameters.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $page     Page name to link to.
+     * @param string $mailbox  The mailbox to use on the linked page.
+     * @param string $index    The index to use on the linked page.
+     *
+     * @return string  URL to $page with any necessary search information
+     *                 added to the parameter list of the URL.
+     */
+    function generateSearchUrl($page, $mailbox, $index = null)
+    {
+        $link = Horde::applicationUrl($page);
+
+        foreach (IMP::getSearchParameters($mailbox, $index) as $key => $val) {
+            $link = Util::addParameter($link, $key, $val);
+        }
+
+        return $link;
+    }
+
+    /**
+     * Returns a list of parameters necessary for handling a search mailbox.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $mailbox  The mailbox to use on the linked page.
+     * @param string $index    The index to use on the linked page.
+     *
+     * @return array  The list of parameters needed for handling a search
+     *                mailbox (may be empty if not currently in a search
+     *                mailbox).
+     */
+    function getSearchParameters($mailbox, $index = null)
+    {
+        $params = array();
+
+        if (isset($GLOBALS['imp_search']) &&
+            $GLOBALS['imp_search']->searchMboxID()) {
+            $params['thismailbox'] = $mailbox;
+            $params['mailbox'] = $GLOBALS['imp']['mailbox'];
+        }
+        if (!is_null($index)) {
+            $params['index'] = $index;
+        }
+
+        return $params;
+    }
+
 }


--- orig/po/pt_PT.po
+++ mod/po/pt_PT.po
@@ -1,10 +1,12 @@
 # IMP Portugal Portuguese translation.
-# Nuno Loureiro <nuno at eth.pt>, 2002.
+# Manuel Menezes de Sequeira <Manuel.Sequeira>, 2005.
+# Based on a previous translation by Nuno Loureiro <nuno at eth.pt>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
-"POT-Creation-Date: 2002-05-28 01:56+0100\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-13 17:13+0200\n"
 "PO-Revision-Date: 2002-01-07 18:25 +0200\n"
 "Last-Translator: Nuno Loureiro <nuno at eth.pt>\n"
 "Language-Team: Brazilian Portuguese <dev at lists.horde.org>\n"
@@ -12,268 +14,700 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: lib/Compose.php:265 lib/Compose.php:317
 msgid "      To: "
 msgstr "    Para: "
 
+#: lib/Compose.php:253 lib/Compose.php:305
 msgid "    Date: "
 msgstr "    Data: "
 
+#: lib/Compose.php:256 lib/Compose.php:308
 msgid "    From: "
 msgstr "      De: "
 
-msgid " - $nm new message"
-msgstr " - $nm nova mensagem"
-
-msgid " - $nm new messages"
-msgstr " - $nm novas mensagens"
+#: mailbox.php:406 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr " (Chave de acesso %s)"
 
+#: lib/Compose.php:262 lib/Compose.php:314
 msgid " Subject: "
 msgstr " Assunto: "
 
+#: templates/compose/spelling.inc:74
 msgid " in "
 msgstr " em  "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr "%A, %e de %B de %Y às %H:%M:%S %Z"
+#: lib/Block/summary.php:71
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr "%.2fMB / %.2fMB  (%.2f%%)"
+
+#: mailbox.php:196
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "%d mensagens foram removidas."
+
+#: lib/Spam.php:178
+#, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+"%d mensagens foram reportadas como não spam ao seu administrador de sistemas."
+
+#: lib/Spam.php:158
+#, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "%d mensagens foram reportadas como não spam."
+
+#: lib/Spam.php:170
+#, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr ""
+"%d mensagens foram reportadas como spam ao seu administrador de sistemas."
 
-#, c-format
-msgid "%d of %d Messages"
-msgstr "%d de %d Mensagens"
+#: lib/Spam.php:150
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "%d mensagens foram reportadas como spam."
 
-#, c-format
+#: mailbox.php:369
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d a %d de %d Mensagens"
 
-#, c-format
-msgid "%s Standard"
-msgstr "Standard %s"
+#: mailbox.php:619
+#, php-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: pgp.php:332
+#, php-format
+msgid "%s PGP Administration"
+msgstr "Administração do PGP para %s"
+
+#: smime.php:254
+#, php-format
+msgid "%s S/MIME Administration"
+msgstr "Administração do S/MIME para %s"
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:46
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s já existe. A pasta %s não foi renomeada."
 
-#, c-format
+#: lib/Message.php:612
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr "%s não parece ser uma caixa postal válida."
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "A pasta %s será renomeada no início do mês."
 
-#, c-format
-msgid "%s messages were fetched..."
-msgstr "%s mensagens foram puxadas..."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr "%s aceitou."
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr "%s cancelou %s."
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr "%s declinou."
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr "%s respondeu a um pedido livre/ocupado."
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr "%s respondeu ao convite para %s."
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr "%s enviou-lhe informação livre/ocupado."
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr "%s aceitou tentativamente."
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s solicita-lhe a sua informação livre/ocupado."
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr "%s pede a sua presença em %s."
+
+#: lib/Message.php:377
+#, php-format
+msgid "%s was successfully added to %s."
+msgstr "%s foi adicionada com sucesso a %s."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr "%s deseja corrigir %s."
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr "%s deseja avisá-lo de que %s."
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr "%s deseja receber a informação mais actualizada sobre %s."
+
+#: message.php:269 message.php:274
+#, php-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#, c-format
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
+#: templates/compose/spelling.inc:140
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Efectuar alterações e avançar para a próxima página.)"
 
+#: templates/compose/spelling.inc:127
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr ""
 "(Cancelar todas as alterações e retornar à janela de escrita de mensagem.)"
 
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Retornar à janela de escrita de mensagem depois de efectuar as alterações "
-"feitas até ao momento. As alterações da janela actual NÃO serão efectuadas.)"
+"(Voltar à janela de composição depois de efectuar as alterações feitas até "
+"ao momento. As alterações na janela actual NÃO serão efectuadas.)"
 
+#: spelling.php:277
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Enviar mensagem depois de aplicar todas as alterações feitas até ao "
+"momento. As alterações na janela actual NÃO serão efectuadas.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
-msgstr "* Adicione isto clicando em OK *"
+msgstr "* Adicione clicando em OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Por favor seleccione endereço(s) *"
 
-#, c-format
+#: mailbox.php:194
+msgid "1 message has been deleted."
+msgstr "1 mensagem foi removida."
+
+#: lib/Spam.php:180
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+"1 mensagem foi reportada como não sendo spam ao seu administrador de sistema."
+
+#: lib/Spam.php:160
+msgid "1 message has been reported as not spam."
+msgstr "1 mensagem foi reportada como não sendo spam."
+
+#: lib/Spam.php:172
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "1 mensagem foi reportada como spam ao seu administrador de sistema."
+
+#: lib/Spam.php:152
+msgid "1 message has been reported as spam."
+msgstr "1 mensagem foi reportada como spam."
+
+#: config/prefs.php.dist:788
+msgid "100 characters"
+msgstr "100 caracteres"
+
+#: config/prefs.php.dist:791
+msgid "1000 characters"
+msgstr "1000 caracteres"
+
+#: config/prefs.php.dist:789
+msgid "250 characters"
+msgstr "250 caracteres"
+
+#: config/prefs.php.dist:790
+msgid "500 characters"
+msgstr "500 caracteres"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr "Uma grande imagem chamada %s é anexo desta mensagem."
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new window.</"
-"i></p>\n"
-msgstr ""
-"<p><i>Esta mensagem foi escrita num conjunto de caracteres diferente do seu. "
-"Se não for mostrada corretamente %sclique aqui</a> para a abrir numa nova "
-"janela.</i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+"Uma mensagem por si enviada resultou numa notificação de retorno do "
+"destinatário."
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr "E"
 
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr "Aceitar pedido"
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr "Aceitar pedido e adicioná-lo ao meu calendário"
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr "Aceite"
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr "Aceite:"
+
+#: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Nome da conta:"
 
-msgid "Action"
-msgstr "Acção"
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+msgid "Actions"
+msgstr "Acções"
+
+#: templates/prefs/sourceselect.inc:303
+msgid "Add source"
+msgstr "Adicionar fonte"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr "Adicionar isto ao meu calendário"
+
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, php-format
+msgid "Add to Address book (%s)"
+msgstr "Adicionar ao Livro de Endereços (%s)"
+
+#: compose.php:1191
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr "\"%s\" incluído como anexo."
 
-#, c-format
-msgid "Add to Addressbook (%s)"
-msgstr "Adicionar aos Contactos (%s)"
+#: config/prefs.php.dist:190
+msgid ""
+"Additional headers to display when viewing: <i>(optional, enter each header "
+"on a new line)</i>"
+msgstr ""
+"Cabeçalhos adicionais a mostrar quando visualizando: <i>(opcional, cada "
+"cabeçalho em sua linha)</i>"
 
-msgid "Added an attachment."
-msgstr "Anexo incluído."
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr "Informação adicional pode ser vista %s."
+
+#: lib/MIME/Viewer/notification.php:62
+msgid "Additional information details"
+msgstr "Pormenores adicionais da informação"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr "Pormenores adicionais da mensagem"
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr "Pormenores adicionais da mensagem podem ser vistos %s."
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr "Pormenores adicionais da mensagem de erro"
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr "Pormenores de erro adicionais da mensagem podem ser vistos %s."
 
+#: contacts.php:90 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
 msgid "Address Book"
-msgstr "Lista de Contactos"
+msgstr "Livro de Endereços"
 
-msgid "Addressbooks"
+#: config/prefs.php.dist:126
+msgid "Address Books"
 msgstr "Listas de Contactos"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Todas as mensagens da(s) seguinte(s) pastas(s) serão apagadas!"
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to BCC all messages: <i>(optional, enter each address on a new "
+"line)</i>"
+msgstr ""
+"Endereços aos quais enviar como Cco todas as mensagens: <i>(opcional, cada "
+"endereço em sua linha)</i>"
+
+#: config/prefs.php.dist:173
+msgid ""
+"Addresses to explicitly tie to this identity: <i>(optional, enter each "
+"address on a new line)</i>"
+msgstr ""
+"Endereços a ligar explicitamente a esta identidade: <i>(opcional, cada "
+"endereço em sua linha)</i>"
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+msgid "All"
+msgstr "Tudo"
 
+#: templates/folders/javascript.inc:5
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Todas as mensagens da(s) seguinte(s) pastas(s) serão puxadas para um único "
-"ficheiro no formato MBOX "
+"arquivo MBOX "
 
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:81
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
-"Todas as mensagens da pasta \"%s\" mais velhas do que %s dias serão "
-"permanentemente apagadas."
+"Todas as mensagens da pasta \"%s\" com mais do que %s dias serão "
+"permanentemente removidas."
 
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "Todos os anexos com ligações com mais de %s meses serão removidos."
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
-"Todas as pastas de mensagens enviadas, mais velhas do que %s meses serão "
-"apagadas."
-
-msgid "All"
-msgstr "Tudo"
-
-msgid "An unknown error occured adding the new entry."
-msgstr "Ocorreu um erro desconhecido ao adicionar uma nova entrada."
-
-msgid "Answered messages"
-msgstr "Mensagens respondidas"
+"Todas as pastas de mensagens enviadas com mais do que %s meses serão "
+"removidas."
 
-msgid "Answered"
-msgstr "Respondida"
+#: acl.php:85
+#, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr ""
+"Todos os direitos sobre a pasta \"%s\" foram removidos com sucesso para o "
+"utilizador \"%s\"."
 
-msgid "Apply All Rules"
-msgstr "Aplicar Todas Regras"
+#: templates/filters/prefs.inc:55
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr "Permitir a aplicação de regras de filtragem a qualquer caixa postal?"
 
-msgid "Apply Filters on"
-msgstr "Aplicar Filtros em"
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr "Partes alternativas para esta secção:"
 
-msgid "Apply filter rules upon logging on."
-msgstr "Aplicar as regras de filtragem aquando o login."
+#: config/prefs.php.dist:565 config/prefs.php.dist:577
+msgid "Always"
+msgstr "Sempre"
 
-msgid "Apply filter rules when mailbox is refreshed."
-msgstr "Aplicar as regras de filtragem quando a mailbox for relida."
+#: config/prefs.php.dist:550
+msgid "Always save attachments"
+msgstr "Guardar sempre os anexos"
 
-msgid "April"
-msgstr "Abril"
+#: lib/Message.php:468
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr "Ocorreu um erro ao tentar descartar o anexo. O servidor IMAP disse: "
+
+#: lib/Message.php:364
+msgid "An unknown error occured while creating the new task."
+msgstr "Ocorreu um erro desconhecido ao criar uma nova tarefa."
+
+#: message.php:484 mailbox.php:693 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
+msgid "Answered"
+msgstr "Respondida"
 
-msgid "Are you SURE you want to continue?"
-msgstr "Tem a certeza que deseja continuar?"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Mensagens respondidas"
 
-msgid "Are you completely sure you wish to continue?"
-msgstr "Tem a certeza absoluta que deseja continuar?"
+#: templates/mailbox/header.inc:7
+msgid "Apply Filters"
+msgstr "Aplicar Filtros"
+
+#: templates/mailbox/header.inc:7
+#, php-format
+msgid "Apply Filters to %s"
+msgstr "Aplicar Filtros a %s"
+
+#: templates/filters/prefs.inc:43
+msgid "Apply filter rules upon logging on?"
+msgstr "Aplicar as regras de filtragem aquando da entrada?"
+
+#: templates/filters/prefs.inc:49
+msgid "Apply filter rules whenever INBOX is displayed?"
+msgstr "Aplicar as regras de filtragem quando a Entrada for mostrada?"
 
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
 msgid "Are you sure you want to delete this public key?"
-msgstr "Tem a certeza que deseja apagar esta chave publica?"
+msgstr "Tem a certeza que deseja remover esta chave pública?"
 
+#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
-"Tem a certeza que quer apagar o par de chaves? (Não é recomendado!)"
+"Tem a certeza de que quer remover o seu par de chaves? (NÃO é recomendado!)"
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Tem a certeza que deseja fazer isto?"
 
+#: message.php:391 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
-msgstr "Tem a certeza que deseja apagar PERMANENTEMENTE estas mensagens?"
+msgstr "Tem a certeza que deseja remover PERMANENTEMENTE estas mensagens?"
 
+#: lib/MIME/Contents.php:202
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Tem a certeza que deseja remover PERMANENTEMENTE este anexo?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
-msgstr "Tem a certeza que deseja apagar esta pasta?"
+msgstr "Tem a certeza que deseja remover esta pasta?"
+
+#: lib/IMP.php:931
+msgid "Are you sure you wish to empty your trash folder?"
+msgstr "Tem a certeza que deseja esvaziar a pasta de lixo?"
 
+#: templates/mailbox/actions.inc:8
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Tem a certeza que deseja remover permanentemente estas mensagens?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Tem a certeza de que quer reportar esta mensagem como sendo inocente?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Tem a certeza de que quer reportar esta mensagem como sendo spam?"
+
+#: config/prefs.php.dist:887
 msgid "Arrival Time"
-msgstr "Data de chegada"
+msgstr "Data de Chegada"
 
+#: config/prefs.php.dist:902
 msgid "Ascending"
 msgstr "Crescente"
 
-msgid "Attach a copy of your PGP public key to your message?"
-msgstr "Anexar uma cópia da sua chave publica de PGP à mensagem?"
+#: config/prefs.php.dist:564 config/prefs.php.dist:576
+msgid "Ask"
+msgstr "Perguntar"
 
+#: templates/compose/compose.inc:509
 msgid "Attach"
 msgstr "Anexar"
 
+#: templates/compose/compose.inc:466
+msgid "Attach Files"
+msgstr "Anexar Arquivos"
+
+#: templates/compose/compose.inc:447
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "Anexar uma cópia da sua chave pública de PGP à sua mensagem?"
+
+#: lib/MIME/Viewer/tnef.php:109
+msgid "Attached File:"
+msgstr "Arquivo Anexado:"
+
+#: lib/Compose.php:362 lib/Compose.php:447
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr "O arquivo \"%s\" excede a dimensão limite. O arquivo NÃO foi anexado."
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "Em anexo está a resposta a um pedido de calendário que você enviou."
+
+#: mailbox.php:729 templates/mailbox/legend.inc:16
+#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
+#: templates/compose/attachments.js:98
 msgid "Attachment"
 msgstr "Anexo"
 
+#: compose.php:1001 lib/Message.php:429
+msgid "Attachment stripped: Original attachment type"
+msgstr "Anexo descartado: Tipo de anexo original"
+
+#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
+#: lib/Compose.php:984
 msgid "Attachments"
 msgstr "Anexos"
 
-msgid "August"
-msgstr "Agosto"
+#: lib/MIME/Viewer/itip.php:682
+msgid "Attendees"
+msgstr "Participantes"
+
+#: lib/MIME/Viewer/notification.php:53
+msgid "Attention"
+msgstr "Atenção"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr "Auth_imp: Extensão IMAP necessária mas não encontrada."
+
+#: config/prefs.php.dist:634
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
+"Mostrar automaticamente imagens em mensagens HTML quando enviadas por "
+"correspondente listado no meu livro de endereços?"
 
-msgid "Available Addressbooks:"
-msgstr "Listas de contactos disponíveis:"
+#: templates/prefs/sourceselect.inc:298
+msgid "Available Address books:"
+msgstr "Livros de Endereços disponíveis:"
+
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr "Esperando Resposta"
+
+#: templates/message/navbar_navigate.inc:26
+#, php-format
+msgid "Bac_k to %s"
+msgstr "Vol_tar para %s"
 
-#, c-format
+#: thread.php:86 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Voltar para %s"
 
-msgid "Barbie"
-msgstr "Barbie"
-
+#: message.php:250 search.php:147 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20
 msgid "Bcc"
 msgstr "Bcc"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr "Abaixo encontra-se o texto cru da mensagem de informação de estado."
+
+#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Lista Negra"
 
-msgid "Body"
-msgstr "Texto"
+#: config/prefs.php.dist:622
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+"Bloquer imagens em mensagens HTML excepto quando explicitamente pedidas?"
 
-msgid "Both Header Listing and Body of Message"
-msgstr "Ambas listagem do cabeçalho e corpo da mensagem"
+#: search.php:155
+msgid "Body"
+msgstr "Corpo"
 
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Ambas"
 
-msgid "Brown"
-msgstr "Castanho"
-
-msgid "Camouflage"
-msgstr "Camoflagem"
+#: config/prefs.php.dist:681
+msgid "Both Header Listing and Body of Message"
+msgstr "Listagem no Cabeçalho e Corpo da Mensagem"
 
-msgid "Can't connect to the Mail Server"
-msgstr "Não foi possível estabelecer ligação ao servidor de Mail"
+#: templates/compose/compose.inc:283
+msgid "C_harset"
+msgstr "Có_digo"
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr "Calendário"
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr "Impossível conectar ao servidor de correio electrónico remoto."
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr "Impossível conectar ao servidor de correio electrónico remoto: "
 
-msgid "Cancel Message"
-msgstr "Cancelar Mensagem"
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+"Não se pode mostrar - encontradas apenas %s de %s partes desta mensagem na "
+"caixa postal corrente."
 
+#: folders.php:273 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/smime/passphrase.inc:22
+#: templates/smime/import_key.inc:85 templates/compose/spelling.inc:127
+#: templates/pgp/passphrase.inc:32 templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
+#: templates/compose/redirect.inc:116
+msgid "Cancel Message"
+msgstr "Cancelar Mensagem"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
 "Ao cancelar esta mensagem irá perder todo o seu conteúdo permanentemente."
 
+#: message.php:249 search.php:143 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15
 msgid "Cc"
 msgstr "Cc"
 
-msgid "Cc:"
-msgstr "Cc:"
+#: lib/MIME/Viewer/itip.php:701
+msgid "Chair Person"
+msgstr "Moderador"
+
+#: templates/compose/spelling.inc:86
+msgid "Change"
+msgstr "Alterar"
 
+#: templates/compose/spelling.inc:87
 msgid "Change All"
 msgstr "Alterar Tudo"
 
+#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+msgid "Change Folder"
+msgstr "Alterar Pasta"
+
+#: config/prefs.php.dist:111
 msgid ""
-"Change display options such as the color scheme, how many messages you see "
-"on each page and how messages are sorted."
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
 msgstr ""
-"Alterar opções de visualização tais como o conjunto de cores, quantas mensagens "
-"quer ver por página e respectiva ordenação."
+"Alterar opções de visualização tais como quantas mensagens quer ver por "
+"página e a respectiva ordenação."
 
-msgid "Change mail server settings."
-msgstr "Alterar os dados do seu servidor de email."
+#: config/prefs.php.dist:24
+msgid "Change mail server and folder settings."
+msgstr "Alterar dados do servidor de correio electrónico e das pastas."
 
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
@@ -281,1312 +715,3000 @@
 "Alterar o nome, email e assinatura que as pessoas verão quando lerem e "
 "responderem à sua mensagem."
 
-msgid "Change"
-msgstr "Alterar"
+#: config/prefs.php.dist:793
+msgid "Characters to display:"
+msgstr "Caracteres a mostrar:"
 
+#: templates/folders/actions.inc:13
 msgid "Check Folder(s) for New Mail"
 msgstr "Verifica se há Mensagens Novas na(s) Pasta(s)"
 
-msgid "Checkbox"
-msgstr "Caixa de marcar"
-
-msgid "Cherry"
-msgstr "Cereja"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:71
+msgid "Check _All/None"
+msgstr "Marcar _Tudo/Nada"
+
+#: templates/fetchmail/fetchmail.inc:14
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr "Verificar todos os servidores de onde pretende descarregar correio:"
+
+#: config/prefs.php.dist:454
+msgid "Check spelling before sending a message?"
+msgstr "Verificar a ortografia antes de enviar a mensagem?"
 
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Acção:"
 
-msgid "Choose the addressbook to use when adding addresses."
+#: config/servers.php.dist:195
+msgid "Choose a mail server:"
+msgstr "Escolher um servidor de correio electrónico:"
+
+#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
+#: templates/compose/compose.inc:228
+msgid "Choose a match or edit the address to the right:"
+msgstr "Escolha uma das correspondências ou edite o endereço à direita:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+msgid "Choose an action:"
+msgstr "Escolha uma acção:"
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
+msgstr "Escolha o livro de endereços a usar quando se adicionar endereços."
+
+#: templates/prefs/sourceselect.inc:293
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr ""
+"Escolha a ordem dos livros de endereços a procurar quando expandindo "
+"endereços."
+
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+"Carregue em %s para converter o arquivo de imagem para um formato que o "
+"navegador possa mostrar."
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr "Carregue em %s para descarregar a imagem."
+
+#: lib/Filter.php:107
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr "Carregue em %s para ir para página de gestão do %s."
+
+#: lib/MIME/Viewer/html.php:128
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Carregue em %s para ver o conteúdo HTML numa janela à parte."
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr "Carregue em %s para ver miniatura desta imagem."
+
+#: lib/MIME/Viewer/pkcs7.php:407
+#, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Carregue em %s para ver o anexo numa janela à parte."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+"Carregue em %s para ver multiparte/parte relacionada numa janela à parte."
+
+#: lib/MIME/Viewer/html.php:104
+msgid "Click here to HIDE the Images"
+msgstr "Carregue aqui para ESCONDER as Imagens"
+
+#: lib/MIME/Viewer/html.php:108
+msgid "Click here to SHOW the Images"
+msgstr "Carregue aqui para VER as Imagens"
+
+#: templates/prefs/sourceselect.inc:321
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
 msgstr ""
-"Escolha a lista de contactos que será utilizada para armazenar contactos."
+"Carregue num dos seus livros de endereços seleccionados e depois escolha os "
+"campos a procurar."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr "Clique para Guardar a Chave Pública PGP no seu Livro de Endereços"
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
+#: lib/MIME/Viewer/pkcs7.php:191
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
-"Escolha a ordem das listas de contactos que será utilizada na pesquisa de "
-"contactos."
+"Clique para Guardar o Certificado S/MIME de %s no seu Livro de Endereços"
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Todas as mensagem de %s foram apagadas."
+#: config/prefs.php.dist:921
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr "Carregar no endereço comporá uma nova mensagem para o remetente"
 
-msgid ""
-"Click on one of your selected addressbooks and then select all fields to "
-"search."
-msgstr "Escolha a sua lista de contactos e os campos de pesquisa. "
+#: config/prefs.php.dist:922
+msgid "Clicking on the address will open the message to be read"
+msgstr "Carregar no endereço abrirá a mensagem para leitura"
 
-msgid "Click to Save PGP Public Key in your Addressbook"
-msgstr "Clique para gravar a chave publica PGP na sua lista de contactos"
+#: templates/fetchmail/fetchmail.inc:30
+msgid "Close"
+msgstr "Fechar"
 
+#: compose.php:775 compose.php:1082
+msgid "Close this window"
+msgstr "Fechar esta Janela"
+
+#: folders.php:416
 msgid "Closed Folder"
 msgstr "Pasta Fechada"
 
-msgid "Collapse All Folders"
-msgstr "Fechar Todas Pastas"
+#: folders.php:436
+msgid "Collapse"
+msgstr "Colapsar"
 
+#: templates/folders/actions.inc:34
 msgid "Collapse All"
 msgstr "Fechar Todas"
 
+#: templates/folders/actions.inc:34
+msgid "Collapse All Folders"
+msgstr "Fechar Todas Pastas"
+
+#: folders.php:436
 msgid "Collapse Folder"
 msgstr "Fechar Pasta"
 
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr "Indicador Colorido:"
+
+#: templates/pgp/pgp.inc:191
 msgid "Comment"
 msgstr "Comentário"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Escrever Mensagem (%s)"
+#: lib/MIME/Viewer/itip.php:769
+msgid "Completed"
+msgstr "Completo"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
+msgid "Compose"
+msgstr "Escrever"
 
-msgid "Compose a message"
-msgstr "Escrever uma mensagem"
+#: mailbox.php:756 lib/MIME/Headers.php:192
+#, php-format
+msgid "Compose Message (%s)"
+msgstr "Escrever (%s)"
 
-msgid "Compose messages in a separate window."
-msgstr "Escrever mensagens numa janela separada."
+#: compose.php:774 compose.php:1081
+msgid "Compose another message"
+msgstr "Escrever uma outra mensagem"
 
-msgid "Compose"
-msgstr "Escrever Mensagem"
+#: config/prefs.php.dist:429
+msgid "Compose messages in a separate window?"
+msgstr "Escrever mensagens numa janela separada?"
 
-msgid "Contact List"
-msgstr "Lista de Contactos"
+#: config/prefs.php.dist:446
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+"Compor mensagens com o ambiente HTML por omissão (se o navegador o suportar)?"
 
-msgid "Control PGP support for IMP."
-msgstr "Suporte de controlo do PGP para o IMP."
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr "Configurar modo de visualização de mensagens."
+
+#: config/prefs.php.dist:96
+msgid "Configure mail preview options."
+msgstr "Configure as opções de previsão de mensagens de correio electrónico."
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr "A connecção ao servidor falhou"
+
+#: config/prefs.php.dist:135
+#, php-format
+msgid "Control PGP support for %s."
+msgstr "Controlar suporte de PGP para o %s."
+
+#: config/prefs.php.dist:144
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr "Controlar suporte de S/MIME para o %s."
 
+#: config/prefs.php.dist:88
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "Controlar a verificação de novas mensagens e respectiva notificação."
 
+#: config/prefs.php.dist:691
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "Converter ícones de emoção de texto para gráficos?"
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Copiar"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+msgid "Copy to folder"
+msgstr "Copiar para pasta"
+
+#: templates/compose/spelling.inc:66
 msgid "Correct"
 msgstr "Corrigir"
 
+#: templates/compose/spelling.inc:145
 msgid "Corrected Text"
 msgstr "Texto Corrigido"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
-msgstr "Não foi possível apagar mensagens de %s: %s"
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr "Impossível criar o mecanismo VFS: %s"
+
+#: lib/Message.php:603
+#, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "Não foi possível remover mensagens de %s. O servidor disse: %s"
+
+#: lib/Session.php:293
+msgid "Could not execute maintenance operations."
+msgstr "Não foi possível executar as operações de manutenção."
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr "Não foi possível extrair o arquivo desejado do anexo MS-TNEF."
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "Impossível extrair o arquivo desejado do arquivo Zip."
+
+#: search.php:361 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:157
+msgid "Create"
+msgstr "Criar"
 
+#: templates/folders/actions.inc:5
 msgid "Create Folder"
 msgstr "Criar Pasta"
 
+#: templates/pgp/pgp.inc:252
 msgid "Create Keys"
 msgstr "Criar chaves"
 
+#: templates/search/header.inc:14
+msgid "Create Virtual Folder"
+msgstr "Criar Pasta Virtual"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr "Criar Nova Conta"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+msgid "Create a new Spam folder"
+msgstr "Criar uma nova pasta de Spam"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
-msgstr "Criar pasta de rascunhos nova"
+msgstr "Criar uma pasta de rascunhos nova"
 
+#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
 msgid "Create a new sent mail folder"
 msgstr "Criar uma pasta de mensagens enviadas nova"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Criar uma pasta nova de apagados"
+msgstr "Criar uma nova pasta de lixo"
 
+#: config/prefs.php.dist:120
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"Criar filtros para organizar os emails recebidos, ordená-los nas respectivas "
-"pastas e apagar spam."
-
-msgid "Create"
-msgstr "Criar"
-
-msgid "Customize accounts for fetching mail from other POP3/IMAP accounts."
-msgstr "Costumizar contas para puxar mail de outros servidores POP3/IMAP."
-
-msgid "Customize how you send mail and where drafts are saved."
-msgstr ""
-"Personalizar o modo de envio de mensagens e onde serão gravados os rascunhos."
+"Criar regras de filtragem para organizar as mensagens recebidas, distribuí-"
+"las pelas respectivas pastas e remover spam."
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr ""
-"Personalizar as operações de manutenção executadas aquando o login no %s."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr "Acesso corrente a %s"
+
+#: config/prefs.php.dist:104
+msgid "Customize accounts for fetching mail from other accounts."
+msgstr "Personalizar contas para descarregar correio de outras contas."
+
+#: config/prefs.php.dist:51
+msgid "Customize how you send mail."
+msgstr "Personalizar forma de envio de correio."
 
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
-msgstr "Personalizar as tarefas que serão executadas aquando o login no %s."
+msgstr "Personalizar tarefas executadas ao aceder a %s."
+
+#: templates/mailbox/message_headers.inc:17
+msgid "Dat_e"
+msgstr "_Data"
 
+#: message.php:246 thread.php:92
 msgid "Date"
 msgstr "Data"
 
-msgid "December"
-msgstr "Dezembro"
+#: lib/MIME/Viewer/itip.php:757
+msgid "Declined"
+msgstr "Declinada"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr "Declinada:"
+
+#: config/prefs.php.dist:530
+msgid "Default"
+msgstr "Por Omissão"
 
+#: config/prefs.php.dist:894
 msgid "Default sorting criteria:"
 msgstr "Critério de ordenação padrão:"
 
+#: config/prefs.php.dist:904
 msgid "Default sorting direction:"
 msgstr "Ordenação padrão:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:765
+msgid "Delegated"
+msgstr "Delegada:"
+
+#: folders.php:407 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:93
+msgid "Delete"
+msgstr "Remover"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#, php-format
 msgid "Delete %s Public Key"
-msgstr "Apagar a chave publica %s"
+msgstr "Remover Chave Pública %s"
 
+#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
 msgid "Delete Current Keys"
-msgstr "Apagar as chaves correntes"
+msgstr "Remover Chaves Correntes"
 
+#: templates/folders/actions.inc:7
 msgid "Delete Folder(s)"
-msgstr "Apagar pasta(s)"
+msgstr "Remover Pasta(s)"
 
-msgid "Delete messages"
-msgstr "Apagar mensagens"
+#: folders.php:274
+msgid "Delete Selected Folders"
+msgstr "Remover Pastas Seleccionadas"
+
+#: folders.php:407
+msgid "Delete Virtual Folder"
+msgstr "Remover Pasta Virtual"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr "Remover do servidor remoto as mensagens descarregadas?"
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr "Remover do meu calendário"
+
+#: config/prefs.php.dist:362
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "Remover anexos ligados antigos no início de cada mês?"
+
+#: config/prefs.php.dist:344
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "Remover pastas antigas de enviados no início de cada mês?"
+
+#: config/prefs.php.dist:612
+msgid "Delete spam messages after they have been reported as spam?"
+msgstr "Remover mensagens de spam quando como tal forem reportadas?"
 
-msgid "Delete old sent-mail folders at beginning of month"
-msgstr "Apagar pastas antigas de enviados no início de cada mês"
-
-msgid "Delete"
-msgstr "Apagar"
-
-msgid "Deleted an attachment."
-msgstr "Um anexo foi apagado."
+#: message.php:487 mailbox.php:719 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Removida"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
-msgstr "Mensagens apagadas"
+msgstr "Mensagens removidas"
 
-msgid "Deleted"
-msgstr "Apagada"
+#: compose.php:280
+#, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Anexo \"%s\" removido."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
-msgstr "Apagar e mover mensagens"
+msgstr "Removendo e Movendo Mensagens"
+
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr "Recusar pedido"
 
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr "Recusar pedido de informação livre/ocupado"
+
+#: config/prefs.php.dist:903
 msgid "Descending"
 msgstr "Decrescente"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+msgid "Description"
+msgstr "Descrição"
+
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:151
 msgid "Details"
 msgstr "Detalhes"
 
+#: config/prefs.php.dist:671
 msgid "Dim signatures?"
 msgstr "Assinaturas DIM?"
 
-msgid "Display Options"
-msgstr "Opções de visualização"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Visualização"
+
+#: config/prefs.php.dist:470
+msgid "Display confirmation after sending a message?"
+msgstr "Mostrar confirmação após enviar uma mensagem?"
 
+#: config/prefs.php.dist:680
 msgid "Display in Body of Message"
-msgstr "Mostrar o corpo da Mensagem"
+msgstr "Mostrar no Corpo da Mensagem"
 
-msgid "Display message when filters have been applied."
-msgstr "Mostrar mensagens depois de aplicar filtros."
-
-msgid "Display pop-up notification of new mail."
-msgstr "Exibir notificação de nova mensagem."
+#: config/prefs.php.dist:768
+msgid "Display pop-up notification of new mail?"
+msgstr "Mostrar uma notificação \"popup\" quando chegarem novas mensagens?"
 
+#: config/prefs.php.dist:733
 msgid "Display the 'Empty Trash' link in the menubar?"
 msgstr "Mostrar o link 'Esvaziar lixo' na barra do menu?"
 
-msgid "Display"
-msgstr "Visualização"
+#: templates/compose/attachments.inc:11
+msgid "Disposition"
+msgstr "Disposição"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr "NÃO corresponde"
 
+#: templates/folders/actions.inc:14
 msgid "Do Not Check Folder(s) for New Mail"
-msgstr "Não Verificar se há Mensagens Novas na(s) Pasta(s)"
+msgstr "Não Verificar se Há Mensagens Novas na(s) Pasta(s)"
+
+#: config/prefs.php.dist:923
+msgid "Do not generate a link in the From: column"
+msgstr "Não gerar uma ligação na coluna De:"
 
+#: lib/IMP.php:1031
 msgid "Do you want to open that folder?"
 msgstr "Deseja abrir essa pasta?"
 
-msgid ""
-"Do you want your PGP public key to be attached to your messages by default?"
-msgstr ""
-"Quer que a sua chave publica PGP seja anexada ás suas mensagens por defeito?"
-
+#: templates/compose/spelling.inc:133
 msgid "Done"
 msgstr "Feito"
 
-#, c-format
-msgid "Download %s"
-msgstr "Receber %s"
+#: lib/MIME/Contents.php:191
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr "Descarregar %s em formato .zip"
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr "Descarregar Todos os Anexos (num ficheiro .zip)"
 
+#: templates/folders/actions.inc:18
 msgid "Download Folder(s)"
 msgstr "Receber Pasta(s)"
 
-msgid "Download"
-msgstr "Receber"
-
+#: templates/folders/actions.inc:19
+msgid "Download Folder(s) [.zip format]"
+msgstr "Receber Pasta(s) [.zip format]"
+
+#: lib/MIME/Contents.php:191
+msgid "Download in .zip Format"
+msgstr "Descarregar no Formato .zip"
+
+#: message.php:485 mailbox.php:698 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Rascunho"
 
+#: folders.php:387
+msgid "Draft folder"
+msgstr "Pasta de rascunhos"
+
+#: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "Pasta de rascunhos:"
 
-msgid "E-Mail"
-msgstr "E-Mail"
-
+#: templates/pgp/pgp.inc:196
 msgid "E-mail Address"
-msgstr "Endereço de E-Mail"
+msgstr "Endereço de Correio Electrónico"
+
+#: lib/Mailbox.php:303
+msgid "END"
+msgstr "FIM"
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr "ERRO: A sua mensagem não pôde ser entregue."
+
+#: folders.php:408
+msgid "Edit"
+msgstr "Editar"
 
-msgid "Edit your IMAP/POP3 accounts."
-msgstr "Editar as suas contas IMAP/POP3."
+#: templates/filters/prefs.inc:21
+msgid "Edit Blacklist"
+msgstr "Editar Lista Negra"
+
+#: templates/filters/prefs.inc:16
+msgid "Edit Filters"
+msgstr "Editar Filtros"
+
+#: folders.php:408 templates/search/header.inc:16
+#: templates/mailbox/header.inc:13
+msgid "Edit Virtual Folder"
+msgstr "Editar Pasta Virtual"
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr "Editar Definição de Pasta Virtual de %s"
+
+#: templates/filters/prefs.inc:26
+msgid "Edit Whitelist"
+msgstr "Editar Lista Branca"
+
+#: templates/filters/prefs.inc:21
+msgid "Edit your blacklist"
+msgstr "Editar a sua lista negra"
 
+#: templates/filters/prefs.inc:16
 msgid "Edit your filter rules"
 msgstr "Editar as suas regras de filtragem"
 
-msgid "Edit your identities"
-msgstr "Editar as suas identidades"
+#: config/prefs.php.dist:830
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+"Editar as sua preferências para aceder a outras contas de correio "
+"electrónico."
 
-msgid "Edit"
-msgstr "Editar"
+#: templates/filters/prefs.inc:26
+msgid "Edit your whitelist"
+msgstr "Editar a sua lista branca"
 
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Endereço de Email"
 
+#: lib/Message.php:620
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "Todas as mensagem de %s foram esvaziadas."
+
+#: templates/folders/actions.inc:20
 msgid "Empty Folder(s)"
 msgstr "Esvaziar  pasta(s)"
 
+#: folders.php:275
+msgid "Empty Selected Folders"
+msgstr "Esvaziar Pastas Seleccionadas"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
-msgstr "Esvaziar a pasta apagados"
+msgstr "Esvaziar a Pasta de Lixo"
 
-msgid "Empty Trash"
-msgstr "Esvaziar a pasta apagados"
+#: lib/IMP.php:931
+msgid "Empty _Trash"
+msgstr "Esvaziar Li_xo"
 
+#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
 msgid "Enable PGP functionality?"
-msgstr "Activar as funcionalidades do PGP?"
+msgstr "Activar funcionalidades do PGP?"
+
+#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+msgid "Enable S/MIME functionality?"
+msgstr "Activar funcionalidades do S/MIME?"
+
+#: config/prefs.php.dist:780
+msgid "Enable message previews?"
+msgstr "Activar previsões de mensagens?"
 
-msgid "Encrypt Message"
-msgstr "Encriptar Mensagem"
+#: templates/compose/compose.inc:433
+msgid "Encr_yption Options"
+msgstr "Opções de Encrip_tação"
 
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr "Fim"
+
+#: lib/Compose.php:330
 msgid "End forwarded message"
 msgstr "Finalizar mensagem reenviada"
 
+#: lib/Compose.php:271
+msgid "End message"
+msgstr "Fim da mensagem"
+
+#: lib/Compose.php:269
+#, php-format
+msgid "End message from %s"
+msgstr "Fim da mensagem de %s"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
 msgid "Enter Passphrase"
-msgstr "Introduza a frase chave"
+msgstr "Introduza a Frase-Chave"
 
+#: templates/prefs/spamselect.inc:9
+msgid "Enter the name for your new Spam folder"
+msgstr "Introduza o nome da sua nova pasta Spam"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Introduza o nome da sua nova pasta de rascunhos"
 
+#: templates/prefs/sentmailselect.inc:24
 msgid "Enter the name for your new sent mail folder"
 msgstr "Introduza o nome da sua nova pasta de mensagens enviadas"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
-msgstr "Introduza o nome da sua nova pasta de mensagens apagadas"
-
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
-msgstr "A entrada \"%s\" foi adicionada na lista de contactos com sucesso"
+msgstr "Introduza o nome da sua nova pasta de lixo"
 
+#: search.php:159
+msgid "Entire Message"
+msgstr "Mensagem Completa"
+
+#: message.php:178 compose.php:1068 thread.php:39
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
+msgstr "A entrada \"%s\" foi adicionada ao livro de endereços com sucesso"
+
+#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
+#: lib/MIME/Viewer/pkcs7.php:365 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Erro"
 
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr "Erro ao enviar resposta: %s."
+
+#: lib/MIME/Viewer/itip.php:101
+msgid "Event successfully deleted."
+msgstr "Evento removido com sucesso."
+
+#: config/prefs.php.dist:758
 msgid "Every 15 minutes"
 msgstr "Cada 15 minutos"
 
+#: config/prefs.php.dist:755
 msgid "Every 30 seconds"
 msgstr "Cada 30 segundos"
 
+#: config/prefs.php.dist:757
 msgid "Every 5 minutes"
 msgstr "Cada 5 minutos"
 
+#: config/prefs.php.dist:759
 msgid "Every half hour"
 msgstr "Cada meia-hora"
 
+#: config/prefs.php.dist:756
 msgid "Every minute"
 msgstr "Cada minuto"
 
-msgid "Expand All Folders"
-msgstr "Mostrar Todas as Pastas"
+#: folders.php:445
+msgid "Expand"
+msgstr "Expandir"
 
+#: templates/folders/actions.inc:33
 msgid "Expand All"
-msgstr "Mostrar Tudo"
+msgstr "Expandir Tudo"
+
+#: templates/folders/actions.inc:33
+msgid "Expand All Folders"
+msgstr "Expandir Todas as Pastas"
 
+#: folders.php:445
 msgid "Expand Folder"
-msgstr "Mostrar Pasta"
+msgstr "Expandir Pasta"
 
+#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
 msgid "Expand Names"
-msgstr "Mostrar Nomes"
+msgstr "Expandir Nomes"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1021
+msgid "Expand names in the compose window automatically in the background?"
 msgstr ""
-"Mostra, por defeito, toda a árvore de pastas na visualização de pastas."
-
-msgid "February"
-msgstr "Fevereiro"
-
-msgid "Fetch Mail in a separate window."
-msgstr "Puxar Mail numa janela separada."
-
-msgid "Fetch Mail"
-msgstr "Puxar Mail"
-
-msgid "Fetch mail"
-msgstr "Puxar mail"
-
-msgid "Fetch"
-msgstr "Puxar"
-
-msgid "Fetching... Please wait..."
-msgstr "A puxar... Por favor aguarde..."
+"Expandir nomes na janela de composição automaticamente e nos bastidores?"
 
-msgid "Field"
-msgstr "Campo"
+#: config/prefs.php.dist:951
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr "Mostrar por omissão toda a árvore de pastas na visualização de pastas?"
 
-msgid "Filename"
-msgstr "Ficheiro"
+#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
+#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+msgid "Expanding"
+msgstr "Expandindo"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Actividade dos Filtros: A mensagem \"%s\" de \"%s\" foi apagada."
+#: lib/IMP.php:940 lib/IMP.php:942
+msgid "F_etch Mail"
+msgstr "_Descarregar"
 
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"Actividade dos filtros: A mensagem \"%s\" de \"%s\" foi movida para a pasta "
-"\"%s\"."
-
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
-msgstr ""
-"Actividade dos filtros: A mensagem \"%s\" de \"%s\" foi movida para a pasta "
-"de mensagems apagadas."
-
-msgid "Filter Rules"
-msgstr "Regras de Filtragem"
+#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+msgid "Fetch Mail"
+msgstr "Descarregar"
 
-msgid "Filter message content for profanity."
-msgstr "Filtrar mensagens com conteúdo indesejado."
+#: config/prefs.php.dist:839
+msgid "Fetch Mail in a separate window?"
+msgstr "Descarregar numa janela separada?"
+
+#: templates/fetchmail/manage.inc:46
+msgid "Fetch messages upon logging on?"
+msgstr "Descarregar mensagens ao entrar?"
+
+#: lib/Fetchmail.php:289
+#, php-format
+msgid "Fetched %d messages from %s"
+msgstr "%d mensagens descarregadas de %s"
+
+#: lib/Fetchmail.php:287
+#, php-format
+msgid "Fetched 1 message from %s"
+msgstr "1 mensagem descarregada de %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
+msgstr "Descarregamentos:"
+
+#: lib/Fetchmail.php:291
+msgid "Fetchmail: no new messages."
+msgstr "Descarregamentos: sem mensagens novas."
+
+#: lib/IMP.php:946
+msgid "Fi_lters"
+msgstr "Fi_ltros"
+
+#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+msgid "File"
+msgstr "Arquivo"
+
+#: templates/filters/prefs.inc:35
+msgid "Filter Options"
+msgstr "Opções de Filtragem"
+
+#: templates/filters/prefs.inc:8
+msgid "Filter Settings"
+msgstr "Configurações da Filtragem"
+
+#: config/prefs.php.dist:594
+msgid "Filter message content for profanity?"
+msgstr "Filtrar conteúdo profano de mensagens?"
+
+#: templates/filters/notactive.inc:8
+msgid "Filter support is disabled on this system."
+msgstr "O suporte de filtros está desactivado neste sistema."
 
+#: config/prefs.php.dist:119
 msgid "Filters"
 msgstr "Filtros"
 
+#: templates/filters/notactive.inc:2
+msgid "Filters NOT Active"
+msgstr "Filtros Inactivos"
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Filters: %s management page"
+msgstr "Filtros: %s páginas de gestão"
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
-msgstr "Achar"
+msgstr "Procurar"
 
+#: config/prefs.php.dist:876
+msgid "First Mailbox Page"
+msgstr "Primeira Página da Caixa Postal"
+
+#: mailbox.php:341
 msgid "First Page"
 msgstr "Primeira Página"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+msgid "Fo_rward"
+msgstr "_Encaminhar"
+
+#: folders.php:255 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr "Acções de Pasta - Confirmação"
+
+#: folders.php:292 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Lista de Pastas"
 
+#: templates/login/login.inc:175
 msgid "Folder Prefix"
 msgstr "Prefixo de Pasta"
 
-msgid "Folders"
-msgstr "Pastas"
+#: lib/Block/summary.php:3
+msgid "Folder Summary"
+msgstr "Sumário da Pasta"
+
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr "Partilha de pastas inactiva."
+
+#: folders.php:52
+msgid "Folder use is not enabled."
+msgstr "Utilização de pastas inactiva."
+
+#: config/prefs.php.dist:940
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr "Formato das datas das mensagens de hoje"
 
+#: compose.php:727 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
-msgstr "Reenviar"
+msgstr "Encaminhar"
 
+#: compose.php:712
 msgid "Forward:"
-msgstr "Reenviada:"
-
-#, c-format
-msgid "Forwarded message from %s"
-msgstr "Mensagem Reenviada de %s"
+msgstr "Encaminhada:"
 
+#: lib/Compose.php:299
 msgid "Forwarded message"
-msgstr "Mensagem reenviada"
+msgstr "Mensagem encaminhada"
 
-msgid "From Address"
-msgstr "Do Endereço"
+#: lib/Compose.php:297
+#, php-format
+msgid "Forwarded message from %s"
+msgstr "Mensagem encaminhada de %s"
 
+#: lib/MIME/Viewer/itip.php:483
+msgid "Free/Busy Information"
+msgstr "Informação de Disponibilidades"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr "Resposta Livre/Ocupado"
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr "Pedido Livre/Ocupado"
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr "Resposta a Pedido Livre/Ocupado"
+
+#: templates/mailbox/message_headers.inc:27
+msgid "Fro_m"
+msgstr "_De"
+
+#: message.php:247 search.php:135 thread.php:93
+#: templates/compose/compose.inc:98
 msgid "From"
 msgstr "De"
 
-msgid "From:"
-msgstr "De:"
+#: config/prefs.php.dist:889
+msgid "From Address"
+msgstr "Do Endereço"
 
+#: compose.php:724 compose.php:728
 msgid "Fwd:"
-msgstr "Fwd:"
-
-msgid "Get only new messages"
-msgstr "Puxar apenas mensagens novas"
-
-msgid "Green"
-msgstr "Verde"
-
-msgid "Grey"
-msgstr "Cinzento"
+msgstr "Enc:"
 
-msgid "Hash-Algorithim"
-msgstr "Algoritmo Hash"
+#: compose.php:1229
+msgid "Fwd: "
+msgstr "Enc: "
+
+#: compose.php:1231
+#, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Enc: %u Mensagens Encaminhadas"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+msgid "General Options"
+msgstr "Opções Gerais"
+
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr "Descarregar apenas mensagens novas? (apenas IMAP)"
+
+#: thread.php:85
+msgid "Go to Message"
+msgstr "Ir para Mensagem"
+
+#: lib/IMP.php:553
+#, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Ir para a entrada do livro de endereços correspondente a \"%s\""
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr "Autorizar acesso"
+
+#: message.php:530 lib/Filter.php:106 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:128
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:407
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr "AQUI"
+
+#: lib/MIME/Viewer/html.php:129 lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr "HTML"
+
+#: compose.php:229
+msgid "HTML Version of Message"
+msgstr "Versão HTML da Mensagem"
 
+#: templates/message/headers.inc:58
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-msgid "Help"
-msgstr "Ajuda"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr "Aqui está a mensagem em composição:"
+
+#: config/prefs.php.dist:662
+msgid "Hidden"
+msgstr "Escondido"
+
+#: config/prefs.php.dist:661
+msgid "Hidden in Thread View"
+msgstr "Escondido em Visualização de Conversa"
 
+#: mailbox.php:363
 msgid "Hide Deleted"
-msgstr "Esconder apagadas"
+msgstr "Esconder Removidas"
 
+#: folders.php:287
 msgid "Hide Unsubscribed"
-msgstr "Esconder Não subscritas"
+msgstr "Esconder Não-Subscritas"
+
+#: lib/MIME/Viewer/html.php:104
+msgid "Hide the Images"
+msgstr "Esconder as Imagens"
+
+#: templates/compose/compose.inc:305
+msgid "High"
+msgstr "Alta"
+
+#: message.php:281 mailbox.php:703 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr "Alta Prioridade"
+
+#: templates/compose/compose.inc:304
+msgid "Highest"
+msgstr "A Mais Alta"
 
+#: config/prefs.php.dist:682
 msgid "How do you want to display attachments?"
 msgstr "Como quer mostrar os anexos?"
 
-msgid "How to prefix quoted lines in a reply:"
-msgstr "Como prefixar citações numa resposta:"
+#: config/prefs.php.dist:496
+msgid "How to attribute quoted lines in a reply"
+msgstr "Como atribuir as linhas citadas numa resposta"
 
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-msgid "IMAP/POP3 Accounts"
-msgstr "Contas IMAP/POP3"
-
-msgid "IMP PGP Administration"
-msgstr "Administração do PGP para o IMP"
-
-msgid "IMP is not properly configured"
-msgstr "O IMP não está configurado correctamente"
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr "IMAP (Protocolos com Auto-detecção)"
+
+#: templates/login/login.inc:163 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr "IMAP sobre SSL"
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP sobre SSL (certificado auto-assinado)"
+
+#: templates/login/login.inc:164
+msgid "IMAP over SSL (self-signed)"
+msgstr "IMAP sobre SSL (auto-assinado)"
+
+#: templates/login/login.inc:162 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr "IMAP, sem TLS"
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr "Servidores de Correio Electrónico IMAP/POP3"
 
+#: lib/IMP.php:886
 msgid "INBOX"
-msgstr "Caixa de Entrada"
+msgstr "Entrada"
 
-msgid "Identities"
-msgstr "Identidades"
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Se continuar, todas as mensagens da(s) pastas(s) se perderão!"
 
-msgid "Identity"
-msgstr "Identidade"
-
-msgid "Identity's name:"
-msgstr "Nome da identidade:"
+#: templates/compose/spelling.inc:88
+msgid "Ignore"
+msgstr "Ignorar"
 
+#: templates/compose/spelling.inc:89
 msgid "Ignore All"
 msgstr "Ignorar Tudo"
 
-msgid "Ignore"
-msgstr "Ignorar"
+#: templates/folders/import.inc:20
+msgid "Import"
+msgstr "Importar"
 
+#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
 msgid "Import Key"
-msgstr "Importar chave"
+msgstr "Importar Chave"
 
+#: templates/pgp/pgp.inc:254
 msgid "Import Keypair"
-msgstr "Importar par de chaves"
+msgstr "Importar Par de Chaves"
+
+#: templates/folders/actions.inc:25
+msgid "Import Messages"
+msgstr "Importar Mensagens"
 
+#: pgp.php:42
 msgid "Import PGP Key"
-msgstr "Importar chave PGP"
+msgstr "Importar Chave PGP"
 
+#: templates/smime/smime.inc:148
+msgid "Import Personal Certificates"
+msgstr "Importar Certificados Pessoais"
+
+#: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
 msgstr "Importar chave pessoal privada PGP"
 
+#: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
 msgstr "Importar chave pessoal pública PGP"
 
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr "Importar Certificados Pessoais S/MIME"
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
 msgid "Import Public Key"
 msgstr "Importar chave pública"
 
+#: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
 msgstr "Importar chave pública PGP"
 
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr "Importar Chave Pública S/MIME"
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr "Importar Chave S/MIME"
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr "Importar Arquivo MBOX"
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr "Importar arquivo MBOX %s para a pasta %s."
+
+#: message.php:486 mailbox.php:713 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
+msgid "Important"
+msgstr "Importante"
+
+#: templates/search/main.inc:47
 msgid "Important messages"
 msgstr "Mensagens importantes"
 
-msgid "Important"
-msgstr "Importante"
+#: folders.php:157
+#, php-format
+msgid "Imported %d messages from %s."
+msgstr "%d mensagens importadas de %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr "Em Processamento"
+
+#: folders.php:379 lib/Folder.php:227 lib/IMP.php:358 lib/IMAP/Tree.php:105
+#: lib/IMAP/Tree.php:204
+msgid "Inbox"
+msgstr "Entrada"
+
+#: config/prefs.php.dist:484
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Incluir um breve sumário do cabeçalho numa resposta?"
 
+#: config/prefs.php.dist:478
 msgid "Include original message in a reply?"
 msgstr "Incluir a mensagem original na resposta?"
 
-#, c-format
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+msgid "Info"
+msgstr "Informação"
+
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#, php-format
 msgid "Information on %s Public Key"
 msgstr "Informação sobre a chave pública %s"
 
+#: templates/pgp/pgp.inc:151
 msgid "Information on Personal Private Key"
 msgstr "Informação sobre a chave pessoal privada"
 
+#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
 msgid "Information on Personal Public Key"
 msgstr "Informação sobre a chave pessoal pública"
 
-msgid "Insert Key Here"
-msgstr "Insira a chave aqui"
-
-msgid "Invalid PGP Key."
-msgstr "Chave PGP inválida."
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
+#: templates/compose/attachments.js:99
+msgid "Inline"
+msgstr "Em-linha"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr "Insira o Certificado Aqui"
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Insira a Chave Pessoal Privada PGP Aqui"
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Insira a Chave Pessoal Pública PGP Aqui"
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr "Insira a Chave Pública PGP Aqui"
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr "Acção seleccionada inválida para este componente."
+
+#: mailbox.php:563 mailbox.php:605
+msgid "Invalid Address"
+msgstr "Endereço Inválido"
 
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
-msgstr "Mailbox remota inválida"
+msgstr "Caixa Postal Remota Inválida"
 
-msgid "Invalid Username/Password"
-msgstr "Username/Password inválido"
+#: compose.php:131
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr "Caractere inválido no endereço de correio electrónico: %s."
+
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr "Chave inválida"
 
+#: pgp.php:196
 msgid "Invalid personal PGP private key."
 msgstr "Chave pessoal privada PGP inválida."
 
+#: pgp.php:171
 msgid "Invalid personal PGP public key."
 msgstr "Chave pública pessoal PGP inválida."
 
-msgid "January"
-msgstr "Janeiro"
-
-msgid "July"
-msgstr "Julho"
-
-msgid "June"
-msgstr "Junho"
-
-msgid "Key Fingerprint"
-msgstr "Impressão digital da chave"
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr "Inverter"
+
+#: templates/compose/compose.inc:567
+msgid "KB"
+msgstr "KB"
 
+#: templates/pgp/pgp.inc:201
 msgid "Key Length"
 msgstr "Comprimento da chave"
 
+#: templates/pgp/pgp.inc:252
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr "A geração das chaves pode demorar muito tempo.  Continuar?"
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr "Chave enviada com sucesso para o servidor de chaves."
+
+#: templates/login/login.inc:199
 msgid "Language"
 msgstr "Idioma"
 
+#: config/prefs.php.dist:877
+msgid "Last Mailbox Page"
+msgstr "Última Página da Caixa Postal"
+
+#: mailbox.php:354
 msgid "Last Page"
 msgstr "Última Página"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Último acesso: %s"
-
-msgid "Last login: Never"
-msgstr "Última acesso: Nunca"
+#: templates/compose/compose.inc:380
+msgid "Li_nk Attachments"
+msgstr "Anexos com Ligações"
+
+#: attachment.php:34 lib/Compose.php:974
+msgid "Linked attachments are forbidden."
+msgstr "Anexos com ligações são proibidos."
+
+#: lib/Compose.php:991
+#, php-format
+msgid "Links will expire on %s"
+msgstr "Ligações expirarão em %s"
 
-msgid "Light Blue"
-msgstr "Azul claro"
-
-msgid "List-Archive"
-msgstr "Listagem-Arquivo"
+#: config/prefs.php.dist:1040
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+"Listas todos os contactos quando carregando a janela de contactos? (se "
+"desactivado, verá apenas os contactos pelos quais procurar explicitamente)"
 
-msgid "List-Help"
-msgstr "Listagem-Ajuda"
+#: config/prefs.php.dist:679
+msgid "Listing in the Header"
+msgstr "Listagem no Cabeçalho"
 
-msgid "List-Owner"
-msgstr "Listagem-Dono"
+#: templates/fetchmail/manage.inc:30
+msgid "Local Mailbox:"
+msgstr "Caixa Postal Local:"
 
-msgid "List-Post"
-msgstr "Listagem-Submissões"
+#: lib/MIME/Viewer/itip.php:674
+msgid "Location"
+msgstr "Local"
 
-msgid "List-Subscribe"
-msgstr "Listagem-Subscritas"
+#: templates/login/login.inc:207
+msgid "Log in"
+msgstr "Entrar"
 
-msgid "List-Unsubscribe"
-msgstr "Listagem-Não subscritas"
+#: lib/Block/summary.php:117
+#, php-format
+msgid "Log in to %s"
+msgstr "Entrar em %s"
 
-msgid "Listing in the Header"
-msgstr "Listagem no Header"
+#: templates/login/login.inc:136
+msgid "Login"
+msgstr "Entrar"
 
-msgid "Local Mailbox:"
-msgstr "Mailbox Local:"
+#: config/prefs.php.dist:39
+msgid "Login Tasks"
+msgstr "Tarefas de Entrada"
 
-#, c-format
-msgid "Log in to %s"
-msgstr "Ligar-se a %s"
+#: templates/compose/compose.inc:307
+msgid "Low"
+msgstr "Baixo"
 
-msgid "Log in"
-msgstr "Ligar"
+#: message.php:283 mailbox.php:706 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr "Baixa Prioridade"
 
-msgid "Login Tasks"
-msgstr "Tarefas de Login"
+#: templates/compose/compose.inc:308
+msgid "Lowest"
+msgstr "Mais Baixo"
 
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
-msgstr ""
-"O login falhou por algum motivo. Aparentemente o nome ou password foi "
-"introduzido incorrectamente."
+#: lib/MIME/Viewer/appledouble.php:44
+msgid "Macintosh File"
+msgstr "Arquivo Macintosh"
 
-msgid "Logout"
-msgstr "Logout"
+#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+msgid "Mail"
+msgstr "Correio"
 
-msgid "Mail Filters"
-msgstr "Filtros de Mensagens"
+#: config/prefs.php.dist:95
+msgid "Mail Previews"
+msgstr "Previsão do Correio"
 
-msgid "Mail Management"
-msgstr "Gestão de Mensagens"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr "Tipo do servidor de correio electrónico ao qual conectar:"
 
+#: folders.php:397
 msgid "Mailbox"
-msgstr "Caixa de correio"
+msgstr "Caixa Postal"
 
-msgid "Mailing List Information"
-msgstr "Informações do Mailing List"
+#: config/prefs.php.dist:110
+msgid "Mailbox and Folder Display Options"
+msgstr "Opções de Pastas e Visualização"
 
-msgid "Maintenance Operations"
-msgstr "Operações de Manutenção"
+#: templates/folders/actions.inc:16
+msgid "Mark All Messages in Folder as Seen"
+msgstr "Marcar Todas as Mensagens na Pasta Como Lidas"
 
-msgid "March"
-msgstr "Março"
+#: templates/folders/actions.inc:17
+msgid "Mark All Messages in Folder as Unseen"
+msgstr "Marcar Todas as Mensagens na Pasta Como Por Ler"
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Marcar como:"
 
+#: config/prefs.php.dist:644
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Marcar os diferentes níveis de citação com cores diferentes?"
 
-msgid "May"
-msgstr "Maio"
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "Marcar imagens como lidas? (apenas IMAP)"
+
+#: config/prefs.php.dist:652
+msgid "Mark simple markup?"
+msgstr "Mostrar marcações simples?"
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr "Procura Todos os Casos"
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr "Procura Qualquer Casos"
+
+#: templates/compose/compose.inc:503
+msgid "Maximum Attachment Size"
+msgstr "Tamanho Máximo dos Anexos"
+
+#: templates/compose/compose.inc:484
+msgid "Maximum number of attachments reached."
+msgstr "Número máximo de anexos atingido."
+
+#: templates/compose/compose.inc:479
+msgid "Maximum total attachment size reached."
+msgstr "Tamanho total máximo de anexos atingido."
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr "Cancelamento de Reunião"
+
+#: lib/MIME/Viewer/itip.php:575
+msgid "Meeting Information"
+msgstr "Informação sobre Reunião"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr "Proposta de Reunião"
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr "Resposta a Reunião"
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr "Actualização de Reunião"
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr "Pedido de Actualização de Reunião"
+
+#: lib/Block/tree_folders.php:3
+msgid "Menu Folder List"
+msgstr "Lista de Menus de Pasta"
+
+#: lib/Compose.php:246
+msgid "Message"
+msgstr "Mensagem"
 
+#: compose.php:507 compose.php:534 compose.php:588 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Escrita de Mensagem"
 
+#: config/prefs.php.dist:888
 msgid "Message Date"
 msgstr "Data da Mensagem"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+msgid "Message Options"
+msgstr "Opções de Mensagens"
+
+#: search.php:359
 msgid "Message Search"
-msgstr "Pesquisa de Mensagem"
+msgstr "Procurar Mensagem"
 
+#: config/prefs.php.dist:892
 msgid "Message Size"
 msgstr "Tamanho da Mensagem"
 
+#: message.php:368
 msgid "Message Source"
 msgstr "Código-fonte da Mensagem"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Visualização da Mensagem"
 
+#: templates/search/header.inc:55
 msgid "Message fields"
 msgstr "Campos da mensagem"
 
+#: templates/search/main.inc:6
 msgid "Message flags"
-msgstr "flags da mensagem"
+msgstr "Atributos da mensagem"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Pastas de mensagens"
 
-msgid "Message sent successfully, but not saved to"
-msgstr "A mensagem foi enviada com sucesso mas não pode ser gravada em"
+#: lib/Compose.php:244
+#, php-format
+msgid "Message from %s"
+msgstr "Mensagem de %s"
+
+#: mailbox.php:646
+msgid "Message has attachments"
+msgstr "Mensagem com anexos"
+
+#: mailbox.php:637
+msgid "Message is encrypted"
+msgstr "A mensagem está encriptada"
+
+#: mailbox.php:632
+msgid "Message is signed"
+msgstr "A mensagem está assinada"
+
+#: templates/search/header.inc:33
+msgid "Message matches"
+msgstr "Tipo de procura"
+
+#: compose.php:771 compose.php:785
+msgid "Message redirected successfully."
+msgstr "A mensagem foi redireccionada com sucesso."
+
+#: compose.php:1018
+#, php-format
+msgid "Message sent successfully, but not saved to %s"
+msgstr "Mensagem enviada com sucesso mas não guardada em %s"
+
+#: compose.php:1077 compose.php:1092
+msgid "Message sent successfully."
+msgstr "Mensagem enviada com sucesso."
 
+#: config/prefs.php.dist:912
 msgid "Messages per page in the mailbox view."
-msgstr "Mensagens por página na visualização da caixa de correio."
+msgstr "Mensagens por página na visualização da caixa postal."
 
+#: mailbox.php:318
 msgid "Messages to"
 msgstr "Mensagens para"
 
-msgid "Mime Type"
-msgstr "Mime Type"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Modificar"
 
-msgid "Move Down"
-msgstr "Abaixo"
-
-msgid "Move Up"
-msgstr "Acima"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Mover mensagens para a pasta <b>%s</b>"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "Mais do que um endereço encontrado com o campo \"%s\"."
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Mover"
 
-msgid "Name and/or email can not be empty"
-msgstr "O Nome e/ou o email não podem ser vazios"
+#: templates/prefs/sourceselect.inc:316
+msgid "Move down"
+msgstr "Descer"
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+msgid "Move to folder"
+msgstr "Mover para pasta"
+
+#: templates/prefs/sourceselect.inc:314
+msgid "Move up"
+msgstr "Subir"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr "Multiparte/alternativa"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
+#: templates/pgp/pgp.inc:24
+msgid "NOTE"
+msgstr "NOTA"
 
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Nome"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr "O Nome e/ou o email não podem ser vazios"
+
+#: lib/MIME/Viewer/itip.php:778
+msgid "Needs Action"
+msgstr "Acção Necessária"
+
+#: config/prefs.php.dist:563 config/prefs.php.dist:575
+#: config/prefs.php.dist:754
 msgid "Never"
 msgstr "Nunca"
 
-msgid "New Mail"
-msgstr "Mensagem Nova"
-
-msgid "New messages"
-msgstr "Mensagens novas"
+#: config/prefs.php.dist:553
+msgid "Never save attachments"
+msgstr "Nunca guardar anexos"
 
+#: templates/acl/acl.inc:126
 msgid "New"
 msgstr "Nova"
 
-msgid "Next Message"
-msgstr "Próxima Mensagem"
+#: lib/IMP.php:615
+msgid "New Folder"
+msgstr "Nova Pasta"
 
-msgid "Next Page"
-msgstr "Próxima Página"
+#: config/prefs.php.dist:87
+msgid "New Mail"
+msgstr "Nova Mensagem"
+
+#: templates/search/main.inc:19
+msgid "New messages"
+msgstr "Mensagens novas"
 
+#: templates/compose/spelling.inc:140
 msgid "Next"
 msgstr "Próxima"
 
+#: templates/message/navbar_navigate.inc:33
+msgid "Next Message"
+msgstr "Próxima Mensagem"
+
+#: mailbox.php:352
+msgid "Next Page"
+msgstr "Próxima Página"
+
+#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+msgid "No"
+msgstr "Não"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr "Certificado não foi encontrado"
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr "Sem Encriptação"
+
+#: templates/pgp/pgp.inc:80
 msgid "No Keys in Keyring"
 msgstr "Não existe nenhuma chave"
 
+#: mailbox.php:371
+#, php-format
+msgid "No Messages"
+msgstr "Não Há Mensagens"
+
+#: pgp.php:137
 msgid "No PGP public key imported."
 msgstr "Não foi importada a chave pública PGP."
 
-msgid "No Subject"
-msgstr "Sem assunto"
+#: templates/smime/smime.inc:140
+msgid "No Personal Certificate Present"
+msgstr "Sem Certificado Pessoal Presente"
+
+#: lib/Mailbox.php:323
+msgid "No Preview Text"
+msgstr "Sem Texto de Previsão"
+
+#: templates/smime/smime.inc:54
+msgid "No Public Keys Found"
+msgstr "Não Foram Encontradas Chaves Públicas"
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr "Não foi importada nenhuma chave pública S/MIME."
+
+#: lib/MIME/Viewer/tnef.php:90
+msgid "No attachments found."
+msgstr "Não se encontrou anexos."
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr "Não há informação de correio electrónico na chave pública."
+
+#: acl.php:72 acl.php:98
+msgid "No folder selected."
+msgstr "Não foi seleccionada nenhuma pasta."
+
+#: lib/Block/summary.php:130
+msgid "No folders are being checked for new mail."
+msgstr "Nenhuma pasta está a verificar novas mensagens."
 
+#: folders.php:207 lib/Folder.php:480 lib/Folder.php:530
 msgid "No folders were specified"
 msgstr "Nenhuma pasta foi especificada"
 
+#: lib/Block/summary.php:136
+msgid "No folders with new messages"
+msgstr "Não há pastas com novas mensagens"
+
+#: lib/Block/summary.php:133
+msgid "No folders with unseen messages"
+msgstr "Não há pastas com mensagens por ler"
+
+#: lib/Compose.php:240
 msgid "No message body text"
 msgstr "Mensagem sem texto no corpo"
 
-msgid "No messages matched your search"
-msgstr "A pesquisa não retornou nenhuma mensagem"
-
-msgid "No messages to fetch..."
-msgstr "Não há mensagens para puxar..."
+#: lib/Mailbox.php:365
+msgid "No messages matched your search."
+msgstr "Nenhuma mensagem corresponde à sua procura."
 
+#: pgp.php:189
 msgid "No personal PGP private key imported."
-msgstr "Não foi importada a chave pessoal privada PGP."
+msgstr "Não foi importada nenhuma chave pessoal privada PGP."
 
+#: pgp.php:165
 msgid "No personal PGP public key imported."
-msgstr "Não foi importada a chave pessoal pública PGP."
+msgstr "Não foi importada nenhuma chave pessoal pública PGP."
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr "Não foi importado nenhum certificado pessoal S/MIME."
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr "Programa de correcção ortográfica não foi configurado."
 
+#: templates/compose/spelling.inc:50
 msgid "No spelling errors"
 msgstr "Nenhum erro de ortografia"
 
+#: templates/compose/spelling.inc:106
 msgid "No suggestions"
 msgstr "Sem sugestões"
 
-msgid "No"
-msgstr "Não"
-
+#: acl.php:68 acl.php:94
+msgid "No user specified."
+msgstr "Nenhum utilizador especificado"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr "Não-Participante"
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Nenhuma"
 
+#: templates/compose/compose.inc:306
+msgid "Normal"
+msgstr "Normal"
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
-msgstr "Não apagada"
+msgstr "Não Removida"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Não Rascunho"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Não Importante"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Não Pessoal"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr "Chave pública Inválida."
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
-msgstr "Não são mensagens apagadas"
+msgstr "Mensagens não removidas"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Não são mensagens importantes"
 
-msgid "November"
-msgstr "Novembro"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr "Note que isto pode demorar algum tempo"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
+#: config/prefs.php.dist:371
+msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
-"Número de pastas antigas de mensagens enviadas a manter, quando efectuar a "
-"remoção mensal"
+"Número de meses durante os quais anexos ligados velhos são mantidos, se se "
+"estiver a removê-los mensalmente."
 
+#: config/prefs.php.dist:353
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"Número de pastas antigas de mensagens enviadas a manter, se se estiver a "
+"removê-las mensalmente."
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-msgid "October"
-msgstr "Outubro"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr "OU"
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Mensagens antigas"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
-msgstr "As pastas antigas de mensagens enviadas estão a ser apagadas."
+msgstr "As pastas antigas de mensagens enviadas estão a ser purgadas."
 
-msgid "Open Folder"
-msgstr "Abrir Pasta"
+#: lib/Block/summary.php:27
+msgid "Only display folders with unread messages in them?"
+msgstr "Mostrar apenas pastas com mensagens por ler?"
 
-msgid "Options"
-msgstr "Opções"
+#: templates/folders/javascript.inc:71
+msgid "Only one folder should be selected for this action."
+msgstr "Apenas se deve seleccionar uma pasta para esta operação."
 
-msgid "Orange"
-msgstr "Laranja"
+#: templates/menu.inc:7 templates/menu.inc:27
+msgid "Ope_n Folder"
+msgstr "Abri_r Pasta"
 
+#: templates/menu.inc:23
+msgid "Open Folder"
+msgstr "Abrir Pasta"
+
+#: folders.php:414
+msgid "Opened Folder"
+msgstr "Pasta Aberta"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr "Participante Opcional"
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: templates/fetchmail/fetchmail.inc:6
+msgid "Other Mail Accounts"
+msgstr "Outras Contas de Correio"
+
+#: config/prefs.php.dist:109 config/prefs.php.dist:118
+#: config/prefs.php.dist:125 config/prefs.php.dist:133
+#: config/prefs.php.dist:142
 msgid "Other Options"
 msgstr "Outras Opções"
 
-msgid "PGP Digital Signature"
-msgstr "Assinatura Digital PGP"
-
-msgid "PGP Encrypted Data"
-msgstr "Dados encriptados PGP"
-
-#, c-format
-msgid "PGP Error: %s"
-msgstr "Erro do PGP: %s"
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr "PGP"
 
-msgid "PGP Error: For message encryption, there can only be one recipient."
-msgstr "Erro do PGP: Para encriptar a mensagem, só pode haver um recipiente."
+#: templates/compose/encrypt_list.inc:7
+msgid "PGP Encrypt Message"
+msgstr "Encriptar Mensagem com PGP"
+
+#: compose.php:331
+msgid "PGP Error: "
+msgstr "Erro do PGP: "
 
+#: compose.php:310
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "Erro do PGP: É necessário a frase chave para a chave pessoal privada."
 
+#: templates/pgp/notactive.inc:6
 msgid "PGP NOT Active"
 msgstr "PGP não activo"
 
+#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
 msgid "PGP Options"
 msgstr "Opções de PGP"
 
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "Introdução da frase chave PGP"
 
+#: templates/pgp/pgp.inc:128
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "O par de chaves pessoais PGP necessita de uma ligação web segura."
 
-#, c-format
-msgid "PGP Public Key for \"%s\" was successfully added."
-msgstr "A chave pública PGP para \"%s\" foi adicionada com sucesso."
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr "Texto da Chave Pública PGP"
+
+#: pgp.php:149
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "A Chave Pública PGP para \"%s\" (%s) foi adicionada com sucesso."
 
-#, c-format
+#: pgp.php:245
+#, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr "A chave pública PGP para  \"%s\" foi apagada com sucesso."
-
-msgid "PGP Public Key"
-msgstr "Chave Pública PGP"
+msgstr "A chave pública PGP para \"%s\" foi removida com sucesso."
 
+#: templates/pgp/pgp.inc:72
 msgid "PGP Public Keyring"
-msgstr "Conjunto de chaves públicas PGP"
-
-msgid "PGP Public/Private Keypair successfully added."
-msgstr "Par de chaves Pública/Privada adicionado com sucesso."
+msgstr "Anel de Chaves Públicas PGP"
 
+#: templates/compose/encrypt_list.inc:8
 msgid "PGP Sign Message"
 msgstr "Assinar Mensagem com PGP"
 
+#: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
 msgstr "Assinar/Encriptar Mensagem com PGP"
 
-msgid "PGP Signed/Encrypted Data"
-msgstr "Dados Assinados/Encriptados com PGP"
+#: pgp.php:202
+msgid "PGP private key successfully added."
+msgstr "Chaves privada PGP adicionada com sucesso."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr "A chaves pública PGP foi adicionada com sucesso."
 
+#: templates/pgp/notactive.inc:11
 msgid "PGP support is disabled on this system."
 msgstr "O suporte de PGP está desactivado neste sistema."
 
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
-"O suporte de PGP não está activo de momento, por isso não é possível verificar "
-"a assinatura digital."
+"O suporte de PGP não está activo de momento, por isso não é possível "
+"verificar a assinatura digital."
 
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
-"O suporte de PGP não está activo de momento, por isso não é possível desencriptar "
-"a mensagem."
+"O suporte de PGP não está activo de momento, por isso não é possível "
+"desencriptar a mensagem."
 
-msgid "PGP"
-msgstr "PGP"
+#: templates/pgp/pgp.inc:24
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly"
+msgstr ""
+"O suporte de PGP exige a utilização de janelas \"popup\".  Se o seu "
+"navegador as estiver a bloquear, deverá alterar essa configuração, pois de "
+"outro modo as funcionalidades do PGP não se comportarão como desejado"
 
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#, c-format
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr "POP3 (Protocolos com Auto-detecção)"
+
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr "POP3 sobre SSL"
+
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 sobre SSL (certificado auto-assinado)"
+
+#: templates/login/login.inc:166
+msgid "POP3 over SSL (self-signed)"
+msgstr "POP3 sobre SSL (auto-assinado)"
+
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr "POP3, sem TLS"
+
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
+#: config/prefs.php.dist:874
+msgid "Page with the First Unseen Message"
+msgstr "Página com a Primeira Mensagem Por ler"
+
+#: config/prefs.php.dist:875
+msgid "Page with the Last Unseen Message"
+msgstr "Página com a Última Mensagem por Ler"
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Parte(s)"
 
+#: templates/pgp/pgp.inc:211
+msgid "Passphrase"
+msgstr "Frase chave"
+
+#: templates/pgp/pgp.inc:216
 msgid "Passphrase (Again)"
 msgstr "Frase chave (novamente)"
 
+#: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
 msgstr "A frase chave foi descarregada com sucesso."
 
-msgid "Passphrase"
-msgstr "Frase chave"
-
+#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Frase chave:"
 
+#: pgp.php:112
 msgid "Passphrases can not be empty"
 msgstr "A frase chave não pode ser vazia"
 
+#: pgp.php:114
 msgid "Passphrases do not match"
 msgstr "As frases chave não coincidem"
 
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
+#: templates/login/login.inc:193
 msgid "Password"
-msgstr "Password"
+msgstr "Palavra-passe"
 
-msgid "Password:"
-msgstr "Password:"
+#: templates/fetchmail/manage.inc:48
+msgid "Perform maintenance operations on login?"
+msgstr "Executar as operações de manutenção aquando da entrada?"
+
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr "As permissões deste utilizador não podem ser alteradas."
 
-msgid "Perform maintenance operations on login"
-msgstr ""
-"Executar as operações de manutenção aquando o login"
+#: message.php:477 mailbox.php:682 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+msgid "Personal"
+msgstr "Pessoal"
 
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
+#: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
 msgstr "Par de chaves pessoais PGP geradas com sucesso"
 
+#: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
 msgstr "Chaves pessoais PGP removidas com sucesso."
 
-msgid "Personal"
-msgstr "Pessoal"
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Certificados S/MIME pessoais NÃO importados"
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "Chaves pessoais S/MIME removidas com sucesso."
 
+#: config/prefs.php.dist:214
 msgid "Place your signature before replies and forwards?"
 msgstr "Colocar a sua assinatura antes de respostas ou reencaminhamentos?"
 
+#: compose.php:227
+msgid "Plaintext Version of Message"
+msgstr "Versão da Mensagem em Texto Simples"
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "Please enter a name for the new folder:"
+msgstr "Por favor, introduza o nome da nova pasta:"
+
+#: templates/folders/javascript.inc:94 templates/folders/javascript.inc:96
 msgid "Please enter the name of the new folder:"
 msgstr "Por favor, introduza o nome da nova pasta:"
 
+#: templates/folders/javascript.inc:129
 msgid "Please enter the new name:"
 msgstr "Por favor, introduza o novo nome:"
 
+#: templates/pgp/passphrase.inc:19
+#, php-format
 msgid ""
 "Please enter the passphrase for your PGP private key. You will only need to "
-"enter this passphrase once per IMP session."
+"enter this passphrase once per %s session."
 msgstr ""
-"Por favor introduza a frase chave da sua chave privada PGP. Apenas precisa de "
-"introduzir esta frase chave uma vez por sessão no IMP."
+"Por favor introduza a frase-chave da sua chave privada PGP. Apenas precisa "
+"de introduzir esta frase chave uma vez por sessão %s no IMP."
 
-msgid "Please enter valid search criteria."
-msgstr "Por favor, introduza um critério de pesquisa válido."
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+"Por favor introduza a frase-chave da sua chave privada S/MIME. Apenas "
+"precisa de introduzir esta frase chave uma vez por sessão %s no IMP."
 
-msgid "Please provide your username and password"
-msgstr "Por favor, introduza o seu nome e password"
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+"Por favor entre de novo para recomeçar a composição da sua mensagem. Se NÃO "
+"estiver a usar \"cookies\" e estiver a compor em janelas de \"popup\", terá "
+"também de entrar de novo na janela principal. Isto serve para impedir "
+"atacantes de sequestrar o ID da sua sessão. Pedimos desculpa por qualquer "
+"inconveniente."
+
+#: templates/login/login.inc:72
+msgid "Please provide your password."
+msgstr "Por favor introduza a sua palavra-passe."
+
+#: templates/login/login.inc:68
+msgid "Please provide your username."
+msgstr "Por favor introduza o seu nome de utilizador."
 
+#: compose.php:79 lib/IMP.php:509
 msgid "Please resolve ambiguous or invalid addresses."
-msgstr "Por favor, resolva os endereços ambíguos ou inválidos"
+msgstr "Por favor resolva os endereços ambíguos ou inválidos."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+"Por favor reveja a informação que se segue e depois deleccione uma acção do "
+"menu abaixo."
+
+#: templates/folders/javascript.inc:53
 msgid "Please select a folder before you perform any actions."
 msgstr "Por favor, seleccione uma pasta antes de efectuar qualquer operação."
 
+#: lib/MIME/Viewer/itip.php:502
+msgid "Please select an action from the menu below."
+msgstr "Por favor seleccione uma acção do menu abaixo."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Por favor, seleccione pelo menos uma pasta para efectuar a pesquisa."
 
+#: templates/folders/javascript.inc:4
 msgid "Please select only one folder for this operation."
 msgstr "Por favor, seleccione apenas uma pasta para efectuar esta operação."
 
-msgid "Please select or edit right next:"
-msgstr "Por favor, seleccione ou edite correctamente a próxima:"
-
-msgid "Precede your signature with dashes ('-- ')"
-msgstr "Preceder a sua assinatura com dois hífens ('-- ')"
+#: templates/compose/redirect.inc:76
+msgid "Please select or edit in the box to the right:"
+msgstr "Por favor seleccione ou edite a caixa à próxima:"
+
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr "Baseado em Horde"
+
+#: config/prefs.php.dist:206
+msgid "Precede your signature with dashes ('-- ')?"
+msgstr "Preceder a sua assinatura com dois hífens ('-- ')?"
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "As preferências foram alteradas com sucesso."
 
+#: templates/compose/attachments.inc:3
+msgid "Preview"
+msgstr "Previsão"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
-msgstr "Mensagem anterior"
+msgstr "Mensagem Anterior"
 
+#: mailbox.php:343
 msgid "Previous Page"
 msgstr "Página Anterior"
 
+#: templates/message/navbar_actions.inc:31
 msgid "Print"
 msgstr "Imprimir"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problema com o filtro %d: Pasta não existente: %s"
-
-msgid "Problem?"
-msgstr "Problemas?"
+#: templates/message/headers.inc:38
+msgid "Priority"
+msgstr "Prioridade"
+
+#: templates/smime/import_key.inc:74
+msgid "Private Key Password"
+msgstr "Palavra-passe da Chave Privada"
+
+#: config/prefs.php.dist:552
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr "Perguntar sempre que um anexo for enviado; o valor por omissão é NÃO"
+
+#: config/prefs.php.dist:551
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr "Perguntar sempre que um anexo for enviado; o valor por omissão é SIM"
 
+#: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-msgid "Purge Deleted"
-msgstr "Eliminar Apagadas"
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr "O suporte para servidores de chaves PGP públicas foi desactivado."
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+msgid "Pur_ge Deleted"
+msgstr "Eliminar Remo_vidas"
 
-msgid "Purge Trash how often:"
-msgstr "Esvaziar a pasta de mensagens apagadas com que frequência:"
-
-msgid "Purge messages in Trash folder older than this amount of days"
-msgstr ""
-"Eliminar mensagens da pasta de mensagens apagadas mais antigas que este "
-"número de dias"
-
-msgid "Purge old message in the Trash folder"
-msgstr "Eliminar mensagens antigas da pasta de mensagens apagadas"
-
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Apagando %d  mensagem(ns) da pasta de mensagens apagadas."
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+msgid "Purge Deleted"
+msgstr "Eliminar Removidas"
 
-msgid "Quoting"
-msgstr "Citando"
+#: templates/folders/actions.inc:22
+msgid "Purge Folder(s)"
+msgstr "Remover Pasta(s)"
 
-msgid "Received after"
-msgstr "Recebida depois"
+#: config/prefs.php.dist:390
+msgid "Purge Trash how often:"
+msgstr "Frequência das purgas da pasta de Lixo:"
 
-msgid "Received before"
-msgstr "Recebida antes"
+#: config/prefs.php.dist:399
+msgid "Purge messages in Trash folder older than this amount of days."
+msgstr "Purgar mensagens da pasta de Lixo com mais do que este número de dias."
+
+#: config/prefs.php.dist:380
+msgid "Purge old messages in the Trash folder?"
+msgstr "Purgar mensagens antigas da pasta de Lixo?"
+
+#: lib/Maintenance/Task/purge_trash.php:66
+#, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Purgando %d mensagem(ns) da pasta de Lixo."
+
+#: lib/Maintenance/Task/purge_trash.php:64
+msgid "Purging 1 message from Trash folder."
+msgstr "Purgando 1 mensagem da pasta de Lixo."
+
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr "Estado da quota: %.2fMB / %.2fMB  (%.2f%%)"
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr "Estado da quota: %.2fMB / SEM LIMITE"
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr "Estado da quota: SEM LIMITE"
+
+#: config/prefs.php.dist:492
+#, php-format
+msgid "Quoting %f:"
+msgstr "Citando %f:"
+
+#: templates/compose/compose.inc:377
+msgid "Re_quest Delivery Confirmation"
+msgstr "Pe_dir Aviso de Recepção"
+
+#: search.php:163
+msgid "Received On"
+msgstr "Recebida Em"
+
+#: search.php:171
+msgid "Received Since"
+msgstr "Recebida Desde"
+
+#: search.php:167
+msgid "Received Until"
+msgstr "Recebida Até"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirec_t"
+msgstr "Redire_ccionar"
 
-msgid "Received on"
-msgstr "Recebida em"
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Redireccionar"
 
+#: templates/compose/redirect.inc:115
 msgid "Redirect Message"
-msgstr "Reencaminhar Mensagem"
+msgstr "Redireccionar Mensagem"
 
+#: compose.php:734
 msgid "Redirect this message"
-msgstr "Reencaminhar esta mensagem"
-
-msgid "Redirect"
-msgstr "Reencaminhar"
+msgstr "Redireccionar esta mensagem"
 
+#: compose.php:794
 msgid "Redirecting failed."
-msgstr "Falha no reencaminhamento."
+msgstr "Redireccionamento falhou."
 
+#: templates/compose/compose.inc:573
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: config/prefs.php.dist:760
 msgid "Refresh Folder Views:"
 msgstr "Actualizar Visualização de Pastas:"
 
-msgid "Refresh"
-msgstr "Actualizar"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+msgid "Reload"
+msgstr "Recarregar"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
-msgstr "Actualizar Visualização"
+msgstr "Recarregar Visualização"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr "Lembrar a informação livre/ocupado."
+
+#: config/prefs.php.dist:950
 msgid "Remember the last view"
-msgstr "Lembrar o último modo de visualização"
+msgstr "Lembrar a última visualização"
 
+#: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
-msgstr "Mailbox Remota:"
-
-msgid "Remove Selected"
-msgstr "Remover Seleccionadas"
+msgstr "Caixa Postal Remota:"
 
-msgid "Rename Folder"
-msgstr "Renomear Pasta"
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr "Remover Campo da Procura"
+
+#: templates/prefs/sourceselect.inc:305
+msgid "Remove source"
+msgstr "Remover fonte"
+
+#: templates/folders/actions.inc:6
+msgid "Rename Folder(s)"
+msgstr "Renomear Pasta(s)"
+
+#: config/prefs.php.dist:335
+msgid "Rename sent-mail folder at beginning of month?"
+msgstr "Renomear a pasta de mensagens enviadas no início de cada mês?"
 
-msgid "Rename sent-mail folder at beginning of month"
-msgstr "Renomear a pasta de mensagens enviadas no início de cada mês"
-
-#, c-format
+#: lib/Folder.php:440
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr ""
-"A renomeação de \"%s\" para \"%s\" falhou. Isto é o que o servidor disse"
+msgstr "A renomeação de \"%s\" para \"%s\" falhou. O servidor disse"
+
+#: templates/message/navbar_actions.inc:10
+msgid "Repl_y to List"
+msgstr "Res_ponder para a Lista"
 
+#: templates/compose/spelling.inc:111
 msgid "Replace with:"
-msgstr "Substituir por: "
+msgstr "Substituir por:"
+
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Responder"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+msgid "Reply Sent."
+msgstr "Resposta Enviada."
 
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
-msgstr "Responder a Todos"
+msgstr "Responder _a Todos"
 
+#: compose.php:680
 msgid "Reply to All:"
 msgstr "Responder a Todos:"
 
+#: templates/message/navbar_actions.inc:10
 msgid "Reply to List"
 msgstr "Responder para a Lista"
 
-msgid "Reply"
-msgstr "Responder"
+#: compose.php:682
+msgid "Reply to List:"
+msgstr "Responder para a Lista:"
+
+#: templates/message/navbar_actions.inc:13
+msgid "Reply to _All"
+msgstr "Responder a _Todos"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr "Responder com Mensagem Não Suportada"
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr "Responder com livre/ocupado para os próximos 2 meses."
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr "Responder com a informação livre/ocupado livre."
+
+#: message.php:251
+msgid "Reply-To"
+msgstr "Responder Para"
 
+#: lib/Compose.php:259 lib/Compose.php:311
 msgid "Reply-To: "
-msgstr "Reponder para: "
-
-msgid "Reply-to"
-msgstr "Reponder-para"
+msgstr "Responder Para: "
 
+#: compose.php:678
 msgid "Reply:"
 msgstr "Responder:"
 
+#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+msgid "Report as Innocent"
+msgstr "Reportar como Não Spam"
+
+#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
 msgid "Report as Spam"
 msgstr "Reportar como Spam"
 
-msgid "Request a Return Receipt"
-msgstr "Solicitar Confirmação de Recebimento"
+#: templates/compose/compose.inc:374
+msgid "Request a _Read Receipt"
+msgstr "Pedir Aviso de _Leitura"
+
+#: config/prefs.php.dist:578
+msgid "Request delivery confirmation?"
+msgstr "Pedir confirmação de entrega?"
+
+#: config/prefs.php.dist:566
+msgid "Request read receipts?"
+msgstr "Solicitar recibos de leitura?"
+
+#: mailbox.php:204
+msgid "Requested message not found."
+msgstr "Mensagem pedida não encontrada."
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr "Participante Indispensável"
 
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:158
 msgid "Reset"
 msgstr "Limpar"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr "Estado do Respondente Actualizado"
+
+#: templates/message/navbar_actions.inc:28
 msgid "Resume"
 msgstr "Continuar"
 
-msgid "Return to Main Preferences Screen"
-msgstr "Retornar ao ecran principal de Preferências"
-
-msgid "Return to Previous Screen"
-msgstr "Retornar ao ecran anterior"
+#: recompose.php:98
+msgid "Resume your session"
+msgstr "Recomeçar a sessão"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr "Voltar ao Descarregamento de Correio"
+
+#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
+#: templates/smime/smime.inc:158 templates/smime/notactive.inc:33
+#: templates/pgp/pgp.inc:268 templates/pgp/notactive.inc:33
+#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+msgid "Return to Options"
+msgstr "Voltar às Opções"
 
+#: config/prefs.php.dist:714
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
-"Retornar à listagem de pastas depois de apagar, mover ou copiar uma mensagem?"
+"Voltar à listagem de caixas postais depois de remover, mover ou copiar uma "
+"mensagem?"
 
-msgid "Rule Definition"
-msgstr "Definição de Regra"
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr "Regra"
+
+#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:226
+#: lib/MIME/Viewer/pkcs7.php:408
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr "Encriptar Mensagem com S/MIME"
+
+#: compose.php:367
+msgid "S/MIME Error: "
+msgstr "Erro do S/MIME: "
+
+#: compose.php:346
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "Erro do S/MIME: Necessária frase-chave para a chave pessoal privada."
+
+#: templates/smime/notactive.inc:6
+msgid "S/MIME NOT Active"
+msgstr "S/MIME NÃO Activo"
+
+#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+msgid "S/MIME Options"
+msgstr "Opções de S/MIME"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr "Introdução da frase-chave S/MIME"
+
+#: templates/smime/smime.inc:100
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr "O suporte a Pares de Chaves Pessoais S/MIME exije uma ligação segura."
+
+#: smime.php:140
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "A Chave Pública S/MIME de \"%s\" foi removida com sucesso."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr "Chave Pública S/MIME adicionada com sucesso."
+
+#: templates/smime/smime.inc:45
+msgid "S/MIME Public Keyring"
+msgstr "Anel de Chaves Públicas S/MIME"
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "Par de Chaves Pública/Privada S/MIME adicionado com sucesso."
+
+#: templates/compose/encrypt_list.inc:13
+msgid "S/MIME Sign Message"
+msgstr "Assinar Mensagem com S/MIME"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "Assinar/Encriptar Mensagem com S/MIME"
+
+#: templates/smime/notactive.inc:11
+msgid "S/MIME support is disabled on this system."
+msgstr "O suporte de S/MIME está desactivado neste sistema."
 
+#: lib/MIME/Viewer/pkcs7.php:230
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+"O suporte de S/MIME não está activo de momento, por isso não é possível "
+"desencriptar a mensagem."
+
+#: lib/MIME/Viewer/pkcs7.php:162
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+"O suporte de S/MIME não está activo, por isso não é possível mostrar o "
+"conteúdo desta mensagem assinada."
+
+#: lib/MIME/Viewer/pkcs7.php:135
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"O suporte de S/MIME não está activo, por isso não é possível verificar a "
+"assinatura digital."
+
+#: templates/smime/smime.inc:24
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly"
+msgstr ""
+"O suporte de S/MIME exige a utilização de janelas \"popup\".  Se o seu "
+"navegador as estiver a bloquear, deverá alterar essa configuração, pois de "
+"outro modo as funcionalidades do PGP não se comportarão como desejado"
+
+#: templates/compose/compose.inc:266
+msgid "S_ubject"
+msgstr "A_ssunto"
+
+#: templates/compose/compose.inc:354
+msgid "Sa_ve a copy in "
+msgstr "Guardar uma Cópia em "
+
+#: templates/message/navbar_actions.inc:30
+msgid "Sa_ve as"
+msgstr "Guar_dar como"
+
+#: search.php:363 templates/fetchmail/manage.inc:67
+msgid "Save"
+msgstr "Gravar"
+
+#: templates/compose/compose.inc:528
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr "Guardar Anexos com a mensagem na pasta de mensagens enviadas?"
+
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
 msgid "Save Draft"
-msgstr "Gravar Rascunho"
+msgstr "Guardar Rascunho"
 
+#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
+#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
+#: templates/pgp/notactive.inc:23
 msgid "Save Options"
-msgstr "Gravar Opções"
+msgstr "Guardar Opções"
 
-msgid "Save a copy in "
-msgstr "Gravar cópia em"
+#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+msgid "Save _Draft"
+msgstr "Guardar _Rascunho"
 
+#: templates/message/navbar_actions.inc:30
 msgid "Save as"
-msgstr "Gravar como"
+msgstr "Guardar como"
 
-msgid "Save sent mail"
-msgstr "Gravar mensagem enviada"
+#: config/prefs.php.dist:513
+msgid "Save drafts as unseen?"
+msgstr "Guardar rascunhos como por ler?"
 
-#, c-format
+#: config/prefs.php.dist:1030
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+"Guardar destinatários automaticamente no livro de endereços por omissão?"
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr "Guardar procura como pasta virtual?"
+
+#: config/prefs.php.dist:223
+msgid "Save sent mail?"
+msgstr "Guardar mensagens enviadas?"
+
+#: compose.php:1162
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "O rascunho não foi gravado. O servidor disse: %s"
 
-msgid "Search Results"
-msgstr "Resultados da Pesquisa"
-
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:50
 msgid "Search"
-msgstr "Pesquisa"
+msgstr "Procurar"
+
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, php-format
+msgid "Search %s"
+msgstr "Procurar %s"
+
+#: search.php:316
+msgid "Search Results"
+msgstr "Resultados da Procura"
 
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "Lida"
 
-msgid "Select addressbook sources for adding and searching for addresses."
-msgstr "Seleccionar as listas de contactos onde será efectuada a pesquisa."
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Seleccionar"
+
+#: templates/fetchmail/manage.inc:70
+msgid "Select Another Account"
+msgstr "Seleccione Outra Conta"
+
+#: templates/search/fields.inc:36
+msgid "Select a date"
+msgstr "Seleccione uma data"
+
+#: templates/search/fields.inc:10
+msgid "Select a field"
+msgstr "Seleccione um campo"
 
+#: config/prefs.php.dist:127
+msgid "Select address book sources for adding and searching for addresses."
+msgstr ""
+"Seleccionar os livros de endereços onde se adicionarão e procurarão "
+"endereços."
+
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Seleccionar tudo"
 
+#: templates/prefs/sourceselect.inc:323
+msgid "Select all fields to search when expanding addresses."
+msgstr "Seleccione todos os campos a procurar quando expandindo endereços."
+
+#: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
 msgstr "Seleccione uma conta"
 
-msgid "Select an identity"
-msgstr "Seleccionar uma identidade"
-
-msgid "Select charset:"
-msgstr "Seleccione o conjunto de caracteres:"
-
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Seleccionar nenhuma"
 
-msgid "Select your color scheme."
-msgstr "Escolha o seu conjunto de cores."
-
-msgid "Select your preferred language:"
-msgstr "Seleccione o seu idioma preferido:"
-
-msgid "Select"
-msgstr "Seleccionar"
-
-msgid "Selected Addressbooks:"
-msgstr "Listas de contactos seleccionadas:"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr "Seleccione o tipo do servidor"
+
+#: templates/prefs/sourceselect.inc:309
+msgid "Selected Address books:"
+msgstr "Livros de Endereços seleccionados:"
+
+#: templates/pgp/pgp.inc:147
+msgid "Send Key to Public Keyserver"
+msgstr "Enviar Chave para o Servidor de Chaves Públicas"
+
+#: lib/MIME/Viewer/itip.php:604
+msgid "Send Latest Information"
+msgstr "Enviar Última Informação"
 
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
 msgid "Send Message"
 msgstr "Enviar Mensagem"
 
+#: config/prefs.php.dist:698
+msgid "Send read receipt when requested by the sender?"
+msgstr "Enviar aviso de leitura quando for requerido?"
+
+#: folders.php:392
+msgid "Sent mail folder"
+msgstr "Pasta de mensagens enviadas"
+
+#: templates/prefs/sentmailselect.inc:39
 msgid "Sent mail folder:"
 msgstr "Pasta de mensagens enviadas:"
 
-msgid "September"
-msgstr "Setembro"
-
-msgid "Server Information"
-msgstr "Dados do Servidor"
-
+#: templates/login/login.inc:132 templates/login/login.inc:145
+#: templates/login/login.inc:152
 msgid "Server"
 msgstr "Servidor"
 
+#: config/prefs.php.dist:23
+msgid "Server and Folder Information"
+msgstr "Informação sobre Servidores e Pastas"
+
+#: templates/fetchmail/manage.inc:23
 msgid "Server:"
 msgstr "Servidor:"
 
-msgid "Set preferences for filtering messages for unwanted content."
+#: config/prefs.php.dist:80
+msgid "Set preferences for what happens when you move and delete messages."
 msgstr ""
-"Ajustar preferências dos filtros de mensagens para conteúdo indesejado."
+"Ajustar preferências acerca do que acontece quando move ou remove mensagens."
 
-msgid "Set preferences for what happens when you move and delete messages."
-msgstr "Ajustar preferências do que acontece quando move ou apaga mensagens. "
+#: config/prefs.php.dist:522
+msgid "Set the X-Priority header when composing messages?"
+msgstr "Colocar o cabeçalho X-Prioridade ao compor as mensagens?"
+
+#: config/prefs.php.dist:31
+msgid "Share Folders"
+msgstr "Partilhar Pastas"
+
+#: templates/acl/acl.inc:86
+msgid "Share mail folders"
+msgstr "Partilhar pastas de correio electrónico"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr "Partilhar pastas de correio electrónico com outros utilizadores."
 
-msgid "Set the current time zone."
-msgstr "Ajustar o fuso horário local."
+#: config/prefs.php.dist:663
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+"Grendes blocos de texto citado devem ser mostrados ou ocultados por omissão? "
+"A sua escolha pode ser alterada facilmente."
 
-msgid "Set the language that menu items, explanations, and help are in."
+#: templates/pgp/pgp.inc:52
+msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
-"Ajustar o idioma em que os itens do menu, as mensagens e a ajuda serão "
-"mostrados."
+"O corpo de mensagens de \"text/plain\" deve ser percorrido procurando dados "
+"PGP?"
 
+#: config/prefs.php.dist:505
 msgid "Should the compose window be closed after saving a draft?"
 msgstr ""
-"A janela de escrita de mensagem deverá ser fechada após a gravação do "
-"rascunho?"
+"A janela de composição deve ser fechada depois de guardar um rascunho?A "
+"janela de escrita de mensagem deverá ser fechada após a gravação do rascunho?"
 
+#: templates/pgp/pgp.inc:40
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+"Quer que a sua chave pública PGP seja anexada ás suas mensagens por omissão?"
+
+#: templates/search/main.inc:92
+msgid "Show All Folders"
+msgstr "Mostrar Todas as Pastas"
+
+#: templates/message/headers.inc:67
 msgid "Show All Headers"
-msgstr "Mostrar todos os cabeçalhos"
+msgstr "Mostrar Todos os Cabeçalhos"
 
+#: mailbox.php:361
 msgid "Show Deleted"
-msgstr "Mostrar Apagadas"
+msgstr "Mostrar Removidas"
 
+#: templates/message/headers.inc:61
 msgid "Show Limited Headers"
-msgstr "Mostrar cabeçalhos limitados"
+msgstr "Mostrar Cabeçalhos Limitados"
 
+#: templates/message/headers.inc:70
 msgid "Show Mailing List Information"
-msgstr "Mostrar informações do Mailing List"
+msgstr "Mostrar Informações de Lista de Correio"
+
+#: templates/search/main.inc:92
+msgid "Show Only Subscribed Folders"
+msgstr "Mostrar Apenas Pastas Subscritas"
 
+#: folders.php:287
 msgid "Show Unsubscribed"
 msgstr "Mostrar Não Subscritas"
 
-msgid "Show last login time when logging in"
-msgstr "Mostrar dados do último acesso"
-
-msgid "Show legend in the mailbox view."
-msgstr "Mostrar legenda na visualização da caixa de correio."
+#: config/prefs.php.dist:603
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr "Mostrar um ícone para permitir libertar mensagens dos seus anexos?"
+
+#: config/prefs.php.dist:974
+msgid "Show legend in the mailbox view?"
+msgstr "Mostrar legenda na visualização da caixa postal?"
+
+#: config/prefs.php.dist:809
+msgid "Show previews for unread messages only?"
+msgstr "Mostrar previsões apenas das mensagens por ler?"
+
+#: config/prefs.php.dist:817
+msgid "Show previews in tooltips?"
+msgstr "Mostrar previsões como anotações (\"tooltips\")?"
+
+#: config/prefs.php.dist:848
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr "Mostrar o ícone 'Descarregar' na barra do menu?"
+
+#: lib/MIME/Viewer/html.php:108
+msgid "Show the Images"
+msgstr "Mostrar as Imagens"
+
+#: templates/filters/prefs.inc:61
+msgid "Show the filter icon on the menubar?"
+msgstr "Mostrar o ícone de filtragem na barra do menu?"
+
+#: lib/Block/summary.php:30
+msgid "Show total number of mails in folder?"
+msgstr "Mostrar número total de mensagens na pasta?"
+
+#: config/prefs.php.dist:660
+msgid "Shown"
+msgstr "Mostrada"
+
+#: templates/mailbox/message_headers.inc:42
+msgid "Si_ze"
+msgstr "_Tamanho"
+
+#: templates/login/login.inc:213
+msgid "Sign up if not registered"
+msgstr "Subscreva, se ainda não está registado"
+
+#: templates/mailbox/legend.inc:17
+msgid "Signed"
+msgstr "Assinada"
 
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Tamanho"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Alguns ficheiros de configuração do IMP não foram encontrados:"
-
+#: templates/mailbox/message_headers.inc:81
 msgid "Sort Direction"
-msgstr "Ordenação"
+msgstr "Direcção de Ordenação"
+
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr "Ordenar por Chegada"
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr "Ordenação por Data"
+
+#: templates/mailbox/message_headers.inc:26
+msgid "Sort by From Address"
+msgstr "Ordenar por Endereço de Origem"
+
+#: templates/mailbox/message_headers.inc:41
+msgid "Sort by Message Size"
+msgstr "Ordenar pelo Tamanho da Mensagem"
+
+#: templates/mailbox/message_headers.inc:36
+msgid "Sort by Subject"
+msgstr "Ordenar por Assunto"
 
-msgid "Spam Report from"
-msgstr "Relatório de Spam de"
+#: templates/mailbox/message_headers.inc:31
+msgid "Sort by Thread"
+msgstr "Ordenar por Conversa"
 
+#: templates/mailbox/message_headers.inc:21
+msgid "Sort by To Address"
+msgstr "Ordenar pelo Destinatário"
+
+#: templates/prefs/spamselect.inc:23
+msgid "Spam folder:"
+msgstr "Pasta de \"Spam\":"
+
+#: templates/compose/compose.inc:337
 msgid "Special Characters"
-msgstr "Símbolos"
+msgstr "Caracteres Especiais"
 
+#: templates/compose/compose.inc:334
 msgid "Spell Check"
 msgstr "Verificar Ortografia"
 
+#: templates/compose/spelling.inc:48
 msgid "Spell Checker"
 msgstr "Corrector Ortográfico"
 
+#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
 msgid "Spell check complete"
 msgstr "Verificação ortográfica completa"
 
+#: config/prefs.php.dist:462
 msgid "Spelling errors per screen when spell checking."
-msgstr "Erros de ortografia por página enquanto está a verificar."
+msgstr "Erros de ortografia por ecrã quanto verificando."
+
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr "Começar"
 
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
-msgstr "Status"
+msgstr "Estado"
 
-msgid "Subject Field"
-msgstr "Campo de Assunto"
+#: lib/MIME/Contents.php:202
+msgid "Strip Attachment"
+msgstr "Descartar Anexo"
 
+#: config/prefs.php.dist:801
+msgid "Strip linebreaks?"
+msgstr "Eliminar fins-de-linha?"
+
+#: templates/mailbox/message_headers.inc:37
+msgid "Sub_ject"
+msgstr "A_ssunto"
+
+#: message.php:252 search.php:151 templates/compose/recompose.inc:25
 msgid "Subject"
 msgstr "Assunto"
 
-msgid "Subject:"
-msgstr "Assunto:"
+#: config/prefs.php.dist:891
+msgid "Subject Field"
+msgstr "Campo de Assunto"
 
+#: search.php:365 templates/smime/passphrase.inc:21
+#: templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Submeter"
 
+#: templates/folders/actions.inc:9
 msgid "Subscribe to Folder(s)"
-msgstr "Seleccionar Pasta(s)"
+msgstr "Subscrever Pasta(s)"
 
+#: lib/MIME/Viewer/pkcs7.php:369 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Sucesso"
 
+#: templates/compose/spelling.inc:92
 msgid "Suggestions"
 msgstr "Sugestões"
 
-msgid "Sun"
-msgstr "Sol"
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr "Sumário"
+
+#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+msgid "Switch Composition Method"
+msgstr "Trocar Método de Composição"
+
+#: templates/compose/compose.inc:395
+msgid "Switch to HTML composition"
+msgstr "Trocar para Composição HTML"
+
+#: templates/compose/compose.inc:395
+msgid "Switch to plain text composition"
+msgstr "Trocar para Composição em Texto"
+
+#: templates/compose/compose.inc:410
+msgid "Te_xt"
+msgstr "Te_xto"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr "Tentativa: "
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr "Aceitar pedido tentativamente"
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr "Aceite Tentativamente"
 
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
 msgid "Terms of Service file not specified in conf.php"
-msgstr "O ficheiro dos termos do serviço não foi especificado no conf.php"
+msgstr "O ficheiro de Termos do Serviço não foi especificado em conf.php"
 
-msgid "Text"
-msgstr "Texto"
+#: config/prefs.php.dist:925
+msgid "The From: column of the message should be linked:"
+msgstr "A coluna De: deveria ser ligada:"
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr "O \"Macintosh resource fork\""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr "O \"Macintosh resource fork\" pode ser descarregado %s."
 
 # c-format
+#: fetchmailprefs.php:81
+#, php-format
 msgid "The account \"%s\" has been deleted."
-msgstr "A conta  \"%s\" foi apagada."
+msgstr "A conta \"%s\" foi removida."
 
-#, c-format
+#: fetchmailprefs.php:74
+#, php-format
 msgid "The account \"%s\" has been saved."
-msgstr "A conta \"%s\" foi gravada."
+msgstr "A conta \"%s\" foi guardada."
+
+#: lib/Filter.php:97
+#, php-format
+msgid "The address \"%s\" has been added to %s."
+msgstr "O endereço \"%s\" foi adicionado a %s."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr "O anexo não foi encontrado."
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr "Os dados de calendário são inválidos"
 
-#, c-format
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"A janela de composição não pôde ser aberta. Talvez tenha configurado o seu "
+"navegador para bloquear janelas de \"popup\"?"
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr "O conteúdo do arquivo Macintosh encontra-se abaixo."
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:91
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "A(s) pasta(s) corrente(s) \"%s\" será(ão) renomeada(s) para \"%s\"."
 
-#, c-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "A pasta \"%s\" não foi apagada. O servidor disse"
+#: templates/acl/acl.inc:112
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+"A lista corrente de utilizadores com acesso a esta pasta não pôde ser "
+"encontrada."
+
+#: compose.php:1171
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr "O rascunho foi guardado na pasta \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr "O evento foi adicionado ao seu calendário."
+
+#: templates/compose/expand.inc:9
+#, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "O campo \"%s\" não pode ser expandido."
 
-#, c-format
+#: lib/Folder.php:328
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "A pasta \"%s\" já existe"
 
-#, c-format
+#: lib/Folder.php:171
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
@@ -1594,512 +3716,1016 @@
 "O nome da pasta \"%s\" contém caracteres inválidos e pode causar problemas. "
 "Entre em contacto com o administrador do sistema."
 
-#, c-format
+#: lib/Folder.php:347
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "A pasta \"%s\" foi criada mas não está na sua lista de subscritas."
 
-#, c-format
+#: lib/Folder.php:285
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "A pasta \"%s\" foi apagada mas continua na sua lista de subscritas."
+msgstr "A pasta \"%s\" foi removida mas continua na sua lista de subscritas."
 
-#, c-format
+#: lib/Folder.php:334
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "A pasta \"%s\" não foi criada. O servidor disse"
 
-#, c-format
+#: lib/Folder.php:278
+#, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "A pasta \"%s\" não foi removida. Eis o que o servidor disse"
+
+#: lib/Folder.php:350
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "A pasta  \"%s\" foi criada com sucesso."
 
-#, c-format
+#: lib/Folder.php:288
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
-msgstr "A pasta \"%s\" foi apagada com sucesso."
+msgstr "A pasta \"%s\" foi removida com sucesso."
 
-#, c-format
+#: lib/Folder.php:438
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "A pasta \"%s\" foi renomeada para \"%s\" com sucesso."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "A identidade \"%s\" foi excluída."
-
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "A identidade \"%s\" foi gravada."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr "Os seguintes arquivos foram anexados a esta parte:"
 
-msgid "The message being composed has been closed.  Exiting."
-msgstr "A mensagem que estava a ser escrita foi fechada. Saíndo."
+#: lib/MIME/Viewer/html.php:96
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+"As imagens serão mostradas, pois o remetente consta no seu livro de "
+"endereços."
 
-msgid "The signature couldn't be replaced."
-msgstr "A assinatura não pode ser substituída."
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr "O servidor de correio electrónico gerou a seguinte mensagem de erro:"
 
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+"O servidor de correio electrónico gerou a seguinte mensagem informativa:"
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr "O servidor de correio electrónico gerou a seguinte mensagem:"
+
+#: lib/Message.php:614
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "A caixa postal %s está já vazia."
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+"A mensagem \"%s\" de \"%s\" (%d byte) excede o tamanho máximo de "
+"descarregamento."
+
+#: templates/contacts/contacts.inc:103
+msgid "The message being composed has been closed. Exiting."
+msgstr "A mensagem em composição foi fechada. Saíndo."
+
+#: message.php:142
+msgid "The message has been deleted."
+msgstr "A mensagem foi removida."
+
+#: lib/MIME/Viewer/pgp.php:393
+msgid "The message has been verified."
+msgstr "A mensagem foi verificada."
+
+#: lib/MIME/Viewer/pkcs7.php:373
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "A mensagem foi verificada. Remetente: %s."
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+"A janela da palavra-passe não pôde ser aberta. Talvez tenha configurado o "
+"seu navegador para bloquear janelas de \"popup\"?"
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr "O texto cru da Chave Pública PGP pode ser visto %s."
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr "O arquivo pedido não existe no anexo MS-TNEF."
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "O arquivo pedido não existe no anexo Zip."
+
+#: message.php:531
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+"O rementente desta mensagem pede uma Notificação de Disposição de Mensagem "
+"quando ler esta mensagem. Por favor carregue em %s para enviar a mensagem de "
+"notificação."
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "O servidor não pôde criar a miniatura desta imagem."
+
+#: templates/compose/compose.js:104
+msgid "The signature could not be replaced."
+msgstr "A assinatura não pôde ser substituída."
+
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "A assinatura foi substituída com sucesso."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr "O arquivo especificado não existe."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr "A tarefa foi adicionada à sua lista de tarefas."
+
+#: lib/MIME/Viewer/status.php:95
+msgid "The text of the message"
+msgstr "O texto da mensagem"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr "O texto da mensagem pode ser visto %s."
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr "O texto da mensagem devolvida"
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr "O texto da mensagem devolvida pode ser visto %s."
+
+#: lib/MIME/Viewer/notification.php:68
+msgid "The text of the sent message"
+msgstr "O texto da mensagem enviada"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr "O texto da mensagem enviada pode ser visto %s."
+
+#: lib/MIME/Viewer/itip.php:154
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "A informação livre/ocupado do utilizador foi arquivada com sucesso."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Não há partes alternativas que possam ser mostradas em-linha."
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
-msgstr "Não há mensagens nesta caixa de correio."
+msgstr "Não há mensagens nesta caixa postal."
 
-#, c-format
+#: thread.php:69
+msgid "There is no text that can be displayed inline."
+msgstr "Não há qualquer texto que possa ser mostrado em-linha."
+
+#: lib/Message.php:575
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Ocorreu um problema removendo %s. O servidor disse"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Ocorreu um problema removendo a caixa de correio. O servidor disse"
-
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"Ocorreu um problema com o envio do ficheiro. Provavelmente o ficheiro excede "
-"o tamanho máximo permitido (%d MB)."
+#: lib/Message.php:616
+#, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
+msgstr "Ocorreu um problema removendo a caixa postal. O servidor disse: %s"
 
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"Ocorreu um problema com o envio do ficheiro. Talvez o ficheiro exceda o "
-"tamanho máximo permitido."
+#: lib/Message.php:584
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Ocorreu um problema removendo a caixa postal. O servidor disse"
 
-#, c-format
+#: lib/Message.php:92
+#, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Ocorreu um erro enquanto as mensagens eram copiadas para \"%s\". O servidor "
-"disse"
+"Ocorreu um erro copiando mensagens de \"%s\" para \"%s\". O servidor disse"
 
-#, c-format
+#: lib/Message.php:200 lib/Message.php:215
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Ocorreu um erro enquanto as mensagens eram apagadas da pasta \"%s\". O "
-"servidor disse"
+"Ocorreu um erro ao remover mensagens da pasta \"%s\". Eis o que o servidor "
+"disse"
 
-#, c-format
+#: lib/Message.php:277
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
-msgstr "Ocorreu um erro ao apagar mensagens da pasta \"%s\". O servidor disse"
+msgstr ""
+"Ocorreu um erro ao remover mensagens da pasta \"%s\". Eis o que o servidor "
+"disse"
 
-msgid "There was an error deleting messages. This is what the server said"
-msgstr "Ocorreu um erro enquanto as mensagens eram apagadas. O servidor disse"
+#: lib/Message.php:213
+#, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "Ocorreu um erro ao remover mensagens. Eis o que o servidor disse: %s"
+
+#: lib/MIME/Viewer/itip.php:99
+#, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Ocorreu um erro ao remover o evento: %s."
 
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Ocorreu um erro ao mostrar esta parte da mensagem"
 
-#, c-format
+#: lib/Message.php:508 lib/Message.php:548
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Ocorreu um erro enquanto as mensagens da pasta \"%s\" eram marcadas. O "
-"servidor disse"
-
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Ocorreu um erro enquanto as mensagens eram marcadas. O servidor disse"
+"Ocorreu um erro ao marcar as mensagens da pasta \"%s\". Eis o que o servidor "
+"disse"
 
-#, c-format
-msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
-msgstr "Ocorreu um erro ao mover as mensagens para \"%s\". O servidor disse"
+#: folders.php:155
+#, php-format
+msgid "There was an error importing %s."
+msgstr "Ocorreu um erro ao importar %s."
+
+#: lib/MIME/Viewer/itip.php:136
+#, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Ocorreu um erro ao importar o evento: %s."
+
+#: lib/MIME/Viewer/itip.php:166
+#, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Ocorreu um erro ao importar a tarefa: %s."
+
+#: lib/MIME/Viewer/itip.php:152
+#, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr ""
+"Ocorreu um erro ao importar a informação livre/ocupado do utilizador: %s."
 
+#: lib/Message.php:87
+#, php-format
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr ""
-"Ocorreu um erro enquanto ao mover as mensagens para a Pasta apagadas. O "
+"Ocorreu um erro ao mover as mensagens de \"%s\" para \"%s\". Eis o que o "
 "servidor disse"
 
-msgid "There was an error saving a draft."
-msgstr "Ocorreu um erro ao gravar o rascunho"
+#: compose.php:1179
+msgid "There was an error saving this message as a draft."
+msgstr "Ocorreu um erro ao guardar esta mensagem como um rascunho."
 
-#, c-format
+#: compose.php:940
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Ocorreu um erro ao enviar a sua mensagem: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "Ocorreu um erro ao recuperar a(s) mensagem(ns). O servidor disse"
+#: lib/MIME/Viewer/itip.php:113
+#, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Ocorreu um erro ao actualizar o evento: %s."
+
+#: lib/MIME/Viewer/plain.php:59
+msgid "There was no text in this message part"
+msgstr "Não havia texto nesta parte da mensagem"
+
+#: lib/MIME/Viewer/html.php:94
+msgid "This HTML message has images embedded in it."
+msgstr "Esta mensagem HTML tem imagens embebidas."
 
-msgid "There was an error viewing the requested message."
-msgstr "Ocorreu um erro ao mostrar a mensagem solicitada."
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
+"Esta mensagem HTML tem imagens embebidas. Imagens bloqueadas aparecem com "
+"este aspecto: "
 
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Esta chave pública PGP foi anexada à mensagem."
 
-msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr ""
-"Este ficheiro controla os drivers MIME para o IMP, especificando que tipos "
-"de anexos são visíveis e/ou graváveis."
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr "Esta acção não é suportada."
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr "Esta acção ainda não está implementada."
 
-msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
-msgstr ""
-"Este ficheiro controla as opções padrão do IMP e quais podem ser alteradas "
-"pelos utilizadores."
+#: templates/folders/javascript.inc:6
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Isto pode levar algum tempo. Tem certeza que deseja continuar?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr "Esta mensagem contém um ficheiro Macintosh."
 
+#: lib/MIME/Viewer/pkcs7.php:399
 msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
 msgstr ""
-"Este ficheiro controla as configurações padrão do IMP e define a lista de "
-"servidores disponíveis caso o sistema esteja configurado para utilizar uma."
+"Esta mensagem contém um anexo que foi assinado digitalmente via S/MIME."
 
-msgid ""
-"This file controls the stylesheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/MIME/Viewer/pkcs7.php:403
+msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
-"Este ficheiro controla a stylesheet que é usada para ajustar cores e fontes "
-"em vez de / ou sobrepôr as opções padrão do Horde."
+"Esta mensagem contém um anexo que foi encriptado digitalmente via S/MIME."
 
+#: lib/MIME/Viewer/status.php:160
 msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
 msgstr ""
-"Este é o ficheiro principal de configuração do IMP. Contém caminhos e opções "
-"para scripts do IMP."
+"Esta mensagem contém informação de estado de entrega do correio, mas o seu "
+"formato é desconhecido."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Isto pode levar algum tempo. Tem certeza que deseja continuar?"
+#: lib/MIME/Viewer/pgp.php:315
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "Esta mensagem não parece ser uma mensagem encriptada com PGP. Erro: "
 
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
-"Esta mensagem não parece estar de acordo com o formato PGP (segundo o RFC 2015)."
+"Esta mensagem não parece estar de acordo com o formato PGP (segundo o RFC "
+"2015)."
+
+#: lib/MIME/Viewer/pkcs7.php:159
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr "Esta mensagem não parece estar de acordo com o formato S/MIME."
 
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Esta mensagem foi assinada digitalmente via PGP."
 
+#: lib/MIME/Viewer/pkcs7.php:132
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Esta mensagem foi assinada digitalmente via S/MIME."
+
+#: lib/MIME/Viewer/pkcs7.php:128 lib/MIME/Viewer/pkcs7.php:227
+msgid "This message has been encrypted via S/MIME."
+msgstr "Esta mensagem foi encriptada via S/MIME."
+
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
 msgstr "Esta mensagem foi encriptada com PGP."
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr ""
-"Esta mensagem foi denunciada como spam ao seu administrador de sistema."
-
-msgid "This message has been reported as spam."
-msgstr ""
-"Esta mensagem foi denunciada como spam."
-
+#: message.php:195
 msgid "This message to"
 msgstr "Esta mensagem para"
 
-msgid "This window must be called from compose window"
-msgstr "Esta janela tem de ser chamada a partir da janela de escrita de mensagem"
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr "Este servidor não suporta partilha de pastas."
+
+#: templates/contacts/contacts.inc:109
+msgid "This window must be called from a compose window."
+msgstr ""
+"Esta janela tem de ser chamada a partir da janela de escrita de mensagem"
 
+#: thread.php:44 templates/thread/top.inc:3 config/prefs.php.dist:893
 msgid "Thread View"
 msgstr "Visualização do Thread"
 
-msgid "Thread"
-msgstr "Thread"
-
-msgid "Time Zone"
-msgstr "Fuso horário"
-
+#: message.php:248 mailbox.php:585 search.php:139
+#: templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:64
+#: templates/compose/recompose.inc:10
 msgid "To"
 msgstr "Para"
 
-msgid "To:"
-msgstr "Para:"
+#: config/prefs.php.dist:890
+msgid "To Address"
+msgstr "Para o Endereço"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+"Para seleccionar múltiplos campos, pressione Controlo (PC) ou Comando (Mac) "
+"quando clicar."
+
+#: templates/compose/compose.inc:567
+msgid "Total Attachments Size:"
+msgstr "Tamanho Total dos Anexos:"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Tamanho Total: %s KB"
+#: folders.php:383
+msgid "Trash folder"
+msgstr "Pasta de lixo"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
-msgstr "Pasta apagados:"
+msgstr "Pasta de lixo:"
 
-msgid "Unanswered messages"
-msgstr "Mensagens não respondidas"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr "Não foi possível obter a quota"
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Não respondida"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Mensagens não respondidas"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Recuperar"
 
+#: mailbox.php:568 mailbox.php:581 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Destinatários não revelados"
 
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr "Componente de tipo não suportado: %s"
+
+#: mailbox.php:544
+msgid "Unknown Date"
+msgstr "Data Desconhecida"
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr "Reunião Desconhecida"
+
+#: mailbox.php:597
+msgid "Unknown Recipient"
+msgstr "Destinatário Desconhecido"
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
 msgid "Unload Passphrase"
-msgstr "Descarregar frase chave"
+msgstr "Descarregar frase-chave"
 
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Sem nome"
 
-msgid "Unread"
-msgstr "Nova"
-
-msgid "Unseen Messages"
-msgstr "Mensagens novas"
-
+#: message.php:483 mailbox.php:687 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
-msgstr "Nova"
+msgstr "Por ler"
 
+#: templates/folders/actions.inc:10
 msgid "Unsubscribe from Folder(s)"
-msgstr "Retirar pasta(s) da sua lista de subscritas"
+msgstr "Cancelar Subscrição de Pasta(s)"
+
+#: templates/compose/compose.inc:574
+msgid "Update Attachment Information"
+msgstr "Actualizar Informação sobre Anexos"
 
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr "Actualizar o estado do respondente"
+
+#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Upload"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Utilize Ctrl/Option+Clique para seleccionar vários campos"
-
+#: templates/prefs/sentmailselect.inc:42
 msgid "Use Default Value"
 msgstr "Usar o valor padrão"
 
-msgid "Use IMAP folder subscriptions"
-msgstr "Usar selecção de pastas IMAP"
+#: config/prefs.php.dist:250
+msgid "Use IMAP folder subscriptions?"
+msgstr "Usar subscrição de pastas IMAP?"
 
-msgid "User Options"
-msgstr "Opções do utilizador"
+#: templates/acl/acl.inc:140
+msgid "User"
+msgstr "Utilizador"
 
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+"O utilizador \"%s\" atribuiu com sucesso os direitos especificados para a "
+"pasta \"%s\"."
+
+#: templates/login/login.inc:181
 msgid "Username"
 msgstr "Utilizador"
 
+#: templates/fetchmail/manage.inc:17
 msgid "Username:"
 msgstr "Username:"
 
-#, c-format
-msgid "View %s Public Key"
-msgstr "Ver a chave pública %s"
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
+#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+msgid "View"
+msgstr "Visualizar"
 
-#, c-format
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Visualizar %s"
 
+#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#, php-format
+msgid "View %s Public Key"
+msgstr "Ver a chave pública %s"
+
+#: lib/MIME/Viewer/html.php:128
+msgid "View HTML content in a separate window"
+msgstr "Ver conteúdo HTML numa janela separada."
+
+#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
 msgid "View Personal Private Key"
 msgstr "Ver a chave pessoal privada"
 
+#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
 msgid "View Personal Public Key"
 msgstr "Ver a chave pessoal pública"
 
-msgid "View messages in "
-msgstr "Visualizar mensagens em "
+#: templates/message/navbar_actions.inc:17
+msgid "View Thread"
+msgstr "Ver Conversa"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr "Ver Miniatura"
+
+#: lib/MIME/Viewer/pkcs7.php:407
+msgid "View attachment in a separate window"
+msgstr "Ver anexo numa janela separada."
+
+#: lib/MIME/Viewer/related.php:79
+msgid "View content in a separate window"
+msgstr "Ver conteúdo numa janela separada."
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr "Ver evento"
+
+#: folders.php:375 mailbox.php:513
+#, php-format
+msgid "View messages in %s"
+msgstr "Ver mensagens em %s"
 
+#: templates/prefs/initialpageselect.inc:26
 msgid "View or mailbox to display after login:"
-msgstr "Caixa de Correio a mostrar depois do login:"
+msgstr "Caixa postal ou vista a mostrar depois da entrada:"
 
-msgid "View"
-msgstr "Visualizar"
+#: lib/MIME/Viewer/itip.php:170
+msgid "View task"
+msgstr "Ver tarefa"
+
+#: lib/MIME/Viewer/html.php:113
+msgid "View the Images"
+msgstr "Ver as Imagens"
+
+#: search.php:314
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "A Pasta Virtual \"%s\" foi criada com sucesso."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:129 lib/IMAP/Tree.php:142
+#: lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:148 lib/IMAP/Tree.php:149
+#: lib/IMAP/Tree.php:354 lib/IMAP/Tree.php:378 lib/IMAP/Tree.php:418
+msgid "Virtual Folders"
+msgstr "Pastas Virtuais"
+
+#: search.php:296
+msgid "Virtual Folders require a label."
+msgstr "Pastas Virtuais precisam de uma etiqueta."
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr "Etiqueta da pasta virtual"
+
+#: lib/MIME/Viewer/pkcs7.php:363
+msgid "Warning"
+msgstr "Aviso"
 
-#, c-format
+#: login.php:130
+#, php-format
 msgid "Welcome to %s"
 msgstr "Bem-vindo ao %s"
 
+#: config/prefs.php.dist:724
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
-"them as deleted."
+"them as deleted?"
+msgstr ""
+"Quando remover mensagens, movê-las para a pasta de Lixo em vez de marcá-las "
+"como removidas?"
+
+#: config/prefs.php.dist:878
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr "Quando abrindo uma nova caixa postal, em que página quer começar?"
+
+#: config/prefs.php.dist:554
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr "Quando guardando mensagens enviadas, guardar também os dados anexos?"
+
+#: config/prefs.php.dist:421
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
 msgstr ""
-"Quando apagar mensagens, move-las para a pasta apagados em vez de marcá-las "
-"como apagadas."
+"Ao enviar mensagens ou ao expandir endereços, que domínio deve ser "
+"adicionado aos endereços não qualificados (i.e., endereços de correio "
+"electrónico sem \"@\")?"
+
+#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "Lista Branca"
 
+#: config/prefs.php.dist:437
 msgid "Wrap text at this many characters."
 msgstr "Quebrar a linha depois desta quantidade de caracteres."
 
+#: templates/compose/compose.inc:531 config/prefs.php.dist:949
 msgid "Yes"
 msgstr "Sim"
 
-msgid "You are attempting to delete the following folders:"
-msgstr "Está a tentar apagar as seguintes pastas:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Está a tentar descarregar correio da(s) seguinte(s) const(s):"
 
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr ""
+"Está a tentar remover todas as mensagens contidas na(s) seguinte(s) pasta(s)"
+
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Está a tentar remover a(s) seguinte(s) pasta(s)."
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+msgid "You are copying/moving to a new folder."
+msgstr "Está a copiar/mover para uma nova pasta."
+
+#: templates/folders/javascript.inc:94
 msgid "You are creating a sub-folder to "
 msgstr "Está a criar uma sub-pasta em "
 
+#: templates/folders/javascript.inc:96
 msgid "You are creating a top-level folder."
-msgstr "Está a criar uma pasta top-level."
+msgstr "Está a criar uma pasta no nível de topo."
 
+#: templates/folders/javascript.inc:127
 msgid "You are renaming the folder: "
 msgstr "Está a renomear a pasta: "
 
-msgid "You didn't specify a Mail Server"
-msgstr "Não especificou um servidor de Mail"
+#: lib/Folder.php:537
+#, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Não pode cessar a subscrição de \"%s\"."
 
-msgid "You didn't specify the password"
-msgstr "Não especificou a password"
-
-msgid "You didn't specify the username"
-msgstr "Não especificou o username"
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr "Não deu o seu acordo aos Termos de Serviços, por isso não pode entrar."
+
+#: templates/acl/acl.inc:165
+msgid "You do not have permission to change access to this folder"
+msgstr "Não tem permissão para alterar o acesso a esta pasta"
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr "Reenviou esta mensagem em %%s para os seguintes destinatários: %s."
 
-#, c-format
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Tem %s mensagens novas."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Tem 1 mensagem nova."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Acabou de sair. Obrigado por utilizar o nosso sistema."
+#: templates/compose/attachments.js:116
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
+"Tem pelo menos um anexo seleccionado que ainda não carregou. Quer mesmo que "
+"enviemos esta mensagem se esses anexos?"
 
+#: lib/IMP.php:1030
 msgid "You have new mail in the following folder:"
-msgstr "Tem novas mensagens nas seguintes pastas:"
+msgstr "Tem novas mensagens na seguinte pasta:"
 
+#: lib/IMP.php:1035
 msgid "You have new mail in the following folders:"
 msgstr "Tem novas mensagens nas seguintes pastas:"
 
+#: compose.php:126
+msgid "You must enter at least one recipient."
+msgstr "Tem de introduzir pelo menos um destinatário."
+
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
-"Tem de introduzir a frase chave da sua chave privada PGP para ver a mensagem"
-
-msgid "You must first select the attachment(s) to delete."
-msgstr "Tem que seleccionar primeiro o anexo a remover."
-
-msgid "You must first specify the file to attach."
-msgstr "Tem que especificar primeiro o ficheiro a ser anexado."
+"Tem de introduzir a frase-chave da sua chave privada PGP para ver esta "
+"mensagem"
 
-msgid "You must have at least one recipient."
-msgstr "Tem que introduzir pelo menos um destinatário."
+#: lib/MIME/Viewer/pkcs7.php:238
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+"Tem de introduzir a frase-chave da sua chave privada S/MIME para ver esta "
+"mensagem"
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
-msgstr "Tem que seleccionar primeiro uma caixa de correio."
+msgstr "Tem de seleccionar primeiro uma caixa postal."
 
+#: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
-msgstr "Tem que seleccionar uma conta para ser apagada."
+msgstr "Tem de seleccionar uma conta para ser removida."
 
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
-msgstr "Tem que seleccionar primeiro um endereço."
-
-msgid "You must select an identity to be deleted."
-msgstr "Tem que seleccionar uma identidade para ser apagada."
+msgstr "Tem de seleccionar primeiro um endereço."
 
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
-msgstr "Tem que seleccionar primeiro pelo menos uma mensagem."
+msgstr "Tem de seleccionar primeiro pelo menos uma mensagem."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
-msgstr "Tem que introduzir um destinatário."
+msgstr "Tem de introduzir um destinatário."
+
+#: templates/compose/attachments.js:29
+msgid "You must specify at least one file to attach."
+msgstr "Tem de especificar pelo menos um arquivo a anexar."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Precisa de ter \"%s\" activado nas suas opções de manutenção."
+
+#: lib/Maillog.php:137
+#, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Redireccionou esta mensagem para %s em %%s."
+
+#: lib/Maillog.php:141
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "Respondeu a esta mensagem em %s."
 
-#, c-format
+#: lib/Folder.php:487
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
-msgstr "A pasta \"%s\" não estava na sua lista de subscritas. O servidor disse"
+msgstr ""
+"A pasta \"%s\" não estava na sua lista de subscrições. Aqui está o que o "
+"servidor disse"
 
-#, c-format
+#: lib/Folder.php:539
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr ""
-"A pasta \"%s\" não foi retirada da sua lista de subscritas. O servidor disse"
+"A pasta \"%s\" não foi retirada da sua lista de subscrições. Aqui está o que "
+"o servidor disse"
 
-#, c-format
+#: lib/Folder.php:490
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
-msgstr "A pasta \"%s\" foi incluída com sucesso na sua lista de subscritas"
+msgstr "A pasta \"%s\" foi incluída com sucesso na sua lista de subscrições"
 
-#, c-format
+#: lib/Folder.php:542
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
-msgstr "A pasta \"%s\" foi excluída com sucesso da sua lista de subscritas"
-
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "A sua sessão %s expirou. Por favor, faça novamente o login."
-
-msgid "Your From: address:"
-msgstr "O seu endereço de email:"
-
-msgid "Your Information"
-msgstr "Os seus dados"
+msgstr "A pasta \"%s\" foi excluída com sucesso da sua lista de subscrições"
 
+#: templates/pgp/pgp.inc:186
 msgid "Your Name"
-msgstr "Nome"
+msgstr "O Seu Nome"
 
+#: templates/pgp/pgp.inc:119
 msgid "Your PGP Public/Private Keys"
-msgstr "As suas chaves Publicas/Privadas"
+msgstr "As Suas Chaves Publicas/Privadas PGP"
 
+#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
 msgid "Your Private Key"
-msgstr "A sua chave privada"
+msgstr "A Sua Chave Privada"
 
+#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
 msgid "Your Public Key"
-msgstr "Chave Pública"
+msgstr "A Sua Chave Pública"
 
+#: config/prefs.php.dist:157
 msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Reponder para <i>(opcional)</i>:"
+msgstr "O Seu Endereço de Resposta <i>(opcional)</i>:"
+
+#: templates/smime/smime.inc:91
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "Os Seus Certificados Publicos/Privados S/MIME"
 
+#: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "As suas contas:"
 
-msgid "Your browser does not support inline display of this image type"
-msgstr ""
-"O seu browser não suporta a visualização deste tipo de imagem inline"
-
+#: config/prefs.php.dist:165
 msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
 msgstr ""
-"O seu browser não suporta esta opção de impressão. Pressione Control/Option "
-"+ P para imprimir."
+"Os seus endereços equivalentes: <i>(opcional, introduza cada endereço em sua "
+"linha)</i>"
 
-msgid "Your current time zone:"
-msgstr "Fuso horário actual:"
+#: lib/MIME/Viewer/images.php:92
+msgid "Your browser does not support inline display of this image type."
+msgstr ""
+"O seu navegador não suporta a visualização em-linha deste tipo de imagem."
 
-msgid "Your default identity:"
-msgstr "Identidade padrão:"
+#: config/prefs.php.dist:532
+msgid "Your default charset for sending messages:"
+msgstr "O seu código de caracteres por emissão ao enviar mensagens:"
 
-msgid "Your full name:"
-msgstr "Nome completo"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr "O seu método de encriptação por omissão ao enviar mensagens:"
 
-msgid "Your identities:"
-msgstr "Identidades:"
+#: lib/MIME/Viewer/status.php:89
+msgid "Your message was successfully delivered."
+msgstr "A sua mensagem foi enviada com sucesso."
 
+#: config/prefs.php.dist:198
 msgid "Your signature:"
-msgstr "Assinatura:"
+msgstr "A Sua Assinatura:"
 
+#: message.php:272 compose.php:1219 mailbox.php:528 lib/Compose.php:729
 msgid "[No Subject]"
-msgstr "[Sem assunto]"
+msgstr "[Sem Assunto]"
 
-msgid "add source"
-msgstr "adicionar fonte"
+#: templates/compose/compose.inc:216
+msgid "_Bcc"
+msgstr "_Bcc"
+
+#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+msgid "_Blacklist"
+msgstr "Lista N_egra"
+
+#: templates/compose/compose.inc:165
+msgid "_Cc"
+msgstr "_Cc"
+
+#: lib/IMP.php:933
+msgid "_Compose"
+msgstr "Escreve_r"
+
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+msgid "_Delete"
+msgstr "Remo_ver"
+
+#: lib/IMP.php:935
+msgid "_Folders"
+msgstr "_Pastas"
+
+#: templates/compose/compose.inc:80
+msgid "_Identity"
+msgstr "_Identidade"
+
+#: lib/IMP.php:926
+msgid "_Inbox"
+msgstr "_Entrada"
+
+#: lib/IMP.php:976
+msgid "_Log out"
+msgstr "_Sair"
 
-msgid "cannot move past the beginning"
-msgstr "não posso ir antes do começo"
-
-msgid "cannot move past the end"
-msgstr "não posso ir além do fim"
+#: message.php:368
+msgid "_Message Source"
+msgstr "Código-fonte da Mensagem"
 
-msgid "delete message"
-msgstr "apagar mensagem"
+#: templates/message/navbar_actions.inc:31
+msgid "_Print"
+msgstr "_Imprimir"
+
+#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+msgid "_Priority"
+msgstr "Prioridade"
+
+#: mailbox.php:402
+#, php-format
+msgid "_Refresh %s"
+msgstr "_Refrescar %s"
+
+#: templates/message/navbar_actions.inc:8
+msgid "_Reply"
+msgstr "Resp_onder"
+
+#: lib/IMP.php:937
+msgid "_Search"
+msgstr "Proc_urar"
+
+#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+msgid "_Send Message"
+msgstr "_Enviar Mensagem"
+
+#: templates/mailbox/message_headers.inc:32
+msgid "_Thread"
+msgstr "_Conversa"
+
+#: templates/compose/compose.inc:115
+msgid "_To"
+msgstr "_Para"
+
+#: templates/mailbox/actions.inc:13
+msgid "_Undelete"
+msgstr "_Recuperar"
+
+#: templates/message/navbar_actions.inc:17
+msgid "_View Thread"
+msgstr "_Ver Conversa"
+
+#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr "Lista B_ranca"
+
+#: lib/Compose.php:351
+msgid "attachment"
+msgstr "anexo"
+
+#: view.php:99
+msgid "attachments.zip"
+msgstr "anexos.zip"
+
+#: templates/compose/compose.inc:503
+msgid "bytes"
+msgstr "bytes"
 
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "de"
 
-msgid "move down"
-msgstr "mover para baixo"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr "chave"
+
+#: folders.php:151
+msgid "mailbox file"
+msgstr "ficheiro de caixa postal"
 
-msgid "move message to"
-msgstr "mover mensagem para"
-
-msgid "move up"
-msgstr "mover para cima"
-
-msgid "no folder selected"
-msgstr "não foi seleccionada nenhuma pasta"
-
-msgid "no rule selected"
-msgstr "não foi seleccionada nenhuma regra"
-
-msgid "no text specified"
-msgstr "nenhum texto especificado"
+#: compose.php:1001 lib/Message.php:429
+msgid "name"
+msgstr "Nome"
 
+#: templates/compose/spelling.inc:80
 msgid "none"
 msgstr "nenhum"
 
+#: templates/compose/spelling.inc:111
 msgid "or"
 msgstr "ou"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "por favor, preencha o texto, escolha um campo e uma açcão"
-
-msgid "remove source"
-msgstr "remover fonte"
-
-msgid "select folder"
-msgstr "seleccione a pasta"
-
+#: templates/compose/spelling.inc:48
 msgid "spelling error"
 msgstr "erro de ortografia"
 
+#: templates/compose/spelling.inc:48
 msgid "spelling errors"
 msgstr "erros de ortografia"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "onde o campo %s contém <b>%s</b>"
-
+#: lib/Filter.php:51
+msgid "your blacklist"
+msgstr "a sua lista negra"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr "a sua lista branca"


--- orig/templates/mailbox/header.inc
+++ mod/templates/mailbox/header.inc
@@ -1,33 +1,36 @@
 <div class="header">
- <span style="float:left; width:40%">
-  <span dir="ltr"><?php echo htmlspecialchars($title) ?></span>
-  <?php echo Horde::link($refresh_url, $refresh_title, 'smallheader', '', '', $refresh_title, $refresh_ak) . Horde::img('reload.png', _("Reload"), array('title' => $refresh_title, 'align' => 'absmiddle'), $registry->getImageDir('horde')) ?></a>
+ <span style="width:30%" class="leftFloat">
+  <span dir="ltr"><?php echo htmlspecialchars($title) ?>&nbsp;</span>
+  <?php echo Horde::link($refresh_url, $refresh_title, '', '', '', '', $refresh_ak) . Horde::img('reload.png', _("Reload"), '', $registry->getImageDir('horde')) ?></a>
 
 <?php if (isset($filter_url)): ?>
-  <?php echo Horde::link($filter_url, sprintf(_("Apply Filters to %s"), $title), 'smallheader') . Horde::img('filters.png', _("Apply Filters"), array('title' => sprintf(_("Apply Filters to %s"), htmlspecialchars($title)), 'align' => 'absmiddle')) ?></a>
+  <?php echo Horde::link($filter_url, sprintf(_("Apply Filters to %s"), $title)) . Horde::img('filters.png', _("Apply Filters")) ?></a>
 <?php endif; ?>
 
 <?php if (!$search_mbox): ?>
-  <?php echo Horde::link(Util::addParameter(Horde::applicationUrl('search.php'), 'mailbox', $imp['mailbox']), sprintf(_("Search %s"), $title), 'smallheader') . Horde::img('search.png', _("Search"), array('title' => sprintf(_("Search %s"), htmlspecialchars($title)), 'align' => 'absmiddle'), $registry->getImageDir('horde')) ?></a>&nbsp;
-<?php elseif (!empty($_SESSION['imp']['search']['vfolder_id'])): ?>
-  <?php echo Horde::link(IMP_VFolder::editVFolderURL($_SESSION['imp']['search']['vfolder_id']), sprintf(_("Edit Virtual Folder Definition for %s"), htmlspecialchars($title)), 'smallheader') . Horde::img('edit.png', _("Edit Virtual Folder"), array('title' => sprintf(_("Edit Virtual Folder Definition for %s"), htmlspecialchars($title)), 'align' => 'absmiddle'), $registry->getImageDir('horde')) ?></a>&nbsp;
+  <?php echo Horde::link(Util::addParameter(Horde::applicationUrl('search.php'), 'search_mailbox', $imp['mailbox']), sprintf(_("Search %s"), $title)) . Horde::img('search.png', _("Search"), '', $registry->getImageDir('horde')) ?></a>
+<?php elseif ($imp_search->isEditableVFolder()): ?>
+  <?php echo Horde::link($imp_search->editURL(), sprintf(_("Edit Virtual Folder Definition for %s"), htmlspecialchars($title))) . Horde::img('edit.png', sprintf(_("Edit Virtual Folder Definition for %s"), $title), '', $registry->getImageDir('horde')) ?></a>
+  <?php echo Horde::link($imp_search->deleteURL(), sprintf(_("Delete Virtual Folder Definition for %s"), htmlspecialchars($title)), null, null, "if (confirm('" . addslashes(_("Are you sure you want to delete this Virtual Folder Definition?")) . "')) { return true; } else { return false; }") . Horde::img('delete.png', sprintf(_("Delete Virtual Folder Definition for %s"), $title), '', $registry->getImageDir('horde')) ?></a>
+<?php elseif (!$imp_search->isVFolder()): ?>
+  <?php echo Horde::link($imp_search->editURL(), _("Edit Search Query")) . Horde::img('edit.png', _("Edit Search Query"), '', $registry->getImageDir('horde')) ?></a>
 <?php endif; ?>
  </span>
 
 <?php if ($pageOb->pagecount > 1): ?>
- <span style="float:left; width:30%; text-align:left">
-  <?php echo sprintf(_("Page %d of %d"), $pageOb->page, $pageOb->pagecount) ?>
+ <span style="width:35%; text-align:center" class="leftFloat nowrap">
+  <?php printf(_("Page %d of %d"), $pageOb->page, $pageOb->pagecount) ?>
  </span>
- <span style="float:right; width:30%; text-align:right">
+ <span style="width:35%" class="rightFloat rightAlign nowrap">
   <?php echo $msg_count ?>
  </span>
 <?php else: ?>
- <span style="float:right; width:60%; text-align:right">
+ <span style="width:70%" class="rightFloat rightAlign nowrap">
   <?php echo $msg_count ?>
  </span>
 <?php endif; ?>
 
- <div class="clear">&nbsp;</div>
+ <br class="clear" />
 </div>
 
 <table class="nopadding" width="100%" cellspacing="0">


--- orig/fetchmailprefs.php
+++ mod/fetchmailprefs.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * $Horde: imp/fetchmailprefs.php,v 1.39.4.1 2005/01/03 12:25:31 jan Exp $
+ * $Horde: imp/fetchmailprefs.php,v 1.39.4.3 2006/01/01 21:28:50 jan Exp $
  *
- * Copyright 2002-2005 Nuno Loureiro <nuno at co.sapo.pt>
- * Copyright 2004-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Nuno Loureiro <nuno at co.sapo.pt>
+ * Copyright 2004-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/locale/fi_FI/help.xml
+++ mod/locale/fi_FI/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/fi_FI/help.xml,v 1.19.6.3 2005/03/31 17:59:44 jan Exp $ -->
+<!-- $Horde: imp/locale/fi_FI/help.xml,v 1.19.6.9 2006/03/23 00:24:12 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="uptodate" md5="3259ba00a198559c7faa76e7867600d9">
     <title>Viestin kirjoitus: Toiminnot</title>
@@ -136,7 +136,7 @@
     t&#xE4;ynn&#xE4;, niin et voi vastaanottaa uusia viestej&#xE4;.
     </warn>
 </entry>
-  <entry id="compose-attach" state="uptodate" md5="98dd30f32af1fa86a9f0fea3124c4ee1">
+  <entry id="compose-attach" state="uptodate" md5="e806e5e1641fb2531cc95d2df277851f">
     <title>Viestin kirjoitus: Liit&#xE4;</title>
     <heading>Liit&#xE4;</heading>
     <para>
@@ -154,10 +154,6 @@
     n&#xE4;ytt&#xE4;m&#xE4;&#xE4;n liitett&#xE4; viestin yhteydess&#xE4;, niin liite n&#xE4;kyy
     tavallisena liitetiedostona.
     </para>
-    <para>
-    Askel 3: Napsauta "Liit&#xE4;" painiketta. Tiedoston nimi ja koko
-    liitet&#xE4;&#xE4;n liitettyjen liitteiden listaan.
-    </para>
     <tip>
     Huomaathan ett&#xE4; suurten tiedostojen tuonti saattaa kest&#xE4;&#xE4; ja
     vied&#xE4; kauan aikaa. Etenkin jos tiedosto on suuri tai k&#xE4;yt&#xE4;t
@@ -226,6 +222,12 @@
     useampia viestej&#xE4;.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="uptodate" md5="a7bb0412b033abdbba2f55b8b84d6c76">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="uptodate" md5="86b2ef57b1194890833d9dd49ebc9b32">
     <title>Viestihaku</title>
     <heading>Haun kriteerit</heading>
@@ -270,7 +272,7 @@
       T&#xE4;ll&#xE4; toiminnolla voit tuoda viestej&#xE4; mbox tai .eml tiedostoista
       valitsemaasi kansioon. Valitse ensin yksi kansio, johon viestit
       tuodaan ja valitse sitten t&#xE4;m&#xE4; toiminto. Sen j&#xE4;lkeen tulet
-      sivulle, jossa kysyt&#xE4;&#xE4;n tuotko viestej&#xE4; mbox vai .eml
+      sivulle, jossa kysyt&#xE4;&#xE4;n tuotko viestej&#xE4; mbox vai .elm
       tiedostosta.
     </para>
 </entry>
@@ -320,10 +322,10 @@
     </para>
 </entry>
   <entry id="filter-edit-whitelist" md5="330c3a8fad198c7afe855c101c63cd0f" state="uptodate">
-    <title>Suodattimet: Muokkaa sallittujen listaa</title>
-    <heading>Muokkaa sallittujen listaa</heading>
+    <title>Suodattimet: Muokkaa valkoista listaa</title>
+    <heading>Muokkaa valkoista listaa</heading>
     <para>
-    Napsauta "Muokkaa sallittujen listaa" p&#xE4;&#xE4;st&#xE4;ksesi sivulla, jossa
+    Napsauta "Muokkaa valkoista listaa" p&#xE4;&#xE4;st&#xE4;ksesi sivulla, jossa
     voit lis&#xE4;t&#xE4;, poistaa ja muokata listaa niist&#xE4;
     s&#xE4;hk&#xF6;postiosoitteista, joista otat AINA vastaan s&#xE4;hk&#xF6;postia.
     </para>
@@ -837,6 +839,12 @@
      <para> %% : '%' -merkki</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" md5="89e92c4d68224b2345b59959878a7174" state="uptodate">
     <title>Asetukset: Pyyd&#xE4; ilmoitus viestin lukemisesta</title>
     <para>
@@ -868,6 +876,21 @@
     vastaanottajalle. Kaikki postipalvelimet eiv&#xE4;t tue t&#xE4;t&#xE4; toimintoa.
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="uptodate" md5="cefa8b52e09b0ada90e0889a3959efea">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" md5="28e1cf08e328345a8e7274c853492d4f" state="uptodate">
     <title>Asetukset: HTML, kuvan korvaus</title>
     <para>
@@ -906,4 +929,16 @@
      <para>* "Kysy aina kun l&#xE4;hetet&#xE4;&#xE4;n liitetiedosto; Oletus EI" - Kysy AINA talletaanko liitteet viestin mukana. Oletus on ett&#xE4; liitteit&#xE4; ei talleteta viestin mukana.</para>
      <para>* "&#xC4;l&#xE4; talleta liitteit&#xE4;" &#xC4;L&#xC4; KOSKAAN kysy talletetaanko liitteit&#xE4;. Liitteit&#xE4; EI IKIN&#xC4; talleteta viestin mukana.</para>
 </entry>
+  <entry id="virtual_inbox" state="uptodate" md5="4d1969e640f6e0bed4f8958f018c2d07">
+    <title>Virtuaaliset kansiot: Virtuaalinen Inbox</title>
+    <para>
+    Virtuaalinen inbox on tallettettu hakuehto, jonka avulla sinun ei en&#xE4;&#xE4; tarvitse etsi&#xE4; uusia viestej&#xE4; yhdest&#xE4; kansiosta kerrallaan. T&#xE4;m&#xE4; virtuaalinen inbox etsii uudet viestit kaikista tilaamistasi kansioista ja n&#xE4;ytt&#xE4;&#xE4; ne yhten&#xE4; virtuaalisena inbox kansiona.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="uptodate" md5="11f91811b9b2af90fe68740f6a86cef6">
+    <title>Virtuaaliset kansiot: Virtuaalinen roskakorikansio</title>
+    <para>
+    Virtuaalinen roskakorikansio on talletettu hakuehto, jonka avulla sinun ei v&#xE4;ltt&#xE4;m&#xE4;tt&#xE4; tarvitse tehd&#xE4; erillista roskakorikansiota. Sen ett&#xE4; siirt&#xE4;isit viestej&#xE4; erilliseen roskakorikansioon, niin voit merkit&#xE4; ne poistetuiksi paikallisessa kansiossa. Kun 'N&#xE4;yt&#xE4; poistetut' on pois p&#xE4;&#xE4;lt&#xE4;, niin poistetut viestit eiv&#xE4;t n&#xE4;y postikansion&#xE4;kym&#xE4;ss&#xE4;. Kun k&#xE4;ytt&#xE4;j&#xE4; valitsee Virtuaalinen roskakorikansio toiminnon, niin poistettuksi merkittyj&#xE4; viestej&#xE4; etsit&#xE4;&#xE4;n kaikista kansioista ja poistettavaksi merkityt viestit n&#xE4;ytet&#xE4;&#xE4;n yhten&#xE4; kansiona.
+    </para>
+</entry>
 </help>


--- orig/lib/Maintenance/Task/delete_attachments_monthly.php
+++ mod/lib/Maintenance/Task/delete_attachments_monthly.php
@@ -2,7 +2,7 @@
 /**
  * Maintenance module that deletes old linked attachments.
  *
- * $Horde: imp/lib/Maintenance/Task/delete_attachments_monthly.php,v 1.4.10.4 2005/07/12 05:59:26 slusarz Exp $
+ * $Horde: imp/lib/Maintenance/Task/delete_attachments_monthly.php,v 1.4.10.5 2005/10/18 12:13:36 jan Exp $
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/templates/pgp/passphrase.inc
+++ mod/templates/pgp/passphrase.inc
@@ -12,12 +12,12 @@
   <td>
    <table width="100%" cellspacing="0" cellpadding="2">
     <tr>
-     <td class="smallheader" align="left">
+     <td class="smallheader leftAlign">
       <?php echo Horde::img('locked.png', _("PGP"), null, $registry->getImageDir('horde')) ?>
      </td>
-     <td class="smallheader" align="left">
-      <?php echo sprintf(_("Please enter the passphrase for your PGP private key. You will only need to enter this passphrase once per %s session."),
-                         $registry->get('name')) ?>
+     <td class="smallheader leftAlign">
+      <?php printf(_("Please enter the passphrase for your PGP private key. You will only need to enter this passphrase once per %s session."),
+                   $registry->get('name')) ?>
      </td>
     </tr>
    </table>
@@ -25,8 +25,8 @@
  </tr>
 
  <tr>
-  <td class="light" align="left">
-   <b><?php echo _("Passphrase:") ?></b>&nbsp;
+  <td class="light leftAlign">
+   <strong><?php echo _("Passphrase:") ?></strong>&nbsp;
    <input type="password" name="passphrase" size="15" maxlength="60" class="fixed" />&nbsp;
    <input type="submit" name="submit" class="button" value="<?php echo _("Submit") ?>" />&nbsp;
    <input type="button" class="button" onclick="window.close();" value="<?php echo _("Cancel") ?>" />


--- orig/locale/nl_NL/help.xml
+++ mod/locale/nl_NL/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/nl_NL/help.xml,v 1.17.6.1 2005/01/25 22:05:52 jan Exp $ -->
+<!-- $Horde: imp/locale/nl_NL/help.xml,v 1.17.6.5 2006/03/23 00:24:09 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Nieuw bericht: Bewerkingen</title>
@@ -189,6 +189,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Zoeken</title>
     <heading>Zoekcriteria</heading>
@@ -642,6 +648,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -660,6 +672,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -689,4 +716,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/thread.php
+++ mod/thread.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * $Horde: imp/thread.php,v 2.10.2.3 2005/09/01 04:47:39 slusarz Exp $
+ * $Horde: imp/thread.php,v 2.10.2.14 2006/02/21 07:32:36 slusarz Exp $
  *
- * Copyright 2004-2005 Michael M Slusarz <slusarz at mail.curecati.org>
+ * Copyright 2004-2006 Michael M Slusarz <slusarz at mail.curecati.org>
  *
  * See the enclosed file COPYING for license information (GPL).  If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -10,14 +10,44 @@
 
 @define('IMP_BASE', dirname(__FILE__));
 require_once IMP_BASE . '/lib/base.php';
+require_once IMP_BASE . '/lib/IMAP.php';
 require_once IMP_BASE . '/lib/MIME/Contents.php';
 require_once IMP_BASE . '/lib/MIME/Headers.php';
 require_once IMP_BASE . '/lib/Mailbox.php';
+require_once IMP_BASE . '/lib/Search.php';
 require_once 'Horde/Template.php';
 
-/* Make sure we have a valid index. */
-$imp_mailbox = &new IMP_Mailbox(Util::getFormData('index'));
-if (!$imp_mailbox->isValidIndex()) {
+/* What mode are we in?
+ * DEFAULT/'thread' - Thread mode
+ * 'msgview' - Multiple message view
+ */
+$mode = Util::getFormData('mode', 'thread');
+
+$imp_mailbox = &IMP_Mailbox::singleton(Util::getFormData('index'));
+
+$error = false;
+if ($mode == 'thread') {
+    /* THREAD MODE: Make sure we have a valid index. */
+    if (!$imp_mailbox->isValidIndex()) {
+        $error = true;
+    }
+} else {
+    /* MSGVIEW MODE: Make sure we have a valid list of messages. */
+    $cacheID = Util::getFormData('msglist');
+    if (!$cacheID) {
+        $error = true;
+    }
+    require_once 'Horde/SessionObjects.php';
+    $cacheSess = &Horde_SessionObjects::singleton();
+    $msglist = $cacheSess->query($cacheID);
+    if ($msglist) {
+        $cacheSess->setPruneFlag($cacheID, true);
+    } else {
+        $error = true;
+    }
+}
+
+if ($error) {
     $actionID = 'message_missing';
     $from_message_page = true;
     $start = null;
@@ -28,6 +58,8 @@
 /* Set the current time zone. */
 NLS::setTimeZone();
 
+$imp_imap = &IMP_IMAP::singleton();
+
 /* Run through action handlers. */
 $actionID = Util::getFormData('actionID');
 switch ($actionID) {
@@ -41,60 +73,90 @@
     break;
 }
 
-$title = _("Thread View");
+$title = ($mode == 'thread') ? _("Thread View") : _("Multiple Message View");
 require IMP_TEMPLATES . '/common-header.inc';
-$msgs = array();
+$msgs = $tree = array();
+$rowct = 0;
 
 require IMP_TEMPLATES . '/menu.inc';
 IMP::status();
 
-$threadob = $imp_mailbox->getThreadOb();
-$thread = $threadob->getThread($imp_mailbox->getIndex());
 $subject = '';
 $page_label = IMP::getLabel();
-$message_url = Horde::applicationUrl('message.php');
-$mailbox_url = Horde::applicationUrl('mailbox.php');
-foreach ($thread as $idx) {
-    /* Set mailbox object to the message index. */
-    $imp_mailbox->setNewIndex($idx);
-
-    /* Get the body of the message. */
-    $curr_msg = array();
-    $contents = &IMP_Contents::singleton($idx);
-    $mime_id = $contents->findBody();
-    $mime_part = $contents->getDecodedMIMEPart($mime_id);
-    if ($contents->canDisplayInline($mime_part)) {
-        $curr_msg['body'] = $contents->renderMIMEPart($mime_part);
-    } else {
-        $curr_msg['body'] = '<em>' . _("There is no text that can be displayed inline.") . '</em>';
-    }
 
-    /* Get headers for the message. */
-    $headers = &new IMP_Headers($idx);
-    $headers->buildHeaders();
-    $headers->buildFlags();
-    $headers->setValueByFunction('date', array('nl2br', array($headers, 'addLocalTime'), 'htmlspecialchars'));
-    $headers->buildAddressLinks('from', Horde::selfUrl(true), true, true);
-    $curr_msg['date'] = $headers->getValue('date');
-    $curr_msg['from'] = $headers->getValue('from');
-    if (empty($subject)) {
-        $subject = preg_replace('/^re:\s*/i', '', $headers->getValue('subject'));
-    }
+if ($mode == 'thread') {
+    $threadob = $imp_mailbox->getThreadOb();
+    $index_array = $imp_mailbox->getIMAPIndex();
+    $thread = $threadob->getThread($index_array['index']);
+    $threadtree = $threadob->getThreadImageTree($thread, false);
+    $loop_array = array($imp['mailbox'] => $thread);
+} else {
+    $loop_array = IMP::parseIndicesList($msglist);
+}
+
+foreach ($loop_array as $mbox => $idxlist) {
+    $imp_imap->changeMbox($mbox);
 
-    /* Create links to current message and mailbox. */
-    $curr_msg['link'] = Horde::widget(Util::addParameter($message_url, array('index' => $idx)), _("Go to Message"), 'widget', '', '', _("Go to Message"), true);
-    $curr_msg['link'] .= ' | ' . Horde::widget(Util::addParameter($mailbox_url, array('start' => $imp_mailbox->getMessageIndex())), sprintf(_("Back to %s"), $page_label), 'widget', '', '', sprintf(_("Back to %s"), $page_label), true);
+    foreach ($idxlist as $idx) {
+        /* Get the body of the message. */
+        $curr_msg = $curr_tree = array();
+        $imp_mailbox->setNewIndex($idx);
+        $contents = &IMP_Contents::singleton($idx . IMP_IDX_SEP . $mbox);
+        $mime_id = $contents->findBody();
+        $mime_part = $contents->getDecodedMIMEPart($mime_id);
+        if ($contents->canDisplayInline($mime_part)) {
+            $curr_msg['body'] = $contents->renderMIMEPart($mime_part);
+        } else {
+            $curr_msg['body'] = '<em>' . _("There is no text that can be displayed inline.") . '</em>';
+        }
+        $curr_msg['idx'] = $idx;
+
+        /* Get headers for the message. */
+        $headers = &new IMP_Headers($idx);
+        $headers->buildHeaders();
+        $headers->setValueByFunction('date', array('nl2br', array($headers, 'addLocalTime'), 'htmlspecialchars'));
+        $from = $headers->getValue('from');
+        $headers->buildAddressLinks('from', Horde::selfUrl(true), true, true);
+        $curr_msg['date'] = $headers->getValue('date');
+        $curr_msg['from'] = $headers->getValue('from');
+        $subject_header = $headers->getValue('subject');
+        if ($mode == 'thread') {
+            if (empty($subject)) {
+                $subject = preg_replace('/^re:\s*/i', '', $subject_header);
+            }
+        }
+        $curr_msg['subject'] = $subject_header;
+
+        /* Create links to current message and mailbox. */
+        if ($mode == 'thread') {
+            $curr_msg['link'] = Horde::widget('#display', _("Back to Thread Display"), 'widget', '', '', _("Back to Thread Display"), true);
+        } else {
+            $curr_msg['link'] = Horde::widget('#display', _("Back to Multiple Message View Index"), 'widget', '', '', _("Back to Multiple Message View Index"), true);
+        }
+        $curr_msg['link'] .= ' | ' . Horde::widget(Util::addParameter(IMP::generateSearchUrl('message.php', $mbox), array('index' => $idx)), _("Go to Message"), 'widget', '', '', _("Go to Message"), true);
+        $curr_msg['link'] .= ' | ' . Horde::widget(Util::addParameter(IMP::generateSearchUrl('mailbox.php', $mbox), array('start' => $imp_mailbox->getMessageIndex())), sprintf(_("Back to %s"), $page_label), 'widget', '', '', sprintf(_("Back to %s"), $page_label), true);
 
-    $msgs[] = $curr_msg;
+        $curr_tree['class'] = (++$rowct % 2) ? 'text' : 'item0';
+        $curr_tree['subject'] = (($mode == 'thread') ? $threadtree[$idx] : null) . ' ' . Horde::link('#' . $idx) . $subject_header . '</a> (' . htmlspecialchars($from) . ')';
+
+        $msgs[] = $curr_msg;
+        $tree[] = $curr_tree;
+    }
 }
 
+/* Flag messages as seen. */
+require_once IMP_BASE . '/lib/Message.php';
+$imp_message = &IMP_Message::singleton();
+$imp_message->flag('\\SEEN', $loop_array);
+
 $template = &new Horde_Template();
 $template->set('date_string', _("Date"), true);
 $template->set('from_string', _("From"), true);
+$template->set('subject_string', _("Subject"), true);
+$template->set('subject', ($mode == 'thread') ? @htmlspecialchars($subject, ENT_COMPAT, NLS::getCharset()) : sprintf(_("%d Messages"), count($msgs)));
+$template->set('header', ($mode == 'thread') ? _("Thread Display") : _("Multiple Message View"));
 $template->set('messages', $msgs, true);
+$template->set('tree', $tree, true);
 
-require IMP_TEMPLATES . '/thread/top.inc';
 echo $template->fetch(IMP_TEMPLATES . '/thread/thread.html');
-require IMP_TEMPLATES . '/thread/bottom.inc';
-
 require $registry->get('templates', 'horde') . '/common-footer.inc';


--- orig/lib/MIME/Viewer/status.php
+++ mod/lib/MIME/Viewer/status.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_status class handles multipart/report messages
  * that refer to mail system administrative messages (RFC 3464).
  *
- * $Horde: imp/lib/MIME/Viewer/status.php,v 1.17.10.5 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/status.php,v 1.17.10.8 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -64,7 +64,7 @@
             $action = substr($action, 0, strpos($action, ' '));
         }
 
-        /* Get the correct text strings for the action type. */ 
+        /* Get the correct text strings for the action type. */
         switch ($action) {
         case 'failed':
         case 'delayed':
@@ -122,10 +122,10 @@
 
         /* Display a link to the returned message. Try to download the
            text of the message/rfc822 part first, if it exists. */
-        if (($part = $contents->getDecodedMIMEPart($this->mime_part->getRelativeMIMEId('3.0'))) ||
-            ($part = $contents->getDecodedMIMEPart($this->mime_part->getRelativeMIMEId(3)))) {
-            $detailed_msg[] = sprintf($msg_link, $contents->linkViewJS($part, 'view_attach', _("HERE"), $msg_link_status));
-        } 
+        if (($part = $contents->getDecodedMIMEPart($this->mime_part->getRelativeMIMEId(3))) ||
+            ($part = $contents->getDecodedMIMEPart($this->mime_part->getRelativeMIMEId('3.0')))) {
+            $detailed_msg[] = sprintf($msg_link, $contents->linkViewJS($part, 'view_attach', _("HERE"), $msg_link_status, null, array('ctype' => 'message/rfc822')));
+        }
 
         $infoimg = Horde::img('info_icon.png', _("Info"), 'height="16" width="16"', $registry->getImageDir('horde'));
         $text .= $contents->formatStatusMsg($detailed_msg, $infoimg, false);


--- orig/templates/compose/compose.js
+++ mod/templates/compose/compose.js
@@ -1,10 +1,13 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 
 function confirmCancel()
 {
     if (window.confirm('<?php echo addslashes(_("Cancelling this message will permanently discard its contents.")) . '\n' . addslashes(_("Are you sure you want to do this?")) ?>')) {
         <?php echo $cancel_js ?>
+        return true;
+    } else {
+        return false;
     }
 }
 
@@ -28,32 +31,15 @@
         $js .= 'false, ';
     }
     if ($conf['user']['select_sentmail_folder'] && !$prefs->isLocked('sent_mail_folder')) {
-        if (isset($ident[2])) {
-            $js .= $ident[2] . ', ';
-        } else {
-            $js .= 'null, ';
-        }
+        $js .= (isset($ident[2])) ? ('"' . $ident[2] . '", ') : 'null, ';
     } else {
-        if (isset($ident[2])) {
-            $js .= '"\"' . $ident[2] . '\"", ';
-        } else {
-            $js .= '"", ';
-        }
+        $js .= (isset($ident[2])) ? '"\"' . IMP::displayFolder($ident[2]) . '\"", ' : '"", ';
     }
     if ($ident[3]) {
         $js .= 'true, ';
     } else {
         $js .= 'false, ';
     }
-    if ($conf['user']['select_sentmail_folder'] && !$prefs->isLocked('sent_mail_folder')) {
-        $js .= 'null, ';
-    } else {
-        if (isset($ident[2])) {
-            $js .= '"\"' . IMP::displayFolder($ident[2]) . '\"", ';
-        } else {
-            $js .= '"", ';
-        }
-    }
 
     if (isset($ident[4])) {
         $js .= '"' . $ident[4] . '"';
@@ -105,47 +91,46 @@
     }
 
 <?php if ($conf['user']['select_sentmail_folder'] && !$prefs->isLocked('sent_mail_folder')): ?>
-    document.compose.sent_mail_folder.selectedIndex = next[2];
+    var field = document.compose.sent_mail_folder;
+    for (var i = 0; i < field.options.length; i++) {
+        if (field.options[i].value == next[2]) {
+            field.selectedIndex = i;
+            break;
+        }
+    }
 <?php else: ?>
     if (document.getElementById && document.createTextNode) {
         folder_text = document.getElementById('sent_mail_folder');
         if (folder_text) {
             if (folder_text.firstChild) {
-                folder_text.replaceChild(document.createTextNode(next[4]), folder_text.firstChild);
+                folder_text.replaceChild(document.createTextNode(next[2]), folder_text.firstChild);
             } else {
-                folder_text.appendChild(document.createTextNode(next[4]));
+                folder_text.appendChild(document.createTextNode(next[2]));
             }
         }
     } else if (document.all) {
         folder_text = document.all.sent_mail_folder;
-        folder_text.innerText = next[4];
+        folder_text.innerText = next[2];
     }
 <?php endif; ?>
-    document.compose.bcc.value = next[5];
     if (document.compose.save_sent_mail) {
         document.compose.save_sent_mail.checked = next[3];
     }
+    document.compose.bcc.value = next[4];
 }
 
-function uniqSubmit()
+function uniqSubmit(actionID)
 {
-    now = new Date();
-    document.compose.submitBtn1.disabled = true;
-<?php if ($conf['user']['allow_folders']): ?>
-    document.compose.submitBtn2.disabled = true;
-<?php endif; ?>
-    document.compose.submitBtn3.disabled = true;
-    document.compose.submitBtn4.disabled = true;
-<?php if ($conf['user']['allow_folders']): ?>
-    document.compose.submitBtn5.disabled = true;
-<?php endif; ?>
-    document.compose.submitBtn6.disabled = true;
-<?php if ($imp['file_upload']): ?>
-    document.compose.submitBtn7.disabled = true;
-<?php endif; ?>
+    if ((actionID == 'send_message') &&
+        (document.compose.subject.value == '') &&
+        !window.confirm('<?php echo addslashes(_("The message does not have a Subject entered.")) . '\n' . addslashes(_("Send message without a Subject?")) ?>')) {
+        return false;
+    }
+
     if (document.compose.style && document.compose.style.cursor) {
         document.compose.style.cursor = "wait";
     }
+    document.compose.actionID.value = actionID;
 <?php if ($rtemode): ?>
     document.compose.onsubmit();
 <?php endif; ?>


--- orig/po/bs_BA.po
+++ mod/po/bs_BA.po
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: imp-bs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-03-11 21:14+0100\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2005-07-01 13:28+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic at smartnet.ba>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
@@ -19,167 +19,167 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "     Za: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "     Za: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "   Datum: "
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "      Od: "
 
-#: mailbox.php:393
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr ""
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr " Tema: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " u "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:190
-#, php-format
-msgid "%d message(s) have been deleted."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "Nema poruka"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
 msgstr "Obrisano je %d poruka."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "%d poruka je prijavljeno da nisu spam administratoru sistema."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "%d poruka je prijavljeno da nisu spam."
 
-#: lib/Spam.php:161
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "%d poruka je prijavljeno kao spam administratoru sistema."
 
-#: lib/Spam.php:141
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
 msgstr "%d poruka je prijavljeno kao spam."
 
-#: mailbox.php:362
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "Poruke %d do %d od ukupno %d"
 
-#: mailbox.php:601
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s PGP administracija"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s S/MIME administracija"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s veæ postoji. Ime %s foldera nije promjenjeno."
 
-#: lib/Message.php:643
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s ne izgleda kao dozvoljen tip sanduèeta."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Ime %s foldera je promjenjeno poèetkom mjeseca."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:603
-#, php-format
+#: lib/MIME/Viewer/itip.php:625
+#, fuzzy, php-format
 msgid "%s has cancelled %s."
-msgstr ""
+msgstr "Ime foldera \"%s\" je uspje¹no promjenjeno u \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:583
-#, php-format
+#: lib/MIME/Viewer/itip.php:616
+#, fuzzy, php-format
 msgid "%s has replied to the invitation to %s."
-msgstr ""
+msgstr "Usmjeri ovu poruku"
 
-#: lib/MIME/Viewer/itip.php:441
-#, php-format
+#: lib/MIME/Viewer/itip.php:482
+#, fuzzy, php-format
 msgid "%s has sent you free/busy information."
-msgstr ""
+msgstr "Odgovori tra¾enom slobodan/zauzet informacijom."
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:446
-#, php-format
+#: lib/MIME/Viewer/itip.php:487
+#, fuzzy, php-format
 msgid "%s requests your free/busy information."
-msgstr ""
+msgstr "Odgovori tra¾enom slobodan/zauzet informacijom."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr ""
 
-#: lib/Message.php:398
+#: lib/Message.php:414
 #, fuzzy, php-format
-msgid "%s was successfully added to %s."
+msgid "%s was successfully added to \"%s\"."
 msgstr "Ime foldera \"%s\" je uspje¹no promjenjeno u \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr ""
 
-#: message.php:276 message.php:281
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr ""
@@ -189,15 +189,23 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;od&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Primjeni ove izmjene i idi na sljedeæi ekran.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Odbaci sve izmjene i vrati se na ekran za pisanje.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
@@ -205,7 +213,7 @@
 "(Vrati se na ekran za pisanje poslije primene svih izmjena do sada. Izmjene "
 "na trenutnom ekranu NEÆE biti aktivirane.)"
 
-#: spelling.php:274
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -213,56 +221,57 @@
 "(Po¹alji poruku nakon apliciranja svih napravljenih izmjena.  Izmjene na "
 "trenutnom ekranu NEÆE biti aktivirane.)"
 
-#: templates/contacts/contacts.inc:223
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Dodaj ove kad klikne¹ na OK *"
 
-#: templates/contacts/contacts.inc:203
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Molim izaberite adrese *"
 
-#: lib/Spam.php:171
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Identitet \"%s\" je obrisan."
+
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "1 poruka je prijavljena da nije spam administratoru sistema."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
 msgstr "1 poruka je prijavljeno da nije spam."
 
-#: lib/Spam.php:163
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "1 poruka je prijavljeno kao spam administratoru sistema."
 
-#: lib/Spam.php:143
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
 msgstr "1 poruka je prijavljeno kao spam."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100 znakova"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000 znakova"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250 znakova"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500 znakova"
 
-#: lib/MIME/Viewer/itip.php:61
-msgid "<b>The calendar data is invalid</b>"
-msgstr ""
-
-#: lib/MIME/Viewer/images.php:150
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
 msgstr ""
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -272,120 +281,123 @@
 msgid "AND"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:738
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr ""
 
-#: lib/IMP.php:911 lib/IMP.php:913
-msgid "Acco_unts"
-msgstr "_Vanjski raèuni"
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Ime korisnièkog raèuna:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
 msgstr "Akcije"
 
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Dodaj u imenik (%s)"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "Dodaj izvor"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr ""
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Dodaj u imenik (%s)"
-
-#: compose.php:1167
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Dodan \"%s\" kao prilog."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "Dodatna polja zaglavlja za prikaz: <i>(nije obavezno, unesite svako polje "
 "headera koje ¾elite vidjeti u novi red)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
 msgstr "Moguæe je prikazati dodatne informacije %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
 msgstr "Dodatne informacije"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
 msgstr "Dodatne informacije o poruci"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr "Moguæe je prikazati dodatne informacije o poruci %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
 msgstr "Dodatne informacije o gre¹ci"
 
-#: lib/MIME/Viewer/status.php:80
-#, php-format
+#: lib/MIME/Viewer/status.php:77
+#, fuzzy, php-format
 msgid "Additional message error details can be viewed %s."
-msgstr ""
+msgstr "Moguæe je prikazati dodatne informacije o poruci %s."
 
-#: contacts.php:90 templates/contacts/contacts.inc:170
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Imenik"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Imenici"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "Adrese kojima treba slati kopiju poruka:  <i>(nije obavezno, unesite svaku "
 "adresu u novom redu)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
 "Adrese eksplicitno vezane za ovaj identitet:  <i>(nije obavezno, unesite "
 "svaku adresu u novom redu)</i>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "Sve"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr ""
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
 "Sve poruke u sljedeæim folderima æe biti downloadovane u jednu MBOX datoteku:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
@@ -394,13 +406,13 @@
 "Sve poruke u va¹em \"%s\" folderu starije od %s dana æe biti zauvijek "
 "obrisane."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, fuzzy, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr ""
 "Svi folderi poslane po¹te stariji vi¹e od %s mjeseci, æe biti obrisani."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr ""
@@ -408,37 +420,46 @@
 
 #: acl.php:85
 #, fuzzy, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "Ime foldera \"%s\" je uspje¹no promjenjeno u \"%s\"."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr ""
 
-#: lib/MIME/Viewer/alternative.php:113
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr ""
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "Uvijek"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Uvijek zapamti priloge"
 
-#: lib/Message.php:491
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
 
-#: lib/Message.php:385
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Prilikom dodavanja novog zapisa javila se nepoznata gre¹ka."
+
+#: lib/Message.php:387
 #, fuzzy
 msgid "An unknown error occured while creating the new task."
 msgstr "Prilikom dodavanja novog zapisa javila se nepoznata gre¹ka."
 
-#: message.php:490 mailbox.php:671 templates/message/navbar_navigate.inc:9
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -457,38 +478,30 @@
 msgid "Apply Filters to %s"
 msgstr "Primjeni filtere na %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "Primeni filter pravila nakon prijavljivanja?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 #, fuzzy
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Primeni filter pravila kada se a¾urira inbox?"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Da li SIGURNO ¾elite nastaviti?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Da li ste sigurni da ¾elite nastaviti?"
-
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Da li ste sigurni da ¾elite obrisati ovaj javni kljuè?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+#, fuzzy
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
-msgstr ""
+msgstr "Da li ste sigurni da ¾elite obrisati ovaj javni kljuè?"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Da li ste sigurni da ¾elite ovo uraditi?"
 
-#: message.php:398 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:68
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Da li ste sigurni da ¾elite obrisati ove poruke?"
 
@@ -501,7 +514,12 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Da li ste sigurni da ¾elite isprazniti ovaj folder?"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Da li ste sigurni da ¾elite isprazniti folder Korpa?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Da li ste sigurni da ¾elite isprazniti folder Korpa?"
 
@@ -509,85 +527,85 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "Da li ste sigurni da ¾elite zauvijek obrisati ove poruke?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 #, fuzzy
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "Da li ste sigurni da ¾elite obrisati ove poruke?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 #, fuzzy
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "Da li ste sigurni da ¾elite obrisati ove poruke?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Vrijeme pristizanja"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Rastuæi"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Pitaj"
 
-#: templates/compose/compose.inc:509
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Zakaèi"
 
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:475
 #, fuzzy
 msgid "Attach Files"
 msgstr "Prilozi"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
 msgid "Attached File:"
-msgstr ""
+msgstr "Prilozi"
 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
 msgstr "Zakaèen je odgovor na kalendarski zahtjev koji ste poslali."
 
-#: mailbox.php:705 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Prilog"
 
-#: compose.php:977 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
 msgstr ""
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:998
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Prilozi"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:682
 #, fuzzy
 msgid "Attendees"
 msgstr "Prilozi"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 #, fuzzy
 msgid "Attention"
 msgstr "Akcija"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr ""
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -600,7 +618,7 @@
 msgid "Available Address books:"
 msgstr "Na raspolaganju su sljedeæi imenici:"
 
-#: lib/MIME/Viewer/itip.php:704
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr ""
 
@@ -609,29 +627,43 @@
 msgid "Bac_k to %s"
 msgstr "_Nazad u %s"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
 msgstr "Nazad u %s"
 
-#: message.php:257 search.php:153 templates/contacts/contacts.inc:219
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Bcc"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
+#, fuzzy
 msgid "Below is the raw text of the status information message."
-msgstr ""
+msgstr "Usmjeri ovu poruku"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Crna lista"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "Blokiraj slike u HTML porukama osim ako su specifièno zatra¾ene?"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Tijelo"
 
@@ -640,43 +672,44 @@
 msgid "Both"
 msgstr "Oba"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
 msgstr "I u zaglavlju i u tekstu poruke"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "_Kodni raspored"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr ""
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr ""
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr ""
 
-#: templates/contacts/contacts.inc:248 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:106 templates/pgp/passphrase.inc:32
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 #, fuzzy
 msgid "Cancel"
 msgstr "Promjeni"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "Odustani od slanja"
 
@@ -684,29 +717,36 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr ""
 
-#: message.php:256 search.php:149 templates/contacts/contacts.inc:218
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Cc"
 
-#: lib/MIME/Viewer/itip.php:686
-msgid "Chair Person"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
 msgstr ""
 
-#: templates/compose/spelling.inc:64
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Lièna"
+
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Promjeni"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Promjeni sve"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 #, fuzzy
 msgid "Change Folder"
 msgstr "Kreiraj folder"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -726,23 +766,23 @@
 "Promijenite ime, adresu i potpis koje æe drugi vidjeti kada èitaju i "
 "odgovaraju na va¹ e-mail."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
 msgstr "Broj prikazanih znakova:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Provjeri novu po¹tu u folderima"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr ""
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr "Izaberite mail server sa kojeg ¾elite preuzeti po¹tu:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "Provjeri pravopis prije slanja poruke?"
 
@@ -750,11 +790,17 @@
 msgid "Choose Action:"
 msgstr "Izaberite akciju:"
 
-#: config/servers.php.dist:184
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Izaberite mail server:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:716
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Izaberite ili promijenite u polju desno:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
 msgstr "Izaberite akciju:"
 
@@ -767,48 +813,45 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "Izaberi redoslijed za pretragu imenika za pro¹irivanje adresa."
 
-#: lib/MIME/Viewer/images.php:100
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:89
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
 msgstr "Kliknite na %s da downloadujete sliku."
 
-#: lib/Filter.php:103
-#, php-format
+#: lib/Filter.php:106
+#, fuzzy, php-format
 msgid "Click %s to go to %s management page."
-msgstr ""
+msgstr "Filteri: %s stranica za ureðivanje"
 
 #: lib/MIME/Viewer/html.php:116
-#, php-format
+#, fuzzy, php-format
 msgid "Click %s to view HTML content in a separate window."
-msgstr ""
+msgstr "Kreiraj poruku u zasebnom prozoru?"
 
-#: lib/MIME/Viewer/images.php:151
-#, php-format
+#: lib/MIME/Viewer/images.php:163
+#, fuzzy, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr ""
+msgstr "Kliknite na %s da downloadujete sliku."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:418
 #, fuzzy, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "Kreiraj poruku u zasebnom prozoru?"
 
-#: lib/MIME/Viewer/related.php:64
-#, php-format
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
-msgstr ""
-
-#: lib/MIME/Viewer/html.php:103
-msgid "Click here to HIDE the Images"
-msgstr ""
+msgstr "Kreiraj poruku u zasebnom prozoru?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:95
+#, fuzzy
 msgid "Click here to SHOW the Images"
-msgstr ""
+msgstr "Kliknite na %s da downloadujete sliku."
 
 #: templates/prefs/sourceselect.inc:321
 #, fuzzy
@@ -819,49 +862,49 @@
 "Klikni na jedan od odabranih adresara a zatim odaberi polja po kojim æe se "
 "vr¹iti pretraga."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "Klikanjem na adresu pravi se nova poruka za po¹iljaoca"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
 msgstr "Klikanjem na adresu otvara se poruka za èitanje"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Zatvori"
 
-#: compose.php:751 compose.php:1058
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
-#: folders.php:383
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Zatvoren folder"
 
-#: folders.php:403
+#: folders.php:449
 #, fuzzy
 msgid "Collapse"
 msgstr "Skupi sve"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Skupi sve"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Skupi sve foldere"
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Skupi folder"
 
@@ -869,68 +912,68 @@
 msgid "Color Indicator: "
 msgstr ""
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
+#, fuzzy
 msgid "Comment"
-msgstr ""
+msgstr "Nova poruka"
 
-#: lib/MIME/Viewer/itip.php:754
+#: lib/MIME/Viewer/itip.php:769
 #, fuzzy
 msgid "Completed"
 msgstr "Nova poruka"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Nova poruka"
-
-#: mailbox.php:735 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Nova poruka (%s)"
-
-#: compose.php:750 compose.php:1057
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Napi¹i novu poruku"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "Pi¹i poruke u zasebnom prozoru?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
 "Koristi HTML opcije za pisane poruka (ako preglednik podr¾ava tu moguænost)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "Podesite prikaz poruka."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr "Podesite opcije pregleda poruke."
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr ""
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr "Podesite PGP podr¹ku za %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr "Podesite S/MIME podr¹ku za %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "Podesite kada æe se vr¹iti provjera pristigle po¹te."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "Pretvori tekstualne smajlije u grafièke?"
 
@@ -938,53 +981,61 @@
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Kopiraj u folder"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Ispravi"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Ispravljen tekst"
 
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Ne mogu napraviti VFS backend: %s"
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr "Ne mogu napraviti VFS backend: %s"
 
-#: lib/Message.php:634
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Ne mogu obrisati poruke od %s. Poruka servera: %s"
 
-#: lib/Session.php:294
+#: lib/Session.php:318
 #, fuzzy
 msgid "Could not execute maintenance operations."
 msgstr "Servisne operacije"
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr ""
 
-#: search.php:356 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 #, fuzzy
 msgid "Create"
 msgstr "Kreiraj folder"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Kreiraj folder"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 #, fuzzy
 msgid "Create Keys"
 msgstr "Kreiraj folder"
@@ -994,11 +1045,21 @@
 msgid "Create Virtual Folder"
 msgstr "Kreiraj folder"
 
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Ostali e-mail raèuni"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Kreiraj novi folder za korpu"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Napravi novi folder za nacrte"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Kreiraj novi folder za poslanu po¹tu"
 
@@ -1006,7 +1067,7 @@
 msgid "Create a new trash folder"
 msgstr "Kreiraj novi folder za korpu"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
@@ -1014,12 +1075,21 @@
 "Uredite pravila filtriranja pomoæu kojih automatski organizujete pristigle "
 "poruke, sortirate ih u foldere i bri¹ete ne¾eljenu po¹tu."
 
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Kreiraj novi folder za poslanu po¹tu"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr "Trenutni pristup %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Podesite dobavljanje po¹te sa e-mail raèuna na drugim serverima"
 
@@ -1032,78 +1102,105 @@
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Podesite zadatke koji æe se izvr¹avati nakon svake prijave na %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "Dat_um"
 
-#: message.php:253 thread.php:75
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Datum"
 
-#: lib/MIME/Viewer/itip.php:742
+#: lib/MIME/Viewer/itip.php:757
 #, fuzzy
 msgid "Declined"
 msgstr "Obrisana"
 
-#: config/prefs.php.dist:894
+#: lib/MIME/Viewer/itip.php:263
+#, fuzzy
+msgid "Declined: "
+msgstr "Obrisana"
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Obri¹i"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Default kriterij za sortiranje:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Default pravac sortiranja:"
 
-#: lib/MIME/Viewer/itip.php:750
+#: lib/MIME/Viewer/itip.php:765
 #, fuzzy
 msgid "Delegated"
 msgstr "Obrisana"
 
-#: folders.php:374 templates/fetchmail/manage.inc:68
-#: templates/contacts/contacts.inc:239 templates/message/navbar_actions.inc:6
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Obri¹i"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "Delete %s Public Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Obri¹i trenutne kljuèeve"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Obri¹i foldere"
 
-#: folders.php:374
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Obri¹i foldere"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Obri¹i virtualni folder"
+
+#: folders.php:419
 msgid "Delete Virtual Folder"
 msgstr "Obri¹i virtualni folder"
 
 #: templates/fetchmail/manage.inc:43
+#, fuzzy
 msgid "Delete fetched messages from remote server?"
-msgstr ""
+msgstr "Obrisane sve poruke iz %s."
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
 msgstr ""
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "Obri¹i stare linkovane priloge poèetkom svakog mjeseca?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "Obri¹i stare foldere poslane po¹te pocetkom svakog mjeseca?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr "Obri¹i poruku nakon prijavljivanja kao spam?"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Obrisane poruke"
 
-#: message.php:493 mailbox.php:695 templates/mailbox/navbar.inc:20
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Obrisana"
@@ -1112,7 +1209,7 @@
 msgid "Deleted messages"
 msgstr "Obrisane poruke"
 
-#: compose.php:292
+#: compose.php:307
 #, fuzzy, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Prilog je obrisan."
@@ -1121,51 +1218,57 @@
 msgid "Deleting and Moving Messages"
 msgstr "Brisanje i prebacivanje poruka"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
+#, fuzzy
 msgid "Deny request for free/busy information"
-msgstr ""
+msgstr "Odgovori tra¾enom slobodan/zauzet informacijom."
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Opadajuæi"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:656
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 #, fuzzy
 msgid "Description"
 msgstr "Korisnièke opcije"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr ""
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Zatamni potpise?"
 
-#: templates/contacts/contacts.inc:232
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Prika¾i"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Prika¾i potvrdu nakon slanja poruke?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Prika¾i u tijelu poruke"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "Prika¾i pop-up poruku pristigle po¹te?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Prika¾i link 'Isprazni korpu' u meniju?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "Prika¾i link 'Isprazni korpu' u meniju?"
 
 #: templates/compose/attachments.inc:11
@@ -1173,28 +1276,33 @@
 msgid "Disposition"
 msgstr "Opcije prikaza"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr ""
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Ne provjeravaj novu po¹tu u folderima"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
 msgstr "Nemoj generisati link u koloni Po¹iljaoca"
 
-#: lib/IMP.php:1004
+#: lib/IMP.php:1075
+#, fuzzy
 msgid "Do you want to open that folder?"
+msgstr "Da li ste sigurni da ¾elite isprazniti ovaj folder?"
+
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
 msgstr ""
 
-#: templates/compose/spelling.inc:112
+#: templates/compose/spelling.inc:126
 #, fuzzy
 msgid "Done"
 msgstr "Nijedna"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
 msgstr "Download %s u .zip formatu"
@@ -1203,25 +1311,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "Download svih priloga (u .zip formatu)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Downloaduj foldere"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "Downloaduj foldere [.zip format]"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
 msgstr "Downloaduj u .zip formatu"
 
-#: message.php:491 mailbox.php:676 templates/message/navbar_navigate.inc:11
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Nacrt"
 
-#: folders.php:354
+#: folders.php:392
 msgid "Draft folder"
 msgstr "Folder za nacrte"
 
@@ -1229,121 +1337,141 @@
 msgid "Drafts folder:"
 msgstr "Folder nezavr¹ene poruke:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 #, fuzzy
 msgid "E-mail Address"
 msgstr "Email adresa"
 
-#: lib/MIME/Viewer/status.php:77
-msgid "ERROR: Your message could not be delivered."
+#: lib/Mailbox.php:309
+msgid "END"
 msgstr ""
 
-#: folders.php:375
+#: lib/MIME/Viewer/status.php:74
+#, fuzzy
+msgid "ERROR: Your message could not be delivered."
+msgstr "Folder \"%s\" je uspje¹no obrisan."
+
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr ""
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "Izmijeni crnu listu"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "Izmijeni filtere"
 
-#: folders.php:375 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:420 templates/search/header.inc:16
+#, fuzzy
 msgid "Edit Virtual Folder"
-msgstr ""
+msgstr "Virtualni folderi"
 
 #: templates/mailbox/header.inc:13
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
 msgstr ""
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "Izmijeni bijelu listu"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "Izmjenite va¹u crnu listu"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Izmjeni filter pravila"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr ""
 "Izmijenite postavke za pristupanje e-mail raèunima na drugim serverima."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "Izmjenite va¹u bijelu listu"
 
-#: templates/contacts/contacts.inc:235
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "Email adresa"
 
-#: lib/Message.php:651
+#: lib/Message.php:657
 #, fuzzy, php-format
 msgid "Emptied all messages from %s."
 msgstr "Obrisane sve poruke iz %s."
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Isprazni foldere"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Isprazni foldere"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Isprazni folder Korpa"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Isprazni _korpu"
+
+#: lib/IMP.php:966
 msgid "Empty _Trash"
 msgstr "Isprazni _korpu"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Ukljuèi PGP funkcionalnost?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr "Ukljuèi S/MIME funkcionalnost?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
 msgstr "Ukljuèi sa¾etke poruka u listi?"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
 msgstr "Opcije ¹_ifrovanja"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Kraj"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Kraj proslijeðene poruke"
 
-#: lib/Compose.php:262
+#: lib/Compose.php:341
 msgid "End message"
 msgstr "Kraj poruke"
 
-#: lib/Compose.php:260
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
 msgstr "Kraj poruke od %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Unesite frazu"
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Unesite ime za va¹ novi folder za smeæe"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Unesite ime za va¹ novi folder za nacrte"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Unesite ime za va¹ novi folder za poslanu po¹tu"
 
@@ -1351,86 +1479,101 @@
 msgid "Enter the name for your new trash folder"
 msgstr "Unesite ime za va¹ novi folder za smeæe"
 
-#: message.php:185 compose.php:1044
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Usmjeri poruku"
+
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\" je uspje¹no dodan u adresar"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:367 lib/MIME/Viewer/pgp.php:392
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Gre¹ka"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Gre¹ka pri slanju odgovora: %s"
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
 #, fuzzy
 msgid "Event successfully deleted."
 msgstr "Folder \"%s\" je uspje¹no obrisan."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Svakih 15 minuta"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Svakih 30 sekundi"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Svakih 5 minuta"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Svakih pola sata"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Svaki minut"
 
-#: folders.php:412
+#: folders.php:457
 #, fuzzy
 msgid "Expand"
 msgstr "Pro¹iri sve"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Pro¹iri sve"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Pro¹iri sve foldere"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Pro¹iri folder"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Pro¹iri imena"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "Automatski ra¹iri imena u prozoru za sastavljanje poruke?"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Automatski ra¹iri cijelo stablo u prikazu foldera?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "Pro¹irujem"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Dobavi po¹tu"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "Dobavi po¹tu"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "Skini poruke u zasebnom prozoru?"
 
@@ -1439,66 +1582,72 @@
 msgid "Fetch messages upon logging on?"
 msgstr "Primeni filter pravila nakon prijavljivanja?"
 
-#: lib/Fetchmail.php:306
+#: lib/Fetchmail.php:289
 #, fuzzy, php-format
-msgid "Fetched %d message(s) from %s"
+msgid "Fetched %d messages from %s"
 msgstr "Obrisane sve poruke iz %s."
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
-msgid "Fetchmail: "
-msgstr ""
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Obrisane sve poruke iz %s."
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#, fuzzy
+msgid "Fetchmail: "
+msgstr "Dobavi po¹tu"
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 #, fuzzy
 msgid "Fetchmail: no new messages."
 msgstr " - $nm novih poruka"
 
-#: lib/IMP.php:917
+#: lib/IMP.php:990
 msgid "Fi_lters"
 msgstr "Fi_lteri"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "Datoteka"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "Opcije filtera"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "Pravila filtera"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "Filtriraj poruke nepo¾eljnog sadr¾aja?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr "Podr¹ka za filtere je iskljuèena na ovom sistemu."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filteri"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
 msgstr "Filteri NISU aktivni"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
 msgstr "Filteri: %s stranica za ureðivanje"
 
-#: templates/contacts/contacts.inc:178
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Tra¾i"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
 msgstr "Prva strana sanduèeta"
 
-#: mailbox.php:334
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Prva strana"
 
@@ -1506,16 +1655,16 @@
 msgid "Fo_rward"
 msgstr "P_roslijedi"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Pregled foldera"
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Prefiks foldera"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "Sa¾etak foldera"
@@ -1524,73 +1673,75 @@
 msgid "Folder sharing is not enabled."
 msgstr ""
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
 msgstr ""
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "Format datuma poruka u sanduèetu za poruke pristigle danas"
 
-#: compose.php:703 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Proslijedi"
 
-#: compose.php:688
+#: compose.php:765
 msgid "Forward:"
 msgstr "Proslijedi:"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:369
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Kraj proslijedjene poruke"
 
-#: lib/Compose.php:288
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Proslijedjena poruka od %s"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informacije servisa"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr "Odgovor slobodan/zauzet"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
+#, fuzzy
 msgid "Free/Busy Request"
-msgstr ""
+msgstr "Odgovor slobodan/zauzet"
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
+#, fuzzy
 msgid "Free/Busy Request Response"
-msgstr ""
+msgstr "Odgovor slobodan/zauzet"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "_Od"
 
-#: message.php:254 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Od"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "Adresa primaoca"
 
-#: compose.php:700 compose.php:704
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1205
+#: compose.php:1294
 #, fuzzy
 msgid "Fwd: "
 msgstr "Fwd:"
 
-#: compose.php:1207
+#: compose.php:1296
 #, fuzzy, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Kraj proslijedjene poruke"
@@ -1604,31 +1755,42 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr ""
 
-#: thread.php:68
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Idi na poruku"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Dodaj u imenik (%s)"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr "Daj pristup"
 
-#: message.php:546 lib/Filter.php:102 lib/MIME/Viewer/images.php:89
-#: lib/MIME/Viewer/images.php:96 lib/MIME/Viewer/images.php:98
-#: lib/MIME/Viewer/images.php:151 lib/MIME/Viewer/html.php:116
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/related.php:64 lib/MIME/Viewer/pkcs7.php:410
-#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr ""
 
-#: compose.php:243
+#: compose.php:256
+#, fuzzy
 msgid "HTML Version of Message"
-msgstr ""
+msgstr "Izvorni kod poruke"
 
 #: templates/message/headers.inc:58
 msgid "Headers"
@@ -1638,112 +1800,129 @@
 msgid "Here is the message you were composing:"
 msgstr ""
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Skriveno"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
 msgstr "Skriveno u prikazu toka teme"
 
-#: mailbox.php:356
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Sakrij obrisane"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Sakrij neupisane"
 
-#: lib/MIME/Viewer/html.php:103
-#, fuzzy
-msgid "Hide the Images"
-msgstr "obri¹i poruku"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr ""
 
-#: message.php:288 mailbox.php:681 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
 msgstr "Visok prioritet"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr ""
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Kako ¾elite prikazati priloge?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "Koji prefiks koristiti za citirane linije u odgovoru"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (automatski prepoznaj protokol)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr "IMAP over SSL (self-signed certificate)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
 msgstr "IMAP preko SSL (self-signed)"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, bez TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 mail serveri"
 
-#: folders.php:346
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "SANDUÈE"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr ""
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "Ignori¹i"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignori¹i sve"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
 #: templates/folders/import.inc:20
 #, fuzzy
 msgid "Import"
 msgstr "Va¾na"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 #, fuzzy
 msgid "Import Key"
 msgstr "Va¾na"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 #, fuzzy
 msgid "Import Keypair"
 msgstr "Va¾na"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "Importuj poruke"
 
 #: pgp.php:42
+#, fuzzy
 msgid "Import PGP Key"
-msgstr ""
+msgstr "Va¾na"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr ""
 
 #: templates/pgp/import_key.inc:14
@@ -1758,32 +1937,40 @@
 msgid "Import Personal S/MIME Certificates"
 msgstr ""
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+#, fuzzy
 msgid "Import Public Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
 #: templates/pgp/import_key.inc:4
+#, fuzzy
 msgid "Import Public PGP Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
 #: templates/smime/import_key.inc:8
+#, fuzzy
 msgid "Import Public S/MIME Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
 #: smime.php:16
+#, fuzzy
 msgid "Import S/MIME Key"
-msgstr ""
+msgstr "Va¾na"
 
 #: templates/folders/import.inc:9
+#, fuzzy
 msgid "Import mbox File"
-msgstr ""
+msgstr "Va¾na"
 
 #: templates/folders/import.inc:16
 #, php-format
 msgid "Import mbox file %s into folder %s."
 msgstr ""
 
-#: message.php:492 mailbox.php:689 templates/message/navbar_navigate.inc:7
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1793,47 +1980,49 @@
 msgid "Important messages"
 msgstr "Va¾ne poruke"
 
-#: folders.php:157
+#: folders.php:167
 #, fuzzy, php-format
 msgid "Imported %d messages from %s."
 msgstr "Obrisane sve poruke iz %s."
 
-#: lib/MIME/Viewer/itip.php:758
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr ""
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
 msgstr "Sanduèe"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "Ukljuèi sa¾etak u zaglavlju odgovora?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Prilo¾i originalnu poruku u odgovoru?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 #, fuzzy
 msgid "Info"
 msgstr "Ignori¹i"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "Information on %s Public Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr ""
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 #, fuzzy
 msgid "Inline"
 msgstr "none"
@@ -1854,27 +2043,29 @@
 msgid "Insert Public PGP Key Here"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
 msgstr ""
 
-#: mailbox.php:549 mailbox.php:590
+#: mailbox.php:584 mailbox.php:626
 #, fuzzy
 msgid "Invalid Address"
 msgstr "Email adresa"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
+#, fuzzy
 msgid "Invalid Remote Mailbox"
-msgstr ""
+msgstr "Udaljeno sanduèe:"
 
-#: compose.php:132
+#: compose.php:158
 #, fuzzy, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Nedozvoljena slova u email adresi."
 
 #: smime.php:82 pgp.php:16
+#, fuzzy
 msgid "Invalid key"
-msgstr ""
+msgstr "Email adresa"
 
 #: pgp.php:196
 msgid "Invalid personal PGP private key."
@@ -1888,39 +2079,61 @@
 msgid "Invert"
 msgstr "Invertuj"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr ""
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr ""
 
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr ""
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Jezik"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
 msgstr "Zadnja strana sanduèeta"
 
-#: mailbox.php:347
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Zadnja strana"
 
-#: templates/compose/compose.inc:380
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
 msgstr "Li_nkuj priloge"
 
-#: attachment.php:34 lib/Compose.php:988
+#: attachment.php:34 lib/Compose.php:1063
+#, fuzzy
 msgid "Linked attachments are forbidden."
+msgstr "Prilozi"
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
 msgstr ""
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1928,7 +2141,7 @@
 "Ispi¹i sve kontakte prilikom otvaranja ekrana kontakata? (Ako je ova opcija "
 "iskljuèena, vidjeæ?te samo kontakte koje tra¾ite)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Spisak priloga u zaglavlju poruke"
 
@@ -1936,21 +2149,21 @@
 msgid "Local Mailbox:"
 msgstr "Lokalno sanduèe:"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:674
 #, fuzzy
 msgid "Location"
 msgstr "Akcija"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "Kreni"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "Prijavi se na %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:137
 #, fuzzy
 msgid "Login"
 msgstr "Login zadaci"
@@ -1959,28 +2172,28 @@
 msgid "Login Tasks"
 msgstr "Login zadaci"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr ""
 
-#: message.php:290 mailbox.php:684 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Nizak prioritet"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 #, fuzzy
 msgid "Macintosh File"
 msgstr "Filteri po¹te"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Po¹ta"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
 msgstr "Pregled po¹te"
 
@@ -1988,19 +2201,19 @@
 msgid "Mail server type to connect to:"
 msgstr ""
 
-#: folders.php:364
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Sanduèe"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "Opcije prikaza sanduèeta i foldera"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "Oznaèi sve poruke kao proèitane"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "Oznaèi sve poruke kao neproèitane"
 
@@ -2008,7 +2221,7 @@
 msgid "Mark as:"
 msgstr "Obilje¾i kao:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Oznaèi razlièite nivoe citiranja razlièitim bojama?"
 
@@ -2016,7 +2229,7 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr ""
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
 msgstr "Oboji posebne oznake?"
 
@@ -2028,40 +2241,49 @@
 msgid "Match Any Query"
 msgstr "Bilo koji uslov"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
 msgstr "Maksimalna velièina priloga"
 
-#: templates/compose/compose.inc:484
-msgid "Maximum number of attachments reached."
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
 msgstr ""
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:494
+#, fuzzy
+msgid "Maximum number of attachments reached."
+msgstr "Maksimalna velièina priloga"
+
+#: templates/compose/compose.inc:489
+#, fuzzy
 msgid "Maximum total attachment size reached."
-msgstr ""
+msgstr "Maksimalna velièina priloga"
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:626
+#, fuzzy
 msgid "Meeting Cancellation"
-msgstr ""
+msgstr "Informacije servisa"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informacije servisa"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
+#, fuzzy
 msgid "Meeting Proposal"
-msgstr ""
+msgstr "Odgovor za sastanak"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
+#, fuzzy
 msgid "Meeting Update"
-msgstr ""
+msgstr "Odgovor za sastanak"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
 msgstr ""
 
@@ -2070,43 +2292,39 @@
 msgid "Menu Folder List"
 msgstr "Otvori folder"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Poruka"
 
-#: compose.php:508 compose.php:535 compose.php:567 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Nova poruka"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Datum poruke"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "Opcije poruka"
 
-#: search.php:354
+#: search.php:312
 msgid "Message Search"
 msgstr "Pretra¾ivanje poruke"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Velièina poruke"
 
-#: message.php:375
+#: message.php:384
 msgid "Message Source"
 msgstr "Izvorni kod poruke"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Pregledavanje poruke"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Polja poruke"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Oznake poruka"
@@ -2115,33 +2333,48 @@
 msgid "Message folders"
 msgstr "Folderi poruka"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:329
 #, fuzzy, php-format
 msgid "Message from %s"
 msgstr "Folderi poruka"
 
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Uslovi pretrage"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Polja poruke"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Polja poruke"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "Uslovi pretrage"
 
-#: compose.php:747 compose.php:761
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
 msgstr "Poruka uspje¹no usmjerena"
 
-#: compose.php:994
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "Poruka uspje¹no poslana, ali nije snimljena u %s"
 
-#: compose.php:1053 compose.php:1068
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "Poruka uspje¹no poslana."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Poruka po strani kod prikaza sanduèeta."
 
-#: mailbox.php:311
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "Poruke u"
 
@@ -2152,7 +2385,7 @@
 
 #: templates/compose/expand.inc:12
 #, php-format
-msgid "More than one address found for field '%s'."
+msgid "More than one address found for field \"%s\"."
 msgstr ""
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2164,7 +2397,11 @@
 msgid "Move down"
 msgstr "pomjeri ni¾e"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 #, fuzzy
 msgid "Move to folder"
 msgstr "odaberi folder"
@@ -2174,16 +2411,25 @@
 msgid "Move up"
 msgstr "pomjeri vi¹e"
 
-#: lib/MIME/Viewer/alternative.php:130
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Pregledavanje poruke"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr ""
 
-#: templates/contacts/contacts.inc:234 lib/MIME/Viewer/itip.php:673
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Ime"
 
@@ -2191,37 +2437,47 @@
 msgid "Name and/or email can not be empty"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:763
+#: lib/MIME/Viewer/itip.php:778
 #, fuzzy
 msgid "Needs Action"
 msgstr "Akcija"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Nikada"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Nikad ne pamti priloge"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "Novo"
 
-#: lib/IMP.php:579
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Novi folder"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Nova po¹ta"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Sljedeæa poruka"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Nove poruke"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nove poruke"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 #, fuzzy
 msgid "Next"
 msgstr "Tekst"
@@ -2230,11 +2486,11 @@
 msgid "Next Message"
 msgstr "Sljedeæa poruka"
 
-#: mailbox.php:345
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Sljedeæa strana"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "Ne"
 
@@ -2246,64 +2502,76 @@
 msgid "No Encryption"
 msgstr "Bez ¹ifrovanja"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr ""
 
-#: mailbox.php:364
+#: mailbox.php:375
 #, php-format
 msgid "No Messages"
 msgstr "Nema poruka"
 
 #: pgp.php:137
+#, fuzzy
 msgid "No PGP public key imported."
-msgstr ""
+msgstr "PGP tekst javnog kljuèa"
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr ""
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Prethodna strana"
+
+#: templates/smime/smime.inc:15
+#, fuzzy
 msgid "No Public Keys Found"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
 #: smime.php:151
 msgid "No S/MIME public key imported."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 #, fuzzy
 msgid "No attachments found."
 msgstr "Prilozi"
 
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
 #: acl.php:72 acl.php:98
 #, fuzzy
 msgid "No folder selected."
 msgstr "nijedan folder nije izabran"
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
 msgstr ""
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Nijedan folder nije specificiran"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:147
 #, fuzzy
 msgid "No folders with new messages"
 msgstr "Neobrisane poruke"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:144
 #, fuzzy
 msgid "No folders with unseen messages"
 msgstr "Neobrisane poruke"
 
-#: lib/Compose.php:231
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "Poruka nema teksta"
 
-#: lib/Mailbox.php:1157
+#: lib/Mailbox.php:371
 #, fuzzy
 msgid "No messages matched your search."
 msgstr "Nijedna poruka ne odgovara postavljenom upitu"
@@ -2324,29 +2592,33 @@
 msgid "No spellchecking program configured."
 msgstr ""
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Nijedna gramaticka gre¹ka"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Nema gre¹ke"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 msgid "No user specified."
 msgstr "Nije naveden korisnik."
 
-#: lib/MIME/Viewer/itip.php:694
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr ""
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:5
-#: lib/MIME/Viewer/itip.php:651
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Nijedna"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr ""
 
@@ -2368,8 +2640,7 @@
 msgid "Not Personal"
 msgstr "Nije lièna"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
-#: lib/Crypt/SMIME.php:166
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr ""
 
@@ -2381,27 +2652,31 @@
 msgid "Not important messages"
 msgstr "Neva¾ne poruke"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr ""
 
-#: config/prefs.php.dist:371
+#: config/prefs.php.dist:616
+msgid "Nothing"
+msgstr ""
+
+#: config/prefs.php.dist:377
 msgid "Number of months to keep old linked attachments if deleting monthly."
 msgstr ""
 "Broj mjeseci koliko treba èuvati stare linkovane priloge u sluèaju mjeseènog "
 "brisanja."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
 "Broj starih foldera poslane po¹te koji ce se sacuvati ako se bri¹u mjesecno."
 
-#: templates/contacts/contacts.inc:247 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:718
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr ""
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr ""
@@ -2410,47 +2685,49 @@
 msgid "Old messages"
 msgstr "Stare poruke"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Bri¹em stare foldere poslane po¹te."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
+#, fuzzy
 msgid "Only display folders with unread messages in them?"
-msgstr ""
+msgstr "Neobrisane poruke"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
 msgstr ""
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "Otvo_ri folder"
-
-#: templates/menu.inc:24
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Otvori folder"
 
-#: folders.php:381
+#: folders.php:427
 msgid "Opened Folder"
 msgstr "Otvoreni folder"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
 msgstr ""
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "Ostali e-mail raèuni"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Ostale opcije"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
@@ -2458,19 +2735,15 @@
 msgid "PGP Encrypt Message"
 msgstr "PGP ¹ifrovanje poruke"
 
-#: compose.php:343
+#: compose.php:358
 msgid "PGP Error: "
 msgstr "PGP gre¹ka:"
 
-#: compose.php:322
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP gre¹ka: Potrebna je fraza za lièni privatni kljuè."
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP NIJE Aktivan"
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP opcije"
 
@@ -2478,11 +2751,11 @@
 msgid "PGP Passphrase Input"
 msgstr "PGP unos fraze"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Podr¹ka za PGP liène kljuèeve zahtijeva sigurnu web konekciju."
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
 msgstr "PGP tekst javnog kljuèa"
 
@@ -2496,7 +2769,7 @@
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "PGP javni kljuè za \"%s\" je uspje¹no obrisan."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "PGP javni privjesak"
 
@@ -2516,11 +2789,11 @@
 msgid "PGP public key successfully added."
 msgstr "PGP javni kljuè je uspje¹no dodan."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP podr¹ka je iskljuèena na ovom sistemu."
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
@@ -2528,40 +2801,40 @@
 "PGP podr¹ka trenutno nije aktivna tako da se digitalni potpis ne mo¾e "
 "provjeriti."
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 "PGP podr¹ka trenutno nije aktivna tako da se poruka ne mo¾e de¹ifrovati."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (automatski prepoznaj protokole)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 over SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 over SSL (self-signed certificate)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr "POP3 over SSL (self-signed)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, bez TLS"
 
@@ -2570,11 +2843,11 @@
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
 msgstr "Stranica sa prvom neproèitanom porukom"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
 msgstr "Stranica sa zadnjom neproèitanom porukom"
 
@@ -2582,21 +2855,25 @@
 msgid "Part(s)"
 msgstr "Dio (dijelovi)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
+#, fuzzy
 msgid "Passphrase"
-msgstr ""
+msgstr "Unesite frazu"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
+#, fuzzy
 msgid "Passphrase (Again)"
-msgstr ""
+msgstr "PGP unos fraze"
 
 #: smime.php:235 pgp.php:310
+#, fuzzy
 msgid "Passphrase successfully unloaded."
-msgstr ""
+msgstr "PGP privatni kljuè je uspje¹no dodan."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+#, fuzzy
 msgid "Passphrase:"
-msgstr ""
+msgstr "Unesite frazu"
 
 #: pgp.php:112
 msgid "Passphrases can not be empty"
@@ -2606,8 +2883,8 @@
 msgid "Passphrases do not match"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "©ifra"
 
@@ -2619,7 +2896,7 @@
 msgid "Permissions for this user can not be changed."
 msgstr "Dozvole za ovog korisnika se ne mogu mijenjati."
 
-#: message.php:483 mailbox.php:660 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "Lièna"
@@ -2629,38 +2906,50 @@
 msgstr "Osobne/Liène informacije"
 
 #: pgp.php:120
+#, fuzzy
 msgid "Personal PGP keypair generated successfully."
-msgstr ""
+msgstr "Poruka uspje¹no usmjerena"
 
 #: pgp.php:127
+#, fuzzy
 msgid "Personal PGP keys deleted successfully."
-msgstr ""
+msgstr "Poruka uspje¹no usmjerena"
 
 #: smime.php:207
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr ""
 
 #: smime.php:132
+#, fuzzy
 msgid "Personal S/MIME keys deleted successfully."
-msgstr ""
+msgstr "Poruka uspje¹no usmjerena"
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Dodaj moj potpis prije odgovora i proslijeðenih poruka?"
 
-#: compose.php:241
+#: compose.php:254
 msgid "Plaintext Version of Message"
 msgstr "Izvorni kod poruke"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
-msgid "Please enter a name for the new folder:"
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
 msgstr ""
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "Unesite ime za va¹ novi folder za smeæe"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
+#, fuzzy
 msgid "Please enter the name of the new folder:"
-msgstr ""
+msgstr "Unesite ime za va¹ novi folder za smeæe"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr ""
 
@@ -2678,7 +2967,7 @@
 "to enter this passphrase once per %s session."
 msgstr ""
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2686,54 +2975,52 @@
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
 msgstr "Molim navedite va¹u ¹ifru."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
 msgstr "Molim navedite va¹e korisnièko ime."
 
-#: compose.php:80 lib/IMP.php:520
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Molim te popravi dvosmislene odnosno invalidne adrese."
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/MIME/Viewer/itip.php:642
+#, fuzzy
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
-msgstr ""
+msgstr "Molim izaberite akciju na meniju ispod."
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Molim izaberite neki folder prije izvr¹avanja akcija."
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
 msgstr "Molim izaberite akciju na meniju ispod."
 
 #: templates/search/javascript.inc:41
+#, fuzzy
 msgid "Please select at least one folder to search."
-msgstr ""
+msgstr "Morate navesti bar jednog primaoca."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
+#, fuzzy
 msgid "Please select only one folder for this operation."
-msgstr ""
+msgstr "Molim izaberite neki folder prije izvr¹avanja akcija."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
 msgstr "Izaberite ili promijenite u polju desno:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Izaberite ili promijenite desno:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Ispred potpisa dodaj crtice ('-- ')?"
 
@@ -2751,11 +3038,11 @@
 msgid "Previous Message"
 msgstr "Prethodna poruka"
 
-#: mailbox.php:336
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Prethodna strana"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Od¹tampaj"
 
@@ -2763,15 +3050,15 @@
 msgid "Priority"
 msgstr "Prioritet"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "©ifra privatnog kljuèa"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Pitaj prilikom slanja priloga; podrazumijevani odgovor je NE"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Pitaj prilikom slanja priloga; podrazumijevani odgovor je DA"
 
@@ -2779,7 +3066,7 @@
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 
@@ -2791,32 +3078,31 @@
 msgid "Purge Deleted"
 msgstr "Izbaci obrisane"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "Izbaci obrisane poruke"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Koliko èesto brisati poruke iz korpe:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Obri¹i poruke u folderu korpa starije od ovog broja dana."
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Isprazni stare poruke u direktoriju Korpa?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
+#: lib/Maintenance/Task/purge_trash.php:65
 #, fuzzy, php-format
-msgid "Purging %d message(s) from Trash folder."
+msgid "Purging %d messages from Trash folder."
 msgstr "Izbacujem %d poruku/a iz foldera korpa."
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Dodaj ovo nakon znaka @ prilikom slanja po¹te i automatskog pro¹irenja "
-"adrese:"
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Izbacujem %d poruku/a iz foldera korpa."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2833,24 +3119,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr "Slobodan prostor: NEOGRANIÈENO"
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
 #, php-format
 msgid "Quoting %f:"
 msgstr "Citiram %f:"
 
-#: templates/compose/compose.inc:377
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
 msgstr "T_ra¾i potvrdu prijema"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "Primljena na"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Primljena nakon"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Primljena prije"
 
@@ -2862,27 +3148,27 @@
 msgid "Redirect"
 msgstr "Usmjeri"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Usmjeri poruku"
 
-#: compose.php:710
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Usmjeri ovu poruku"
 
-#: compose.php:770
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Usmjerenje nije uspjelo."
 
-#: templates/compose/compose.inc:573
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "A¾uriraj"
 
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "A¾uriraj prikaz foldera:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 #, fuzzy
 msgid "Reload"
 msgstr "A¾uriraj prikaz"
@@ -2891,11 +3177,12 @@
 msgid "Reload View"
 msgstr "A¾uriraj prikaz"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+#, fuzzy
 msgid "Remember the free/busy information."
-msgstr ""
+msgstr "Odgovori tra¾enom slobodan/zauzet informacijom."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Zapamti zadnji prikaz"
 
@@ -2903,7 +3190,7 @@
 msgid "Remote Mailbox:"
 msgstr "Udaljeno sanduèe:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr ""
 
@@ -2912,15 +3199,15 @@
 msgid "Remove source"
 msgstr "izbaci izvor"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Promjeni ime foldera"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Promjeni ime foldera poslane po¹te poèetkom svakog mjeseca?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Promjena imena nije uspjela \"%s\" u \"%s\". Ovo je poruka servera"
@@ -2929,7 +3216,7 @@
 msgid "Repl_y to List"
 msgstr "Odgovo_ri na listu"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Zamjeni sa:"
 
@@ -2937,7 +3224,7 @@
 msgid "Reply"
 msgstr "Odgovori"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
 msgstr "Odgovor je poslan."
 
@@ -2945,7 +3232,7 @@
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: compose.php:659
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Odgovori svima:"
 
@@ -2953,7 +3240,7 @@
 msgid "Reply to List"
 msgstr "Odgovori na listu"
 
-#: compose.php:661
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "Odgovori na listu:"
 
@@ -2961,107 +3248,107 @@
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
 msgstr "Odgovori porukom Nije podr¾ano"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Odgovori porukom slobodan/zauzet za naredna 2 mjeseca."
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Odgovori tra¾enom slobodan/zauzet informacijom."
 
-#: message.php:258
+#: message.php:267
 msgid "Reply-To"
 msgstr "Odgovori-na"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "Odgovori-Na: "
 
-#: compose.php:657
+#: compose.php:731
 msgid "Reply:"
 msgstr "Odgovori:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
 msgstr "Prijavi kao ne-spam"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Prijavi kao spam"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "Tra¾i _potvrdu èitanja"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
 msgstr "Da tra¾im potvrdu prijema?"
 
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "Da tra¾im potvrdu èitanja poruke?"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr "Tra¾ena poruka nije pronaðena."
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:697
+#, fuzzy
 msgid "Required Participant"
-msgstr ""
+msgstr "Da tra¾im potvrdu èitanja poruke?"
 
 #: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Poni¹ti"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
 msgstr ""
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Nastavi"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Nastavite va¹u sesiju"
 
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Nova poruka"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 #: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "Nazad na Vanjske raèune"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Nazad na Glavni ekran opcija"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
 msgstr "Nazad na opcije"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Nazad na prethodni ekran"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
 "Vrati se na prikaz sanduèeta nakon brisanja, prebacivanja, ili kopiranja "
 "poruke?"
 
-#: lib/MIME/Viewer/itip.php:673
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:411
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
@@ -3069,29 +3356,29 @@
 msgid "S/MIME Encrypt Message"
 msgstr "S/MIME ¹ifruj poruku"
 
-#: compose.php:379
+#: compose.php:394
+#, fuzzy
 msgid "S/MIME Error: "
-msgstr ""
+msgstr "PGP gre¹ka:"
 
-#: compose.php:358
+#: compose.php:373
+#, fuzzy
 msgid "S/MIME Error: Need passphrase for personal private key."
-msgstr ""
-
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME NIJE aktivan"
+msgstr "PGP gre¹ka: Potrebna je fraza za lièni privatni kljuè."
 
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
 msgstr "S/MIME opcije"
 
 #: smime.php:49
+#, fuzzy
 msgid "S/MIME Passphrase Input"
-msgstr ""
+msgstr "PGP unos fraze"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
+#, fuzzy
 msgid "S/MIME Personal Keypair support requires a secure web connection."
-msgstr ""
+msgstr "Podr¹ka za PGP liène kljuèeve zahtijeva sigurnu web konekciju."
 
 #: smime.php:140
 #, fuzzy, php-format
@@ -3099,98 +3386,127 @@
 msgstr "Folder \"%s\" je uspje¹no obrisan."
 
 #: smime.php:162
+#, fuzzy
 msgid "S/MIME Public Key successfully added."
-msgstr ""
+msgstr "PGP javni kljuè je uspje¹no dodan."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
+#, fuzzy
 msgid "S/MIME Public Keyring"
-msgstr ""
+msgstr "PGP javni privjesak"
 
 #: smime.php:211
+#, fuzzy
 msgid "S/MIME Public/Private Keypair successfully added."
-msgstr ""
+msgstr "PGP privatni kljuè je uspje¹no dodan."
 
 #: templates/compose/encrypt_list.inc:13
+#, fuzzy
 msgid "S/MIME Sign Message"
-msgstr ""
+msgstr "S/MIME ¹ifruj poruku"
 
 #: templates/compose/encrypt_list.inc:14
+#, fuzzy
 msgid "S/MIME Sign/Encrypt Message"
-msgstr ""
+msgstr "S/MIME ¹ifruj poruku"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
+#, fuzzy
 msgid "S/MIME support is disabled on this system."
-msgstr ""
+msgstr "PGP podr¹ka je iskljuèena na ovom sistemu."
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
+#, fuzzy
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
+"PGP podr¹ka trenutno nije aktivna tako da se poruka ne mo¾e de¹ifrovati."
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message can not "
 "be displayed."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
+#, fuzzy
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr ""
+"PGP podr¹ka trenutno nije aktivna tako da se digitalni potpis ne mo¾e "
+"provjeriti."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
 msgstr ""
 
-#: templates/compose/compose.inc:266
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "T_ema"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "Saèu_vaj kopiju u "
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "_Saèuvaj kao"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 #, fuzzy
 msgid "Save"
 msgstr "Saèuvaj kao"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr ""
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Saèuvaj kao nacrt"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Saèuvaj kao"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Snimi opcije"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Snimi opcije"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
 msgstr "Saèuvaj kao _nacrt"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Saèuvaj kao"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "Èuvaj nacrte kao neproèitane?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "Automatski pamti primatelje poruke u glavnom adresaru?"
 
@@ -3198,16 +3514,17 @@
 msgid "Save search as a virtual folder?"
 msgstr "Zapamti pretragu kao virtualni folder?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "Saèuvaj poslanu po¹tu?"
 
-#: compose.php:1138
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Nije uspjelo spa¹avanje nacrta. Ovo je poruka servera: %s"
 
-#: templates/contacts/contacts.inc:192 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Tra¾i"
 
@@ -3216,11 +3533,12 @@
 msgid "Search %s"
 msgstr "Tra¾i %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Pretra¾i poruke"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Snimi opcije"
 
-#: search.php:311
+#: search.php:265
 msgid "Search Results"
 msgstr "Rezultati pretrage"
 
@@ -3236,7 +3554,7 @@
 msgid "Select Another Account"
 msgstr "Izaberite korisnièki raèun"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 #, fuzzy
 msgid "Select a date"
 msgstr "Odaberi identitet"
@@ -3245,7 +3563,12 @@
 msgid "Select a field"
 msgstr "Izaberite polje"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Odaberi identitet"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "Izaberite izvore imenika za dodavanje i pretra¾ivanje adresa."
 
@@ -3265,6 +3588,10 @@
 msgid "Select none"
 msgstr "Odaberi nijedan"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr ""
@@ -3274,34 +3601,35 @@
 msgid "Selected Address books:"
 msgstr "Odaberi adresare:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informacije servisa"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "©alji MDN kada to tra¾i po¹iljalac?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Po¹alji poruku"
 
-#: folders.php:359
+#: config/prefs.php.dist:703
+#, fuzzy
+msgid "Send read receipt when requested by the sender?"
+msgstr "©alji MDN kada to tra¾i po¹iljalac?"
+
+#: folders.php:397
 #, fuzzy
 msgid "Sent mail folder"
 msgstr "Folder poslane po¹te:"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "Folder poslane po¹te:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Server"
 
@@ -3320,7 +3648,7 @@
 "Podesite opcije u kojima æe se defininisati akcije nakon premje¹tanja i "
 "brisanja poruka."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Podesi X-Priority polje u zaglavlju prilikom pisanja poruka?"
 
@@ -3336,7 +3664,7 @@
 msgid "Share your mail folders with other users."
 msgstr "Razmjenjujte va¹e e-mail foldere sa drugim korisnicima."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3344,15 +3672,15 @@
 "Da li æe veliki komadi citiranog teksta biti automatski sakriveni ili "
 "prikazani? Ovo se mo¾e lako promijeniti kada za¾elite."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "Da li zatvoriti prozor za pisanje nove poruke nakon spa¹avanja nacrta?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 
@@ -3365,7 +3693,7 @@
 msgid "Show All Headers"
 msgstr "Prika¾i sva polja"
 
-#: mailbox.php:354
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Prika¾i obrisane"
 
@@ -3383,54 +3711,51 @@
 msgid "Show Only Subscribed Folders"
 msgstr "Prijavi se na Folder(e)"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Prika¾i neprijavljene"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "Prika¾i ikonu koja omoguæuje brisanje priloga iz poruke?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "Prika¾i legendu u prikazu sanduèeta?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
 msgstr "Prika¾i sa¾etke samo za neproèitane poruke?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
 msgstr "Prika¾i sa¾etke u oblaèiæima?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Prika¾i ikonu za Vanjske raèune u meniju?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:95
+#, fuzzy
 msgid "Show the Images"
-msgstr ""
+msgstr "Prikaz poruka u "
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "Prika¾i ikonu filtera u meniju?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
 msgstr ""
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "Prikazano"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "_Velièina"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr ""
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "Potpisana"
@@ -3439,67 +3764,85 @@
 msgid "Size"
 msgstr "Velièina"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Pravac sortiranja"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
+#, fuzzy
 msgid "Sort by Arrival"
-msgstr ""
+msgstr "Tok teme"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
+#, fuzzy
 msgid "Sort by Date"
-msgstr ""
+msgstr "Tok teme"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "Sortiraj po adresi po¹iljaoca"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "Sortiraj po velièini poruke"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Sortiraj po temi"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "Tok teme"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "Sortiraj po adresi primaoca"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "Folder za spam:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Specijalni karakteri"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Provjera pravopisa"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Provjera pravopisa"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Provjera pravopisa gotova"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Broj gre¹aka po ekranu prilikom provjere pravopisa?"
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:673
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr ""
 
@@ -3508,82 +3851,99 @@
 msgid "Strip Attachment"
 msgstr "Prilog"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
 msgstr "Ukloni nove redove?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "Te_ma"
 
-#: message.php:259 search.php:157 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Tema"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "Polje teme"
 
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Po¹alji"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Prijavi se na Folder(e)"
 
-#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:395
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Uspje¹no"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Prijedlozi"
 
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+#, fuzzy
 msgid "Summary"
-msgstr ""
+msgstr "Sa¾etak foldera"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
 msgstr ""
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
 msgstr ""
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
 msgstr ""
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "Te_kst"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:746
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr ""
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "Te_kst"
+
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
 msgstr "Kolona Po¹iljaoca treba biti link na:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr ""
@@ -3598,13 +3958,13 @@
 msgid "The account \"%s\" has been saved."
 msgstr "Identitet \"%s\" je saèuvan."
 
-#: lib/Filter.php:94
-#, fuzzy, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Identitet \"%s\" je saèuvan."
-
 #: attachment.php:43
+#, fuzzy
 msgid "The attachment was not found."
+msgstr "Prilozi"
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
 msgstr ""
 
 #: templates/javascript/open_compose_win.js:37
@@ -3613,41 +3973,41 @@
 "block popup windows?"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Trenutno ime foldera \"%s\" æe biti promijenjeno u \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 "Nisam mogao dobaviti listu korisnika koji imaju pravo pristupa ovom folderu"
 
-#: compose.php:1147
-#, php-format
+#: compose.php:1236
+#, fuzzy, php-format
 msgid "The draft has been saved to the \"%s\" folder."
-msgstr ""
+msgstr "Identitet \"%s\" je saèuvan."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr ""
 
 #: templates/compose/expand.inc:9
 #, php-format
-msgid "The field '%s' can't be expanded."
+msgid "The field \"%s\" can't be expanded."
 msgstr ""
 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Folder \"%s\" veæ postoji"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3656,91 +4016,101 @@
 "Folder \"%s\" sadr¾i ilegalne karaktere u imenu. Kao takav mo¾e biti "
 "problematièan."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Folder \"%s\" je kreiran ali niste prijavljeni na njega."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Folder \"%s\" je obrisan ali niste odjavljeni sa istog."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Folder \"%s\" nije kreiran. Ovo je poruka servera"
 
-#: lib/Folder.php:373
+#: lib/Folder.php:265
 #, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "Folder \"%s\" nije obrisan. Ovo je poruka servera"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Folder \"%s\" je uspje¹no kreiran."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Folder \"%s\" je uspje¹no obrisan."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Ime foldera \"%s\" je uspje¹no promjenjeno u \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:95
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+#, fuzzy
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr ""
+"Automatski prika¾i slike u HTML porukama za koje je po¹iljalac u mom "
+"adresaru?"
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
 msgstr ""
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
 msgstr ""
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
 msgstr ""
 
-#: lib/Message.php:645
+#: lib/Message.php:651
 #, fuzzy, php-format
 msgid "The mailbox %s is already empty."
 msgstr "%s je veæ prazan."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
 
-#: templates/contacts/contacts.inc:98
+#: templates/contacts/contacts.inc:103
+#, fuzzy
 msgid "The message being composed has been closed. Exiting."
-msgstr ""
+msgstr "Identitet \"%s\" je obrisan."
 
-#: message.php:142
+#: message.php:148
 #, fuzzy
 msgid "The message has been deleted."
 msgstr "Identitet \"%s\" je obrisan."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:393
 #, fuzzy
 msgid "The message has been verified."
 msgstr "Identitet \"%s\" je saèuvan."
 
-#: lib/MIME/Viewer/pkcs7.php:374
-#, php-format
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
 msgid "The message has been verified. Sender: %s."
-msgstr ""
+msgstr "Identitet \"%s\" je saèuvan."
 
 #: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
@@ -3748,16 +4118,16 @@
 "block popup windows?"
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr ""
 
@@ -3769,9 +4139,14 @@
 "notification message."
 msgstr ""
 
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
 #: templates/compose/compose.js:104
+#, fuzzy
 msgid "The signature could not be replaced."
-msgstr ""
+msgstr "Folder \"%s\" je uspje¹no kreiran."
 
 #: templates/compose/compose.js:102
 #, fuzzy
@@ -3782,44 +4157,62 @@
 msgid "The specified file does not exist."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Identitet \"%s\" je saèuvan."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Identitet \"%s\" je obrisan."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Identitet \"%s\" je obrisan."
+
+#: lib/MIME/Viewer/itip.php:169
+#, fuzzy
 msgid "The task has been added to your tasklist."
-msgstr ""
+msgstr "Identitet \"%s\" je saèuvan."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 #, fuzzy
 msgid "The text of the message"
 msgstr "obri¹i poruku"
 
-#: lib/MIME/Viewer/status.php:97
-#, php-format
+#: lib/MIME/Viewer/status.php:94
+#, fuzzy, php-format
 msgid "The text of the message can be viewed %s."
-msgstr ""
+msgstr "obri¹i poruku"
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
+#, fuzzy
 msgid "The text of the returned message"
-msgstr ""
+msgstr "Usmjeri ovu poruku"
 
-#: lib/MIME/Viewer/status.php:82
-#, php-format
+#: lib/MIME/Viewer/status.php:79
+#, fuzzy, php-format
 msgid "The text of the returned message can be viewed %s."
-msgstr ""
+msgstr "Usmjeri ovu poruku"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, fuzzy
 msgid "The text of the sent message"
 msgstr "Usmjeri ovu poruku"
 
-#: lib/MIME/Viewer/notification.php:71
-#, php-format
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy, php-format
 msgid "The text of the sent message can be viewed %s."
-msgstr ""
+msgstr "Usmjeri ovu poruku"
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
 msgid "The user's free/busy information was sucessfully stored."
-msgstr ""
+msgstr "Folder \"%s\" je uspje¹no kreiran."
 
-#: lib/MIME/Viewer/alternative.php:89
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr ""
 
@@ -3827,21 +4220,25 @@
 msgid "There are no messages in this mailbox."
 msgstr "Nema poruka u ovom mailbox-u."
 
-#: lib/Message.php:604
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Nastao je problem sa èi¹æenjem %s. Ovo je poruka servera"
 
-#: lib/Message.php:647
+#: lib/Message.php:653
 #, fuzzy, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Nastao je problem sa èi¹æenjem mailbox-a. Ovo je poruka servera: %s"
 
-#: lib/Message.php:613
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr "Nastao je problem sa èi¹æenjem mailbox-a. Ovo je poruka servera"
 
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, fuzzy, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
@@ -3849,7 +4246,7 @@
 msgstr ""
 "Desila se gre¹ka tokom kopiranja poruka u \"%s\". Ovo je poruka servera"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
@@ -3858,7 +4255,7 @@
 "Desila se gre¹ka tokom brisanja poruka iz foldera \"%s\". Ovo je poruka "
 "servera"
 
-#: lib/Message.php:296
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
@@ -3867,21 +4264,21 @@
 "Desila se gre¹ka tokom brisanja poruka iz foldera \"%s\". Ovo je poruka "
 "servera"
 
-#: lib/Message.php:230
+#: lib/Message.php:211
 #, fuzzy, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Desila se gre¹ka tokom brisanja poruka. Ovo je poruka servera"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:99
 #, fuzzy, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Desila se gre¹ka tokom èitanja odabrane poruke."
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Desila se gre¹ka tokom prikaza ovog dijela poruke"
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
@@ -3889,27 +4286,27 @@
 msgstr ""
 "Desila se gre¹ka tokom markiranja poruka u \"%s\". Ovo je poruka servera"
 
-#: folders.php:155
+#: folders.php:165
 #, fuzzy, php-format
 msgid "There was an error importing %s."
 msgstr "Desila se gre¹ka tokom spa¹avanja nezavr¹ene poruke."
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, fuzzy, php-format
 msgid "There was an error importing the event: %s."
 msgstr "Desila se gre¹ka tokom èitanja odabrane poruke."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
 #, fuzzy, php-format
 msgid "There was an error importing the task: %s."
 msgstr "Desila se gre¹ka tokom èitanja odabrane poruke."
 
-#: lib/MIME/Viewer/itip.php:142
-#, php-format
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
 msgid "There was an error importing user's free/busy information: %s."
-msgstr ""
+msgstr "Desila se gre¹ka tokom èitanja odabrane poruke."
 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, fuzzy, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
@@ -3917,106 +4314,114 @@
 msgstr ""
 "Desila se gre¹ka tokom prebacivanja poruka u \"%s\". Ovo je poruka servera"
 
-#: compose.php:1155
+#: compose.php:1244
 #, fuzzy
 msgid "There was an error saving this message as a draft."
 msgstr "Desila se gre¹ka tokom prikaza ovog dijela poruke"
 
-#: compose.php:916
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Desila se gre¹ka tokom slanja poruke: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, fuzzy, php-format
 msgid "There was an error updating the event: %s."
 msgstr "Desila se gre¹ka tokom slanja poruke: %s"
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 #, fuzzy
 msgid "There was no text in this message part"
 msgstr "Desila se gre¹ka tokom prikaza ovog dijela poruke"
 
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:97
+#, fuzzy
 msgid "This HTML message has images embedded in it."
-msgstr ""
+msgstr "Identitet \"%s\" je obrisan."
 
-#: lib/MIME/Viewer/html.php:89
+#: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr ""
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
+#, fuzzy
 msgid "This may take some time. Are you sure you want to continue?"
-msgstr ""
+msgstr "Da li SIGURNO ¾elite nastaviti?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:414
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
 msgstr "Ova poruka ne izgleda kao ispravna PGP ¹ifrovana poruka. Gre¹ka: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+#, fuzzy
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
-msgstr ""
+msgstr "Ova poruka ne izgleda kao ispravna PGP ¹ifrovana poruka. Gre¹ka: "
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
+#, fuzzy
 msgid "This message does not appear to be in the correct S/MIME format."
-msgstr ""
+msgstr "Ova poruka ne izgleda kao ispravna PGP ¹ifrovana poruka. Gre¹ka: "
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+#, fuzzy
 msgid "This message has been digitally signed via PGP."
-msgstr ""
+msgstr "Identitet \"%s\" je obrisan."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
+#, fuzzy
 msgid "This message has been digitally signed via S/MIME."
-msgstr ""
+msgstr "Identitet \"%s\" je obrisan."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#, fuzzy
 msgid "This message has been encrypted via S/MIME."
-msgstr ""
+msgstr "Identitet \"%s\" je obrisan."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+#, fuzzy
 msgid "This message has been encrypted with PGP."
-msgstr ""
+msgstr "Identitet \"%s\" je obrisan."
 
-#: message.php:202
+#: message.php:211
 msgid "This message to"
 msgstr "Ova poruka u"
 
@@ -4024,22 +4429,26 @@
 msgid "This server does not support sharing folders."
 msgstr ""
 
-#: templates/contacts/contacts.inc:104
+#: templates/contacts/contacts.inc:109
 msgid "This window must be called from a compose window."
 msgstr ""
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Prika¾i"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Prikaz po toku teme"
 
-#: message.php:255 mailbox.php:570 search.php:145
-#: templates/contacts/contacts.inc:216
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Za"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:919
 msgid "To Address"
 msgstr "Adresa po¹iljaoca"
 
@@ -4051,12 +4460,18 @@
 "Da biste izabrali vi¹e od jednog polja, dr¾ite tipku Control (PC) odnosno "
 "Command (Mac) prilikom klikanja."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 #, fuzzy
 msgid "Total Attachments Size:"
 msgstr "Prilozi"
 
-#: folders.php:350
+#: folders.php:388
 msgid "Trash folder"
 msgstr "Folder za smeæe:"
 
@@ -4064,8 +4479,8 @@
 msgid "Trash folder:"
 msgstr "Folder korpa:"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr ""
 
@@ -4082,76 +4497,92 @@
 msgid "Undelete"
 msgstr "Vrati obrisane"
 
-#: mailbox.php:554 mailbox.php:566 lib/MIME/Headers.php:218
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Primaoci su skriveni"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr ""
 
-#: mailbox.php:531
+#: mailbox.php:565
+#, fuzzy
 msgid "Unknown Date"
+msgstr "Ne prikazani primaoci"
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/MIME/Viewer/itip.php:635
+#, fuzzy
 msgid "Unknown Meeting"
-msgstr ""
+msgstr "Ne prikazani primaoci"
 
-#: mailbox.php:582
+#: mailbox.php:618
 #, fuzzy
 msgid "Unknown Recipient"
 msgstr "Ne prikazani primaoci"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
 msgid "Unload Passphrase"
-msgstr ""
+msgstr "Unesite frazu"
 
 #: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Bezimeni"
 
-#: message.php:489 mailbox.php:665 templates/message/navbar_navigate.inc:6
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Neproèitana"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Odjavi se sa Foldera"
 
-#: templates/compose/compose.inc:574
+#: templates/compose/compose.inc:584
+#, fuzzy
 msgid "Update Attachment Information"
-msgstr ""
+msgstr "Informacije servisa"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr ""
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+#, fuzzy
 msgid "Upload"
-msgstr ""
+msgstr "A¾uriraj prikaz"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Koristi default vrijednost"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "Koristi IMAP folder prijavu?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Virtualni folderi"
+
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "Korisnik"
 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr "Korisniku '%s' su uspje¹no data prava na folder '%s'."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Korisnièko ime"
 
@@ -4159,101 +4590,143 @@
 msgid "Username:"
 msgstr "Korisnièko ime:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 #, fuzzy
 msgid "View"
 msgstr "Prikaz %s"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
 msgstr "Prikaz %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "View %s Public Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
 #: lib/MIME/Viewer/html.php:116
 #, fuzzy
 msgid "View HTML content in a separate window"
 msgstr "Kreiraj poruku u zasebnom prozoru?"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Nove poruke"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+#, fuzzy
 msgid "View Personal Public Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
 msgstr "Vidi èitavu temu"
 
-#: lib/MIME/Viewer/images.php:151 lib/MIME/Viewer/images.php:153
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#, fuzzy
 msgid "View Thumbnail"
-msgstr ""
+msgstr "Vidi èitavu temu"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:418
 #, fuzzy
 msgid "View attachment in a separate window"
 msgstr "Kreiraj poruku u zasebnom prozoru?"
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 #, fuzzy
 msgid "View content in a separate window"
 msgstr "Kreiraj poruku u zasebnom prozoru?"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
+#, fuzzy
 msgid "View event"
-msgstr ""
+msgstr "Prikaz %s"
 
-#: folders.php:342 mailbox.php:500
+#: folders.php:380 mailbox.php:534
 #, fuzzy, php-format
 msgid "View messages in %s"
 msgstr "Prikaz poruka u "
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Prikaz ili sanduèe koje æe se prikazati nakon prijave:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 #, fuzzy
 msgid "View task"
 msgstr "Prikaz %s"
 
-#: lib/MIME/Viewer/html.php:110
+#: lib/MIME/Viewer/html.php:101
 #, fuzzy
 msgid "View the Images"
 msgstr "Prikaz poruka u "
 
-#: search.php:309
+#: search.php:263
 #, fuzzy, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "Folder \"%s\" je uspje¹no obrisan."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:118 lib/IMAP/Tree.php:310
-#: lib/IMAP/Tree.php:334 lib/IMAP/Tree.php:376
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "Virtualni folderi"
 
-#: search.php:291
+#: search.php:245
 msgid "Virtual Folders require a label."
 msgstr "Za virtualni folder je obavezna oznaka."
 
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "Virtualni folderi"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Virtualni folderi"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Virtualni folderi"
+
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "Oznaka virtualnog foldera"
 
-#: login.php:131
+#: lib/MIME/Viewer/pkcs7.php:374
+#, fuzzy
+msgid "Warning"
+msgstr "Pro¹irujem"
+
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
 msgstr "Dobro do¹li na %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:619
+#, fuzzy
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "Obri¹i poruku nakon prijavljivanja kao spam?"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -4261,64 +4734,94 @@
 "Prilikom brisanja poruka, da li da ih prebacim u folder Korpa umjesto da ih "
 "oznaèim kao obrisane?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "Prilikom otvaranja sanduèiæa, na kojoj stranici ¾elite poèeti?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "Prilikom snimanja poslane po¹te, trebamo li pamtiti i priloge?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "Bijela lista"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Rasporedi tekst na ovoliko karaktera."
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Da"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
 msgid "You are about to fetch email from the following account(s):"
+msgstr "Podesite dobavljanje po¹te sa e-mail raèuna na drugim serverima"
+
+#: templates/folders/folders_confirm.html:10
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
 msgstr ""
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: templates/folders/folders_confirm.html:9
+msgid "You are attempting to delete the following folder(s)."
 msgstr ""
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr ""
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr ""
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr ""
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:320
+msgid "You are not allowed to create folders."
+msgstr ""
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr ""
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Uspje¹no ste odjavljeni sa \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
 msgstr ""
 
-#: lib/Maillog.php:132
-#, php-format
+#: lib/Maillog.php:129
+#, fuzzy, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr ""
+msgstr "Usmjerili ste ovu poruku na %s - %%s."
 
 #: templates/mailbox/alert.inc:3
 #, fuzzy, php-format
@@ -4330,37 +4833,42 @@
 msgid "You have 1 new message."
 msgstr " - $nm nova poruka"
 
-#: templates/compose/attachments.js:116
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr " - $nm nova poruka"
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
 msgstr ""
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr ""
 
-#: lib/IMP.php:1008
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr ""
 
-#: compose.php:127
+#: compose.php:153
 #, fuzzy
 msgid "You must enter at least one recipient."
 msgstr "Morate navesti bar jednog primaoca."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 #, fuzzy
 msgid "You must select a target mailbox first."
 msgstr "Morate odabrati identitet koji ¾elite brisati."
@@ -4369,13 +4877,13 @@
 msgid "You must select an account to be deleted."
 msgstr "Morate odabrati korisnièki raèun koji ¾elite brisati."
 
-#: templates/contacts/contacts.inc:76
+#: templates/contacts/contacts.inc:81
 #, fuzzy
 msgid "You must select an address first."
 msgstr "Morate odabrati identitet koji ¾elite brisati."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 #, fuzzy
 msgid "You must select at least one message first."
 msgstr "Morate navesti bar jednog primaoca."
@@ -4391,65 +4899,70 @@
 msgstr "Morate navesti bar jednog primaoca."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr ""
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "Servisne operacije"
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "Usmjerili ste ovu poruku na %s - %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, fuzzy, php-format
 msgid "You replied to this message on %s."
 msgstr "Usmjeri ovu poruku"
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Niste prijavljeni na \"%s\". Ovo je poruka servera"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Niste odjavljeni sa \"%s\". Ovo je poruka servera"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Uspje¹no ste prijavljeni na \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Uspje¹no ste odjavljeni sa \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 #, fuzzy
 msgid "Your Name"
 msgstr ""
 "Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
+#, fuzzy
 msgid "Your PGP Public/Private Keys"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+#, fuzzy
 msgid "Your Private Key"
 msgstr ""
+"Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 #, fuzzy
 msgid "Your Public Key"
 msgstr ""
 "Va¹e ime i prezime: <i>(ovaj podatak vide drugi kada èitaju va¹e poruke)</i>"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Va¹a Reply-to: adresa: <i>(nije obavezno)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
 
@@ -4458,27 +4971,20 @@
 msgid "Your accounts:"
 msgstr "Va¹i identiteti:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
 "Va¹e alternativne adrese: <i>(nije obavezno, unesite svaku adresu u novom "
 "redu)</i>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:92
 #, fuzzy
 msgid "Your browser does not support inline display of this image type."
 msgstr "Va¹ browser nema moguænost da direktno prikazje slike ovog tipa"
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Va¹ browser ne podr¾ava opciju ¹tampanja. Pritisnite Control+P ili Option+P "
-"za ¹tampanje."
-
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "Uobièajeni kodni raspored za slanje poruka:"
 
@@ -4486,69 +4992,71 @@
 msgid "Your default encryption method for sending messages:"
 msgstr "Uobièajeni metod ¹ifrovanja poruka prilikom slanja:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 #, fuzzy
 msgid "Your message was successfully delivered."
 msgstr "Folder \"%s\" je uspje¹no obrisan."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Va¹ potpis:"
 
-#: message.php:279 compose.php:1195 mailbox.php:515 lib/Compose.php:731
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Bez teme]"
 
-#: templates/compose/compose.inc:216
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "_Crna lista"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_Cc"
 
-#: lib/IMP.php:904
-msgid "_Compose"
-msgstr "_Nova poruka"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "O_bri¹i"
 
-#: lib/IMP.php:906
+#: lib/IMP.php:979
 msgid "_Folders"
 msgstr "_Folderi"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: lib/IMP.php:897
+#: lib/IMP.php:961
 msgid "_Inbox"
 msgstr "_Sanduèe"
 
-#: lib/IMP.php:947
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "_Izlaz"
 
-#: message.php:375
+#: message.php:384
 msgid "_Message Source"
 msgstr "_Izvorni kod poruke"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Nove poruke"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "Od¹_tampaj"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+#, fuzzy
 msgid "_Priority"
-msgstr ""
+msgstr "Prioritet"
 
-#: mailbox.php:389
+#: mailbox.php:418
 #, fuzzy, php-format
 msgid "_Refresh %s"
 msgstr "A¾uriraj"
@@ -4557,19 +5065,19 @@
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: lib/IMP.php:908
+#: lib/IMP.php:981
 msgid "_Search"
 msgstr "_Tra¾i"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
 msgstr "_Po¹alji poruku"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_Tok teme"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_Za"
 
@@ -4577,65 +5085,130 @@
 msgid "_Undelete"
 msgstr "_Vrati obrisane"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_Vidi èitavu temu"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "_Bijela lista"
 
-#: lib/Compose.php:344
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
 #, fuzzy
 msgid "attachment"
 msgstr "Prilog"
 
-#: view.php:102
+#: view.php:99
 #, fuzzy
 msgid "attachments.zip"
 msgstr "Prilozi"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "bytes"
 msgstr ""
 
-#: templates/contacts/contacts.inc:182
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "od"
 
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
 #: smime.php:29 pgp.php:69
 msgid "key"
 msgstr ""
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
 msgstr "mailbox datoteka"
 
-#: compose.php:977 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "ime"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ni¹ta"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ili"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "pravopisna gre¹ka"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "pravopisne gre¹ke"
 
-#: lib/Filter.php:56
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "pravopisna gre¹ka"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
 #, fuzzy
 msgid "your blacklist"
 msgstr "Crna lista"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "va¹a bijela lista"


--- orig/lib/MIME/Viewer/appledouble.php
+++ mod/lib/MIME/Viewer/appledouble.php
@@ -3,9 +3,9 @@
  * The IMP_MIME_Viewer_appledouble class handles multipart/appledouble
  * messages conforming to RFC 1740.
  *
- * $Horde: imp/lib/MIME/Viewer/appledouble.php,v 1.13.10.4 2005/07/03 03:42:45 selsky Exp $
+ * $Horde: imp/lib/MIME/Viewer/appledouble.php,v 1.13.10.6 2006/01/01 21:28:58 jan Exp $
  *
- * Copyright 2003-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2003-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.


--- orig/po/ar_SY.po
+++ mod/po/ar_SY.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP v3.2.1\n"
-"Report-Msgid-Bugs-To: <i18n at lists.horde.org>\n"
-"POT-Creation-Date: 2003-04-30 12:00+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2003-04-30 12:00+0200\n"
 "Last-Translator: Platinum Development Team <devteam at platinum-sy.net>\n"
 "Language-Team: Arabic <i18n at lists.horde.org>\n"
@@ -15,641 +15,1463 @@
 "Content-Type: text/html; charset=CP1256\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: compose.php:647
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Åáì : "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "      Åáì : "
 
-#: compose.php:630
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "   ÇáÊÇÑíÎ: "
 
-#: compose.php:634
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "     ãä : "
 
-#: lib/api.php:94 folders.php:447
-msgid " - $nm new message"
-msgstr " - $nm ÑÓÇáÉ ÌÏíÏÉ"
-
-#: lib/api.php:94 folders.php:447
-msgid " - $nm new messages"
-msgstr " - $nm ÑÓÇÆá ÌÏíÏÉ"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
-#: compose.php:642
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "  ÇáãæÖæÚ : "
 
-#: templates/compose/spelling.inc:59
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " Ýí "
 
-#: templates/mailbox/message_headers.inc:9
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "ÑÞã"
 
-#: mailbox.php:522
-#, c-format
-msgid "%d of %d Messages"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d ãä %d ÑÓÇáÉ"
 
-#: mailbox.php:520
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d Åáì %d ãä %d ÑÓÇáÉ"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:50
-#, c-format
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s ãæÌæÏÉ ãÓÈÞÇ. ãÌáÏ %s áã íÊã ÊÛííÑå."
 
-#: folders.php:256
-#, c-format
+#: lib/Message.php:649
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s áÇ íÙåÑ Çäå ÚäæÇä ÈÑíÏí ÕÇáÍ."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:48
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Êã ÊÛííÑ ÃÓãÇÁ  %s ãÌáÏ ÚäÏ ÈÏÇíÉ ÇáÔåÑ."
 
-#: folders.php:258
-#, c-format
-msgid "%s is already empty."
-msgstr "%s ÝÇÑÛ ãÓÈÞÇ."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
 
-#: templates/message/navbar_aux_top.inc:14
-#, c-format
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Êã ÅÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ \"%s\" Åáì \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;de&nbsp;%d)"
 
-#: templates/compose/spelling.inc:126
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(ØÈÞ åÐå ÇáÊÛííÑÇÊ æÇäÊÞá Åáì ÇáÔÇÔÉ ÇáÊÇáíÉ.)"
 
-#: templates/compose/spelling.inc:113
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(Þã ÈÅáÛÇÁ ÌãíÚ ÇáÊÛííÑÇÊ æÚÏ Åáì ÔÇÔÉ ÇáÅÑÓÇá)"
 
-#: templates/compose/spelling.inc:119
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(ÚÏ Åáì ÔÇÔÉ ÇáÅÑÓÇá ÈÚÏ ÊØÈíÞ ÌãíÚ ÇáÊÛííÑÇÊ ÇáãÏÑÌÉ ÍÊì ÇáÂä. "
-"áä íÊã ÊØÈíÞ ÇáÊÛííÑÇÊ Úáì ÇáÔÇÔÉ ÇáÍÇáíÉ.)"
+"(ÚÏ Åáì ÔÇÔÉ ÇáÅÑÓÇá ÈÚÏ ÊØÈíÞ ÌãíÚ ÇáÊÛííÑÇÊ ÇáãÏÑÌÉ ÍÊì ÇáÂä. áä íÊã ÊØÈíÞ "
+"ÇáÊÛííÑÇÊ Úáì ÇáÔÇÔÉ ÇáÍÇáíÉ.)"
+
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(ÚÏ Åáì ÔÇÔÉ ÇáÅÑÓÇá ÈÚÏ ÊØÈíÞ ÌãíÚ ÇáÊÛííÑÇÊ ÇáãÏÑÌÉ ÍÊì ÇáÂä. áä íÊã ÊØÈíÞ "
+"ÇáÊÛííÑÇÊ Úáì ÇáÔÇÔÉ ÇáÍÇáíÉ.)"
 
-#: templates/contacts/contacts.inc:56
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* ÃÖÝ åÐå ÈÇáÖÛØ Úáì ÒÑ äÚã *"
 
-#: templates/contacts/contacts.inc:40
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* íÑÌì ÇÎÊíÇÑ ÇáÚäæÇä ( ÇáÚäÇæíä ) . *"
 
-#: lib/MIME/Viewer/text.php:109 lib/MIME/Viewer/enriched.php:183
-#, c-format
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "ÑãæÒ ÎÇÕÉ"
+
+#: lib/MIME/Viewer/images.php:162
+#, php-format
+msgid "A large image named %s is attached to this message."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
-"<p><i>This message was written in a character set other than your own. If it "
-"is not displayed correctly, %sclick here</a> to open it in a new "
-"window.</i></p>\n"
-msgstr ""
-"<p><i>ßÊÈÊ åÐå ÇáÑÓÇáÉ ÈÊÑãíÒ ãÎÊáÝ Úä áÛÊß ÇáÍÇáíÉ .ÅÐÇ áã . "
-"íÊã ÚÑÖåÇ ÈÔßá ÌíÏ ÇÖÛØ, %såäÇ</a> áßí íÊã ÝÊÍ ÇáÑÓÇáÉ "
-"Ýí ÕÝÍÉ ÌÏíÏÉ.</i></p>\n"
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
+#, fuzzy
+msgid "Account's name:"
+msgstr "ÃÓãÇÁ ÇáãÚÑÝÇÊ :"
 
-#: templates/filters/manage.inc:50
-msgid "Action"
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "ÅÌÑÇÁ"
 
-#: message.php:89
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "ÃÖÝ Åáì ÓÌá ÇáÚäÇæíä (%s)"
 
-#: compose.php:996
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "ÃÖÝ ÇáãÕÏÑ"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "ÃÖÝ ãÑÝÞÇÊ."
 
-#: templates/compose/compose.inc:301
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "ãÚáæãÇÊ ÔÎÕíÉ"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "ÓÌá ÇáÚäÇæíä"
 
-#: config/prefs.php.dist:116
-msgid "Addressbooks"
-msgstr "ÓÌáÇÊ ÇáÚäÇæíä"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "ÓÌá ÇáÚäÇæíä"
+
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
+
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:10
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "ÇáÌãíÚ"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "ÌãíÚ ÇáÑÓÇÆá Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÓæÝ ÊÝÞÏ !"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr ""
-"ÌãíÚ ÇáÑÓÇÆá ÇáãæÌæÏÉ Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÇáÊÇáíÉ ÓæÝ íÊã ÊÍãíáåÇ Ýí ÕäÏæÞ æÇÍÏ "
-"ÇáÕäÏæÞ :"
+"ÌãíÚ ÇáÑÓÇÆá ÇáãæÌæÏÉ Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÇáÊÇáíÉ ÓæÝ íÊã ÊÍãíáåÇ Ýí ÕäÏæÞ "
+"æÇÍÏ ÇáÕäÏæÞ :"
 
-#: lib/Maintenance/Task/purge_trash.php:96
-#, c-format
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
-msgstr ""
-"ßá ÇáÑÓÇÆá Ýí ãÌáÏ \"%s\" ÇáÃÞÏã ãä %s íæã ÓæÝ íÊã ÈÔßá ÏÇÆã"
-"ÅáÛÇÄåÇ."
+msgstr "ßá ÇáÑÓÇÆá Ýí ãÌáÏ \"%s\" ÇáÃÞÏã ãä %s íæã ÓæÝ íÊã ÈÔßá ÏÇÆãÅáÛÇÄåÇ."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
-#, c-format
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "ßá ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÃÞÏã ãä  %s ÔåÑÇ ÓæÝ ÊáÛì "
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
+msgstr "ßá ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÃÞÏã ãä  %s ÔåÑÇ ÓæÝ ÊáÛì "
+
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Êã ÅÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ \"%s\" Åáì \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
 msgstr ""
-"ßá ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÃÞÏã ãä  %s ÔåÑÇ ÓæÝ ÊáÛì "
 
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
+
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "ÃÖÝ ãÑÝÞÇÊ."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
 
-#: prefs.php:96
-msgid "An illegal value was specified."
-msgstr "Êã ÊÍÏíÏ ÞíãÉ ÛíÑ ãÞÈæáÉ."
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "ÎØÃ ÛíÑ ãÚÑæÝ ÃËäÇÁ ÅÖÇÝÉ ÇáÅÏÎÇáÇÊ ÇáÌÏíÏÉ."
 
-#: message.php:449
-msgid "An unknown error occurred adding the new entry."
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
 msgstr "ÎØÃ ÛíÑ ãÚÑæÝ ÃËäÇÁ ÅÖÇÝÉ ÇáÅÏÎÇáÇÊ ÇáÌÏíÏÉ."
 
-#: templates/mailbox/navbar.inc:17 templates/mailbox/navbar.inc:34
-#: templates/mailbox/legend.inc:12 config/conf.php.dist:132
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Êã ÇáÑÏ ÚáíåÇ"
 
-#: templates/search/main.inc:153
+#: templates/search/main.inc:31
 msgid "Answered messages"
 msgstr "ÇáÑÓÇÆá ÇáÊí Êã ÇáÑÏ ÚáíåÇ"
 
-#: templates/filters/list.inc:12
-msgid "Apply All Rules"
-msgstr "Þã ÈÊØÈíÞ ÌãíÚ ÇáÞæÇÚÏ"
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ Úáì"
 
-#: templates/mailbox/header.inc:21
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ Úáì"
 
-#: config/prefs.php.dist:320
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr " Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ ÃËäÇÁ ÇáÏÎæá ¿"
 
-#: config/prefs.php.dist:330
-msgid "Apply filter rules when mailbox is refreshed?"
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ ÃËäÇÁ ÊÍÏíË ÇáÕäÏæÞ ÇáÈÑíÏí"
 
-#: search.php:58
-msgid "April"
-msgstr "ÃÈÑíá"
-
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy
+msgid "Are you sure you want to delete this public key?"
 msgstr "ÊÃßíÏ ÇáÇÓÊãÑÇÑ ¿"
 
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "ÊÃßíÏ ÇáÇÓÊãÑÇÑ¿"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
 
-#: templates/compose/javascript.inc:46
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "ÊÃßíÏ ÇáÇÓÊãÑÇÑ ¿"
 
-#: message.php:605
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅáÛÇÁ åÐå ÇáÑÓÇÆá ÈÔßá äåÇÆí ¿"
 
-#: templates/mailbox/actions.inc:32
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅáÛÇÁ åÐå ÇáÑÓÇÆá ÈÔßá äåÇÆí ¿"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅÝÑÇÛ åÐÇ ÇáãÌáÏ ¿"
 
-#: templates/menu/menu.inc:18
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅÝÑÇÛ ãÌáÏ ÓáÉ ÇáãåãáÇÊ ¿"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅÝÑÇÛ ãÌáÏ ÓáÉ ÇáãåãáÇÊ ¿"
 
-#: config/prefs.php.dist:507
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅáÛÇÁ åÐå ÇáÑÓÇÆá ÈÔßá äåÇÆí ¿"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅÝÑÇÛ åÐÇ ÇáãÌáÏ ¿"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr " ÊÃßíÏ ÇáÇÓÊãÑÇÑ æÅÝÑÇÛ åÐÇ ÇáãÌáÏ ¿"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "æÞÊ ÇáæÕæá"
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "ÊÕÇÚÏí"
 
-#: templates/compose/compose.inc:407
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
+
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "ÅÑÝÇÞ"
 
-#: templates/compose/compose.inc:405
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "ãÑÝÞÇÊ"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:109
+#, fuzzy
+msgid "Attached File:"
+msgstr "ÅÑÝÇÞ"
+
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "ãÑÝÞ"
 
-#: templates/compose/compose.inc:310 templates/compose/compose.inc:400
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "ãÑÝÞÇÊ"
 
-#: search.php:62
-msgid "August"
-msgstr "ÃÛÓØÓ"
-
-#: templates/message/navbar.inc:49
-msgid "Automatic charset"
-msgstr "ÊÑãíÒ ÊáÞÇÆí"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "ãÑÝÞÇÊ"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "ÅÌÑÇÁ"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
+
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:264
-msgid "Available Addressbooks:"
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "ÓÌáÇÊ ÇáÒæÇÑ ÇáãÊæÝÑÉ :"
 
-#: templates/message/navbar.inc:29
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "ÇáÚæÏÉ Åáì %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "ÇáÚæÏÉ Åáì %s"
 
-#: templates/compose/compose.inc:218 templates/message/headers.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "ãÑÝÞ ãÎÝí"
 
-#: templates/mailbox/actions.inc:16 templates/message/navbar.inc:14
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
 
-#: templates/search/main.inc:62 templates/filters/manage.inc:17
-#: filters.php:143
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "ÇáäÕ"
 
-#: templates/search/main.inc:147 templates/search/main.inc:161
-#: templates/search/main.inc:175 templates/search/main.inc:189
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "ÇáÇËäÇä"
 
-#: templates/compose/spelling.inc:106 templates/filters/manage.inc:77
-#: templates/contacts/contacts.inc:92
-#: templates/identities/manage.inc:113
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr ""
+
+#: templates/compose/compose.inc:272
+#, fuzzy
+msgid "C_harset"
+msgstr "ÊÑãíÒ MAC"
+
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:201
+msgid "Can not connect to the remote mail server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:199
+msgid "Can not connect to the remote mail server: "
+msgstr ""
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
+
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "ÅáÛÇÁ"
 
-#: templates/compose/compose.inc:43 templates/compose/compose.inc:379
-#: templates/compose/bounce.inc:38
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "ÅáÛÇÁ ÇáÑÓÇáÉ"
 
-#: templates/compose/javascript.inc:46
-msgid "Canceling this message will permanently discard its contents."
-msgstr ""
-"ÅáÛÇÁ åÐå ÇáÑÓÇáÉ ÓæÝ íÄÏí ÊáÞÇÆíÇ Åáì ÊÏãíÑ ãÍÊæíÇÊåÇ."
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
+#, fuzzy
+msgid "Cancelling this message will permanently discard its contents."
+msgstr "ÅáÛÇÁ åÐå ÇáÑÓÇáÉ ÓæÝ íÄÏí ÊáÞÇÆíÇ Åáì ÊÏãíÑ ãÍÊæíÇÊåÇ."
 
-#: templates/search/main.inc:46 templates/compose/compose.inc:162
-#: templates/message/headers.inc:16
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "äÓÎÉ"
 
-#: templates/filters/manage.inc:14 filters.php:140
-msgid "Cc:"
-msgstr "äÓÎÉ :"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "ÔÎÕí"
 
-#: templates/compose/spelling.inc:68
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "ÊÛííÑ"
 
-#: templates/compose/spelling.inc:69
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "ÊÛííÑ ÇáÌãíÚ"
 
-#: config/prefs.php.dist:86
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "ÅäÔÇÁ ãÌáÏ"
+
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
-"ÊÛííÑ ÎíÇÑÇÊ ÇáÚÑÖ ãËá ÚÏÏ ÇáÑÓÇÆá ÇáãÚÑæÖÉ Ýí ßá ÕÝÍÉ æ  "
-"ßíÝíÉ ÝåÑÓÉ ÇáÑÓÇÆá."
+"ÊÛííÑ ÎíÇÑÇÊ ÇáÚÑÖ ãËá ÚÏÏ ÇáÑÓÇÆá ÇáãÚÑæÖÉ Ýí ßá ÕÝÍÉ æ  ßíÝíÉ ÝåÑÓÉ "
+"ÇáÑÓÇÆá."
 
-#: config/prefs.php.dist:32
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "ÊÛííÑ ÖæÇÈØ ãÒæÏ ÇáÈÑíÏ"
 
-#: config/prefs.php.dist:25
+#: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
+msgstr "ÊÛííÑ ÇáÇÓã¡ ÇáÚäæÇä ¡ æ ÇáÊæÞíÚ íÑÏæä Úáì ÑÓÇÆáß."
+
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
 msgstr ""
-"ÊÛííÑ ÇáÇÓã¡ ÇáÚäæÇä ¡ æ ÇáÊæÞíÚ"
-" íÑÏæä Úáì ÑÓÇÆáß."
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ÇáÈÍË Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) Úä ÑÓÇÆá ÌÏíÏÉ."
 
-#: templates/mailbox/message_headers.inc:6
-msgid "Checkbox"
-msgstr "ÎÇäÉ ÇÎÊíÇÑ"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
+
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "åäÇáß ÎØÃ Ýí ÅÑÓÇá ÑÓÇáÊß : %s"
 
 #: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "ÇÎÊÑ ÅÌÑÇÁ :"
 
-#: config/servers.php.dist:85
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "ÇÎÊÑ ãÒæÏ ÇáÈÑíÏ :"
 
-#: templates/prefs/sourceselect.inc:304
-msgid "Choose the address book to use when adding addresses."
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
 msgstr ""
-"ÇÎÊÑ ÓÌá ÇáÚäÇæíä ."
 
-#: templates/prefs/sourceselect.inc:258
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "ÇÎÊÑ ÅÌÑÇÁ :"
+
+#: templates/prefs/sourceselect.inc:349
+msgid "Choose the address book to use when adding addresses."
+msgstr "ÇÎÊÑ ÓÌá ÇáÚäÇæíä ."
+
+#: templates/prefs/sourceselect.inc:293
 msgid "Choose the order of address books to search when expanding addresses."
+msgstr "ÇÎÊÑ ÇáÊÑÊíÈ ÇáÐí ÊÑíÏ Ãä íÊã ÇáÈÍË Èå ÚäÏ ÝÊÍ ÓÌáÇÊ ÇáÚäÇæíä. "
+
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
-"ÇÎÊÑ ÇáÊÑÊíÈ ÇáÐí ÊÑíÏ Ãä íÊã ÇáÈÍË Èå ÚäÏ ÝÊÍ ÓÌáÇÊ ÇáÚäÇæíä. "
-""
 
-#: mailbox.php:335 folders.php:265
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:287
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "ÃÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
+msgstr "ÇäÞÑ Úáì æÇÍÏÇ ãä ÓÌáÇÊ ÒæÇÑß ÇáãÎÊÇÑÉ Ëã ÇÎÊÑ ÌãíÚ ÇáÍÞæá  ááÈÍË."
+
+#: lib/MIME/Viewer/pgp.php:171
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:202
+#, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr ""
+
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
+
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
+
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "ÅÑÓÇá"
+
+#: compose.php:828 compose.php:1148
+msgid "Close this window"
 msgstr ""
-"ÇäÞÑ Úáì æÇÍÏÇ ãä ÓÌáÇÊ ÒæÇÑß ÇáãÎÊÇÑÉ Ëã ÇÎÊÑ ÌãíÚ ÇáÍÞæá  "
-"ááÈÍË."
 
-#: folders.php:367
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "ãÌáÏ ãÛáÞ"
 
-#: templates/folders/actions.inc:29
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Øí ÇáÌãíÚ"
+
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Øí ÇáÌãíÚ"
 
-#: templates/folders/actions.inc:28
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Øí ÌãíÚ ÇáãÌáÏÇÊ"
 
-#: folders.php:375 folders.php:376
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Øí ãÌáÏ"
 
-#: lib/api.php:43 templates/menu/menu.inc:20
-msgid "Compose"
-msgstr "ÅÑÓÇá"
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
+msgid "Comment"
+msgstr ""
 
-#: mailbox.php:812 message.php:81
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "ÅÑÓÇá ÑÓÇáÉ (%s)"
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "ÅÑÓÇá"
 
-#: compose.php:427 compose.php:441 compose.php:456 compose.php:506
-msgid "Compose a message"
+#: compose.php:827 compose.php:1147
+#, fuzzy
+msgid "Compose another message"
 msgstr "ÅÑÓÇá ÑÓÇáÉ"
 
-#: config/prefs.php.dist:639
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "ÃÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
 
-#: templates/contacts/contacts.inc:8 contacts.php:81
-msgid "Contact List"
-msgstr "ÞÇÆãÉ ÇáÇÊÕÇá"
-
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:443
 msgid ""
-"Control when new mail will be checked for, and whether or not to notify you "
-"when it arrives."
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
 msgstr ""
-"ÇáÊÍßã Ýí æÞÊ ÇáÈÍË Úä ÑÓÇÆá ÌÏíÏÉ ¡ æåá íÊã ÊäÈíåß Ãã áÇ  "
-"ÚäÏ æÕá ÑÓÇÆá ÌÏíÏÉ."
 
-#: templates/mailbox/navbar.inc:62 templates/message/navbar_aux_top.inc:20
-#: templates/message/navbar_aux_bottom.inc:6
-msgid "Copy"
-msgstr "äÓÎ"
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
 
-#: templates/compose/spelling.inc:52
-msgid "Correct"
-msgstr "ÕÍíÍ"
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "ÊÛííÑ ÖæÇÈØ ãÒæÏ ÇáÈÑíÏ"
 
-#: templates/compose/spelling.inc:131
-msgid "Corrected Text"
-msgstr "ÇáäÕ ÇáãÕÍÍ"
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
 
-#: folders.php:252 folders.php:260 folders.php:262
-#, c-format
-msgid "Could not delete messages from %s: %s"
-msgstr "ÊÚÐÑ ÅáÛÇÁ ÇáÑÓÇÆá ãä %s : %s"
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
 
-#: templates/filters/manage.inc:75 templates/filters/javascript.inc:75
-#: templates/identities/manage.inc:105
-#: templates/identities/manage.inc:112
-#: templates/identities/javascript.inc:32
-msgid "Create"
-msgstr "ÅäÔÇÁ"
+#: config/prefs.php.dist:143
+#, php-format
+msgid "Control PGP support for %s."
+msgstr ""
 
-#: templates/folders/actions.inc:5
+#: config/prefs.php.dist:152
+#, php-format
+msgid "Control S/MIME support for %s."
+msgstr ""
+
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
+msgid ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+msgstr ""
+"ÇáÊÍßã Ýí æÞÊ ÇáÈÍË Úä ÑÓÇÆá ÌÏíÏÉ ¡ æåá íÊã ÊäÈíåß Ãã áÇ  ÚäÏ æÕá ÑÓÇÆá "
+"ÌÏíÏÉ."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+msgid "Copy"
+msgstr "äÓÎ"
+
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
+
+#: templates/compose/spelling.inc:63
+msgid "Correct"
+msgstr "ÕÍíÍ"
+
+#: templates/compose/spelling.inc:140
+msgid "Corrected Text"
+msgstr "ÇáäÕ ÇáãÕÍÍ"
+
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "ÊÚÐÑ ÅáÛÇÁ ÇáÑÓÇÆá ãä %s : %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
+msgstr "ÊÚÐÑ ÅáÛÇÁ ÇáÑÓÇÆá ãä %s : %s"
+
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "ÚãáíÇÊ ÇáÕíÇäÉ"
+
+#: lib/MIME/Viewer/tnef.php:54
+msgid "Could not extract the requested file from the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:58
+msgid "Could not extract the requested file from the Zip archive."
+msgstr ""
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "ÅäÔÇÁ"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "ÅäÔÇÁ ãÌáÏ"
 
-#: templates/prefs/folderselect.inc:24
+#: templates/pgp/pgp.inc:137
+#, fuzzy
+msgid "Create Keys"
+msgstr "ÅäÔÇÁ"
+
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "ÅäÔÇÁ ãÌáÏ"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "ÅäÔÇÁ ãÌáÏ ãåãáÇÊ ÌÏíÏ"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "ÅäÔÇÁ ãÌáÏ ãÓæÏÇÊ ÌÏíÏ"
 
-#: templates/identities/manage.inc:95
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "ÅäÔÇÁ ãÌáÏ ÑÓÇÆá ãÑÓáÉ ÌÏíÏ"
 
-#: templates/prefs/trashselect.inc:24
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "ÅäÔÇÁ ãÌáÏ ãåãáÇÊ ÌÏíÏ"
 
-#: config/prefs.php.dist:53
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"ÅäÔÇÁ ÞæÇÚÏ ÇäÊÞÇÁ áÊÑÊíÈ ÇáÈÑíÏ ÇáæÇÑÏ ¡ ÊÕäíÝåÇ Ýí ÇáãÌáÏÇÊ  "
-"æÅáÛÇÁ ÇáÈÑíÏ ÇáÛíÑ ãÑÛæÈ."
+"ÅäÔÇÁ ÞæÇÚÏ ÇäÊÞÇÁ áÊÑÊíÈ ÇáÈÑíÏ ÇáæÇÑÏ ¡ ÊÕäíÝåÇ Ýí ÇáãÌáÏÇÊ  æÅáÛÇÁ ÇáÈÑíÏ "
+"ÇáÛíÑ ãÑÛæÈ."
 
-#: config/prefs.php.dist:95
-msgid "Customize how you send mail and where drafts are saved."
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "ÅäÔÇÁ ãÌáÏ ÑÓÇÆá ãÑÓáÉ ÌÏíÏ"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
 msgstr ""
-"ÖÈØ ßíÝíÉ ÅÑÓÇáß ÇáÑÓÇÆá æÃíä íÊã ÍÝÙ ÇáãÓæÏÇÊ . "
-""
 
-#: config/prefs.php.dist:75
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
+#: config/prefs.php.dist:105
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr ""
-"ÖÈØ ÚãáíÇÊ ÇáÕíÇäÉ ÇáÊí ÊÚãá ÚäÏ ÇáÏÎæá Åáì %s."
 
-#: config/prefs.php.dist:103
-#, c-format
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
+msgstr "ÖÈØ ßíÝíÉ ÅÑÓÇáß ÇáÑÓÇÆá æÃíä íÊã ÍÝÙ ÇáãÓæÏÇÊ . "
+
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "ÖÈØ ãåÇã áßí ÊÚãá ÚäÏ ÇáÏÎæá %s."
 
-#: templates/message/navbar.inc:52
-msgid "DOS charset"
-msgstr "ÊÑãíÒ ÇáÏæÓ"
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "ÇáÊÇÑíÎ"
 
-#: templates/mailbox/message_headers.inc:13 templates/message/headers.inc:4
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "ÇáÊÇÑíÎ"
 
-#: search.php:66
-msgid "December"
-msgstr "ÏíÓãÈÑ"
-
-#: templates/prefs/identityselect.inc:5
-msgid "Default Identity"
-msgstr "ÇáåæíÉ ÇáÇÝÊÑÇÖíÉ"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "ãáÛí"
 
-#: config/prefs.php.dist:513
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "ÅáÛÇÁ"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "ÕíÛÉ ÇáÝåÑÓÉ ÇáÇÝÊÑÇÖíÉ :"
 
-#: config/prefs.php.dist:524
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "ÇÊÌÇå ÇáÝåÑÓÉ ÇáÇÝÊÑÇÖí :"
 
-#: templates/mailbox/actions.inc:9 templates/message/navbar.inc:7
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "ãáÛí"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "ÅáÛÇÁ"
 
-#: templates/folders/actions.inc:7
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Delete %s Public Key"
+msgstr ""
+
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid "Delete Current Keys"
+msgstr ""
+
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "ÅáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
 
-#: templates/filters/list.inc:38
-msgid "Delete messages"
-msgstr "ÅáÛÇÁ ÑÓÇÆá"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "ÅáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "ÅáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "ÅáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: templates/fetchmail/manage.inc:43
+msgid "Delete fetched messages from remote server?"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
+
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
+msgstr "ÍÐÝ ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíã Ýí ÈÏÇíÉ ÇáÔåÑ ¿"
 
-#: config/prefs.php.dist:448
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "ÍÐÝ ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíã Ýí ÈÏÇíÉ ÇáÔåÑ ¿"
 
-#: templates/mailbox/navbar.inc:19 templates/mailbox/navbar.inc:37
-#: templates/mailbox/legend.inc:16 config/conf.php.dist:128
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "ÅáÛÇÁ ÑÓÇÆá"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "ãáÛí"
 
-#: compose.php:1027
-msgid "Deleted an attachment."
-msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
-
-#: templates/search/main.inc:181
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "ÑÓÇÆá ãÍÐæÝÉ"
 
-#: config/prefs.php.dist:67
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
+
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "ÅáÛÇÁ æÊÛííÑ ãæÞÚ ÑÓÇÆá"
 
-#: config/prefs.php.dist:523
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "ÊäÇÒáí"
 
-#: config/prefs.php.dist:598
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "Details"
+msgstr ""
+
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "ÊÚÊíã ÇáÊæÞíÚ ¿"
 
-#: templates/contacts/contacts.inc:65
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "ÚÜÑÖ"
 
-#: config/prefs.php.dist:85
-msgid "Display Options"
-msgstr "ÚÑÖ ÇáÎíÇÑÇÊ"
+#: config/prefs.php.dist:479
+#, fuzzy
+msgid "Display confirmation after sending a message?"
+msgstr ""
+"ÚÑÖ ÑÓÇáÉ ÊÃßíÏ ÈÚÏ ÅÑÓÇá ÑÓÇáÉ ¿ ( ÝÞØ ÚäÏ ÚÏã ÇÓÊÎÏÇã äÇÝÐÉ ãäÈËÞÉ áÅÑÓÇá "
+"ÇáÑÓÇáÉ )"
 
-#: config/prefs.php.dist:648
-msgid ""
-"Display confirmation after sending a message? (only when not using a pop-up "
-"compose window)"
-msgstr "ÚÑÖ ÑÓÇáÉ ÊÃßíÏ ÈÚÏ ÅÑÓÇá ÑÓÇáÉ ¿ ( ÝÞØ ÚäÏ ÚÏã ÇÓÊÎÏÇã äÇÝÐÉ ãäÈËÞÉ "
-"áÅÑÓÇá ÇáÑÓÇáÉ )"
-
-#: config/prefs.php.dist:340
-msgid "Display message when filters have been applied?"
-msgstr "ÚÑÖ ÑÓÇáÉ ÚäÏ ÊØÈíÞ ÇáÇäÊÞÇÁ¿"
+#: config/prefs.php.dist:686
+msgid "Display in Body of Message"
+msgstr ""
 
-#: config/prefs.php.dist:733
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
+msgstr "ÚÑÖ ÑÓÇáÉ ãäÈËÞÉ ááÅÚáÇã Úä æÕæá ÑÓÇáÉ ÌÏíÏÉ ¿"
+
+#: config/prefs.php.dist:758
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr ""
+
+#: config/prefs.php.dist:750
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr ""
+
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "ÚÑÖ ÇáÎíÇÑÇÊ"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
 msgstr ""
-"ÚÑÖ ÑÓÇáÉ ãäÈËÞÉ ááÅÚáÇã Úä æÕæá ÑÓÇáÉ ÌÏíÏÉ ¿"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "áÇ ÊÞã ÈÇáÈÍË Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) Úä ÇáÑÓÇÆá ÇáÌÏíÏÉ"
 
-#: templates/folders/confirm.inc:3
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "åá ÊÑíÏ ÝÊÍ Ðáß ÇáãÌáÏ ¿"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Êã"
 
-#: lib/IMP.php:1057
-msgid "Download"
-msgstr "ÊÍãíá"
-
-#: lib/IMP.php:1056
-#, c-format
-msgid "Download %s"
-msgstr "Êã ÇáÊÍãíá %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
 
-#: templates/folders/actions.inc:16
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
+
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "ÊÍãíá ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
 
-#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:40
-#: config/conf.php.dist:136
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "ÊÍãíá ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
+
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "ãÓæÏÉ"
 
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
+msgstr "ãÌáÏ ÇáãÓæÏÇÊ :"
+
 #: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
 msgstr "ãÌáÏ ÇáãÓæÏÇÊ :"
 
-#: templates/identities/manage.inc:27
+#: templates/pgp/pgp.inc:108
+#, fuzzy
+msgid "E-mail Address"
+msgstr "ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí"
+
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "ÊÍÑíÑ"
 
-#: config/prefs.php.dist:310
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "ãÑÔÍÇÊ ÇáÈÑíÏ"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "ÊÍÑíÑ ÞæÇÚÏ ÇáÅäÊÞÇÁ"
+
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "ÊÍÑíÑ ÞæÇÚÏ ÇáÅäÊÞÇÁ"
 
-#: config/prefs.php.dist:172
-msgid "Edit your identities"
-msgstr "ÊÍÑíÑ ÇáãÚÑÝÇÊ"
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "ÊÍÑíÑ ÞæÇÚÏ ÇáÅäÊÞÇÁ"
 
-#: templates/contacts/contacts.inc:68
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí"
 
-#: templates/folders/actions.inc:17
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "ãÌáÏ ( ãÌáÏÇÊ) ÝÇÑÛÉ"
 
-#: templates/menu/menu.inc:18
-msgid "Empty Trash"
-msgstr "ÓáÉ ÝÇÑÛÉ"
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "ãÌáÏ ( ãÌáÏÇÊ) ÝÇÑÛÉ"
 
-#: templates/mailbox/actions.inc:32
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
 
-#: compose.php:657
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "ÓáÉ ÝÇÑÛÉ"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
+msgstr "ÓáÉ ÝÇÑÛÉ"
+
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
+msgid "Enable PGP functionality?"
+msgstr ""
+
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+msgid "Enable S/MIME functionality?"
+msgstr ""
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
+
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "ÅäåÇÁ ÇáÑÓÇÆá ÇáãÍæáÉ"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "ÇáÑÓÇÆá ÇáÞÏíãÉ"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "ÑÓÇáÉ ãÍæáÉ ãä %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Enter Passphrase"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "ÇÏÎá ÇÓã ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÇáÌÏíÏ"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "ÇÏÎá ÇÓã ãÌáÏ ÇáãÓæÏÇÊ ÇáÌÏíÏ"
 
-#: templates/identities/javascript.inc:128
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "ÇÏÎá ÇÓã ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÌÏíÏ"
 
@@ -657,796 +1479,2082 @@
 msgid "Enter the name for your new trash folder"
 msgstr "ÇÏÎá ÇÓã ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÇáÌÏíÏ"
 
-#: message.php:451
-#, c-format
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "ÅÚÇÏÉ ÊæÌíå ÑÓÇáÉ"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Êã ÅÏÎÇá ÇáÓÌá \"%s\" ÈäÌÇÍ Ýí ÓÌá ÇáÚäÇæíä"
 
-#: status.php:35
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "ÎØÃ"
 
-#: config/prefs.php.dist:722
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "ßá 15 ÏÞíÞÉ"
 
-#: config/prefs.php.dist:719
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "ßá 30 ËÇäíÉ"
 
-#: config/prefs.php.dist:721
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "ßá 5 ÏÞÇÆÞ"
 
-#: config/prefs.php.dist:723
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "ßá äÕÝ ÓÇÚÉ"
 
-#: config/prefs.php.dist:720
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "ßá ÏÞíÞÉ"
 
-#: templates/folders/actions.inc:27
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "ÈÓØ Çáßá"
+
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "ÈÓØ Çáßá"
 
-#: templates/folders/actions.inc:26
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "ÈÓØ ÌãíÚ ÇáãÌáÏÇÊ"
 
-#: folders.php:379 folders.php:380
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "ÈÓØ ãÌáÏ"
 
-#: templates/compose/compose.inc:302
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "ÈÓØ ÇáÃÓãÇÁ"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "ÈÓØ ÔÌÑÉ ÇáãÌáÏÇÊ ÇáÍÇáíÉ ÈÔßá ÇÝÊÑÇÖí ÃËäÇÁ ÚÑÖ ÇáãÌáÏÇÊ ¿"
 
-#: search.php:56
-msgid "February"
-msgstr "ÝÈÑÇíÑ"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "ÈÓØ Çáßá"
 
-#: templates/filters/manage.inc:7
-msgid "Field"
-msgstr "ÍÞá"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "ÈÑíÏ ÌÏíÏ"
 
-#: templates/compose/compose.inc:433
-msgid "Filename"
-msgstr "ÇÓã ÇáãáÝ"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+#, fuzzy
+msgid "Fetch Mail"
+msgstr "ÈÑíÏ ÌÏíÏ"
 
-#: lib/IMP.php:1192
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "ÝÇÚáíÉ ÇáÊÑÔíÍ : Êã ÅáÛÇÁ ÇáÑÓÇáÉ \"%s\" ãä \"%s\" ."
+#: config/prefs.php.dist:869
+#, fuzzy
+msgid "Fetch Mail in a separate window?"
+msgstr "ÃÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
 
-#: lib/IMP.php:1203
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder "
-"\"%s\"."
-msgstr ""
-"ÝÇÚáíÉ ÇáÊÑÔíÍ : Êã ÊÍæíá ÇáÑÓÇáÉ \"%s\" ãä \"%s\" Åáì ÇáãÌáÏ "
-"\"%s\"."
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr " Þã ÈÊØÈíÞ ÇáãÑÔÍÇÊ ÃËäÇÁ ÇáÏÎæá ¿"
 
-#: lib/IMP.php:1190
-#, c-format
-msgid ""
-"Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash "
-"folder."
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "ÑÓÇáÉ ãÍæáÉ ãä %s"
+
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+msgid "Fetchmail: "
 msgstr ""
-"ÝÇÚáíÉ ÇáÊÑÔíÍ : Êã ÊÍæíá ÇáÑÓÇáÉ \"%s\" ãä \"%s\" Åáì ãÌáÏ  "
-"ÓáÉ ÇáãåãáÇÊ."
 
-#: templates/filters/list.inc:10
-msgid "Filter Rules"
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "ÊæÌÏ áÏíß %s ÑÓÇáÉ ÌÏíÏÉ."
+
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "ÇáãÑÔÍÇÊ"
+
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "ÇáãÑÔÍÇÊ"
+
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "ÎíÇÑÇÊ ÃÎÑì"
+
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "ÞæÇÚÏ ÇáãÑÔÍ"
 
-#: config/prefs.php.dist:363
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
 msgstr "ÊÑÔíÍ ÇáãÍÊæíÇÊ ÇáÑÓÇÆá ÛíÑ ÇáÃÎáÇÞíÉ ¿"
 
-#: config/prefs.php.dist:52
+#: templates/filters/notactive.inc:11
+msgid "Filter support is disabled on this system."
+msgstr ""
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "ÇáãÑÔÍÇÊ"
 
-#: templates/contacts/contacts.inc:18
+#: templates/filters/notactive.inc:3
+msgid "Filters NOT Active"
+msgstr ""
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "ÌÏ"
 
-#: mailbox.php:458 mailbox.php:459 mailbox.php:465 mailbox.php:466
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "ÇáÕÝÍÉ ÇáÃæáì"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "ÇáÕÝÍÉ ÇáÃæáì"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "ÊÍæíá"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
-#: templates/prefs/initialpageselect.inc:10 templates/folders/head.inc:5
-#: folders.php:283
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "ãÓÊßÔÝ ÇáãÌáÏ"
 
-#: templates/login/login.inc:130
-msgid "Folder Prefix"
-msgstr "ÈÇÏÆÉ ÇáãÌáÏ"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "ÝÈÑÇíÑ"
 
-#: templates/menu/menu.inc:22
-msgid "Folders"
-msgstr "ãÌáÏÇÊ"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
-#: templates/message/navbar.inc:11 compose.php:664
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "ÊÍæíá"
 
-#: compose.php:661
+#: compose.php:765
 msgid "Forward:"
 msgstr "ÊÍæíá :"
 
-#: compose.php:626
-#, c-format
+#: lib/Compose.php:369
+#, fuzzy
+msgid "Forwarded message"
+msgstr "ÅäåÇÁ ÇáÑÓÇÆá ÇáãÍæáÉ"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "ÑÓÇáÉ ãÍæáÉ ãä %s"
 
-#: templates/search/main.inc:30 templates/compose/compose.inc:83
-#: templates/mailbox/message_headers.inc:17 templates/message/headers.inc:8
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "ãÚáæãÇÊ ÇáãÎÏã"
+
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "ãä"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "ãä"
 
-#: config/prefs.php.dist:509
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "ãä ÇáÚäæÇä"
 
-#: templates/filters/manage.inc:15 filters.php:141
-msgid "From:"
-msgstr "ãä :"
-
-#: compose.php:660 compose.php:663
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "ãÍæá:"
 
-#: templates/menu/menu.inc:41
-msgid "Help"
-msgstr "ãÓÇÚÏÉ"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "ãÍæá:"
 
-#: mailbox.php:516
-msgid "Hide Deleted"
-msgstr "ÅÎÝÇÁ ÇáãáÛí"
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "ÅäåÇÁ ÇáÑÓÇÆá ÇáãÍæáÉ"
 
-#: folders.php:274
-msgid "Hide Unsubscribed"
-msgstr "ÅÎÝÇÁ ÇáÛíÑ ãÔÊÑß"
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
 
-#: config/prefs.php.dist:630
-msgid "How to prefix quoted lines in a reply:"
-msgstr " ÊÍÏíÏ ÈÇÏÆÉ ÇáÃÓØÑ ÇáãÞÊÈÓÉ Ýí ÇáÑÏ :"
+#: templates/fetchmail/manage.inc:37
+msgid "Get only new messages? (IMAP only)"
+msgstr ""
 
-#: templates/index/notconfigured.inc:4
-msgid "IMP is not properly configured"
-msgstr "áã íÊã ÖÈØ ÇáÜ IMP ÈÔßá ÕÍíÍ"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
 
-#: templates/menu/menu.inc:16 folders.php:354
-msgid "INBOX"
-msgstr "ÇáæÇÑÏ"
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "ÇáÑÓÇáÉ ÇáÊÇáíÉ"
 
-#: templates/message/navbar.inc:53
-msgid "ISO charset"
-msgstr "ÊÑãíÒ ISO"
-
-#: templates/identities/manage.inc:5 identities.php:140
-msgid "Identities"
-msgstr "ÇáãÚÑÝÇÊ"
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "ÃÖÝ Åáì ÓÌá ÇáÚäÇæíä (%s)"
 
-#: templates/compose/compose.inc:68
-msgid "Identity"
-msgstr "åæíÉ"
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
 
-#: templates/identities/manage.inc:47
-msgid "Identity's name:"
-msgstr "ÃÓãÇÁ ÇáãÚÑÝÇÊ :"
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
 
-#: templates/compose/spelling.inc:70
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
+
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
+
+#: templates/message/headers.inc:58
+msgid "Headers"
+msgstr ""
+
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "ÚÑÖ ÊÓáÓáí"
+
+#: mailbox.php:367
+msgid "Hide Deleted"
+msgstr "ÅÎÝÇÁ ÇáãáÛí"
+
+#: folders.php:298
+msgid "Hide Unsubscribed"
+msgstr "ÅÎÝÇÁ ÇáÛíÑ ãÔÊÑß"
+
+#: templates/compose/compose.inc:294
+msgid "High"
+msgstr ""
+
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr ""
+
+#: templates/compose/compose.inc:293
+msgid "Highest"
+msgstr ""
+
+#: config/prefs.php.dist:688
+msgid "How do you want to display attachments?"
+msgstr ""
+
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
+msgstr " ÊÍÏíÏ ÈÇÏÆÉ ÇáÃÓØÑ ÇáãÞÊÈÓÉ Ýí ÇáÑÏ :"
+
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
+msgid "IMAP over SSL"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:152
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr ""
+
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr ""
+
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
+
+#: lib/IMP.php:866
+msgid "INBOX"
+msgstr "ÇáæÇÑÏ"
+
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "ÌãíÚ ÇáÑÓÇÆá Ýí ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÓæÝ ÊÝÞÏ !"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "ÊÌÇåá"
 
-#: templates/compose/spelling.inc:71
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "ÊÌÇåá Çáßá"
 
-#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
-#: templates/mailbox/legend.inc:14 config/conf.php.dist:134
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "ãåã"
+
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
+#, fuzzy
+msgid "Import Key"
+msgstr "ãåã"
+
+#: templates/pgp/pgp.inc:139
+#, fuzzy
+msgid "Import Keypair"
+msgstr "ãåã"
+
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "ÑÓÇÆá ãåãÉ"
+
+#: pgp.php:42
+msgid "Import PGP Key"
+msgstr ""
+
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
+msgstr ""
+
+#: templates/pgp/import_key.inc:14
+msgid "Import Personal Private PGP Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:9
+msgid "Import Personal Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:4
+msgid "Import Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+msgid "Import Public Key"
+msgstr ""
+
+#: templates/pgp/import_key.inc:4
+msgid "Import Public PGP Key"
+msgstr ""
+
+#: templates/smime/import_key.inc:8
+msgid "Import Public S/MIME Key"
+msgstr ""
+
+#: smime.php:16
+msgid "Import S/MIME Key"
+msgstr ""
+
+#: templates/folders/import.inc:9
+msgid "Import mbox File"
+msgstr ""
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
+
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "ãåã"
 
-#: templates/search/main.inc:167
+#: templates/search/main.inc:47
 msgid "Important messages"
 msgstr "ÑÓÇÆá ãåãÉ"
 
-#: config/prefs.php.dist:621
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Êã ÍÐÝ ÌãíÚ ÇáÑÓÇÆá ãä %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "ÅÑÝÇÞ ÇáÑÓÇÆá ÇáÃÕáíÉ ÚäÏ ÇáÑÏ ¿"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "ÅÑÝÇÞ ÇáÑÓÇÆá ÇáÃÕáíÉ ÚäÏ ÇáÑÏ ¿"
 
-#: compose.php:678 compose.php:759
-msgid "Invalid character in e-mail address."
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "ÊÌÇåá"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "Information on %s Public Key"
+msgstr ""
+
+#: templates/pgp/pgp.inc:77
+msgid "Information on Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "Information on Personal Public Key"
+msgstr ""
+
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "áÇ ÔíÁ"
+
+#: templates/smime/import_key.inc:9
+msgid "Insert Certificate Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:15
+msgid "Insert Personal Private PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:10
+msgid "Insert Personal Public PGP Key Here"
+msgstr ""
+
+#: templates/pgp/import_key.inc:5
+msgid "Insert Public PGP Key Here"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí"
+
+#: lib/Fetchmail/imap.php:307
+msgid "Invalid Remote Mailbox"
+msgstr ""
+
+#: compose.php:158
+#, fuzzy, php-format
+msgid "Invalid character in e-mail address: %s."
 msgstr "ÍÑæÝ ÛíÑ ãÞÈæáÉ Ýí ÚäæÇä ÇáÈÑíÏ ÇáÇáßÊÑæäí."
 
-#: search.php:55
-msgid "January"
-msgstr "íäÇíÑ"
-
-#: search.php:61
-msgid "July"
-msgstr "íæáíæ"
-
-#: search.php:60
-msgid "June"
-msgstr "íæäíæ"
-
-#: templates/message/navbar.inc:51
-msgid "KOI charset"
-msgstr "ÊÑãíÒ KOI"
+#: smime.php:82 pgp.php:16
+msgid "Invalid key"
+msgstr ""
+
+#: pgp.php:196
+msgid "Invalid personal PGP private key."
+msgstr ""
+
+#: pgp.php:171
+msgid "Invalid personal PGP public key."
+msgstr ""
+
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
+
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
+
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr ""
+
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
 
-#: templates/login/login.inc:140 config/prefs.php.dist:38
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "ÇááÛÉ"
 
-#: mailbox.php:489 mailbox.php:490 mailbox.php:495 mailbox.php:496
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
+msgstr "ÂÎÑ ÕÝÍÉ"
+
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "ÂÎÑ ÕÝÍÉ"
 
-#: lib/IMP.php:347
-#, c-format
-msgid "Last login: %s"
-msgstr "ÂÎÑ ÏÎæá : %s"
-
-#: lib/IMP.php:345
-msgid "Last login: Never"
-msgstr "ÂÎÑ ÏÎæá : áÇ ÔíÁ"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "ãÑÝÞÇÊ"
+
+#: attachment.php:34 lib/Compose.php:1063
+msgid "Linked attachments are forbidden."
+msgstr ""
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-#: templates/login/login.inc:147
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
+
+#: config/prefs.php.dist:685
+msgid "Listing in the Header"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:30
+#, fuzzy
+msgid "Local Mailbox:"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
+
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "ÅÌÑÇÁ"
+
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "ÏÎæá"
 
-#: lib/api.php:82
-#, c-format
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "ÏÎæá Åáì %s"
 
-#: config/prefs.php.dist:102
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
+msgstr "ÏÎæá"
+
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "ãåÇã ÇáÏÎæá"
 
-#: login.php:22
-msgid ""
-"Login failed for some reason. Most likely your username or password was "
-"entered incorrectly."
+#: templates/compose/compose.inc:296
+msgid "Low"
 msgstr ""
-"ÝÔá Ýí ÇáÏÎæá áÓÈÈ ãÇ . Úáì ÇáÃÑÌÍ ÎØÃ Ýí ÅÏÎÇá ÇÓã ÇáãÓÊÎÏã Ãæ  "
-"ßáãÉ ÇáãÑæÑ."
 
-#: templates/menu/menu.inc:54 templates/menu/menu.inc:56
-msgid "Logout"
-msgstr "ÎÑæÌ"
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+msgid "Low Priority"
+msgstr ""
 
-#: templates/message/navbar.inc:54
-msgid "MAC charset"
-msgstr "ÊÑãíÒ MAC"
+#: templates/compose/compose.inc:297
+msgid "Lowest"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "ãÑÔÍÇÊ ÇáÈÑíÏ"
 
-#: filters.php:131
-msgid "Mail Filters"
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
+
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
 msgstr "ãÑÔÍÇÊ ÇáÈÑíÏ"
 
-#: config/prefs.php.dist:51 config/prefs.php.dist:59 config/prefs.php.dist:66
-#: config/prefs.php.dist:73
-msgid "Mail Management"
-msgstr "ÅÏÇÑÉ ÇáÈÑíÏ"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
-#: folders.php:356 folders.php:358 folders.php:360
+#: folders.php:402
 msgid "Mailbox"
 msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: config/prefs.php.dist:74
-msgid "Maintenance Operations"
-msgstr "ÚãáíÇÊ ÇáÕíÇäÉ"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "ÚÑÖ ÇáÎíÇÑÇÊ"
 
-#: search.php:57
-msgid "March"
-msgstr "ãÇÑÓ"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
 
-#: templates/mailbox/navbar.inc:29
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "ÊÚáíã ßÜ :"
 
-#: config/prefs.php.dist:589
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
+msgstr "Úáã ÇáãÓÊæíÇÊ ÇáãÎÊáÝÉ ãä ÇáÇÞÊÈÇÓÇÊ ÈÃáæÇä ãÎÊáÝÉ ¿"
+
+#: templates/fetchmail/manage.inc:40
+msgid "Mark messages as seen? (IMAP only)"
+msgstr ""
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "ãÑÝÞ"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
 msgstr ""
-"Úáã ÇáãÓÊæíÇÊ ÇáãÎÊáÝÉ ãä ÇáÇÞÊÈÇÓÇÊ ÈÃáæÇä ãÎÊáÝÉ ¿"
 
-#: search.php:59
-msgid "May"
-msgstr "ãÇíæ"
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "ãÚáæãÇÊ ÇáãÎÏã"
 
-#: status.php:48
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "ãÌáÏ ãÝÊæÍ"
+
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "ÑÓÇáÉ"
 
-#: compose.php:430 compose.php:434 compose.php:1082 config/prefs.php.dist:94
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "ÈäíÉ ÇáÑÓÇáÉ"
 
-#: config/prefs.php.dist:508
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "ÊÇÑíÎ ÇáÑÓÇáÉ"
 
-#: search.php:22
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "ÑÓÇÆá Åáì"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "ÈÍË ÇáÑÓÇáÉ"
 
-#: config/prefs.php.dist:511
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "ÍÌã ÇáÑÓÇáÉ"
 
-#: templates/message/navbar.inc:17
+#: message.php:384
 msgid "Message Source"
 msgstr "ãßæäÇÊ ÇáÑÓÇáÉ"
 
-#: config/prefs.php.dist:60
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "ÚÑÖ ÇáÑÓÇáÉ"
 
-#: templates/search/main.inc:26
-msgid "Message fields"
-msgstr "ÍÞæá ÇáÑÓÇáÉ"
-
-#: templates/search/main.inc:129
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "ÃÚáÇã ÇáÑÓÇáÉ"
 
-#: templates/search/main.inc:197
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "ãÌáÏÇÊ ÇáÑÓÇáÉ"
 
-#: mailbox.php:125
-msgid "Message sent successfully"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "ãÌáÏÇÊ ÇáÑÓÇáÉ"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "ÍÞæá ÇáÑÓÇáÉ"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "ÍÞæá ÇáÑÓÇáÉ"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "ÊÇÑíÎ ÇáÑÓÇáÉ"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
+msgstr "Êã ÅÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
 msgstr "Êã ÅÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
 
-#: config/prefs.php.dist:533
+#: compose.php:1143 compose.php:1158
+#, fuzzy
+msgid "Message sent successfully."
+msgstr "Êã ÅÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "ÑÓÇáÉ áßá ÕÝÍÉ ÃËäÇÁ ÚÑÖ ÕäÏæÞ ÇáÑÓÇÆá."
 
-#: mailbox.php:346
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "ÑÓÇÆá Åáì"
 
-#: templates/compose/compose.inc:435
-msgid "Mime Type"
-msgstr "äæÚ  Mime"
-
-#: templates/filters/javascript.inc:67
-#: templates/filters/javascript.inc:108
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "ÊÚÏíá"
 
-#: templates/mailbox/navbar.inc:61 templates/message/navbar_aux_top.inc:19
-#: templates/message/navbar_aux_bottom.inc:5
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "ÇäÊÞá"
 
-#: templates/filters/list.inc:58
-msgid "Move Down"
-msgstr "ÇäÊÞá ááÃÓÝá"
-
-#: templates/filters/list.inc:59
-msgid "Move Up"
-msgstr "ÇäÊÞá ááÃÚáì"
-
-#: templates/filters/list.inc:40
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "ÇäÞá ÇáÑÓÇÆá Åáì ÇáãÌáÏ <b>%s</b> "
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "ÇäÊÞá Åáì ÇáÃÓÝá"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "ÇÎÊÑ ãÌáÏ"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "ÇäÊÞá Åáì ÇáÃÚáì"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "ÚÑÖ ÇáÑÓÇáÉ"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
 
-#: templates/contacts/contacts.inc:67
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "ÇáÇÓã"
 
-#: config/prefs.php.dist:718
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "ÅÌÑÇÁ"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "ãØáÞÇ"
 
-#: templates/mailbox/legend.inc:8
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "ãÑÝÞÇÊ ãÍÐæÝÉ"
+
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "ÌÏíÏ"
 
-#: lib/IMP.php:698
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "ãÌáÏ ÌÏíÏ"
 
-#: config/prefs.php.dist:109
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "ÈÑíÏ ÌÏíÏ"
 
-#: templates/search/main.inc:143
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "ÇáÑÓÇáÉ ÇáÊÇáíÉ"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "ÑÓÇÆá ÌÏíÏÉ"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "ÇáÊÇáí"
 
-#: templates/message/navbar.inc:38
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "ÇáÑÓÇáÉ ÇáÊÇáíÉ"
 
-#: mailbox.php:486 mailbox.php:487 mailbox.php:493 mailbox.php:494
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "ÇáÕÝÍÉ ÇáÊÇáíÉ"
 
-#: config/prefs.php.dist:551
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "áÇ"
 
-#: mailbox.php:705
-msgid "No Subject"
-msgstr "áÇ íæÌÏ ãæÖæÚ"
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
+
+#: templates/pgp/pgp.inc:19
+msgid "No Keys in Keyring"
+msgstr ""
+
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: pgp.php:137
+msgid "No PGP public key imported."
+msgstr ""
+
+#: templates/smime/smime.inc:84
+msgid "No Personal Certificate Present"
+msgstr ""
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "ÇáäÕ ÇáãÕÍÍ"
+
+#: templates/smime/smime.inc:15
+msgid "No Public Keys Found"
+msgstr ""
+
+#: smime.php:151
+msgid "No S/MIME public key imported."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:90
+#, fuzzy
+msgid "No attachments found."
+msgstr "ãÑÝÞÇÊ"
+
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "áã íÊã ÇÎÊíÇÑ ãÌáÏ"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
 
-#: lib/Folder.php:412 lib/Folder.php:446 folders.php:200 folders.php:210
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "áã íÊã ÊÍÏíÏ ãÌáÏ"
 
-#: templates/mailbox/empty_mailbox.inc:4
-msgid "No messages matched your search"
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "áíÓÊ ÑÓÇÆá ãáÛíÉ"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "áíÓÊ ÑÓÇÆá ãáÛíÉ"
+
+#: lib/Compose.php:325
+#, fuzzy
+msgid "No message body text"
+msgstr "ÇäÞá ÇáÑÓÇÆá Åáì"
+
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "áÇ ÊæÌÏ ÑÓÇÆá ãØÇÈÞÉ áÈÍËß"
 
-#: spelling.php:208
+#: pgp.php:189
+msgid "No personal PGP private key imported."
+msgstr ""
+
+#: pgp.php:165
+msgid "No personal PGP public key imported."
+msgstr ""
+
+#: smime.php:201
+msgid "No personal S/MIME certificates imported."
+msgstr ""
+
+#: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr "áã íÊã ÊÚÑíÝ ÈÑäÇãÌ ÊÏÞíÞ ÅãáÇÆí."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "áÇ ÊæÌÏ ÃÎØÇÁ ÅãáÇÆíÉ"
 
-#: templates/compose/spelling.inc:88
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "áÇ ÊæÌÏ ÇÞÊÑÇÍÇÊ"
 
-#: templates/prefs/sourceselect.inc:26 templates/mailbox/navbar.inc:11
-#: templates/identities/manage.inc:93
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "áã íÊã ÊÍÏíÏ ãÌáÏ"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "áÇ ÔíÁ"
 
-#: templates/mailbox/navbar.inc:20 templates/mailbox/navbar.inc:38
+#: templates/compose/compose.inc:295
+msgid "Normal"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "áã íÊã ÇáÅáÛÇÁ"
 
-#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "áÇ ÊæÌÏ ãÓæÏÉ"
 
-#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "ÛíÑ ãåãÉ"
 
-#: templates/mailbox/navbar.inc:24
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "áíÓÊ ÔÎÕíå"
 
-#: templates/search/main.inc:185
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
+msgid "Not a valid public key."
+msgstr ""
+
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "áíÓÊ ÑÓÇÆá ãáÛíÉ"
 
-#: templates/search/main.inc:171
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "áíÓÊ ÑÓÇÆá ãåãÉ"
 
-#: search.php:65
-msgid "November"
-msgstr "äæÝãÈÑ"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "ÇÞÊÈÇÓ"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"ÚÏÏ ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ ÇáÊí íÌÈ ÅÈÞÇÄåÇ Ýí ÍÇá ÇáÅáÛÇÁ   ÇáÔåÑí."
+
+#: config/prefs.php.dist:359
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"ÚÏÏ ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ ÇáÊí íÌÈ ÅÈÞÇÄåÇ Ýí ÍÇá ÇáÅáÛÇÁ   ÇáÔåÑí."
+
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
+msgid "OK"
+msgstr "ãæÇÝÞ"
+
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
+
+#: templates/search/main.inc:15
+msgid "Old messages"
+msgstr "ÇáÑÓÇÆá ÇáÞÏíãÉ"
+
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
+msgid "Old sent-mail folders being purged."
+msgstr "Êã ÇáÊÎáÕ ãä ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ."
+
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ ÝÞØ áåÐå ÇáÚãáíÉ."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "ãÌáÏ ãÝÊæÍ"
+
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "ãÌáÏ ãÝÊæÍ"
+
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
+
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
+msgstr "ÎíÇÑÇÊ ÃÎÑì"
+
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
+msgid "Other Options"
+msgstr "ÎíÇÑÇÊ ÃÎÑì"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "ÅáÛÇÁ ÇáÑÓÇáÉ"
+
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
+msgstr "ÎØÃ"
+
+#: compose.php:337
+msgid "PGP Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:142
+#, fuzzy
+msgid "PGP Options"
+msgstr "ÎíÇÑÇÊ"
+
+#: pgp.php:30
+msgid "PGP Passphrase Input"
+msgstr ""
+
+#: templates/pgp/pgp.inc:55
+msgid "PGP Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+msgid "PGP Public Key Text"
+msgstr ""
+
+#: pgp.php:149
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "Êã ÅäÔÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: pgp.php:245
+#, fuzzy, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: templates/pgp/pgp.inc:14
+msgid "PGP Public Keyring"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:8
+#, fuzzy
+msgid "PGP Sign Message"
+msgstr "ÃÑÓá ÑÓÇáÉ"
+
+#: templates/compose/encrypt_list.inc:9
+msgid "PGP Sign/Encrypt Message"
+msgstr ""
+
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
+
+#: pgp.php:177
+msgid "PGP public key successfully added."
+msgstr ""
+
+#: templates/pgp/notactive.inc:4
+msgid "PGP support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
 
-#: config/prefs.php.dist:457
-msgid "Number of old sent-mail folders to keep if deleting monthly."
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
-"ÚÏÏ ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ ÇáÊí íÌÈ ÅÈÞÇÄåÇ Ýí ÍÇá ÇáÅáÛÇÁ   "
-"ÇáÔåÑí."
 
-#: templates/contacts/contacts.inc:91
-msgid "OK"
-msgstr "ãæÇÝÞ"
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
 
-#: search.php:64
-msgid "October"
-msgstr "ÊÔÑíä Ãæá"
+#: lib/Fetchmail/imap.php:105
+msgid "POP3"
+msgstr ""
 
-#: templates/search/main.inc:139
-msgid "Old messages"
-msgstr "ÇáÑÓÇÆá ÇáÞÏíãÉ"
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
-msgid "Old sent-mail folders being purged."
-msgstr "Êã ÇáÊÎáÕ ãä ãÌáÏÇÊ ÇáÑÓÇÆá ÇáãÑÓáÉ ÇáÞÏíãÉ."
+#: lib/Fetchmail/imap.php:117
+msgid "POP3 over SSL"
+msgstr ""
 
-#: templates/menu/menu.inc:68 templates/menu/menu.inc:74 folders.php:365
-msgid "Open Folder"
-msgstr "ãÌáÏ ãÝÊæÍ"
+#: lib/Fetchmail/imap.php:123
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr ""
 
-#: templates/compose/compose.inc:291 templates/menu/menu.inc:25
-msgid "Options"
-msgstr "ÎíÇÑÇÊ"
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr ""
 
-#: config/prefs.php.dist:84 config/prefs.php.dist:93 config/prefs.php.dist:101
-#: config/prefs.php.dist:108 config/prefs.php.dist:115
-msgid "Other Options"
-msgstr "ÎíÇÑÇÊ ÃÎÑì"
+#: lib/Fetchmail/imap.php:111
+msgid "POP3, no TLS"
+msgstr ""
 
-#: templates/mailbox/header.inc:26
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "ÇáÕÝÍÉ %d ãä %d"
 
-#: templates/message/headers.inc:32
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "ÌÒÁ (ÃÌÒÇÁ)"
 
-#: templates/login/login.inc:76
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr ""
+
+#: templates/pgp/pgp.inc:128
+msgid "Passphrase (Again)"
+msgstr ""
+
+#: smime.php:235 pgp.php:310
+#, fuzzy
+msgid "Passphrase successfully unloaded."
+msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
+
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
+msgid "Passphrase:"
+msgstr ""
+
+#: pgp.php:112
+msgid "Passphrases can not be empty"
+msgstr ""
+
+#: pgp.php:114
+msgid "Passphrases do not match"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "ßáãÉ ÇáãÑæÑ"
 
-#: config/prefs.php.dist:430
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "ÊÝÚíá ÚãáíÇÊ ÇáÕíÇäÉ ÚäÏ ÇáÏÎæá ¿"
 
-#: templates/mailbox/navbar.inc:23 config/conf.php.dist:138
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "ÔÎÕí"
 
-#: config/prefs.php.dist:24
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "ãÚáæãÇÊ ÔÎÕíÉ"
 
-#: templates/identities/manage.inc:82
+#: pgp.php:120
+#, fuzzy
+msgid "Personal PGP keypair generated successfully."
+msgstr "Êã ÅÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: pgp.php:127
+#, fuzzy
+msgid "Personal PGP keys deleted successfully."
+msgstr "Êã ÅÑÓÇá ÇáÑÓÇáÉ ÈäÌÇÍ."
+
+#: smime.php:207
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr ""
+
+#: smime.php:132
+msgid "Personal S/MIME keys deleted successfully."
+msgstr ""
+
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "ÅÏÑÇÌ  ÊæÞíÚß ÞÈá ÇáÑÏæÏ æÇáÊÍæíáÇÊ ¿"
 
-#: templates/mailbox/javascript.inc:81
-#: templates/message/javascript.inc:14
+#: compose.php:254
+msgid "Plaintext Version of Message"
+msgstr ""
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "íÑÌì ÅÏÎÇá ÇÓã ááãÌáÏ ÇáÌÏíÏ :"
 
-#: templates/folders/javascript.inc:98
-#: templates/folders/javascript.inc:100
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "íÑÌì ÅÏÎÇá ÇÓã ÇáãÌáÏ ÇáÌÏíÏ :"
 
-#: templates/folders/javascript.inc:137
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "íÑÌì ÅÏÎÇá ÇáÇÓã ÇáÌÏíÏ :"
 
-#: templates/search/javascript.inc:61
-msgid "Please enter valid search criteria."
-msgstr "íÑÌì ÅÏÎÇá ãÊÛíÑÇÊ ÈÍË ãÞÈæáÉ."
+#: templates/pgp/passphrase.inc:19
+#, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+
+#: templates/smime/passphrase.inc:13
+#, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
+
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "íÑÌì ÊæÝíÑ ÇÓã ÇáãÓÊÎÏã æßáãÉ ÇáãÑæÑ"
 
-#: templates/login/login.inc:17 templates/login/login.inc:21
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "íÑÌì ÊæÝíÑ ÇÓã ÇáãÓÊÎÏã æßáãÉ ÇáãÑæÑ"
 
-#: compose.php:229 compose.php:244
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "íÑÌì Íá ÇáÇáÊÈÇÓ Ãæ ÚÏã ÕáÇÍíÉ ÇáÚäÇæíä ."
 
-#: templates/folders/javascript.inc:53
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ ÞÈá ÇáÔÑæÚ Ýí Ãí ÅÌÑÇÁ."
 
-#: templates/search/javascript.inc:38
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ Úáì ÇáÃÞá ááÈÍË."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ Úáì ÇáÃÞá ááÈÍË."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "ÇáÑÌÇÁ ÇÎÊíÇÑ ãÌáÏ æÇÍÏ ÝÞØ áåÐå ÇáÚãáíÉ."
 
-#: templates/compose/compose.inc:116 templates/compose/compose.inc:172
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "íÑÌì ÇÎÊíÇÑ Ãæ ÊÍÑíÑ äÕ ÕÍíÍ :"
 
-#: templates/identities/manage.inc:77
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "ÇÓÊåá ÊæÞíÚß ÈÔÑØ ('-- ')"
 
-#: templates/message/navbar.inc:32
+#: smime.php:241 pgp.php:257 filterprefs.php:40
+#, fuzzy
+msgid "Preferences successfully updated."
+msgstr "Êã ÅäÔÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "ÇáÕÝÍÉ ÇáÓÇÈÞÉ"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "ÇáÑÓÇáÉ ÇáÓÇÈÞÉ"
 
-#: mailbox.php:461 mailbox.php:462 mailbox.php:467 mailbox.php:468
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "ÇáÕÝÍÉ ÇáÓÇÈÞÉ"
 
-#: templates/message/navbar.inc:23
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "ØÈÇÚÉ"
 
-#: lib/IMP.php:1209
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "ãÔßáÉ ãÊÚáÞÉ ÈÞÇÚÏÉ ÇáãÑÔÍ %d : áã íÊã ÅÖÇÝÉ ÇáãÌáÏ : %s"
-
-#: templates/menu/menu.inc:33
-msgid "Problem?"
-msgstr "ãÔßáÉ ¿"
+#: templates/message/headers.inc:38
+#, fuzzy
+msgid "Priority"
+msgstr "ØÈÇÚÉ"
+
+#: templates/smime/import_key.inc:76
+msgid "Private Key Password"
+msgstr ""
+
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
+
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:10
+msgid "Protocol:"
+msgstr ""
+
+#: lib/Crypt/PGP.php:429
+msgid "Public PGP keyserver support has been disabled."
+msgstr ""
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "ÊÎáÕ ãä ÇáãáÛí"
 
-#: templates/mailbox/actions.inc:26
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "ÊÎáÕ ãä ÇáãáÛí"
 
-#: config/prefs.php.dist:476
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "ÅáÛÇÁ ãÌáÏ ( ãÌáÏÇÊ )"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "äÙÝ ÓáÉ ÇáãåãáÇÊ ßá ÝÊÑÉ :"
 
-#: config/prefs.php.dist:485
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "ÍÐÝ ÇáÑÓÇÆá Ýí ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÇáÊí ÊÓÈÞ åÐÇ ÇáÚÏÏ ãä ÇáÃíÇã."
 
-#: config/prefs.php.dist:466
-msgid "Purge old message in the Trash folder?"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "ÍÐÝ ÇáÑÓÇÆá ÇáÞÏíãÉ ãä ãÌáÏ ÓáÉ ÇáãåãáÇÊ¿"
 
-#: lib/Maintenance/Task/purge_trash.php:66
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "ÍÐÝ %d ÑÓÇáÉ (ÑÓÇÆá) ãä ãÌáÏ ÓáÉ ÇáãåãáÇÊ."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "ÍÐÝ %d ÑÓÇáÉ (ÑÓÇÆá) ãä ãÌáÏ ÓáÉ ÇáãåãáÇÊ."
 
-#: compose.php:595
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "ÇÞÊÈÇÓ"
 
-#: templates/search/main.inc:110
-msgid "Received after"
-msgstr "ÇÓÊáãÊ ÈÚÏ"
-
-#: templates/search/main.inc:90
-msgid "Received before"
-msgstr "ÇÓÊáãÊ ÞÈá"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "ÇÓÊáãÊ Ýí"
+
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "ÇÓÊáãÊ Ýí"
 
-#: templates/search/main.inc:70
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "ÇÓÊáãÊ Ýí"
 
-#: templates/message/navbar.inc:12
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "ÅÚÇÏÉ ÊæÌíå"
+
+#: templates/message/navbar_actions.inc:16
 msgid "Redirect"
 msgstr "ÅÚÇÏÉ ÊæÌíå"
 
-#: templates/compose/bounce.inc:37
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "ÅÚÇÏÉ ÊæÌíå ÑÓÇáÉ"
 
-#: compose.php:1046
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "ÅÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
 
-#: compose.php:726
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "ÍÞá ÅÚÇÏÉ ÇáÊæÌíå."
 
-#: templates/mailbox/header.inc:19
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "ÊÍÏíË"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "ÊÍÏíË ÚÑÖ ÇáãÌáÏÇÊ :"
 
-#: templates/folders/head.inc:6 templates/folders/head.inc:7
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "ÅÚÇÏÉ ÊÍãíá ÇáÚÑÖ"
+
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "ÅÚÇÏÉ ÊÍãíá ÇáÚÑÖ"
 
-#: config/prefs.php.dist:553
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "ÊÐßÑ ÂÎÑ ÚÑÖ"
 
-#: templates/compose/compose.inc:458
-msgid "Remove Selected"
-msgstr "ÅÒÇáÉ ÇáãÎÊÇÑ"
+#: templates/fetchmail/manage.inc:27
+#, fuzzy
+msgid "Remote Mailbox:"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: templates/folders/actions.inc:6
-msgid "Rename Folder"
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "ÅÒÇáÉ ÇáãÕÏÑ"
+
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "ÅÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ"
 
-#: config/prefs.php.dist:439
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "ÅÚÇÏÉ ÊÓãíÉ ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ Ýí ÈÏÇíÉ ÇáÔåÑ¿"
 
-#: lib/Folder.php:379
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "ÅÚÇÏÉ ÊÓãíÉ \"%s\" Åáì \"%s\" ÍÞá. åÐÇ ãÇ ÞÇáå ÇáãÎÏã "
 
-#: templates/compose/spelling.inc:96
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "ÇáÑÏ Úáì Çáßá"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "ÇÓÊÈÏáå ÈÜ :"
 
-#: templates/message/navbar.inc:9
+#: templates/message/navbar_actions.inc:8
 msgid "Reply"
 msgstr "ÇáÑÏ"
 
-#: templates/message/navbar.inc:10
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "ÇáÑÏ Úáì"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "ÇáÑÏ Úáì Çáßá"
 
-#: compose.php:610
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "ÇáÑÏ Úáì Çáßá :"
-#: compose.php:638
-msgid "Reply-To: "
+
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Reply to List"
+msgstr "ÇáÑÏ Úáì Çáßá"
+
+#: compose.php:735
+#, fuzzy
+msgid "Reply to List:"
+msgstr "ÇáÑÏ Úáì Çáßá :"
+
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "ÇáÑÏ Úáì Çáßá"
+
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "ÇáÑÏ Úáì :"
 
-#: templates/message/headers.inc:24
-msgid "Reply-to"
-msgstr "ÇáÑÏ Úáì"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "ÇáÑÏ Úáì :"
 
-#: compose.php:608
+#: compose.php:731
 msgid "Reply:"
 msgstr "ÇáÑÏ :"
 
-#: templates/message/navbar.inc:25
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "ÇÈáÛ Úä ÑÓÇáÉ ÛíÑ ãÑÛæÈÉ"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "ÇÈáÛ Úä ÑÓÇáÉ ÛíÑ ãÑÛæÈÉ"
 
-#: templates/compose/compose.inc:351
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "ÇØáÈ æÕá ÞÑÇÁÉ"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "ÇØáÈ æÕá ÞÑÇÁÉ"
 
-#: templates/filters/manage.inc:76 templates/contacts/contacts.inc:73
-#: templates/identities/manage.inc:112 templates/search/main.inc:22
-#: templates/search/main.inc:222
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "ÇÓÊÚÇÏÉ ÇáÇÝÊÑÇÖí"
 
-#: templates/message/navbar.inc:20
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "ÇÓÊÃäÝ"
 
-#: config/prefs.php.dist:378
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "ÈäíÉ ÇáÑÓÇáÉ"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+msgid "Return to Fetch Mail"
+msgstr ""
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr "ÇÑÌÚ Åáì ÚÑÖ ÕäÇÏíÞ ÇáÈÑíÏ ÈÚÏ ÅáÛÇÁ ÊÍæíá Ãæ äÓÎ  ÑÓÇáÉ ¿"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+msgid "S/MIME Encrypt Message"
+msgstr ""
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr ""
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "ÎíÇÑÇÊ"
+
+#: smime.php:49
+msgid "S/MIME Passphrase Input"
+msgstr ""
+
+#: templates/smime/smime.inc:54
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr ""
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: smime.php:162
+msgid "S/MIME Public Key successfully added."
+msgstr ""
+
+#: templates/smime/smime.inc:10
+msgid "S/MIME Public Keyring"
+msgstr ""
+
+#: smime.php:211
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "ÃÑÓá ÑÓÇáÉ"
+
+#: templates/compose/encrypt_list.inc:14
+msgid "S/MIME Sign/Encrypt Message"
+msgstr ""
+
+#: templates/smime/notactive.inc:4
+msgid "S/MIME support is disabled on this system."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:241
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
 msgstr ""
-"ÇÑÌÚ Åáì ÚÑÖ ÕäÇÏíÞ ÇáÈÑíÏ ÈÚÏ ÅáÛÇÁ ÊÍæíá Ãæ äÓÎ  "
-"ÑÓÇáÉ ¿"
 
-#: templates/filters/manage.inc:4
-msgid "Rule Definition"
-msgstr "ÊÚÑíÝ ÞÇÚÏÉ"
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "ÇáãæÖæÚ"
+
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "ÇÍÝÙ äÓÎÉ Ýí "
+
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "ÍÝÙ ßÜ"
+
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "ÍÝÙ ßÜ"
+
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
-#: templates/compose/compose.inc:41 templates/compose/compose.inc:377
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "ÍÝÙ ãÓæÏÉ"
 
-#: templates/compose/compose.inc:330
-msgid "Save a copy in "
-msgstr "ÇÍÝÙ äÓÎÉ Ýí "
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "ÍÝÙ ßÜ"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
+#, fuzzy
+msgid "Save Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: templates/stationery/prefs.inc:40
+msgid "Save Stationery"
+msgstr ""
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "ÍÝÙ ãÓæÏÉ"
 
-#: templates/message/navbar.inc:22
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "ÍÝÙ ßÜ"
 
-#: templates/identities/manage.inc:87
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "ÍÝÙ ÇáÑÓÇáÉ ÇáãÑÓáÉ"
 
-#: compose.php:950
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "ÍÝÙ ÍÞá ÇáãÓæÏÉ. åÐÇ ãÇ ÞÇáå ÇáãÎÏã : %s "
 
-#: templates/search/main.inc:8 templates/menu/menu.inc:27
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "ÈÍË"
 
-#: lib/IMP.php:480
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "ÈÍË"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "äÊÇÆÌ ÇáÈÍË"
 
-#: templates/mailbox/navbar.inc:13 templates/mailbox/navbar.inc:30
-#: templates/mailbox/legend.inc:10
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
 msgstr "äÙÑ"
 
@@ -1454,546 +3562,1161 @@
 msgid "Select"
 msgstr "ÇÎÊÑ"
 
-#: config/prefs.php.dist:117
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "ÇÎÊÑ áÇ ÔíÁ"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "ÇÎÊÑ ãÚÑÝ"
+
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "ÇÎÊÑ Çáßá"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "ÇÎÊÑ áÇ ÔíÁ"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
-msgstr ""
-"ÇÎÊÑ ãÕÏÑ ÓÌá ÇáÚäÇæíä áÅÖÇÝÉ æÇáÈÍË  "
-"Ýí ÇáÚäÇæíä."
+msgstr "ÇÎÊÑ ãÕÏÑ ÓÌá ÇáÚäÇæíä áÅÖÇÝÉ æÇáÈÍË  Ýí ÇáÚäÇæíä."
 
-#: templates/search/main.inc:202
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "ÇÎÊÑ Çáßá"
 
-#: templates/identities/manage.inc:12
-msgid "Select an identity"
-msgstr "ÇÎÊÑ ãÚÑÝ"
-
-#: templates/message/navbar.inc:48
-msgid "Select charset:"
-msgstr "ÇÎÊÑ ÊÑãíÒ :"
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "ÇÎÊÑ ÇáÊÑÊíÈ ÇáÐí ÊÑíÏ Ãä íÊã ÇáÈÍË Èå ÚäÏ ÝÊÍ ÓÌáÇÊ ÇáÚäÇæíä. "
+
+#: templates/fetchmail/account_select.inc:21
+#, fuzzy
+msgid "Select an account"
+msgstr "ÇÎÊÑ áÇ ÔíÁ"
 
-#: templates/search/main.inc:203
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "ÇÎÊÑ áÇ ÔíÁ"
 
-#: config/prefs.php.dist:281
-msgid "Select your preferred language:"
-msgstr "ÇÎÊÑ áÛÊß ÇáãÝÖáÉ :"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:275
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "ÓÌáÇÊ ÇáÚäÇæíä ÇáãÎÊÇÑÉ :"
 
-#: templates/compose/compose.inc:39 templates/compose/compose.inc:375
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "ãÚáæãÇÊ ÇáãÎÏã"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "ÃÑÓá ÑÓÇáÉ"
 
-#: templates/identities/manage.inc:91
-msgid "Sent mail folder:"
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
+
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
 msgstr "ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ :"
 
-#: search.php:63
-msgid "September"
-msgstr "ÓÈÊãÈÑ"
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ :"
 
-#: templates/login/login.inc:85 templates/login/login.inc:91
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "ÇáãÎÏã"
 
-#: config/prefs.php.dist:31
-msgid "Server Information"
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
 msgstr "ãÚáæãÇÊ ÇáãÎÏã"
 
-#: config/prefs.php.dist:61
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "ÖÈØ ÇáÃÝÖáíÉ áÑÓÇÆá ÇáÊÑÔíÍ ÇáÎÇÕÉ ÈÇáãÍÊæíÇÊ ÛíÑ ÇáãÑÛæÈÉ."
+#: templates/fetchmail/manage.inc:23
+#, fuzzy
+msgid "Server:"
+msgstr "ÇáãÎÏã"
 
-#: config/prefs.php.dist:68
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
+msgstr "ÖÈØ ÇáÃÏÇÁ áãÇ ÓíÍÏË ÚäÏãÇ ÊÞæã ÈäÞá Ãæ ÅáÛÇÁ  ÇáÑÓÇÆá."
+
+#: config/prefs.php.dist:529
+msgid "Set the X-Priority header when composing messages?"
 msgstr ""
-"ÖÈØ ÇáÃÏÇÁ áãÇ ÓíÍÏË ÚäÏãÇ ÊÞæã ÈäÞá Ãæ ÅáÛÇÁ  "
-"ÇáÑÓÇÆá."
 
-#: config/prefs.php.dist:46
-msgid "Set the current time zone."
-msgstr "ÖÈØ äØÇÞ ÇáÊæÞíÊ ÇáÍÇáí."
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "ãÌáÏÇÊ"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "ãÌáÏ ÇáÑÓÇÆá ÇáãÑÓáÉ :"
 
-#: config/prefs.php.dist:39
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "ÖÈØ áÛÉ ÞæÇÆã ÇáÃæÇãÑ ¡ ÇáÊæÖíÍÇÊ¡ æÇáãÓÇÚÏÉ."
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
 
 #: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
+
+#: templates/pgp/pgp.inc:7
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr ""
+
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "åá íÌÈ ÅÛáÇÞ äÇÝÐÉ ÅÑÓÇá ÇáÑÓÇÆá ÈÚÏ ÍÝÙ ÇáãÓæÏÇÊ ¿"
 
-#: mailbox.php:514
+#: templates/pgp/pgp.inc:4
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Øí ÌãíÚ ÇáãÌáÏÇÊ"
+
+#: templates/message/headers.inc:67
+msgid "Show All Headers"
+msgstr ""
+
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "ÚÑÖ ÇáãáÛí"
 
-#: folders.php:274
+#: templates/message/headers.inc:61
+msgid "Show Limited Headers"
+msgstr ""
+
+#: templates/message/headers.inc:70
+#, fuzzy
+msgid "Show Mailing List Information"
+msgstr "ãÚáæãÇÊ ÔÎÕíÉ"
+
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "ÇáÇÔÊÑÇß Ýí ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "ÚÑÖ ÛíÑ ÇáãÔÊÑß"
 
-#: config/prefs.php.dist:684
-msgid "Show last login time when logging in?"
-msgstr "ÅÙåÇÑ ÂÎÑ æÞÊ ÏÎæá ÚäÏ ÇáÏÎæá ¿"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-#: config/prefs.php.dist:580
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "ÅÙåÇÑÊÝÓíÑÇÊ ÃËäÇÁ ÚÑÖ ÕäÏæÞ ÇáÈÑíÏ ¿"
 
-#: templates/compose/compose.inc:434 templates/mailbox/message_headers.inc:33
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
+msgid "Show the Fetch Mail icon on the menubar?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Show the Images"
+msgstr ""
+
+#: templates/filters/prefs.inc:54
+msgid "Show the filter icon on the menubar?"
+msgstr ""
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+msgid "Shown"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "ÍÌã"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "ÍÌã"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "ÍÌã"
 
-#: templates/index/notconfigured.inc:13
-msgid "Some of IMP's configuration files are missing:"
-msgstr "ÈÚÖ ãáÝÇÊ ÖæÇÈØ  IMP  ãÝÞæÏÉ :"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
 
-#: templates/mailbox/message_headers.inc:8
-#: templates/mailbox/message_headers.inc:12
 #: templates/mailbox/message_headers.inc:16
-#: templates/mailbox/message_headers.inc:22
+msgid "Sort by Date"
+msgstr ""
+
 #: templates/mailbox/message_headers.inc:26
-#: templates/mailbox/message_headers.inc:32
-msgid "Sort Direction"
-msgstr "ÇÊÌÇå ÇáÝÑÒ"
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "ãä ÇáÚäæÇä"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "ÍÌã ÇáÑÓÇáÉ"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "áÇ íæÌÏ ãæÖæÚ"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "ÓáÓáÉ"
+
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "ãä ÇáÚäæÇä"
 
-#: message.php:424
-msgid "Spam Report from"
-msgstr "ÊÞÑíÑ ÑÓÇÆá ÛíÑ ãÑÛæÈÉ ãä"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "ÓáÉ ÇáãåãáÇÊ :"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "ÑãæÒ ÎÇÕÉ"
 
-#: templates/compose/compose.inc:305
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "ÊÏÞíÞ ÅãáÇÆí"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "ÇáãÏÞÞ ÇáÅãáÇÆí"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "ÇáÇäÊåÇÁ ãä ÇáÊÏÞíÞ ÇáÅãáÇÆí"
 
-#: config/prefs.php.dist:542
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "ÚÏÏ ÇáÃÎØÇÁ ÇáÅãáÇÆíÉ áßá ÔÇÔÉ ÃËäÇÁ ÇáÊÏÞíÞ ÇáÅãáÇÆí."
 
-#: templates/search/main.inc:54 templates/compose/compose.inc:273
-#: templates/mailbox/message_headers.inc:24
-#: templates/mailbox/message_headers.inc:27 templates/message/headers.inc:28
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+msgid "Start"
+msgstr ""
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Status"
+msgstr ""
+
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "ãÑÝÞ"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "ÇáãæÖæÚ"
+
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "ÇáãæÖæÚ"
 
-#: config/prefs.php.dist:510
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "ÍÞá ÇáãæÖæÚ"
 
-#: templates/filters/manage.inc:16 filters.php:142
-msgid "Subject:"
-msgstr "ÇáãæÖæÚ :"
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
+#, fuzzy
+msgid "Submit"
+msgstr "ÇáãæÖæÚ"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "ÇáÇÔÊÑÇß Ýí ÇáãÌáÏ ( ÇáãÌáÏÇÊ )"
 
-#: status.php:39
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "äÌÇÍ"
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "ãÞÊÑÍÇÊ"
 
-#: templates/filters/manage.inc:30
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "äÕ"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
+msgid "Terms of Service file not specified in conf.php"
+msgstr ""
+
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "äÕ"
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:97
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, fuzzy, php-format
+msgid "The account \"%s\" has been deleted."
+msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: fetchmailprefs.php:74
+#, fuzzy, php-format
+msgid "The account \"%s\" has been saved."
+msgstr "Êã ÍÝÙ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: attachment.php:43
+msgid "The attachment was not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "ÓæÝ íÊã ÊÛííÑ ÃÓãÇÁ ÇáãÌáÏ (ÇáãÌáÏÇÊ) ÇáÍÇáíÉ \"%s\" Åáì \"%s\"."
 
-#: lib/Folder.php:307
-#, c-format
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "ÇáãÌáÏ \"%s\" ãæÌæÏ ãÓÈÞÇ"
 
-#: lib/Folder.php:140
-#, c-format
+#: lib/Folder.php:163
+#, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
 "ÇáãÌáÏ \"%s\" íÍÊæí Úáì ÑãæÒ ÛíÑ ãÞÈæáÉ Ýí ÇÓãå. ÞÏ íÄÏí Ðáß Åáì ãÔÇßá "
-"ÇáÑÌÇÁ ãÑÇÌÚÉ ãÏíÑ ÇáäÙÇã"
-"."
+"ÇáÑÌÇÁ ãÑÇÌÚÉ ãÏíÑ ÇáäÙÇã."
 
-#: lib/Folder.php:320
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Êã ÅäÔÇÁ ÇáãÌáÏ \"%s\" æáßä áã íÊã ÅÔÑÇßß Èå."
 
-#: lib/Folder.php:273
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" æáßä áã íÊã ÅáÛÇÁ ÇÔÊÑÇßß Èå."
 
-#: lib/Folder.php:313
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "áã íÊã ÅäÔÇÁ ÇáãÌáÏ \"%s\" . åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
 
-#: lib/Folder.php:267
-#, c-format
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "áã íÊã ÅáÛÇÁ ÇáãÌáÏ \"%s\" . åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã"
 
-#: lib/Folder.php:325
-#, c-format
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Êã ÅäÔÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
 
-#: lib/Folder.php:276
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
 
-#: lib/Folder.php:376
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Êã ÅÚÇÏÉ ÊÓãíÉ ÇáãÌáÏ \"%s\" Åáì \"%s\"."
 
-#: identities.php:132
-#, c-format
-msgid "The identity \"%s\" has been deleted."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "%s ÝÇÑÛ ãÓÈÞÇ."
+
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
+
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
+msgstr "Êã ÅÛáÇÞ ÇáÑÓÇáÉ ÇáÌÇÑí ÅäÔÇÄåÇ.  ÌÇÑí ÇáÎÑæÌ."
+
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
 msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
 
-#: identities.php:125
-#, c-format
-msgid "The identity \"%s\" has been saved."
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
 msgstr "Êã ÍÝÙ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
 
-#: templates/contacts/javascript.inc:72
-msgid "The message being composed has been closed.  Exiting."
-msgstr "Êã ÅÛáÇÞ ÇáÑÓÇáÉ ÇáÌÇÑí ÅäÔÇÄåÇ.  ÌÇÑí ÇáÎÑæÌ."
+#: lib/MIME/Viewer/pkcs7.php:384
+#, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr ""
 
-#: templates/compose/javascript.inc:140
-msgid "The signature couldn't be replaced."
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
+msgid "The requested file does not exist in the MS-TNEF attachment."
+msgstr ""
+
+#: lib/MIME/Viewer/zip.php:64
+msgid "The requested file does not exist in the Zip attachment."
+msgstr ""
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "ÊÚÐÑ ÊÛííÑ ÇáÊæÞíÚ."
 
-#: templates/compose/javascript.inc:138
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
 
-#: templates/mailbox/empty_mailbox.inc:4
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Êã ÍÝÙ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Êã ÅáÛÇÁ ÇáåæíÉ \"%s\" ÈäÌÇÍ."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "ÅáÛÇÁ ÑÓÇáÉ"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "ÅÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Êã ÊÛííÑ ÇáÊæÞíÚ ÈäÌÇÍ."
+
+#: lib/MIME/Viewer/alternative.php:86
+msgid "There are no alternative parts that can be displayed inline."
+msgstr ""
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "áÇ ÊæÌÏ ÑÓÇÆá Ýí ÕäÏæÞ ÇáÈÑíÏ."
 
-#: mailbox.php:218
-#, c-format
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "åäÇáß ãÔßáÉ äÚØá %s. åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
 
-#: mailbox.php:227
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "åäÇáß ãÔßáÉ ÊÚØá ÕäÏæÞ ÇáÈÑíÏ. åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
-
-#: mailbox.php:333
-#, c-format
-msgid ""
-"There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "åäÇáß ãÔßáÉ ÊÚØá ÕäÏæÞ ÇáÈÑíÏ. åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã : %s"
 
-#: compose.php:973
-#, c-format
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size (%d MB)."
-msgstr ""
-"åäÇáß ãÔßáÉ ãÊÚáÞÉ ÈÊÍãíá ÇáãáÝ. ÞÏ íßæä ÍÌã ÇáãáÝ ÇßÈÑ ãä  "
-"ÇáÍÏ ÇáÃÚáì ÇáãÓãæÍ Èå æåæ (%d ãíÌÇÈÇíÊ)."
-
-#: compose.php:998
-msgid ""
-"There was a problem with the file upload. The file may have been larger than "
-"the maximum allowed size."
-msgstr ""
-"åäÇáß ãÔßáÉ ãÊÚáÞÉ ÈÊÍãíá ÇáãáÝ. ÞÏ íßæä ÍÌã ÇáãáÝ ÇßÈÑ ãä  "
-"ÇáÍÏ ÇáÃÚáì ÇáãÓãæÍ Èå."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "åäÇáß ãÔßáÉ ÊÚØá ÕäÏæÞ ÇáÈÑíÏ. åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
 
-#: lib/Message.php:123
-#, c-format
+#: lib/Message.php:90
+#, fuzzy, php-format
 msgid ""
-"There was an error copying messages to \"%s\". This is what the server said"
-msgstr ""
-"åäÇáß ÎØÇ Ýí äÓÎ ÇáÑÓÇÆá Åáì  \"%s\". åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã"
-""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "åäÇáß ÎØÇ Ýí äÓÎ ÇáÑÓÇÆá Åáì  \"%s\". åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã"
 
-#: lib/Message.php:225
-#, c-format
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÅáÛÇÁ ÇáÑÓÇÆá ãä ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÃÝÇÏ "
-"Èå ÇáãÎÏã"
+msgstr "åäÇáß ÎØÃ Ýí ÅáÛÇÁ ÇáÑÓÇÆá ãä ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã"
 
-#: lib/Message.php:300
-#, c-format
+#: lib/Message.php:275
+#, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÅáÛÇÁ ÇáÑÓÇÆá Ýí ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÃÝÇÏ  "
-"Èå ÇáãÎÏã"
+msgstr "åäÇáß ÎØÃ Ýí ÅáÛÇÁ ÇáÑÓÇÆá Ýí ÇáãÌáÏ  \"%s\". åÐÇ ãÇ ÃÝÇÏ  Èå ÇáãÎÏã"
 
-#: lib/Message.php:255 lib/Message.php:263
-msgid "There was an error deleting messages. This is what the server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÅáÛÇÁ ÇáÑÓÇÆá. åÐÇ ãÇ ÃÝÇÏ "
-"Èå ÇáãÎÏã "
+#: lib/Message.php:211
+#, fuzzy, php-format
+msgid "There was an error deleting messages. This is what the server said: %s"
+msgstr "åäÇáß ÎØÃ Ýí ÅáÛÇÁ ÇáÑÓÇÆá. åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
+
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
 
-#: lib/MIME/Viewer/text.php:29 lib/MIME/Viewer/enriched.php:48
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "åäÇáß ÎØÃ Ýí ÚÑÖ åÐÇ ÇáÌÒÁ ãä ÇáÑÓÇáÉ"
 
-#: lib/Message.php:362 lib/Message.php:377
-#, c-format
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÊÚáíã ÇáÑÓÇÆá Ýí ÇáãÌáÏ \"%s\". åÐÇ ãÇ ÃÝÇÏ  "
-"Èå ÇáãÎÏã "
+msgstr "åäÇáß ÎØÃ Ýí ÊÚáíã ÇáÑÓÇÆá Ýí ÇáãÌáÏ \"%s\". åÐÇ ãÇ ÃÝÇÏ  Èå ÇáãÎÏã "
 
-#: lib/Message.php:385
-msgid "There was an error flagging messages. This is what the server said"
-msgstr ""
-"åäÇáß ÎØÃ Ýí ÊÚáíã ÇáÑÓÇÆá. åÐÇ ãÇ ÃÝÇÏ  "
-"Èå ÇáãÎÏã "
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "ÎØÃ Ýí ÍÝÙ ãÓæÏÉ."
+
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
 
-#: lib/Message.php:119
-#, c-format
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
+
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "åäÇáß ÎØÃ Ýí ÅÑÓÇá ÑÓÇáÊß : %s"
+
+#: lib/Message.php:85
+#, fuzzy, php-format
 msgid ""
-"There was an error moving messages to \"%s\". This is what the server said"
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "åäÇáß ÎØÃ Ýí äÞá ÇáÑÓÇÆá Åáì  \"%s\". åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
+
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "åäÇáß ÎØÃ Ýí ÚÑÖ åÐÇ ÇáÌÒÁ ãä ÇáÑÓÇáÉ"
+
+#: compose.php:1006
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr "åäÇáß ÎØÃ Ýí ÅÑÓÇá ÑÓÇáÊß : %s"
+
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "åäÇáß ÎØÃ Ýí ÅÑÓÇá ÑÓÇáÊß : %s"
+
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "åäÇáß ÎØÃ Ýí ÚÑÖ åÐÇ ÇáÌÒÁ ãä ÇáÑÓÇáÉ"
+
+#: lib/MIME/Viewer/html.php:97
+msgid "This HTML message has images embedded in it."
 msgstr ""
-"åäÇáß ÎØÃ Ýí äÞá ÇáÑÓÇÆá Åáì  \"%s\". åÐÇ ãÇ ÃÝÇÏ "
-"Èå ÇáãÎÏã "
 
-#: lib/Message.php:219 lib/Message.php:249
+#: lib/MIME/Viewer/html.php:90
 msgid ""
-"There was an error moving messages to the trash. This is what the server said"
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
 msgstr ""
-"åäÇáß ÎØÃ Ýí äÞá ÇáÑÓÇÆá Åáì ÓáÉ ÇáãåãáÇÊ. "
-"åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
 
-#: compose.php:966
-msgid "There was an error saving a draft."
-msgstr "ÎØÃ Ýí ÍÝÙ ãÓæÏÉ."
+#: lib/MIME/Viewer/pgp.php:166
+msgid "This PGP Public Key was attached to the message."
+msgstr ""
 
-#: compose.php:886
-#, c-format
-msgid "There was an error sending your message: %s"
-msgstr "åäÇáß ÎØÃ Ýí ÅÑÓÇá ÑÓÇáÊß : %s"
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
 
-#: lib/Message.php:313
-msgid "There was an error undeleting messages. This is what the server said"
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
 msgstr ""
-"åäÇáß ÎØÃ- ÇáÊÑÇÌÚ Úä ÅáÛÇÁ ÇáÑÓÇÆá.   "
-"åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã"
 
-#: mailbox.php:151
-msgid "There was an error viewing the requested message."
-msgstr "åäÇáß ÎØÇ Ýí ÚÑÖ ÇáÑÓÇáÉ ÇáãØáæÈÉ."
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "ÞÏ íÓÊÛÑÞ åÐÇ ÈÚÖ ÇáæÞÊ.  ÊÃßíÏ ÇáÇÓÊãÑÇÑ¿"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:410
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:414
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
-#: templates/index/notconfigured.inc:32
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
 msgid ""
-"This file controls local MIME drivers for IMP, specifically what kinds of "
-"attachments are viewable and/or downloadable."
-msgstr ""
-"åÐÇ ÇáãáÝ íÊÍßã ÈÃäæÇÚ MIME  ááÜ IMP ¡ ÈÇáÖÈØ Ãí äæÚ ãä  "
-"ÇáãÑÝÞÇÊ íãßä ÚÑÖå æ/Ãæ ÊÍãíáå."
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr "%s áÇ íÙåÑ Çäå ÚäæÇä ÈÑíÏí ÕÇáÍ."
 
-#: templates/index/notconfigured.inc:39
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
-"This file controls the default preferences for IMP, and also controls which "
-"preferences users can alter."
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
 msgstr ""
-"åÐÇ ÇáãáÝ íÊÍßã Ýí ÇáÎíÇÑÇÊ ÇáÇÝÊÑÇÖíÉ  IMP ¡ æíÊÍßã ÃíÖÇ ÈÃí ÎíÇÑÇÊ íãßä ááãÓÊÎÏã ÊÚÏíáåÇ "
-""
 
-#: templates/index/notconfigured.inc:46
-msgid ""
-"This file controls the default settings for IMP, and also defines the list "
-"of available servers if you are using the server list."
+#: lib/MIME/Viewer/pkcs7.php:170
+msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
-" åÐÇ ÇáãáÝ íÊÍßã Ýí ÇáÎíÇÑÇÊ ÇáÇÝÊÑÇÖíÉ IMP  ¡ æíÚÑÝ ÃíÖÇ ÞÇÆãÉ  "
-"ÇáãÎÏãÇÊ ÇáãÊæÝÑÉ ÅÐÇ ßäÊ ÊÓÊÎÏã ÞÇÆãÉ ãÎÏãÇÊ."
 
-#: templates/index/notconfigured.inc:25
-msgid ""
-"This file controls the style sheet that is used to set colors and fonts in "
-"addition to or overriding Horde defaults."
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+msgid "This message has been digitally signed via PGP."
 msgstr ""
-"íÊÍßã åÐÇ ÇáãáÝ Ýí ÔÑíÍÉ  ÇáÓãÇÊ ÇáÊí ÊÓÊÎÏã áÖÈØ ÇáÃáæÇä æÇáÎØæØ ÈÇáÅÖÇÝÉ Åáì"
-" Ãæ ÊÌÇåá ÇáÎíÇÑÇÊ ÇáÃÓÇÓíÉ áåæÑÏí."
 
-#: templates/index/notconfigured.inc:18
-msgid ""
-"This is the main IMP configuration file. It contains paths and options for "
-"the IMP scripts."
+#: lib/MIME/Viewer/pkcs7.php:143
+msgid "This message has been digitally signed via S/MIME."
 msgstr ""
-"åÐÇ åæ ÇáãáÝ ÇáÑÆíÓí áÖæÇÈØ  IMP æíÍÊæí Úáì ãÓÇÑÇÊ  "
-"æÇáÎíÇÑÇÊ áÊÑãíÒ  IMP."
 
-#: templates/folders/javascript.inc:7
-msgid "This may take some time. Are you sure you want to continue?"
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+msgid "This message has been encrypted via S/MIME."
 msgstr ""
-"ÞÏ íÓÊÛÑÞ åÐÇ ÈÚÖ ÇáæÞÊ.  "
-"ÊÃßíÏ ÇáÇÓÊãÑÇÑ¿"
 
-#: message.php:435
-msgid "This message has been reported as spam to your system administrator."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
 msgstr ""
-"Êã ÊÞÏíã ÊÞÑíÑ ÈåÐå ÇáÑÓÇáÉ ßÑÓÇáÉ ÛíÑ ãÑÛæÈ ÈåÇ Åáì ãÏíÑ ÇáäÙÇã."
 
-#: message.php:457
+#: message.php:211
 msgid "This message to"
 msgstr "åÐå ÇáÑÓÇáÉ Åáì"
 
-#: prefs.php:105
-msgid "This number must be at least one."
-msgstr "íÌÈ Ãä íßæä åÐÇ ÇáÑÞã æÇÍÏ Úáì ÇáÃÞá."
-
-#: prefs.php:103
-msgid "This value must be a number."
-msgstr "íÌÈ Ãä Êßæä ÇáÞíãÉ ÚÈÇÑÉ Úä ÑÞã."
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
 
-#: templates/contacts/javascript.inc:78
-msgid "This window must be called from compose window"
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "íÌÈ äÏÇÁ åÐå ÇáäÇÝÐÉ ãä äÇÝÐÉ ÅäÔÇÁ ÇáÑÓÇÆá"
 
-#: templates/mailbox/message_headers.inc:23
-#: templates/mailbox/message_headers.inc:28
-msgid "Thread"
-msgstr "ÓáÓáÉ"
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "ÚÜÑÖ"
 
-#: config/prefs.php.dist:512
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "ÚÑÖ ÊÓáÓáí"
 
-#: config/prefs.php.dist:45
-msgid "Time Zone"
-msgstr "äØÇÞ ÇáÊæÞíÊ"
-
-#: templates/search/main.inc:38 templates/compose/compose.inc:106
-#: templates/compose/bounce.inc:28 templates/message/headers.inc:12
-#: mailbox.php:673
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Åáì"
 
-#: templates/filters/manage.inc:13 filters.php:139
-msgid "To:"
-msgstr "Åáì :"
-
-#: templates/compose/compose.inc:459
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "ãÌãæÚ ÇáÍÌã : %s ß È"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "ãä ÇáÚäæÇä"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "ãÑÝÞÇÊ"
+
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "ÓáÉ ÇáãåãáÇÊ :"
 
 #: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "ÓáÉ ÇáãåãáÇÊ :"
 
-#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "áã íÑÏ ÚáíåÇ"
 
-#: templates/search/main.inc:157
+#: templates/search/main.inc:35
 msgid "Unanswered messages"
 msgstr "ÑÓÇÆá áã íÊã ÇáÑÏ ÚáíåÇ"
 
-#: templates/mailbox/actions.inc:13 templates/message/navbar.inc:5
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "ÊÑÇÌÚ Úä ÇáÅáÛÇÁ"
 
-#: mailbox.php:671 message.php:101
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "ãÓÊáãíä ãÎÝííä"
 
-#: identities.php:74 identities.php:75
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "ãÓÊáãíä ãÎÝííä"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "Unload Passphrase"
+msgstr ""
+
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "áã ÊÓãì"
 
-#: config/conf.php.dist:130
-msgid "Unread"
-msgstr "áã ÊÞÑÃ"
-
-#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "áã ÊÑì"
 
-#: templates/folders/actions.inc:32
-msgid "Unseen Messages"
-msgstr "ÑÓÇÆá áã ÊÑì"
-
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "ÅáÛÇÁ ÇáÇÔÊÑÇß ãä ãÌáÏ (ãÌáÏÇÊ)"
 
-#: templates/prefs/sourceselect.inc:288
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "ÇÓÊÎÏã ÒÑ ÊÍßã/ÇÎÊíÇÑ+ÇáäÞÑ áÇÎÊíÇÑ ÍÞæá ãÊÚÏÏÉ"
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+msgid "Upload"
+msgstr ""
 
-#: templates/identities/manage.inc:94
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "ÇÓÊÎÏã ÇáÞíãÉ ÇáÇÝÊÑÇÖíÉ"
 
-#: config/prefs.php.dist:265
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "ÇÓÊÎÏã ÇÔÊÑÇßÇÊ ãÌáÏ  IMAP¿"
 
-#: prefs.php:285
-msgid "User Options"
-msgstr "ÎíÇÑÇÊ ÇáãÓÊÎÏã"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
+
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "ÇÓã ÇáãÓÊÎÏã"
 
-#: templates/login/login.inc:69
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "ÇÓã ÇáãÓÊÎÏã"
 
-#: lib/MIME/Viewer/text.php:110 lib/MIME/Viewer/enriched.php:184
-#: lib/IMP.php:1043
-#, c-format
+#: templates/fetchmail/manage.inc:17
+#, fuzzy
+msgid "Username:"
+msgstr "ÇÓã ÇáãÓÊÎÏã"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+#, fuzzy
+msgid "View"
+msgstr "ÚÑÖ %s"
+
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "ÚÑÖ %s"
 
-#: folders.php:350
-msgid "View messages in "
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "ÃÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
+msgid "View Personal Private Key"
+msgstr ""
+
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+msgid "View Personal Public Key"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "ÓáÓáÉ"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "ÃÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "ÃÑÓá ÑÓÇáÉ Ýí äÇÝÐÉ ÌÏíÏÉ ¿"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "ÚÑÖ ÇáÑÓÇÆá Ýí "
 
-#: templates/prefs/initialpageselect.inc:26
-msgid "View of mailbox to display after login:"
+#: templates/prefs/initialpageselect.inc:23
+#, fuzzy
+msgid "View or mailbox to display after login:"
 msgstr "Ôßá  ÕäÏæÞ ÈÑíÏ ááÅÙåÇÑ ÈÚÏ ÇáÏÎæá :"
 
-#: templates/message/navbar.inc:50
-msgid "WIN charset"
-msgstr "ÊÑãíÒ ÇáæíäÏæÒ"
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "ÚÑÖ %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "ÚÑÖ ÇáÑÓÇÆá Ýí "
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "ÅäÔÇÁ ãÌáÏ"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "ãÌáÏ ÓáÉ ãåãáÇÊ ÝÇÑÛÉ"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
 
-#: status.php:43
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "ÊÍÐíÑ"
 
-#: templates/login/login.inc:63 login.php:164
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "ãÑÍÈÇ Èß Ýí %s"
 
-#: config/prefs.php.dist:389
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
@@ -2001,41 +4724,100 @@
 "ÚäÏ ÅáÛÇÁ ÑÓÇÆá ¡ Þã ÈäÞáåÇ Åáì ãÌáÏ ÓáÉ ÇáãåãáÇÊ ÈÏáÇ ãä ÊÚáíãåä ßÑÓÇÆá "
 "ãáÛíÉ ¿"
 
-#: config/prefs.php.dist:612
-msgid "Wrap text at this many characters."
-msgstr "ÞíÏ ÇáäÕ ÈåÐÇ Çáßã ãä ÇáÍÑæÝ."
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
-#: config/prefs.php.dist:552
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "äÚã"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Çäß ÊÍÇæá ÅáÛÇÁ ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Çäß ÊÍÇæá ÅáÛÇÁ ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Çäß ÊÍÇæá ÅáÛÇÁ ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
 
-#: templates/mailbox/javascript.inc:81
-#: templates/message/javascript.inc:14
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Çäß ÊäÓÎ/ÊäÞá Åáì ãÌáÏ ÌÏíÏ."
 
-#: templates/folders/javascript.inc:98
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Çäß ÊÖíÝ ãÌáÏ ÝÑÚí Åáì "
 
-#: templates/folders/javascript.inc:100
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "ÓæÝ  ÊäÔí ãÌáÏ ÃÓÇÓí."
 
-#: templates/folders/javascript.inc:135
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "ÓæÝ  ÊäÔí ãÌáÏ ÃÓÇÓí."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Çäß ÊÚíÏ ÊÓãíÉ ÇáãÌáÏ : "
 
-#: identities.php:84
-msgid "You can not have the '\\' character in your full name."
-msgstr "áÇ íãßäß ÇÓÊÎÏÇã ÇáÑãÒ '\\' Ýí ÇÓãß ÇáßÇãá."
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Êã ÅáÛÇÁ ÇÔÊÑÇßß ÈäÌÇÍ ãä \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
+
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
+
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
 
 #: templates/mailbox/alert.inc:3
-#, c-format
+#, php-format
 msgid "You have %s new messages."
 msgstr "ÊæÌÏ áÏíß %s ÑÓÇáÉ ÌÏíÏÉ."
 
@@ -2043,219 +4825,387 @@
 msgid "You have 1 new message."
 msgstr "áÏíß ÑÓÇáÉ æÇÍÏÉ ÌÏíÏÉ."
 
-#: login.php:21
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "áÞÏ Êã ÇáÎÑæÌ ãä ÇáäÙÇã .<br />äÔßÑß Úáì ÇÓÊÎÏÇãß ÇáäÙÇã."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "áÏíß ÑÓÇáÉ æÇÍÏÉ ÌÏíÏÉ."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
-#: templates/folders/confirm.inc:3
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "áÏíß ÈÑíÏ ÌÏíÏ Ýí ÇáãÌáÏ ÇáÊÇáí :"
 
-#: templates/folders/alert.inc:3
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "áÏíß ÈÑíÏ ÌÏíÏ Ýí ÇáãÌáÏÇÊ ÇáÊÇáíÉ :"
 
-#: templates/compose/javascript.inc:35
-msgid "You must first select the attachment(s) to delete."
-msgstr "íÌÈ Ãä ÊÎÊÇÑ ÇáãÑÝÞÇÊ ÇáãÑÇÏ ÅáÛÇÄåÇ ÃæáÇ."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "íÌÈ Ãä íßæä áÏíß ãÓÊÞÈá æÇÍÏ Úáì  ÇáÃÞá."
 
-#: templates/compose/javascript.inc:10
-msgid "You must first specify the file to attach."
-msgstr "íÌÈ ÃæáÇ ÊÍÏíÏ ÇáãáÝ ÇáãÑÇÏ ÅÑÝÇÞå."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
 
-#: compose.php:738
-msgid "You must have at least one recipient."
-msgstr "íÌÈ Ãä íßæä áÏíß ãÓÊÞÈá æÇÍÏ Úáì  ÇáÃÞá."
+#: lib/MIME/Viewer/pkcs7.php:249
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
 
-#: templates/mailbox/javascript.inc:90
-#: templates/message/javascript.inc:23
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "íÌÈ Ãä ÊÎÊÇÑ ÕäÏæÞ ÇáÈÑíÏ ÇáåÏÝ ÃæáÇ."
 
-#: templates/contacts/javascript.inc:56
+#: fetchmailprefs.php:85
+#, fuzzy
+msgid "You must select an account to be deleted."
+msgstr "íÌÈ Ãä ÊÎÊÇÑ åæíÉ áíÊã ÅáÛÇÄåÇ."
+
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "íÌÈ Ãä ÊÎÊÇÑ ÚäæÇä ÃæáÇ."
 
-#: identities.php:134
-msgid "You must select an identity to be deleted."
-msgstr "íÌÈ Ãä ÊÎÊÇÑ åæíÉ áíÊã ÅáÛÇÄåÇ."
-
-#: templates/mailbox/javascript.inc:21
-#: templates/mailbox/javascript.inc:97
-#: templates/mailbox/javascript.inc:108
-#: templates/mailbox/javascript.inc:155
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "íÌÈ Ãä ÊÎÊÇÑ ÑÓÇáÉ æÇÍÏÉ Úáì ÇáÃÞá."
 
-#: templates/compose/bounce.inc:6
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "íÌÈ ÊÍÏíÏ ãÓÊáã."
 
-#: lib/Folder.php:403
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "íÌÈ ÃæáÇ ÊÍÏíÏ ÇáãáÝ ÇáãÑÇÏ ÅÑÝÇÞå."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "ÅÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "ÅÚÇÏÉ ÊæÌíå åÐå ÇáÑÓÇáÉ"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "áã Êßä ãÔÊÑßÇ ÈÜ \"%s\". åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
 
-#: lib/Folder.php:437
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "áã íÊã ÅáÛÇÁ ÇÔÊÑÇßß ãä  \"%s\".  åÐÇ ãÇ ÃÝÇÏ Èå ÇáãÎÏã "
 
-#: lib/Folder.php:407
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Êã ÅÔÑÇßß ÈäÌÇÍ Ýí  \"%s\""
 
-#: lib/Folder.php:441
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Êã ÅáÛÇÁ ÇÔÊÑÇßß ÈäÌÇÍ ãä \"%s\""
 
-#: login.php:20
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr " ÌáÓÊ Úãáß %s ÇäÊåÊ. íÑÌì ÇáÏÎæá ãÑÉ ÃÎÑì."
-
-#: templates/identities/manage.inc:59
-msgid "Your From: address:"
-msgstr "ÇáÚäæÇä :  ãä :"
-
-#: config/prefs.php.dist:23 config/prefs.php.dist:30 config/prefs.php.dist:37
-#: config/prefs.php.dist:44
-msgid "Your Information"
-msgstr "ãÚáæãÇÊß"
-
-#: templates/identities/manage.inc:64
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "ÚäæÇä : ÇáÑÏ Åáì : <i>(ÇÎÊíÇÑí)</i>"
+#: templates/pgp/pgp.inc:98
+#, fuzzy
+msgid "Your Name"
+msgstr "ÇÓãß ÇáßÇãá :"
 
-#: lib/MIME/Viewer/images.php:52
-msgid "Your browser does not support inline display of this image type"
-msgstr "áÇ íÏÚã ãÊÕÝÍß ÇáÚÑÖ ÇáÏÇÎáí áåÐÇ ÇáäæÚ ãä ÇáÕæÑ"
+#: templates/pgp/pgp.inc:50
+msgid "Your PGP Public/Private Keys"
+msgstr ""
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+msgid "Your Private Key"
 msgstr ""
-"áÇ íÏÚã ãÊÕÝÍß ÎíÇÑ ÇáØÈÇÚÉ åÐÇ ÇÖÛØ ÒÑ  ÊÍßã + ÇáÍÑÝ Èí áßí  "
-"ÊÞæã ÈÇáØÈÇÚÉ."
 
-#: config/prefs.php.dist:297
-msgid "Your current time zone:"
-msgstr "äØÇÞ ÊæÞíÊß ÇáÍÇáí :"
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
+#, fuzzy
+msgid "Your Public Key"
+msgstr "ÇÓãß ÇáßÇãá :"
 
-#: templates/prefs/identityselect.inc:14
-msgid "Your default identity:"
-msgstr "åæíÊß ÇáÇÎÊíÇÑíÉ :"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "ÚäæÇä : ÇáÑÏ Åáì : <i>(ÇÎÊíÇÑí)</i>"
 
-#: templates/identities/manage.inc:54
-msgid "Your full name:"
-msgstr "ÇÓãß ÇáßÇãá :"
+#: templates/smime/smime.inc:49
+msgid "Your S/MIME Public/Private Certificates"
+msgstr ""
 
-#: templates/identities/manage.inc:10
-msgid "Your identities:"
+#: templates/fetchmail/account_select.inc:16
+#, fuzzy
+msgid "Your accounts:"
 msgstr "ãÚÑÝÇÊß:"
 
-#: prefs.php:253
-msgid "Your options have been updated."
-msgstr "Êã ÊÚÏíá ÎíÇÑÇÊß."
-
-#: templates/compose/javascript.inc:170
+#: config/prefs.php.dist:173
 msgid ""
-"Your session will expire in 1 minute. Do you want to reload the page to "
-"prevent losing your work?"
-msgstr "ÇáÌáÓÉ ÓæÝ ÊäÊåí ÎáÇá ÏÞíÞÉ æÇÍÏÉ. åá ÊÑíÏ ÅÚÇÏÉ ÊÍãíá ÇáÕÝÍÉ ßí áÇ  "
-"ÊÝÞÏ Úãáß ÇáÍÇáí ¿"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-#: templates/compose/javascript.inc:168
-msgid ""
-"Your session will expire in 5 minutes. Do you want to reload the page to "
-"prevent losing your work?"
-msgstr "ÇáÌáÓÉ ÓæÝ ÊäÊåí ÎáÇá ÎãÓ ÏÞÇÆÞ. åá ÊÑíÏ ÅÚÇÏÉ ÊÍãíá ÇáÕÝÍÉ ßí áÇ  "
-"ÊÝÞÏ Úãáß ÇáÍÇáí ¿"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr "áÇ íÏÚã ãÊÕÝÍß ÇáÚÑÖ ÇáÏÇÎáí áåÐÇ ÇáäæÚ ãä ÇáÕæÑ"
+
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
+
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Êã ÅáÛÇÁ ÇáãÌáÏ \"%s\" ÈäÌÇÍ."
 
-#: templates/identities/manage.inc:69
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "ÊæÞíÚß :"
 
-#: lib/IMP.php:1190 lib/IMP.php:1192 lib/IMP.php:1203 message.php:510
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[áÇ íæÌÏ ãæÖæÚ]"
 
-#: templates/prefs/sourceselect.inc:269
-msgid "add source"
-msgstr "ÃÖÝ ÇáãÕÏÑ"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "ãÑÝÞ ãÎÝí"
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
 
-#: filters.php:120
-msgid "cannot move past the beginning"
-msgstr "áÇ íãßä ÇáÚæÏÉ Åáì ÇáÈÏÇíÉ"
-
-#: filters.php:103
-msgid "cannot move past the end"
-msgstr "áÇ íãßä ÇáÚæÏÉ Åáì ÇáäåÇíÉ"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "äÓÎÉ"
 
-#: templates/filters/manage.inc:56
-msgid "delete message"
-msgstr "ÅáÛÇÁ ÑÓÇáÉ"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "ÅáÛÇÁ"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "ãÌáÏÇÊ"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "åæíÉ"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "ÎÑæÌ"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "ãßæäÇÊ ÇáÑÓÇáÉ"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "ÑÓÇÆá ÌÏíÏÉ"
+
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "ØÈÇÚÉ"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+msgid "_Priority"
+msgstr ""
 
-#: templates/contacts/contacts.inc:21
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "ÊÍÏíË"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "ÇáÑÏ"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "ÈÍË"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "ÃÑÓá ÑÓÇáÉ"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "ÓáÓáÉ"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Åáì"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "ÊÑÇÌÚ Úä ÇáÅáÛÇÁ"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "ÓáÓáÉ"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "ãÑÝÞ"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "ãÑÝÞÇÊ"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "ãä"
 
-#: templates/prefs/sourceselect.inc:282
-msgid "move down"
-msgstr "ÇäÊÞá Åáì ÇáÃÓÝá"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-#: templates/filters/manage.inc:58
-msgid "move message to"
-msgstr "ÇäÞá ÇáÑÓÇÆá Åáì"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:280
-msgid "move up"
-msgstr "ÇäÊÞá Åáì ÇáÃÚáì"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-#: filters.php:45 filters.php:68
-msgid "no folder selected"
-msgstr "áã íÊã ÇÎÊíÇÑ ãÌáÏ"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
+
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "ÕäÏæÞ ÇáÈÑíÏ"
 
-#: filters.php:79 filters.php:90 filters.php:107 filters.php:124
-msgid "no rule selected"
-msgstr "áã íÊã ÇÎÊíÇÑ ÞÇÚÏÉ"
-
-#: filters.php:75
-msgid "no text specified"
-msgstr "áã íÊã ÊÍÏíÏ äÕ"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "ÇáÇÓã"
 
-#: templates/compose/spelling.inc:64 templates/filters/list.inc:25
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "áÇ ÔíÁ"
 
-#: templates/compose/spelling.inc:94 filters.php:151
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "Ãæ"
 
-#: filters.php:53
-msgid "please fill in the text and choose a field and an action"
-msgstr "íÑÌì ÊÚÈÆÉ ÇáäÕ æÇÎÊÑ ÍÞá æÅÌÑÇÁ"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-#: templates/prefs/sourceselect.inc:271
-msgid "remove source"
-msgstr "ÅÒÇáÉ ÇáãÕÏÑ"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-#: filters.php:158
-msgid "select folder"
-msgstr "ÇÎÊÑ ãÌáÏ"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "ÎØÃ ÅãáÇÆí"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "ÃÎØÇÁ ÅãáÇÆíÉ"
 
-#: templates/filters/list.inc:42
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "ÈíäãÇ ÇáÍÞá  %s íÍÊæí <b>%s</b>"
\ Ingen nyrad vid filslut
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "ÎØÃ ÅãáÇÆí"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "ÇáÞÇÆãÉ ÇáÓæÏÇÁ"
+
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/templates/acl/acl.inc
+++ mod/templates/acl/acl.inc
@@ -1,4 +1,4 @@
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 <?php if (isset($js_right)): ?>
 var users = new Array(<?php echo $js_user ?>);
@@ -14,7 +14,7 @@
     if (num == <?php echo count($curr_acl) ?>) {
         resetForm();
     } else {
-        document.acl.share_user.value = users[num];  
+        document.acl.share_user.value = users[num];
         document.acl.share_user.disabled = true;
 <?php if (!empty($js_right)): ?>
 <?php foreach ($js_right as $key => $val): ?>
@@ -49,8 +49,8 @@
 {
     if (document.folders.folder[document.folders.folder.selectedIndex].value != '') {
         if (loading == null || clear != null) {
-            loading = true; 
-            disableButtons(); 
+            loading = true;
+            disableButtons();
             document.folders.submit();
         }
     }
@@ -62,10 +62,10 @@
     }
     if (document.acl.resetbut) {
         document.acl.resetbut.disabled = true;
-    }    
+    }
     if (document.acl.back) {
         document.acl.back.disabled = true;
-    }    
+    }
     if (document.acl.number) {
         for (var i = 0; i < document.acl.number.length; i++) {
             document.acl.number[i].disabled = true;
@@ -81,94 +81,100 @@
 <form method="post" name="folders" action="<?php echo Horde::applicationUrl('acl.php') ?>">
 <input type="hidden" name="actionID" value="" />
 <?php Util::pformInput() ?>
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-  <td colspan="2" class="header"><?php echo _("Share mail folders") ?></td>
+<div class="header">
   <?php Prefs_UI::generateNavigationCell('acl') ?>
-</tr>
-<tr><td colspan="2">&nbsp;</td></tr>
-<tr>
-  <td colspan="2">
-
-    <table width="100%" cellspacing="0">
-    <tr>
-      <td align="left" class="header" nowrap="nowrap"><?php echo sprintf(_("Current access to %s"), String::convertCharset($folder, 'UTF7-IMAP')) ?></td>
-      <td align="right" class="header" nowrap="nowrap">
-        <?php echo Horde::link('', _("Change Folder"), 'smallheader', '', 'ACLFolderChange(true); return false;') ?>
-        <?php echo Horde::img('shared.png', _("Change Folder")) ?></a>
-        <select name="folder" onchange="ACLFolderChange()"><?php echo $options ?></select>&nbsp;
-      </td>
-    </tr>
-    </table>
-  </td>
-</tr>
+  <?php echo _("Share mail folders") ?>
+</div>
+
+<div class="header">
+  <ul>
+    <li>
+      <?php echo Horde::link('#', _("Change Folder"), 'smallheader', '', 'ACLFolderChange(true); return false;') ?><?php echo Horde::img('shared.png', _("Change Folder")) ?></a><select name="folder" onchange="ACLFolderChange()"><?php echo $options ?></select>&nbsp;
+    </li>
+  </ul>
+  <?php printf(_("Current access to %s"), String::convertCharset($folder, 'UTF7-IMAP')) ?>
+</div>
 </form>
+
 <form method="post" name="acl" action="<?php echo Horde::applicationUrl('acl.php') ?>">
-<input type="hidden" name="actionID" value="imp_acl_set" />
-<input type="hidden" name="folder" value="<?php echo $folder ?>" />
-<?php Util::pformInput() ?>
+  <input type="hidden" name="actionID" value="imp_acl_set" />
+  <input type="hidden" name="folder" value="<?php echo $folder ?>" />
+  <?php Util::pformInput() ?>
+<table cellspacing="0" width="100%">
 <?php if (!count($curr_acl)): ?>
-<tr>
-  <td colspan="2" class="item" align="left"><i><b>&nbsp;<?php echo _("The current list of users with access to this folder could not be retrieved") ?></b></i></td>
-</tr>
+  <tr>
+    <td colspan="2" class="item leftAlign">
+      <em><strong>&nbsp;<?php echo _("The current list of users with access to this folder could not be retrieved") ?></strong></em>
+    </td>
+  </tr>
 <?php else: ?>
 <?php $i = 1; foreach ($curr_acl as $index => $rule): ?>
-<tr>
-  <td class="light" align="right"><b><?php echo $i++ ?>&nbsp;</b></td>
-  <td class="item" align="left">
-    <input class="item" type="radio" name="number" value="<?php echo $i-2 ?>" <?php if (in_array($index, $protected)) echo 'disabled ' ?>onclick="selectRule(<?php echo $i - 2 ?>)" />&nbsp;&nbsp;
-    <b><?php echo $index ?></b>&nbsp;&nbsp;
+  <tr>
+    <td class="light rightAlign">
+      <strong><?php echo $i++ ?>&nbsp;</strong>
+    </td><td class="item leftAlign">
+      <input class="item" type="radio" name="number" value="<?php echo $i-2 ?>" <?php if (in_array($index, $protected)) echo 'disabled ' ?>onclick="selectRule(<?php echo $i - 2 ?>)" />&nbsp;&nbsp;
+      <strong><?php echo $index ?></strong>&nbsp;&nbsp;
     <?php foreach ($rule as $key => $val): ?><?php echo $key ?>,&nbsp;<?php endforeach; ?>
-  </td>
-</tr>
+    </td>
+  </tr>
 <?php endforeach; ?>
-<tr>
-  <td class="light" align="right"><b><?php echo _("New") ?>&nbsp;</b></td>
-  <td class="item" align="left">
-    <input class="item" type="radio" checked name="number" value="<?php echo $i - 1 ?>" onclick="selectRule(<?php echo $i - 1 ?>)" />&nbsp;&nbsp;
-  </td>
-</tr>
+  <tr>
+    <td class="light rightAlign">
+      <strong><?php echo _("New") ?>&nbsp;</strong>
+    </td><td class="item leftAlign">
+      <input class="item" type="radio" checked name="number" value="<?php echo $i - 1 ?>" onclick="selectRule(<?php echo $i - 1 ?>)" />&nbsp;&nbsp;
+    </td>
+  </tr>
 <?php endif; ?>
 
-<tr><td>&nbsp;</td></tr>
-<tr>
-  <td colspan="2" class="header"><b class="smallheader"><?php echo _("Grant access") ?></b></td>
-</tr>
+  <tr>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td colspan="2" class="header">
+      <span class="smallheader"><?php echo _("Grant access") ?></span>
+    </td>
+  </tr>
 
 <?php if ($canEdit): ?>
-<tr>
-  <td class="light" align="right"><b><?php echo _("User") ?>&nbsp;</b></td>
-  <td class="item" align="left">
-    &nbsp;<input class="fixed" type="text" name="share_user" />
-  </td>
-</tr>
+  <tr>
+    <td class="light rightAlign">
+      <strong><?php echo _("User") ?>&nbsp;</strong>
+    </td><td class="item leftAlign">
+      &nbsp;<input class="fixed" type="text" name="share_user" />
+    </td>
+  </tr>
 <?php foreach ($rights as $right => $desc): ?>
-<tr>
-  <td class="light" align="right"><b><?php echo $right ?>&nbsp;:&nbsp;</b></td>
-  <td class="item" align="left">
-    <input type="checkbox" name="acl[<?php echo $right ?>]" />
+  <tr>
+    <td class="light rightAlign">
+      <strong><?php echo $right ?>&nbsp;:&nbsp;</strong>
+    </td><td class="item leftAlign">
+      <input type="checkbox" name="acl[<?php echo $right ?>]" />
     &nbsp;<?php echo $desc ?>
-  </td>
-</tr>
+    </td>
+  </tr>
 <?php endforeach; ?>
-<tr>
-  <td>&nbsp;</td>
-  <td class="header" valign="middle">
-    <input type="button" class="button" name="fbutton" onclick="disableButtons(); document.acl.share_user.disabled = false; document.acl.submit();" value="<?php echo _("Create") ?>" />
-    <input type="button" class="button" name="resetbut" onclick="resetForm()" value="<?php echo _("Reset") ?>" />
-    <input type="button" class="button" name="back" onclick="disableButtons(); document.location.href='<?php echo $prefs_url ?>'" value="<?php echo _("Return to Options") ?>" />
-  </td>
-</tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td class="header" valign="middle">
+      <input type="button" class="button" name="fbutton" onclick="disableButtons(); document.acl.share_user.disabled = false; document.acl.submit();" value="<?php echo _("Create") ?>" />
+      <input type="button" class="button" name="resetbut" onclick="resetForm()" value="<?php echo _("Reset") ?>" />
+      <input type="button" class="button" name="back" onclick="disableButtons(); document.location.href='<?php echo $prefs_url ?>'" value="<?php echo _("Return to Options") ?>" />
+    </td>
+  </tr>
 
 <?php else: ?>
-<tr>
-  <td colspan="2" class="item" align="left"><i><b>&nbsp;<?php echo _("You do not have permission to change access to this folder") ?></b></i></td>
-</tr>
-<tr>
-  <td colspan="2" class="header" valign="middle">
-    <input type="button" class="button" name="back" onclick="disableButtons(); document.location.href='<?php echo $prefs_url ?>'" value="<?php echo _("Return to Options") ?>" />
-  </td>
-</tr>
+  <tr>
+    <td colspan="2" class="item leftAlign">
+      <em><strong>&nbsp;<?php echo _("You do not have permission to change access to this folder") ?></strong></em>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="2" class="header" valign="middle">
+      <input type="button" class="button" name="back" onclick="disableButtons(); document.location.href='<?php echo $prefs_url ?>'" value="<?php echo _("Return to Options") ?>" />
+    </td>
+  </tr>
 <?php endif; ?>
 </table>
 </form>


--- orig/locale/uk_UA/help.xml
+++ mod/locale/uk_UA/help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Horde: imp/locale/uk_UA/help.xml,v 1.17.6.1 2005/01/25 22:05:50 jan Exp $ -->
+<!-- $Horde: imp/locale/uk_UA/help.xml,v 1.17.6.5 2006/03/23 00:24:07 jan Exp $ -->
 <help>
   <entry id="compose-buttons" state="unknown">
     <title>Message Composition: Actions</title>
@@ -191,6 +191,12 @@
     Determines whether the attachments in your composition are saved with the message when stored in the sent-mail folder.  If "Yes", the attachment data will be saved.  If "No", the attachment data will be stripped from the message after it is sent to all recipients.  Choosing "No" will help conserve disk space by removing (potentially large) attachment information from the saved messages.
     </para>
 </entry>
+  <entry id="compose-link-attachments" state="new">
+    <title>Message Composition: Link Attachments</title>
+    <para>
+    Determines whether the attachments in your composition are sent as a part of the mail message or whether those attachments are kept on a local server.  If attachments are linked, the recipient(s) of your message will be provided a weblink where they can download the attachment(s).  Linking attachments has the advantage of tremendously reducing the size of outgoing messages.  Linking attachments has the disadvantage that the content of the attachments can not be guaranteed to be available in the future since the attachment data is not located within the e-mail message.
+    </para>
+</entry>
   <entry id="search" state="unknown">
     <title>Message Search</title>
     <heading>Search Criteria</heading>
@@ -644,6 +650,12 @@
      <para> %% : The '%' character</para>
 
 </entry>
+  <entry id="prefs-default_msg_charset" state="new">
+    <title>Preferences: Default Message Character Set</title>
+    <para>
+    Define the default character set to use for text message parts that do not contain explicit character set information. Per RFC 2045, messages without a character set parameter are displayed using the 'US-ASCII' character set. However, certain badly broken mailers may send out text messages in other character sets without setting the proper parameters in the message header. Set this parameter to the default character set string to use locally. Select "Default" to use the MIME defaults.
+    </para>
+</entry>
   <entry id="prefs-disposition_request_read" state="new">
     <title>Preferences: Request Read Receipts</title>
     <para>
@@ -662,6 +674,21 @@
     "Request Delivery Confirmation" sends a request to the recipient's e-mail server to notify you when it has delivered the message to the recipient's mailbox. It doesn't mean the message has been seen, just that it's sitting in a mailbox somewhere. Not all mail servers support this. 
     </para>
 </entry>
+  <entry id="prefs-delete_spam_after_report" state="new">
+    <title>Preferences: Delete Spam After Reporting</title>
+    <para>
+    You may elect to do one of three items after reporting a message as either spam or innocent.
+    </para>
+    <para>
+    First, you can decide to do nothing - the message will be reported as either spam or innocent but will otherwise remain unchanged in your mailbox.
+    </para>
+    <para>
+    Second, if reporting a message as spam, you can instead have the message be immediately deleted.  This setting has no effect on reporting a message as innocent.
+    </para>
+    <para>
+    Third, after reporting a message as spam the message will be deleted from the current mailbox and moved to your spam folder.  Alternatively, if reporting a message as innocent the message will be deleted from the current mailbox and moved to your INBOX.
+    </para>
+</entry>
   <entry id="prefs-html_image_replacement" state="new">
     <title>Preferences: HTML Image Replacement</title>
     <para>
@@ -691,4 +718,16 @@
      <para>* "Prompt every time an attachment is sent; default to NO" - ALWAYS prompt to save attachments in the compose screen; the default is to not save attachments.</para>
      <para>* "Never save attachments" - NEVER prompt to save attachments in compose screen; the attachments are NEVER saved with the message.</para>
 </entry>
+  <entry id="virtual_inbox" state="new">
+    <title>Virtual Folders: Virtual Inbox</title>
+    <para>
+    Virutal Inbox is a saved search that does away with the need to search every mailbox for messages marked as new.  Instead, all currently subscribed mailboxes are searched for new messages and the results are displayed in a single mailbox.
+    </para>
+</entry>
+  <entry id="virtual_trash" state="new">
+    <title>Virtual Folders: Virtual Trash</title>
+    <para>
+    Virtual Trash is a saved search that does away with the need for a separate Trash folder.  Instead of moving messages to a centralized trash folder, messages are simply marked as deleted in the current folder they live in.  When 'show deleted messages' is turned off, this results in these messages not appearing in a mailbox view.  When a user clicks on Virtual Trash, *all* mailboxes all searched for messages that are flagged deleted and these messages are displayed in a single mailbox.
+    </para>
+</entry>
 </help>


--- orig/themes/screen.css
+++ mod/themes/screen.css
@@ -1,7 +1,26 @@
 /**
- * $Horde: imp/themes/screen.css,v 1.2.2.6 2005/10/13 16:52:16 slusarz Exp $
+ * $Horde: imp/themes/screen.css,v 1.2.2.13 2006/03/28 16:20:30 jan Exp $
  */
 
+/* Align styles, added for BC. */
+.leftAlign {
+   text-align: left;
+}
+.rightAlign {
+   text-align: right;
+}
+.leftFloat {
+   float: left;
+}
+.rightFloat {
+   float: right;
+}
+
+/* Menu bottom margin, added for BC. */
+#menu {
+    margin-bottom: 8px;
+}
+
 /* Message list table styles. */
 .messageList {
     table-layout: fixed;
@@ -29,9 +48,33 @@
     overflow: hidden;
 }
 
-/* Message styles. */
+/* Based on the Mozilla default defintions */
 #html-message td {
-    padding: 0px;
+    padding: 0;
+}
+#html-message ul {
+    display: block;
+    list-style-type: disc;
+    margin: 1em 0;
+    -moz-padding-start: 40px;
+}
+#html-message ol {
+    display: block;
+    list-style-type: decimal;
+    margin: 1em 0;
+    -moz-padding-start: 40px;
+}
+#html-message li {
+    display: list-item;
+}
+#html-message p {
+    display: block;
+    margin: 1em 0;
+}
+#html-message blockquote[type="cite"] {
+    margin-top: 1em;
+    margin-bottom: 1em;
+    padding-left: 1em;
 }
 
 /* Legend styles. */
@@ -39,7 +82,7 @@
     padding: 5px;
 }
 .mailboxLegend li {
-    color: black;
+    color: #000;
     font-family: Geneva,Arial,Helvetica,sans-serif;
     font-size: 11px;
     list-style: none;
@@ -51,12 +94,12 @@
 }
 .mailboxLegend li div div {
     padding: 2px;
-    border: 1px solid #666666;
+    border: 1px solid #666;
     margin-right: .3em;
 }
 
 .composebody {
-    font-family: Courier New, Monospace;
+    font-family: monospace,fixed;
     font-size: 12px;
 }
 .folders {
@@ -66,64 +109,49 @@
     padding-top: 5px;
 }
 .seen {
-    background-color: white;
-}
-.seen:hover {
-    background-color: #f3f3f3;
+    background: #fff;
 }
-.seen-over {
-    background-color: #f3f3f3;
+.seen:hover, .seen-over {
+    background: #f3f3f3;
 }
 .deleted {
-    background-color: #999999;
-}
-.deleted:hover {
-    background-color: #777777;
+    background: #999;
 }
-.deleted-over {
-    background-color: #777777;
+tr.deleted:hover, tr.deleted-over {
+    background: #777;
 }
 .important {
-    background-color: #ffcccc;
+    background: #fcc;
 }
-.important:hover {
-    background-color: #ffaaaa;
-}
-.important-over {
-    background-color: #ffaaaa;
+tr.important:hover, tr.important-over {
+    background: #faa;
 }
 .unseen {
-    background-color: #eeeeff;
-}
-.unseen:hover {
-    background-color: #ccccff;
+    background: #eef;
 }
-.unseen-over {
-    background-color: #ccccff;
+tr.unseen:hover, tr.unseen-over {
+    background: #ccf;
 }
 .answered {
-    background-color: #ccffcc;
-}
-.answered:hover {
-    background-color: #99ee99;
+    background: #cfc;
 }
-.answered-over {
-    background-color: #99ee99;
+tr.answered:hover, tr.answered-over {
+    background: #9e9;
 }
 .folderunsub {
     font-style: italic;
 }
 .quotawarn {
-    color: black;
-    background-color: yellow;
+    color: #000;
+    background: yellow;
 }
 .quotaalert {
-    color: white;
-    background-color: red;
+    color: #fff;
+    background: #f00;
 }
 
 /* Pad the addressbook icon in header compose links. */
-.addrbookicon {
+.msgheader img {
     vertical-align: middle;
     padding: 1px;
 }


--- orig/po/sl_SI.po
+++ mod/po/sl_SI.po
@@ -1,191 +1,182 @@
-# Slovenian translations for Imp package
-# Slovenski prevodi paketa PACKAGE.
+# Slovenian translation of Imp
 # Copyright (C) 2005 Horde Project
 # This file is distributed under the same license as the Imp package.
-# Automatically generated, 2005.
-# Original Author: Jure Krasovic <jurek at rcc-irc.si>  (3.0 cvs)
-# Changed in august 2002: Bostjan Hojkar <hob at fov.uni-mb.si> (v3.1)
-# Changed in  april 2003: Bostjan Hojkar <hob at fov.uni-mb.si> (v3.2.1)
-# Changed in february 2005: Matic Dolar <smesni at medium.si>, (version h3-4.0.1)
-# Last-Translator: Robert Ludvik <r at aufbix.org>, (ver. h3-4.0.2)
+# Matic Dolar <smesni at medium.si>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Imp H3 (4.0.2)\n"
+"Project-Id-Version:  Imp H3 (4.0.1)\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-02-10 02:08+0100\n"
-"PO-Revision-Date: 2005-02-10 02:08+0100\n"
-"Last-Translator: Robert Ludvik <r at aufbix.org>\n"
-"Language-Team: i18n at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
+"PO-Revision-Date: 2005-02-21 15:25+0100\n"
+"Last-Translator: Matic Dolar <smesni at medium.si>\n"
+"Language-Team: Sloven¹èina\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
 
-#: lib/Compose.php:256 lib/Compose.php:308
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "      Za: "
+
+#: lib/Compose.php:415
 msgid "      To: "
-msgstr "       Prejemnik: "
+msgstr "      Za: "
 
-#: lib/Compose.php:244 lib/Compose.php:296
+#: lib/Compose.php:403
 msgid "    Date: "
-msgstr "    Datum: "
+msgstr "   Datum: "
 
-#: lib/Compose.php:247 lib/Compose.php:299
+#: lib/Compose.php:406
 msgid "    From: "
-msgstr "Po¹iljatelj: "
+msgstr "      Od: "
 
-#: mailbox.php:393
+#: mailbox.php:422 templates/folders/head.inc:7
 #, php-format
 msgid " (Accesskey %s)"
 msgstr " (Bli¾njica %s)"
 
-#: lib/Compose.php:253 lib/Compose.php:305
+#: lib/Compose.php:412
 msgid " Subject: "
-msgstr "  Naslov: "
+msgstr "  Zadeva: "
 
-#: templates/compose/spelling.inc:52
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " v "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr "%.2fMB / %.2fMB  (%.2f%%)"
 
-#: mailbox.php:190
-#, php-format
-msgid "%d message(s) have been deleted."
-msgstr "Izbrisanih sporoèil: %d."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "Ni sporoèil"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "%d sporoèil je bilo izbrisanih."
 
-#: lib/Spam.php:169
+#: lib/Spam.php:178
 #, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
-msgstr ""
-"%d sporoèil je bilo prijavljeno kot neza¾elena po¹ta vzdr¾evalcu sistema."
+msgstr "%d sporoèil je bilo va¹emu skrbniku prijavljenih kot za¾elena e-po¹ta."
 
-#: lib/Spam.php:149
+#: lib/Spam.php:158
 #, php-format
 msgid "%d messages have been reported as not spam."
-msgstr "%d sporoèil ni bilo oznaèenih kot neza¾elena po¹ta."
+msgstr "%d sporoèil je bilo prijavljenih kot za¾elena e-po¹ta."
 
-#: lib/Spam.php:161
+#: lib/Spam.php:170
 #, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr ""
-"%d sporoèil je bilo prijavljeno kot neza¾elena po¹ta vzdr¾evalcu sistema."
+"%d sporoèil je bilo va¹emu skrbniku prijavljenih kot neza¾elena e-po¹ta."
 
-#: lib/Spam.php:141
+#: lib/Spam.php:150
 #, php-format
 msgid "%d messages have been reported as spam."
-msgstr "%d sporoèil je bilo prijavljeno kot neza¾elena po¹ta."
+msgstr "%d sporoèil je bilo prijavljenih kot neza¾elena e-po¹ta."
 
-#: mailbox.php:362
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
-msgstr "%d do %d od %d Sporoèil"
+msgstr "%d do %d od %d sporoèil"
 
-#: mailbox.php:601
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr "%s Administracija PGP"
-
-#: smime.php:254
-#, php-format
-msgid "%s S/MIME Administration"
-msgstr "%s Administracija S/MIME"
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
 msgid "%s already exists. Your %s folder was not renamed."
-msgstr "%s ¾e obstoja. %s mapa ni bila preimenovana."
+msgstr "%s ¾e obstaja. Va¹a mapa %s ni bila preimenovana."
 
-#: lib/Message.php:643
+#: lib/Message.php:649
 #, php-format
 msgid "%s does not appear to be a valid mailbox."
-msgstr "%s ni pravilen po¹tni predal."
+msgstr "%s ni veljaven nabiralnik."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
 #, php-format
 msgid "%s folder being renamed at the start of the month."
-msgstr "%s mapa je bila preimenovana kot zaèetek meseca."
+msgstr "Mapa %s bo preimenovana na zaèetku meseca."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr "%s je sprejel."
 
-#: lib/MIME/Viewer/itip.php:603
+#: lib/MIME/Viewer/itip.php:625
 #, php-format
 msgid "%s has cancelled %s."
 msgstr "%s je preklical %s."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
-msgstr "%s je zavrnil."
+msgstr "%s je odklonil."
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
-msgstr "%s je odgovoril na prost/zaseden zahtevo."
+msgstr "%s je odgovoril na zahtevo prost/zaseden."
 
-#: lib/MIME/Viewer/itip.php:583
+#: lib/MIME/Viewer/itip.php:616
 #, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s je odgovoril na povabilo na %s."
 
-#: lib/MIME/Viewer/itip.php:441
+#: lib/MIME/Viewer/itip.php:482
 #, php-format
 msgid "%s has sent you free/busy information."
-msgstr "%s je poslal informacijo prost/zaseden."
+msgstr "%s vam je poslal informacijo prost/zaseden."
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
-msgstr "%s je sprejel z oklevanjem."
+msgstr "%s je oklevajoèe sprejel."
 
-#: lib/MIME/Viewer/itip.php:446
+#: lib/MIME/Viewer/itip.php:487
 #, php-format
 msgid "%s requests your free/busy information."
 msgstr "%s je zahteval va¹o informacijo prost/zaseden."
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr "%s zahteva va¹o prisotnost pri %s."
 
-#: lib/Message.php:398
-#, php-format
-msgid "%s was successfully added to %s."
-msgstr "%s je bilo uspe¹no dodano k %s."
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s je bil uspe¹no dodan k %s."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr "%s ¾eli popraviti %s."
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
-msgstr "%s vas ¾eli obvestiti o %s."
+msgstr "%s vas ¾eli opozoriti na %s."
 
-#: lib/MIME/Viewer/itip.php:558
+#: lib/MIME/Viewer/itip.php:602
 #, php-format
 msgid "%s wishes to receive the latest information about %s."
 msgstr "%s ¾eli prejeti najnovej¹e informacije o %s."
 
-#: message.php:277 message.php:282
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -193,259 +184,287 @@
 #: templates/message/navbar_top.inc:13
 #, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
-msgstr "%s: %s (%d&nbsp;of&nbsp;%d)"
+msgstr "%s: %s (%d&nbsp;od&nbsp;%d)"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
-msgstr "(Shrani spremembe in pojdi na naslednji zaslon."
+msgstr "(Uporabi te spremembe in nadaljuj.)"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Zavr¾i vse sprememba in se vrni na zaèetni zaslon."
+msgstr "(Ovr¾i vse spremembe in se vrni na sestavljanje sporoèila.)"
 
-#: spelling.php:277
+#: templates/stationery/prefs.inc:16
+#, fuzzy
+msgid "(HTML)"
+msgstr "HTML"
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
-"(Vrnitev na zaèetni zaslon po tem ko shrani¹ vse spremembe do slej.  "
-"Spremembe na trenutnem zaslonu NE bodo upo¹tevane.)"
+"(Uporabi vse dosedanje spremembembe in se vrni na sestavljane sporoèila. "
+"Spremembe na trenutnem zaslonu NE BODO uporabljene.)"
 
-#: spelling.php:274
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
 msgstr ""
-"(Po¹lji sporoèilo po potrditvi vseh sprememb doslej.Spremembe na trenutnem "
-"zaslonu NE bodo upo¹tevane.)"
+"(Uporabi vse dosedanje spremembe in po¹lji sporoèilo. Spremembe na trenutnem "
+"zaslonu NE BODO uporabljene.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
-msgstr "Dodajte s klikom na V redu."
+msgstr "* Dodaj s klikom na V redu *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
-msgstr "Izberite naslov(e) *"
+msgstr "* Prosim izberite naslov(e) *"
+
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Sporoèilo je bilo pobrisano."
 
-#: lib/Spam.php:171
+#: lib/Spam.php:180
 msgid "1 message has been reported as not spam to your system administrator."
-msgstr "1 sporoèilo ni bilo javljeno kot neza¾elena po¹ta vzdr¾evalcu sistema."
+msgstr "1 sporoèilo je bilo va¹emu skrbniku prijavljeno kot za¾elena e-po¹ta."
 
-#: lib/Spam.php:151
+#: lib/Spam.php:160
 msgid "1 message has been reported as not spam."
-msgstr "1 sporoèilo ni bilo javljeno kot neza¾elena po¹ta."
+msgstr "1 sporoèilo je bilo prijavljeno kot za¾elena e-po¹ta."
 
-#: lib/Spam.php:163
+#: lib/Spam.php:172
 msgid "1 message has been reported as spam to your system administrator."
 msgstr ""
-"1 sporoèilo ni bilo javljeno kot neza¾elena po¹ta vzdr¾evalcu sistema.."
+"1 sporoèilo je bilo va¹emu skrbniku prijavljeno kot neza¾elena e-po¹ta."
 
-#: lib/Spam.php:143
+#: lib/Spam.php:152
 msgid "1 message has been reported as spam."
-msgstr "1 sporoèilo je bilo javljeno kot neza¾elena po¹ta."
+msgstr "1 sporoèilo je bilo prijavljeno kot neza¾elena e-po¹ta."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100 znakov"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000 znakov"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250 znakov"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500 znakov"
 
-#: lib/MIME/Viewer/itip.php:61
-msgid "<b>The calendar data is invalid</b>"
-msgstr "<b>Podatki koledarja niso veljavni</b>"
-
-#: lib/MIME/Viewer/images.php:148
+#: lib/MIME/Viewer/images.php:162
 #, php-format
 msgid "A large image named %s is attached to this message."
-msgstr "Sporoèilu je dodana velika slika z imenom %s."
+msgstr "Temu sporoèilu je pripeta velika slika z imenom %s."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
-msgstr "Za sporoèilo, ki ste ga poslali, ste dobili potrdilo o prejemu."
+msgstr ""
+"Sporoèilo, ki ste ga poslali, je bilo vzrok za obvestilo, vrnjeno s strani "
+"prejemnika."
 
 #: templates/search/fields.inc:5
 msgid "AND"
-msgstr "AND"
+msgstr "IN"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr "Sprejmi zahtevo"
 
-#: lib/MIME/Viewer/itip.php:738
+#: lib/MIME/Viewer/itip.php:587
+#, fuzzy
+msgid "Accept request and add it to my calendar"
+msgstr "Dogodek je bil dodan na va¹ koledar."
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: lib/IMP.php:911 lib/IMP.php:913
-msgid "Acco_unts"
-msgstr "Raèuni"
+#: lib/MIME/Viewer/itip.php:257
+#, fuzzy
+msgid "Accepted: "
+msgstr "Sprejeto"
 
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Ime raèuna:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:715
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 msgid "Actions"
 msgstr "Dejanja"
 
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "Dodaj v Adresar (%s)"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
-msgstr "Dodaj izvor"
+msgstr "Dodaj vir"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr "Dodaj v moj koledar"
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-#, php-format
-msgid "Add to Address book (%s)"
-msgstr "Dodaj v imenik (%s)"
-
-#: compose.php:1166
+#: compose.php:1256
 #, php-format
 msgid "Added \"%s\" as an attachment."
-msgstr "Dodaj \"%s\" kot priponko."
+msgstr "Dodal \"%s\" kot priponko."
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
-"Pri pregledu prika¾i dodatne glave: <i>(èe ¾elite, vnesite vsako glavo v "
-"svojo vrstico)</i>"
+"Prikaz dodatnih vrstic glave pri pregledovanju: <i>(po ¾elji, dodajte vsako "
+"vrstico glave v svojo vrstico)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, php-format
 msgid "Additional information can be viewed %s."
-msgstr "Ogledate si lahko nadaljnje informacije o %s."
+msgstr "Dodatne informacije so na voljo %s."
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 msgid "Additional information details"
-msgstr "Dodatne podrobnosti informacij"
+msgstr "Dodatne podrobnosti"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
 msgid "Additional message details"
-msgstr "Dodatne podrobnosti sporoèila"
+msgstr "Dodatne podrobnosti o sporoèilu"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
-msgstr "Dodatne podrobnosti sporoèila lahko vidite o %s"
+msgstr "Dodatne podrobnosti o sporoèilu so na voljo %s."
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
 msgid "Additional message error details"
-msgstr "Dodatne podrobnosti napake sporoèila"
+msgstr "Dodatne podrobnosti o napaki"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
-msgstr "Dodatne podrobnosti napake sporoèila lahko vidite o %s."
+msgstr "Dodatne podrobnosti o napaki so na voljo %s."
 
-#: contacts.php:95 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adresar"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "Adresarji"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
-"Naslovi za BCC vseh sporoèil: <i>(èe ¾elite, vnesite vsak naslov v svojo "
+"BKK naslovi za vsa sporoèila: <i>(po ¾elji, dodajte vsak naslov v svojo "
 "vrstico)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
-"Naslovi, ki so izrecno povezani s to identiteto: <i>(èe ¾elite, vnesite vsak "
-"naslov v svojo vrstico)</i>"
+"Naslovi, ki naj se izrecno ve¾ejo s to identiteto: <i>(po ¾elji, dodajte "
+"vsak naslov v svojo vrstico)</i>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
-msgstr "Vse"
+msgstr "Vsa"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Vsa sporoèila v mapi(ah) bodo izgubljena!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
-msgstr "Vsa sporoèila v mapi(ah) bodo shranjena v en MBOX "
+msgstr "Vsa sporoèila v naslednjih mapah bodo strnjena v en MBOX nabiralnik:"
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
 #, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr ""
-"Vsa sporoèila v va¹i \"%s\" mapi stara veè kot %s dni bodo trajno izbrisana."
+"Vsa sporoèila v va¹i mapi \"%s\", ki so starej¹a od %s dni bodo trajno  "
+"pobrisana."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:65
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
 #, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
-msgstr "Vse stare priponke sporoèil, starej¹e kot %s mesece(v) bodo izbrisane."
+msgstr "Vse priponke, starej¹e od %s mesecev bodo pobrisane."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
 #, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "Vse mape s poslano po¹to starej¹e kot %s mesece(v) bodo izbrisane."
+msgstr "Vse mape s poslano po¹to starej¹e od %s mesecev bodo pobrisane."
 
 #: acl.php:85
-#, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Vse pravice za mapo '%s' so bile uspe¹no odvzete uporabniku '%s'."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
 msgstr ""
-"Vse pravice na mapi '%s' so bile uspe¹no odstranjene za uporabnika '%s'."
 
-#: templates/filters/prefs.inc:55
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
-msgstr "Dovolimo uveljavljanje filtrov v kateremkoli predalu?"
+msgstr "Se lahko pravila za filtriranje uporabijo na kateremkoli nabiralniku?"
 
-#: lib/MIME/Viewer/alternative.php:109
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
-msgstr "Opcijski deli za ta odsek:"
+msgstr "Alternativni deli za ta odsek:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "Vedno"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Vedno shrani priponke"
 
-#: lib/Message.php:491
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
-msgstr "Med loèevanjem priponke je pri¹lo do napake. Stre¾nik IMAP je javil:"
+msgstr ""
+"Pri odstranjevanju priponke sporoèil je pri¹lo do napake. IMAP stre¾nik je "
+"javil: "
+
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "Pri dodajanju novega opravila je pri¹lo do neznane napake."
 
-#: lib/Message.php:385
+#: lib/Message.php:387
 msgid "An unknown error occured while creating the new task."
-msgstr "Med ustvarjanjem novega opravila se je pojavila neznana napaka."
+msgstr "Pri dodajanju novega opravila je pri¹lo do neznane napake."
 
-#: message.php:491 mailbox.php:671 templates/message/navbar_navigate.inc:9
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
-msgstr "Odgovorjena"
+msgstr "Odgovorjeno"
 
 #: templates/search/main.inc:31
 msgid "Answered messages"
@@ -453,529 +472,559 @@
 
 #: templates/mailbox/header.inc:7
 msgid "Apply Filters"
-msgstr "Uveljavi filtre"
+msgstr "Uporabi filtre"
 
 #: templates/mailbox/header.inc:7
 #, php-format
 msgid "Apply Filters to %s"
-msgstr "Uveljavi filtre za %s"
+msgstr "Uporabi filtre na %s"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
-msgstr "Uveljavim filtre po prijavi?"
+msgstr "Uporabim pravila filtriranja ob prijavi?"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
-msgstr "Uveljavim filtre kadarkoli prika¾em INBOX?"
-
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "Ali ste preprièani da ¾elite nadeljevati?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "Ste preprièani, da ¾elite nadaljevati?"
+msgstr "Uporabim pravila filtriranja ob prikazu INBOX?"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
-msgstr "Ste preprièani, da ¾elite izbrisati ta javni kljuè?"
+msgstr "Ali ste preprièani, da ¾elite pobrisati ta javni kljuè?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
 msgstr ""
-"Ste preprièani, da ¾elite izbrisati va¹ par kljuèev? (To NI priporoèljivo!)"
+"Ali ste preprièani, da ¾elite pobrisati svoj par kljuèev? (NI priporoèeno!)"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
-msgstr "Ste preprièani da ¾elite to narediti?"
+msgstr "Ste preprièani, da ¾elite izvr¹iti dejanje?"
 
-#: message.php:399 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:63
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
-msgstr "Ali ste preprièani da ¾elite TRAJNO izbrisati sporoèila?"
+msgstr "Ste preprièani, da ¾elite TRAJNO zbrisati ta sporoèila?"
 
-#: lib/MIME/Contents.php:222
+#: lib/MIME/Contents.php:215
 msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
-msgstr "Ste preprièani, da ¾elite TRAJNO izbrisati to priponko?"
+msgstr "Ste preprièani, da ¾elite TRAJNO zbrisati to priponko?"
 
 #: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Ste preprièani, da ¾elite izprazniti to mapo?"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Ste preprièani, da ¾elite izprazniti svojo mapo s smetmi?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
-msgstr "Ste preprièani, da ¾elite izprazniti mapo s smetmi?"
+msgstr "Ste preprièani, da ¾elite izprazniti svojo mapo s smetmi?"
 
 #: templates/mailbox/actions.inc:8
 msgid "Are you sure you wish to permanently delete these messages?"
-msgstr "Ste preprièani, da ¾elite trajno izbrisati sporoèila?"
+msgstr "Ste preprièani, da ¾elite trajno pobrisati ta sporoèila?"
 
-#: templates/mailbox/javascript.inc:81
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 msgid "Are you sure you wish to report this message as innocent?"
-msgstr "Ste preprièani, da ¾elite prijaviti to sporoèilo kot nedol¾no?"
+msgstr "Ste preprièani, da ¾elite prijaviti to sporoèilo kot za¾eleno?"
 
-#: templates/mailbox/javascript.inc:72
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 msgid "Are you sure you wish to report this message as spam?"
-msgstr "Ste preprièani, da ¾elite prijaviti to sporoèilo kot neza¾eleno po¹to?"
+msgstr "Ste preprièani, da ¾elite prijaviti to sporoèilo kot neza¾eleno?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Èas prihoda"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:931
 msgid "Ascending"
-msgstr "Nara¹èajoè"
+msgstr "Nara¹ujoè"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "Vpra¹aj"
 
-#: templates/compose/compose.inc:509
+#: templates/compose/compose.inc:519
 msgid "Attach"
-msgstr "Dodaj"
+msgstr "Pripni"
 
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:475
 msgid "Attach Files"
-msgstr "Pripni"
+msgstr "Pripni datoteke"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
-msgstr "Pripnem sporoèilu kopijo va¹ega javnega kljuèa PGP?"
+msgstr "Pripnem izvod va¹ega javnega PGP kljuèa k sporoèilu?"
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
-msgstr "Priponke"
+msgstr "Priponka:"
 
-#: lib/Compose.php:355 lib/Compose.php:442
+#: lib/Compose.php:451 lib/Compose.php:536
 #, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr ""
-"Priponka \"%s\" presega dovoljeno velikost priponk. Datoteka ni bila "
-"prilo¾ena."
+"Priponka \"%s\" presega omejitev velikosti za priponke. Datoteka NI BILA "
+"pripeta."
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
-msgstr "V prilogi je odgovor na poslano zahtevo iz koledarja."
+msgstr "Pripet je odgovor na poslano zahtevo koledarja."
 
-#: mailbox.php:705 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Priponka"
 
-#: compose.php:976 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
-msgstr "Priponka je bila razbita: Izvirni tip priponke"
+msgstr "Priponka odstranjena: Vrsta priponke"
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:990
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Priponke"
 
-#: lib/MIME/Viewer/itip.php:668
+#: lib/MIME/Viewer/itip.php:682
 msgid "Attendees"
 msgstr "Udele¾enci"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "Pozor"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
-msgstr "Auth_imap: Potrebnega IMAP dodatka ni mogoèe najti."
+msgstr "Auth_imp: Zahtevan IMAP dodatek ni bil najden."
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
 msgstr ""
-"Samodejno prika¾em slike v sporoèilih HTML, ko je po¹iljatelj v imeniku?"
+"Avtomatièno prika¾em slike v HTML sporoèilih, kadar je po¹iljatelj v mojem "
+"adresarju?"
 
 #: templates/prefs/sourceselect.inc:298
 msgid "Available Address books:"
-msgstr "Razpolo¾ljivi imeniki:"
+msgstr "Adresarji, ki so na voljo:"
 
-#: lib/MIME/Viewer/itip.php:704
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
-msgstr "Èakajoè odgovor"
+msgstr "Èakajoè odziv"
 
 #: templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Bac_k to %s"
-msgstr "Nazaj na %s"
+msgstr "Nazaj _na %s"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
 #, php-format
 msgid "Back to %s"
-msgstr "Nazaj za %s"
+msgstr "Nazaj na %s"
+
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
 
-#: message.php:258 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
-msgstr "Kpp"
+msgstr "Bkk"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
 msgid "Below is the raw text of the status information message."
-msgstr "Spodaj je èisto besedilo sporoèila o stanju informacij."
+msgstr "Spodaj je surovo besedilo poroèila o statusu."
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
-msgstr "Èrna lista"
+msgstr "Blacklist"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
-msgstr "Blokiram slike v sporoèilih HTML, èe niso posebej zahtevane?"
+msgstr "Ne prika¾em slik v HTML sporoèilih razen èe so izrecno zahtevane?"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
-msgstr "Vsebina"
+msgstr "Telo"
 
 #: templates/search/main.inc:23 templates/search/main.inc:39
 #: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Oboje"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
-msgstr "Seznam glav in telo sporoèila"
+msgstr "Oboje - seznam glave in telo sporoèila"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
-msgstr "Znak"
+msgstr "Ko_dna tabela"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "Koledar"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
-msgstr "Povezava na oddaljeni po¹tni stre¾nik ni mogoèa."
+msgstr "Povezava na oddaljen po¹tni stre¾nik ni uspela."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
-msgstr "Povezave z oddaljenim po¹tnim stre¾nikom ni mogoèe vzpostaviti."
+msgstr "Povezava na oddaljen po¹tni stre¾nik ni uspela: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr ""
-"Ne morem prikazati - v trenutnem imeniku Prejeto je bilo najdenih samo %s od "
-"%s delov sporoèila."
+"Prikaz ni mogoè - v trenutnem nabiralniku je bilo najdenih samo %s od %s "
+"delov tega sporoèila."
 
-#: templates/contacts/contacts.inc:253 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:106 templates/pgp/passphrase.inc:32
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Preklièi"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
-msgstr "Preklièi"
+msgstr "Preklièi sporoèilo"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
-msgstr "Preklic bo trajno odstranil vsebino sporoèila."
+msgstr "Preklic tega sporoèila bo trajno zavrgel vsebino."
 
-#: message.php:257 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
-msgstr "Kp"
+msgstr "Kk"
 
-#: lib/MIME/Viewer/itip.php:686
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
 msgid "Chair Person"
 msgstr "Predsedujoèa oseba"
 
-#: templates/compose/spelling.inc:64
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "Spremeni"
 
-#: templates/compose/spelling.inc:65
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Spremeni vse"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "Spremeni mapo"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
 msgstr ""
-"Nastavi mo¾nosti kot so: Koliko sporoèil vidi¹ na vsaki strani in kako so "
-"sporoèila sortirana."
+"Nastavi mo¾nosti prikaza, ¹tevilo sporoèil prikazanih na eni strani in "
+"mo¾nosti razvr¹èanja sporoèil."
 
 #: config/prefs.php.dist:24
 msgid "Change mail server and folder settings."
-msgstr "Spremeni po¹tni stre¾nik in podatke o mapi."
+msgstr "Nastavi po¹tni stre¾nik in mo¾nosti mape."
 
 #: config/prefs.php.dist:15
 msgid ""
 "Change the name, address, and signature that people see when they read and "
 "reply to your email."
 msgstr ""
-"Spremeni ime, naslov in podpis, ki ga bodo prejemniki videli ko bodo brali "
-"in odgovarjali na va¹o po¹to."
+"Nastavi ime, naslov in podpis, ki ga prejemniki sporoèil vidijo, ko berejo "
+"in odgovarjajo na va¹o e-po¹to."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
-msgstr "Znaki za prikaz:"
+msgstr "Prikaz znakov:"
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
-msgstr "Preveri mapo(e) za novo po¹to"
+msgstr "Poglej za Nova sporoèila"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
-msgstr "Izberi vse/Niè"
+msgstr "Oznaèi _Vse/Nobenega"
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
-msgstr "Izberite vse po¹tne stre¾nike, iz katerih ¾elite prebrati po¹to."
+msgstr "Oznaèite vse stre¾nike, s katerih ¾elite prenesti e-po¹to:"
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
-msgstr "Preverim èrkovanje preden po¹iljem sporoèilo?"
+msgstr "Preverim èrkovanje preden po¹ljem sporoèilo?"
 
 #: templates/folders/actions.inc:4
 msgid "Choose Action:"
-msgstr "Izberi postopek:"
+msgstr "Izberite dejanje:"
 
-#: config/servers.php.dist:170
+#: config/servers.php.dist:182
 msgid "Choose a mail server:"
 msgstr "Izberite po¹tni stre¾nik:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:716
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "Prosim izberite ali uredite v obrazcu na desni:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 msgid "Choose an action:"
 msgstr "Izberite dejanje:"
 
 #: templates/prefs/sourceselect.inc:349
 msgid "Choose the address book to use when adding addresses."
-msgstr "Izberi imenik za dodajanje naslovov."
+msgstr "Izberite adresar, ki ga uporabim za dodajanje naslovov."
 
 #: templates/prefs/sourceselect.inc:293
 msgid "Choose the order of address books to search when expanding addresses."
-msgstr "Izberi zaporedje imenikov pri iskanju, kadar raz¹irjam naslove."
+msgstr "Izberite vrstni red iskanja po adresarjih, ko raz¹irjam naslove."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:106
 #, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr ""
-"Kliknite %s za pretvorbo slike v obliko, ki jo zna prikazati va¹ brskalnik."
+"Kliknite %s za pretvorbo slike v obliko ki jo va¹ brskalnik zna prikazati."
 
-#: lib/MIME/Viewer/images.php:93
+#: lib/MIME/Viewer/images.php:95
 #, php-format
 msgid "Click %s to download the image."
-msgstr "Kliknite %s za prenos slike."
+msgstr "Kliknite %s da si prenesete sliko."
 
-#: lib/Filter.php:103
+#: lib/Filter.php:106
 #, php-format
 msgid "Click %s to go to %s management page."
-msgstr "Kliknite %s da pridete na nadzorno stran %s."
+msgstr "Kliknite %s za stran za upravljanje %s."
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:116
 #, php-format
 msgid "Click %s to view HTML content in a separate window."
-msgstr "Kliknite %s za ogled sporoèila HTML v loèenem oknu."
+msgstr "Kliknite %s za prikaz HTML vsebine v loèenem oknu."
 
-#: lib/MIME/Viewer/images.php:149
+#: lib/MIME/Viewer/images.php:163
 #, php-format
 msgid "Click %s to view a thumbnail of this image."
-msgstr "Kliknite %s za ogled pomanj¹ane slike."
+msgstr "Kliknite %s za prikaz slièice te slike."
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:418
 #, php-format
 msgid "Click %s to view the attachment in a separate window."
-msgstr "Kliknite %s za ogled priponke v loèenem oknu."
+msgstr "Kliknite %s za prikaz priponke v loèenem oknu."
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Click here to HIDE the Images"
-msgstr "Kliknite tukaj, èe ¾elite skriti sliko."
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr "Kliknite %s za prikaz priponke v loèenem oknu."
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
-msgstr "Kliknite tukaj, èe ¾elite pokazati sliko."
+msgstr "Kliknite za PRIKAZ slik"
 
 #: templates/prefs/sourceselect.inc:321
 msgid ""
 "Click on one of your selected address books and then select all fields to "
 "search."
 msgstr ""
-"Kliknite na enega od izbranih imenikov in izberite vsa ¾elena polja za "
-"iskanje."
+"Kliknite na izbrane adresarje, nato pa izberite vsa polja, po katerih naj "
+"poteka iskanje."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
-msgstr "Kliknite tukaj, èe ¾elite shraniti kljuè PGP v imenik."
+msgstr "Kliknite za shranitev javnega PHP kljuèa v va¹ Adresar"
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
-msgstr ""
-"Kliknite tukaj, èe ¾elite shraniti certifikat S/MIME va¹ega %s v imenik"
+msgstr "Kliknite za shranitev %s S/MIME potrdila v va¹ Adresar."
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
-msgstr "Klik na naslov bo odprl okno za pisanje novega sporoèila po¹iljatelju"
+msgstr "Klik na naslov bo odprl sestavljanje novega sporoèila po¹iljatelju"
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
-msgstr "Klik na naslov bo odprl sporoèilo"
+msgstr "Klik na naslov bo odprl sporoèilo za branje"
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 msgid "Close"
 msgstr "Zapri"
 
-#: compose.php:1057
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: folders.php:387
+#: folders.php:429
 msgid "Closed Folder"
-msgstr "Zaprta mapa"
+msgstr "Zapri mapo"
 
-#: folders.php:407
+#: folders.php:449
 msgid "Collapse"
 msgstr "Skrèi"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Skrèi vse"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "Skrèi vse mape"
 
-#: folders.php:407
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Skrèi mapo"
 
 #: templates/fetchmail/manage.inc:51
 msgid "Color Indicator: "
-msgstr "Barvni indikator:"
+msgstr "Pokazatelj barve: "
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Komentar"
 
-#: lib/MIME/Viewer/itip.php:754
+#: lib/MIME/Viewer/itip.php:769
 msgid "Completed"
-msgstr "Opravljeno"
-
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "Ustvari"
-
-#: mailbox.php:735 lib/MIME/Headers.php:195
-#, php-format
-msgid "Compose Message (%s)"
-msgstr "Ustvari sporoèilo (%s)"
+msgstr "Konèano"
 
-#: compose.php:1056
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
-msgstr "Ustvari ¹e eno sporoèilo"
+msgstr "Sestavi ¹e eno sporoèilo"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
-msgstr "Ustvari sporoèilo v loèenem oknu?"
+msgstr "Sestavljaj sporoèila v loèenem oknu?"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
-"Naj privzeto ustvarim sporoèilo z grafiènim vmesnikom HTML (èe brskalnik to "
-"podpira)?"
+"Privzeto sestavljaj sporoèila s HTML uporabni¹kim vmesnikom (èe brskalnik "
+"podpira to mo¾nost)?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
-msgstr "Doloèite, kako naj bodo sporoèila prikazana."
+msgstr "Nastavi prikaz sporoèil."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
-msgstr "Nastavite mo¾nosti predogleda po¹te."
+msgstr "Nastavi predogled sporoèil."
+
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "Povezava s stre¾nikom ni uspela"
 
-#: lib/Fetchmail/imap.php:237
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
-msgstr "Povezava na stre¾nik ni uspela"
+msgstr "Povezava s stre¾nikom ni uspela"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
-msgstr "Urejanje podpore PGP za %s."
+msgstr "Upravljanje s PGP podporo za %s."
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
-msgstr "Urejanje podpore S/MIME za %s"
+msgstr "Upravljanje s S/MIME podporo za %s."
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr ""
-"Nastavite kdaj bo stre¾nik preveril prispetje novih sporoèila in ali boste o "
-"tem prejeli obvestilo."
+"Nastavi preverjanje nove po¹te in naèin obve¹èanja, kadar prispe novo "
+"sporoèilo."
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
-msgstr "Pretvorim besedilne sme¹ke v grafiène?"
+msgstr "Pretvorim tekstovne sme¹ke v grafiène?"
 
 #: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "Kopiraj v mapo"
 
-#: templates/compose/spelling.inc:44
+#: templates/compose/spelling.inc:63
 msgid "Correct"
-msgstr "Pravilno"
+msgstr "Popravi"
 
-#: templates/compose/spelling.inc:124
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
-msgstr "Popravljen tekst"
+msgstr "Popravljeno besedilo"
+
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "VFS hrbtenice ni bilo mogoèe izdelati: %s"
 
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
-msgstr "Ni mogoèe izdelati osnove za VFS: %s"
+msgstr "VFS hrbtenice ni bilo mogoèe izdelati: %s"
 
-#: lib/Message.php:634
+#: lib/Message.php:640
 #, php-format
 msgid "Could not delete messages from %s. The server said: %s"
-msgstr "Ne morem izbrisati sporoèila iz %s. Stre¾nik je javil napako: %s"
+msgstr "Sporoèila ni bilo mogoèe pobrisati iz %s. Napaka: %s"
 
-#: lib/Session.php:287
+#: lib/Session.php:318
 msgid "Could not execute maintenance operations."
-msgstr "Ne morem izvr¹iti operacij vzdr¾evanja."
+msgstr "Vzdr¾evanja ni bilo mogoèe zagnati."
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
-msgstr "Ne morem raz¹iriti zahtevane datoteke iz priponke MS-TNEF."
+msgstr "®eljene datoteke ni bilo mogoèe izvleèi iz MS-TNEF priponke."
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
-msgstr "Ne morem raz¹iriti zahtevane datoteke iz arhiva ZIP."
+msgstr "®eljene datoteke ni bilo mogoèe izvleèi iz Zip priponke."
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
 
-#: search.php:356 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "Ustvari"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Ustvari mapo"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Ustvari kljuèe"
 
@@ -983,942 +1032,1086 @@
 msgid "Create Virtual Folder"
 msgstr "Ustvari navidezno mapo"
 
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "Drugi raèuni za E-po¹to"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Ustvari novo mapo za smeti"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
-msgstr "Ustvari novo mapo osnutkov"
+msgstr "Ustvari novo mapo za osnutke"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
-msgstr "Ustvari novo mapo poslanih sporoèil"
+msgstr "Ustvari novo mapo za poslano po¹to"
 
 #: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
-msgstr "Ustvari novo mapo za odpadke"
+msgstr "Ustvari novo mapo za smeti"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr ""
-"Ustvari filtre, ki bodo organizirali prejeto po¹to v mape in izbrisali spam."
+"Nastavitev pravil filtriranja za organiziranje va¹e prihajajoèe e-po¹te, "
+"sortiranje v mape in brisanje neza¾elene e-po¹te."
+
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Ustvari novo mapo za poslano po¹to"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
-msgstr "Trenutni dostop do %s"
+msgstr "Trenuten dostop do %s"
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
-msgstr "Prilagodite raèune za prejemanje po¹te z drugih raèunov."
+msgstr "Nastavi raèune za snemanje po¹te z drugih raèunov."
 
 #: config/prefs.php.dist:51
 msgid "Customize how you send mail."
-msgstr "Prilagodite po¹iljanje po¹te."
+msgstr "Nastavitve naèina po¹iljanja e-po¹te."
 
 #: config/prefs.php.dist:40
 #, php-format
 msgid "Customize tasks to run upon logon to %s."
-msgstr "Prilagodi opravila, ki se za¾enejo ob prijavi v %s."
+msgstr "Nastavi opravila, ki se za¾enejo ob prijavi v %s."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
-msgstr "Datum"
+msgstr "Datu_m"
 
-#: message.php:254 thread.php:75
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Datum"
 
-#: lib/MIME/Viewer/itip.php:742
+#: lib/MIME/Viewer/itip.php:757
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: config/prefs.php.dist:894
+#: lib/MIME/Viewer/itip.php:263
+#, fuzzy
+msgid "Declined: "
+msgstr "Zavrnjeno"
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Izbri¹i"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
-msgstr "Privzeti kriterij za sortiranje:"
+msgstr "Privzeta razvrstitev:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
-msgstr "Privzeta smer sortiranja:"
+msgstr "Privzeta smer razvrstitve:"
 
-#: lib/MIME/Viewer/itip.php:750
+#: lib/MIME/Viewer/itip.php:765
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: folders.php:378 templates/fetchmail/manage.inc:68
+#: folders.php:419 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Izbri¹i"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Delete %s Public Key"
-msgstr "Izbri¹i javni kljuè %s"
+msgstr "Izbri¹i %s javni kljuè"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Izbri¹i trenutne kljuèe"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Izbri¹i mapo(e)"
 
-#: folders.php:378
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Izbri¹i mapo(e)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Izbri¹i navidezno mapo"
+
+#: folders.php:419
 msgid "Delete Virtual Folder"
 msgstr "Izbri¹i navidezno mapo"
 
 #: templates/fetchmail/manage.inc:43
 msgid "Delete fetched messages from remote server?"
-msgstr "Izbri¹em prejeta sporoèila z oddaljenega stre¾nika?"
+msgstr "Izbri¹em posneta sporoèila z oddaljenega stre¾nika?"
 
-#: lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
-msgstr "Izbri¹i iz koledarja"
+msgstr "Izbri¹i iz mojega koledarja"
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
-msgstr "Izbri¹em stare priponke sporoèil na zaèetku meseca?"
+msgstr "Pobri¹em stare priponke na zaèetku meseca?"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
-msgstr "Izbri¹em stare mape poslanih sporoèil na zaèetku meseca?"
+msgstr "Pobri¹em stare mape s poslano e-po¹to na zaèetku meseca?"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr ""
-"Izbri¹em neza¾elena sporoèila potem, ko so bila javljena kot neza¾elena "
-"po¹ta?"
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Pobrisana sporoèila"
 
-#: message.php:494 mailbox.php:695 templates/mailbox/navbar.inc:20
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
-msgstr "Izbrisana"
+msgstr "Pobrisano"
 
 #: templates/search/main.inc:63
 msgid "Deleted messages"
-msgstr "Izbrisana sporoèila"
+msgstr "Pobrisana sporoèila"
 
-#: compose.php:292
+#: compose.php:307
 #, php-format
 msgid "Deleted the attachment \"%s\"."
-msgstr "Priponka \"%s\" je bila izbrisana."
+msgstr "Pobri¹i priponko \"%s\"."
 
 #: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Brisanje in premikanje sporoèil"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr "Zavrni zahtevo"
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
 msgid "Deny request for free/busy information"
-msgstr "Zavrni zahtevo po informaciji prost/zaseden"
+msgstr "Zavrni zahtevo za informacijo prost/zaseden"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Padajoè"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:656
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Opis"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
-msgstr "Zabri¹em podpise?"
+msgstr "Zameglim podpise?"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
-msgstr "Prika¾i"
+msgstr "Prikaz"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
-msgstr "Prika¾em potrditev po po¹iljanju sporoèila?"
+msgstr "Prika¾em potrditev o poslanem sporoèilu?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Prika¾i v telesu sporoèila"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
-msgstr "Prika¾em okno z obvestilom ob prispetju nove po¹te?"
+msgstr "Prika¾em okence z obvestilom o novi po¹ti?"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
-msgstr "Prika¾em v meniju povezavo za brisanje sporoèil iz ko¹a?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "Prika¾em povezavo 'Sprazni smeti' v menuju?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Prika¾em povezavo 'Sprazni smeti' v menuju?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
-msgstr "Predlog"
+msgstr "Dispozicija"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
-msgstr "Se ne ujema"
+msgstr "Se NE ujema"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
-msgstr "Ne preveri map(e) za nova sporoèila"
+msgstr "Ne preverjaj map(e) za novo e-po¹to"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
-msgstr "Ne ustvari povezave v stolpcu Od:"
+msgstr "Ne ustvari povezave z Od: stolpca"
 
-#: lib/IMP.php:1004
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Ali ¾elite odpreti to mapo?"
 
-#: templates/compose/spelling.inc:112
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
-msgstr "Urejeno"
+msgstr "Konèano"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:192
 #, php-format
 msgid "Download %s in .zip Format"
-msgstr "Prenesi %s v obliki ZIP"
+msgstr "Prenesi %s v .zip obliki"
 
 #: templates/message/headers.inc:52
 msgid "Download All Attachments (in .zip file)"
-msgstr "Prenesi vse priponke (v datoteki ZIP)"
+msgstr "Presnemi vse Priponke (v .zip datoteki)"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
-msgstr "Strani mapo(e)"
+msgstr "Presnemi Mapo(e)"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
-msgstr "Prenesi mapo(e) (v obliki ZIP)"
+msgstr "Presnemi Mapo(e) [.zip oblika]"
 
-#: lib/MIME/Contents.php:211
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
-msgstr "Prenesi v obliki ZIP"
+msgstr "Presnemi v .zip obliki"
 
-#: message.php:492 mailbox.php:676 templates/message/navbar_navigate.inc:11
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Osnutek"
 
-#: folders.php:358
+#: folders.php:392
 msgid "Draft folder"
 msgstr "Mapa z osnutki"
 
 #: templates/prefs/folderselect.inc:23
 msgid "Drafts folder:"
-msgstr "Mapa z osnutki: "
+msgstr "Mapa z osnutki:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "E-po¹tni naslov"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "IN"
+
+#: lib/MIME/Viewer/status.php:74
 msgid "ERROR: Your message could not be delivered."
-msgstr "Napaka: Sporoèilo ni bilo dostavljeno."
+msgstr "NAPAKA: Va¹ega sporoèila ni bilo mogoèe dostaviti."
 
-#: folders.php:379
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "Uredi"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
-msgstr "Uredi èrni seznam"
+msgstr "Uredi Blacklist"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
-msgstr "Uredi filtre"
+msgstr "Uredi Filtre"
 
-#: folders.php:379 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:420 templates/search/header.inc:16
 msgid "Edit Virtual Folder"
-msgstr "Uredi navidezno mapo"
+msgstr "Uredi Navidezne mape"
 
 #: templates/mailbox/header.inc:13
 #, php-format
 msgid "Edit Virtual Folder Definition for %s"
-msgstr "Uredi definicijo navidezne mape za %s"
+msgstr "Uredi definicijo navideznih map za %s"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
-msgstr "Uredi beli seznam"
+msgstr "Uredi Whitelist"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
-msgstr "Uredite svoj èrni seznam"
+msgstr "Uredite svoj blacklist"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
-msgstr "Uredite pravila filtrov"
+msgstr "Uredite svoja pravila filtriranja"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
-msgstr "Uredite lastnosti za dostop do drugih po¹tnih raèunov."
+msgstr "Uredite svoje nastavitve za dostop do drugih po¹tnih naslovov."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
-msgstr "Uredite svoj beli seznam"
+msgstr "Uredite svoj whitelist"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "E-po¹tni naslov"
 
-#: lib/Message.php:651
+#: lib/Message.php:657
 #, php-format
 msgid "Emptied all messages from %s."
-msgstr "Vsa sporoèila iz %s so bila izbrisana."
+msgstr "Izpraznil vsa sporoèila iz %s"
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Izprazni mapo(e)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Izprazni mapo(e)"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
-msgstr "Izprazni Ko¹"
+msgstr "Izprazni mapo s smetmi"
+
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Izprazni _Smeti"
 
-#: lib/IMP.php:902
+#: lib/IMP.php:966
 msgid "Empty _Trash"
-msgstr "Izprazni Ko¹"
+msgstr "Izprazni _Smeti"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
-msgstr "Omogoèim funkcionalnosti PGP?"
+msgstr "Omogoèim PGP?"
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
-msgstr "Omogoèim funkcionalnosti S/MIME?"
+msgstr "Omogoèim S/MIME?"
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:811
 msgid "Enable message previews?"
-msgstr "Omogoèim predogled sporoèil?"
+msgstr "Omogoèi predogled sporoèil"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
-msgstr "Mo¾nosti kodiranja"
+msgstr "Mo¾nosti ©ifriran_ja"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:644
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
 msgid "End"
 msgstr "Konec"
 
-#: lib/Compose.php:321
+#: lib/Compose.php:384
 msgid "End forwarded message"
-msgstr "Konèaj posredovano sporoèilo"
+msgstr "Konec posredovanega sporoèila"
 
-#: lib/Compose.php:262
+#: lib/Compose.php:341
 msgid "End message"
 msgstr "Konec sporoèila"
 
-#: lib/Compose.php:260
+#: lib/Compose.php:339
 #, php-format
 msgid "End message from %s"
 msgstr "Konec sporoèila od %s"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
-msgstr "Vnesite geslo"
+msgstr "Vpi¹ite stavek za geslo"
+
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Vpi¹ite ime va¹e nove mape za smeti"
 
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
-msgstr "Vnesi ime nove mape osnutkov"
+msgstr "Vpi¹ite ime va¹e nove mape z osnutki"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
-msgstr "Vnesi ime nove mape poslanih sporoèil"
+msgstr "Vpi¹ite ime va¹e nove mape s poslano po¹to"
 
 #: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
-msgstr "Vnesi ime nove mape izbrisanih sporoèil"
+msgstr "Vpi¹ite ime va¹e nove mape za smeti"
+
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Preusmeri sporoèilo"
 
-#: message.php:186 compose.php:1043
+#: message.php:194 compose.php:1134 thread.php:71
 #, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
-msgstr "Zapis \"%s\" je bil uspe¹no dodan v imenik"
+msgstr "Vpis \"%s\" je bil uspe¹no dodan v Adresar"
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:367 lib/MIME/Viewer/pgp.php:392
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Napaka"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr "Napaka pri po¹iljanju odgovora: %s."
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
 msgid "Event successfully deleted."
-msgstr "Dogodek je bil uspe¹no izbrisan."
+msgstr "Dogodek uspe¹no izbrisan."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Vsakih 15 minut"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Vsakih 30 sekund"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Vsakih 5 minut"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Vsake pol ure"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Vsako minuto"
 
-#: folders.php:416
+#: folders.php:457
 msgid "Expand"
 msgstr "Raz¹iri"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Raz¹iri vse"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "Raz¹iri vse mape"
 
-#: folders.php:416
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Raz¹iri mapo"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Raz¹iri imena"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
-msgstr "Samodejno raz¹irim imena v oknu za sestavljanje sporoèil v ozadju?"
+msgstr "Pri oknu za sestavljane avtomatièno raz¹iri imena v ozadju."
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
-msgstr "Naj privzeto raz¹irim celo drevo map v pogledu map?"
+msgstr "Raz¹irim celotno drevo pri pogledu map?"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
-msgstr "Raz¹irjanje"
+msgstr "Raz¹iranje"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Fetch Mail"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
-msgstr "Preberi po¹to"
+msgstr "Fetch Mail"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
-msgstr "Preberem po¹to v loèenem oknu?"
+msgstr "Fetch Mail v loèenem oknu?"
 
 #: templates/fetchmail/manage.inc:46
 msgid "Fetch messages upon logging on?"
-msgstr "Preberem sporoèila po prijavi?"
+msgstr "Prenesem sporoèila ob prijavi?"
 
-#: lib/Fetchmail.php:306
-#, php-format
-msgid "Fetched %d message(s) from %s"
-msgstr "Prebrano %d sporoèil iz %s"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Presnel %d sporoèil z %s"
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Presnel %d sporoèil z %s"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
 msgid "Fetchmail: "
 msgstr "Fetchmail: "
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
 msgstr "Fetchmail: ni novih sporoèil."
 
-#: lib/IMP.php:917
+#: lib/IMP.php:990
 msgid "Fi_lters"
-msgstr "Filtri"
+msgstr "Fi_ltri"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "Datoteka"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
-msgstr "Mo¾nosti filtra"
+msgstr "Mo¾nosti Filtrov"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
-msgstr "Nastavitve filtra"
+msgstr "Nastavitve Filtrov"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:600
 msgid "Filter message content for profanity?"
-msgstr "Filtriram grde besede v vsebini sporoèil?"
+msgstr "Filtriram vsebino sporoèil za vulgarne besede?"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
-msgstr "Podpora filtrom je za ta sistem onemogoèena."
+msgstr "Podpora filtrom je na tem sistemu onemogoèena."
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filtri"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
 msgid "Filters NOT Active"
-msgstr "Filtri niso aktivni"
+msgstr "Filtri NISO aktivni"
 
-#: lib/Filter.php:102
+#: lib/Filter.php:105
 #, php-format
 msgid "Filters: %s management page"
-msgstr "Filtri: nadzorna stran %s"
+msgstr "Filtri: %s stran za upravljanje"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Najdi"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
-msgstr "Prva stran"
+msgstr "Prva stran nabiralnika"
 
-#: mailbox.php:334
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Prva stran"
 
 #: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
 msgid "Fo_rward"
-msgstr "Posreduj"
+msgstr "Nap_rej"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
-msgstr "Upravljalec map"
-
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "Predpona mape"
+msgstr "Premikanje po Mapah"
 
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
-msgstr "Povzetek mape"
+msgstr "Opis Mape"
 
 #: acl.php:24
 msgid "Folder sharing is not enabled."
-msgstr "Skupna raba za mape ni omogoèena."
+msgstr "Mape v skupni rabi niso omogoèene."
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
 msgstr "Uporaba map ni omogoèena."
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
-msgstr "Oblika datuma sporoèil za dana¹nja sporoèila"
+msgstr "Oblika datumov za dana¹nja sporoèila v pogledu nabiralnika"
 
-#: compose.php:706 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Posreduj"
 
-#: compose.php:691
+#: compose.php:765
 msgid "Forward:"
 msgstr "Posreduj:"
 
-#: lib/Compose.php:290
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Posredovano sporoèilo"
 
-#: lib/Compose.php:288
+#: lib/Compose.php:367
 #, php-format
 msgid "Forwarded message from %s"
 msgstr "Posredovano sporoèilo od %s"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 msgid "Free/Busy Information"
 msgstr "Informacija Prost/Zaseden"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr "Odgovor Prost/Zaseden"
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
 msgstr "Zahteva Prost/Zaseden"
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
 msgstr "Odgovor na zahtevo Prost/Zaseden"
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
-msgstr "Od"
+msgstr "O_d"
 
-#: message.php:255 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Od"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:918
 msgid "From Address"
-msgstr "Iz naslova"
+msgstr "Od naslov"
 
-#: compose.php:703 compose.php:707
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Fwd:"
 
-#: compose.php:1204
+#: compose.php:1294
 msgid "Fwd: "
-msgstr "Fwd: "
+msgstr "Fwd:"
 
-#: compose.php:1206
+#: compose.php:1296
 #, php-format
 msgid "Fwd: %u Forwarded Messages"
-msgstr "Fwd: %u posredovana sporoèila"
+msgstr "Fwd: %u Posredovanih sporoèil"
 
 #: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
 #: config/prefs.php.dist:38
 msgid "General Options"
-msgstr "Splo¹ne mo¾nosti"
+msgstr "Splo¹ne Mo¾nosti"
 
 #: templates/fetchmail/manage.inc:37
 msgid "Get only new messages? (IMAP only)"
-msgstr "Povleèem samo nova sporoèila? (samo za IMAP)"
+msgstr "Prenesem samo nova sporoèila? (samo IMAP)"
 
-#: thread.php:68
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "Pojdi na sporoèilo"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Dodaj v Adresar (%s)"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
-msgstr "Dovoli dostop"
+msgstr "Odobri dostop"
 
-#: message.php:547 lib/Filter.php:102 lib/MIME/Viewer/images.php:93
-#: lib/MIME/Viewer/images.php:94 lib/MIME/Viewer/images.php:96
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/html.php:117
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/pkcs7.php:410 lib/MIME/Viewer/appledouble.php:43
-#: lib/MIME/Viewer/pgp.php:178 lib/MIME/Viewer/status.php:123
-#: lib/MIME/Viewer/status.php:130
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "TUKAJ"
 
-#: lib/MIME/Viewer/html.php:118
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr "HTML"
 
-#: compose.php:243
+#: compose.php:256
 msgid "HTML Version of Message"
 msgstr "HTML razlièica sporoèila"
 
 #: templates/message/headers.inc:58
 msgid "Headers"
-msgstr "Glave"
+msgstr "Vrstice glave"
 
 #: templates/compose/recompose.inc:5
 msgid "Here is the message you were composing:"
-msgstr "Sporoèilo, ki ste ga sestavljali:"
+msgstr "Tukaj je sporoèilo, ki ste ga sestavljali:"
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "Skrito"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
-msgstr "Skrito v nitnem pogledu"
+msgstr "Skrito v pogledu Pogovora"
 
-#: mailbox.php:356
+#: mailbox.php:367
 msgid "Hide Deleted"
-msgstr "Skrij izbrisana"
+msgstr "Skrij Izbrisana"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Hide Unsubscribed"
-msgstr "Skrij neprijavljene"
+msgstr "Skrij Nenaroèene"
 
-#: lib/MIME/Viewer/html.php:104
-msgid "Hide the Images"
-msgstr "Skrij slike"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
-msgstr "Visoko"
+msgstr "Visoka"
 
-#: message.php:289 mailbox.php:681 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
 msgid "High Priority"
-msgstr "Skrij prioriteto"
+msgstr "Visoka prioritita"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Najvi¹ja"
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
-msgstr "Kako ¾elite prikazati priloge?"
+msgstr "Kako ¾elite prikazati priponke?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
-msgstr "Kako oznaèim citirane vrstice v odgovoru"
+msgstr "Kako ponazorim citirane vrstice v odgovoru"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr "IMAP"
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
-msgstr "IMAP (samodejno zaznaj protokol)"
+msgstr "IMAP (zaznaj protokol)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP preko SSL"
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
-msgstr "IMAP preko SSL (samo-podpisani certifikat)"
+msgstr "IMAP preko SSL (samo-podpisano potrdilo)"
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
-msgstr "IMAP preko SSL (samo-podpisano)"
+msgstr "IMAP preko SSL (samo-podpisan)"
+
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Tip stre¾nika za povezavo:"
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr "IMAP, brez TLS"
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
-msgstr "Po¹tni stre¾niki IMAP/POP3"
+msgstr "IMAP/POP3 Po¹tni Stre¾niki"
 
-#: folders.php:350
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "INBOX"
 
-#: templates/compose/spelling.inc:66
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Vsa sporoèila v mapi(ah) bodo izgubljena!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
-msgstr "Ignoriraj"
+msgstr "Prezri"
 
-#: templates/compose/spelling.inc:67
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
-msgstr "Ignoriraj vse"
+msgstr "Prezri vse"
+
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
 
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "Uvozi"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Uvozi kljuè"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Uvozi par kljuèev"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
+#, fuzzy
 msgid "Import Messages"
-msgstr "Uvozi sporoèila"
+msgstr "Pomembna sporoèila"
 
 #: pgp.php:42
 msgid "Import PGP Key"
-msgstr "Uvozi kljuè PGP"
+msgstr "Uvozi PGP kljuè"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
-msgstr "Uvozi osebni certifikat"
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
+msgstr "Uvozi Osebna potrdila"
 
 #: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
-msgstr "Uvozi osebni privatni kljuè PGP"
+msgstr "Uvozi osebni Zasebni PGP kljuè"
 
 #: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
-msgstr "Uvozi osebni javni kljuè PGP"
+msgstr "Uvozi osebni Javni PGP kljuè"
 
 #: templates/smime/import_key.inc:4
 msgid "Import Personal S/MIME Certificates"
-msgstr "Uvozi osebni certifikat S/MIME"
+msgstr "Uvozi osebno S/MIME potrdilo"
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
-msgstr "Uvozi javni kljuè"
+msgstr "Uvozi Javni kljuè"
 
 #: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
-msgstr "Uvozi javni kljuè PGP"
+msgstr "Uvozi Javni PGP kljuè"
 
 #: templates/smime/import_key.inc:8
 msgid "Import Public S/MIME Key"
-msgstr "Uvozi javni kljuè S/MIME"
+msgstr "Uvozi Javni S/MIME kljuè"
 
 #: smime.php:16
 msgid "Import S/MIME Key"
-msgstr "Uvozi kljuè S/MIME"
+msgstr "Uvozi S/MIME kljuè"
 
 #: templates/folders/import.inc:9
 msgid "Import mbox File"
-msgstr "Uvozi datoteko mbox"
+msgstr "Uvozi mbox datoteko"
 
 #: templates/folders/import.inc:16
 #, php-format
 msgid "Import mbox file %s into folder %s."
-msgstr "Uvozi datoteko mbox %s v mapo %s."
+msgstr "Uvozi mbox datoteko %s v mapo %s."
 
-#: message.php:493 mailbox.php:689 templates/message/navbar_navigate.inc:7
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
-msgstr "Pomembna"
+msgstr "Pomembno"
 
 #: templates/search/main.inc:47
 msgid "Important messages"
 msgstr "Pomembna sporoèila"
 
-#: folders.php:157
+#: folders.php:167
 #, php-format
 msgid "Imported %d messages from %s."
-msgstr "Uvo¾eno %d sporoèil od %s."
+msgstr "Uvozil %d sporoèil iz %s."
 
-#: lib/MIME/Viewer/itip.php:758
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
-msgstr "V obdelavi"
+msgstr "V teku"
 
-#: lib/Folder.php:248 lib/IMP.php:369
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
-msgstr "Prejeto"
+msgstr "Inbox"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
-msgstr "Vkljuèim povzetek glave v odgovoru?"
+msgstr "Vkljuèim kratek povzetek glave v odgovor?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
-msgstr "Vkljuèim izvirno sporoèilo v odgovoru?"
+msgstr "Vkljuèim izvorno sporoèilo v odgovor?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Info"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "Information on %s Public Key"
-msgstr "Informacije o javnem kljuèu %s"
+msgstr "Informacije o %s Javnem kljuèu"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
-msgstr "Informacije o osebnem zasebnem kljuèu"
+msgstr "Informacije o osebnem Zasebnem kljuèu"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
-msgstr "Informacije o osebnem javnem kljuèu"
+msgstr "Informacije o osebnem Javnem kljuèu"
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 msgid "Inline"
 msgstr "Znotraj"
 
 #: templates/smime/import_key.inc:9
 msgid "Insert Certificate Here"
-msgstr "Tukaj vstavi certifikat"
+msgstr "Tukaj vstavi Potrdilo"
 
 #: templates/pgp/import_key.inc:15
 msgid "Insert Personal Private PGP Key Here"
-msgstr "Tukaj vstavi osebni zasebni kljuè PGP"
+msgstr "Tukaj vstavi osebni Zaseben PGP kljuè"
 
 #: templates/pgp/import_key.inc:10
 msgid "Insert Personal Public PGP Key Here"
-msgstr "Tukaj vstavi osebni javni kljuè PGP"
+msgstr "Tukaj vstavi osebni Javni PGP kljuè"
 
 #: templates/pgp/import_key.inc:5
 msgid "Insert Public PGP Key Here"
-msgstr "Tukaj vstavi javni kljuè PGP"
+msgstr "Tukaj vstavi Javni PGP kljuè"
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
-msgstr "Izbrano neustrezno dejanje za to komponento."
+msgstr "Za to komponento je bilo izbrano nepravilno dejanje"
 
-#: mailbox.php:549 mailbox.php:590
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
-msgstr "Napaèen naslov"
+msgstr "Nepravilen Naslov"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
-msgstr "Napaèen oddaljen po¹tni predal"
+msgstr "Nepravilen oddaljen nabiralnik"
 
-#: compose.php:132
+#: compose.php:158
 #, php-format
 msgid "Invalid character in e-mail address: %s."
-msgstr "Napaènen znak v naslovu elektronske po¹te: %s."
+msgstr "Neveljaven znak v e-po¹tnem naslovu: %s"
 
 #: smime.php:82 pgp.php:16
 msgid "Invalid key"
-msgstr "Napaèen kljuè"
+msgstr "Neveljaven kljuè"
 
 #: pgp.php:196
 msgid "Invalid personal PGP private key."
-msgstr "Napaèen osebni zasebni kljuè PGP"
+msgstr "Neveljaven osebni PGP zasebni kljuè."
 
 #: pgp.php:171
 msgid "Invalid personal PGP public key."
-msgstr "Napaèen osebni javni kljuè PGP."
+msgstr "Neveljaven osebni PGP javni kljuè."
 
 #: templates/mailbox/navbar.inc:12
 msgid "Invert"
-msgstr "Obrni"
+msgstr "Obrni izbor"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr "KB"
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr "Dol¾ina kljuèa"
 
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
-msgstr "Kljuè je bil uspe¹no poslan na javni stre¾nik s kljuèi."
+msgstr "Kljuè uspe¹no poslan na javni stre¾nik s kljuèi."
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Jezik"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
-msgstr "Zadnja stran"
+msgstr "Zadnja stran nabiralnika"
 
-#: mailbox.php:347
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "Zadnja stran"
 
-#: templates/compose/compose.inc:380
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
-msgstr "Pove¾i priponke"
+msgstr "Pove¾i Pripo_nke"
 
-#: attachment.php:34 lib/Compose.php:980
+#: attachment.php:34 lib/Compose.php:1063
 msgid "Linked attachments are forbidden."
-msgstr "Povezave do priponk so prepovedane."
+msgstr "Povezane priponke niso dovoljene."
+
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
 msgstr ""
-"Prika¾em vse kontakte med nalaganjem? (èe ni omogoèeno, boste videli samo "
-"kontakte, ki ste jih iskali)"
+"Prika¾em vse stike, ko nalagam zaslon s stiki? (èe je mo¾nost onemogoèena "
+"bostevideli samo stike, ki jih sami izrecno i¹èete)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Seznam v glavi"
 
 #: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
-msgstr "Lokalni po¹tni predal:"
+msgstr "Lokalni Nabiralnik:"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:674
 msgid "Location"
 msgstr "Lokacija"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "Prijava"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:115
 #, php-format
 msgid "Log in to %s"
 msgstr "Prijava v %s"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "Prijava"
 
@@ -1926,197 +2119,213 @@
 msgid "Login Tasks"
 msgstr "Opravila ob prijavi"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
-msgstr "Nizko"
+msgstr "Nizka"
 
-#: message.php:291 mailbox.php:684 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
-msgstr "Nizka prioriteta"
+msgstr "Nizka Prioriteta"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Najni¾ja"
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 msgid "Macintosh File"
-msgstr "Datoteka Macintosh"
+msgstr "Macintosh Datoteka"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "Po¹ta"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 msgid "Mail Previews"
-msgstr "Predogledi po¹te"
+msgstr "Predogled Po¹te"
 
 #: templates/fetchmail/driver_select.inc:16
 msgid "Mail server type to connect to:"
-msgstr "Vrsta po¹tnega stre¾nika za priklop:"
+msgstr "Tip stre¾nika za povezavo:"
 
-#: folders.php:368
+#: folders.php:402
 msgid "Mailbox"
-msgstr "Po¹tni predal"
+msgstr "Nabiralnik"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
-msgstr "Mo¾nosti prikaza po¹tnega predala in map"
+msgstr "Mo¾nosti prikaza Nabiralnikov in Map"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
-msgstr "Oznaèi vsa sporoèila v mapi kot ¾e videna"
+msgstr "Oznaèi vsa sporoèila v mapi kot Videna"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
-msgstr "Oznaèi vsa sporoèila v mapi kot ¹e ne videna"
+msgstr "Oznaèi vsa sporoèila v mapi kot Ne-videna"
 
 #: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Oznaèi kot:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
-msgstr "Oznaèim razliène nivoje navajanja z razliènimi barvami?"
+msgstr "Oznaèim razliène nivoje citiranja z razliènimi barvami?"
 
 #: templates/fetchmail/manage.inc:40
 msgid "Mark messages as seen? (IMAP only)"
-msgstr "Oznaèim sporoèila kot ¾e videna? (samo za IMAP)"
+msgstr "Oznaèim sporoèila kot videna? (samo IMAP)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
-msgstr "Oznaèim preprosto?"
+msgstr "Oznaèim preprosto oblikovanje?"
 
 #: templates/search/header.inc:46
 msgid "Match All Queries"
-msgstr "Ujemanje z vsemi pogoji"
+msgstr "Prika¾i vse poizvedbe"
 
 #: templates/search/header.inc:42
 msgid "Match Any Query"
-msgstr "Ujemanje z vsaj enim pogojem"
+msgstr "Prika¾i katerokoli poizvedbo"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
 msgstr "Najveèja velikost priponke"
 
-#: templates/compose/compose.inc:484
+#: lib/api.php:79
+#, fuzzy
+msgid "Maximum Number of Folders"
+msgstr "Najveèje ¹tevilo priponk dose¾eno."
+
+#: templates/compose/compose.inc:494
 msgid "Maximum number of attachments reached."
-msgstr "Dose¾eno je bilo najveèje ¹tevilo priponk."
+msgstr "Najveèje ¹tevilo priponk dose¾eno."
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:489
 msgid "Maximum total attachment size reached."
-msgstr "Dose¾ena je bila najveèja velikost priponke."
+msgstr "Najveèja skupna velikost priponk dose¾ena."
 
-#: lib/MIME/Viewer/itip.php:604
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
 msgstr "Odpoved sestanka"
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
 msgid "Meeting Information"
 msgstr "Informacije o sestanku"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
 msgid "Meeting Proposal"
-msgstr "Predlog sestanka"
+msgstr "Predlog za sestanek"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:617
 msgid "Meeting Reply"
 msgstr "Odgovor o sestanku"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
 msgid "Meeting Update"
-msgstr "Popravek sestanka"
+msgstr "Nove informacije o sestanku"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
 msgid "Meeting Update Request"
-msgstr "Zahteva popravka sestanka"
+msgstr "Zahteva po novih informacijah o sestanku"
 
 #: lib/Block/tree_folders.php:3
 msgid "Menu Folder List"
-msgstr "Meni Seznam map"
+msgstr "Menu seznama Map"
 
-#: lib/Compose.php:237
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "Sporoèilo"
 
-#: compose.php:508 compose.php:535 compose.php:568 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
-msgstr "Ustvarjanje sporoèila"
+msgstr "Setavljanje Sporoèila"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:917
 msgid "Message Date"
-msgstr "Datum sporoèila"
+msgstr "Datum Sporoèila"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
-msgstr "Mo¾nosti sporoèila"
+msgstr "Mo¾nosti Sporoèila"
 
-#: search.php:354
+#: search.php:312
 msgid "Message Search"
-msgstr "Iskanje sporoèil"
+msgstr "Iskanje Sporoèila"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:921
 msgid "Message Size"
-msgstr "Velikost sporoèila"
+msgstr "Velikost Sporoèila"
 
-#: message.php:376
+#: message.php:384
 msgid "Message Source"
-msgstr "Izvirnik sporoèila"
+msgstr "Izvorna koda Sporoèila"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
-msgstr "Pogledovanje sporoèil"
-
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "Polja sporoèila"
+msgstr "Pregled Sporoèila"
 
 #: templates/search/main.inc:6
 msgid "Message flags"
-msgstr "Statusi sporoèila"
+msgstr "Oznake Sporoèila"
 
 #: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Mape sporoèil"
 
-#: lib/Compose.php:235
+#: lib/Compose.php:329
 #, php-format
 msgid "Message from %s"
 msgstr "Sporoèilo od %s"
 
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Ujemanje sporoèila"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Polja Sporoèila"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Polja Sporoèila"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
-msgstr "Sporoèilo se ujema"
+msgstr "Ujemanje sporoèila"
 
-#: compose.php:750 compose.php:760
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
-msgstr "Sporoèilo je bilo uspe¹no preusmerjeno."
+msgstr "Sporoèilo uspe¹no preusmerjeno."
 
-#: compose.php:993
+#: compose.php:1084
 #, php-format
 msgid "Message sent successfully, but not saved to %s"
-msgstr "Sporoèilo je bilo uspe¹no poslano vendar ni bilo shranjeno v %s"
+msgstr "Sporoèilo uspe¹no poslano, vendar ni bilo shranjeno v %s"
 
-#: compose.php:1052 compose.php:1067
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
-msgstr "Sporoèilo je bilo uspe¹no poslano."
+msgstr "Sporoèilo uspe¹no poslano."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
-msgstr "©tevilo sporoèil na strani v po¹tnem predalu."
+msgstr "Sporoèil na stran v pogledu nabiralnika."
 
-#: mailbox.php:311
+#: mailbox.php:322
 msgid "Messages to"
-msgstr "Sporoèila v"
+msgstr "Sporoèila za"
 
 #: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Spremeni"
 
 #: templates/compose/expand.inc:12
-#, php-format
-msgid "More than one address found for field '%s'."
-msgstr "Za polje %s je bil najden veè kot en naslov."
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr "Za polje '%s' je bil najden veè kot en naslov."
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
@@ -2126,7 +2335,11 @@
 msgid "Move down"
 msgstr "Premakni dol"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "Premakni v mapo"
 
@@ -2134,53 +2347,73 @@
 msgid "Move up"
 msgstr "Premakni gor"
 
-#: lib/MIME/Viewer/alternative.php:126
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
-msgstr "Multipart/alternativno"
+msgstr "Veèdelno/alternativno"
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Pregled Sporoèila"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "BELE®KA"
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
-msgstr "OPOMBA"
+msgstr "BELE®KA"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:673
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Ime"
 
 #: pgp.php:110
 msgid "Name and/or email can not be empty"
-msgstr "Ime in/ali sporoèilo ne sme biti prazno"
+msgstr "Ime in/ali e-po¹ta ne smeta biti prazna"
 
-#: lib/MIME/Viewer/itip.php:763
+#: lib/MIME/Viewer/itip.php:778
 msgid "Needs Action"
 msgstr "Potrebuje ukrep"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Nikoli"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Nikoli ne shrani priponk"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
-msgstr "Nova"
+msgstr "Nov"
 
-#: lib/IMP.php:579
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "Nova mapa"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
-msgstr "Nova po¹ta"
+msgstr "Nova E-po¹ta"
+
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Naslednje sporoèilo"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Nova sporoèila"
 
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nova sporoèila"
 
-#: templates/compose/spelling.inc:119
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "Naprej"
 
@@ -2188,171 +2421,188 @@
 msgid "Next Message"
 msgstr "Naslednje sporoèilo"
 
-#: mailbox.php:345
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Naslednja stran"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "Ne"
 
 #: smime.php:226
 msgid "No Certificate found"
-msgstr "Certifikat ni bil najden"
+msgstr "Ni potrdil"
 
 #: templates/compose/encrypt_list.inc:5
 msgid "No Encryption"
-msgstr "Brez kodiranja"
+msgstr "Brez ¹ifriranja"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
-msgstr "V zbirki kljuèev ni nobenega kljuèa"
+msgstr "Ni kljuèev"
 
-#: mailbox.php:364
+#: mailbox.php:375
 #, php-format
 msgid "No Messages"
 msgstr "Ni sporoèil"
 
 #: pgp.php:137
 msgid "No PGP public key imported."
-msgstr "Noben javni kljuè PGP ni bil uvo¾en."
+msgstr "Noben javni PGP kljuè ni bil uvo¾en."
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
-msgstr "Osebno potrdilo ni prisotno"
+msgstr "Ni osebnih potrdil"
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Predogled"
+
+#: templates/smime/smime.inc:15
 msgid "No Public Keys Found"
-msgstr "Javni kljuè ni bil najden"
+msgstr "Ni javnih kljuèev"
 
 #: smime.php:151
 msgid "No S/MIME public key imported."
-msgstr "Noben javni kljuè S/MIME ni bil uvo¾en."
+msgstr "Noben javni S/MIME kljuè ni bil uvo¾en."
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
-msgstr "Priponk ni mogoèe najti."
+msgstr "Ni priponk."
+
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Informacije o %s Javnem kljuèu"
 
 #: acl.php:72 acl.php:98
 msgid "No folder selected."
 msgstr "Nobena mapa ni izbrana."
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
-msgstr "Nobena mapa ni bila preverjena za nova sporoèila."
+msgstr "Nobene mape se ne preverja za novo po¹to."
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
-msgstr "Nobena mapa ni bila izbrana"
+msgstr "Nobena mapa ni bila podana"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
-msgstr "Ni map z novimi sporoèili"
+msgstr "Nobena mapa ne vsebuje novih sporoèil"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
-msgstr "Ni map z neprebranimi sporoèili"
+msgstr "Nobena mapa ne vsebuje nevidenih sporoèil"
 
-#: lib/Compose.php:231
+#: lib/Compose.php:325
 msgid "No message body text"
-msgstr "Ni besedila v telesu sporoèila"
+msgstr "Telo sporoèila ne vsebuje besedila"
 
-#: lib/Mailbox.php:1157
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
-msgstr "Nobeno sporoèilo ne ustreza iskanemu pojmu."
+msgstr "Nobeno sporoèilo se ne ujema z iskanimi pogoji."
 
 #: pgp.php:189
 msgid "No personal PGP private key imported."
-msgstr "Noben osebni zasebni kljuè PGP ni bil uvo¾en."
+msgstr "Noben osebni Zasebni PGP kljuè ni bil uvo¾en."
 
 #: pgp.php:165
 msgid "No personal PGP public key imported."
-msgstr "Noben osebni javni kljuè PGP ni bil uvo¾en."
+msgstr "Noben osebni Javni PGP kljuè ni bil uvo¾en."
 
 #: smime.php:201
 msgid "No personal S/MIME certificates imported."
-msgstr "Nobeno osebno potrdilo S/MIME ni bilo uvo¾eno."
+msgstr "Nobeno osebno S/MIME potrdilo ni bilo uvo¾eno."
 
 #: spelling.php:220
 msgid "No spellchecking program configured."
-msgstr "Program za preverjanje èrkovanja ni nastavljen."
+msgstr "Noben program za preverjanje èrkovanja ni bil konfiguriran."
 
-#: templates/compose/spelling.inc:28
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
-msgstr "Èrkovanje brez napak"
+msgstr "Ni èrkovalnih napak"
 
-#: templates/compose/spelling.inc:85
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Ni predlogov"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 msgid "No user specified."
-msgstr "Noben uporabnik ni podan."
+msgstr "Uporabnik ni bil podan."
 
-#: lib/MIME/Viewer/itip.php:694
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
-msgstr "Ne sodelujoèi"
+msgstr "Ni udele¾enec"
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 lib/MIME/Viewer/itip.php:651
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
-msgstr "Brez"
+msgstr "Nobenega"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
-msgstr "Normalna"
+msgstr "Navadna"
 
 #: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
-msgstr "Ne brisana"
+msgstr "Ni pobrisano"
 
 #: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
 #: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
-msgstr "Ni osnutek"
+msgstr "Ni Osnutek"
 
 #: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
 #: templates/mailbox/navbar.inc:34
 msgid "Not Important"
-msgstr "Nepomembna"
+msgstr "Nepomembno"
 
 #: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
-msgstr "Ne osebna"
+msgstr "Ni Osebno"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:151 lib/Crypt/SMIME.php:157
-#: lib/Crypt/SMIME.php:166
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
-msgstr "Ni veljavni javni kljuè."
+msgstr "Ni veljaven javni kljuè."
 
 #: templates/search/main.inc:67
 msgid "Not deleted messages"
-msgstr "Ne brisana sporoèila"
+msgstr "Niso izbrisana sporoèila"
 
 #: templates/search/main.inc:51
 msgid "Not important messages"
-msgstr "Nepomembna sporoèila"
+msgstr "Niso pomembna sporoèila"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
-msgstr "To lahko traja nekaj èasa"
+msgstr "Dejanje lahko traja dalj èasa"
 
-#: config/prefs.php.dist:371
-msgid "Number of months to keep old linked attachments if deleting monthly."
+#: config/prefs.php.dist:616
+msgid "Nothing"
 msgstr ""
-"©tevilo mesecev, za katere naj se ohranijo priponke, èe se bri¹ejo meseèno."
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:377
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "©tevil mesecev preden pobri¹em stare priponke, èe jih bri¹em meseèno."
+
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr ""
-"©tevilo starih map poslanih sporoèil za ohranit, èe se bri¹ejo meseèno."
+"©tevil mesecev preden pobri¹em mape s poslano po¹to, èe jih bri¹em meseèno."
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:718
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "V redu"
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "ALI"
@@ -2361,160 +2611,159 @@
 msgid "Old messages"
 msgstr "Stara sporoèila"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
-msgstr "Èi¹èenje stare mape poslanih sporoèil."
+msgstr "Stare mape s poslano po¹to se bri¹ejo."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
 msgid "Only display folders with unread messages in them?"
 msgstr "Prika¾em samo mape z neprebranimi sporoèili?"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 msgid "Only one folder should be selected for this action."
-msgstr "Za to dejanje izberite samo eno mapo."
+msgstr "Za to dejanje je lahko izbrana samo ena mapa."
 
-#: templates/menu.inc:24 templates/menu.inc:25
-msgid "Ope_n Folder"
-msgstr "Odpri mapo"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
+msgstr "Odpri Mapo"
 
-#: templates/menu.inc:16 templates/menu.inc:18
-msgid "Open Folder"
-msgstr "Odpri mapo"
-
-#: folders.php:385
+#: folders.php:427
 msgid "Opened Folder"
-msgstr "Odprta mapa"
+msgstr "Odprta Mapa"
 
-#: lib/MIME/Viewer/itip.php:690
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
-msgstr "Udele¾enec po ¾elji"
+msgstr "Pogojni udele¾enec"
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
-msgstr "Drugi raèuni"
+msgstr "Drugi raèuni za E-po¹to"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
-msgstr "Ostale mo¾nosti"
+msgstr "Druge mo¾nosti"
+
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr "PGP"
 
 #: templates/compose/encrypt_list.inc:7
 msgid "PGP Encrypt Message"
-msgstr "Kodirano sporoèilo PGP"
+msgstr "PGP ¹ifriraj sporoèilo"
 
-#: compose.php:343
+#: compose.php:358
 msgid "PGP Error: "
-msgstr "Napaka PGP: "
+msgstr "PGP Napaka: "
 
-#: compose.php:322
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
-msgstr "Napaka PGP: vnesite geslo za osebni javni kljuè."
-
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr "PGP ni aktiven"
+msgstr "PGP Napaka: Potrebujem geslo za osebni zasebni kljuè."
 
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 msgid "PGP Options"
-msgstr "Mo¾nosti PGP"
+msgstr "PGP Mo¾nosti"
 
 #: pgp.php:30
 msgid "PGP Passphrase Input"
-msgstr "Vnos gesla PGP"
+msgstr "Vpis PGP gesla"
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
-msgstr "Podpora osebnega para kljuèev PGP zahteva varno spletno povezavo."
+msgstr "Podpora osebnemu paru PGP kljuèev zahteva varno spletno povezavo."
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 msgid "PGP Public Key Text"
-msgstr "Besedilo javnega kljuèa PGP"
+msgstr "Besedilo Javnega PGP kljuèa"
 
 #: pgp.php:149
 #, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr "Javni kljuè za PGP \"%s (%s)\" je bil uspe¹no dodan."
+msgstr "Javni PGP kljuè za \"%s (%s)\" je bil uspe¹no dodan."
 
 #: pgp.php:245
 #, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr "Javni kljuè za PGP \"%s\" je bil uspe¹no izbrisan."
+msgstr "Javni PGP kljuè za \"%s\" je bil uspe¹no izbrisan."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
-msgstr "Seznam javnih kljuèev PGP"
+msgstr "Obesek z javnimi PGP kljuèi"
 
 #: templates/compose/encrypt_list.inc:8
 msgid "PGP Sign Message"
-msgstr "Podpi¹i sporoèilo s PGP"
+msgstr "PGP Podpi¹i sporoèilo"
 
 #: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
-msgstr "Podpi¹i/kodiraj sporoèilo s PGP"
+msgstr "PGP Podpi¹i/©ifriraj sporoèilo"
 
 #: pgp.php:202
 msgid "PGP private key successfully added."
-msgstr "Zasebni kljuè PGP je bil uspe¹no dodan."
+msgstr "PGP zasebni kljuè uspe¹no dodan."
 
 #: pgp.php:177
 msgid "PGP public key successfully added."
-msgstr "Javni kljuè PGP je bil uspe¹no dodan."
+msgstr "PGP javni kljuè uspe¹no dodan."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "Podpora PGP je na tem sistemu onemogoèena."
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
-"Podpora PGP trenutno ni aktivna, zato digitalni podpis ne more biti "
-"preverjen."
+"PGP podpora trenutno ni omogoèena, zato digitalnega podpisa ni bilo mogoèe "
+"overiti."
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
-"Podpora PGP trenutno ni aktivna, zato sporoèilo ne more biti odkodirano."
+"PGP podpora trenutno ni omogoèena, zato sporoèila ni bilo mogoèe de¹ifrirati."
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
+#, fuzzy
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
-"Podpora PGP uporablja okna popup. Èe va¹ brskalnik trenutno blokira okna "
-"popup, morate to nastavitev spremeniti, drugaèe PGP ne bo deloval pravilno."
+"PGP podpora zahteva uporabo popup oken. Èe jih va¹ brskalnik trenutno ne "
+"omogoèa morate to nastavitev spremeniti in jih omogoèiti. V nasprotnem "
+"primeru PGP mo¾nosti ne bodo pravilno delovale"
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
-msgstr "POP3 (samodejno zaznaj protokol)"
+msgstr "POP3 (samodejno zaznaj)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr "POP3 preko SSL"
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr "POP3 preko SSL (samo-podpisano potrdilo)"
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
-msgstr "POP3 preko SSL (samo-podpisano)"
+msgstr "POP3 preko SSL (samo-podpisan)"
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, brez TLS"
 
@@ -2523,31 +2772,31 @@
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
-msgstr "Stran s prvim neprebranim sporoèilom"
+msgstr "Stran s prvim Ne-videnim sporoèilom"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
-msgstr "Stran z zadnjim neprebranim sporoèilom"
+msgstr "Stran z zadnjim Ne-videnim sporoèilom"
 
 #: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Del(i)"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr "Geslo"
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Geslo (ponovno)"
 
 #: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
-msgstr "Geslo je bilo uspe¹no odlo¾eno."
+msgstr "Geslo uspe¹no odstranjeno."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Geslo:"
 
@@ -2559,63 +2808,70 @@
 msgid "Passphrases do not match"
 msgstr "Gesli se ne ujemata"
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Geslo"
 
 #: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
-msgstr "Izvedi operacije vzdr¾evanja ob prijavi?"
+msgstr "Izvedem vzdr¾evanje ob prijavi?"
 
 #: acl.php:76 acl.php:102
 msgid "Permissions for this user can not be changed."
-msgstr "Ne morem spremeniti pravic za tega uporabnika."
+msgstr "Pravic za tega uporabnika ni mogoèe spreminjati."
 
-#: message.php:484 mailbox.php:660 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
-msgstr "Oseben"
+msgstr "Osebno"
 
 #: config/prefs.php.dist:14
 msgid "Personal Information"
-msgstr "Osebni podatki"
+msgstr "Osebne Informacije"
 
 #: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
-msgstr "Par osebnih kljuèev PGP je bil uspe¹no ustvarjen."
+msgstr "Oseben par PGP kljuèev uspe¹no generiran."
 
 #: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
-msgstr "Par osebnih kljuèev PGP je bil uspe¹no izbrisan."
+msgstr "Oseben par PGP kljuèev uspe¹no izbrisan."
 
 #: smime.php:207
 msgid "Personal S/MIME certificates NOT imported: "
-msgstr "Osebno potrdilo S/MIME ni bilo uvo¾eno: "
+msgstr "Osebno S/MIME potrdilo NI BILO uvo¾eno: "
 
 #: smime.php:132
 msgid "Personal S/MIME keys deleted successfully."
-msgstr "Osebni kljuèi S/MIME so bili uspe¹no izbrisani."
+msgstr "Osebni S/MIME kljuèi uspe¹no izbrisani."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
-msgstr "Postavite va¹ podpis pred odgovor in posredovano sporoèilo?"
+msgstr "Prika¾em va¹ podpis pred posredovanimi sporoèili in odgovori?"
 
-#: compose.php:241
+#: compose.php:254
 msgid "Plaintext Version of Message"
-msgstr "Besedilna razlièica sporoèila"
+msgstr "Sporoèilo v navadnem besedilu"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
-msgstr "Prosim vpi¹ite ime nove mape:"
+msgstr "Prosim vpi¹ite ime za novo mapo:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
-msgstr "Prosim vnesite ime nove mape:"
+msgstr "Prosim vpi¹ite ime nove mape:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
-msgstr "Vnesite novo ime:"
+msgstr "Prosim vpi¹ite novo ime:"
 
 #: templates/pgp/passphrase.inc:19
 #, php-format
@@ -2623,8 +2879,8 @@
 "Please enter the passphrase for your PGP private key. You will only need to "
 "enter this passphrase once per %s session."
 msgstr ""
-"Prosim vnesite geslo va¹ega zasebnega kljuèa PGP. Geslo morate vnesti samo "
-"enkrat na sejo %s."
+"Prosim vpi¹ite geslo za va¹ zasebni PGP kljuè. To geslo boste morali vpisati "
+"samo enkrat v vsaki %s seji."
 
 #: templates/smime/passphrase.inc:13
 #, php-format
@@ -2632,78 +2888,73 @@
 "Please enter the passphrase for your S/MIME private key. You will only need "
 "to enter this passphrase once per %s session."
 msgstr ""
-"Prosim vnesite geslo va¹ega zasebnega kljuèa S/MIME. Geslo morate vnesti "
-"samo enkrat na sejo %s."
+"Prosim vpi¹ite geslo za va¹ S/MIME zasebni kljuè. To geslo boste morali "
+"vpisati samo enkrat v vsaki %s seji."
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
 "log in again in your main window as well. This is to keep attackers from "
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
-"Za nadaljevanje sestavljanja sporoèila se ponovno prijavite. Èe ne "
-"uporabljate pi¹kotkov in sestavljate sporoèilo v loèenem oknu, se boste "
-"morali ponovno prijaviti tudi v glavnem oknu. Tak sistem se uporablja zaradi "
-"nevarnosti prevzema va¹e seje s strani napadalca. Opravièujemo se za "
-"neprijetnosti."
+"Za nadaljevanje sestavljanja va¹ega sporoèila se prosim ponovno prijavite. "
+"Èe ne uporabljate pi¹kotkov IN èe sestavljate sporoèila v popup oknih, se "
+"boste morali ponovno prijaviti tudi v va¹em glavnem oknu. Ti ukrepi so zato, "
+"da bi napadalcem prepreèili ugrabitev ID seje. Opravièujemo se za "
+"neprijetnost."
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 msgid "Please provide your password."
-msgstr "Prosim vpi¹ite va¹e geslo."
+msgstr "Prosim vpi¹ite svoje geslo."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 msgid "Please provide your username."
-msgstr "Prosim vpi¹ite va¹e uporabni¹ko ime."
+msgstr "Prosim vpi¹ite svoje uporabni¹ko ime."
 
-#: compose.php:80 lib/IMP.php:520
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
-msgstr "Izberite nejasne in napaène naslove."
+msgstr "Prosim popravite dvoumne ali neveljavne naslove."
 
-#: lib/MIME/Viewer/itip.php:631
+#: lib/MIME/Viewer/itip.php:642
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
 msgstr ""
-"Prosim preglejte naslednje informacije, nato pa izberite ustrezno dejanje iz "
-"menuja spodaj."
+"Prosim poglejte naslednje informacije in izberite dejanje iz spodnjega "
+"menuja."
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
-msgstr "Izberite mapo pred kakr¹nim koli dejanjem."
+msgstr "Prosim izberite mapo, preden izberite dejanje."
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 msgid "Please select an action from the menu below."
-msgstr "Prosim izberite dejanje iz menuja spodaj."
+msgstr "Prosim izberite dejanje iz spodnjega menuja."
 
 #: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
-msgstr "Izberite vsaj eno mapo po kateri boste iskali."
+msgstr "Za iskanje izberite vsaj eno mapo."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
-msgstr "Izberite samo eno mapo za to dejanje."
+msgstr "Za to opreacijo prosim izberite smao eno mapo."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 msgid "Please select or edit in the box to the right:"
-msgstr "Prosim izberite ali uredite v desnem okvirju:"
-
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "Izberite ali uredite sledeÄe:"
+msgstr "Prosim izberite ali uredite v obrazcu na desni:"
 
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr "Powered by Horde"
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
-msgstr "Vstavim pred podpis pomi¹ljaje ('-- ')?"
+msgstr "Predpi¹em va¹ podpis s pomi¹ljaji ('-- ')?"
 
 #: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
-msgstr "Lastnosti so bile uspe¹no posodobljene."
+msgstr "Nastavitve uspe¹no posodobljene."
 
 #: templates/compose/attachments.inc:3
 msgid "Preview"
@@ -2711,13 +2962,13 @@
 
 #: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
-msgstr "Prej¹ne sporoèilo"
+msgstr "Prej¹nje sporoèilo"
 
-#: mailbox.php:336
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Prej¹nja stran"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Natisni"
 
@@ -2725,59 +2976,59 @@
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr "Geslo zasebnega kljuèa"
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
-msgstr "Vpra¹aj vsakokrat, ko je poslana priponka; privzeto je NE."
+msgstr "Vpra¹am vsakiè ko je poslana priponka; privzeto je NE"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
-msgstr "Vpra¹aj vsakokrat, ko je poslana priponka; privzeto je DA."
+msgstr "Vpra¹am vsakiè ko je poslana priponka; privzeto je DA"
 
 #: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
-msgstr "Popdora javnim stre¾nikom s kljuèi PGP je bila onemogoèena."
+msgstr "Podpora javnemu PGP stre¾niku je bila onemogoèena."
 
 #: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Pur_ge Deleted"
-msgstr "Odstrani izbrisana"
+msgstr "Izb_ri¹i Izbrisana"
 
 #: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
-msgstr "Odstrani izbrisana"
+msgstr "Izbri¹i Izbrisana"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
-msgstr "Izbri¹i mapo(e)"
+msgstr "Izbri¹i izbrisana sporoèila iz map"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
-msgstr "Kako pogosto oèistiti mapo z odpadki:"
+msgstr "Kako pogosto izbri¹em Smeti:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
-msgstr "Odstrani sporoèila v Ko¹u starej¹a kot navedeno ¹tevilo dni."
+msgstr "Pobri¹em sporoèila iz Smeti, ki so starej¹a od:"
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
-msgstr "Odstranim stara sporoèila iz Ko¹a?"
-
-#: lib/Maintenance/Task/purge_trash.php:67
-#, php-format
-msgid "Purging %d message(s) from Trash folder."
-msgstr "Bri¹em %d sporoèil iz Ko¹a."
+msgstr "Pobri¹em stara sporoèila iz Smeti?"
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
-"Pri privzetem raz¹irjanju naslovov in po¹iljanju po¹te postavi to za znak @:"
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Bri¹em %d sporoèil iz Smeti."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Bri¹em %d sporoèil iz Smeti."
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2787,116 +3038,116 @@
 #: templates/quota/quota.inc:21
 #, php-format
 msgid "Quota status: %.2fMB / NO LIMIT"
-msgstr "Stanje kvote: %.2fMB / Brez omejitve"
+msgstr "Stanje kvote: %.2fMB / NI OMEJITVE"
 
 #: templates/quota/quota.inc:24
 #, php-format
 msgid "Quota status: NO LIMIT"
-msgstr "Status kvote: brez omejitev"
+msgstr "Stanje kvote: NI OMEJITVE"
 
-#: config/prefs.php.dist:492
-#, php-format
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
 msgid "Quoting %f:"
-msgstr "Navajanje %f:"
+msgstr "Citiram %%f:"
 
-#: templates/compose/compose.inc:377
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
-msgstr "Zahtevaj sporoèilo o prejemu"
+msgstr "Zahte_vam potrditev dostave"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
-msgstr "Prejeto"
+msgstr "Prejeto na"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "Prejeto od"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "Prejeto do"
 
 #: templates/message/navbar_actions.inc:16
 msgid "Redirec_t"
-msgstr "Preusmeri"
+msgstr "Pre_usmeri"
 
 #: templates/message/navbar_actions.inc:16
 msgid "Redirect"
 msgstr "Preusmeri"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Preusmeri sporoèilo"
 
-#: compose.php:713
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Preusmeri to sporoèilo"
 
-#: compose.php:769
+#: compose.php:847
 msgid "Redirecting failed."
-msgstr "Preusmeritev ni bila uspe¹na."
+msgstr "Preusmeritev spodletela."
 
-#: templates/compose/compose.inc:573
+#: templates/compose/compose.inc:583
 msgid "Refresh"
-msgstr "Obnovi"
+msgstr "Osve¾i"
 
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
-msgstr "Obnovi pogled map:"
+msgstr "Osve¾i pogled map:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "Ponovno nalo¾i"
 
 #: templates/folders/head.inc:3
 msgid "Reload View"
-msgstr "Obnovi pogled"
+msgstr "Osve¾i pogled"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
 msgid "Remember the free/busy information."
 msgstr "Zapomni si informacijo prost/zaseden."
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Zapomni si zadnji pogled"
 
 #: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
-msgstr "Oddaljeni po¹tni predal"
+msgstr "Oddaljen Nabiralnik:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr "Odstrani polje iz iskanja"
 
 #: templates/prefs/sourceselect.inc:305
 msgid "Remove source"
-msgstr "Odstrani izvor"
+msgstr "Odstrani izvorno kodo"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "Preimenuj mapo(e)"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
-msgstr "Preimenujem mapo poslano na zaèetku meseca?"
+msgstr "Preimenujem mapo s poslano po¹to na zaèetku meseca?"
 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
 #, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
-msgstr "Preimenovanje \"%s\" v \"%s\" je spodletelo je sporoèilo stre¾nika"
+msgstr "Preimenovanje \"%s\" v \"%s\" ni uspelo. Stre¾nik je javil"
 
 #: templates/message/navbar_actions.inc:10
 msgid "Repl_y to List"
-msgstr "Odgovori dopisnemu seznamu"
+msgstr "O_dgovori na Listo"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
-msgstr "Nadomesti z:"
+msgstr "Zamenjaj z:"
 
 #: templates/message/navbar_actions.inc:8
 msgid "Reply"
 msgstr "Odgovori"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 msgid "Reply Sent."
 msgstr "Odgovor poslan."
 
@@ -2904,289 +3155,307 @@
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: compose.php:660
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Odgovori vsem:"
 
 #: templates/message/navbar_actions.inc:10
 msgid "Reply to List"
-msgstr "Odgovori dopisnemu seznamu"
+msgstr "Odgovori na Listo"
 
-#: compose.php:662
+#: compose.php:735
 msgid "Reply to List:"
-msgstr "Odgovori dopisnemu seznamu:"
+msgstr "Odgovori na Listo:"
 
 #: templates/message/navbar_actions.inc:13
 msgid "Reply to _All"
-msgstr "Odgovori vsem"
+msgstr "Odgovori v_sem"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
 msgid "Reply with Not Supported Message"
-msgstr "Odgovori s sporoèilo Ni podprto"
+msgstr "Odgovori s sporoèilom Ni podprto"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr "Odgovori z informacijo prost/zaseden za naslednje 2 meseca."
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
 msgid "Reply with requested free/busy information."
 msgstr "Odgovori z zahtevano informacijo prost/zaseden."
 
-#: message.php:259
+#: message.php:267
 msgid "Reply-To"
-msgstr "Odgovori"
+msgstr "Odgovori-Na"
 
-#: lib/Compose.php:250 lib/Compose.php:302
+#: lib/Compose.php:409
 msgid "Reply-To: "
-msgstr "Odgovori:"
+msgstr "Odgovori-Na:"
 
-#: compose.php:658
+#: compose.php:731
 msgid "Reply:"
 msgstr "Odgovori:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 msgid "Report as Innocent"
-msgstr "Ne javi kot neza¾elena po¹ta"
+msgstr "Prijavi kot Za¾eleno"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
-msgstr "Oznaèi kot Spam"
+msgstr "Prijavi kot Neza¾eleno"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
-msgstr "Zahtevaj potrdilo o branju"
+msgstr "Zahtevaj potrdilo o _Prejemu"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
-msgstr "Zahtevam potrditev o dostavi?"
+msgstr "Zahtevam potrdilo o dostavi?"
 
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
-msgstr "Zahtevam potrdilo o prejemu?"
+msgstr "Zahtevam potrdila o prejemu?"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
-msgstr "Zahtevano sporoèilo' ni bilo najdeno."
+msgstr "Zahtevano sporoèilo ni bilo najdeno."
 
-#: lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:697
 msgid "Required Participant"
 msgstr "Potreben udele¾enec"
 
 #: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Ponastavi"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
-msgstr "Status sogovornika posodobljen."
+msgstr "Stanje dopisnika posodobljeno."
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
-msgstr "Obnovi"
+msgstr "Nadaljuj"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr "Nadaljuj sejo"
 
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Setavljanje Sporoèila"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 #: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
-msgstr "Nazaj na branje po¹te"
-
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Nazaj na zaslon z glavnimi nastavitvami"
+msgstr "Vrni se na Fetch Mail"
 
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
-msgstr "Nazaj na Mo¾nosti"
+msgstr "Nazaj na mo¾nosti"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "Na prej¹njo stran"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr ""
-"Vrnitev v po¹tni predal po brisanju, premikanju ali kopiranju sporoèila?"
+"Se vrnem na seznam nabiralnika po brisanju, premikanju ali kopiranju "
+"sporoèila?"
 
-#: lib/MIME/Viewer/itip.php:673
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "Vloga"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:411
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
 msgid "S/MIME"
 msgstr "S/MIME"
 
 #: templates/compose/encrypt_list.inc:12
 msgid "S/MIME Encrypt Message"
-msgstr "Kodirano sporoèilo S/MIME"
+msgstr "©ifriraj sporoèilo s S/MIME"
 
-#: compose.php:379
+#: compose.php:394
 msgid "S/MIME Error: "
-msgstr "Napaka S/MIME: "
+msgstr "S/MIME Napaka: "
 
-#: compose.php:358
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
-msgstr "Napaka S/MIME: Za osebni zasebni kljuè je potrebno geslo."
+msgstr "S/MIME Napaka: Za osebni zasebni kljuè je potrebno geslo."
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr "S/MIME ni aktiven"
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 msgid "S/MIME Options"
-msgstr "Mo¾nosti S/MIME"
+msgstr "S/MIME Mo¾nosti"
 
 #: smime.php:49
 msgid "S/MIME Passphrase Input"
-msgstr "Vnos gesla S/MIME"
+msgstr "Vnos S/MIME gesla"
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
-msgstr "Osebni par kljuèev S/MIME zahteva varno spletno povezavo."
+msgstr "S/MIME zasebni par kljuèev zahteva varno spletno povezavo."
 
 #: smime.php:140
 #, php-format
 msgid "S/MIME Public Key for \"%s\" was successfully deleted."
-msgstr "Javni kljuè S/MIME za \"%s\" je bil uspe¹no izbrisan."
+msgstr "S/MIME javni kljuè za \"%s\" uspe¹no izbrisan."
 
 #: smime.php:162
 msgid "S/MIME Public Key successfully added."
-msgstr "Javni kljuè S/MIME za \"%s\" je bil uspe¹no dodan."
+msgstr "S/MIME javni kljuè uspe¹no dodan."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
 msgid "S/MIME Public Keyring"
-msgstr "Seznam javnih kljuèev S/MIME"
+msgstr "S/MIME obesek za javne kljuèe"
 
 #: smime.php:211
 msgid "S/MIME Public/Private Keypair successfully added."
-msgstr "Par kljuèev S/MIME za \"%s\" je bil uspe¹no dodan."
+msgstr "S/MIME Javni/Zasebni par kljuèev uspe¹no dodan."
 
 #: templates/compose/encrypt_list.inc:13
 msgid "S/MIME Sign Message"
-msgstr "Podpisano sprooèilo S/MIME"
+msgstr "Podpi¹i sporoèilo s S/MIME"
 
 #: templates/compose/encrypt_list.inc:14
 msgid "S/MIME Sign/Encrypt Message"
-msgstr "Podpisano/kodirano sporoèilo S/MIME"
+msgstr "Podpi¹i/©ifriraj sporoèilo s S/MIME"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
-msgstr "Popdora S/MIME je na tem sistemu onemogoèena."
+msgstr "Podpora S/MIME je na tem sistemu onemogoèena."
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
-"Podpora S/MIME je trenutno onemogoèena, zato ne morem odkodirati sporoèila."
+"Podpora S/MIME trenutno ni omogoèena, zato sporoèila ni bilo mogoèe "
+"de¹ifrirati."
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message can not "
 "be displayed."
 msgstr ""
-"Podpora S/MIME je trenutno onemogoèena, zato ne morem prikazati podpisanega "
-"sporoèila."
+"Podpora S/MIME ni omogoèena, zato vsebine tega podpisanega sporoèila ni "
+"mogoèe prikazati."
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr ""
-"Podpora S/MIME je trenutno onemogoèena, zato ne morem preveriti digitalnega "
-"podpisa."
+"Podpora S/MIME ni omogoèena, zato tega digitalnega podpisa ni mogoèe overiti."
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
+#, fuzzy
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
+msgstr ""
+"Podpora S/MIME zahteva uporabo popup oken. Èe je va¹ brskalnik trenutno "
+"nastavljen tako da ne podpira popup oken, morate to nastavitev spremeniti. V "
+"nasprotnem primeru S/MIME podpora ne bo pravilno delovala"
+
+#: templates/login/login.inc:205
+msgid "SMTP"
 msgstr ""
-"Podpora S/MIME zahteva uporabo oken popup. Èe va¹ brskalnik ne dovoli oken "
-"popup, morate to nastavitev popraviti, drugaèe podpora S/MIME ne bo delovala."
 
-#: templates/compose/compose.inc:266
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
-msgstr "Zadeva"
+msgstr "Zade_va"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
-msgstr "Shrani kopijo v "
+msgstr "Shra_ni kopijo v"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
-msgstr "Shrani kot"
+msgstr "Shra_ni kot"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
-msgstr "Shranim priloge skupaj s sporoèilom v mapo poslanih sporoèil?"
+msgstr "Shranim Priponke skupaj s sporoèilom med poslano po¹to?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
-msgstr "Shrani osnutek"
+msgstr "Shrani Osnutek"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Shrani kot"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
-msgstr "Shrani mo¾nosti"
+msgstr "Shrani Mo¾nosti"
+
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Shrani Mo¾nosti"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
-msgstr "Shrani osnutek"
+msgstr "Shrani _Osnutek"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Shrani kot"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
-msgstr "Shranim osnutek kot neprebran?"
+msgstr "Shranim osnutke kot nevidene?"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
-msgstr "Samodejno dosam prejemnike v privzeti imenik?"
+msgstr "Avtomatièno shranim prejemnike v privzet adresar?"
 
 #: templates/search/main.inc:127
 msgid "Save search as a virtual folder?"
 msgstr "Shranim iskanje kot navidezno mapo?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
-msgstr "Shranim poslano sporoèilo?"
+msgstr "Shranim poslano po¹to?"
 
-#: compose.php:1137
+#: compose.php:1227
 #, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
-msgstr "Shranjevanje osnutka je spodletelo. Stre¾nik je sporoèil: %s"
+msgstr "Shranjevanje osnutka spodletelo. Stre¾nik je javil: %s"
 
-#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
-msgstr "Iskanje"
+msgstr "I¹èi"
 
 #: templates/search/header.inc:18 templates/mailbox/header.inc:11
 #, php-format
 msgid "Search %s"
-msgstr "Iskanje %s"
+msgstr "I¹èi %s"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "Iskanje sporoèil"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Shrani Mo¾nosti"
 
-#: search.php:311
+#: search.php:265
 msgid "Search Results"
-msgstr "Rezultati iskanja"
+msgstr "Rezultati Iskanja"
 
 #: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
 msgid "Seen"
@@ -3198,19 +3467,24 @@
 
 #: templates/fetchmail/manage.inc:70
 msgid "Select Another Account"
-msgstr "Izberi drugi raèun"
+msgstr "Izberi drug raèun"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
-msgstr "Izberite datum"
+msgstr "Izberi datum"
 
 #: templates/search/fields.inc:10
 msgid "Select a field"
 msgstr "Izberi polje"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Izberi datum"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
-msgstr "Izberi imenik za dodajanje in iskanje naslovov."
+msgstr "Izberite Adresarje za dodajanje in iskanje naslovov"
 
 #: templates/search/main.inc:88
 msgid "Select all"
@@ -3218,56 +3492,61 @@
 
 #: templates/prefs/sourceselect.inc:323
 msgid "Select all fields to search when expanding addresses."
-msgstr "Izberi vsa polja pri iskanju kadar raz¹irja¹ naslove."
+msgstr "Izberi vsa polja za iskanje, ko raz¹irja¹ naslove"
 
 #: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
-msgstr "Izberite reaèun"
+msgstr "Izberi raèun"
 
 #: templates/search/main.inc:89
 msgid "Select none"
-msgstr "Izkljuèi vse"
+msgstr "Ne izberi nobene"
+
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
-msgstr "Izberite vrsto po¹tnega stre¾nik"
+msgstr "Izberite vrsto po¹tnega stre¾nika"
 
 #: templates/prefs/sourceselect.inc:309
 msgid "Selected Address books:"
-msgstr "Izbrani imeniki:"
+msgstr "Izbrani Adresarji:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
-msgstr "Po¹lji kljuè na javni stre¾nik s kljuèi"
+msgstr "Po¹lji Kljuè na javni stre¾nik s kljuèi"
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 msgid "Send Latest Information"
 msgstr "Po¹lji najnovej¹e informacije"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "Po¹ljem MDN, ko je to zahtevano od po¹iljatelja?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Po¹lji sporoèilo"
 
-#: folders.php:363
+#: config/prefs.php.dist:703
+#, fuzzy
+msgid "Send read receipt when requested by the sender?"
+msgstr "Po¹ljem MDN, ko ga po¹iljatelj zahteva?"
+
+#: folders.php:397
 msgid "Sent mail folder"
-msgstr "Mapa poslane po¹te"
+msgstr "Mapa s poslano po¹to"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
-msgstr "Mapa poslane po¹te:"
+msgstr "Mapa s poslano po¹to:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Stre¾nik"
 
 #: config/prefs.php.dist:23
 msgid "Server and Folder Information"
-msgstr "Podatki o stre¾niku in mapah"
+msgstr "Informacije o Stre¾nikih in Mapah"
 
 #: templates/fetchmail/manage.inc:23
 msgid "Server:"
@@ -3275,43 +3554,44 @@
 
 #: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
-msgstr "Nastavi dogodke, ki se zgodijo kadar premakne¹ ali izbri¹e¹ sporoèilo."
+msgstr "Nastavi kaj se zgodi, ko premikate ali bri¹ete sporoèila."
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
-msgstr "Nastavim glavo X-Priority pri sestavljanju sporoèila?"
+msgstr "Nastavi vrstico glave X-Priority pri sestavljanju sporoèil?"
 
 #: config/prefs.php.dist:31
 msgid "Share Folders"
-msgstr "Deli mape"
+msgstr "Skupna raba Map"
 
 #: templates/acl/acl.inc:86
 msgid "Share mail folders"
-msgstr "Deli mape sporoèil"
+msgstr "Skupna raba map"
 
 #: config/prefs.php.dist:32
 msgid "Share your mail folders with other users."
-msgstr "Delite svoje mape sporoèil z drugimi uporabniki."
+msgstr "Omogoèite skupno rabo svojih po¹tnih map."
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
 msgstr ""
-"Naj bodo veliki sklopi navedenega besedila privzeto skriti ali prikazani? "
-"Karkoli izberete, lahko enostavno prestavljate."
+"Naj bodo veliki odseki citiranega besedila privzeto prikazani ali skriti? "
+"Nastavitev je mogoèe preprosto preklapljati."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
-msgstr "Naj preverim telesa besedilnih sporoèil, èe vsebujejo podatke PGP?"
+msgstr "Naj v telesu text/plain sporoèil i¹èem PGP podatke?"
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
-msgstr "Naj se okno Ustvarjanje sporoèila zapre po tem ko shranite osnutek?"
+msgstr ""
+"Naj se po shranjevanju sporoèila med osnutke okno za sestavljanje zapre?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
-msgstr "Naj se sporoèilom pripne va¹ javni kljuè PGP?"
+msgstr "Naj se va¹ javni PGP kljuè privzeto pripne sporoèilom?"
 
 #: templates/search/main.inc:92
 msgid "Show All Folders"
@@ -3319,71 +3599,67 @@
 
 #: templates/message/headers.inc:67
 msgid "Show All Headers"
-msgstr "Prika¾i vse glave"
+msgstr "Prika¾i vse vrstice glave"
 
-#: mailbox.php:354
+#: mailbox.php:365
 msgid "Show Deleted"
-msgstr "Prika¾i izbrisana"
+msgstr "Prika¾i pobrisane"
 
 #: templates/message/headers.inc:61
 msgid "Show Limited Headers"
-msgstr "Prika¾i omejene glave"
+msgstr "Skraj¹an prikaz vrstic glave"
 
 #: templates/message/headers.inc:70
 msgid "Show Mailing List Information"
-msgstr "Prika¾i podatke o dopisnem seznamu"
+msgstr "Prika¾i podatke o mailing-listi"
 
 #: templates/search/main.inc:92
 msgid "Show Only Subscribed Folders"
 msgstr "Prika¾i samo naroèene mape"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Show Unsubscribed"
-msgstr "Prika¾i neprijavljene"
+msgstr "Prika¾i Nenaroèene"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
-msgstr "Prika¾em ikono za loèevanje priponke od sporoèila?"
+msgstr "Prika¾em ikono, ki dovoljuje brisanje priponk iz sporoèil?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
-msgstr "Prika¾em legendo v pogledu mape sporoèil?"
+msgstr "Prika¾em legendo v pogledu nabiralnika?"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
 msgstr "Prika¾em predogled samo za neprebrana sporoèila?"
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
-msgstr "Prika¾em predoglede v namigih?"
+msgstr "Prika¾em predoglede ob prehodu mi¹ke?"
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
-msgstr "Prika¾em ikono za prejemanje po¹te v meniju?"
+msgstr "Prika¾em ikono Fetch Mail?"
 
-#: lib/MIME/Viewer/html.php:107
+#: lib/MIME/Viewer/html.php:95
 msgid "Show the Images"
-msgstr "Prika¾i slike"
+msgstr "Poka¾i Slike"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
-msgstr "Prika¾em ikono filtrov v meniju?"
+msgstr "Prika¾em ikono Filter?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
 msgstr "Prika¾em skupno ¹tevilo sporoèil v mapi?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "Prikazano"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
-msgstr "Velikost"
-
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr "Prijavite se èe ¹e niste registrirani"
+msgstr "Veliko_st"
 
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
@@ -3393,649 +3669,724 @@
 msgid "Size"
 msgstr "Velikost"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Smer razvr¹èanja"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
 msgid "Sort by Arrival"
-msgstr "Uredi po èasu prihoda"
+msgstr "Razvrsti po Prihodu"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
 msgid "Sort by Date"
-msgstr "Uredi po datumu"
+msgstr "Razvrsti po Datumu"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
-msgstr "Uredi po naslovu po¹iljatelja"
+msgstr "Razvrsti po Od naslovu"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
-msgstr "Uredi po velikosti sporoèila"
+msgstr "Razvrsti po Velikosti sporoèila"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
-msgstr "Uredi po zadevi"
+msgstr "Razvrsti po Zadevi"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
-msgstr "Uredi po niti"
+msgstr "Razvrsti po Pogovoru"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
-msgstr "Uredi po naslovu prejemnika"
+msgstr "Razvrsti po Za naslovu"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
-msgstr "Mapa z odpadki:"
+msgstr "Mapa z neza¾eleno po¹to:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Posebni znaki"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
-msgstr "Èrkovanje"
+msgstr "Preveri èrkovanje"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
-msgstr "Èrkovalnik"
+msgstr "Èrkovanje"
 
-#: templates/compose/spelling.inc:28 templates/compose/spelling.inc:36
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
-msgstr "Èrkovanje konèano"
+msgstr "Preverjanje èrkovanja konèano"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
-msgstr "©tevilo napak na ekranu pri èrkovanju."
+msgstr "Èrkovalnih napak na zaslon pri pregledovanju èrkovanja."
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:639
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
-msgstr "Zaèetek"
+msgstr "Zaèni"
 
-#: lib/MIME/Viewer/itip.php:673
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Stanje"
 
-#: lib/MIME/Contents.php:222
+#: lib/MIME/Contents.php:215
 msgid "Strip Attachment"
-msgstr "Izloèi priponko"
+msgstr "Odstrani Priponko"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
-msgstr "Izloèim prelome vrstic?"
+msgstr "Odstranim prelome vrstic?"
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
-msgstr "Zadeva"
+msgstr "Zade_va"
 
-#: message.php:260 search.php:157 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Zadeva"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:920
 msgid "Subject Field"
-msgstr "Naslovno polje"
+msgstr "Polje z Zadevo"
 
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Po¹lji"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
-msgstr "Prijava map(e)"
+msgstr "Naroèi se na Mapo(e)"
 
-#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:395
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
-msgstr "Uspe¹no"
+msgstr "Uspelo"
 
-#: templates/compose/spelling.inc:70
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Predlogi"
 
-#: lib/MIME/Viewer/itip.php:649 lib/MIME/Viewer/itip.php:651
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 msgid "Summary"
 msgstr "Povzetek"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
 msgid "Switch Composition Method"
-msgstr "Preklopi naèin sestavljanja"
+msgstr "Preklop med naèinom sestavljanja"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
-msgstr "Preklopi na sestavljanje HTML"
+msgstr "Preklopi v HTML naèin sestavljanja"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
-msgstr "Preklopi na sestavljanje v navadnem besedilu"
+msgstr "Preklopi v tekstovni naèin sestavljanja"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
-msgstr "Besedilo"
+msgstr "Bese_dilo"
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:269
+#, fuzzy
+msgid "Tentative: "
+msgstr "Oklevajoèe Sprejeto"
+
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
-msgstr "Oklevajoèe sprejmi zahtevo"
+msgstr "Oklevajoèe Sprejmi zahtevo"
 
-#: lib/MIME/Viewer/itip.php:746
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
-msgstr "Sprejeto z oklevanjem"
+msgstr "Oklevajoèe Sprejeto"
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
-msgstr "V conf.php niso doloèeni pogoji uporabe"
+msgstr "Datoteka s Pogoji uporabe ni podana v conf.php"
+
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "Bese_dilo"
 
-#: config/prefs.php.dist:925
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
-msgstr "Stolpec Od: naj ima povezavo:"
+msgstr "Povezava v stolpcu Od: naj ka¾e na:"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
-msgstr "Raz¹irjeni atributi Macintosh"
+msgstr "Macintosh resursi"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
-msgstr "Raz¹irjene atribute Macintosh lahko prenesete z %s."
+msgstr "Macintosh resurse lahko dobite z %s."
 
 #: fetchmailprefs.php:81
 #, php-format
 msgid "The account \"%s\" has been deleted."
-msgstr "Raèun \"%s\" je bil izbrisan."
+msgstr "Raèun \"%s\" je bil pobrisan."
 
 #: fetchmailprefs.php:74
 #, php-format
 msgid "The account \"%s\" has been saved."
-msgstr "Raèun \"%s\" je bil shranjen"
-
-#: lib/Filter.php:94
-#, php-format
-msgid "The address \"%s\" has been added to %s."
-msgstr "Naslov \"%s\" je bil dodan v %s"
+msgstr "Raèun \"%s\" je bil shranjen."
 
 #: attachment.php:43
 msgid "The attachment was not found."
-msgstr "Predloga ni bila najdena."
+msgstr "Priponke ni mogoèe najti."
+
+#: lib/MIME/Viewer/itip.php:69
+#, fuzzy
+msgid "The calendar data is invalid"
+msgstr "<b>Podatki v koledarju niso veljavni</b>"
 
 #: templates/javascript/open_compose_win.js:37
 msgid ""
 "The compose window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
-"Ne morem odpreti okna za sestavljanje sporoèila: ste morda nastavili "
-"brskalnik, da ne dovoli odpiranja oken popup?"
+"Okna za sestavljanje sporoèil ni mogoèe odpreti. Mogoèe imate v brskalniku "
+"onemogoèena popup okna?"
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
-msgstr "Vsebina datoteke Macintosh je spodaj."
+msgstr "Vsebina Macintosh datoteke je prikazana spodaj."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
 #, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
-msgstr "Trenutna mapa(e) \"%s\" bo(do) preimenovana(e) v \"%s\"."
+msgstr "Trenutna mapa \"%s\" bo preimenovana v \"%s\"."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
-"Ne morem pridobiti trenutnega seznama uporabnikov, ki lahko dostopajo do te "
-"mape."
+"Trenutnega seznama uporabnikov z dostopom do te mape ni mogoèe prebrati"
 
-#: compose.php:1146
+#: compose.php:1236
 #, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "Osnutek je bil shranjen v mapo \"%s\"."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr "Dogodek je bil dodan na va¹ koledar."
 
 #: templates/compose/expand.inc:9
-#, php-format
-msgid "The field '%s' can't be expanded."
-msgstr "Polje '%s' ne more biti raz¹irjeno."
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Polja '%s' ni mogoèe raz¹iriti."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
 #, php-format
 msgid "The folder \"%s\" already exists"
-msgstr "Mapa \"%s\" ¾e obstoja"
+msgstr "Mapa \"%s\" ¾e obstaja"
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
 "problems. Please see your system administrator."
 msgstr ""
-"Ime mape \"%s\" vsebuje nedovoljene znake. To lahko povzroèi te¾ave. Prosimo "
-"da se posvetujete z vzdr¾evalcem sistema."
+"Mapa \"%s\" vsebuje v svojem imenu neveljavne znake. To lahko povzroèi "
+"te¾ave. Prosim kontaktirajte svojega skrbnika sistema."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
-msgstr "Mapa \"%s\" je bila uspe¹no ustvarjena vendar ni prijavljena."
+msgstr "Mapa \"%s\" je bila ustvarjena, vendar nanjo niste naroèeni."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
-msgstr "Mapa \"%s\" je bila izbrinana vendar ni bila odjavljena."
+msgstr "Mapa \"%s\" je bila izbrisana, vendar se od nje niste odjavili."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
 #, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
-msgstr "Mapa \"%s\" ni bila ustvarjena. Stre¾nik je sporoèil"
+msgstr "Mape \"%s\" ni bilo mogoèe ustvariti. Stre¾nik je javil"
 
-#: lib/Folder.php:373
-#, php-format
+#: lib/Folder.php:265
+#, fuzzy, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
-msgstr "Mapa \"%s\" ni bila odstranjena. Stre¾nik je sporoèil"
+msgstr "Mapa '%s' ni bila izbrisana. Stre¾nik je javil"
 
-#: lib/Folder.php:448
+#: lib/Folder.php:359
 #, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mapa \"%s\" je bila uspe¹no ustvarjena."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
 #, php-format
 msgid "The folder \"%s\" was successfully deleted."
-msgstr "Mapa \"%s\" je bila uspe¹no odstranjena."
+msgstr "Mapa \"%s\" je bila uspe¹no izbrisana."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
 #, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mapa \"%s\" je bila uspe¹no preimenovana v \"%s\"."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
-msgstr "K temu delu so bile prilo¾ene sledeèe datoteke:"
+msgstr "Naslednje datoteke so bile pripete tem delu:"
+
+#: templates/javascript/open_saveimage_win.js:12
+#, fuzzy
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+"Okna za sestavljanje sporoèil ni mogoèe odpreti. Mogoèe imate v brskalniku "
+"onemogoèena popup okna?"
 
-#: lib/MIME/Viewer/html.php:96
+#: lib/MIME/Viewer/html.php:97
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
-msgstr "Slike bodo prikazane, ker je po¹iljatelj v va¹em imeniku."
+msgstr "Slike bodo prikazane, ker je po¹iljatelj prisoten v va¹em adresarju."
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
 msgid "The mail server generated the following error message:"
-msgstr "Po¹tni stre¾nik je javil sledeèo napako:"
+msgstr "Po¹tni stre¾nik je javil naslednjo napako:"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 msgid "The mail server generated the following informational message:"
-msgstr "Po¹tni stre¾nik je javil sledeèe sporoèilo:"
+msgstr "Po¹tni stre¾nik je javil naslednjo informacijo:"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
 msgid "The mail server generated the following message:"
-msgstr "Po¹tni stre¾nik je javil sledeèe sporoèilo:"
+msgstr "Po¹tni stre¾nik je javil:"
 
-#: lib/Message.php:645
+#: lib/Message.php:651
 #, php-format
 msgid "The mailbox %s is already empty."
-msgstr "Mapa Prejeto %s je ¾e prazna."
+msgstr "Nabiralnik %s je ¾e prazen."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
-msgstr ""
-"Sporoèilo \"%s\" od \"%s\" (%d bajtov) je prekoraèilo dovoljeno velikost "
-"sporoèila."
+msgstr "Sporoèilo \"%s\" iz \"%s\" (%d bytov) presega omejitev."
 
 #: templates/contacts/contacts.inc:103
 msgid "The message being composed has been closed. Exiting."
-msgstr "Okno za sestavljanje se je zaprlo. Zapiram."
+msgstr "Sporoèilo, ki ste ga sestavljali se je zaprlo."
 
-#: message.php:143
+#: message.php:148
 msgid "The message has been deleted."
-msgstr "Sporoèilo je bilo izbrisano."
+msgstr "Sporoèilo je bilo pobrisano."
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:393
 msgid "The message has been verified."
-msgstr "Sporoèilo je bilo preverjeno."
+msgstr "Sporoèilo je bilo overjeno."
 
-#: lib/MIME/Viewer/pkcs7.php:374
+#: lib/MIME/Viewer/pkcs7.php:384
 #, php-format
 msgid "The message has been verified. Sender: %s."
-msgstr "Sporoèilo je bilo preverjeno. Po¹iljatelj: %s."
+msgstr "Sporoèilo je bilo overjeno. Po¹iljatelj: %s."
 
 #: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
 "The passphrase window can't be opened. Perhaps you have set your browser to "
 "block popup windows?"
 msgstr ""
-"Ne morem odpreti okna za vnos gesla. Morda ste prepreèili odpiranje oken "
-"popup v brskalniku."
+"Okna za geslo ni mogoèe odpreti. Morda je va¹ brskalnik nastavljen tako, da "
+"ne dovoljuje popup oken?"
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
-msgstr "Golo besedilo javnega kljuèa PGP si lahko ogledate %s."
+msgstr "Surovo besedilo Javnega PGP kljuèa je mogoèe videti %s."
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
-msgstr "Zahtevana datoteka ne obstaja v priponki MS-TNEF."
+msgstr "Zahtevana datoteka ne obstaja v MS-TNEF priponki."
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
-msgstr "Zahtevana datoteka ne obstaja v priponki ZIP."
+msgstr "Zahtevana datoteka ne obstaja v Zip priponki."
 
-#: message.php:548
+#: message.php:547
 #, php-format
 msgid ""
 "The sender of this message is requesting a Message Disposition Notification "
 "from you when you have read this message. Please click %s to send the "
 "notification message."
 msgstr ""
-"Po¹iljatelj sporoèila zahteva potrdilo o prejetju sporoèila. Kliknite %s, èe "
-"¾elite poslati potrdilo o prejemu."
+"Po¹iljatelj sporoèila je zahteval Obvestilo o dispoziciji sporoèila, ko "
+"boste prebrali to sporoèilo. Prosim kliknite %s za po¹iljanje Obvestila."
+
+#: lib/MIME/Viewer/images.php:69
+#, fuzzy
+msgid "The server was not able to create a thumbnail of this image."
+msgstr "Kliknite %s za prikaz slièice te slike."
 
 #: templates/compose/compose.js:104
 msgid "The signature could not be replaced."
-msgstr "Podpisa ni mogoèe zamenjati"
+msgstr "Podpisa ni bilo mogoèe zamenjati."
 
 #: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
-msgstr "Podpis je bil uspe¹no spremenjen."
+msgstr "Podpis je bil uspe¹no zamenjan."
 
 #: attachment.php:59
 msgid "The specified file does not exist."
 msgstr "Navedena datoteka ne obstaja."
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Raèun \"%s\" je bil shranjen."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Raèun \"%s\" je bil pobrisan."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Raèun \"%s\" je bil pobrisan."
+
+#: lib/MIME/Viewer/itip.php:169
 msgid "The task has been added to your tasklist."
 msgstr "Opravilo je bilo dodano na va¹ seznam opravil."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "Besedilo sporoèila"
 
-#: lib/MIME/Viewer/status.php:97
+#: lib/MIME/Viewer/status.php:94
 #, php-format
 msgid "The text of the message can be viewed %s."
-msgstr "Besedilo sporoèila si lahko ogledate %s."
+msgstr "Besedilo sporoèila je mogoèe videti %s."
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
 msgid "The text of the returned message"
 msgstr "Besedilo vrnjenega sporoèila"
 
-#: lib/MIME/Viewer/status.php:82
+#: lib/MIME/Viewer/status.php:79
 #, php-format
 msgid "The text of the returned message can be viewed %s."
-msgstr "Besedilo vrnjenega sporoèila si lahko ogledate %s."
+msgstr "Besedilo vrnjenega sporoèila je mogoèe videti %s."
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 msgid "The text of the sent message"
 msgstr "Besedilo poslanega sporoèila"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, php-format
 msgid "The text of the sent message can be viewed %s."
-msgstr "Besedilo poslanega sporoèila si lahko ogledate %s."
+msgstr "Besedilo poslanega sporoèila je mogoèe videti %s."
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "Uporabnikova informacija prost/zaseden je bila uspe¹no shranjena."
 
-#: lib/MIME/Viewer/alternative.php:54
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
-msgstr "Nobenega dela sporoèila ni mogoèe prikazati znotraj tega okna."
+msgstr ""
+"Ni alternativnih delov sporoèila, ki bi jih bilo mogoèe prikazati v okvirju."
 
 #: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
-msgstr "Ni sporoèil v po¹tnem predalu."
+msgstr "V tem nabiralniku ni sporoèil."
 
-#: lib/Message.php:604
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr ""
+"Ni alternativnih delov sporoèila, ki bi jih bilo mogoèe prikazati v okvirju."
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
-msgstr "Nastala je te¾ava pri odstranitvi %s. To je sporoèilo stre¾nika"
+msgstr "Pri praznenju %s je pri¹lo do napake. Stre¾nik je javil"
 
-#: lib/Message.php:647
+#: lib/Message.php:653
 #, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
-msgstr ""
-"Nastala je te¾ava pri odstranitvi po¹tnega predala. Po¹tni stre¾nik je "
-"javil: %s"
+msgstr "Pri praznenju nabiralnika je pri¹lo do napake. Stre¾nik je javil: %s"
 
-#: lib/Message.php:613
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr ""
-"Nastala je te¾ava pri ostranitvi po¹tnega predala. To je sporoèilo stre¾nika"
+msgstr "Pri praznenju nabiralnika je pri¹lo do napake. Stre¾nik je javil"
 
-#: lib/Message.php:107
+#: lib/Message.php:90
 #, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
-"Nastala je te¾ava pri kopiranju sporoèil iz \"%s\" v \"%s\". Stre¾nik je "
-"javil:"
+"Pri kopiranju sporoèil iz \"%s\" v \"%s\" je pri¹lo do napake. Stre¾nik je "
+"javli"
 
-#: lib/Message.php:217 lib/Message.php:232
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr ""
-"Pri¹lo je do napake pri brisanju sporoèil iz mape \"%s\". Sporoèilo "
-"stre¾nika je"
+"Pri brisanju sporoèil iz mape \"%s\" je pri¹lo do napake. Stre¾nik je javil"
 
-#: lib/Message.php:296
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pri¹lo je do napake pri brisanju sporoèila v mapi \"%s\". Sporoèilo "
-"stre¾nika je"
+"Pri brisanju sporoèil v mapi \"%s\" je pri¹lo do napake. Stre¾nik je javil "
+"napako"
 
-#: lib/Message.php:230
+#: lib/Message.php:211
 #, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
-msgstr "Napaka pri brisanju sporoèila. Stre¾nik je javil: %s"
+msgstr "Pri brisanju sporoèil je pri¹lo do napake. Stre¾nik je javil: %s"
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:99
 #, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "Pri brisanju dogodka je pri¹lo do napake: %s."
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
-msgstr "Pri prikazovanju tega dela sporoèila je pri¹lo do napake"
+msgstr "Pri prikazovanju tega dela sporoèila je pri¹lo do napake."
 
-#: lib/Message.php:533 lib/Message.php:575
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pri¹lo je do napake pri oznaèevanju sporoèil v mapi \"%s\". Sporoèilo "
-"stre¾nika je"
+"Pri oznaèevanju sporoèil v mapi \"%s\" je pri¹lo do napake. Stre¾nik je "
+"javilnapako"
 
-#: folders.php:155
+#: folders.php:165
 #, php-format
 msgid "There was an error importing %s."
-msgstr "Pri uva¾anju opravila je pri¹lo do napake: %s."
+msgstr "Pri uva¾anju %s je pri¹lo do napake."
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, php-format
 msgid "There was an error importing the event: %s."
-msgstr "Do napake je pri¹lo pri uva¾anju dogodka: %s."
+msgstr "Pri uva¾anju dogodka je pri¹lo do napake: %s."
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
 #, php-format
 msgid "There was an error importing the task: %s."
-msgstr "Do napake je pri¹lo pri uva¾anju opravila: %s."
+msgstr "Pri uva¾anju opravila je pri¹lo do napake: %s"
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:152
 #, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr ""
-"Do napake je pri¹lo pri uva¾anju uporabnikove informacije prost/zaseden: %s."
+"Pri uva¾anju uporabnikove informacije prost/zaseden je pri¹lo do napake: %s."
 
-#: lib/Message.php:102
+#: lib/Message.php:85
 #, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr ""
-"Pri¹lo je do napake pri premikanju sporoèil iz \"%s\" v \"%s\". Stre¾nik je "
-"javil"
+"Pri premikanju sporoèil iz \"%s\" v \"%s\" je pri¹lo do napake. Stre¾nik je "
+"javil napako"
 
-#: compose.php:1154
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
-msgstr "Pri shranjevanju tega sporoèila kot osnutka je pri¹lo do napake."
+msgstr "Pri shranjevanju sporoèila kot osnutek je pri¹lo do napake."
 
-#: compose.php:915
+#: compose.php:1006
 #, php-format
 msgid "There was an error sending your message: %s"
-msgstr "Pri¹lo je do napake pri po¹iljanju sporoèila: %s"
+msgstr "Pri po¹iljanju va¹ega sporoèila je pri¹lo do napake: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, php-format
 msgid "There was an error updating the event: %s."
-msgstr "Do napake je pri¹lo pri posodabljanju dogodka: %s."
+msgstr "Pri osve¾evanju dogodka je pri¹lo do napake: %s."
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
-msgstr "V tem delu sporoèila ni besedila"
+msgstr "V tem delu sporoèila ni bilo besedila"
 
-#: lib/MIME/Viewer/html.php:94
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
-msgstr "To sporoèilo HTML vsebuje slike."
+msgstr "To HTML sporoèilo ima vgnezdene slike."
 
 #: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
-msgstr "To sporoèilo HTML vsebuje slike. Blokirane slike se pojavijo kot: "
+msgstr ""
+"To HTML sporoèilo ima vgnezdene slike. Blokirane slike so prikazane tako: "
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
-msgstr "Sporoèilu je bil prilo¾en ta javni kljuè PGP."
+msgstr "Ta Javni PGP kljuè je bil pripet sporoèilu."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr "To dejanje ni podprto."
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr "To dejanje ¹e ni implementirano."
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
-msgstr "To lahko traja nekaj èasa. Ali ste preprièani da ¾elite nadaljevati?"
+msgstr ""
+"To dejanje lahko traja dalj èasa. Ste preprièani da ¾elite nadaljevati?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
-msgstr "To sporoèilo vsebuje datoteko Macintosh."
+msgstr "To sporoèilo vsebuje Macintosh datoteko."
 
-#: lib/MIME/Viewer/pkcs7.php:402
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
-"To sporoèilo vsebuje priponko, ki je bila digitalno podpisana z S/MIME."
+"Sporoèilo vsebuje priponko, ki je bila digitalno podpisana preko S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:414
 msgid "This message contains an attachment that has been encrypted via S/MIME."
-msgstr "To sporoèilo vsebuje priponko, ki je bila ¹ifrirana z S/MIME."
+msgstr "To sporoèilo vsebuje priponko, ki je bila ¹ifrirana preko S/MIME."
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
-"To sporoèilo vsebuje informacijo o dostavi ampak oblika sporoèila ni znana."
+"To sporoèilo vsebuje poroèilo o dostavi sporoèila, format tega sporoèila pa "
+"je neznan."
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
-msgstr "To sporoèilo ni pravilno ¹ifrirano s PGP. Napaka: "
+msgstr "To sporoèilo ni veljavno PGP ¹ifrirano sporoèilo. Napaka: "
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
-msgstr "To sporoèilo ni v pravilni obliki PGP (v skladu z RFC 2015)."
+msgstr "To sporoèilo oèitno ni v pravilni PGP obliki (glede na RFC 2015)."
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
-msgstr "To sporoèilo ni v pravilni obliki S/MIME."
+msgstr "To sporoèilo oèitno ni v pravilni S/MIME obliki."
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
-msgstr "To sporoèilo je bilo ¹ifrirano s PGP."
+msgstr "To sporoèilo je bilo digitalno podpisano preko PGP."
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
 msgid "This message has been digitally signed via S/MIME."
-msgstr "To sporoèilo je bilo digitalno podpisano z S/MIME."
+msgstr "To sporoèilo je bilo digitalno podpisano preko S/MIME."
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
 msgid "This message has been encrypted via S/MIME."
-msgstr "To sporoèilo je bilo ¹ifrirano z S/MIME."
+msgstr "To sporoèilo je bilo ¹ifrirano preko S/MIME."
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
 msgid "This message has been encrypted with PGP."
-msgstr "To sporoèilo je bilo ¹ifrirano s PGP."
+msgstr "To sporoèilo je bilo ¹ifrirano preko PGP."
 
-#: message.php:203
+#: message.php:211
 msgid "This message to"
-msgstr "Sporoèilo za"
+msgstr "To sporoèilo k"
 
 #: acl.php:46
 msgid "This server does not support sharing folders."
-msgstr "Ta stre¾nik ne podpira skupne rabe imenikov."
+msgstr "Stre¾nik ne podpira skupne rabe map."
 
 #: templates/contacts/contacts.inc:109
 msgid "This window must be called from a compose window."
-msgstr "To okno je potrebno odpreti iz okna za sestavljanje sporoèila."
+msgstr "To okno morate odpreti iz okna za sestavljanje sporoèila."
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Prikaz"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
-msgstr "Nitni pogled"
+msgstr "Pogled pogovora"
 
-#: message.php:256 mailbox.php:570 search.php:145
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Za"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:919
 msgid "To Address"
-msgstr "Naslov za"
+msgstr "Za Naslov"
 
 #: templates/prefs/sourceselect.inc:326
 msgid ""
 "To select multiple fields, hold down the Control (PC) or Command (Mac) while "
 "clicking."
 msgstr ""
-"Za izbiro veèih mo¾nosti, dr¾ite tipko Control (PC) ali Command (Mac) med "
-"klikanjem na ¾eljene mo¾nosti."
+"Za izbiro veèih polj, dr¾ite tipko Control (PC) ali Command (Mac) medtem ko "
+"klikate na polja."
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
-msgstr "Skupna velikost priponk:"
+msgstr "Skupna velikost Priponk:"
 
-#: folders.php:354
+#: folders.php:388
 msgid "Trash folder"
-msgstr "Ko¹"
+msgstr "Mapa s smetmi"
 
 #: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
-msgstr "Mapa z odpadki:"
+msgstr "Mapa s smetmi"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
-msgstr "Nisem mogel dobiti podatkov o kvoti"
+msgstr "Ni bilo mogoèe prebrati kvote"
 
 #: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
 #: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
-msgstr "Neodgovorjen"
+msgstr "Neodgovorjeno"
 
 #: templates/search/main.inc:35
 msgid "Unanswered messages"
@@ -4043,77 +4394,88 @@
 
 #: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
-msgstr "Obnovi"
+msgstr "Ne izbri¹i"
 
-#: mailbox.php:554 mailbox.php:566 lib/MIME/Headers.php:218
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
-msgstr "Skriti prejemniki"
+msgstr "Skriti Prejemniki"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr "Neobravnavana komponenta tipa: %s"
 
-#: mailbox.php:531
+#: mailbox.php:565
 msgid "Unknown Date"
 msgstr "Neznan datum"
 
-#: lib/MIME/Viewer/itip.php:624
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
 msgid "Unknown Meeting"
 msgstr "Neznan sestanek"
 
-#: mailbox.php:582
+#: mailbox.php:618
 msgid "Unknown Recipient"
-msgstr "Neznani prejemnik"
+msgstr "Neznan Prejemnik"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
-msgstr "Odstrani frazo gesla"
+msgstr "Odnalo¾i geslo"
 
 #: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Neimenovan"
 
-#: message.php:490 mailbox.php:665 templates/message/navbar_navigate.inc:6
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
-msgstr "Nevidena"
+msgstr "Nevideno"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
-msgstr "Odjavi mapo(e)"
+msgstr "Odjavi se od Map(e)"
 
-#: templates/compose/compose.inc:574
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
-msgstr "Posodobi informacije o priponkah"
+msgstr "Osve¾i informacije o priponki"
 
-#: lib/MIME/Viewer/itip.php:587
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
-msgstr "Posodobi status"
+msgstr "Osve¾i stanje dopisnika"
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
-msgstr "Shrani na stre¾nik"
+msgstr "Posnemi na stre¾nik"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Uporabi privzeto vrednost"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
-msgstr "Uporabim naroèanje map IMAP?"
+msgstr "Uporabljam naroèanje na IMAP mape?"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Navidezne Mape"
+
+#: templates/acl/acl.inc:142
 msgid "User"
 msgstr "Uporabnik"
 
 #: acl.php:87
-#, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
-msgstr "Uporabniku '%s' so bile za mapo '%s' uspe¹no dodeljene pravice."
+#, fuzzy, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr "Uporabnik '%s' je uspe¹no nastavil imenovane pravice za mapo '%s'."
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Uporabni¹ko ime"
 
@@ -4121,457 +4483,600 @@
 msgid "Username:"
 msgstr "Uporabni¹ko ime:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "Prika¾i"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
 #, php-format
 msgid "View %s"
 msgstr "Prika¾i %s"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, php-format
 msgid "View %s Public Key"
-msgstr "Prika¾i javni kljuè %s"
+msgstr "Prika¾i %s Javni kljuè"
 
-#: lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/html.php:116
 msgid "View HTML content in a separate window"
-msgstr "Poglej vsebino HTML v loèenem oknu."
+msgstr "Prika¾i HTML vsebino v loèenem oknu"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Nova sporoèila"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
-msgstr "Prika¾i osebni zasebni kljuè"
+msgstr "Prika¾i osebni Zasebni kljuè"
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
-msgstr "Prika¾i osebni javni kljuè"
+msgstr "Prika¾i osebni Javni kljuè"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "View Thread"
-msgstr "Prika¾i nit"
+msgstr "Prika¾i pogovor"
 
-#: lib/MIME/Viewer/images.php:149 lib/MIME/Viewer/images.php:151
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
 msgid "View Thumbnail"
-msgstr "Preglej vzorec slike"
+msgstr "Prika¾i slièico"
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:418
 msgid "View attachment in a separate window"
-msgstr "Prika¾i priponko v loèenem oknu."
+msgstr "Prika¾i priponko v loèenem oknu"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Prika¾i HTML vsebino v loèenem oknu"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
 msgid "View event"
 msgstr "Prika¾i dogodek"
 
-#: folders.php:346 mailbox.php:500
+#: folders.php:380 mailbox.php:534
 #, php-format
 msgid "View messages in %s"
 msgstr "Prika¾i sporoèila v %s"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
-msgstr "Pogled ali mapa, ki naj se prika¾e po prijavi:"
+msgstr "Pogled ali nabiralnik, ki ga prika¾em po prijavi:"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 msgid "View task"
 msgstr "Prika¾i opravilo"
 
-#: lib/MIME/Viewer/html.php:111
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
 msgstr "Prika¾i slike"
 
-#: search.php:309
+#: search.php:263
 #, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
-msgstr "Navidezna mapa \"%s\" je bila uspe¹no ustvarjena."
+msgstr "Navidezna mapa \"%s\" uspe¹no ustvarjena."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:118 lib/IMAP/Tree.php:308
-#: lib/IMAP/Tree.php:332 lib/IMAP/Tree.php:374
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
-msgstr "Navidezne mape"
+msgstr "Navidezne Mape"
 
-#: search.php:291
+#: search.php:245
+#, fuzzy
 msgid "Virtual Folders require a label."
-msgstr "Navidezne mape zahtevajo oznako."
+msgstr "Oznaka navidezne mape"
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "Navidezne Mape"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Navidezne Mape"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Navidezne Mape"
 
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "Oznaka navidezne mape"
 
-#: login.php:131
+#: lib/MIME/Viewer/pkcs7.php:374
+#, fuzzy
+msgid "Warning"
+msgstr "Raz¹iranje"
+
+#: login.php:138
 #, php-format
 msgid "Welcome to %s"
 msgstr "Dobrodo¹li v %s"
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:619
+#, fuzzy
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr "Pobri¹em neza¾elena sporoèila ko so bila prijavljena?"
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr ""
-"Ko bri¹em sporoèila, jih prestavi v Ko¹ namesto, da jih oznaèim kot brisana?"
+"Ko bri¹em sporoèila, jih premaknem v mapo Smeti, namesto da jih oznaèim kot "
+"pobrisane?"
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
-msgstr "Na katero stran naj se postavim, ko odprem nov predal?"
+msgstr "Ko prikazujem nov nabiralnik, na kateri strani naj zaènem?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
-msgstr "Naj shranim podatke o priponki, ko shranim poslano sporoèilo?"
+msgstr "Ko shranjujem poslano e-po¹to, naj shranim priponke?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
-msgid "Whitelist"
-msgstr "Beli seznam"
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "Prelom vrstite po toliko znakih."
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr "Whitelist"
 
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Da"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 msgid "You are about to fetch email from the following account(s):"
-msgstr "Prebrali boste sporoèila za sledeèe raèune:"
+msgstr "Presneli si boste e-po¹to z naslednjih raèunov:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Izbrisali boste naslednje mape:"
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
-msgstr "Poizku¹ate izbrisati sledeèe mape:"
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
+msgstr "Izbrisali boste naslednje mape:"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:199
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "Kopirate/premikate v novo mapo."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
-msgstr "Ustvarjate pod-mapo v "
+msgstr "Ustvarjate pod-mapo za "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
-msgstr "Ustvarjate mapo na najvi¹jem nivoju."
+msgstr "Ustvarjate mapo."
+
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Ustvarjate mapo."
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
-msgstr "Preimenuj mapo: "
+msgstr "Preimenovali boste mapo: "
+
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Uspe¹no ste se odjavili od \"%s\""
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
-msgstr "Niste se strinjali s pogoji uporabe, zato se ne morete pirjaviti."
+msgstr ""
+"Niste se strinjali s Pravili Uporabe, zato vam prijava ni bila dovoljena."
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
-msgstr "Nimate pravic za spreminjanje pravic dostopa do te mape"
+msgstr "Nimate dovoljenja za spreminjane dostopa do te mape"
 
-#: lib/Maillog.php:132
+#: lib/Maillog.php:129
 #, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr "To sporoèilo ste dne %%s posredovali sledeèim prejemnikom: %s."
+msgstr "%%s ste posredovali sporoèilo prejemnikom: %s"
 
 #: templates/mailbox/alert.inc:3
 #, php-format
 msgid "You have %s new messages."
-msgstr "Imate %s nova sporoèila."
+msgstr "Imate %s novih sporoèil."
 
 #: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
-msgstr "Imate novo sporoèilo."
+msgstr "Imate 1 novo sporoèilo."
 
-#: templates/compose/attachments.js:116
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Imate 1 novo sporoèilo."
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
 msgstr ""
-"Najmanj ene epriponke ,ki ste jo oznaèili ¹e niste prenesli na stre¾nik. Ste "
-"preprièani, da ¾elite poslati sporoèilo brez teh priponk?"
+"Izbrano imato vsaj eno priponko, ki je ¹e niste presneli na stre¾nik. Ste "
+"preprièani, da ¾elite poslati sporoèilo brez te priponke?"
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
-msgstr "V sledeèi mapi imate nova sporoèila:"
+msgstr "Nova sporoèila imate v naslednjih mapah:"
 
-#: lib/IMP.php:1008
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
-msgstr "V sledeèih mapah imate nova sporoèila:"
+msgstr "Nova sporoèila imate v naslednjih mapah:"
 
-#: compose.php:127
+#: compose.php:153
 msgid "You must enter at least one recipient."
-msgstr "Vnesti morate vsaj enega prejemnika."
+msgstr "Vpisati morate vsaj enega prejemnika."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
-"Za ogled tega sporoèila morate vnesti geslo va¹ega zasebnega kljuèa PGP"
+"Èe ¾elite videti sporoèilo, morate vpisati geslo za svoj zasebni PGP kljuè"
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
-"Za ogled tega sporoèila morate vnesti geslo va¹ega zasebnega kljuèa S/MIME"
+"Èe ¾elite videti sporoèilo, morate vpisati geslo za svoj zasebni S/MIME kljuè"
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:208
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
-msgstr "Najprej morate izbrati ciljni po¹tni predal."
+msgstr "Najprej morate izbrati ciljni nabiralnik."
 
 #: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
-msgstr "Izbrati morate raèun za brisanje."
+msgstr "Izbrati morate raèun, ki ga ¾elite izbrisati."
 
 #: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Najprej morate izbrati naslov."
 
-#: templates/mailbox/javascript.inc:90 templates/mailbox/javascript.inc:215
-#: templates/mailbox/javascript.inc:270
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
-msgstr "Vsaj eno sporoèilo mora biti izbrano."
+msgstr "Najprej morate izbrati vsaj eno sporoèilo."
 
 #: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
-msgstr "Naslovnik mora biti vne¹en"
+msgstr "Doloèiti morate prejemnika."
 
 #: templates/compose/attachments.js:29
 msgid "You must specify at least one file to attach."
-msgstr "Doloèiti morate vsaj eno datoteko za pripenjanje."
+msgstr "Izbrati morate vsaj eno datoteko, ki jo ¾elite pripeti."
 
 #: templates/fetchmail/manage.inc:48
-#, php-format
-msgid "You need to have '%s' enabled in your maintenance options."
-msgstr "V mo¾nostih vzdr¾evanja morate imeti omogoèeno '%s'."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr "V mo¾nostih vzdr¾evanja morate omogoèiti '%s'."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, php-format
 msgid "You redirected this message to %s on %%s."
-msgstr "Dne %%s ste to sporoèilo preusmerili k %s."
+msgstr "Sporoèilo ste preusmerili s %s na %%s."
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
 #, php-format
 msgid "You replied to this message on %s."
-msgstr "Dne %s ste odgovorili na to sporoèilo."
+msgstr "Na sporoèilo ste odgovorili %s."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
 #, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
-msgstr "Mapa \"%s\" ni privjavljena. Stre¾nik je sporoèil"
+msgstr "Na \"%s\" niste bili naroèeni. Stre¾nik je javil"
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
 #, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
-msgstr "Mapa \"%s\" je neprijavljena. Stre¾nik je sporoèil"
+msgstr "Od \"%s\" se ¹e niste odjavili. Stre¾nik je javil"
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
 #, php-format
 msgid "You were successfully subscribed to \"%s\""
-msgstr "Mapa \"%s\" je bila uspe¹no prijavljena"
+msgstr "Uspe¹no ste se naroèili na \"%s\""
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
 #, php-format
 msgid "You were successfully unsubscribed from \"%s\""
-msgstr "Mapa \"%s\" je bila uspe¹no odjavljena"
+msgstr "Uspe¹no ste se odjavili od \"%s\""
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Va¹e ime"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
-msgstr "Va¹ javni/zasebni kljuè PGP"
+msgstr "Va¹i Javni/Zasebni PGP kljuèi"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Va¹ zasebni kljuè"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Va¹ javni kljuè"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
-msgstr "Va¹ odgovori: naslov: <i>(opcija)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
+msgstr "Va¹ Odgovori-na: naslov: <i>(opcijsko)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
-msgstr "Va¹a javna/zasebna potrdila S/MIME"
+msgstr "Va¹a Javna/Zasebna S/MIME potrdila"
 
 #: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "Va¹i raèuni:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
-msgstr "Va¹ naslov alias: <i>(vsak naslov vnesite v novo vrstico)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
+"Va¹i drugi naslovi: <i>(opcijsko, vpi¹ite vsak naslov v svojo vrsto)</i>"
 
-#: lib/MIME/Viewer/images.php:86
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
-msgstr "Va¹ brskalnik ne podpira prikaz te vrste znotraj."
-
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"Va¹ brskalnik ne podpira te mo¾nosti za tiskanje. Za tiskanje pritisnite "
-"Control + P."
+msgstr "Va¹ brskalnik ne podpira prikaz te vrste slik v okvirju."
 
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
-msgstr "Privzet nabor za po¹iljanje sporoèil:"
+msgstr "Va¹a privzeta kodna tabela za po¹iljanje sporoèil:"
 
 #: templates/prefs/encryptselect.inc:1
 msgid "Your default encryption method for sending messages:"
-msgstr "Privzeti naèin ¹ifriranja poslanih sporoèil:"
+msgstr "Va¹ privzet naèin ¹ifriranja za po¹iljanje sporoèil:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
-msgstr "Sporoèilo je bilo uspe¹no dostavljeno."
+msgstr "Va¹e sporoèilo je bilo uspe¹no dostavljeno."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Va¹ podpis:"
 
-#: message.php:280 compose.php:1194 mailbox.php:515 lib/Compose.php:731
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
-msgstr "[Brez zadeve]"
+msgstr "[Brez Zadeve]"
 
-#: templates/compose/compose.inc:216
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
-msgstr "Kpp"
+msgstr "_Bkk"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
-msgstr "Èrni seznam"
+msgstr "_Blacklist"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
-msgstr "Kp"
-
-#: lib/IMP.php:904
-msgid "_Compose"
-msgstr "Sestavi"
+msgstr "_Kk"
 
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
-msgstr "Izbri¹i"
+msgstr "_Izbri¹i"
 
-#: lib/IMP.php:906
+#: lib/IMP.php:979
 msgid "_Folders"
-msgstr "Mape"
+msgstr "_Mape"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
-msgstr "Identiteta"
+msgstr "_Identiteta"
 
-#: lib/IMP.php:897
+#: lib/IMP.php:961
 msgid "_Inbox"
-msgstr "Prejeto"
+msgstr "_Inbox"
 
-#: lib/IMP.php:947
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "_Odjava"
 
-#: message.php:376
+#: message.php:384
 msgid "_Message Source"
-msgstr "Izvor sporoèila"
+msgstr "_Izvorna koda sporoèila"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Nova sporoèila"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
-msgstr "Natisni"
+msgstr "_Natisni"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
-msgstr "Prednost"
+msgstr "_Prioriteta"
 
-#: mailbox.php:389
+#: mailbox.php:418
 #, php-format
 msgid "_Refresh %s"
-msgstr "Obnovi %s"
+msgstr "_Osve¾i %s"
 
 #: templates/message/navbar_actions.inc:8
 msgid "_Reply"
-msgstr "Odgovori"
+msgstr "_Odgovori"
 
-#: lib/IMP.php:908
+#: lib/IMP.php:981
 msgid "_Search"
-msgstr "Iskanje"
+msgstr "_I¹èi"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
-msgstr "Po¹lji sporoèilo"
+msgstr "_Po¹lji Sporoèilo"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
-msgstr "Nit"
+msgstr "_Pogovor"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
-msgstr "Za"
+msgstr "_Za"
 
 #: templates/mailbox/actions.inc:13
 msgid "_Undelete"
-msgstr "Povrni"
+msgstr "_Ne izbri¹i"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
-msgstr "Prika¾i nit"
+msgstr "_Poglej Pogovor"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
-msgstr "Beli seznam"
+msgstr "_Whitelist"
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
 
-#: lib/Compose.php:344
+#: lib/Compose.php:440
 msgid "attachment"
 msgstr "priponka"
 
-#: view.php:102
+#: view.php:99
 msgid "attachments.zip"
 msgstr "priponke.zip"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "bytes"
-msgstr "bajtov"
+msgstr "bytov"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "od"
 
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
 #: smime.php:29 pgp.php:69
 msgid "key"
 msgstr "kljuè"
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
-msgstr "Po¹tni predal"
+msgstr "nabiralnik"
 
-#: compose.php:976 lib/Message.php:452
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "ime"
 
-#: templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:76
 msgid "none"
-msgstr "nobeno"
+msgstr "noben"
 
-#: templates/compose/spelling.inc:90
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "ali"
 
-#: templates/compose/spelling.inc:26
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
-msgstr "napaka pri èrkovanju"
+msgstr "èrkovalna napaka"
 
-#: templates/compose/spelling.inc:26
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
-msgstr "napake pri èrkovanju"
+msgstr "èrkovalne napake"
+
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "èrkovalna napaka"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
 
-#: lib/Filter.php:56
+#: lib/Filter.php:51
 msgid "your blacklist"
-msgstr "Èrni seznam"
+msgstr "va¹a blacklista"
 
-#: lib/Filter.php:68
+#: lib/Filter.php:61
 msgid "your whitelist"
-msgstr "Beli seznam"
+msgstr "va¹a whitelista"


--- orig/lib/Session.php
+++ mod/lib/Session.php
@@ -2,10 +2,10 @@
 /**
  * Functions required to start an IMP session.
  *
- * $Horde: imp/lib/Session.php,v 1.74.2.10 2005/07/03 03:42:43 selsky Exp $
+ * $Horde: imp/lib/Session.php,v 1.74.2.25 2006/03/28 18:52:20 slusarz Exp $
  *
- * Copyright 1999-2005 Chuck Hagenbuch <chuck at horde.org>
- * Copyright 1999-2005 Jon Parise <jon at horde.org>
+ * Copyright 1999-2006 Chuck Hagenbuch <chuck at horde.org>
+ * Copyright 1999-2006 Jon Parise <jon at horde.org>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -31,20 +31,18 @@
      * 'base_protocol' -- Either 'imap' or 'pop3'.
      * 'cache'         -- Various IMP libraries can use this variable to cache
      *                    data.
-     * 'delimiter'     -- The folder delimiter to use for the IMAP server.
-     * 'dotfiles'      -- See config/servers.php.
      * 'file_upload'   -- If file uploads are allowed, the max size.
      * 'filteravail'   -- Can we apply filters manually?
-     * 'folders'       -- See config/servers.php.
-     * 'hierarchies'   -- See config/servers.php.
+     * 'imap_server'   -- IMAP server capabilities.
      * 'mailbox'       -- The current viewable mailbox.
      * 'maildomain'    -- See config/servers.php.
      * 'namespace'     -- See config/servers.php.
+     * 'notepadavail'  -- Is listing of notepads available?
      * 'pass'          -- The encrypted password.
      * 'port'          -- See config/servers.php.
      * 'protocol'      -- See config/servers.php.
      * 'quota'         -- See config/servers.php.
-     * 'search'        -- Mailbox/Folder search parameters.
+     * 'search'        -- Settings used by the IMP_Search library.
      * 'server'        -- The name of the server entry in config/servers.php.
      * 'smime'         -- Settings related to the S/MIME viewer.
      * 'smtphost'      -- The SMTP host to use instead of the Horde default.
@@ -73,12 +71,11 @@
 
         /* Make sure all necessary parameters are set. */
         $default_args = array(
-            'realm'      => '',
-            'port'       => '',
-            'protocol'   => '',
-            'maildomain' => '',
-            'namespace'  => '',
-            'folders'    => ''
+            'realm'        => '',
+            'port'         => '',
+            'protocol'     => '',
+            'maildomain'   => '',
+            'imap_server'  => array('children' => false),
         );
 
         /* Merge with the passed-in parameters. */
@@ -124,10 +121,9 @@
         if (($conf['server']['server_list'] != 'none') &&
             !empty($servers[$server]) &&
             is_array($servers[$server])) {
-            $fields = array('server', 'protocol', 'port', 'folders',
-                            'namespace', 'maildomain', 'delimiter', 'quota',
-                            'acl', 'dotfiles');
-            $fields_array = array('hierarchies', 'admin');
+            $fields = array('server', 'protocol', 'port', 'maildomain',
+                            'quota', 'acl');
+            $fields_array = array('admin');
             $ptr = &$servers[$server];
 
             foreach ($fields as $val) {
@@ -168,7 +164,7 @@
             }
             $ptr = &$servers[$server_key];
 
-            if ($conf['server']['change_server']) {
+            if (!empty($conf['server']['change_server'])) {
                 $_SESSION['imp']['server'] = $server;
             } else {
                 $_SESSION['imp']['server'] = $ptr['server'];
@@ -187,35 +183,22 @@
                 }
             }
 
-            if ($conf['server']['change_port']) {
-                $_SESSION['imp']['port'] = $args['port'];
-            } else {
-                $_SESSION['imp']['port'] = $ptr['port'];
-            }
-
-            if ($conf['server']['change_protocol']) {
-                $_SESSION['imp']['protocol'] = $args['protocol'];
-            } else {
-                $_SESSION['imp']['protocol'] = $ptr['protocol'];
-            }
-
-            if ($conf['server']['change_folders']) {
-                $_SESSION['imp']['folders'] = $args['folders'];
-            } else {
-                $_SESSION['imp']['folders'] = $ptr['folders'];
+            foreach (array('port', 'protocol', 'smtphost', 'smtpport') as $param) {
+                if (!empty($conf['server']['change_' . $param])) {
+                    $_SESSION['imp'][$param] = isset($args[$param]) ? $args[$param] : null;
+                } else {
+                    $_SESSION['imp'][$param] = isset($ptr[$param]) ? $ptr[$param] : null;
+                }
             }
 
             $_SESSION['imp']['maildomain'] = $args['maildomain'];
-            $_SESSION['imp']['namespace'] = $args['namespace'];
-            $_SESSION['imp']['dotfiles'] = !empty($ptr['dotfiles']);
-            $_SESSION['imp']['hierarchies'] = !empty($ptr['hierarchies']) ? $ptr['hierarchies'] : array();
         }
 
         /* Determine the base protocol. */
         if (($pos = strpos($_SESSION['imp']['protocol'], '/'))) {
-            $_SESSION['imp']['base_protocol'] = substr($_SESSION['imp']['protocol'], 0, $pos);
+            $_SESSION['imp']['base_protocol'] = strtolower(substr($_SESSION['imp']['protocol'], 0, $pos));
         } else {
-            $_SESSION['imp']['base_protocol'] = $_SESSION['imp']['protocol'];
+            $_SESSION['imp']['base_protocol'] = strtolower($_SESSION['imp']['protocol']);
         }
 
         /* Set the initial mailbox to blank. */
@@ -225,6 +208,7 @@
         $auth_imp = &Auth::singleton(array('imp', 'imp'));
         $auth_imp->authenticateOptions(array('flags' => OP_HALFOPEN));
         if ($auth_imp->authenticate(null, null, true) !== true) {
+            unset($_SESSION['imp']);
             return false;
         }
 
@@ -245,23 +229,83 @@
         /* Is the 'tasks/listTasklists' call available? */
         $_SESSION['imp']['tasklistavail'] = ($conf['tasklist']['use_tasklist'] && $registry->hasMethod('tasks/listTasklists'));
 
+        /* Is the 'notes/listNotepads' call available? */
+        $_SESSION['imp']['notepadavail'] = ($conf['notepad']['use_notepad'] && $registry->hasMethod('notes/listNotepads'));
+
         /* IMAP specific variables. */
         if ($_SESSION['imp']['base_protocol'] != 'pop3') {
-            if (empty($_SESSION['imp']['delimiter'])) {
-                /* Get the default delimiter value (per RFC 3501 [6.3.8]). */
-                $box = @imap_getmailboxes($_SESSION['imp']['stream'], IMP::serverString(), '');
-                if (empty($box)) {
-                    $box = @imap_getmailboxes($_SESSION['imp']['stream'], IMP::serverString(), 'INBOX');
-                }
-                $_SESSION['imp']['delimiter'] = !empty($box[0]->delimiter) ? $box[0]->delimiter : '/';
+            /* Check for timeouts. */
+            if (!empty($ptr['timeout'])) {
+                $_SESSION['imp']['imap_server']['timeout'] = $ptr['timeout'];
             }
 
-            /* Initialize the 'showunsub' value. */
-            $_SESSION['imp']['showunsub'] = false;
+            /* Check for manual configuration. */
+            if (!empty($ptr['imap_config'])) {
+                $_SESSION['imp']['imap_config']['children'] = $ptr['imap_config']['children'];
+                $_SESSION['imp']['namespace'] = $ptr['imap_config']['namespace'];
+                $_SESSION['imp']['imap_config']['search_charset'] = $ptr['imap_config']['search_charset'];
+            } else {
+                require_once IMP_BASE . '/lib/IMAP/Client.php';
+                $imapclient = &new IMP_IMAPClient($_SESSION['imp']['server'], $_SESSION['imp']['port'], $_SESSION['imp']['protocol']);
+
+                $_SESSION['imp']['namespace'] = array();
+
+                $use_tls = $imapclient->useTLS();
+                $user_namespace = (isset($ptr['namespace']) && is_array($ptr['namespace'])) ? $ptr['namespace'] : array();
+                if (is_a($use_tls, 'PEAR_Error')) {
+                    if (!empty($user_namespace)) {
+                        foreach ($ptr as $val) {
+                            /* This is a correct TLS configuration - we only
+                             * need to determine the delimiters for each
+                             * namespace.  Get the default delimiter value
+                             * (per RFC 3501 [6.3.8]). */
+                            $box = @imap_getmailboxes($_SESSION['imp']['stream'], IMP::serverString(), $val);
+                            if (!empty($box[0]->delimiter)) {
+                                $_SESSION['imp']['namespace'][$val] = array('name' => $val, 'delimiter' => $box[0]->delimiter);
+                            }
+                        }
+                    } else {
+                        $auth_imp->IMPsetAuthErrorMsg($use_tls->getMessage());
+                        $auth_imp->clearAuth();
+                        unset($_SESSION['imp']);
+                        return false;
+                    }
+                } else {
+                    /* Auto-detect namespace parameters from IMAP server. */
+                    $res = $imapclient->login($_SESSION['imp']['user'], $password);
+                    if (is_a($res, 'PEAR_Error')) {
+                        $auth_imp->IMPsetAuthErrorMsg($res->getMessage());
+                        unset($_SESSION['imp']);
+                        return false;
+                    }
+                    $_SESSION['imp']['namespace'] = $imapclient->namespace($user_namespace);
+                    if (!is_array($_SESSION['imp']['namespace'])) {
+                        $auth_imp->IMPsetAuthErrorMsg(_("Could not retrieve namespace information from IMAP server."));
+                        unset($_SESSION['imp']);
+                        return false;
+                    }
+                    $_SESSION['imp']['imap_server']['children'] = $imapclient->queryCapability('CHILDREN');
+
+                    /* Determine if the search command supports the current
+                     * browser's charset. */
+                    $charset = NLS::getCharset();
+                    $_SESSION['imp']['imap_server']['search_charset'] = array($charset => $imapclient->searchCharset($charset));
+                    $imapclient->logout();
+                }
+
+                /* Initialize the 'showunsub' value. */
+                $_SESSION['imp']['showunsub'] = false;
+
+                /* Initialize the IMP_Tree object.  This needs to be done
+                 * before initializing IMP_Search::. */
+                require_once IMP_BASE . '/lib/IMAP/Tree.php';
+                IMP_IMAP::singleton();
 
-            /* Are there any virtual folders the user has? */
-            require_once IMP_BASE . '/lib/VFolder.php';
-            $_SESSION['imp']['vfolder'] = IMP_VFolder::getVFolderList();
+                /* Set up search information for the session. */
+                $GLOBALS['imp_search']->sessionSetup();
+            }
+        } else {
+            $_SESSION['imp']['namespace'] = null;
         }
 
         /* Store the $imp variable globally. */
@@ -307,13 +351,39 @@
 
             /* Run filters. */
             require_once IMP_BASE . '/lib/Filter.php';
-            IMP_Filter::filter('INBOX');
-
-            /* Return to read-only. */
-            $imp_imap->changeMbox('', OP_HALFOPEN);
+            $imp_filter = &IMP_Filter::singleton();
+            $imp_filter->filter('INBOX');
         }
 
         IMP::loginTasksFlag(0);
     }
 
+    /**
+     * Returns the initial URL.
+     *
+     * @param string $actionID  The action ID to perform on the initial page.
+     * @param boolean $encode   If true the argument separator gets encoded.
+     *
+     * @return string  The initial URL.
+     */
+    function getInitialUrl($actionID = null, $encode = true)
+    {
+        $init_url = ($_SESSION['imp']['base_protocol'] == 'pop3') ? 'INBOX' : $GLOBALS['prefs']->getValue('initial_page');
+
+        if ($init_url == 'folders.php') {
+            $url = Horde::applicationUrl($init_url, !$encode);
+            $url = Util::addParameter($url, IMP::getComposeArgs(), null, $encode);
+        } else {
+            $url = Horde::applicationUrl('mailbox.php', !$encode);
+            $url = Util::addParameter($url, 'mailbox', $init_url, $encode);
+            $url = Util::addParameter($url, IMP::getComposeArgs(), null, $encode);
+        }
+
+        if (!empty($actionID)) {
+            $url = Util::addParameter($url, 'actionID', $actionID, $encode);
+        }
+
+        return $url;
+    }
+
 }


--- orig/lib/MIME/Headers.php
+++ mod/lib/MIME/Headers.php
@@ -12,9 +12,9 @@
  * The IMP_Headers:: class contains all functions related to handling
  * the headers of mail messages in IMP.
  *
- * $Horde: imp/lib/MIME/Headers.php,v 1.92.2.11 2005/10/13 16:52:17 slusarz Exp $
+ * $Horde: imp/lib/MIME/Headers.php,v 1.92.2.20 2006/02/15 06:21:46 slusarz Exp $
  *
- * Copyright 2002-2005 Michael Slusarz <slusarz at bigworm.colorado.edu>
+ * Copyright 2002-2006 Michael Slusarz <slusarz at bigworm.colorado.edu>
  *
  * See the enclosed file COPYING for license information (GPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
@@ -124,23 +124,15 @@
      */
     function addSiteHeaders()
     {
-        global $conf;
-
         /* Add the 'User-Agent' header. */
         $this->addAgentHeader();
 
         /* Tack on any site-specific headers. */
-        if ($conf['msg']['prepend_header'] &&
-            @is_readable(IMP_BASE . '/config/header.txt')) {
-            include_once 'Horde/Text/Filter.php';
-
-            $lines = @file(IMP_BASE . '/config/header.txt');
-            foreach ($lines as $line) {
-                $line = trim(Text_Filter::filter($line, 'environment'));
-                if (!empty($line)) {
-                    list($key, $val) = explode(':', $line, 2);
-                    $this->addHeader(trim($key), trim($val));
-                }
+        if (!empty($GLOBALS['conf']['msg']['prepend_header']) &&
+            @is_readable(IMP_BASE . '/config/header.php')) {
+            require_once IMP_BASE . '/config/header.php';
+            foreach ($_header as $key => $val) {
+                $this->addHeader(trim($key), trim($val));
             }
         }
     }
@@ -163,7 +155,7 @@
         $add_link = null;
 
         /* Make sure this is a valid object address field. */
-        $array = $this->getOb($field);
+        $array = $this->myGetOb($field);
         if (empty($array) || !is_array($array)) {
             return null;
         }
@@ -189,7 +181,7 @@
                 } else {
                     $ret = htmlspecialchars(str_replace('\"', '"', $ob->address));
                     if ($link) {
-                        $ret = Horde::link(IMP::composeLink(array('to' => addslashes($ob->address))), sprintf(_("Compose Message (%s)"), $ob->inner)) . $ret . '</a>';
+                        $ret = Horde::link(IMP::composeLink(array('to' => addslashes($ob->address))), sprintf(_("New Message to %s"), $ob->inner)) . $ret . '</a>';
                     }
 
                     /* Append the add address icon to every address if
@@ -197,8 +189,8 @@
                     if ($add_link) {
                         $curr_link = Util::addParameter($add_link, array('name' => $ob->personal,
                                                                          'address' => $ob->inner));
-                        $ret .= Horde::link($curr_link, sprintf(_("Add to Address book (%s)"), $ob->inner)) .
-                            Horde::img('addressbook-blue.png', sprintf(_("Add to Address book (%s)"), $ob->inner), 'style="addrbookicon"') . '</a>';
+                        $ret .= Horde::link($curr_link, sprintf(_("Add %s to my Address Book"), $ob->inner)) .
+                            Horde::img('addressbook_add.png', sprintf(_("Add %s to my Address Book"), $ob->inner)) . '</a>';
                     }
                 }
 
@@ -212,7 +204,17 @@
             $ret = _("Undisclosed Recipients");
         } else {
             /* Build the address line. */
-            $ret = '<span style="white-space:nowrap">' . implode(',</span> <span style="white-space:nowrap">', $addr_array) . '</span>';
+            if (count($addr_array) > 20) {
+                Horde::addScriptFile('hideable.js', 'horde', true);
+                Horde::addScriptFile('addressesBlocks.js', 'imp');
+            
+                $ret = '<div id="at_' . $field . '">' .
+                    Horde::link('#', '', 'widget', '', 'toggleAddressesBlock(\'' . $field . '\', \'' . count($addr_array) . '\'); return false;', '', '') .
+                    sprintf(_("[Show addresses - %s recipients]"), count($addr_array)) . '</a></div>' .
+                    '<div id="ab_' . $field . '" style="display:none;"><span class="nowrap">' . implode(',</span> <span class="nowrap">', $addr_array) . '</span></div>';
+            } else {
+                $ret = '<span class="nowrap">' . implode(',</span> <span class="nowrap">', $addr_array) . '</span>';
+            }
         }
 
         /* Set the header value, if requested. */
@@ -232,7 +234,13 @@
      */
     function addLocalTime($date)
     {
-        if ($date && ($ltime = strtotime($date)) != -1) {
+        if (empty($date)) {
+            $ltime = false;
+        } else {
+            $date = preg_replace('/\s+\(\w+\)$/', '', $date);
+            $ltime = strtotime($date);
+        }
+        if ($ltime !== false && $ltime !== -1) {
             $date_str = strftime($GLOBALS['prefs']->getValue('date_format'), $ltime);
             $time_str = strftime($GLOBALS['prefs']->getValue('time_format'), $ltime);
             $tz = strftime('%Z');
@@ -250,4 +258,22 @@
         return $date;
     }
 
+    /**
+     * Get a header from the header object.
+     *
+     * @since IMP 4.1
+     *
+     * @param string $field  The header to return as an object.
+     *
+     * @return mixed  The field requested.
+     */
+    function myGetOb($field)
+    {
+        if (!isset($this->_obCache[$field])) {
+            $value = $this->getValue($field);
+            $this->_obCache[$field] = IMP::parseAddressList($value);
+        }
+        return $this->_obCache[$field];
+    }
+
 }


--- orig/templates/prefs/sourceselect.inc
+++ mod/templates/prefs/sourceselect.inc
@@ -85,7 +85,7 @@
 ?>
 
 <?php if (!$prefs->isLocked('search_sources') && (!empty($readSelect) || !empty($prefSelect))): ?>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 function deselectHeaders()
 {
@@ -300,9 +300,9 @@
    </select>
   </td>
   <td>
-   <a href="" onclick="addSource(); return false;"><?php echo Horde::img('rhand.png', _("Add source"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="" onclick="addSource(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'lhand.png' : 'rhand.png', _("Add source"), null, $registry->getImageDir('horde')) ?></a>
    <br />
-   <a href="" onclick="removeSource(); return false;"><?php echo Horde::img('lhand.png', _("Remove source"), null, $registry->getImageDir('horde')) ?></a>
+   <a href="" onclick="removeSource(); return false;"><?php echo Horde::img(isset($GLOBALS['nls']['rtl'][$GLOBALS['language']]) ? 'rhand.png' : 'lhand.png', _("Remove source"), null, $registry->getImageDir('horde')) ?></a>
   </td>
   <td>
    <select name="selected_search_sources" multiple="multiple" size="5" width="20" onchange="deselectHeaders();updateSearchFields();">
@@ -335,7 +335,7 @@
  </tr>
 </table>
 
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 <!--
 updateSearchFields();
 // -->


--- orig/templates/smime/notactive.inc
+++ mod/templates/smime/notactive.inc
@@ -1,39 +1,17 @@
-<form method="post" name="smime" action="<?php echo $selfURL ?>">
-<input type="hidden" name="actionID" value="" />
-
-<table border="0" align="center" cellpadding="3" cellspacing="0" width="100%">
-  <tr>
-    <td align="left" class="header" nowrap="nowrap"><b><?php echo _("S/MIME NOT Active") ?></b></td>
-    <?php Prefs_UI::generateNavigationCell('smime') ?>
-  </tr>
-  <tr>
-<?php if ($prefs->isLocked('use_smime')): ?>
-    <td class="item" align="left">&nbsp;<b><?php echo _("S/MIME support is disabled on this system.") ?></b></td>
-    <td class="item">&nbsp;</td>
-  </tr>
+<?php
+  $use_smime_locked = $prefs->isLocked('use_smime');
+  if ($use_smime_locked): ?>
+<strong><?php echo _("S/MIME support is disabled on this system.") ?></strong>
 <?php else: ?>
-    <td class="item" align="left">&nbsp;
-      <input id="use_smime" type="checkbox" name="use_smime" <?php echo ($prefs->getValue('use_smime')) ? "checked=\"checked\"" : "" ?> />&nbsp;<?php echo Horde::label('use_smime', _("Enable S/MIME functionality?")) ?>
-    </td>
-    <td class="item" align="right"><?php echo Help::link('imp', 'smime-overview') ?></td>
-  </tr>
-
-  <tr>
-    <td class="header" nowrap="nowrap" align="left" valign="middle">
-      <input type="submit" name="save" class="button" onclick="document.smime.actionID.value='save_options'; return true;" value="<?php echo _("Save Options") ?>" />
-    </td>
-    <td class="header">&nbsp;</td>
-  </tr>
+<input id="use_smime" type="checkbox" name="use_smime"<?php echo ($prefs->getValue('use_smime')) ? ' checked="checked"' : '' ?> /> <?php echo Horde::label('use_smime', _("Enable S/MIME functionality?")) ?>&nbsp;<?php echo Help::link('imp', 'smime-overview') ?><br />
 <?php endif; ?>
+</div>
 
-  <tr rowspan="2"><td>&nbsp;</td></tr>
-
-  <tr>
-    <td align="left" class="header" nowrap="nowrap">
-      <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
-    </td>
-    <td class="header">&nbsp;</td>
-  </tr>
-</table>
-
+<br class="spacer" />
+<div class="nowrap">
+<?php if (!$use_smime_locked): ?>
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options'; return true;" value="<?php echo _("Save Options") ?>" />&nbsp;
+<?php endif; ?>
+  <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
+</div>
 </form>


--- orig/templates/smime/smime.inc
+++ mod/templates/smime/smime.inc
@@ -1,164 +1,104 @@
-<form method="post" name="smime" action="<?php echo $selfURL ?>">
-<input type="hidden" name="actionID" value="" />
+<input id="use_smime" type="checkbox" name="use_smime"<?php echo ($prefs->getValue('use_smime')) ? ' checked="checked"' : '' ?> /> <?php echo Horde::label('use_smime', _("Enable S/MIME functionality?")) ?>&nbsp;<?php echo Help::link('imp', 'smime-overview') ?><br />
+<strong style="color:red"><?php echo _("NOTE") ?>:</strong> <?php echo _("S/MIME support requires popup windows to be used.  If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly.") ?><br />
+</div>
+
+<br class="spacer" />
+<div class="header">
+  <ul>
+    <li><?php echo Help::link('imp', 'smime-manage-pubkey') ?></li>
+  </ul>
+  <?php echo _("S/MIME Public Keyring") ?>
+</div>
 
-<table border="0" align="center" cellpadding="0" cellspacing="0" width="100%">
-  <tr>
-    <td align="left" class="header" nowrap="nowrap"><b><?php echo _("S/MIME Options") ?></b></td>
-    <?php $app = 'imp'; Prefs_UI::generateNavigationCell('smime') ?>
-  </tr>
-
-  <tr>
-    <td class="item" align="left" colspan="2">
-      <table border="0" cellpadding="0" width="100%">
-        <tr>
-          <td class="item" align="left" valign="top">&nbsp;
-            <input id="use_smime" type="checkbox" name="use_smime" <?php echo ($prefs->getValue('use_smime')) ? "checked=\"checked\"" : "" ?> />&nbsp;
-          </td>
-          <td class="item" align="left">
-            <table border="0" cellpadding="0" width="75%">
-              <tr>
-                <td class="item" align="left"><label for="use_smime"><?php echo _("Enable S/MIME functionality?") ?></label>
-                </td>
-              </tr>
-              <tr>
-                <td class="item" align="left"><font color="red"><b><?php echo _("NOTE") ?>:</b></font> <?php echo _("S/MIME support requires popup windows to be used.  If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly") ?>.
-                </td>
-              </tr>
-            </table>
-          </td>
-          <td class="item" align="right"><?php echo Help::link('imp', 'smime-overview') ?></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td nowrap="nowrap" align="left" class="header" valign="middle">
-      <input type="submit" name="save" class="button" onclick="document.smime.actionID.value='save_options';return true;" value="<?php echo _("Save Options") ?>" />
-    </td>
-     <td class="header"></td>
-  </tr>
-
-  <tr rowspan="2"><td>&nbsp;</td></tr>
-
-  <tr>
-    <td class="header" align="left" nowrap="nowrap"><b><?php echo _("S/MIME Public Keyring") ?></b></td>
-    <td class="header" align="right"><?php echo Help::link('imp', 'smime-manage-pubkey') ?></td>
-  </tr>
-
-  <tr>
-    <td class="item" align="left" colspan="2">
-      <table border="0" cellspacing="0" cellpadding="0">
+<div class="item">
 <?php if (empty($pubkey_list)): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo _("No Public Keys Found") ?></b></td>
-        </tr>
+<strong><?php echo _("No Public Keys Found") ?></strong>
+
 <?php elseif (is_a($pubkey_list, 'PEAR_Error')): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo _("Error") ?>:</b> <?php echo $pubkey_list->getMessage() ?></td>
-        </tr>
+<strong><?php echo _("Error") ?>:</strong> <?php echo $pubkey_list->getMessage() ?>
+
 <?php else: ?>
-<?php foreach ($pubkey_list as $val): ?>
-<?php $linkurl = Util::addParameter($selfURL, 'email', $val['email']); ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo $val['name'] ?> (<?php echo $val['email'] ?>)</b></td>
-          <td class="item" align="left">&nbsp;&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'view_public_key'), sprintf(_("View %s Public Key"), $val['name']), null, 'view_key'); ?><?php echo _("View") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'info_public_key'), sprintf(_("Information on %s Public Key"), $val['name']), null, 'info_key'); ?><?php echo _("Details") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'delete_public_key'), sprintf(_("Delete %s Public Key"), $val['name']), null, null, "if (confirm('" . addslashes(_("Are you sure you want to delete this public key?")) . "')) { return true; } else { return false; }"); ?><?php echo _("Delete") ?></a>]</td>
-        </tr>
-<?php endforeach; ?>
-<?php endif; ?>
-      </table>
-    </td>
-  </tr>
-<?php if ($imp['file_upload']): ?>
+<table>
+<?php foreach ($pubkey_list as $val): $linkurl = Util::addParameter($selfURL, 'email', $val['email']); ?>
   <tr>
-    <td class="header" colspan="2">
-      <table border="0" cellpadding="0" cellspacing="0" width="100%">
-        <tr>
-          <td nowrap="nowrap" align="left" valign="middle">
-<?php $public_import_url = Util::addParameter(Util::addParameter($selfURL, 'actionID', 'import_public_key'), 'reload', $selfURL); ?>
-            <input type="submit" name="save" class="button" onclick="open_smime_import('<?php echo $public_import_url ?>');return false;" value="<?php echo _("Import Public Key") ?>" />
-          </td>
-          <td align="right"><?php echo Help::link('imp', 'smime-import-pubkey') ?></td>
-        </tr>
-      </table>
-    </td>
+    <td><?php echo $val['name'] ?> (<?php echo $val['email'] ?>)</td>
+    <td>&nbsp;&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'view_public_key'), sprintf(_("View %s Public Key"), $val['name']), null, 'view_key'); ?><?php echo _("View") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'info_public_key'), sprintf(_("Information on %s Public Key"), $val['name']), null, 'info_key'); ?><?php echo _("Details") ?></a>]&nbsp;[<?php echo Horde::link(Util::addParameter($linkurl, 'actionID', 'delete_public_key'), sprintf(_("Delete %s Public Key"), $val['name']), null, null, "if (confirm('" . addslashes(_("Are you sure you want to delete this public key?")) . "')) { return true; } else { return false; }"); ?><?php echo _("Delete") ?></a>]</td>
   </tr>
+<?php endforeach; ?>
+</table>
 <?php endif; ?>
+</div>
 
-  <tr rowspan="2"><td>&nbsp;</td></tr>
+<br class="spacer" />
+<div class="nowrap">
+<?php if (!$imp['file_upload']): ?>
+  <span style="color:red"><?php echo _("Key import is not available. File upload is not enabled on this server.") ?></span>
+<?php elseif (!$GLOBALS['prefs']->getValue('add_source')): ?>
+  <strong><?php echo _("Key import is not available. You have no address book defined to add your contacts.") ?></strong>
+<?php else: ?>
+  <?php $public_import_url = Util::addParameter($selfURL, array('actionID' => 'import_public_key', 'reload' => $selfURL)); ?>
+  <input type="submit" name="save" class="button" onclick="popup_imp('<?php echo $public_import_url ?>',750,275); return false;" value="<?php echo _("Import Public Key") ?>" />
+<?php endif; ?>
+</div>
 
-  <tr>
-    <td align="left" class="header" nowrap="nowrap"><b><?php echo _("Your S/MIME Public/Private Certificates") ?></b></td>
-    <td class="header" align="right"><?php echo Help::link('imp', 'smime-overview-personalkey') ?></td>
-  </tr>
+<br class="spacer" />
+<div class="header">
+  <ul>
+    <li><?php echo Help::link('imp', 'smime-overview-personalkey') ?></li>
+  </ul>
+  <?php echo _("Your S/MIME Public/Private Certificates") ?>
+</div>
 
-  <tr>
-    <td class="item" align="left" colspan="2">
-      <table border="0" cellspacing="0" cellpadding="0">
+<div class="item">
 <?php if (is_a($secure_check, 'PEAR_Error')): ?>
-        <tr>
-          <td class="item" align="left">&nbsp;<b><?php echo _("S/MIME Personal Keypair support requires a secure web connection.") ?></b></td>
-        </tr>
-      </table>
-    </td>
-<?php elseif ($prefs->getValue('smime_public_key') && $prefs->getValue('smime_private_key')): ?>
+<strong><?php echo _("S/MIME Personal Keypair support requires a secure web connection.") ?></strong>
+</div>
+
 <?php
-  $viewpublic_url = Util::addParameter($selfURL, 'actionID', 'view_personal_public_key');
-  $infopublic_url = Util::addParameter($selfURL, 'actionID', 'info_personal_public_key');
-  $unload_url = Util::addParameter($selfURL, 'actionID', 'unset_passphrase');
-  $viewprivate_url = Util::addParameter($selfURL, 'actionID', 'view_personal_private_key');
+elseif ($prefs->getValue('smime_public_key') &&
+        $prefs->getValue('smime_private_key')):
+    $viewpublic_url = Util::addParameter($selfURL, 'actionID', 'view_personal_public_key');
+    $infopublic_url = Util::addParameter($selfURL, 'actionID', 'info_personal_public_key');
+    $unload_url = Util::addParameter($selfURL, 'actionID', 'unset_passphrase');
+    $viewprivate_url = Util::addParameter($selfURL, 'actionID', 'view_personal_private_key');
 ?>
-        <tr nowrap="nowrap">
-          <td class="item" align="left"><b>&nbsp;<?php echo _("Your Public Key") ?>:</b></td>
-          <td class="item" align="left">&nbsp;&nbsp;[<?php echo Horde::link($viewpublic_url, _("View Personal Public Key"), null, 'view_key') . _("View") ?></a>]&nbsp;[<?php echo Horde::link($infopublic_url, _("Information on Personal Public Key"), null, 'info_key') . _("Details") ?></a>]</td>
-         </tr>
-         <tr nowrap="nowrap">
-          <td class="item" align="left"><b>&nbsp;<?php echo _("Your Private Key") ?>:</b></td>
-          <td class="item" align="left">&nbsp;&nbsp;<?php if ($passphrase !== null): ?>[<?php echo (empty($passphrase)) ? Horde::link('', _("Enter Passphrase"), null, null, $opensmimewin . ' return false;') . _("Enter Passphrase") : Horde::link($unload_url, _("Unload Passphrase")) . _("Unload Passphrase") ?></a>]&nbsp;<?php endif; ?>[<?php echo Horde::link($viewprivate_url, _("View Personal Private Key"), null, 'view_key') . _("View") ?></a>]</td>
-        </tr>
-      </table>
-    </td>
+<table>
+  <tr>
+    <td><?php echo _("Your Public Key") ?>:</td>
+    <td>&nbsp;&nbsp;[<?php echo Horde::link($viewpublic_url, _("View Personal Public Key"), null, 'view_key') . _("View") ?></a>]&nbsp;[<?php echo Horde::link($infopublic_url, _("Information on Personal Public Key"), null, 'info_key') . _("Details") ?></a>]</td>
   </tr>
-
   <tr>
-    <td class="header" align="left" colspan="2">
-      <table border="0" cellspacing="0" cellpadding="0" width="100%">
-        <tr nowrap="nowrap">
-          <td align="left" valign="middle">
-            <input type="submit" name="delete" class="button" onclick="if (confirm('<?php echo addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")) ?>')) { document.smime.actionID.value='delete_key'; return true; } else { return false; }" value="<?php echo _("Delete Current Keys") ?>" />
-          </td>
-          <td align="right"><?php echo Help::link('imp', 'smime-delete-personal-certs') ?></td>
-        </tr>
-      </table>
-    </td>
-<?php else: ?>
+    <td><?php echo _("Your Private Key") ?>:</td>
+    <td>&nbsp;&nbsp;<?php if ($passphrase !== null): ?>[<?php echo (empty($passphrase)) ? Horde::link('#', _("Enter Passphrase"), null, null, htmlspecialchars($opensmimewin) . ' return false;') . _("Enter Passphrase") : Horde::link($unload_url, _("Unload Passphrase")) . _("Unload Passphrase") ?></a>]&nbsp;<?php endif; ?>[<?php echo Horde::link($viewprivate_url, _("View Personal Private Key"), null, 'view_key') . _("View") ?></a>]</td>
   </tr>
+</table>
+</div>
 
-<?php $personal_import_url = Util::addParameter($selfURL, 'actionID', 'import_personal_certs'); ?>
-<?php if ($imp['file_upload']): ?>
-      <tr nowrap="nowrap">
-       <td class="item" align="left"><b>&nbsp;<?php echo _("No Personal Certificate Present") ?></b></td>
-      </tr>
-    </table>
-   </td>
-  </tr>
+<br class="spacer" />
+<div class="nowrap">
+  <input type="submit" name="delete" class="button" onclick="if (confirm('<?php echo addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")) ?>')) { document.prefs.actionID.value='delete_key'; return true; } else { return false; }" value="<?php echo _("Delete Current Keys") ?>" />
+  <?php echo Help::link('imp', 'smime-delete-personal-certs') ?>
+</div>
 
-  <tr>
-   <td nowrap="nowrap" align="left" class="header" valign="middle">
-    <input type="submit" name="save" class="button" onclick="open_smime_import('<?php echo $personal_import_url ?>');return false;" value="<?php echo _("Import Personal Certificates") ?>" />
-   </td>
-   <td class="header"></td>
-  </tr>
-<?php endif; ?>
+<?php else: ?>
+<strong><?php echo _("No Personal Certificate Present") ?></strong>
+</div>
+
+<br class="spacer" />
+<div class="nowrap">
+<?php   if ($imp['file_upload']): ?>
+  <?php $personal_import_url = Util::addParameter($selfURL, 'actionID', 'import_personal_certs'); ?>
+  <input type="submit" name="save" class="button" onclick="popup_imp('<?php echo $personal_import_url ?>',750,275); return false;" value="<?php echo _("Import Personal Certificate") ?>" />
+<?php   else: ?>
+  <span style="color:red"><?php echo _("Certificate import is not available. File upload is not enabled on this server.") ?></span>
+<?php   endif; ?>
+</div>
 <?php endif; ?>
-  <tr rowspan="2"><td>&nbsp;</td></tr>
 
-  <tr>
-    <td class="header" align="left" nowrap="nowrap">
-      <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
-    </td>
-    <td class="header">&nbsp;</td>
-  </tr>
-</table>
+<br class="spacer" />
+<div class="nowrap">
+  <input type="submit" name="save" class="button" onclick="document.prefs.actionID.value='save_options';return true;" value="<?php echo _("Save Options") ?>" />&nbsp;
+  <input type="button" name="back" class="button" onclick="document.location.href='<?php echo IMP::prefsURL(true) ?>'" value="<?php echo _("Return to Options") ?>" />
+</div>
 
 </form>


--- orig/po/nn_NO.po
+++ mod/po/nn_NO.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
-"POT-Creation-Date: 2002-06-08 22:15+0200\n"
+"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2002-06-08 22:34+0100\n"
 "Last-Translator: Per-Stian Vatne <psv at orsta.org>\n"
 "Language-Team: Norwegian Nynorsk <nynorsk at orsta.org>\n"
@@ -14,2094 +15,5289 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "     Til: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "     Til: "
 
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "    Dato: "
 
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "     Frå: "
 
-msgid " - $nm new message"
-msgstr " - $nm ny melding"
-
-msgid " - $nm new messages"
-msgstr " - $nm nye meldingar"
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
+msgid " (Accesskey %s)"
+msgstr ""
 
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "    Emne: "
 
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " i "
 
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr "#"
 
-msgid "%A, %B %e, %Y, %I:%M:%S %p %Z"
-msgstr "%A, %B %e, %Y, %I:%M:%S %p %Z"
+#: lib/Block/summary.php:69
+#, php-format
+msgid "%.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
 
-#, c-format
-msgid "%d of %d Messages"
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
 msgstr "%d av %d meldingar"
 
-#, c-format
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
+msgstr "%s meldingar vart henta..."
+
+#: lib/Spam.php:178
+#, fuzzy, php-format
+msgid ""
+"%d messages have been reported as not spam to your system administrator."
+msgstr ""
+"Denne meldinga er rapportert som søppelpost til din systemadministrator."
+
+#: lib/Spam.php:158
+#, fuzzy, php-format
+msgid "%d messages have been reported as not spam."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: lib/Spam.php:170
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam to your system administrator."
+msgstr ""
+"Denne meldinga er rapportert som søppelpost til din systemadministrator."
+
+#: lib/Spam.php:150
+#, fuzzy, php-format
+msgid "%d messages have been reported as spam."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: mailbox.php:373
+#, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d til %d av %d meldingar"
 
-#, c-format
-msgid "%s Standard"
-msgstr "%s Standard"
+#: mailbox.php:640
+#, php-format
+msgid "%s KB"
+msgstr ""
 
-#, c-format
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
+#, php-format
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s eksisterer allereie. Namnet på mappa %s vart ikkje endra."
 
-#, c-format
+#: lib/Message.php:649
+#, php-format
+msgid "%s does not appear to be a valid mailbox."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "Mappa %s får endra namnet ved starten av månaden."
 
-#, c-format
-msgid "%s messages were fetched..."
-msgstr "%s meldingar vart henta..."
+#: lib/MIME/Viewer/itip.php:256
+#, php-format
+msgid "%s has accepted."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:625
+#, php-format
+msgid "%s has cancelled %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:262
+#, php-format
+msgid "%s has declined."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:493
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:616
+#, php-format
+msgid "%s has replied to the invitation to %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:482
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:268
+#, php-format
+msgid "%s has tentatively accepted."
+msgstr ""
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:487
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:584
+#, php-format
+msgid "%s requests your presence at %s."
+msgstr ""
+
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "Mappa \"%s\" endra namn til \"%s\"."
+
+#: lib/MIME/Viewer/itip.php:597
+#, php-format
+msgid "%s wishes to ammend %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:574
+#, php-format
+msgid "%s wishes to make you aware of %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:602
+#, php-format
+msgid "%s wishes to receive the latest information about %s."
+msgstr ""
+
+#: message.php:285 message.php:290
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: templates/message/navbar_top.inc:13
+#, php-format
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;av&nbsp;%d)"
 
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(Bruk desse endringane og gå til neste skjermbilete.)"
 
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
-msgstr "(Tilbakestill alle endringar og gå tilbake til skjermbiletet for skriv melding.)"
+msgstr ""
+"(Tilbakestill alle endringar og gå tilbake til skjermbiletet for skriv "
+"melding.)"
 
-msgid "(Return to the compose screen after applying all changes made thus far.  Changes on the current screen will NOT be applied.)"
-msgstr "(Gå tilbake til skjermbiletet for skriv melding etter å ha aktivert alle endringane du har gjort så langt. Endringar i dette skjermbiletet vil IKKJE bli brukt.)"
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
 
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
+msgid ""
+"(Return to the compose screen after applying all changes made thus far.  "
+"Changes on the current screen will NOT be applied.)"
+msgstr ""
+"(Gå tilbake til skjermbiletet for skriv melding etter å ha aktivert alle "
+"endringane du har gjort så langt. Endringar i dette skjermbiletet vil IKKJE "
+"bli brukt.)"
+
+#: spelling.php:277
+#, fuzzy
+msgid ""
+"(Send message after applying all changes made thus far.  Changes on the "
+"current screen will NOT be applied.)"
+msgstr ""
+"(Gå tilbake til skjermbiletet for skriv melding etter å ha aktivert alle "
+"endringane du har gjort så langt. Endringar i dette skjermbiletet vil IKKJE "
+"bli brukt.)"
+
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* Legg til desse ved å klikke OK *"
 
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* Vel adresse(r) *"
 
-#, c-format
-msgid "<p><i>This message was written in a character set other than your own. If it is not displayed correctly, %sclick here</a> to open it in a new window.</i></p>\n"
-msgstr "<p><i>Denne meldinga vart skriven i eit anna teiknsett enn ditt eige. Dersom den ikkje blir vist rett, %sklikk her</a> for å opne den i eit nytt vindauge.</i></p>\n"
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: lib/Spam.php:180
+#, fuzzy
+msgid "1 message has been reported as not spam to your system administrator."
+msgstr ""
+"Denne meldinga er rapportert som søppelpost til din systemadministrator."
+
+#: lib/Spam.php:160
+#, fuzzy
+msgid "1 message has been reported as not spam."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: lib/Spam.php:172
+#, fuzzy
+msgid "1 message has been reported as spam to your system administrator."
+msgstr ""
+"Denne meldinga er rapportert som søppelpost til din systemadministrator."
+
+#: lib/Spam.php:152
+#, fuzzy
+msgid "1 message has been reported as spam."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: config/prefs.php.dist:819
+#, fuzzy
+msgid "100 characters"
+msgstr "Spesialteikn"
+
+#: config/prefs.php.dist:822
+#, fuzzy
+msgid "1000 characters"
+msgstr "Spesialteikn"
+
+#: config/prefs.php.dist:820
+#, fuzzy
+msgid "250 characters"
+msgstr "Spesialteikn"
+
+#: config/prefs.php.dist:821
+#, fuzzy
+msgid "500 characters"
+msgstr "Spesialteikn"
+
+#: lib/MIME/Viewer/images.php:162
+#, fuzzy, php-format
+msgid "A large image named %s is attached to this message."
+msgstr "Denne offentlege PGP-nøkkelen var lagt ved meldinga."
+
+#: lib/MIME/Viewer/notification.php:50
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+
+#: templates/search/fields.inc:5
+msgid "AND"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:590
+msgid "Accept request"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
+msgid "Accepted"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:257
+msgid "Accepted: "
+msgstr ""
+
+#: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "Namn på konto:"
 
-msgid "Action"
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
+#, fuzzy
+msgid "Actions"
 msgstr "Handling"
 
-#, c-format
-msgid "Add to Addressbook (%s)"
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
 msgstr "Legg til adressebok (%s)"
 
-msgid "Added an attachment."
+#: templates/prefs/sourceselect.inc:303
+#, fuzzy
+msgid "Add source"
+msgstr "legg til kjelde"
+
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
+msgid "Add this to my calendar"
+msgstr ""
+
+#: compose.php:1256
+#, fuzzy, php-format
+msgid "Added \"%s\" as an attachment."
 msgstr "La til eit vedlegg."
 
+#: config/prefs.php.dist:198
+msgid ""
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, php-format
+msgid "Additional information can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy
+msgid "Additional information details"
+msgstr "Personleg informasjon"
+
+#: lib/MIME/Viewer/status.php:93
+msgid "Additional message details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:92
+#, php-format
+msgid "Additional message details can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:78
+msgid "Additional message error details"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:77
+#, php-format
+msgid "Additional message error details can be viewed %s."
+msgstr ""
+
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "Adressebok"
 
-msgid "Addressbooks"
-msgstr "Adressebøker"
+#: config/prefs.php.dist:134
+#, fuzzy
+msgid "Address Books"
+msgstr "Adressebok"
 
-msgid "All messages in the folder(s) will be lost!"
-msgstr "Alle meldingar i mappe(r) vil bli tapt!"
+#: config/prefs.php.dist:189
+msgid ""
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
+msgstr ""
 
-msgid "All messages in the following folder(s) will be downloaded into one MBOX file:"
+#: config/prefs.php.dist:181
+msgid ""
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
+msgstr ""
+
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
+msgid "All"
+msgstr "Alle"
+
+#: templates/javascript/folders.js:13
+msgid ""
+"All messages in the following folder(s) will be downloaded into one MBOX "
+"file:"
 msgstr "Alle meldingar i følgjande mappe(r) vil bli lasta ned til ei MBOX-fil:"
 
-#, c-format
-msgid "All messages in your \"%s\" folder older than %s days will be permanently deleted."
-msgstr "Alle meldingar i mappa \"%s\" som er eldre enn %s dagar, vil bli sletta permanent."
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
+msgid ""
+"All messages in your \"%s\" folder older than %s days will be permanently "
+"deleted."
+msgstr ""
+"Alle meldingar i mappa \"%s\" som er eldre enn %s dagar, vil bli sletta "
+"permanent."
+
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, fuzzy, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr ""
+"Alle gamle katalogar med sendt post som er eldre enn %s månader, vil bli "
+"sletta."
 
-#, c-format
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
-msgstr "Alle gamle katalogar med sendt post som er eldre enn %s månader, vil bli sletta."
+msgstr ""
+"Alle gamle katalogar med sendt post som er eldre enn %s månader, vil bli "
+"sletta."
 
-msgid "All"
-msgstr "Alle"
+#: acl.php:85
+#, fuzzy, php-format
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
+msgstr "Mappa \"%s\" endra namn til \"%s\"."
+
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr ""
+
+#: lib/MIME/Viewer/alternative.php:110
+msgid "Alternative parts for this section:"
+msgstr ""
 
-msgid "An error occurred when deleting messages from server!"
-msgstr "Feil ved sletting av meldingar frå tenar!"
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
+msgid "Always"
+msgstr ""
 
-msgid "An unknown error occured adding the new entry."
+#: config/prefs.php.dist:557
+#, fuzzy
+msgid "Always save attachments"
+msgstr "La til eit vedlegg."
+
+#: lib/Message.php:505
+msgid ""
+"An error occured while attempting to strip the attachment. The IMAP server "
+"said: "
+msgstr ""
+
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
 msgstr "Ukjent feil når oppføringa skulle leggjast til."
 
-msgid "Answered messages"
-msgstr "Meldingar du har svart på"
+#: lib/Message.php:387
+#, fuzzy
+msgid "An unknown error occured while creating the new task."
+msgstr "Ukjent feil når oppføringa skulle leggjast til."
 
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
+#: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
+#: templates/mailbox/legend.inc:6
 msgid "Answered"
 msgstr "Svart på"
 
-msgid "Apply All Rules"
-msgstr "Bruk alle reglar"
+#: templates/search/main.inc:31
+msgid "Answered messages"
+msgstr "Meldingar du har svart på"
+
+#: templates/mailbox/header.inc:7
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Bruk filter på"
 
-msgid "Apply Filters on"
+#: templates/mailbox/header.inc:7
+#, fuzzy, php-format
+msgid "Apply Filters to %s"
 msgstr "Bruk filter på"
 
-msgid "Apply filter rules upon logging on."
+#: templates/filters/prefs.inc:36
+#, fuzzy
+msgid "Apply filter rules upon logging on?"
 msgstr "Bruk filterreglar ved pålogging."
 
-msgid "Apply filter rules when mailbox is refreshed."
+#: templates/filters/prefs.inc:42
+#, fuzzy
+msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "Bruk filterreglar når postboksa blir friska opp."
 
-msgid "April"
-msgstr "April"
-
-msgid "Are you SURE you want to continue?"
-msgstr "Er du SIKKER på at du vil halde fram?"
-
-msgid "Are you completely sure you wish to continue?"
-msgstr "Er du heilt sikker på at du vil halde fram?"
-
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 msgid "Are you sure you want to delete this public key?"
 msgstr "Er du sikker på at du vil slette denne offentlege nøkkelen?"
 
-msgid "Are you sure you want to delete your keypair? (This is NOT recommended!)"
-msgstr "Er du sikker på at du vil slette nøkkelparet ditt? (Dette er IKKJE tilrådd!)"
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+"Er du sikker på at du vil slette nøkkelparet ditt? (Dette er IKKJE tilrådd!)"
 
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "Er du sikker på at du vil gjere dette?"
 
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "Er du sikker på at du vil slette desse meldingane PERMANENT?"
 
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Er du sikker på at du vil slette desse meldingane PERMANENT?"
+
+#: templates/mailbox/actions.inc:39
 msgid "Are you sure you wish to empty this folder?"
 msgstr "Er du sikker på at du vil tømme denne mappa?"
 
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Er du sikker på at du vil tømme søppelkorga di?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Er du sikker på at du vil tømme søppelkorga di?"
 
+#: templates/mailbox/actions.inc:8
+#, fuzzy
+msgid "Are you sure you wish to permanently delete these messages?"
+msgstr "Er du sikker på at du vil slette desse meldingane PERMANENT?"
+
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
+#, fuzzy
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Er du sikker på at du vil tømme denne mappa?"
+
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
+#, fuzzy
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Er du sikker på at du vil tømme denne mappa?"
+
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "Tid motteke"
 
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "Stigande"
 
-msgid "Ask for confirmation before doing maintenance operations?"
-msgstr "Spør om stadfesting før køyring av vedlikehaldsoperasjonar?"
-
-msgid "Attach a copy of your PGP public key to your message?"
-msgstr "Legg ved ein kopi av din offentlege PGP-nøkkel i meldinga?"
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
+msgid "Ask"
+msgstr ""
 
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "Legg ved"
 
+#: templates/compose/compose.inc:475
+#, fuzzy
+msgid "Attach Files"
+msgstr "Vedlagt fil:"
+
+#: templates/compose/compose.inc:456
+msgid "Attach a copy of your PGP public key to your message?"
+msgstr "Legg ved ein kopi av din offentlege PGP-nøkkel i meldinga?"
+
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "Vedlagt fil:"
 
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:376
+msgid "Attached is a reply to a calendar request you sent."
+msgstr ""
+
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "Vedlegg"
 
+#: compose.php:1067 lib/Message.php:466
+msgid "Attachment stripped: Original attachment type"
+msgstr ""
+
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "Vedlegg"
 
-msgid "August"
-msgstr "August"
+#: lib/MIME/Viewer/itip.php:682
+#, fuzzy
+msgid "Attendees"
+msgstr "Vedlegg"
+
+#: lib/MIME/Viewer/notification.php:53
+#, fuzzy
+msgid "Attention"
+msgstr "Handling"
+
+#: lib/Auth/imp.php:44
+msgid "Auth_imp: Required IMAP extension not found."
+msgstr ""
 
-msgid "Available Addressbooks:"
+#: config/prefs.php.dist:640
+msgid ""
+"Automatically show images in HTML messages when the sender is in my "
+"addressbook?"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:298
+#, fuzzy
+msgid "Available Address books:"
 msgstr "Tilgjengelege adressebøker:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:719
+msgid "Awaiting Response"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:26
+#, fuzzy, php-format
+msgid "Bac_k to %s"
+msgstr "Tilbake til %s"
+
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "Tilbake til %s"
 
-msgid "Barbie"
-msgstr "Barbie"
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
 
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "Blind kopi"
 
+#: lib/MIME/Viewer/status.php:161
+msgid "Below is the raw text of the status information message."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "Svartelist"
 
+#: config/prefs.php.dist:629
+msgid "Block images in HTML messages unless they are specifically requested?"
+msgstr ""
+
+#: lib/Search.php:42
 msgid "Body"
 msgstr "Kropp"
 
-msgid "Both Header Listing and Body of Message"
-msgstr "Både vising av meldingshovud og meldingskropp"
-
+#: templates/search/main.inc:23 templates/search/main.inc:39
+#: templates/search/main.inc:55 templates/search/main.inc:71
 msgid "Both"
 msgstr "Begge"
 
-msgid "Brown"
-msgstr "Brun"
+#: config/prefs.php.dist:687
+msgid "Both Header Listing and Body of Message"
+msgstr "Både vising av meldingshovud og meldingskropp"
 
-msgid "Burnt Orange"
-msgstr "Brent oransje"
+#: templates/compose/compose.inc:272
+msgid "C_harset"
+msgstr ""
 
-msgid "Camouflage"
-msgstr "Kamuflasje"
+#: templates/search/fields.inc:36
+msgid "Calendar"
+msgstr ""
 
-msgid "Can't connect to the Mail Server"
+#: lib/Fetchmail/imap.php:201
+#, fuzzy
+msgid "Can not connect to the remote mail server."
 msgstr "Kan ikkje kople til e-posttenaren"
 
-msgid "Cancel Message"
-msgstr "Avbryt melding"
+#: lib/Fetchmail/imap.php:199
+#, fuzzy
+msgid "Can not connect to the remote mail server: "
+msgstr "Kan ikkje kople til e-posttenaren"
+
+#: lib/MIME/Viewer/partial.php:50
+#, php-format
+msgid ""
+"Can not display - found only %s of %s parts of this message in the current "
+"mailbox."
+msgstr ""
 
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
+#: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Avbryt"
 
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
+msgid "Cancel Message"
+msgstr "Avbryt melding"
+
+#: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Ved å avbryte denne meldinga vil du miste innhaldet for godt."
 
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "Kopi"
 
-msgid "Cc:"
-msgstr "Kopi:"
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
+#, fuzzy
+msgid "Chair Person"
+msgstr "Personleg"
 
+#: templates/compose/spelling.inc:80
+msgid "Change"
+msgstr "Endre"
+
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "Endre alle"
 
-msgid "Change display options such as the color scheme, how many messages you see on each page and how messages are sorted."
-msgstr "Endre visingsalternativ, slik som fargeskjema, kro mange meldingar du ser på kvar side, og korleis meldingane blir sorterte."
+#: templates/acl/acl.inc:92
+#, fuzzy
+msgid "Change Folder"
+msgstr "Oppret mappe"
+
+#: config/prefs.php.dist:112
+#, fuzzy
+msgid ""
+"Change display options such as how many messages you see on each page and "
+"how messages are sorted."
+msgstr ""
+"Endre visingsalternativ, slik som fargeskjema, kro mange meldingar du ser på "
+"kvar side, og korleis meldingane blir sorterte."
 
-msgid "Change mail server settings."
+#: config/prefs.php.dist:24
+#, fuzzy
+msgid "Change mail server and folder settings."
 msgstr "Endre innstillingar for posttenar."
 
-msgid "Change the name, address, and signature that people see when they read and reply to your email."
-msgstr "Endre namn, adresse og signaturen folk ser når dei les og svarar på e-post frå deg."
+#: config/prefs.php.dist:15
+msgid ""
+"Change the name, address, and signature that people see when they read and "
+"reply to your email."
+msgstr ""
+"Endre namn, adresse og signaturen folk ser når dei les og svarar på e-post "
+"frå deg."
 
-msgid "Change"
-msgstr "Endre"
+#: config/prefs.php.dist:824
+msgid "Characters to display:"
+msgstr ""
 
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "Sjekk mappe(r) for ny e-post"
 
-msgid "Checkbox"
-msgstr "Avkryssingsboks"
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
+msgid "Check _All/None"
+msgstr ""
 
-msgid "Cherry"
-msgstr "Kirsebær"
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
+msgid "Check all mail servers you want to fetch mail from:"
+msgstr ""
 
+#: config/prefs.php.dist:463
+#, fuzzy
+msgid "Check spelling before sending a message?"
+msgstr "Vis stadfesting etter å ha sendt ei melding?"
+
+#: templates/folders/actions.inc:4
 msgid "Choose Action:"
 msgstr "Vel handling:"
 
-msgid "Choose the addressbook to use when adding addresses."
-msgstr "Vel adresseboka du vil bruke for å leggje til nye adresser."
+#: config/servers.php.dist:182
+#, fuzzy
+msgid "Choose a mail server:"
+msgstr "Endre innstillingar for posttenar."
+
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+msgid "Choose a match or edit the address to the right:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
+#, fuzzy
+msgid "Choose an action:"
+msgstr "Vel handling:"
+
+#: templates/prefs/sourceselect.inc:349
+#, fuzzy
+msgid "Choose the address book to use when adding addresses."
+msgstr "Vel adresseboka du vil bruke for å leggje til nye adresser."
+
+#: templates/prefs/sourceselect.inc:293
+#, fuzzy
+msgid "Choose the order of address books to search when expanding addresses."
+msgstr "Vel rekkefølgje på adressebøker å søke i ved kontroll av adresser."
+
+#: lib/MIME/Viewer/images.php:106
+#, php-format
+msgid "Click %s to convert the image file into a format your browser can view."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:95
+#, php-format
+msgid "Click %s to download the image."
+msgstr ""
+
+#: lib/Filter.php:106
+#, php-format
+msgid "Click %s to go to %s management page."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy, php-format
+msgid "Click %s to view HTML content in a separate window."
+msgstr "Skriv meldingar i eige vindauge."
+
+#: lib/MIME/Viewer/images.php:163
+#, php-format
+msgid "Click %s to view a thumbnail of this image."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy, php-format
+msgid "Click %s to view the attachment in a separate window."
+msgstr "Skriv meldingar i eige vindauge."
+
+#: lib/MIME/Viewer/related.php:79
+#, php-format
+msgid "Click %s to view this multipart/related part in a separate window."
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:95
+msgid "Click here to SHOW the Images"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:321
+#, fuzzy
+msgid ""
+"Click on one of your selected address books and then select all fields to "
+"search."
+msgstr ""
+"Klikk på ei av dine valde adressebøker og vel alle felta det skal søkast i."
+
+#: lib/MIME/Viewer/pgp.php:171
+#, fuzzy
+msgid "Click to Save PGP Public Key in your Address book"
+msgstr "Klikk for å lagre offentleg PGP-nøkkel i adresseboka di"
 
-msgid "Choose the order of addressbooks to search when expanding addresses."
-msgstr "Vel rekkefølgje på adressebøker å søke i ved kontroll av adresser."
+#: lib/MIME/Viewer/pkcs7.php:202
+#, fuzzy, php-format
+msgid "Click to Save S/MIME certificate of %s in your Address Book"
+msgstr "Klikk for å lagre offentleg PGP-nøkkel i adresseboka di"
 
-#, c-format
-msgid "Cleared all messages from %s."
-msgstr "Fjerna alle meldingar frå %s."
+#: config/prefs.php.dist:950
+msgid "Clicking on the address will compose a new message to the sender"
+msgstr ""
 
-msgid "Click on one of your selected addressbooks and then select all fields to search."
-msgstr "Klikk på ei av dine valde adressebøker og vel alle felta det skal søkast i."
+#: config/prefs.php.dist:951
+msgid "Clicking on the address will open the message to be read"
+msgstr ""
 
-msgid "Click to Save PGP Public Key in your Addressbook"
-msgstr "Klikk for å lagre offentleg PGP-nøkkel i adresseboka di"
+#: templates/fetchmail/fetchmail.inc:28
+#, fuzzy
+msgid "Close"
+msgstr "Ny melding"
 
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Lukk dette vindauget"
 
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "Lukka mappe"
 
-msgid "Collapse All Folders"
-msgstr "Fold saman alle mapper"
+#: folders.php:449
+#, fuzzy
+msgid "Collapse"
+msgstr "Fold saman alle"
 
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "Fold saman alle"
 
+#: templates/folders/actions.inc:39
+msgid "Collapse All Folders"
+msgstr "Fold saman alle mapper"
+
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "Fold saman mappe"
 
+#: templates/fetchmail/manage.inc:51
+msgid "Color Indicator: "
+msgstr ""
+
+#: templates/pgp/pgp.inc:103
 msgid "Comment"
 msgstr "Kommentar"
 
-#, c-format
-msgid "Compose Message (%s)"
-msgstr "Skriv melding (%s)"
-
-msgid "Compose a message"
-msgstr "Skriv ei melding"
+#: lib/MIME/Viewer/itip.php:769
+#, fuzzy
+msgid "Completed"
+msgstr "Kommentar"
 
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "Skriv ei melding til"
 
-msgid "Compose messages in a separate window."
+#: config/prefs.php.dist:434
+#, fuzzy
+msgid "Compose messages in a separate window?"
 msgstr "Skriv meldingar i eige vindauge."
 
-msgid "Compose"
-msgstr "Ny melding"
+#: config/prefs.php.dist:443
+msgid ""
+"Compose messages with an HTML GUI by default (if browser supports the "
+"feature)?"
+msgstr ""
+
+#: config/prefs.php.dist:67
+msgid "Configure how messages are displayed."
+msgstr ""
 
-msgid "Contact List"
-msgstr "Kontaktliste"
+#: config/prefs.php.dist:97
+#, fuzzy
+msgid "Configure mail preview options."
+msgstr "Endre innstillingar for posttenar."
+
+#: lib/IMAP/Client.php:370
+msgid "Connection dropped by IMAP server."
+msgstr ""
+
+#: lib/Fetchmail/imap.php:234
+msgid "Connection to server failed"
+msgstr ""
+
+#: config/prefs.php.dist:143
+#, fuzzy, php-format
+msgid "Control PGP support for %s."
+msgstr "Kontrollerer PGP-støtte for IMP."
 
-msgid "Control PGP support for IMP."
+#: config/prefs.php.dist:152
+#, fuzzy, php-format
+msgid "Control S/MIME support for %s."
 msgstr "Kontrollerer PGP-støtte for IMP."
 
-msgid "Control when new mail will be checked for, and whether or not to notify you when it arrives."
-msgstr "Kontroller når det skal sjekkast for ny post, og om du skal varslast eller ikkje når ny post kjem."
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
+msgid ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+msgstr ""
+"Kontroller når det skal sjekkast for ny post, og om du skal varslast eller "
+"ikkje når ny post kjem."
+
+#: config/prefs.php.dist:696
+msgid "Convert textual emoticons into graphical ones?"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy"
 msgstr "Kopier"
 
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
+#, fuzzy
+msgid "Copy to folder"
+msgstr "Tøm søppelkorg"
+
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "Korriger"
 
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "Korrigert tekst"
 
-#, c-format
-msgid "Could not delete messages from %s: %s"
+#: lib/IMAP/Client.php:382
+#, fuzzy, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr "Kunne ikkje slette meldingar frå %s: %s"
+
+#: attachment.php:50
+#, php-format
+msgid "Could not create the VFS backend: %s"
+msgstr ""
+
+#: lib/Message.php:640
+#, fuzzy, php-format
+msgid "Could not delete messages from %s. The server said: %s"
 msgstr "Kunne ikkje slette meldingar frå %s: %s"
 
+#: lib/Session.php:318
+#, fuzzy
+msgid "Could not execute maintenance operations."
+msgstr "Vedlikehaldsoperasjonar"
+
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr "Kunne ikkje trekke ut den førespurde fila"
 
+#: lib/MIME/Viewer/zip.php:58
+#, fuzzy
+msgid "Could not extract the requested file from the Zip archive."
+msgstr "Kunne ikkje trekke ut den førespurde fila"
+
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
+msgid "Create"
+msgstr "Opprett"
+
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "Oppret mappe"
 
+#: templates/pgp/pgp.inc:137
 msgid "Create Keys"
 msgstr "Opprett nøklar"
 
+#: templates/search/header.inc:14
+#, fuzzy
+msgid "Create Virtual Folder"
+msgstr "Oppret mappe"
+
+#: templates/fetchmail/account_select.inc:26
+msgid "Create a New Account"
+msgstr ""
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "Opprett ny mappe for søppelkorg"
+
+#: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "Opprett ny mappe for kladd"
 
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "Opprett ny mappe for sendt post"
 
+#: templates/prefs/trashselect.inc:12 templates/prefs/trashselect.inc:24
 msgid "Create a new trash folder"
 msgstr "Opprett ny mappe for søppelkorg"
 
-msgid "Create filtering rules to organize your incoming mail, sort it into folders, and delete spam."
+#: config/prefs.php.dist:128
+msgid ""
+"Create filtering rules to organize your incoming mail, sort it into folders, "
+"and delete spam."
 msgstr "Opprett filterreglar "
 
-msgid "Create"
-msgstr "Opprett"
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "Opprett ny mappe for sendt post"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
 
-msgid "Customize accounts for fetching mail from other POP3/IMAP accounts."
+#: templates/acl/acl.inc:95
+#, php-format
+msgid "Current access to %s"
+msgstr ""
+
+#: config/prefs.php.dist:105
+#, fuzzy
+msgid "Customize accounts for fetching mail from other accounts."
 msgstr "Skreddarsy kontoar for å hente mail frå andre POP3-/IMAP-kontoar."
 
-msgid "Customize how you send mail and where drafts are saved."
+#: config/prefs.php.dist:51
+#, fuzzy
+msgid "Customize how you send mail."
 msgstr "Tilpass korleis du sender post og kvar kladden blir lagra."
 
-#, c-format
-msgid "Customize maintenance operations run upon login to %s."
-msgstr "Tilpass vedlikehaldsoperasjonar som skal køyrast ved pålogging til %s."
-
-#, c-format
+#: config/prefs.php.dist:40
+#, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "Tilpass oppgåver som skal køyrast ved pålogging til %s."
 
+#: templates/mailbox/message_headers.inc:17
+#, fuzzy
+msgid "Dat_e"
+msgstr "Dato"
+
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "Dato"
 
-msgid "December"
-msgstr "Desember"
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
+msgid "Declined"
+msgstr "Sletta"
+
+#: lib/MIME/Viewer/itip.php:263
+msgid "Declined: "
+msgstr ""
+
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Slett"
 
-msgid "Default Identity"
-msgstr "Standardidentitet"
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
 
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "Standard sorteringskriterium:"
 
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "Standard sorteringsrekkefølgje:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
+msgid "Delegated"
+msgstr "Sletta"
+
+#: folders.php:419 templates/fetchmail/manage.inc:68
+#: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
+msgid "Delete"
+msgstr "Slett"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "Delete %s Public Key"
 msgstr "Slett %s offentleg nøkkel"
 
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
 msgid "Delete Current Keys"
 msgstr "Slett noverande nøklar"
 
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "Slette mappe(r)"
 
-msgid "Delete fetched messages from server"
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "Slette mappe(r)"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "Slette mappe(r)"
+
+#: folders.php:419
+#, fuzzy
+msgid "Delete Virtual Folder"
+msgstr "Slette mappe(r)"
+
+#: templates/fetchmail/manage.inc:43
+#, fuzzy
+msgid "Delete fetched messages from remote server?"
 msgstr "Slett meldingar som hentast frå tenaren"
 
-msgid "Delete messages"
-msgstr "Slett meldingar"
+#: lib/MIME/Viewer/itip.php:628
+msgid "Delete from my calendar"
+msgstr ""
 
-msgid "Delete old sent-mail folders at beginning of month"
+#: config/prefs.php.dist:368
+#, fuzzy
+msgid "Delete old linked attachments at beginning of month?"
 msgstr "Slett gamle mapper med sendt post ved starten av månaden"
 
-msgid "Delete"
-msgstr "Slett"
+#: config/prefs.php.dist:350
+#, fuzzy
+msgid "Delete old sent-mail folders at beginning of month?"
+msgstr "Slett gamle mapper med sendt post ved starten av månaden"
 
-msgid "Deleted an attachment."
-msgstr "Slett eit vedlegg."
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Slett meldingar"
+
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
+#: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
+msgid "Deleted"
+msgstr "Sletta"
 
+#: templates/search/main.inc:63
 msgid "Deleted messages"
 msgstr "Sletta meldingar"
 
-msgid "Deleted"
-msgstr "Sletta"
+#: compose.php:307
+#, fuzzy, php-format
+msgid "Deleted the attachment \"%s\"."
+msgstr "Slett eit vedlegg."
 
+#: config/prefs.php.dist:79
 msgid "Deleting and Moving Messages"
 msgstr "Sletting og flytting av meldingar"
 
+#: lib/MIME/Viewer/itip.php:592
+msgid "Deny request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:540
+msgid "Deny request for free/busy information"
+msgstr ""
+
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "Synkande"
 
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
+#, fuzzy
+msgid "Description"
+msgstr "Brukaralternativ"
+
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "Details"
 msgstr "Detaljar"
 
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "Dim signaturar?"
 
-msgid "Display Options"
-msgstr "Visingsalternativ"
+#: templates/contacts/contacts.inc:236
+msgid "Display"
+msgstr "Vis"
 
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "Vis stadfesting etter å ha sendt ei melding?"
 
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "Vis i meldingskropp"
 
-msgid "Display message when filters have been applied."
-msgstr "Vis melding etter at filter har blitt brukt."
-
-msgid "Display pop-up notification of new mail."
+#: config/prefs.php.dist:792
+#, fuzzy
+msgid "Display pop-up notification of new mail?"
 msgstr "Vis sprettopp-varsel om ny post."
 
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
 msgstr "Vis 'Tøm søppelkorg'-kopling i menylinje?"
 
-msgid "Display"
-msgstr "Vis"
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
+msgstr "Vis 'Tøm søppelkorg'-kopling i menylinje?"
 
+#: templates/compose/attachments.inc:11
+#, fuzzy
+msgid "Disposition"
+msgstr "Visingsalternativ"
+
+#: templates/search/fields.inc:26
+msgid "Do NOT match"
+msgstr ""
+
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "Ikkje sjekk mappe(r) for ny e-post"
 
+#: config/prefs.php.dist:952
+msgid "Do not generate a link in the From: column"
+msgstr ""
+
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "Vil du opne den mappa?"
 
-msgid "Do you want to scan the body of text messages for PGP data?"
-msgstr "Vil du søke gjennom meldingskroppen for PGP-data?"
-
-msgid "Do you want your PGP public key to be attached to your messages by default?"
-msgstr "Vil du legge ved din offentlege PGP-nøkkel i meldingane dine som standard?"
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
 
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "Ferdig"
 
-#, c-format
-msgid "Download %s"
-msgstr "Last ned %s"
+#: lib/MIME/Contents.php:192
+#, php-format
+msgid "Download %s in .zip Format"
+msgstr ""
+
+#: templates/message/headers.inc:52
+msgid "Download All Attachments (in .zip file)"
+msgstr ""
 
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "Last ned mappe(r)"
 
-msgid "Download"
-msgstr "Last ned"
+#: templates/folders/actions.inc:21
+#, fuzzy
+msgid "Download Folder(s) [.zip format]"
+msgstr "Last ned mappe(r)"
+
+#: lib/MIME/Contents.php:192
+msgid "Download in .zip Format"
+msgstr ""
 
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
+#: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
+#: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "Kladd"
 
-msgid "Drafts folder:"
+#: folders.php:392
+#, fuzzy
+msgid "Draft folder"
 msgstr "Kladd-mappe:"
 
-msgid "E-Mail"
-msgstr "E-post"
+#: templates/prefs/folderselect.inc:23
+msgid "Drafts folder:"
+msgstr "Kladd-mappe:"
 
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "E-postadresse"
 
-msgid "Edit your IMAP/POP3 accounts."
-msgstr "Endre IMAP-/POP3-kontoar"
+#: lib/Mailbox.php:309
+msgid "END"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:74
+msgid "ERROR: Your message could not be delivered."
+msgstr ""
+
+#: folders.php:420 templates/stationery/prefs.inc:19
+msgid "Edit"
+msgstr "Endre"
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit Blacklist"
+msgstr "Svartelist"
+
+#: templates/filters/prefs.inc:13
+#, fuzzy
+msgid "Edit Filters"
+msgstr "E-postfilter"
+
+#: folders.php:420 templates/search/header.inc:16
+msgid "Edit Virtual Folder"
+msgstr ""
+
+#: templates/mailbox/header.inc:13
+#, php-format
+msgid "Edit Virtual Folder Definition for %s"
+msgstr ""
+
+#: templates/filters/prefs.inc:23
+msgid "Edit Whitelist"
+msgstr ""
+
+#: templates/filters/prefs.inc:18
+#, fuzzy
+msgid "Edit your blacklist"
+msgstr "Endre filterreglane dine"
 
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "Endre filterreglane dine"
 
-msgid "Edit your identities"
-msgstr "Endre identiteten din"
+#: config/prefs.php.dist:861
+msgid "Edit your preferences for accessing other mail accounts."
+msgstr ""
 
-msgid "Edit"
-msgstr "Endre"
+#: templates/filters/prefs.inc:23
+#, fuzzy
+msgid "Edit your whitelist"
+msgstr "Endre filterreglane dine"
 
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "E-postadresse"
 
+#: lib/Message.php:657
+#, fuzzy, php-format
+msgid "Emptied all messages from %s."
+msgstr "Fjerna alle meldingar frå %s."
+
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "Tøm mappe(r)"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "Tøm mappe(r)"
+
+#: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Tøm søppelkorg"
 
-msgid "Empty Trash"
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "Tøm søppelkorg"
+
+#: lib/IMP.php:966
+#, fuzzy
+msgid "Empty _Trash"
 msgstr "Tøm søppelkorg"
 
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr "Slå på PGP-funksjonalitet?"
 
-msgid "Encrypt Message"
-msgstr "Krypter melding"
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
+#, fuzzy
+msgid "Enable S/MIME functionality?"
+msgstr "Slå på PGP-funksjonalitet?"
+
+#: config/prefs.php.dist:811
+msgid "Enable message previews?"
+msgstr ""
+
+#: templates/compose/compose.inc:442
+msgid "Encr_yption Options"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+msgid "End"
+msgstr ""
 
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Slutt vidaresendt melding"
 
+#: lib/Compose.php:341
+#, fuzzy
+msgid "End message"
+msgstr "Gamle meldingar"
+
+#: lib/Compose.php:339
+#, fuzzy, php-format
+msgid "End message from %s"
+msgstr "Vidaresende meldingar frå %s"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr "Skriv inn passordfrase"
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "Skriv inn namnet på di nye søppelkorg"
+
+#: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "Skriv inn namnet på di nye kladd-mappe"
 
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "Skriv inn namet på di nye mappe for sendt post"
 
+#: templates/prefs/trashselect.inc:9
 msgid "Enter the name for your new trash folder"
 msgstr "Skriv inn namnet på di nye søppelkorg"
 
-#, c-format
-msgid "Entry \"%s\" was successfully added to the addressbook"
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "Krypter melding"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, fuzzy, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "Oppføringa \"%s\" vart lagt til adresseboka"
 
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "Feil"
 
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
+#, php-format
+msgid "Error sending reply: %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
+msgid "Event successfully deleted."
+msgstr "Innstillingar vart oppdaterte."
+
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "Kvart 15. minutt"
 
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "Kvart 30. sekund"
 
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "Kvart 5. minutt"
 
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "Kvar halve time"
 
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "Kvart minutt"
 
-msgid "Expand All Folders"
-msgstr "Vis alle mapper"
+#: folders.php:457
+#, fuzzy
+msgid "Expand"
+msgstr "Vis alle"
 
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "Vis alle"
 
+#: templates/folders/actions.inc:38
+msgid "Expand All Folders"
+msgstr "Vis alle mapper"
+
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "Vis mappe"
 
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "Kontroller namn"
 
-msgid "Expand the entire folder tree by default in the folders view."
+#: config/prefs.php.dist:1063
+msgid "Expand names in the compose window automatically in the background?"
+msgstr ""
+
+#: config/prefs.php.dist:980
+#, fuzzy
+msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "Utvid heile mappestrukturen i mappevising som standard."
 
-msgid "Expiration Date"
-msgstr "Utløpsdato"
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
+#, fuzzy
+msgid "Expanding"
+msgstr "Vis alle"
 
-msgid "Expunge error!"
-msgstr "Feil ved tømming!"
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "Hent e-post"
 
-msgid "February"
-msgstr "Februar"
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
+msgid "Fetch Mail"
+msgstr "Hent e-post"
 
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "Hent post i eige vindauge?"
 
-msgid "Fetch Mail"
-msgstr "Hent e-post"
+#: templates/fetchmail/manage.inc:46
+#, fuzzy
+msgid "Fetch messages upon logging on?"
+msgstr "Bruk filterreglar ved pålogging."
 
-msgid "Fetch"
-msgstr "Hent"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "Fjerna alle meldingar frå %s."
 
-msgid "Fetching... Please wait..."
-msgstr "Hentar... Ver venleg og vent..."
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
+msgstr "Vidaresende meldingar frå %s"
 
-msgid "Field"
-msgstr "Felt"
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#, fuzzy
+msgid "Fetchmail: "
+msgstr "Hent e-post"
 
-msgid "Filename"
-msgstr "Filnamn"
+#: lib/Fetchmail.php:291
+#, fuzzy
+msgid "Fetchmail: no new messages."
+msgstr "Du har %s nye meldingar."
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Filteraktivitet: Meldinga \"%s\" frå \"%s\" var sletta."
+#: lib/IMP.php:990
+#, fuzzy
+msgid "Fi_lters"
+msgstr "Filter"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been moved to the folder \"%s\"."
-msgstr "Filteraktivitet: Meldinga \"%s\" frå \"%s\" vart flytta til mappa \"%s\"."
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
+#, fuzzy
+msgid "File"
+msgstr "Filter"
 
-#, c-format
-msgid "Filter Activity: The message \"%s\" from \"%s\" has been moved to your Trash folder."
-msgstr "Filteraktivitet: Meldinga \"%s\" frå \"%s\" vart flytta til søppelkorga di."
+#: templates/filters/prefs.inc:31
+#, fuzzy
+msgid "Filter Options"
+msgstr "Andre alternativ"
 
-msgid "Filter Rules"
+#: templates/filters/prefs.inc:9
+#, fuzzy
+msgid "Filter Settings"
 msgstr "Filterreglar"
 
-msgid "Filter message content for profanity."
+#: config/prefs.php.dist:600
+#, fuzzy
+msgid "Filter message content for profanity?"
 msgstr "Filtrer meldingsinnhald for ukvemsord."
 
+#: templates/filters/notactive.inc:11
+#, fuzzy
+msgid "Filter support is disabled on this system."
+msgstr "PGP-støtte er slått av på dette systemet."
+
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "Filter"
 
+#: templates/filters/notactive.inc:3
+#, fuzzy
+msgid "Filters NOT Active"
+msgstr "PGP IKKJE aktiv"
+
+#: lib/Filter.php:105
+#, php-format
+msgid "Filters: %s management page"
+msgstr ""
+
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Finn"
 
+#: config/prefs.php.dist:905
+#, fuzzy
+msgid "First Mailbox Page"
+msgstr "Første side"
+
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Første side"
 
+#: templates/message/navbar_actions.inc:15 templates/mailbox/actions.inc:21
+#, fuzzy
+msgid "Fo_rward"
+msgstr "Vidaresend"
+
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
+#: templates/prefs/initialpageselect.inc:6
+#: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "Mappenavigering"
 
-msgid "Folder Prefix"
-msgstr "Mappeprefiks"
+#: lib/Block/summary.php:3
+#, fuzzy
+msgid "Folder Summary"
+msgstr "Februar"
 
-msgid "Folders"
-msgstr "Mapper"
+#: acl.php:24
+msgid "Folder sharing is not enabled."
+msgstr ""
+
+#: folders.php:62
+msgid "Folder use is not enabled."
+msgstr ""
+
+#: config/prefs.php.dist:969
+msgid "Format of message dates in the mailbox view for messages dated today"
+msgstr ""
 
+#: compose.php:780 templates/message/navbar_actions.inc:15
+#: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Vidaresend"
 
+#: compose.php:765
 msgid "Forward:"
 msgstr "Vidaresend:"
 
-#, c-format
+#: lib/Compose.php:369
+msgid "Forwarded message"
+msgstr "Vidaresendt melding"
+
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "Vidaresende meldingar frå %s"
 
-msgid "Forwarded message"
-msgstr "Vidaresendt melding"
+#: lib/MIME/Viewer/itip.php:483
+#, fuzzy
+msgid "Free/Busy Information"
+msgstr "Tenarinformasjon"
 
-msgid "From Address"
-msgstr "Frå-adresse"
+#: lib/MIME/Viewer/itip.php:494
+msgid "Free/Busy Reply"
+msgstr ""
 
+#: lib/MIME/Viewer/itip.php:488
+msgid "Free/Busy Request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:401
+msgid "Free/Busy Request Response"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:27
+#, fuzzy
+msgid "Fro_m"
+msgstr "Frå"
+
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "Frå"
 
-msgid "From:"
-msgstr "Frå:"
+#: config/prefs.php.dist:918
+msgid "From Address"
+msgstr "Frå-adresse"
 
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "VS:"
 
-msgid "Get only new messages (IMAP only)"
+#: compose.php:1294
+#, fuzzy
+msgid "Fwd: "
+msgstr "VS:"
+
+#: compose.php:1296
+#, fuzzy, php-format
+msgid "Fwd: %u Forwarded Messages"
+msgstr "Vidaresendt melding"
+
+#: config/prefs.php.dist:13 config/prefs.php.dist:22 config/prefs.php.dist:30
+#: config/prefs.php.dist:38
+#, fuzzy
+msgid "General Options"
+msgstr "Brukaralternativ"
+
+#: templates/fetchmail/manage.inc:37
+#, fuzzy
+msgid "Get only new messages? (IMAP only)"
 msgstr "Hent berre nye meldingar (berre for IMAP)"
 
-msgid "Green"
-msgstr "Grøn"
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
+#, fuzzy
+msgid "Go to Message"
+msgstr "Neste melding"
+
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "Legg til adressebok (%s)"
+
+#: templates/acl/acl.inc:135
+msgid "Grant access"
+msgstr ""
+
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
+msgid "HERE"
+msgstr ""
 
-msgid "Grey"
-msgstr "Grå"
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
+msgid "HTML"
+msgstr ""
 
-msgid "Hash-Algorithm"
-msgstr "Hash-algoritme"
+#: compose.php:256
+msgid "HTML Version of Message"
+msgstr ""
 
+#: templates/message/headers.inc:58
 msgid "Headers"
 msgstr "Meldingshovud"
 
-msgid "Help"
-msgstr "Hjelp"
+#: templates/compose/recompose.inc:5
+msgid "Here is the message you were composing:"
+msgstr ""
+
+#: config/prefs.php.dist:668
+msgid "Hidden"
+msgstr ""
+
+#: config/prefs.php.dist:667
+#, fuzzy
+msgid "Hidden in Thread View"
+msgstr "Trådvising"
 
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Skjul sletta"
 
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "Skjul u/abonnement"
 
-msgid "High Priority"
-msgstr "Høg prioritet"
-
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr "Høg"
 
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+msgid "High Priority"
+msgstr "Høg prioritet"
+
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr "Høgast"
 
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Korleis vil du vise vedlegg?"
 
-msgid "How to prefix quoted lines in a reply:"
+#: config/prefs.php.dist:504
+#, fuzzy
+msgid "How to attribute quoted lines in a reply"
 msgstr "Prefiks på siterte linjer i eit svar:"
 
-msgid "IMAP over SSL (self-signed)"
-msgstr "IMAP over SSL (sjølv-signert)"
+#: lib/Fetchmail/imap.php:134
+msgid "IMAP"
+msgstr "IMAP"
 
+#: lib/Fetchmail/imap.php:129
+msgid "IMAP (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr "IMAP over SSL"
 
-msgid "IMAP"
-msgstr "IMAP"
+#: lib/Fetchmail/imap.php:152
+#, fuzzy
+msgid "IMAP over SSL (self-signed certificate)"
+msgstr "IMAP over SSL (sjølv-signert)"
 
-msgid "IMAP, no TLS"
-msgstr "IMAP, ikkje TLS"
+#: templates/login/login.inc:167
+msgid "IMAP over SSL (self-signed)"
+msgstr "IMAP over SSL (sjølv-signert)"
 
-msgid "IMAP/POP3 Accounts"
-msgstr "IMAP-/POP3-kontoar"
+#: lib/IMAP/Client.php:368
+msgid "IMAP server closed the connection."
+msgstr ""
 
-msgid "IMP PGP Administration"
-msgstr "IMP Administering av PGP"
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
+msgid "IMAP, no TLS"
+msgstr "IMAP, ikkje TLS"
 
-msgid "IMP is not properly configured"
-msgstr "IMP er ikkje ordentleg konfigurert"
+#: lib/Fetchmail/imap.php:49
+msgid "IMAP/POP3 Mail Servers"
+msgstr ""
 
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "Innboks"
 
-msgid "Identities"
-msgstr "Identitetar"
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
 
-msgid "Identity"
-msgstr "Identitet"
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "Alle meldingar i mappe(r) vil bli tapt!"
 
-msgid "Identity's name:"
-msgstr "Namn på identitet:"
+#: templates/compose/spelling.inc:82
+msgid "Ignore"
+msgstr "Ignorer"
 
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "Ignorer alle"
 
-msgid "Ignore"
-msgstr "Ignorer"
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
+#: templates/folders/import.inc:20
+#, fuzzy
+msgid "Import"
+msgstr "Viktig"
 
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 msgid "Import Key"
 msgstr "Importer nøkkel"
 
+#: templates/pgp/pgp.inc:139
 msgid "Import Keypair"
 msgstr "Importer nøkkelpar"
 
+#: templates/folders/actions.inc:27
+#, fuzzy
+msgid "Import Messages"
+msgstr "Viktige meldingar"
+
+#: pgp.php:42
 msgid "Import PGP Key"
 msgstr "Importer PGP-nøkkel"
 
+#: templates/smime/smime.inc:91
+#, fuzzy
+msgid "Import Personal Certificate"
+msgstr "Importer personleg privat PGP-nøkkel"
+
+#: templates/pgp/import_key.inc:14
 msgid "Import Personal Private PGP Key"
 msgstr "Importer personleg privat PGP-nøkkel"
 
+#: templates/pgp/import_key.inc:9
 msgid "Import Personal Public PGP Key"
 msgstr "Importer personleg offentleg PGP-nøkkel"
 
+#: templates/smime/import_key.inc:4
+#, fuzzy
+msgid "Import Personal S/MIME Certificates"
+msgstr "Importer personleg privat PGP-nøkkel"
+
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
 msgid "Import Public Key"
 msgstr "Importer offentleg nøkkel"
 
+#: templates/pgp/import_key.inc:4
 msgid "Import Public PGP Key"
 msgstr "Importer offentleg PGP-nøkkel"
 
-msgid "Important messages"
-msgstr "Viktige meldingar"
+#: templates/smime/import_key.inc:8
+#, fuzzy
+msgid "Import Public S/MIME Key"
+msgstr "Importer offentleg nøkkel"
+
+#: smime.php:16
+#, fuzzy
+msgid "Import S/MIME Key"
+msgstr "Importer nøkkel"
+
+#: templates/folders/import.inc:9
+#, fuzzy
+msgid "Import mbox File"
+msgstr "Importer nøkkel"
+
+#: templates/folders/import.inc:16
+#, php-format
+msgid "Import mbox file %s into folder %s."
+msgstr ""
 
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
+#: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
+#: templates/mailbox/legend.inc:7
 msgid "Important"
 msgstr "Viktig"
 
+#: templates/search/main.inc:47
+msgid "Important messages"
+msgstr "Viktige meldingar"
+
+#: folders.php:167
+#, fuzzy, php-format
+msgid "Imported %d messages from %s."
+msgstr "Fjerna alle meldingar frå %s."
+
+#: lib/MIME/Viewer/itip.php:773
+msgid "In Process"
+msgstr ""
+
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
+msgid "Inbox"
+msgstr ""
+
+#: config/prefs.php.dist:492
+#, fuzzy
+msgid "Include a brief summary of the header in a reply?"
+msgstr "Inkludere original melding i svar?"
+
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "Inkludere original melding i svar?"
 
-#, c-format
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
+#, fuzzy
+msgid "Info"
+msgstr "Ignorer"
+
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
 msgid "Information on %s Public Key"
 msgstr "Informasjon om %s offentleg nøkkel"
 
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr "Informasjon om personleg privat nøkkel"
 
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr "Informasjon om personleg offentleg nøkkel"
 
-msgid "Insert Key Here"
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
+#, fuzzy
+msgid "Inline"
+msgstr "ingen"
+
+#: templates/smime/import_key.inc:9
+#, fuzzy
+msgid "Insert Certificate Here"
 msgstr "Set inn nøkkel her"
 
-msgid "Invalid PGP Key."
-msgstr "Ugyldig PGP-nøkkel."
+#: templates/pgp/import_key.inc:15
+#, fuzzy
+msgid "Insert Personal Private PGP Key Here"
+msgstr "Importer personleg privat PGP-nøkkel"
+
+#: templates/pgp/import_key.inc:10
+#, fuzzy
+msgid "Insert Personal Public PGP Key Here"
+msgstr "Importer personleg offentleg PGP-nøkkel"
+
+#: templates/pgp/import_key.inc:5
+#, fuzzy
+msgid "Insert Public PGP Key Here"
+msgstr "Importer offentleg PGP-nøkkel"
+
+#: lib/MIME/Viewer/itip.php:412
+msgid "Invalid Action selected for this component."
+msgstr ""
+
+#: mailbox.php:584 mailbox.php:626
+#, fuzzy
+msgid "Invalid Address"
+msgstr "E-postadresse"
 
+#: lib/Fetchmail/imap.php:307
 msgid "Invalid Remote Mailbox"
 msgstr "Ugyldig ekstern postkasse"
 
-msgid "Invalid Username/Password"
-msgstr "Ugyldig brukarnamn/passord"
+#: compose.php:158
+#, php-format
+msgid "Invalid character in e-mail address: %s."
+msgstr ""
 
+#: smime.php:82 pgp.php:16
 msgid "Invalid key"
 msgstr "Ugyldig PGP-nøkkel."
 
+#: pgp.php:196
 msgid "Invalid personal PGP private key."
 msgstr "Ugydlig personleg prvat PGP-nøkkel."
 
+#: pgp.php:171
 msgid "Invalid personal PGP public key."
 msgstr "Ugyldig personleg offentleg PGP-nøkkel."
 
-msgid "January"
-msgstr "Januar"
+#: templates/mailbox/navbar.inc:12
+msgid "Invert"
+msgstr ""
 
-msgid "July"
-msgstr "Juli"
+#: templates/compose/compose.inc:577
+msgid "KB"
+msgstr ""
 
-msgid "June"
-msgstr "Juni"
+#: templates/pgp/pgp.inc:113
+msgid "Key Length"
+msgstr "Nøkkellengde"
 
-msgid "Key Creation"
-msgstr "Nøkkeloppretting"
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
 
-msgid "Key Fingerprint"
-msgstr "Fingeravtrykk for nøkkel"
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
 
-msgid "Key Length"
-msgstr "Nøkkellengde"
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
 
-msgid "Key Type"
-msgstr "Nøkkeltype"
+#: pgp.php:318
+msgid "Key successfully sent to the public keyserver."
+msgstr ""
 
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "Språk"
 
-msgid "Last Page"
+#: config/prefs.php.dist:906
+#, fuzzy
+msgid "Last Mailbox Page"
 msgstr "Siste side"
 
-#, c-format
-msgid "Last login: %s"
-msgstr "Siste innlogging: %s"
-
-msgid "Last login: Never"
-msgstr "Siste innlogging: Aldri"
-
-msgid "Light Blue"
-msgstr "Lys blå"
-
-msgid "List-Archive"
-msgstr "Liste-Arkiv"
-
-msgid "List-Help"
-msgstr "Liste-Hjelp"
+#: mailbox.php:358
+msgid "Last Page"
+msgstr "Siste side"
 
-msgid "List-Owner"
-msgstr "Liste-Eigar"
+#: templates/compose/compose.inc:389
+#, fuzzy
+msgid "Li_nk Attachments"
+msgstr "Vedlegg"
 
-msgid "List-Post"
-msgstr "Liste-Post"
+#: attachment.php:34 lib/Compose.php:1063
+#, fuzzy
+msgid "Linked attachments are forbidden."
+msgstr "Fann ingen vedlegg"
 
-msgid "List-Subscribe"
-msgstr "Liste-Abonner"
+#: lib/Compose.php:1080
+#, php-format
+msgid "Links will expire on %s"
+msgstr ""
 
-msgid "List-Unsubscribe"
-msgstr "Liste-Sei-opp-abonnement"
+#: config/prefs.php.dist:1082
+msgid ""
+"List all contacts when loading the contacts screen? (if disabled, you will "
+"only see contacts that you search for explicitly)"
+msgstr ""
 
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "Listing i meldingshovud"
 
+#: templates/fetchmail/manage.inc:30
 msgid "Local Mailbox:"
 msgstr "Lokal postkasse:"
 
-#, c-format
+#: lib/MIME/Viewer/itip.php:674
+#, fuzzy
+msgid "Location"
+msgstr "Handling"
+
+#: templates/login/login.inc:225
+msgid "Log in"
+msgstr "Logg inn"
+
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "Logg inn til %s"
 
-msgid "Log in"
+#: templates/login/login.inc:137
+#, fuzzy
+msgid "Login"
 msgstr "Logg inn"
 
+#: config/prefs.php.dist:39
 msgid "Login Tasks"
 msgstr "Oppgåver ved innlogging"
 
-msgid "Login failed for some reason. Most likely your username or password was entered incorrectly."
-msgstr "Kunne av ein eller annan grunn ikkje logge inn. Sannsynlegvis er brukarnamn eller passord tasta inn feil."
-
-msgid "Logout"
-msgstr "Logg ut"
+#: templates/compose/compose.inc:296
+msgid "Low"
+msgstr "Lav"
 
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
 msgid "Low Priority"
 msgstr "Lav prioritet"
 
-msgid "Low"
-msgstr "Lav"
-
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr "Lavast"
 
-msgid "Mail Filters"
+#: lib/MIME/Viewer/appledouble.php:44
+#, fuzzy
+msgid "Macintosh File"
+msgstr "E-postfilter"
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy
+msgid "Mail"
+msgstr "E-post"
+
+#: config/prefs.php.dist:96
+#, fuzzy
+msgid "Mail Previews"
 msgstr "E-postfilter"
 
-msgid "Mail Management"
-msgstr "E-posthandtering"
+#: templates/fetchmail/driver_select.inc:16
+msgid "Mail server type to connect to:"
+msgstr ""
 
+#: folders.php:402
 msgid "Mailbox"
 msgstr "Postkasse"
 
-msgid "Maintenance Operations"
-msgstr "Vedlikehaldsoperasjonar"
+#: config/prefs.php.dist:111
+#, fuzzy
+msgid "Mailbox and Folder Display Options"
+msgstr "Visingsalternativ"
 
-msgid "Maintenance class did not load successfully."
-msgstr "Klassa Maintenance:: vart ikkje lasta inn"
+#: templates/folders/actions.inc:18
+msgid "Mark All Messages in Folder as Seen"
+msgstr ""
 
-msgid "March"
-msgstr "Mars"
+#: templates/folders/actions.inc:19
+msgid "Mark All Messages in Folder as Unseen"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:5 templates/mailbox/navbar.inc:30
 msgid "Mark as:"
 msgstr "Marker som:"
 
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "Merk ulike nivå av sitering med ulike fargar?"
 
-msgid "May"
-msgstr "Mai"
+#: templates/fetchmail/manage.inc:40
+#, fuzzy
+msgid "Mark messages as seen? (IMAP only)"
+msgstr "Hent berre nye meldingar (berre for IMAP)"
+
+#: config/prefs.php.dist:658
+msgid "Mark simple markup?"
+msgstr ""
+
+#: templates/search/header.inc:46
+msgid "Match All Queries"
+msgstr ""
+
+#: templates/search/header.inc:42
+msgid "Match Any Query"
+msgstr ""
+
+#: templates/compose/compose.inc:513
+#, fuzzy
+msgid "Maximum Attachment Size"
+msgstr "Vedlegg"
+
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
+msgstr ""
+
+#: templates/compose/compose.inc:494
+msgid "Maximum number of attachments reached."
+msgstr ""
+
+#: templates/compose/compose.inc:489
+msgid "Maximum total attachment size reached."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:626
+msgid "Meeting Cancellation"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
+msgid "Meeting Information"
+msgstr "Tenarinformasjon"
+
+#: lib/MIME/Viewer/itip.php:585
+msgid "Meeting Proposal"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:617
+msgid "Meeting Reply"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:598
+msgid "Meeting Update"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:603
+msgid "Meeting Update Request"
+msgstr ""
+
+#: lib/Block/tree_folders.php:3
+#, fuzzy
+msgid "Menu Folder List"
+msgstr "Opne mappe"
+
+#: lib/Compose.php:331
+#, fuzzy
+msgid "Message"
+msgstr "meldingar til"
 
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "Skriv melding"
 
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "Meldingsdato"
 
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
+#, fuzzy
+msgid "Message Options"
+msgstr "meldingar til"
+
+#: search.php:312
 msgid "Message Search"
 msgstr "Meldingssøk"
 
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "Meldingsstorleik"
 
+#: message.php:384
 msgid "Message Source"
 msgstr "Meldingskjelde"
 
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "Meldingsvising"
 
-msgid "Message bounced successfully."
-msgstr "Melding omdirigert."
-
-msgid "Message fields"
-msgstr "Meldingsfelt"
-
+#: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "Meldingsflagg"
 
+#: templates/search/main.inc:83
 msgid "Message folders"
 msgstr "Meldingsmapper"
 
-msgid "Message sent successfully, but not saved to"
+#: lib/Compose.php:329
+#, fuzzy, php-format
+msgid "Message from %s"
+msgstr "Meldingsmapper"
+
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "Slett eit vedlegg."
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "Meldingsfelt"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "Meldingsfelt"
+
+#: templates/search/header.inc:33
+#, fuzzy
+msgid "Message matches"
+msgstr "Meldingsdato"
+
+#: compose.php:824 compose.php:838
+#, fuzzy
+msgid "Message redirected successfully."
+msgstr "Melding sendt."
+
+#: compose.php:1084
+#, fuzzy, php-format
+msgid "Message sent successfully, but not saved to %s"
 msgstr "Meldinga vart sendt, men ikkje lagra til"
 
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "Melding sendt."
 
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "Meldingar per side i postboksvising."
 
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "meldingar til"
 
-msgid "Mime Type"
-msgstr "Mime-typar"
-
+#: templates/acl/acl.inc:29
 msgid "Modify"
 msgstr "Modifisere"
 
-msgid "Move Down"
-msgstr "Flytt ned"
-
-msgid "Move Up"
-msgstr "Flytt opp"
-
-#, c-format
-msgid "Move messages to the <b>%s</b> folder"
-msgstr "Flytt meldingar til <b>%s</b>-mappa"
+#: templates/compose/expand.inc:12
+#, php-format
+msgid "More than one address found for field \"%s\"."
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move"
 msgstr "Flytt"
 
-msgid "Name and/or email can not be empty"
-msgstr "Namn og/eller e-postadresse kan ikkje vere tom"
+#: templates/prefs/sourceselect.inc:316
+#, fuzzy
+msgid "Move down"
+msgstr "flytt ned"
+
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
+#, fuzzy
+msgid "Move to folder"
+msgstr "Vel mappe"
+
+#: templates/prefs/sourceselect.inc:314
+#, fuzzy
+msgid "Move up"
+msgstr "flytt opp"
+
+#: lib/MIME/Viewer/alternative.php:127
+msgid "Multipart/alternative"
+msgstr ""
+
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "Meldingsvising"
+
+#: templates/prefs/defaultsearchselect.inc:5
+msgid "NONE"
+msgstr ""
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
+msgid "NOTE"
+msgstr ""
 
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "Namn"
 
+#: pgp.php:110
+msgid "Name and/or email can not be empty"
+msgstr "Namn og/eller e-postadresse kan ikkje vere tom"
+
+#: lib/MIME/Viewer/itip.php:778
+#, fuzzy
+msgid "Needs Action"
+msgstr "Handling"
+
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "Aldri"
 
+#: config/prefs.php.dist:560
+#, fuzzy
+msgid "Never save attachments"
+msgstr "Slett eit vedlegg."
+
+#: templates/acl/acl.inc:124
+msgid "New"
+msgstr "Ny"
+
+#: lib/IMP.php:563
+#, fuzzy
+msgid "New Folder"
+msgstr "Opne mappe"
+
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "Ny e-post"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "Neste melding"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "Nye meldingar"
+
+#: templates/search/main.inc:19
 msgid "New messages"
 msgstr "Nye meldingar"
 
-msgid "New"
-msgstr "Ny"
+#: templates/compose/spelling.inc:133
+msgid "Next"
+msgstr "Neste"
 
+#: templates/message/navbar_navigate.inc:33
 msgid "Next Message"
 msgstr "Neste melding"
 
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "Neste side"
 
-msgid "Next"
-msgstr "Neste"
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
+msgid "No"
+msgstr "Nei"
+
+#: smime.php:226
+msgid "No Certificate found"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:5
+msgid "No Encryption"
+msgstr ""
 
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr "Ingen nøklar i nøkkelknippe"
 
+#: mailbox.php:375
+#, fuzzy, php-format
+msgid "No Messages"
+msgstr "Nye meldingar"
+
+#: pgp.php:137
 msgid "No PGP public key imported."
 msgstr "Ingen offentleg PGP-nøkkel importert."
 
-msgid "No Subject"
-msgstr "Tomt emne"
+#: templates/smime/smime.inc:84
+#, fuzzy
+msgid "No Personal Certificate Present"
+msgstr "Importer personleg privat PGP-nøkkel"
+
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "Korrigert tekst"
+
+#: templates/smime/smime.inc:15
+#, fuzzy
+msgid "No Public Keys Found"
+msgstr "Din offentlege nøkkel"
+
+#: smime.php:151
+#, fuzzy
+msgid "No S/MIME public key imported."
+msgstr "Ingen offentleg PGP-nøkkel importert."
 
+#: lib/MIME/Viewer/tnef.php:90
 msgid "No attachments found."
 msgstr "Fann ingen vedlegg"
 
+#: lib/Crypt/SMIME.php:140
+#, fuzzy
+msgid "No email information located in the public key."
+msgstr "Informasjon om %s offentleg nøkkel"
+
+#: acl.php:72 acl.php:98
+#, fuzzy
+msgid "No folder selected."
+msgstr "inga mappe velt"
+
+#: lib/Block/summary.php:141
+msgid "No folders are being checked for new mail."
+msgstr ""
+
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "Ingen mappe(r) vart spesifisert"
 
+#: lib/Block/summary.php:147
+#, fuzzy
+msgid "No folders with new messages"
+msgstr "Ikkje sletta meldingar"
+
+#: lib/Block/summary.php:144
+#, fuzzy
+msgid "No folders with unseen messages"
+msgstr "Ikkje sletta meldingar"
+
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "Inga tekst i meldingskropp"
 
-msgid "No messages matched your search"
+#: lib/Mailbox.php:371
+#, fuzzy
+msgid "No messages matched your search."
 msgstr "Ingen meldingar samsvara med søket ditt"
 
-msgid "No messages to fetch..."
-msgstr "Ingen meldingar å hente..."
-
+#: pgp.php:189
 msgid "No personal PGP private key imported."
 msgstr "Ingen personleg privat PGP-nøkkel importert."
 
+#: pgp.php:165
 msgid "No personal PGP public key imported."
 msgstr "Ingen personleg offentleg PGP-nøkkel importert."
 
+#: smime.php:201
+#, fuzzy
+msgid "No personal S/MIME certificates imported."
+msgstr "Ingen personleg privat PGP-nøkkel importert."
+
+#: spelling.php:220
+msgid "No spellchecking program configured."
+msgstr ""
+
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Ingen stavefeil"
 
+#: templates/compose/spelling.inc:100
 msgid "No suggestions"
 msgstr "Ingen forslag"
 
-msgid "No"
-msgstr "Nei"
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
+#: acl.php:68 acl.php:94
+#, fuzzy
+msgid "No user specified."
+msgstr "Ingen mappe(r) vart spesifisert"
+
+#: lib/MIME/Viewer/itip.php:709
+msgid "Non Participant"
+msgstr ""
 
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "Ingen"
 
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr "Normal"
 
+#: templates/mailbox/navbar.inc:21 templates/mailbox/navbar.inc:39
 msgid "Not Deleted"
 msgstr "Ikkje sletta"
 
+#: templates/message/navbar_navigate.inc:12 templates/mailbox/navbar.inc:23
+#: templates/mailbox/navbar.inc:42
 msgid "Not Draft"
 msgstr "Ikkje kladd"
 
+#: templates/message/navbar_navigate.inc:8 templates/mailbox/navbar.inc:17
+#: templates/mailbox/navbar.inc:34
 msgid "Not Important"
 msgstr "Ikkje viktig"
 
+#: templates/mailbox/navbar.inc:25
 msgid "Not Personal"
 msgstr "Ikkje personleg"
 
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr "Ikkje ein gyldig offentleg nøkkel."
 
+#: templates/search/main.inc:67
 msgid "Not deleted messages"
 msgstr "Ikkje sletta meldingar"
 
+#: templates/search/main.inc:51
 msgid "Not important messages"
 msgstr "Ikkje viktige meldingar"
 
-msgid "November"
-msgstr "November"
+#: lib/Maintenance/Task/fetchmail_login.php:71
+msgid "Note that this can take some time"
+msgstr ""
+
+#: config/prefs.php.dist:616
+#, fuzzy
+msgid "Nothing"
+msgstr "Siterer"
+
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr ""
+"Talet på gamle mapper med sendt post å ta vare på ved månadleg sletting"
 
-msgid "Number of old sent-mail folders to keep if deleting monthly"
-msgstr "Talet på gamle mapper med sendt post å ta vare på ved månadleg sletting"
+#: config/prefs.php.dist:359
+#, fuzzy
+msgid "Number of old sent-mail folders to keep if deleting monthly."
+msgstr ""
+"Talet på gamle mapper med sendt post å ta vare på ved månadleg sletting"
 
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr "OK"
 
-msgid "October"
-msgstr "Oktober"
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
+#: templates/pgp/import_key.inc:48
+msgid "OR"
+msgstr ""
 
+#: templates/search/main.inc:15
 msgid "Old messages"
 msgstr "Gamle meldingar"
 
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "Gamle mapper med sendt post blir sletta."
 
-msgid "Open Folder"
+#: lib/Block/summary.php:25
+msgid "Only display folders with unread messages in them?"
+msgstr ""
+
+#: templates/javascript/folders.js:79
+#, fuzzy
+msgid "Only one folder should be selected for this action."
+msgstr "Vel kun ei mappe for denne operasjonen."
+
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "Opne mappe"
 
-msgid "Options"
-msgstr "Alternativ"
+#: folders.php:427
+#, fuzzy
+msgid "Opened Folder"
+msgstr "Opne mappe"
 
-msgid "Orange"
-msgstr "Oransje"
+#: lib/MIME/Viewer/itip.php:705
+msgid "Optional Participant"
+msgstr ""
 
-msgid "Other Accounts"
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
+#: templates/fetchmail/fetchmail.inc:6
+#, fuzzy
+msgid "Other Mail Accounts"
 msgstr "Andre kontoar"
 
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "Andre alternativ"
 
-msgid "PGP Digital Signature"
-msgstr "PGP digital signatur"
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
+msgid "PGP"
+msgstr "PGP"
 
-msgid "PGP Encrypted Data"
-msgstr "PGP-kryptert data"
+#: templates/compose/encrypt_list.inc:7
+#, fuzzy
+msgid "PGP Encrypt Message"
+msgstr "PGP-signer/-krypter melding"
 
-#, c-format
-msgid "PGP Error: %s"
+#: compose.php:358
+#, fuzzy
+msgid "PGP Error: "
 msgstr "PGP-feil: %s"
 
-msgid "PGP Error: For message encryption, there can only be one recipient."
-msgstr "PGP-feil: For meldingskryptering kan det berre vere ein mottakar."
-
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr "PGP-feil: Treng passordfrase for personleg privat nøkkel."
 
-msgid "PGP NOT Active"
-msgstr "PGP IKKJE aktiv"
-
+#: config/prefs.php.dist:142
 msgid "PGP Options"
 msgstr "PGP Alternativ"
 
+#: pgp.php:30
 msgid "PGP Passphrase Input"
 msgstr "PGP inntasting av passordfrase"
 
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr "Støtte for personleg PGP-nøkkelpar krev ei sikker web-kopling."
 
-#, c-format
+#: lib/MIME/Viewer/pgp.php:173
+#, fuzzy
+msgid "PGP Public Key Text"
+msgstr "Offentleg PGP-nøkkel"
+
+#: pgp.php:149
+#, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
 msgstr "Offentleg PGP-nøkkel for \"%s (%s)\" vart lagt til."
 
-#, c-format
+#: pgp.php:245
+#, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
 msgstr "Offentleg PGP-nøkkel for \"%s\" vart sletta."
 
-msgid "PGP Public Key"
-msgstr "Offentleg PGP-nøkkel"
-
+#: templates/pgp/pgp.inc:14
 msgid "PGP Public Keyring"
 msgstr "Offentleg PGP-nøkkelring"
 
-msgid "PGP Public/Private Keypair successfully added."
-msgstr "Offentleg/private PGP-nøkkelpar vart lagt til."
-
+#: templates/compose/encrypt_list.inc:8
 msgid "PGP Sign Message"
 msgstr "PGP Signer melding"
 
+#: templates/compose/encrypt_list.inc:9
 msgid "PGP Sign/Encrypt Message"
 msgstr "PGP-signer/-krypter melding"
 
-msgid "PGP Signed/Encrypted Data"
-msgstr "PGP-signert/-kryptert data"
+#: pgp.php:202
+#, fuzzy
+msgid "PGP private key successfully added."
+msgstr "Offentleg/private PGP-nøkkelpar vart lagt til."
+
+#: pgp.php:177
+#, fuzzy
+msgid "PGP public key successfully added."
+msgstr "Offentleg/private PGP-nøkkelpar vart lagt til."
 
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr "PGP-støtte er slått av på dette systemet."
 
-msgid "PGP support is not currently active so the digital signature is unable to be verified."
-msgstr "PGP-støtte er for tida ikkje aktiv, så den digitale signaturen kan ikkje verifiserast."
-
-msgid "PGP support is not currently active so the message is unable to be decrypted."
-msgstr "PGP-støtte er for tida ikkje aktiv, så meldinga kan ikkje dekrypterast."
+#: lib/MIME/Viewer/pgp.php:208
+msgid ""
+"PGP support is not currently active so the digital signature is unable to be "
+"verified."
+msgstr ""
+"PGP-støtte er for tida ikkje aktiv, så den digitale signaturen kan ikkje "
+"verifiserast."
 
-msgid "PGP"
-msgstr "PGP"
+#: lib/MIME/Viewer/pgp.php:295
+msgid ""
+"PGP support is not currently active so the message is unable to be decrypted."
+msgstr ""
+"PGP-støtte er for tida ikkje aktiv, så meldinga kan ikkje dekrypterast."
 
-msgid "POP3 over SSL (self-signed)"
-msgstr "POP3 over SSL (sjølv-signert)"
+#: templates/pgp/pgp.inc:2
+msgid ""
+"PGP support requires popup windows to be used.  If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
 
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr "POP3"
 
+#: lib/Fetchmail/imap.php:100
+msgid "POP3 (Auto Detect Protocols)"
+msgstr ""
+
+#: lib/Fetchmail/imap.php:117
+#, fuzzy
+msgid "POP3 over SSL"
+msgstr "IMAP over SSL"
+
+#: lib/Fetchmail/imap.php:123
+#, fuzzy
+msgid "POP3 over SSL (self-signed certificate)"
+msgstr "POP3 over SSL (sjølv-signert)"
+
+#: templates/login/login.inc:169
+msgid "POP3 over SSL (self-signed)"
+msgstr "POP3 over SSL (sjølv-signert)"
+
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr "POP3, ikkje TLS"
 
-#, c-format
+#: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
+#: config/prefs.php.dist:903
+msgid "Page with the First Unseen Message"
+msgstr ""
+
+#: config/prefs.php.dist:904
+msgid "Page with the Last Unseen Message"
+msgstr ""
+
+#: templates/message/headers.inc:43
 msgid "Part(s)"
 msgstr "Del(ar)"
 
+#: templates/pgp/pgp.inc:123
+msgid "Passphrase"
+msgstr "Passordfrase"
+
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr "Passordfrase (igjen)"
 
+#: smime.php:235 pgp.php:310
 msgid "Passphrase successfully unloaded."
 msgstr "Passordfrase vart lasta ut."
 
-msgid "Passphrase"
-msgstr "Passordfrase"
-
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
+#: pgp.php:112
 msgid "Passphrases can not be empty"
 msgstr "Passordfrasar kan ikkje vere tomme"
 
+#: pgp.php:114
 msgid "Passphrases do not match"
 msgstr "Passordfrasar samsvarar ikkje"
 
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "Passord"
 
-msgid "Password:"
-msgstr "Passord:"
-
-msgid "Perform maintenance operations on login"
-msgstr "Køyr vedlikehaldsoperasjonar ved innlogging"
-
+#: templates/fetchmail/manage.inc:48
 msgid "Perform maintenance operations on login?"
 msgstr "Køyr vedlikehaldsoperasjonar ved innlogging?"
 
+#: acl.php:76 acl.php:102
+msgid "Permissions for this user can not be changed."
+msgstr ""
+
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
+#: templates/mailbox/legend.inc:10
+msgid "Personal"
+msgstr "Personleg"
+
+#: config/prefs.php.dist:14
 msgid "Personal Information"
 msgstr "Personleg informasjon"
 
+#: pgp.php:120
 msgid "Personal PGP keypair generated successfully."
 msgstr "Personleg PGP-nøkkelpar vart generert."
 
+#: pgp.php:127
 msgid "Personal PGP keys deleted successfully."
 msgstr "Personleg PGP-nøklar vart sletta."
 
-msgid "Personal"
-msgstr "Personleg"
+#: smime.php:207
+#, fuzzy
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Ingen personleg privat PGP-nøkkel importert."
+
+#: smime.php:132
+#, fuzzy
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "Personleg PGP-nøklar vart sletta."
 
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "Plasser signatur før svar og vidaresendt?"
 
+#: compose.php:254
+#, fuzzy
+msgid "Plaintext Version of Message"
+msgstr "Vis i meldingskropp"
+
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "Please enter a name for the new folder:"
+msgstr "Skriv inn namnet på den nye mappa:"
+
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "Skriv inn namnet på den nye mappa:"
 
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "Skriv inn det nye namnet:"
 
-msgid "Please enter the passphrase for your PGP private key. You will only need to enter this passphrase once per IMP session."
-msgstr "Skriv inn passordfrasen for din private PGP-nøkkel. Du treng berre å skrive inn denne passordfrasen ein gong per IMP-økt."
+#: templates/pgp/passphrase.inc:19
+#, fuzzy, php-format
+msgid ""
+"Please enter the passphrase for your PGP private key. You will only need to "
+"enter this passphrase once per %s session."
+msgstr ""
+"Skriv inn passordfrasen for din private PGP-nøkkel. Du treng berre å skrive "
+"inn denne passordfrasen ein gong per IMP-økt."
+
+#: templates/smime/passphrase.inc:13
+#, fuzzy, php-format
+msgid ""
+"Please enter the passphrase for your S/MIME private key. You will only need "
+"to enter this passphrase once per %s session."
+msgstr ""
+"Skriv inn passordfrasen for din private PGP-nøkkel. Du treng berre å skrive "
+"inn denne passordfrasen ein gong per IMP-økt."
+
+#: recompose.php:97
+msgid ""
+"Please log in again to resume composing your message. If you are NOT using "
+"cookies AND you are composing messages in popup windows, you will have to "
+"log in again in your main window as well. This is to keep attackers from "
+"hijacking your session ID. We apologize for any inconvenience."
+msgstr ""
 
-msgid "Please enter valid search criteria."
-msgstr "Skriv inn eit gyldig søkekriterium."
+#: templates/login/login.inc:71
+#, fuzzy
+msgid "Please provide your password."
+msgstr "Skriv inn ditt brukarnamn og passord"
 
-msgid "Please provide your username and password"
+#: templates/login/login.inc:67
+#, fuzzy
+msgid "Please provide your username."
 msgstr "Skriv inn ditt brukarnamn og passord"
 
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "Ordne opp i fleirtydige eller ugyldige adresser."
 
+#: lib/MIME/Viewer/itip.php:642
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "Vel ei mappe før du køyrer ei eller fleire handlingar."
 
+#: lib/MIME/Viewer/itip.php:502
+#, fuzzy
+msgid "Please select an action from the menu below."
+msgstr "Vel minst ei mappe å søke i."
+
+#: templates/search/javascript.inc:41
 msgid "Please select at least one folder to search."
 msgstr "Vel minst ei mappe å søke i."
 
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "Vel kun ei mappe for denne operasjonen."
 
-msgid "Please select or edit right next:"
+#: templates/compose/redirect.inc:73
+#, fuzzy
+msgid "Please select or edit in the box to the right:"
 msgstr "Vel eller endre rett neste:"
 
-msgid "Precede your signature with dashes ('-- ')"
+#: config/motd.php.dist:41
+msgid "Powered by Horde"
+msgstr ""
+
+#: config/prefs.php.dist:214
+#, fuzzy
+msgid "Precede your signature with dashes ('-- ')?"
 msgstr "Bruk strekar ('-- ') før signaturen din."
 
+#: smime.php:241 pgp.php:257 filterprefs.php:40
 msgid "Preferences successfully updated."
 msgstr "Innstillingar vart oppdaterte."
 
+#: templates/compose/attachments.inc:3
+#, fuzzy
+msgid "Preview"
+msgstr "Forrige side"
+
+#: templates/message/navbar_navigate.inc:28
 msgid "Previous Message"
 msgstr "Forrige melding"
 
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "Forrige side"
 
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "Skriv ut"
 
+#: templates/message/headers.inc:38
 msgid "Priority"
 msgstr "Prioritet"
 
-msgid "Private Key"
+#: templates/smime/import_key.inc:76
+#, fuzzy
+msgid "Private Key Password"
 msgstr "Privat nøkkel"
 
-#, c-format
-msgid "Problem with filter rule %d: folder does not exist: %s"
-msgstr "Problem med filterregel %d: Mappa eksisterer ikkje: %s"
+#: config/prefs.php.dist:559
+msgid "Prompt every time an attachment is sent; default to NO"
+msgstr ""
 
-msgid "Problem?"
-msgstr "Problem?"
+#: config/prefs.php.dist:558
+msgid "Prompt every time an attachment is sent; default to YES"
+msgstr ""
 
+#: templates/fetchmail/manage.inc:10
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-msgid "Public Key"
-msgstr "Offentleg nøkkel"
-
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr "Støtte for offentleg PGP-nøkkeltenar er slått av."
 
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
+#, fuzzy
+msgid "Pur_ge Deleted"
+msgstr "Fjern sletta"
+
+#: templates/mailbox/actions.inc:36 templates/mailbox/actions_deleted.inc:8
 msgid "Purge Deleted"
 msgstr "Fjern sletta"
 
+#: templates/folders/actions.inc:24
+#, fuzzy
+msgid "Purge Folder(s)"
+msgstr "Slette mappe(r)"
+
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Tøm søppelkorga kor ofte:"
 
-msgid "Purge messages in Trash folder older than this amount of days"
+#: config/prefs.php.dist:405
+#, fuzzy
+msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "Fjern meldingar i søppelkorga som er eldre enn dette talet på dagar"
 
-msgid "Purge old message in the Trash folder"
+#: config/prefs.php.dist:386
+#, fuzzy
+msgid "Purge old messages in the Trash folder?"
 msgstr "Fjern gamle meldingar frå søppelkorga"
 
-#, c-format
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
+msgstr "Fjerner %d melding(ar) frå søppelkorga."
+
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
 msgstr "Fjerner %d melding(ar) frå søppelkorga."
 
-msgid "Quoting"
+#: templates/quota/quota.inc:17
+#, php-format
+msgid "Quota status: %.2fMB / %.2fMB  (%.2f%%)"
+msgstr ""
+
+#: templates/quota/quota.inc:21
+#, php-format
+msgid "Quota status: %.2fMB / NO LIMIT"
+msgstr ""
+
+#: templates/quota/quota.inc:24
+#, php-format
+msgid "Quota status: NO LIMIT"
+msgstr ""
+
+#: config/prefs.php.dist:500
+#, fuzzy, php-format
+msgid "Quoting %f:"
 msgstr "Siterer"
 
-msgid "Received after"
-msgstr "Motteke etter"
+#: templates/compose/compose.inc:386
+msgid "Re_quest Delivery Confirmation"
+msgstr ""
+
+#: lib/Search.php:50
+#, fuzzy
+msgid "Received On"
+msgstr "Motteke på"
 
-msgid "Received before"
-msgstr "Motteke før"
+#: lib/Search.php:58
+#, fuzzy
+msgid "Received Since"
+msgstr "Motteke på"
 
-msgid "Received on"
+#: lib/Search.php:54
+#, fuzzy
+msgid "Received Until"
 msgstr "Motteke på"
 
+#: templates/message/navbar_actions.inc:16
+#, fuzzy
+msgid "Redirec_t"
+msgstr "Omdiriger"
+
+#: templates/message/navbar_actions.inc:16
+msgid "Redirect"
+msgstr "Omdiriger"
+
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "Omdiriger melding"
 
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "Omdiriger denne meldinga"
 
-msgid "Redirect"
-msgstr "Omdiriger"
-
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "Kunne ikkje omdirigere."
 
+#: templates/compose/compose.inc:583
+msgid "Refresh"
+msgstr "Frisk opp"
+
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "Frisk opp mappevisingar:"
 
-msgid "Refresh"
-msgstr "Frisk opp"
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
+#, fuzzy
+msgid "Reload"
+msgstr "Oppdater vising"
 
+#: templates/folders/head.inc:3
 msgid "Reload View"
 msgstr "Oppdater vising"
 
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+msgid "Remember the free/busy information."
+msgstr ""
+
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "Hugs siste vising"
 
+#: templates/fetchmail/manage.inc:27
 msgid "Remote Mailbox:"
 msgstr "Ekstern postkasse:"
 
-msgid "Remove Selected"
-msgstr "Fjern valde"
+#: templates/search/fields.inc:41
+msgid "Remove Field From Search"
+msgstr ""
+
+#: templates/prefs/sourceselect.inc:305
+#, fuzzy
+msgid "Remove source"
+msgstr "fjern kjelde"
 
-msgid "Rename Folder"
+#: templates/folders/actions.inc:8
+#, fuzzy
+msgid "Rename Folder(s)"
 msgstr "Gi nytt namn til mappe"
 
-msgid "Rename sent-mail folder at beginning of month"
+#: config/prefs.php.dist:341
+#, fuzzy
+msgid "Rename sent-mail folder at beginning of month?"
 msgstr "Endre namn på mappe for sendt post ved starten av månaden"
 
-#, c-format
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "Kunne ikkje endre namn på \"%s\" til \"%s\". Dette er kva tenaren sa"
 
+#: templates/message/navbar_actions.inc:10
+#, fuzzy
+msgid "Repl_y to List"
+msgstr "Svar til liste"
+
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "Erstatt med:"
 
+#: templates/message/navbar_actions.inc:8
+msgid "Reply"
+msgstr "Svar"
+
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
+#, fuzzy
+msgid "Reply Sent."
+msgstr "Svar-til"
+
+#: templates/message/navbar_actions.inc:13
 msgid "Reply to All"
 msgstr "Svar til alle"
 
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "Svar til alle:"
 
+#: templates/message/navbar_actions.inc:10
 msgid "Reply to List"
 msgstr "Svar til liste"
 
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "Svar til liste:"
 
-msgid "Reply"
-msgstr "Svar"
+#: templates/message/navbar_actions.inc:13
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Svar til alle"
 
-msgid "Reply-To: "
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+msgid "Reply with Not Supported Message"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:535
+msgid "Reply with free/busy for next 2 months."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:534
+msgid "Reply with requested free/busy information."
+msgstr ""
+
+#: message.php:267
+#, fuzzy
+msgid "Reply-To"
 msgstr "Svar til: "
 
-msgid "Reply-to"
-msgstr "Svar-til"
+#: lib/Compose.php:409
+msgid "Reply-To: "
+msgstr "Svar til: "
 
+#: compose.php:731
 msgid "Reply:"
 msgstr "Svar:"
 
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
+#, fuzzy
+msgid "Report as Innocent"
+msgstr "Raporter som søppelpost"
+
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "Raporter som søppelpost"
 
-msgid "Request a Return Receipt"
+#: templates/compose/compose.inc:383
+#, fuzzy
+msgid "Request a _Read Receipt"
+msgstr "Be om returkvittering"
+
+#: config/prefs.php.dist:585
+msgid "Request delivery confirmation?"
+msgstr ""
+
+#: config/prefs.php.dist:573
+#, fuzzy
+msgid "Request read receipts?"
 msgstr "Be om returkvittering"
 
+#: mailbox.php:189
+msgid "Requested message not found."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:697
+msgid "Required Participant"
+msgstr ""
+
+#: templates/search/main.inc:143 templates/search/header.inc:26
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "Nullstill"
 
+#: lib/MIME/Viewer/itip.php:115
+msgid "Respondent Status Updated."
+msgstr ""
+
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "Gjenoppta"
 
-msgid "Return to Filters Preferences"
-msgstr "Tilbake til Filterinnstillingar"
+#: recompose.php:98
+msgid "Resume your session"
+msgstr ""
+
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "Skriv melding"
+
+#: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
+#: templates/fetchmail/account_select.inc:32
+#, fuzzy
+msgid "Return to Fetch Mail"
+msgstr "Hent e-post"
+
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
+#, fuzzy
+msgid "Return to Options"
+msgstr "Brukaralternativ"
+
+#: config/prefs.php.dist:718
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr ""
+"Gå tilbake til postbokslista etter å ha sletta, flytta eller kopiert ei "
+"melding?"
+
+#: lib/MIME/Viewer/itip.php:688
+msgid "Role"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+msgid "S/MIME"
+msgstr ""
+
+#: templates/compose/encrypt_list.inc:12
+#, fuzzy
+msgid "S/MIME Encrypt Message"
+msgstr "Krypter melding"
+
+#: compose.php:394
+msgid "S/MIME Error: "
+msgstr ""
+
+#: compose.php:373
+#, fuzzy
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "PGP-feil: Treng passordfrase for personleg privat nøkkel."
+
+#: config/prefs.php.dist:151
+#, fuzzy
+msgid "S/MIME Options"
+msgstr "Lagre alternativ"
+
+#: smime.php:49
+#, fuzzy
+msgid "S/MIME Passphrase Input"
+msgstr "PGP inntasting av passordfrase"
+
+#: templates/smime/smime.inc:54
+#, fuzzy
+msgid "S/MIME Personal Keypair support requires a secure web connection."
+msgstr "Støtte for personleg PGP-nøkkelpar krev ei sikker web-kopling."
+
+#: smime.php:140
+#, fuzzy, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "Offentleg PGP-nøkkel for \"%s\" vart sletta."
+
+#: smime.php:162
+#, fuzzy
+msgid "S/MIME Public Key successfully added."
+msgstr "Offentleg/private PGP-nøkkelpar vart lagt til."
+
+#: templates/smime/smime.inc:10
+#, fuzzy
+msgid "S/MIME Public Keyring"
+msgstr "Offentleg PGP-nøkkelring"
+
+#: smime.php:211
+#, fuzzy
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "Offentleg/private PGP-nøkkelpar vart lagt til."
+
+#: templates/compose/encrypt_list.inc:13
+#, fuzzy
+msgid "S/MIME Sign Message"
+msgstr "PGP Signer melding"
+
+#: templates/compose/encrypt_list.inc:14
+#, fuzzy
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "PGP-signer/-krypter melding"
+
+#: templates/smime/notactive.inc:4
+#, fuzzy
+msgid "S/MIME support is disabled on this system."
+msgstr "PGP-støtte er slått av på dette systemet."
+
+#: lib/MIME/Viewer/pkcs7.php:241
+#, fuzzy
+msgid ""
+"S/MIME support is not currently enabled so the message is unable to be "
+"decrypted."
+msgstr ""
+"PGP-støtte er for tida ikkje aktiv, så meldinga kan ikkje dekrypterast."
+
+#: lib/MIME/Viewer/pkcs7.php:173
+msgid ""
+"S/MIME support is not enabled so the contents of this signed message can not "
+"be displayed."
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:146
+#, fuzzy
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"PGP-støtte er for tida ikkje aktiv, så den digitale signaturen kan ikkje "
+"verifiserast."
+
+#: templates/smime/smime.inc:2
+msgid ""
+"S/MIME support requires popup windows to be used.  If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
 
-msgid "Return to Main Preferences Screen"
-msgstr "Tilbake til hovedskjermbiletet for innstillingar"
+#: templates/compose/compose.inc:255
+#, fuzzy
+msgid "S_ubject"
+msgstr "Emne"
 
-msgid "Return to Personal Information"
-msgstr "Tilbake til Personleg informasjon"
+#: templates/compose/compose.inc:363
+#, fuzzy
+msgid "Sa_ve a copy in "
+msgstr "Lagre ein kopi i"
 
-msgid "Return to Previous Screen"
-msgstr "Tilbake til førre skjerm"
+#: templates/message/navbar_actions.inc:32
+#, fuzzy
+msgid "Sa_ve as"
+msgstr "Lagre som"
 
-msgid "Return to the mailbox listing after deleting, moving, or copying a message?"
-msgstr "Gå tilbake til postbokslista etter å ha sletta, flytta eller kopiert ei melding?"
+#: search.php:316 templates/fetchmail/manage.inc:67
+#, fuzzy
+msgid "Save"
+msgstr "Lagre som"
 
-msgid "Rule Definition"
-msgstr "Regeldefinisjon"
+#: templates/compose/compose.inc:538
+msgid "Save Attachments with message in sent-mail folder?"
+msgstr ""
 
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "Lagre kladd"
 
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "Lagre som"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "Lagre alternativ"
 
-msgid "Save a copy in "
-msgstr "Lagre ein kopi i"
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "Lagre alternativ"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Lagre kladd"
 
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "Lagre som"
 
-msgid "Save sent mail"
+#: config/prefs.php.dist:521
+msgid "Save drafts as unseen?"
+msgstr ""
+
+#: config/prefs.php.dist:1072
+msgid "Save recipients automatically to the default address book?"
+msgstr ""
+
+#: templates/search/main.inc:127
+msgid "Save search as a virtual folder?"
+msgstr ""
+
+#: config/prefs.php.dist:230
+#, fuzzy
+msgid "Save sent mail?"
 msgstr "Lagre sendt post"
 
-#, c-format
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "Kunne ikkje lagre kladd. Dette er kva tenaren sa: %s"
 
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
+msgid "Search"
+msgstr "Søk"
+
+#: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, fuzzy, php-format
+msgid "Search %s"
+msgstr "Søk"
+
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "Lagre alternativ"
+
+#: search.php:265
 msgid "Search Results"
 msgstr "Søkeresultat"
 
-msgid "Search"
-msgstr "Søk"
+#: templates/mailbox/navbar.inc:14 templates/mailbox/navbar.inc:31
+msgid "Seen"
+msgstr "Lest"
+
+#: templates/mailbox/navbar.inc:9
+msgid "Select"
+msgstr "Vel"
+
+#: templates/fetchmail/manage.inc:70
+#, fuzzy
+msgid "Select Another Account"
+msgstr "Vel ein konto"
+
+#: templates/search/fields.inc:36
+#, fuzzy
+msgid "Select a date"
+msgstr "Vel ein konto"
 
-msgid "Seen"
-msgstr "Lest"
+#: templates/search/fields.inc:10
+#, fuzzy
+msgid "Select a field"
+msgstr "Vel alle"
+
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "Vel ein konto"
 
-msgid "Select addressbook sources for adding and searching for addresses."
+#: config/prefs.php.dist:135
+#, fuzzy
+msgid "Select address book sources for adding and searching for addresses."
 msgstr "Vel kjelder for adressebok til å legge til og søke etter adresser i."
 
+#: templates/search/main.inc:88
 msgid "Select all"
 msgstr "Vel alle"
 
+#: templates/prefs/sourceselect.inc:323
+#, fuzzy
+msgid "Select all fields to search when expanding addresses."
+msgstr "Vel rekkefølgje på adressebøker å søke i ved kontroll av adresser."
+
+#: templates/fetchmail/account_select.inc:21
 msgid "Select an account"
 msgstr "Vel ein konto"
 
-msgid "Select an identity"
-msgstr "Vel ein identitet"
-
-msgid "Select charset:"
-msgstr "Vel teiknsett:"
-
+#: templates/search/main.inc:89
 msgid "Select none"
 msgstr "Vel ingen"
 
-msgid "Select your color scheme."
-msgstr "Vel ditt fargeskjema."
-
-msgid "Select your preferred language:"
-msgstr "Vel ønska språk:"
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
 
-msgid "Select"
-msgstr "Vel"
+#: templates/fetchmail/driver_select.inc:21
+msgid "Select the mail server type"
+msgstr ""
 
-msgid "Selected Addressbooks:"
+#: templates/prefs/sourceselect.inc:309
+#, fuzzy
+msgid "Selected Address books:"
 msgstr "Valde adressebøker:"
 
+#: templates/pgp/pgp.inc:72
+msgid "Send Key to Public Keyserver"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:604
+#, fuzzy
+msgid "Send Latest Information"
+msgstr "Tenarinformasjon"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "Send melding"
 
-msgid "Sent mail folder:"
-msgstr "Mappe for sendt post:"
+#: config/prefs.php.dist:703
+msgid "Send read receipt when requested by the sender?"
+msgstr ""
 
-msgid "September"
-msgstr "September"
+#: folders.php:397
+#, fuzzy
+msgid "Sent mail folder"
+msgstr "Mappe for sendt post:"
 
-msgid "Server Information"
-msgstr "Tenarinformasjon"
+#: templates/prefs/sentmailselect.inc:38
+msgid "Sent mail folder:"
+msgstr "Mappe for sendt post:"
 
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "Tenar"
 
+#: config/prefs.php.dist:23
+#, fuzzy
+msgid "Server and Folder Information"
+msgstr "Tenarinformasjon"
+
+#: templates/fetchmail/manage.inc:23
 msgid "Server:"
 msgstr "Tenar:"
 
-msgid "Set preferences for filtering messages for unwanted content."
-msgstr "Set innstillingar for å filtrere meldingar for uønska innhald."
-
+#: config/prefs.php.dist:80
 msgid "Set preferences for what happens when you move and delete messages."
-msgstr "Set innstillingar for kva som skjer når du flyttar og slettar meldingar."
+msgstr ""
+"Set innstillingar for kva som skjer når du flyttar og slettar meldingar."
 
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr "Set X-Priority-meldingshovud når ein skriv meldingar?"
 
-msgid "Set the current time zone."
-msgstr "Set gjeldande tidssone."
+#: config/prefs.php.dist:31
+#, fuzzy
+msgid "Share Folders"
+msgstr "Mapper"
+
+#: templates/acl/acl.inc:86
+#, fuzzy
+msgid "Share mail folders"
+msgstr "Mappe for sendt post:"
+
+#: config/prefs.php.dist:32
+msgid "Share your mail folders with other users."
+msgstr ""
+
+#: config/prefs.php.dist:669
+msgid ""
+"Should large blocks of quoted text be shown or hidden by default? It can be "
+"toggled easily whichever you choose."
+msgstr ""
 
-msgid "Set the language that menu items, explanations, and help are in."
-msgstr "Vel språk for menyar, forklaringar og hjelp."
+#: templates/pgp/pgp.inc:7
+#, fuzzy
+msgid "Should the body of text/plain messages be scanned for PGP data?"
+msgstr "Vil du søke gjennom meldingskroppen for PGP-data?"
 
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
-msgstr "Skal vindauget for skriv melding lukkast etter at du har lagra ein kladd?"
+msgstr ""
+"Skal vindauget for skriv melding lukkast etter at du har lagra ein kladd?"
+
+#: templates/pgp/pgp.inc:4
+#, fuzzy
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr ""
+"Vil du legge ved din offentlege PGP-nøkkel i meldingane dine som standard?"
 
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show All Folders"
+msgstr "Vis alle meldingshovud"
+
+#: templates/message/headers.inc:67
 msgid "Show All Headers"
 msgstr "Vis alle meldingshovud"
 
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Vis sletta"
 
+#: templates/message/headers.inc:61
 msgid "Show Limited Headers"
 msgstr "Vis avgrensa meldingshovud"
 
+#: templates/message/headers.inc:70
 msgid "Show Mailing List Information"
 msgstr "Vis informasjon om e-postliste"
 
+#: templates/search/main.inc:92
+#, fuzzy
+msgid "Show Only Subscribed Folders"
+msgstr "Abonnere på mappe(r)"
+
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "Vis u/abonnement"
 
-msgid "Show last login time when logging in"
-msgstr "Vis sist innlogga tidspunkt ved innlogging"
+#: config/prefs.php.dist:608
+msgid "Show an icon to allow stripping of attachments from messages?"
+msgstr ""
 
-msgid "Show legend in the mailbox view."
+#: config/prefs.php.dist:1002
+#, fuzzy
+msgid "Show legend in the mailbox view?"
 msgstr "Vis teiknforklaring i postkassevising."
 
+#: config/prefs.php.dist:840
+msgid "Show previews for unread messages only?"
+msgstr ""
+
+#: config/prefs.php.dist:848
+msgid "Show previews in tooltips?"
+msgstr ""
+
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "Vis Hent post-ikonet i menylinje?"
 
+#: lib/MIME/Viewer/html.php:95
+#, fuzzy
+msgid "Show the Images"
+msgstr "Vis avgrensa meldingshovud"
+
+#: templates/filters/prefs.inc:54
+#, fuzzy
+msgid "Show the filter icon on the menubar?"
+msgstr "Vis Hent post-ikonet i menylinje?"
+
+#: lib/Block/summary.php:28
+msgid "Show total number of mails in folder?"
+msgstr ""
+
+#: config/prefs.php.dist:666
+#, fuzzy
+msgid "Shown"
+msgstr "Brun"
+
+#: templates/mailbox/message_headers.inc:42
+#, fuzzy
+msgid "Si_ze"
+msgstr "Storleik"
+
+#: templates/mailbox/legend.inc:17
+#, fuzzy
+msgid "Signed"
+msgstr "Storleik"
+
+#: templates/compose/attachments.inc:3
 msgid "Size"
 msgstr "Storleik"
 
-msgid "Some of IMP's configuration files are missing:"
-msgstr "Nokre av IMP sine konfigureringsfiler manglar:"
+#: templates/mailbox/message_headers.inc:11
+msgid "Sort by Arrival"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:16
+msgid "Sort by Date"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:26
+#, fuzzy
+msgid "Sort by From Address"
+msgstr "Frå-adresse"
+
+#: templates/mailbox/message_headers.inc:41
+#, fuzzy
+msgid "Sort by Message Size"
+msgstr "Meldingsstorleik"
+
+#: templates/mailbox/message_headers.inc:36
+#, fuzzy
+msgid "Sort by Subject"
+msgstr "Tomt emne"
+
+#: templates/mailbox/message_headers.inc:31
+#, fuzzy
+msgid "Sort by Thread"
+msgstr "Tråd"
 
-msgid "Sort Direction"
-msgstr "Sorteringsrekkefølgje"
+#: templates/mailbox/message_headers.inc:21
+#, fuzzy
+msgid "Sort by To Address"
+msgstr "Frå-adresse"
 
-msgid "Spam Report from"
-msgstr "Søppelpostrapport frå"
+#: templates/prefs/spamselect.inc:23
+#, fuzzy
+msgid "Spam folder:"
+msgstr "Søppelkorg:"
 
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Spesialteikn"
 
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Stavekontroll"
 
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Stavekontroll ferdig"
 
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Stavefeil per skjermbilete ved stavekontroll."
 
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
+#, fuzzy
+msgid "Start"
+msgstr "Status"
+
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr "Status"
 
-msgid "Subject Field"
-msgstr "Emnefelt"
+#: lib/MIME/Contents.php:215
+#, fuzzy
+msgid "Strip Attachment"
+msgstr "Vedlegg"
+
+#: config/prefs.php.dist:832
+msgid "Strip linebreaks?"
+msgstr ""
+
+#: templates/mailbox/message_headers.inc:37
+#, fuzzy
+msgid "Sub_ject"
+msgstr "Emne"
 
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Emne"
 
-msgid "Subject:"
-msgstr "Emne:"
+#: config/prefs.php.dist:920
+msgid "Subject Field"
+msgstr "Emnefelt"
 
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "Send"
 
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "Abonnere på mappe(r)"
 
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "Suksess"
 
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Forslag"
 
-msgid "Sun"
-msgstr "Sol"
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
+msgid "Summary"
+msgstr ""
+
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+msgid "Switch Composition Method"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to HTML composition"
+msgstr ""
+
+#: templates/compose/compose.inc:404
+msgid "Switch to plain text composition"
+msgstr ""
+
+#: templates/compose/compose.inc:419
+#, fuzzy
+msgid "Te_xt"
+msgstr "Tekst"
+
+#: lib/MIME/Viewer/itip.php:269
+msgid "Tentative: "
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:591
+msgid "Tentatively Accept request"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:761
+msgid "Tentatively Accepted"
+msgstr ""
 
+#: lib/Maintenance/Task/tos_agreement.php:49
+#, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr "Vilkår for tenesta-fila ikkje spesifisert i conf.php"
 
+#: templates/stationery/prefs.inc:30
 msgid "Text"
 msgstr "Tekst"
 
-#, c-format
+#: config/prefs.php.dist:954
+msgid "The From: column of the message should be linked:"
+msgstr ""
+
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+msgid "The Macintosh resource fork"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
+#, php-format
+msgid "The Macintosh resource fork can be downloaded %s."
+msgstr ""
+
+#: fetchmailprefs.php:81
+#, php-format
 msgid "The account \"%s\" has been deleted."
 msgstr "Kontoen \"%s\" vart sletta."
 
-#, c-format
+#: fetchmailprefs.php:74
+#, php-format
 msgid "The account \"%s\" has been saved."
 msgstr "Kontoen \"%s\" vart lagra."
 
-#, c-format
+#: attachment.php:43
+#, fuzzy
+msgid "The attachment was not found."
+msgstr "Fann ingen vedlegg"
+
+#: lib/MIME/Viewer/itip.php:69
+msgid "The calendar data is invalid"
+msgstr ""
+
+#: templates/javascript/open_compose_win.js:37
+msgid ""
+"The compose window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:42
+msgid "The contents of the Macintosh file are below."
+msgstr ""
+
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "Namnet på gjeldande mappe(r) \"%s\" vil bli endra til \"%s\"."
 
-#, c-format
-msgid "The folder '%s' was not deleted. This is what the server said"
-msgstr "Mappa '%s' vart ikkje sletta. Dette er kva tenaren sa"
+#: templates/acl/acl.inc:107
+msgid ""
+"The current list of users with access to this folder could not be retrieved"
+msgstr ""
+
+#: compose.php:1236
+#, php-format
+msgid "The draft has been saved to the \"%s\" folder."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:139
+msgid "The event was added to your calendar."
+msgstr ""
+
+#: templates/compose/expand.inc:9
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
+msgstr "Identiteten \"%s\" vart sletta."
 
-#, c-format
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "Mappa \"%s\" eksisterer allereie"
 
-#, c-format
-msgid "The folder \"%s\" contains illegal characters in its name. It may cause problems. Please see your system administrator."
-msgstr "Namnet på mappa \"%s\" inneheld ulovlege teikn. Dette kan skape problem. Kontakt din systemadministrator."
+#: lib/Folder.php:163
+#, php-format
+msgid ""
+"The folder \"%s\" contains illegal characters in its name. It may cause "
+"problems. Please see your system administrator."
+msgstr ""
+"Namnet på mappa \"%s\" inneheld ulovlege teikn. Dette kan skape problem. "
+"Kontakt din systemadministrator."
 
-#, c-format
+#: lib/Folder.php:356
+#, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "Mappa \"%s\" vart oppretta, men du abonnerer ikkje på den."
 
-#, c-format
+#: lib/Folder.php:272
+#, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "Mappa \"%s\" vart sletta, men du abonnerer framleis på den."
 
-#, c-format
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "Mappa \"%s\" vart ikkje oppretta. Dette er kva tenaren sa"
 
-#, c-format
+#: lib/Folder.php:265
+#, fuzzy, php-format
+msgid "The folder \"%s\" was not deleted. This is what the server said"
+msgstr "Mappa '%s' vart ikkje sletta. Dette er kva tenaren sa"
+
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "Mappa \"%s\" vart oppretta."
 
-#, c-format
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "Mappa \"%s\" vart sletta."
 
-#, c-format
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "Mappa \"%s\" endra namn til \"%s\"."
 
-#, c-format
-msgid "The identity \"%s\" has been deleted."
-msgstr "Identiteten \"%s\" vart sletta."
+#: lib/MIME/Viewer/tnef.php:92
+msgid "The following files were attached to this part:"
+msgstr ""
+
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+msgid ""
+"The images will be displayed because the sender is present in your "
+"addressbook."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:75
+msgid "The mail server generated the following error message:"
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:51
+msgid "The mail server generated the following informational message:"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:90
+msgid "The mail server generated the following message:"
+msgstr ""
+
+#: lib/Message.php:651
+#, fuzzy, php-format
+msgid "The mailbox %s is already empty."
+msgstr "Mappa \"%s\" eksisterer allereie"
 
-#, c-format
-msgid "The identity \"%s\" has been saved."
-msgstr "Identiteten \"%s\" vart lagra."
+#: lib/Fetchmail.php:245
+#, php-format
+msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
+msgstr ""
 
-msgid "The message being composed has been closed.  Exiting."
+#: templates/contacts/contacts.inc:103
+#, fuzzy
+msgid "The message being composed has been closed. Exiting."
 msgstr "Meldinga som blir skriven vart lukka. Avsluttar."
 
+#: message.php:148
+#, fuzzy
+msgid "The message has been deleted."
+msgstr "Identiteten \"%s\" vart sletta."
+
+#: lib/MIME/Viewer/pgp.php:393
+#, fuzzy
+msgid "The message has been verified."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
+msgid "The message has been verified. Sender: %s."
+msgstr "Denne meldinga er rapportert som søppelpost."
+
+#: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
+msgid ""
+"The passphrase window can't be opened. Perhaps you have set your browser to "
+"block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/pgp.php:173
+#, php-format
+msgid "The raw text of the PGP Public Key can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr "Den førespurde fila eksisterer ikkje i MS-TNEF-vedlegget."
 
-msgid "The signature couldn't be replaced."
+#: lib/MIME/Viewer/zip.php:64
+#, fuzzy
+msgid "The requested file does not exist in the Zip attachment."
+msgstr "Den førespurde fila eksisterer ikkje i MS-TNEF-vedlegget."
+
+#: message.php:547
+#, php-format
+msgid ""
+"The sender of this message is requesting a Message Disposition Notification "
+"from you when you have read this message. Please click %s to send the "
+"notification message."
+msgstr ""
+
+#: lib/MIME/Viewer/images.php:69
+msgid "The server was not able to create a thumbnail of this image."
+msgstr ""
+
+#: templates/compose/compose.js:104
+#, fuzzy
+msgid "The signature could not be replaced."
 msgstr "Signaturen kunne ikkje bli erstatta."
 
+#: templates/compose/compose.js:102
 msgid "The signature was successfully replaced."
 msgstr "Signaturen vart erstatta."
 
+#: attachment.php:59
+msgid "The specified file does not exist."
+msgstr ""
+
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "Kontoen \"%s\" vart lagra."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "Kontoen \"%s\" vart sletta."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "Kontoen \"%s\" vart sletta."
+
+#: lib/MIME/Viewer/itip.php:169
+msgid "The task has been added to your tasklist."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:95
+#, fuzzy
+msgid "The text of the message"
+msgstr "slett melding"
+
+#: lib/MIME/Viewer/status.php:94
+#, php-format
+msgid "The text of the message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:80
+msgid "The text of the returned message"
+msgstr ""
+
+#: lib/MIME/Viewer/status.php:79
+#, php-format
+msgid "The text of the returned message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy
+msgid "The text of the sent message"
+msgstr "Omdiriger denne meldinga"
+
+#: lib/MIME/Viewer/notification.php:68
+#, php-format
+msgid "The text of the sent message can be viewed %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:154
+#, fuzzy
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "Signaturen vart erstatta."
+
+#: lib/MIME/Viewer/alternative.php:86
+#, fuzzy
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "Det var ingen alternative delar som kunne visast innebygd."
+
+#: templates/mailbox/empty_mailbox.inc:3
 msgid "There are no messages in this mailbox."
 msgstr "Det er ingen meldingar i denne postkassa."
 
-#, c-format
+#: thread.php:109
+#, fuzzy
+msgid "There is no text that can be displayed inline."
+msgstr "Det var ingen alternative delar som kunne visast innebygd."
+
+#: lib/Message.php:612
+#, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "Problem ved tømming av %s. Dette er kva tenaren sa"
 
-msgid "There was a problem expunging the mailbox. This is what the server said"
-msgstr "Problem ved tømming av postkasse. Dette er kva tenaren sa"
-
-#, c-format
-msgid "There was a problem expunging the mailbox. This is what the server said: %s"
+#: lib/Message.php:653
+#, fuzzy, php-format
+msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "Problem ved tømming av postkasse. Dette er kva tenaren sa: %s"
 
-#, c-format
-msgid "There was a problem with the file upload. The file may have been larger than the maximum allowed size (%d MB)."
-msgstr "Problem ved opplasting av fil. Fila er kanskje større enn maksimalt tillaten storleik. (%d MB)."
-
-msgid "There was a problem with the file upload. The file may have been larger than the maximum allowed size."
-msgstr "Problem ved opplasting av fil. Fila er kanskje større enn maksimalt tillaten storleik."
+#: lib/Message.php:621
+msgid "There was a problem expunging the mailbox. This is what the server said"
+msgstr "Problem ved tømming av postkasse. Dette er kva tenaren sa"
 
-#, c-format
-msgid "There was an error copying messages to \"%s\". This is what the server said"
+#: lib/Message.php:90
+#, fuzzy, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
 msgstr "Problem ved kopiering av melding til \"%s\". Dette er kva tenaren sa"
 
-#, c-format
-msgid "There was an error deleting messages from the folder \"%s\". This is what the server said"
-msgstr "Problem ved sletting av meldingar frå mappa \"%s\". Dette er kva tenaren sa"
-
-#, c-format
-msgid "There was an error deleting messages in the folder \"%s\". This is what the server said"
-msgstr "Problem ved sletting av meldingar i mappa \"%s\". Dette er kva tenaren sa"
+#: lib/Message.php:198 lib/Message.php:213
+#, php-format
+msgid ""
+"There was an error deleting messages from the folder \"%s\". This is what "
+"the server said"
+msgstr ""
+"Problem ved sletting av meldingar frå mappa \"%s\". Dette er kva tenaren sa"
+
+#: lib/Message.php:275
+#, php-format
+msgid ""
+"There was an error deleting messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+"Problem ved sletting av meldingar i mappa \"%s\". Dette er kva tenaren sa"
 
-#, c-format
+#: lib/Message.php:211
+#, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "Problem ved sletting av meldingar. Dette er kva tenaren sa: %s"
 
+#: lib/MIME/Viewer/itip.php:99
+#, fuzzy, php-format
+msgid "There was an error deleting the event: %s."
+msgstr "Problem med å vise den førespurte meldinga."
+
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "Problem ved vising av denne meldingsdelen"
 
-#, c-format
-msgid "There was an error flagging messages in the folder \"%s\". This is what the server said"
-msgstr "Problem ved flagging av meldingar i mappa \"%s\". Dette er kva tenaren sa"
+#: lib/Message.php:545 lib/Message.php:585
+#, php-format
+msgid ""
+"There was an error flagging messages in the folder \"%s\". This is what the "
+"server said"
+msgstr ""
+"Problem ved flagging av meldingar i mappa \"%s\". Dette er kva tenaren sa"
+
+#: folders.php:165
+#, fuzzy, php-format
+msgid "There was an error importing %s."
+msgstr "Problem ved lagring av kladd."
 
-msgid "There was an error flagging messages. This is what the server said"
-msgstr "Problem ved flagging av meldingar. Dette er kva tenaren sa"
+#: lib/MIME/Viewer/itip.php:136
+#, fuzzy, php-format
+msgid "There was an error importing the event: %s."
+msgstr "Problem med å vise den førespurte meldinga."
 
-#, c-format
-msgid "There was an error moving messages to \"%s\". This is what the server said"
-msgstr "Problem ved flytting av meldingar til \"%s\". Dette er kva tenaren sa"
+#: lib/MIME/Viewer/itip.php:166
+#, fuzzy, php-format
+msgid "There was an error importing the task: %s."
+msgstr "Problem med å vise den førespurte meldinga."
 
-msgid "There was an error moving messages to the trash. This is what the server said"
-msgstr "Problem ved flytting av meldingar til søppelkorga. Dette er kva tenaren sa"
+#: lib/MIME/Viewer/itip.php:152
+#, fuzzy, php-format
+msgid "There was an error importing user's free/busy information: %s."
+msgstr "Problem ved sending av meldinga di: %s"
 
-#, c-format
-msgid "There was an error moving messages to the trash. This is what the server said: %s"
-msgstr "Problem ved flytting av meldingar til søppelkorga. Dette er kva tenaren sa: %s"
+#: lib/Message.php:85
+#, fuzzy, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr "Problem ved flytting av meldingar til \"%s\". Dette er kva tenaren sa"
 
-msgid "There was an error saving a draft."
-msgstr "Problem ved lagring av kladd."
+#: compose.php:1244
+#, fuzzy
+msgid "There was an error saving this message as a draft."
+msgstr "Problem ved vising av denne meldingsdelen"
 
-#, c-format
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "Problem ved sending av meldinga di: %s"
 
-msgid "There was an error undeleting messages. This is what the server said"
-msgstr "Problem med å angre sletting av melding. Dette er kva tenaren sa"
+#: lib/MIME/Viewer/itip.php:113
+#, fuzzy, php-format
+msgid "There was an error updating the event: %s."
+msgstr "Problem ved sending av meldinga di: %s"
 
-msgid "There was an error viewing the requested message."
-msgstr "Problem med å vise den førespurte meldinga."
+#: lib/MIME/Viewer/plain.php:59
+#, fuzzy
+msgid "There was no text in this message part"
+msgstr "Problem ved vising av denne meldingsdelen"
 
-msgid "There were no alternative parts that can be displayed inline."
-msgstr "Det var ingen alternative delar som kunne visast innebygd."
+#: lib/MIME/Viewer/html.php:97
+#, fuzzy
+msgid "This HTML message has images embedded in it."
+msgstr "Denne meldinga er kryptert med PGP."
+
+#: lib/MIME/Viewer/html.php:90
+msgid ""
+"This HTML message has images embedded in it. Blocked images appear like "
+"this: "
+msgstr ""
 
+#: lib/MIME/Viewer/pgp.php:166
 msgid "This PGP Public Key was attached to the message."
 msgstr "Denne offentlege PGP-nøkkelen var lagt ved meldinga."
 
-msgid "This file controls local MIME drivers for IMP, specifically what kinds of attachments are viewable and/or downloadable."
-msgstr "Denne fila kontrollerer lokale MIME-modular for IMP, spesielt kva typar vedlegg som kan visast og/eller lastast ned."
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
+msgid "This action is not supported."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
+msgid "This action is not yet implemented."
+msgstr ""
+
+#: templates/javascript/folders.js:14
+msgid "This may take some time. Are you sure you want to continue?"
+msgstr "Dette kan ta ein del tid. Er du sikker på at du vil halde fram?"
+
+#: lib/MIME/Viewer/appledouble.php:40
+msgid "This message contains a Macintosh file."
+msgstr ""
 
-msgid "This file controls the default preferences for IMP, and also controls which preferences users can alter."
-msgstr "Denne fila kontrollerer standardinnstillingane for IMP, og kontrollerer også kva innstillingar brukarane kan endre."
+#: lib/MIME/Viewer/pkcs7.php:410
+#, fuzzy
+msgid ""
+"This message contains an attachment that has been digitally signed via S/"
+"MIME."
+msgstr "Denne meldinga er digitalt signert via PGP."
 
-msgid "This file controls the default settings for IMP, and also defines the list of available servers if you are using the server list."
-msgstr "Denne fila kontrollerer standardvala for IMP, og definerer også lista over tilgjengelege tenarar dersom du brukar tenarlista."
+#: lib/MIME/Viewer/pkcs7.php:414
+#, fuzzy
+msgid "This message contains an attachment that has been encrypted via S/MIME."
+msgstr "Denne meldinga er kryptert med PGP."
 
-msgid "This file controls the stylesheet that is used to set colors and fonts in addition to or overriding Horde defaults."
-msgstr "Denne fila kontrollerer stilarket som blir brukt til å definere fargar og skrifttypar, og legg til eller overstyrer standardverdiane til Horde."
+#: lib/MIME/Viewer/status.php:160
+msgid ""
+"This message contains mail delivery status information, but the format of "
+"this message is unknown."
+msgstr ""
 
-msgid "This is the main IMP configuration file. It contains paths and options for the IMP scripts."
-msgstr "Dette er hovedkonfigurasjonsfila for IMP. Den inneheld katalognamn og alternativ for skripta i IMP."
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
+msgid ""
+"This message does not appear to be a valid PGP encrypted message. Error: "
+msgstr ""
+"Denne meldinga ser ikkje ut til å vere i korrekt PGP-format (i følgje RFC "
+"2015)."
 
-msgid "This may take some time. Are you sure you want to continue?"
-msgstr "Dette kan ta ein del tid. Er du sikker på at du vil halde fram?"
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
+msgid ""
+"This message does not appear to be in the correct PGP format (according to "
+"RFC 2015)."
+msgstr ""
+"Denne meldinga ser ikkje ut til å vere i korrekt PGP-format (i følgje RFC "
+"2015)."
 
-msgid "This message does not appear to be in the correct PGP format (according to RFC 2015)."
-msgstr "Denne meldinga ser ikkje ut til å vere i korrekt PGP-format (i følgje RFC 2015)."
+#: lib/MIME/Viewer/pkcs7.php:170
+#, fuzzy
+msgid "This message does not appear to be in the correct S/MIME format."
+msgstr ""
+"Denne meldinga ser ikkje ut til å vere i korrekt PGP-format (i følgje RFC "
+"2015)."
 
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
 msgid "This message has been digitally signed via PGP."
 msgstr "Denne meldinga er digitalt signert via PGP."
 
-msgid "This message has been encrypted with PGP."
-msgstr "Denne meldinga er kryptert med PGP."
+#: lib/MIME/Viewer/pkcs7.php:143
+#, fuzzy
+msgid "This message has been digitally signed via S/MIME."
+msgstr "Denne meldinga er digitalt signert via PGP."
 
-msgid "This message has been reported as spam to your system administrator."
-msgstr "Denne meldinga er rapportert som søppelpost til din systemadministrator."
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#, fuzzy
+msgid "This message has been encrypted via S/MIME."
+msgstr "Denne meldinga er kryptert med PGP."
 
-msgid "This message has been reported as spam."
-msgstr "Denne meldinga er rapportert som søppelpost."
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+msgid "This message has been encrypted with PGP."
+msgstr "Denne meldinga er kryptert med PGP."
 
+#: message.php:211
 msgid "This message to"
 msgstr "Denne meldinga til"
 
-msgid "This window must be called from compose window"
+#: acl.php:46
+msgid "This server does not support sharing folders."
+msgstr ""
+
+#: templates/contacts/contacts.inc:109
+#, fuzzy
+msgid "This window must be called from a compose window."
 msgstr "Dette vindauget må kallast frå vindauget for skriv melding"
 
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Vis"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "Trådvising"
 
-msgid "Thread"
-msgstr "Tråd"
-
-msgid "Time Zone"
-msgstr "Tidssone"
-
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "Til"
 
-msgid "To:"
-msgstr "Til:"
+#: config/prefs.php.dist:919
+#, fuzzy
+msgid "To Address"
+msgstr "Frå-adresse"
+
+#: templates/prefs/sourceselect.inc:326
+msgid ""
+"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
+"clicking."
+msgstr ""
+
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
+#, fuzzy
+msgid "Total Attachments Size:"
+msgstr "Vedlegg"
 
-#, c-format
-msgid "Total Size: %s KB"
-msgstr "Total storleik: %s KB"
+#: folders.php:388
+#, fuzzy
+msgid "Trash folder"
+msgstr "Søppelkorg:"
 
+#: templates/prefs/trashselect.inc:23
 msgid "Trash folder:"
 msgstr "Søppelkorg:"
 
-msgid "Unanswered messages"
-msgstr "Ubesvarte meldingar"
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
+msgid "Unable to retrieve quota"
+msgstr ""
 
+#: templates/message/navbar_navigate.inc:10 templates/mailbox/navbar.inc:19
+#: templates/mailbox/navbar.inc:36
 msgid "Unanswered"
 msgstr "Ubesvart"
 
+#: templates/search/main.inc:35
+msgid "Unanswered messages"
+msgstr "Ubesvarte meldingar"
+
+#: templates/message/navbar_actions.inc:4 templates/mailbox/actions.inc:13
 msgid "Undelete"
 msgstr "Angre slett"
 
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "Skjult mottakar"
 
+#: lib/MIME/Viewer/itip.php:447
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr ""
+
+#: mailbox.php:565
+msgid "Unknown Date"
+msgstr ""
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:635
+msgid "Unknown Meeting"
+msgstr ""
+
+#: mailbox.php:618
+#, fuzzy
+msgid "Unknown Recipient"
+msgstr "Skjult mottakar"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr "Last ut passordfrase"
 
+#: fetchmailprefs.php:65
 msgid "Unnamed"
 msgstr "Utan namn"
 
-msgid "Unread"
-msgstr "Ulest"
-
-msgid "Unseen Messages"
-msgstr "Uleste meldingar"
-
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
+#: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
+#: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "Ulest"
 
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "Sei opp abonnement på mappe(r)"
 
+#: templates/compose/compose.inc:584
+msgid "Update Attachment Information"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:620
+msgid "Update respondent status"
+msgstr ""
+
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
 msgid "Upload"
 msgstr "Last opp"
 
-msgid "Use Ctrl/Option+Click to select multiple fields"
-msgstr "Bruk Ctrl-klikk for å velje fleire felt"
-
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "Bruk standardverdi"
 
-msgid "Use IMAP folder subscriptions"
+#: config/prefs.php.dist:256
+#, fuzzy
+msgid "Use IMAP folder subscriptions?"
 msgstr "Bruk abonnement på IMAP-mapper"
 
-msgid "User Options"
-msgstr "Brukaralternativ"
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "Tøm søppelkorg"
 
+#: templates/acl/acl.inc:142
+#, fuzzy
+msgid "User"
+msgstr "Brukarnamn"
+
+#: acl.php:87
+#, php-format
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
+msgstr ""
+
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "Brukarnamn"
 
+#: templates/fetchmail/manage.inc:17
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#, c-format
-msgid "View %s Public Key"
-msgstr "Vis %s offentleg nøkkel"
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
+msgid "View"
+msgstr "Vis"
 
-#, c-format
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "Vis %s"
 
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, php-format
+msgid "View %s Public Key"
+msgstr "Vis %s offentleg nøkkel"
+
+#: lib/MIME/Viewer/html.php:116
+#, fuzzy
+msgid "View HTML content in a separate window"
+msgstr "Hent post i eige vindauge?"
+
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "Nye meldingar"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr "Vis personleg privat nøkkel"
 
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "View Personal Public Key"
 msgstr "Vis personleg offentleg nøkkel"
 
-msgid "View messages in "
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "View Thread"
+msgstr "Tråd"
+
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+msgid "View Thumbnail"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:418
+#, fuzzy
+msgid "View attachment in a separate window"
+msgstr "Hent post i eige vindauge?"
+
+#: lib/MIME/Viewer/related.php:79
+#, fuzzy
+msgid "View content in a separate window"
+msgstr "Hent post i eige vindauge?"
+
+#: lib/MIME/Viewer/itip.php:140
+msgid "View event"
+msgstr ""
+
+#: folders.php:380 mailbox.php:534
+#, fuzzy, php-format
+msgid "View messages in %s"
 msgstr "Vis meldingar i"
 
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "Vising eller postboks som skal visast etter innlogging:"
 
-msgid "View"
-msgstr "Vis"
+#: lib/MIME/Viewer/itip.php:170
+#, fuzzy
+msgid "View task"
+msgstr "Vis %s"
+
+#: lib/MIME/Viewer/html.php:101
+#, fuzzy
+msgid "View the Images"
+msgstr "Vis meldingar i"
+
+#: search.php:263
+#, fuzzy, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Mappa \"%s\" vart sletta."
+
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Oppret mappe"
+
+#: search.php:245
+msgid "Virtual Folders require a label."
+msgstr ""
+
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+msgid "Virtual INBOX Folder"
+msgstr ""
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+msgid "Virtual Trash"
+msgstr ""
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "Tøm søppelkorg"
+
+#: templates/search/main.inc:133
+msgid "Virtual folder label"
+msgstr ""
+
+#: lib/MIME/Viewer/pkcs7.php:374
+msgid "Warning"
+msgstr ""
 
-#, c-format
+#: login.php:138
+#, php-format
 msgid "Welcome to %s"
 msgstr "Velkomen til %s"
 
-msgid "When deleting messages, move them to your Trash folder instead of marking them as deleted."
-msgstr "Ved sletting av meldingar, flytt dei til søppelkorga i staden for å markere dei som sletta."
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
+#, fuzzy
+msgid ""
+"When deleting messages, move them to your Trash folder instead of marking "
+"them as deleted?"
+msgstr ""
+"Ved sletting av meldingar, flytt dei til søppelkorga i staden for å markere "
+"dei som sletta."
+
+#: config/prefs.php.dist:907
+msgid "When opening a new mailbox, which page do you want to start on?"
+msgstr ""
+
+#: config/prefs.php.dist:561
+msgid "When saving sent-mail, should we save attachment data?"
+msgstr ""
+
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
 
-msgid "Wrap text at this many characters."
-msgstr "Bryt tekst etter så mange teikn."
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "Whitelist"
+msgstr ""
 
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "Ja"
 
-msgid "You are attempting to delete the following folders:"
+#: lib/Maintenance/Task/fetchmail_login.php:58
+#, fuzzy
+msgid "You are about to fetch email from the following account(s):"
+msgstr "Du prøver å slette følgjande mapper:"
+
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
+msgstr "Du prøver å slette følgjande mapper:"
+
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
 msgstr "Du prøver å slette følgjande mapper:"
 
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
+#, fuzzy
+msgid "You are copying/moving to a new folder."
+msgstr "Du endrar namn på mappa:"
+
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "Du opprettar ei undermappe til"
 
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "Du opprettar ei toppnivå-mappe."
 
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "Du opprettar ei toppnivå-mappe."
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "Du endrar namn på mappa:"
 
-msgid "You didn't specify a Mail Server"
-msgstr "Du spesifiserte ein e-posttenar"
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "Ditt abonnement på \"%s\" er sagt opp"
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
+msgid ""
+"You did not agree to the Terms of Service agreement, so you were not allowed "
+"to login."
+msgstr ""
 
-msgid "You didn't specify the password"
-msgstr "Du spesifiserte ikkje passordet"
+#: templates/acl/acl.inc:169
+msgid "You do not have permission to change access to this folder"
+msgstr ""
 
-msgid "You didn't specify the username"
-msgstr "Dy spesifiserte ikkje brukarnamnet"
+#: lib/Maillog.php:129
+#, php-format
+msgid "You forwarded this message on %%s to the following recipients: %s."
+msgstr ""
 
-#, c-format
+#: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "Du har %s nye meldingar."
 
+#: templates/mailbox/alert.inc:3
 msgid "You have 1 new message."
 msgstr "Du har 1 ny melding."
 
-msgid "You have been logged out.<br />Thank you for using the system."
-msgstr "Du er logga ut.<br />Takk for at du brukar dette systemet."
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "Du har 1 ny melding."
+
+#: templates/compose/attachments.js:115
+msgid ""
+"You have at least one attachment selected that you didn't upload yet. Are "
+"you sure you want to send this message without these attachments?"
+msgstr ""
 
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "Du har ny post i følgjande mappe:"
 
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "Du har ny post i følgjande mapper:"
 
-msgid "You must enter the passphrase for your PGP private key to view this message"
-msgstr "Du må skrive inn passordfrasa for din private PGP-nøkkel for å vise denne meldinga"
-
-msgid "You must first select the attachment(s) to delete."
-msgstr "Du må først velje vedlegg som skal slettast."
+#: compose.php:153
+#, fuzzy
+msgid "You must enter at least one recipient."
+msgstr "Du må ha minst ein mottakar."
 
-msgid "You must first specify the file to attach."
-msgstr "Du må først spesifisere fila som skal vedleggast."
+#: lib/MIME/Viewer/pgp.php:302
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message"
+msgstr ""
+"Du må skrive inn passordfrasa for din private PGP-nøkkel for å vise denne "
+"meldinga"
 
-msgid "You must have at least one recipient."
-msgstr "Du må ha minst ein mottakar."
+#: lib/MIME/Viewer/pkcs7.php:249
+#, fuzzy
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this "
+"message"
+msgstr ""
+"Du må skrive inn passordfrasa for din private PGP-nøkkel for å vise denne "
+"meldinga"
 
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "Du må først velje ei målmappe."
 
+#: fetchmailprefs.php:85
 msgid "You must select an account to be deleted."
 msgstr "Du må velje ein konto som skal slettast."
 
+#: templates/contacts/contacts.inc:81
 msgid "You must select an address first."
 msgstr "Du må først velje ei adresse."
 
-msgid "You must select an identity to be deleted."
-msgstr "Du må velje ein identitet som skal slettast."
-
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "Du må først velje minst ei melding."
 
+#: templates/compose/redirect.inc:13
 msgid "You must specify a recipient."
 msgstr "Du må spesifisere ein mottakar."
 
-#, c-format
+#: templates/compose/attachments.js:29
+#, fuzzy
+msgid "You must specify at least one file to attach."
+msgstr "Du må først spesifisere fila som skal vedleggast."
+
+#: templates/fetchmail/manage.inc:48
+#, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
+msgstr ""
+
+#: lib/Maillog.php:137
+#, fuzzy, php-format
+msgid "You redirected this message to %s on %%s."
+msgstr "Omdiriger denne meldinga"
+
+#: lib/Maillog.php:141
+#, fuzzy, php-format
+msgid "You replied to this message on %s."
+msgstr "Omdiriger denne meldinga"
+
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "Kunne ikkje abonnere på \"%s\". Dette er kva tenaren sa"
 
-#, c-format
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "Ditt abonnement på \"%s\" vart ikkje sagt opp. Dette er kva tenaren sa"
 
-#, c-format
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "Du abonnerer no på \"%s\""
 
-#, c-format
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "Ditt abonnement på \"%s\" er sagt opp"
 
-#, c-format
-msgid "Your %s session has expired. Please login again."
-msgstr "Økta di (%s) har gått ut på tid. Logg inn på nytt."
-
-msgid "Your From: address:"
-msgstr "Di Frå: adresse:"
-
-msgid "Your Information"
-msgstr "Din informasjon"
-
+#: templates/pgp/pgp.inc:98
 msgid "Your Name"
 msgstr "Ditt namn"
 
+#: templates/pgp/pgp.inc:50
 msgid "Your PGP Public/Private Keys"
 msgstr "Dine offentlege/private PGP-nøklar"
 
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
 msgid "Your Private Key"
 msgstr "Din private nøkkel"
 
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 msgid "Your Public Key"
 msgstr "Din offentlege nøkkel"
 
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "Di Svar-til: adresse: <i>(valfritt)</i>"
 
+#: templates/smime/smime.inc:49
+#, fuzzy
+msgid "Your S/MIME Public/Private Certificates"
+msgstr "Dine offentlege/private PGP-nøklar"
+
+#: templates/fetchmail/account_select.inc:16
 msgid "Your accounts:"
 msgstr "Dine kontoar:"
 
-msgid "Your browser does not support inline display of this image type"
-msgstr "Nettlesaren din støttar ikkje vising av bilete av denne typen"
-
-msgid "Your browser does not support this print option. Press Control/Option + P to print."
-msgstr "Nettlesaren din støttar ikkje denne utskriftsfunksjonen. Vel Ctrl+P for å skrive ut."
-
-msgid "Your current time zone:"
-msgstr "Di gjeldande tidssone:"
-
-msgid "Your default identity:"
-msgstr "Din standardidentitet:"
+#: config/prefs.php.dist:173
+msgid ""
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
+msgstr ""
 
-msgid "Your full name:"
-msgstr "Ditt fulle namn:"
+#: lib/MIME/Viewer/images.php:92
+#, fuzzy
+msgid "Your browser does not support inline display of this image type."
+msgstr "Nettlesaren din støttar ikkje vising av bilete av denne typen"
 
-msgid "Your identities:"
-msgstr "Dine identitetar:"
+#: config/prefs.php.dist:539
+msgid "Your default charset for sending messages:"
+msgstr ""
 
-msgid "Your session will expire in 1 minute. Do you want to reload the page to prevent losing your work?"
-msgstr "Økta di går ut om 1 minutt. Vil du laste inn sida på nytt for å ikkje miste arbeidet ditt?"
+#: templates/prefs/encryptselect.inc:1
+msgid "Your default encryption method for sending messages:"
+msgstr ""
 
-msgid "Your session will expire in 5 minutes. Do you want to reload the page to prevent losing your work?"
-msgstr "Økta di går ut om 5 minutt. Vil du laste inn sida på nytt for å ikkje miste arbeidet ditt?"
+#: lib/MIME/Viewer/status.php:89
+#, fuzzy
+msgid "Your message was successfully delivered."
+msgstr "Mappa \"%s\" vart sletta."
 
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "Din signatur:"
 
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Tomt emne]"
 
-msgid "add source"
-msgstr "legg til kjelde"
+#: templates/compose/compose.inc:205
+#, fuzzy
+msgid "_Bcc"
+msgstr "Blind kopi"
 
-msgid "cannot move past the beginning"
-msgstr "kan ikkje flytte til før starten"
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
+#, fuzzy
+msgid "_Blacklist"
+msgstr "Svartelist"
 
-msgid "cannot move past the end"
-msgstr "kan ikkje flytte til etter enden"
+#: templates/compose/compose.inc:154
+#, fuzzy
+msgid "_Cc"
+msgstr "Kopi"
 
-msgid "delete message"
-msgstr "slett melding"
+#: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
+#: templates/mailbox/actions.inc:10
+#, fuzzy
+msgid "_Delete"
+msgstr "Slett"
+
+#: lib/IMP.php:979
+#, fuzzy
+msgid "_Folders"
+msgstr "Mapper"
+
+#: templates/compose/compose.inc:81
+#, fuzzy
+msgid "_Identity"
+msgstr "Identitet"
+
+#: lib/IMP.php:961
+msgid "_Inbox"
+msgstr ""
+
+#: lib/IMP.php:1020
+#, fuzzy
+msgid "_Log out"
+msgstr "Logg ut"
+
+#: message.php:384
+#, fuzzy
+msgid "_Message Source"
+msgstr "Meldingskjelde"
+
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "Nye meldingar"
 
+#: templates/message/navbar_actions.inc:33
+#, fuzzy
+msgid "_Print"
+msgstr "Skriv ut"
+
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
+#, fuzzy
+msgid "_Priority"
+msgstr "Prioritet"
+
+#: mailbox.php:418
+#, fuzzy, php-format
+msgid "_Refresh %s"
+msgstr "Frisk opp"
+
+#: templates/message/navbar_actions.inc:8
+#, fuzzy
+msgid "_Reply"
+msgstr "Svar"
+
+#: lib/IMP.php:981
+#, fuzzy
+msgid "_Search"
+msgstr "Søk"
+
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
+#, fuzzy
+msgid "_Send Message"
+msgstr "Send melding"
+
+#: templates/mailbox/message_headers.inc:32
+#, fuzzy
+msgid "_Thread"
+msgstr "Tråd"
+
+#: templates/compose/compose.inc:116
+#, fuzzy
+msgid "_To"
+msgstr "Til"
+
+#: templates/mailbox/actions.inc:13
+#, fuzzy
+msgid "_Undelete"
+msgstr "Angre slett"
+
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
+msgid "_View Thread"
+msgstr "Tråd"
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
+msgid "_Whitelist"
+msgstr ""
+
+#: lib/Compose.php:176
+msgid "addressee unknown"
+msgstr ""
+
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "Vedlegg"
+
+#: view.php:99
+#, fuzzy
+msgid "attachments.zip"
+msgstr "Vedlegg"
+
+#: templates/compose/compose.inc:513
+msgid "bytes"
+msgstr ""
+
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "frå"
 
-msgid "move down"
-msgstr "flytt ned"
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
 
-msgid "move message to"
-msgstr "flytt melding til"
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
 
-msgid "move up"
-msgstr "flytt opp"
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
 
-msgid "no folder selected"
-msgstr "inga mappe velt"
+#: smime.php:29 pgp.php:69
+msgid "key"
+msgstr ""
 
-msgid "no rule selected"
-msgstr "ingen regel velt"
+#: folders.php:161
+#, fuzzy
+msgid "mailbox file"
+msgstr "Postkasse"
 
-msgid "no text specified"
-msgstr "tekst er ikkje spesifisert"
+#: compose.php:1067 lib/Message.php:466
+#, fuzzy
+msgid "name"
+msgstr "Namn"
 
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "ingen"
 
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "eller"
 
-msgid "please fill in the text and choose a field and an action"
-msgstr "fyll inn tekst og vel eit felt og ei handling"
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
 
-msgid "remove source"
-msgstr "fjern kjelde"
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
 
-msgid "select folder"
-msgstr "Vel mappe"
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
 
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "stavefeil"
 
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "stavefeil"
 
-#, c-format
-msgid "where the %s field contains <b>%s</b>"
-msgstr "der feltet %s inneheld <b>%s</b>"
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "stavefeil"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
+#, fuzzy
+msgid "your blacklist"
+msgstr "Svartelist"
 
+#: lib/Filter.php:61
+msgid "your whitelist"
+msgstr ""


--- orig/templates/mailbox/message_headers.inc
+++ mod/templates/mailbox/message_headers.inc
@@ -53,14 +53,18 @@
 }
 
 /* Determine which of Subject/Thread to emphasize. */
-$extra = SORTTHREAD;
-$standard = SORTSUBJECT;
-if ($thread_sort) {
-    $extra = SORTSUBJECT;
-    $standard = SORTTHREAD;
+if ($search_mbox) {
+    unset($headers[SORTTHREAD]);
+} else {
+    $extra = SORTTHREAD;
+    $standard = SORTSUBJECT;
+    if ($thread_sort) {
+        $extra = SORTSUBJECT;
+        $standard = SORTTHREAD;
+    }
+    $headers[$standard]['extra'] = '&nbsp;<span style="font-size: 10px;">[' . Horde::widget(Util::addParameter($mailbox_url, array('sortby' => $extra, 'actionID' => 'change_sort')), $headers[$extra]['stext'], 'widget" style="font-size: 10px; font-weight: normal;', null, 'if (window.event) window.event.cancelBubble = true; else if (event) event.stopPropagation();', $headers[$extra]['text']) . ']</span>';
+    unset($headers[$extra]);
 }
-$headers[$standard]['extra'] = '&nbsp;<span style="font-size: 10px;">[' . Horde::widget(Util::addParameter($mailbox_url, 'sortby', $extra), $headers[$extra]['stext'], 'widget" style="font-size: 10px; font-weight: normal;', null, 'if (window.event) window.event.cancelBubble = true; else if (event) event.stopPropagation();', $headers[$extra]['text']) . ']</span>';
-unset($headers[$extra]);
 ?>
 <tr class="control"><td colspan="6">
 <form method="post" name="messages" action="<?php echo $mailbox_url ?>">
@@ -74,12 +78,14 @@
 <?php endif; ?>
 
 <?php foreach ($headers as $key => $val): ?>
-  <th class="<?php echo ($sortby == $key) ? 'selected' : 'item' ?>" width="<?php echo $val['width'] ?>" <?php if (!$sortlimit): ?> onclick="document.location.href='<?php echo addslashes(Util::addParameter(($sortby == $key) ? $sort_url : $mailbox_url, 'sortby', $key)) ?>';"<?php endif; ?>>
+  <th class="<?php echo ($sortby == $key) ? 'selected' : 'item' ?>" width="<?php echo $val['width'] ?>" <?php if (!$sortlimit): ?> onclick="document.location.href='<?php echo addslashes(Util::addParameter(($sortby == $key) ? $sort_url : $mailbox_url, array('sortby' => $key, 'actionID' => 'change_sort'))) ?>';"<?php endif; ?>>
 <?php if ($sortlimit): ?>
   <?php echo Horde::stripAccessKey($val['text']) ?>
 <?php else: ?>
-  <?php echo Horde::link(Util::addParameter($sort_url, 'sortby', $key), $val['stext'], null, null, null, $val['stext']) . Horde::img($sortImg, $sortText, array('title' => _("Sort Direction")), $registry->getImageDir('horde')) ?></a>
-  <?php echo Horde::widget(Util::addParameter(($sortby == $key) ? $sort_url : $mailbox_url, 'sortby', $key), $val['stext'], 'widget', null, null, $val['text']) ?>
+  <?php if ($sortby == $key): ?>
+    <?php echo Horde::link(Util::addParameter($sort_url, array('sortby' => $key, 'actionID' => 'change_sort')), $val['stext'], null, null, null, $val['stext']) . Horde::img($sortImg, $sortText, '', $registry->getImageDir('horde')) ?></a>
+  <?php endif; ?>
+  <?php echo Horde::widget(Util::addParameter(($sortby == $key) ? $sort_url : $mailbox_url, array('sortby' => $key, 'actionID' => 'change_sort')), $val['stext'], 'widget', null, null, $val['text']) ?>
 <?php if (isset($val['extra'])) echo $val['extra']; ?>
 <?php endif; ?>
   </th>


--- orig/templates/search/fields.inc
+++ mod/templates/search/fields.inc
@@ -2,7 +2,7 @@
 <?php if (($i == 0) && !$last_field): ?>
  <td>&nbsp;</td>
 <?php elseif ($i > 0): ?>
- <td><b><?php echo ($search['match'] == 'and') ? _("AND") : _("OR") ?></b>&nbsp;</td>
+ <td><strong><?php echo (is_null($search['match']) || ($search['match'] == 'and')) ? _("AND") : _("OR") ?></strong>&nbsp;</td>
 <?php endif; ?>
  <td style="padding:2px">
   <select onchange="document.search.submit();return true;" name="field[<?php echo $i ?>]" id="field_<?php echo $i ?>">
@@ -10,30 +10,30 @@
    <option value=""><?php echo _("Select a field") ?></option>
    <option value=""> --------- </option>
 <?php endif; ?>
-<?php foreach ($fields as $key => $val): ?>
+<?php foreach ($imp_search_fields as $key => $val): ?>
    <option value="<?php echo $key ?>"<?php if ($curr_field == $key) echo ' selected="selected"'; ?>><?php $label = $val['label']; echo _($label) ?></option>
 <?php endforeach; ?>
   </select>
  </td>
 <?php if (is_null($curr_field)): ?>
  <td>&nbsp;</td>
-<?php elseif (($fields[$curr_field]['type'] == IMP_SEARCH_HEADER) ||
-              ($fields[$curr_field]['type'] == IMP_SEARCH_BODY) ||
-              ($fields[$curr_field]['type'] == IMP_SEARCH_TEXT)): ?>
- <td class="item0" align="left">
+<?php elseif (($imp_search_fields[$curr_field]['type'] == IMP_SEARCH_HEADER) ||
+              ($imp_search_fields[$curr_field]['type'] == IMP_SEARCH_BODY) ||
+              ($imp_search_fields[$curr_field]['type'] == IMP_SEARCH_TEXT)): ?>
+ <td class="item0 leftAlign">
   <input type="text" name="search_text[<?php echo $i ?>]" size="40" <?php if (!empty($search['text'][$i])) echo 'value="' . $search['text'][$i] . '" '; ?>/>
   <input type="checkbox" name="search_text_not[<?php echo $i ?>]" <?php if (!empty($search['text_not'][$i])) echo 'checked="checked" '; ?>/>
-    <i><?php echo _("Do NOT match") ?></i>
+    <em><?php echo _("Do NOT match") ?></em>
  </td>
-<?php elseif ($fields[$curr_field]['type'] == IMP_SEARCH_DATE): ?>
- <td class="item0" nowrap="nowrap" align="left">
+<?php elseif ($imp_search_fields[$curr_field]['type'] == IMP_SEARCH_DATE): ?>
+ <td class="item0 leftAlign" nowrap="nowrap">
   <?php echo buildMonthWidget('search_date[' . $i . '][month]', isset($search['date'][$i]['month']) ? $search['date'][$i]['month'] : $curr_date['mon']) ?>
   <?php echo buildDayWidget('search_date[' . $i . '][day]', isset($search['date'][$i]['day']) ? $search['date'][$i]['day'] : $curr_date['mday'], "onchage=\"dateCheck('on')\"") ?>
   <?php echo buildYearWidget('search_date[' . $i . '][year]', -20, isset($search['date'][$i]['year']) ? $search['date'][$i]['year']: $curr_date['year'], "onchange=\"dateCheck('on')\"") ?>
 <?php if ($GLOBALS['browser']->hasFeature('javascript')) {
     Horde::addScriptFile('open_calendar.js', 'horde');
     echo '<div id="goto" class="control" style="position:absolute;visibility:hidden;padding:1px"></div>';
-    echo Horde::link('', _("Select a date"), '', '', 'openCalendar(\'dateimg\', \'search_date[' . $i . ']\'); return false;') . Horde::img('calendar.png', _("Calendar"), 'align="top" id="dateimg"', $GLOBALS['registry']->getImageDir('horde')) . '</a>';
+    echo Horde::link('#', _("Select a date"), '', '', 'openCalendar(\'dateimg\', \'search_date[' . $i . ']\'); return false;') . Horde::img('calendar.png', _("Calendar"), 'align="top" id="dateimg"', $GLOBALS['registry']->getImageDir('horde')) . '</a>';
 } ?>
  </td>
 <?php endif; ?>


--- orig/po/ko_KR.po
+++ mod/po/ko_KR.po
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: IMP 4.0-cvs\n"
 "Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-05-08 16:42+0900\n"
+"POT-Creation-Date: 2005-10-18 15:12+0200\n"
 "PO-Revision-Date: 2001-11-09 16:29+0900\n"
 "Last-Translator: Jinhyok Heo <novembre at ournature.org>\n"
 "Language-Team: i18n at lists.horde.org\n"
@@ -15,161 +15,167 @@
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/Compose.php:266 lib/Compose.php:318
+#: lib/Compose.php:418
+#, fuzzy
+msgid "      Cc: "
+msgstr "¹Þ´Â»ç¶÷: "
+
+#: lib/Compose.php:415
 msgid "      To: "
 msgstr "¹Þ´Â»ç¶÷: "
 
-#: lib/Compose.php:254 lib/Compose.php:306
+#: lib/Compose.php:403
 msgid "    Date: "
 msgstr "³¯Â¥: "
 
-#: lib/Compose.php:257 lib/Compose.php:309
+#: lib/Compose.php:406
 msgid "    From: "
 msgstr "º¸³½»ç¶÷: "
 
-#: mailbox.php:399
+#: mailbox.php:422 templates/folders/head.inc:7
+#, php-format
 msgid " (Accesskey %s)"
 msgstr " (´ÜÃàÅ° %s)"
 
-#: lib/Compose.php:263 lib/Compose.php:315
+#: lib/Compose.php:412
 msgid " Subject: "
 msgstr "Á¦¸ñ: "
 
-#: templates/compose/spelling.inc:74
+#: templates/compose/spelling.inc:70
 msgid " in "
 msgstr " : "
 
-#: templates/mailbox/message_headers.inc:7
+#: templates/mailbox/message_headers.inc:12
 msgid "#"
 msgstr ""
 
-#: lib/Block/summary.php:71
+#: lib/Block/summary.php:69
 #, php-format
 msgid "%.2fMB / %.2fMB  (%.2f%%)"
 msgstr ""
 
-#: mailbox.php:190
-msgid "%d message(s) have been deleted."
+#: thread.php:151
+#, fuzzy, php-format
+msgid "%d Messages"
+msgstr "ÆíÁö ¾øÀ½"
+
+#: mailbox.php:176
+#, fuzzy, php-format
+msgid "%d messages have been deleted."
 msgstr "%d°³ ÆíÁö Áö¿öÁü. "
 
-#: lib/Spam.php:182
+#: lib/Spam.php:178
 #, fuzzy, php-format
 msgid ""
 "%d messages have been reported as not spam to your system administrator."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: lib/Spam.php:162
+#: lib/Spam.php:158
 #, fuzzy, php-format
 msgid "%d messages have been reported as not spam."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: lib/Spam.php:174
+#: lib/Spam.php:170
 #, fuzzy, php-format
 msgid "%d messages have been reported as spam to your system administrator."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: lib/Spam.php:154
+#: lib/Spam.php:150
 #, fuzzy, php-format
 msgid "%d messages have been reported as spam."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: mailbox.php:362
+#: mailbox.php:373
 #, php-format
 msgid "%d to %d of %d Messages"
 msgstr "%d / %d (ÆíÁö: %d)"
 
-#: mailbox.php:607
+#: mailbox.php:640
 #, php-format
 msgid "%s KB"
 msgstr ""
 
-#: pgp.php:332
-#, php-format
-msgid "%s PGP Administration"
-msgstr ""
-
-#: smime.php:254
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:44
 #, php-format
-msgid "%s S/MIME Administration"
-msgstr ""
-
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:49
 msgid "%s already exists. Your %s folder was not renamed."
 msgstr "%s °¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù. %s ÆíÁöÇÔÀÇ ÀÌ¸§À» º¯°æÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: lib/Message.php:633
+#: lib/Message.php:649
+#, php-format
 msgid "%s does not appear to be a valid mailbox."
 msgstr "%s ´Â Á¤»óÀûÀÎ ÆíÁöÇÔÀ¸·Î º¸ÀÌÁö ¾Ê½À´Ï´Ù."
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:47
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:42
+#, php-format
 msgid "%s folder being renamed at the start of the month."
 msgstr "%s ÆíÁöÇÔÀÇ ÀÌ¸§À» ¸Å¿ùÃÊ º¯°æÇÕ´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:226
+#: lib/MIME/Viewer/itip.php:256
 #, php-format
 msgid "%s has accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:581
-#, php-format
+#: lib/MIME/Viewer/itip.php:625
+#, fuzzy, php-format
 msgid "%s has cancelled %s."
-msgstr ""
+msgstr "ÆíÁöÇÔ \"%s\"ÀÌ \"%s\"¿¡ ¼º°øÀûÀ¸·Î Ãß°¡µÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:232
+#: lib/MIME/Viewer/itip.php:262
 #, php-format
 msgid "%s has declined."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:452
+#: lib/MIME/Viewer/itip.php:493
 #, php-format
 msgid "%s has replied to a free/busy request."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:572
+#: lib/MIME/Viewer/itip.php:616
 #, fuzzy, php-format
 msgid "%s has replied to the invitation to %s."
 msgstr "%s Á¤ÀÇ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:441
-#, php-format
+#: lib/MIME/Viewer/itip.php:482
+#, fuzzy, php-format
 msgid "%s has sent you free/busy information."
-msgstr ""
+msgstr "µ¥ÀÌÅ¸ ÀÓÆ÷Æ® ¿À·ù"
 
-#: lib/MIME/Viewer/itip.php:238
+#: lib/MIME/Viewer/itip.php:268
 #, php-format
 msgid "%s has tentatively accepted."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:446
-#, php-format
+#: lib/MIME/Viewer/itip.php:487
+#, fuzzy, php-format
 msgid "%s requests your free/busy information."
-msgstr ""
+msgstr "ÆíÁö ¼¹ö Á¤º¸»çÇ×"
 
-#: lib/MIME/Viewer/itip.php:541
+#: lib/MIME/Viewer/itip.php:584
 #, php-format
 msgid "%s requests your presence at %s."
 msgstr ""
 
-#: lib/Message.php:388
-msgid "%s was successfully added to %s."
+#: lib/Message.php:414
+#, fuzzy, php-format
+msgid "%s was successfully added to \"%s\"."
 msgstr "ÆíÁöÇÔ \"%s\"ÀÌ \"%s\"¿¡ ¼º°øÀûÀ¸·Î Ãß°¡µÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:553
+#: lib/MIME/Viewer/itip.php:597
 #, php-format
 msgid "%s wishes to ammend %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:531
+#: lib/MIME/Viewer/itip.php:574
 #, php-format
 msgid "%s wishes to make you aware of %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:558
-#, php-format
+#: lib/MIME/Viewer/itip.php:602
+#, fuzzy, php-format
 msgid "%s wishes to receive the latest information about %s."
-msgstr ""
+msgstr "%s Á¤ÀÇ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: message.php:276 message.php:281
+#: message.php:285 message.php:290
 #, php-format
 msgid "%s: %s"
 msgstr ""
@@ -179,22 +185,30 @@
 msgid "%s: %s (%d&nbsp;of&nbsp;%d)"
 msgstr "%s: %s (%d&nbsp;/&nbsp;%d)"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "(Apply these changes and move to next screen.)"
 msgstr "(º¯°æ»çÇ× Àû¿ë ÈÄ ´ÙÀ½ È¸éÀ¸·Î ÀÌµ¿)"
 
-#: templates/compose/spelling.inc:127
+#: templates/compose/spelling.inc:120
 msgid "(Discard all changes and return to the compose screen.)"
 msgstr "(¸ðµç º¯°æ»çÇ× Ãë¼Ò ÈÄ µÇµ¹¾Æ°¡±â.)"
 
-#: spelling.php:273
+#: templates/stationery/prefs.inc:16
+msgid "(HTML)"
+msgstr ""
+
+#: templates/stationery/prefs.inc:16
+msgid "(Plain Text)"
+msgstr ""
+
+#: spelling.php:280
 msgid ""
 "(Return to the compose screen after applying all changes made thus far.  "
 "Changes on the current screen will NOT be applied.)"
 msgstr ""
 "(¸ðµç º¯°æ»çÇ× Àû¿ë ÈÄ µÇµ¹¾Æ°¨. ÇöÀç È¸éÀÇ º¯°æ³»¿ëÀº Àû¿ëµÇÁö ¾Ê½À´Ï´Ù.)"
 
-#: spelling.php:270
+#: spelling.php:277
 msgid ""
 "(Send message after applying all changes made thus far.  Changes on the "
 "current screen will NOT be applied.)"
@@ -202,55 +216,61 @@
 "(¸ðµç º¯°æ³»¿ëÀ» Àû¿ë ÈÄ ÆíÁö º¸³»±â. ÇöÀç È¸éÀÇ º¯°æ³»¿ëÀº Àû¿ëµÇÁö ¾Ê½À´Ï"
 "´Ù.)"
 
-#: templates/contacts/contacts.inc:228
+#: templates/contacts/contacts.inc:227
 msgid "* Add these by clicking OK *"
 msgstr "* OK¸¦ Å¬¸¯ÇÏ¿© Ãß°¡ÇÏ¼¼¿ä *"
 
-#: templates/contacts/contacts.inc:208
+#: templates/contacts/contacts.inc:206
 msgid "* Please select address(es) *"
 msgstr "* ÁÖ¼Ò¸¦ ¼±ÅÃÇÏ¼¼¿ä *"
 
-#: lib/Spam.php:184
+#: mailbox.php:174
+#, fuzzy
+msgid "1 message has been deleted."
+msgstr "ÆíÁö Áö¿öÁü"
+
+#: lib/Spam.php:180
 #, fuzzy
 msgid "1 message has been reported as not spam to your system administrator."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: lib/Spam.php:164
+#: lib/Spam.php:160
 #, fuzzy
 msgid "1 message has been reported as not spam."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: lib/Spam.php:176
+#: lib/Spam.php:172
 #, fuzzy
 msgid "1 message has been reported as spam to your system administrator."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: lib/Spam.php:156
+#: lib/Spam.php:152
 #, fuzzy
 msgid "1 message has been reported as spam."
 msgstr "ÀÌ ÆíÁö´Â ½Ã½ºÅÛ °ü¸®ÀÚ¿¡°Ô ½ºÆÔÀ¸·Î º¸°íµÇ¾ú½À´Ï´Ù."
 
-#: config/prefs.php.dist:788
+#: config/prefs.php.dist:819
 msgid "100 characters"
 msgstr "100ÀÚ"
 
-#: config/prefs.php.dist:791
+#: config/prefs.php.dist:822
 msgid "1000 characters"
 msgstr "1000ÀÚ"
 
-#: config/prefs.php.dist:789
+#: config/prefs.php.dist:820
 msgid "250 characters"
 msgstr "250ÀÚ"
 
-#: config/prefs.php.dist:790
+#: config/prefs.php.dist:821
 msgid "500 characters"
 msgstr "500ÀÚ"
 
-#: lib/MIME/Viewer/images.php:159
+#: lib/MIME/Viewer/images.php:162
+#, php-format
 msgid "A large image named %s is attached to this message."
 msgstr "%s¶ó´Â Å« ±×¸²ÀÌ ÆíÁö¿¡ Ã·ºÎµÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/notification.php:53
+#: lib/MIME/Viewer/notification.php:50
 msgid ""
 "A message you have sent has resulted in a return notification from the "
 "recipient."
@@ -260,167 +280,184 @@
 msgid "AND"
 msgstr "±×¸®°í"
 
-#: lib/MIME/Viewer/itip.php:546
+#: lib/MIME/Viewer/itip.php:590
 msgid "Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:705
+#: lib/MIME/Viewer/itip.php:587
+msgid "Accept request and add it to my calendar"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:753
 msgid "Accepted"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:227
+#: lib/MIME/Viewer/itip.php:257
 msgid "Accepted: "
 msgstr ""
 
-#: lib/IMP.php:910 lib/IMP.php:912
-msgid "Acco_unts"
-msgstr "_u¿ÜºÎ°èÁ¤"
-
 #: templates/fetchmail/manage.inc:7
 msgid "Account's name:"
 msgstr "°èÁ¤ ÀÌ¸§:"
 
-#: lib/MIME/Viewer/itip.php:477 lib/MIME/Viewer/itip.php:682
+#: lib/MIME/Viewer/itip.php:520 lib/MIME/Viewer/itip.php:730
 #, fuzzy
 msgid "Actions"
 msgstr "½ÇÇà"
 
+#: lib/MIME/Headers.php:200 lib/MIME/Headers.php:201
+#, fuzzy, php-format
+msgid "Add %s to my Address Book"
+msgstr "\"%s\"¸¦ ÁÖ¼Ò·Ï¿¡ Ãß°¡"
+
 #: templates/prefs/sourceselect.inc:303
 msgid "Add source"
 msgstr "¼Ò½º Ãß°¡"
 
-#: lib/MIME/Viewer/itip.php:534 lib/MIME/Viewer/itip.php:544
+#: lib/MIME/Viewer/itip.php:577 lib/MIME/Viewer/itip.php:588
 msgid "Add this to my calendar"
 msgstr ""
 
-#: lib/MIME/Headers.php:206 lib/MIME/Headers.php:207
-msgid "Add to Address book (%s)"
-msgstr "\"%s\"¸¦ ÁÖ¼Ò·Ï¿¡ Ãß°¡"
-
-#: compose.php:1177
+#: compose.php:1256
+#, php-format
 msgid "Added \"%s\" as an attachment."
 msgstr "Ã·ºÎÆÄÀÏ(\"%s\") Ãß°¡µÊ"
 
-#: config/prefs.php.dist:190
+#: config/prefs.php.dist:198
+#, fuzzy
 msgid ""
-"Additional headers to display when viewing: <i>(optional, enter each header "
-"on a new line)</i>"
+"Additional headers to display when viewing: <em>(optional, enter each header "
+"on a new line)</em>"
 msgstr ""
 "ÆíÁö º¼ ¶§ Ãß°¡·Î º¸¿©ÁÙ ¸Ó¸´¸»(header): <i>(¼±ÅÃ»çÇ×ÀÌ¸ç, ÇÑ ÁÙ¿¡ ¸Ó¸´¸» ÇÏ"
 "³ª¾¿ ¾²¼¼¿ä.)</i>"
 
-#: lib/MIME/Viewer/notification.php:65
-#, php-format
+#: lib/MIME/Viewer/notification.php:62
+#, fuzzy, php-format
 msgid "Additional information can be viewed %s."
-msgstr ""
+msgstr "°³ÀÎ Á¤º¸"
 
-#: lib/MIME/Viewer/notification.php:65
+#: lib/MIME/Viewer/notification.php:62
 #, fuzzy
 msgid "Additional information details"
 msgstr "°³ÀÎ Á¤º¸"
 
-#: lib/MIME/Viewer/status.php:96
+#: lib/MIME/Viewer/status.php:93
+#, fuzzy
 msgid "Additional message details"
-msgstr ""
+msgstr "°³ÀÎ Á¤º¸"
 
-#: lib/MIME/Viewer/status.php:95
+#: lib/MIME/Viewer/status.php:92
 #, php-format
 msgid "Additional message details can be viewed %s."
 msgstr ""
 
-#: lib/MIME/Viewer/status.php:81
+#: lib/MIME/Viewer/status.php:78
+#, fuzzy
 msgid "Additional message error details"
-msgstr ""
+msgstr "°³ÀÎ Á¤º¸"
 
-#: lib/MIME/Viewer/status.php:80
+#: lib/MIME/Viewer/status.php:77
 #, php-format
 msgid "Additional message error details can be viewed %s."
 msgstr ""
 
-#: contacts.php:90 templates/contacts/contacts.inc:175
-#: templates/compose/compose.inc:330 templates/compose/redirect.inc:55
+#: contacts.php:85 templates/contacts/contacts.inc:180
+#: templates/compose/compose.inc:339 templates/compose/redirect.inc:52
 msgid "Address Book"
 msgstr "ÁÖ¼Ò·Ï"
 
-#: config/prefs.php.dist:126
+#: config/prefs.php.dist:134
 msgid "Address Books"
 msgstr "ÁÖ¼Ò·Ï"
 
-#: config/prefs.php.dist:181
+#: config/prefs.php.dist:189
+#, fuzzy
 msgid ""
-"Addresses to BCC all messages: <i>(optional, enter each address on a new "
-"line)</i>"
+"Addresses to BCC all messages: <em>(optional, enter each address on a new "
+"line)</em>"
 msgstr ""
 "¸ðµç ÆíÁö¿¡ Ãß°¡ÇÒ ¼ûÀºÂüÁ¶ ÁÖ¼Ò: <i>(¼±ÅÃ»çÇ×ÀÌ¸ç, ÇÑ ÁÙ¿¡ ÁÖ¼Ò ÇÏ³ª¾¿ ¾²¼¼"
 "¿ä.)</i>"
 
-#: config/prefs.php.dist:173
+#: config/prefs.php.dist:181
+#, fuzzy
 msgid ""
-"Addresses to explicitly tie to this identity: <i>(optional, enter each "
-"address on a new line)</i>"
+"Addresses to explicitly tie to this identity: <em>(optional, enter each "
+"address on a new line)</em>"
 msgstr ""
+"¸ðµç ÆíÁö¿¡ Ãß°¡ÇÒ ¼ûÀºÂüÁ¶ ÁÖ¼Ò: <i>(¼±ÅÃ»çÇ×ÀÌ¸ç, ÇÑ ÁÙ¿¡ ÁÖ¼Ò ÇÏ³ª¾¿ ¾²¼¼"
+"¿ä.)</i>"
 
-#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:792
+#: templates/mailbox/navbar.inc:10 config/prefs.php.dist:823
 msgid "All"
 msgstr "¸ðµÎ ¼±ÅÃ"
 
-#: templates/folders/javascript.inc:5
-msgid "All messages in the folder(s) will be lost!"
-msgstr "ÆíÁöÇÔÀÇ ¸ðµç ÆíÁö°¡ Áö¿öÁý´Ï´Ù!"
-
-#: templates/folders/javascript.inc:6
+#: templates/javascript/folders.js:13
 msgid ""
 "All messages in the following folder(s) will be downloaded into one MBOX "
 "file:"
 msgstr "´ÙÀ½ ÆíÁöÇÔÀÇ ¸ðµç ÆíÁö¸¦ ÇÏ³ªÀÇ MBOX ÆÄÀÏ·Î ´Ù¿î·ÎµåÇÕ´Ï´Ù."
 
-#: lib/Maintenance/Task/purge_trash.php:83
+#: lib/Maintenance/Task/purge_trash.php:80
+#, php-format
 msgid ""
 "All messages in your \"%s\" folder older than %s days will be permanently "
 "deleted."
 msgstr "\"%s\" ÆíÁöÇÔ¿¡¼ %s ÀÏº¸´Ù ¿À·¡µÈ ÆíÁö¸¦ Áö¿ó´Ï´Ù."
 
-#: lib/Maintenance/Task/delete_attachments_monthly.php:63
+#: lib/Maintenance/Task/delete_attachments_monthly.php:59
+#, php-format
 msgid "All old linked attachments more than %s months old will be deleted."
 msgstr "%s °³¿ùº¸´Ù ¿À·¡µÈ ÆíÁöÀÇ ¸µÅ© Ã·ºÎ ÆÄÀÏÀ» Áö¿ó´Ï´Ù."
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:78
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:73
+#, php-format
 msgid "All old sent-mail folders more than %s months old will be deleted."
 msgstr "%s °³¿ùº¸´Ù ¿À·¡µÈ º¸³½ÆíÁöÇÔÀ» ¸ðµÎ Áö¿ó´Ï´Ù."
 
 #: acl.php:85
 #, fuzzy, php-format
-msgid "All rights on folder '%s' successfully removed for user '%s'."
+msgid "All rights on folder \"%s\" successfully removed for user \"%s\"."
 msgstr "ÆíÁöÇÔ \"%s\"ÀÌ \"%s\"·Î º¯°æµÇ¾ú½À´Ï´Ù."
 
-#: templates/filters/prefs.inc:55
+#: lib/api.php:76
+msgid "Allow Folder Creation?"
+msgstr ""
+
+#: templates/filters/prefs.inc:48
 msgid "Allow filter rules to be applied in any mailbox?"
 msgstr "¸ðµç ÆíÁöÇÔ¿¡ ÇÊÅÍ ±ÔÄ¢À» Àû¿ëÇÒ ¼ö ÀÖ°Ô ÇÒ±î¿ä?"
 
-#: lib/MIME/Viewer/alternative.php:113
+#: lib/MIME/Viewer/alternative.php:110
 msgid "Alternative parts for this section:"
 msgstr "ÀÌ ºÎºÐ¿¡ ´ëÇÑ ´Ù¸¥ ´ëÃ¼ ³»¿ë:"
 
-#: config/prefs.php.dist:565 config/prefs.php.dist:586
+#: config/prefs.php.dist:572 config/prefs.php.dist:584
 msgid "Always"
 msgstr "Ç×»ó"
 
-#: config/prefs.php.dist:550
+#: config/prefs.php.dist:557
 msgid "Always save attachments"
 msgstr "Ç×»ó Ã·ºÎÆÄÀÏ ÀúÀåÇÏ±â"
 
-#: lib/Message.php:481
+#: lib/Message.php:505
 msgid ""
 "An error occured while attempting to strip the attachment. The IMAP server "
 "said: "
 msgstr ""
 
-#: lib/Message.php:375
+#: lib/Message.php:388
+#, fuzzy
+msgid "An unknown error occured while creating the new note."
+msgstr "»õ Ç×¸ñ Ãß°¡½Ã ¾Ë¼ö ¾ø´Â ¿À·ù ¹ß»ý."
+
+#: lib/Message.php:387
 #, fuzzy
 msgid "An unknown error occured while creating the new task."
 msgstr "»õ Ç×¸ñ Ãß°¡½Ã ¾Ë¼ö ¾ø´Â ¿À·ù ¹ß»ý."
 
-#: message.php:490 mailbox.php:677 templates/message/navbar_navigate.inc:9
+#: message.php:500 mailbox.php:714 templates/message/navbar_navigate.inc:9
 #: templates/mailbox/navbar.inc:18 templates/mailbox/navbar.inc:35
 #: templates/mailbox/legend.inc:6
 msgid "Answered"
@@ -435,41 +472,34 @@
 msgstr "ÇÊÅÍ Àû¿ëÇÏ±â"
 
 #: templates/mailbox/header.inc:7
+#, php-format
 msgid "Apply Filters to %s"
 msgstr "%s ÆíÁöÇÔ¿¡ ÇÊÅÍ Àû¿ëÇÏ±â"
 
-#: templates/filters/prefs.inc:43
+#: templates/filters/prefs.inc:36
 msgid "Apply filter rules upon logging on?"
 msgstr "·Î±×ÀÎÇÒ ¶§ ÇÊÅÍ Àû¿ë"
 
-#: templates/filters/prefs.inc:49
+#: templates/filters/prefs.inc:42
 msgid "Apply filter rules whenever INBOX is displayed?"
 msgstr "¹ÞÀºÆíÁöÇÔ °»½Å½Ã ÇÊÅÍ Àû¿ë"
 
-#: templates/folders/javascript.inc:9
-msgid "Are you SURE you want to continue?"
-msgstr "°è¼Ó ÁøÇàÇÏ½Ã°Ú½À´Ï±î?"
-
-#: templates/folders/javascript.inc:5
-msgid "Are you completely sure you wish to continue?"
-msgstr "°è¼Ó ÁøÇàÇÏ½Ã°Ú½À´Ï±î?"
-
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
 #, fuzzy
 msgid "Are you sure you want to delete this public key?"
 msgstr "ÀÌ ÆíÁö¸¦ ¿µ¿øÈ÷ Áö¿ì°Ú½À´Ï±î?"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+#, fuzzy
 msgid ""
 "Are you sure you want to delete your keypair? (This is NOT recommended!)"
-msgstr ""
+msgstr "ÀÌ ÆíÁö¸¦ ¿µ¿øÈ÷ Áö¿ì°Ú½À´Ï±î?"
 
 #: templates/compose/redirect.inc:5 templates/compose/compose.js:6
 msgid "Are you sure you want to do this?"
 msgstr "°è¼Ó ÁøÇàÇÏ½Ã°Ú½À´Ï±î?"
 
-#: message.php:398 templates/folders/javascript.inc:73
-#: templates/mailbox/javascript.inc:68
+#: message.php:407 templates/mailbox/javascript.inc:68
 msgid "Are you sure you wish to PERMANENTLY delete these messages?"
 msgstr "ÀÌ ÆíÁö¸¦ ¿µ¿øÈ÷ Áö¿ì°Ú½À´Ï±î?"
 
@@ -481,7 +511,12 @@
 msgid "Are you sure you wish to empty this folder?"
 msgstr "ÀÌ ÆíÁöÇÔÀ» ºñ¿ì½Ã°Ú½À´Ï±î?"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Are you sure you wish to empty your spam folder?"
+msgstr "Áö¿îÆíÁöÇÔ(Trash)À» ºñ¿ì½Ã°Ú½À´Ï±î?"
+
+#: lib/IMP.php:966
 msgid "Are you sure you wish to empty your trash folder?"
 msgstr "Áö¿îÆíÁöÇÔ(Trash)À» ºñ¿ì½Ã°Ú½À´Ï±î?"
 
@@ -489,82 +524,82 @@
 msgid "Are you sure you wish to permanently delete these messages?"
 msgstr "ÀÌ ÆíÁö¸¦ ¿ÏÀüÈ÷ Áö¿ì°Ú½À´Ï±î?"
 
-#: templates/mailbox/javascript.inc:86
+#: templates/message/javascript.inc:80 templates/mailbox/javascript.inc:79
 #, fuzzy
 msgid "Are you sure you wish to report this message as innocent?"
 msgstr "ÀÌ ÆíÁö¸¦ ¿µ¿øÈ÷ Áö¿ì°Ú½À´Ï±î?"
 
-#: templates/mailbox/javascript.inc:77
+#: templates/message/javascript.inc:75 templates/mailbox/javascript.inc:74
 #, fuzzy
 msgid "Are you sure you wish to report this message as spam?"
 msgstr "ÀÌ ÆíÁö¸¦ ¿µ¿øÈ÷ Áö¿ì°Ú½À´Ï±î?"
 
-#: config/prefs.php.dist:887
+#: config/prefs.php.dist:916
 msgid "Arrival Time"
 msgstr "µµÂø ½Ã°£"
 
-#: config/prefs.php.dist:902
+#: config/prefs.php.dist:931
 msgid "Ascending"
 msgstr "¿À¸§Â÷¼ø"
 
-#: config/prefs.php.dist:564 config/prefs.php.dist:585
+#: config/prefs.php.dist:571 config/prefs.php.dist:583
 msgid "Ask"
 msgstr "¹°¾îº¸±â"
 
-#: templates/compose/compose.inc:509
+#: templates/compose/compose.inc:519
 msgid "Attach"
 msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: templates/compose/compose.inc:466
+#: templates/compose/compose.inc:475
 msgid "Attach Files"
 msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: templates/compose/compose.inc:447
+#: templates/compose/compose.inc:456
 msgid "Attach a copy of your PGP public key to your message?"
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:113
+#: lib/MIME/Viewer/tnef.php:109
 msgid "Attached File:"
 msgstr "Ã·ºÎµÈ ÆÄÀÏ:"
 
-#: lib/Compose.php:366 lib/Compose.php:453
+#: lib/Compose.php:451 lib/Compose.php:536
+#, php-format
 msgid ""
 "Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
 msgstr "%s´Â ÆÄÀÏÃ·ºÎ Å©±â ÇÑ°è¸¦ ÃÊ°úÇÏ¿© Ã·ºÎµÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:341
+#: lib/MIME/Viewer/itip.php:376
 msgid "Attached is a reply to a calendar request you sent."
 msgstr ""
 
-#: mailbox.php:711 templates/mailbox/legend.inc:16
-#: templates/compose/attachments.inc:14 templates/compose/compose.inc:496
-#: templates/compose/attachments.js:98
+#: templates/mailbox/legend.inc:16 templates/compose/attachments.inc:14
+#: templates/compose/compose.inc:506 templates/compose/attachments.js:97
 msgid "Attachment"
 msgstr "ÆÄÀÏÃ·ºÎ"
 
-#: compose.php:987 lib/Message.php:442
+#: compose.php:1067 lib/Message.php:466
 msgid "Attachment stripped: Original attachment type"
 msgstr ""
 
-#: templates/compose/compose.inc:340 templates/compose/compose.inc:464
-#: lib/Compose.php:1009
+#: templates/compose/compose.inc:349 templates/compose/compose.inc:473
+#: lib/Compose.php:1073
 msgid "Attachments"
 msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: lib/MIME/Viewer/itip.php:635
+#: lib/MIME/Viewer/itip.php:682
 #, fuzzy
 msgid "Attendees"
 msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: lib/MIME/Viewer/notification.php:56
+#: lib/MIME/Viewer/notification.php:53
 msgid "Attention"
 msgstr "¾Ë¸²"
 
-#: lib/Auth/imp.php:49
+#: lib/Auth/imp.php:44
 msgid "Auth_imp: Required IMAP extension not found."
 msgstr ""
 
-#: config/prefs.php.dist:643
+#: config/prefs.php.dist:640
 msgid ""
 "Automatically show images in HTML messages when the sender is in my "
 "addressbook?"
@@ -575,36 +610,52 @@
 msgid "Available Address books:"
 msgstr "ÀÌ¿ë°¡´ÉÇÑ ÁÖ¼Ò·Ï:"
 
-#: lib/MIME/Viewer/itip.php:671
+#: lib/MIME/Viewer/itip.php:719
 msgid "Awaiting Response"
 msgstr ""
 
 #: templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Bac_k to %s"
 msgstr "_k%s·Î µ¹¾Æ°¡±â"
 
-#: thread.php:69 templates/message/navbar_navigate.inc:26
+#: thread.php:137 templates/message/navbar_navigate.inc:26
+#, php-format
 msgid "Back to %s"
 msgstr "%s·Î µ¹¾Æ°¡±â"
 
-#: message.php:257 search.php:153 templates/contacts/contacts.inc:224
-#: templates/compose/recompose.inc:20
+#: thread.php:134
+msgid "Back to Multiple Message View Index"
+msgstr ""
+
+#: thread.php:132
+msgid "Back to Thread Display"
+msgstr ""
+
+#: lib/IMAP/Client.php:387
+#, php-format
+msgid "Bad or malformed request. Server Responded: %s"
+msgstr ""
+
+#: message.php:266 templates/contacts/contacts.inc:222
+#: templates/compose/recompose.inc:20 lib/Search.php:34
 msgid "Bcc"
 msgstr "¼ûÀºÂüÁ¶"
 
-#: lib/MIME/Viewer/status.php:168
+#: lib/MIME/Viewer/status.php:161
+#, fuzzy
 msgid "Below is the raw text of the status information message."
-msgstr ""
+msgstr "ÆíÁö Àü´Þ"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "Blacklist"
 msgstr "¼ö½Å°ÅºÎ"
 
-#: config/prefs.php.dist:631
+#: config/prefs.php.dist:629
 msgid "Block images in HTML messages unless they are specifically requested?"
 msgstr "¿äÃ»ÀÌ ¾ø´Ù¸é HTML ÆíÁöÀÇ ±×¸²À» ¸·À»±î¿ä?"
 
-#: search.php:161
+#: lib/Search.php:42
 msgid "Body"
 msgstr "º»¹®"
 
@@ -613,42 +664,43 @@
 msgid "Both"
 msgstr "¸ðµÎ"
 
-#: config/prefs.php.dist:690
+#: config/prefs.php.dist:687
 msgid "Both Header Listing and Body of Message"
 msgstr "µÎ°¡Áö ¸ðµÎ"
 
-#: templates/compose/compose.inc:283
+#: templates/compose/compose.inc:272
 msgid "C_harset"
 msgstr "¹®ÀÚ¼Â"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Calendar"
 msgstr "´Þ·Â"
 
-#: lib/Fetchmail/imap.php:204
+#: lib/Fetchmail/imap.php:201
 msgid "Can not connect to the remote mail server."
 msgstr "¿ÜºÎ ¸ÞÀÏ¼¹ö¿¡ Á¢¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: lib/Fetchmail/imap.php:202
+#: lib/Fetchmail/imap.php:199
 msgid "Can not connect to the remote mail server: "
 msgstr "¿ÜºÎ ¸ÞÀÏ¼¹ö¿¡ Á¢¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù: "
 
-#: lib/MIME/Viewer/partial.php:53
+#: lib/MIME/Viewer/partial.php:50
 #, php-format
 msgid ""
 "Can not display - found only %s of %s parts of this message in the current "
 "mailbox."
 msgstr ""
 
-#: templates/contacts/contacts.inc:253 templates/folders/import.inc:21
-#: templates/smime/passphrase.inc:22 templates/smime/import_key.inc:85
-#: templates/compose/spelling.inc:127 templates/pgp/passphrase.inc:32
+#: folders.php:284 templates/contacts/contacts.inc:255
+#: templates/folders/import.inc:21 templates/saveimage/saveimage.inc:19
+#: templates/smime/passphrase.inc:21 templates/smime/import_key.inc:86
+#: templates/compose/spelling.inc:120 templates/pgp/passphrase.inc:32
 #: templates/pgp/import_key.inc:66
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
-#: templates/compose/compose.inc:70 templates/compose/compose.inc:426
-#: templates/compose/redirect.inc:116
+#: templates/compose/compose.inc:71 templates/compose/compose.inc:435
+#: templates/compose/redirect.inc:111
 msgid "Cancel Message"
 msgstr "ÆíÁö Ãë¼Ò"
 
@@ -656,29 +708,35 @@
 msgid "Cancelling this message will permanently discard its contents."
 msgstr "Ãë¼ÒÇÏ¸é ÀÌ ÆíÁöÀÇ ³»¿ëÀº ¿µ±¸È÷ Áö¿öÁö°Ô µË´Ï´Ù."
 
-#: message.php:256 search.php:149 templates/contacts/contacts.inc:223
-#: templates/compose/recompose.inc:15
+#: message.php:265 templates/contacts/contacts.inc:221
+#: templates/compose/recompose.inc:15 lib/Search.php:30
 msgid "Cc"
 msgstr "ÂüÁ¶"
 
-#: lib/MIME/Viewer/itip.php:653
+#: templates/smime/smime.inc:93
+msgid ""
+"Certificate import is not available. File upload is not enabled on this "
+"server."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:701
 #, fuzzy
 msgid "Chair Person"
 msgstr "°³ÀÎ ÆíÁö"
 
-#: templates/compose/spelling.inc:86
+#: templates/compose/spelling.inc:80
 msgid "Change"
 msgstr "º¯°æ"
 
-#: templates/compose/spelling.inc:87
+#: templates/compose/spelling.inc:81
 msgid "Change All"
 msgstr "¸ðµÎ º¯°æ"
 
-#: templates/acl/acl.inc:97 templates/acl/acl.inc:98
+#: templates/acl/acl.inc:92
 msgid "Change Folder"
 msgstr "ÆíÁöÇÔ º¯°æ"
 
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:112
 msgid ""
 "Change display options such as how many messages you see on each page and "
 "how messages are sorted."
@@ -694,23 +752,23 @@
 "reply to your email."
 msgstr "ÆíÁö¸¦ º¸³¾ ¶§ »ç¿ëÇÒ ÀÌ¸§, ÁÖ¼Ò, ¼¸íÀ» º¯°æÇÕ´Ï´Ù."
 
-#: config/prefs.php.dist:793
+#: config/prefs.php.dist:824
 msgid "Characters to display:"
 msgstr ""
 
-#: templates/folders/actions.inc:13
+#: templates/folders/actions.inc:15
 msgid "Check Folder(s) for New Mail"
 msgstr "ÆíÁöÇÔ¿¡¼ »õ ¸ÞÀÏ °Ë»ç"
 
-#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:65
+#: templates/folders/actions.inc:2 templates/mailbox/message_headers.inc:75
 msgid "Check _All/None"
 msgstr ""
 
-#: templates/fetchmail/fetchmail.inc:14
+#: templates/fetchmail/fetchmail.inc:10 templates/fetchmail/fetchmail.inc:21
 msgid "Check all mail servers you want to fetch mail from:"
 msgstr ""
 
-#: config/prefs.php.dist:454
+#: config/prefs.php.dist:463
 msgid "Check spelling before sending a message?"
 msgstr "ÆíÁö º¸³»±â Àü Ã¶ÀÚ °Ë»çÇÏ±â"
 
@@ -718,11 +776,18 @@
 msgid "Choose Action:"
 msgstr "¼±ÅÃ»çÇ×:"
 
-#: config/servers.php.dist:194
+#: config/servers.php.dist:182
+#, fuzzy
 msgid "Choose a mail server:"
-msgstr ""
+msgstr "¼±ÅÃ»çÇ×:"
 
-#: lib/MIME/Viewer/itip.php:478 lib/MIME/Viewer/itip.php:683
+#: templates/compose/compose.inc:125 templates/compose/compose.inc:166
+#: templates/compose/compose.inc:217
+#, fuzzy
+msgid "Choose a match or edit the address to the right:"
+msgstr "¼±ÅÃÇÏ°Å³ª ¿À¸¥ÂÊ ´ÙÀ½Ç×¸ñÀ» ¼öÁ¤ÇÏ¼¼¿ä:"
+
+#: lib/MIME/Viewer/itip.php:521 lib/MIME/Viewer/itip.php:731
 #, fuzzy
 msgid "Choose an action:"
 msgstr "¼±ÅÃ»çÇ×:"
@@ -737,39 +802,42 @@
 msgid "Choose the order of address books to search when expanding addresses."
 msgstr "ÁÖ¼Ò È®Àå½Ã °Ë»öÇÒ ÁÖ¼Ò·Ï ¼ø¼ ¼±ÅÃ"
 
-#: lib/MIME/Viewer/images.php:109
+#: lib/MIME/Viewer/images.php:106
+#, php-format
 msgid "Click %s to convert the image file into a format your browser can view."
 msgstr "ºê¶ó¿ìÁ®°¡ º¼ ¼ö ÀÖ´Â Çü½ÄÀ¸·Î ±×¸² ÆÄÀÏÀ» º¯È¯ÇÏ·Á¸é %s¸¦ ´©¸£¼¼¿ä."
 
-#: lib/MIME/Viewer/images.php:98
+#: lib/MIME/Viewer/images.php:95
+#, php-format
 msgid "Click %s to download the image."
 msgstr "ÀÌ¹ÌÁö¸¦ ³»·Á¹ÞÀ¸·Á¸é %s¸¦ ´©¸£¼¼¿ä."
 
-#: lib/Filter.php:113
+#: lib/Filter.php:106
+#, php-format
 msgid "Click %s to go to %s management page."
 msgstr "%s¸¦ ´©¸£¸é %s °ü¸®ÆäÀÌÁö·Î °©´Ï´Ù."
 
 #: lib/MIME/Viewer/html.php:116
+#, php-format
 msgid "Click %s to view HTML content in a separate window."
 msgstr "»õ Ã¢¿¡¼ html ³»¿ëÀ» º¸·Á¸é %s¸¦ ´©¸£¼¼¿ä."
 
-#: lib/MIME/Viewer/images.php:160
+#: lib/MIME/Viewer/images.php:163
+#, php-format
 msgid "Click %s to view a thumbnail of this image."
 msgstr "ÀÌ ±×¸²ÀÇ ½æ³×ÀÏÀ» º¸·Á¸é %s¸¦ ´©¸£¼¼¿ä."
 
-#: lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/pkcs7.php:418
+#, php-format
 msgid "Click %s to view the attachment in a separate window."
 msgstr "»õ Ã¢¿¡¼ Ã·ºÎ¸¦ º¸·Á¸é %s¸¦ ´©¸£¼¼¿ä."
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
+#, php-format
 msgid "Click %s to view this multipart/related part in a separate window."
 msgstr "ÀÌ ºÎºÐÀ» »õ Ã¢¿¡¼ º¸·Á¸é %s¸¦ Å¬¸¯ÇÏ¼¼¿ä."
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Click here to HIDE the Images"
-msgstr "ÀÌ¹ÌÁö¸¦ °¨Ãß·Á¸é ¿©±â¸¦ ´©¸£¼¼¿ä."
-
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:95
 msgid "Click here to SHOW the Images"
 msgstr "ÀÌ¹ÌÁö¸¦ º¸·Á¸é ¿©±â¸¦ ´©¸£¼¼¿ä."
 
@@ -780,49 +848,49 @@
 "search."
 msgstr "¼±ÅÃµÈ ÁÖ¼Ò·ÏÁß ÇÏ³ª¸¦ ¼±ÅÃÇÑÈÄ °Ë»ö Ç×¸ñÀ» ¼±ÅÃÇÏ¼¼¿ä."
 
-#: lib/MIME/Viewer/pgp.php:176
+#: lib/MIME/Viewer/pgp.php:171
 msgid "Click to Save PGP Public Key in your Address book"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:194
+#: lib/MIME/Viewer/pkcs7.php:202
 #, php-format
 msgid "Click to Save S/MIME certificate of %s in your Address Book"
 msgstr ""
 
-#: config/prefs.php.dist:921
+#: config/prefs.php.dist:950
 msgid "Clicking on the address will compose a new message to the sender"
 msgstr "ÁÖ¼Ò¸¦ Å¬¸¯ÇÏ¸é º¸³½ÀÌ¿¡°Ô »õ ÆíÁö¸¦ ¾¹´Ï´Ù."
 
-#: config/prefs.php.dist:922
+#: config/prefs.php.dist:951
 msgid "Clicking on the address will open the message to be read"
 msgstr "ÁÖ¼Ò¸¦ Å¬¸¯ÇÏ¸é ÆíÁö¸¦ º¸¿©ÁÝ´Ï´Ù."
 
-#: templates/fetchmail/fetchmail.inc:30
+#: templates/fetchmail/fetchmail.inc:28
 #, fuzzy
 msgid "Close"
 msgstr "»õ ÆíÁö"
 
-#: compose.php:762 compose.php:1068
+#: compose.php:828 compose.php:1148
 msgid "Close this window"
 msgstr "Ã¢ ´Ý±â"
 
-#: folders.php:383
+#: folders.php:429
 msgid "Closed Folder"
 msgstr "´ÝÈù ÆíÁöÇÔ"
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse"
 msgstr "´Ý±â"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All"
 msgstr "¸ðµÎ ´Ý±â"
 
-#: templates/folders/actions.inc:34
+#: templates/folders/actions.inc:39
 msgid "Collapse All Folders"
 msgstr "¸ðµç ÆíÁöÇÔ ´Ý±â"
 
-#: folders.php:403
+#: folders.php:449
 msgid "Collapse Folder"
 msgstr "ÆíÁöÇÔ ´Ý±â"
 
@@ -830,67 +898,69 @@
 msgid "Color Indicator: "
 msgstr ""
 
-#: templates/pgp/pgp.inc:191
+#: templates/pgp/pgp.inc:103
+#, fuzzy
 msgid "Comment"
-msgstr ""
+msgstr "»õ ÆíÁö"
 
-#: lib/MIME/Viewer/itip.php:721
+#: lib/MIME/Viewer/itip.php:769
 #, fuzzy
 msgid "Completed"
 msgstr "»õ ÆíÁö"
 
-#: lib/Block/summary.php:19 lib/Block/tree_folders.php:42
-msgid "Compose"
-msgstr "ÀÛ¼ºÇÏ±â"
-
-#: mailbox.php:741 lib/MIME/Headers.php:195
-msgid "Compose Message (%s)"
-msgstr "ÆíÁö ÀÛ¼º (%s)"
-
-#: compose.php:761 compose.php:1067
+#: compose.php:827 compose.php:1147
 msgid "Compose another message"
 msgstr "»õ ÆíÁö ÀÛ¼º"
 
-#: config/prefs.php.dist:429
+#: config/prefs.php.dist:434
 msgid "Compose messages in a separate window?"
 msgstr "»õ Ã¢¿¡¼ ÆíÁö ÀÛ¼º"
 
-#: config/prefs.php.dist:446
+#: config/prefs.php.dist:443
 msgid ""
 "Compose messages with an HTML GUI by default (if browser supports the "
 "feature)?"
 msgstr ""
 "(ºê¶ó¿ìÁ®°¡ ±â´ÉÀ» Áö¿øÇÒ °æ¿ì) ÆíÁö¸¦ ¾µ ¶§ HTML ÀÛ¼º¸ðµå¸¦ ±âº»À¸·Î ÇÒ±î¿ä?"
 
-#: config/prefs.php.dist:70
+#: config/prefs.php.dist:67
 msgid "Configure how messages are displayed."
 msgstr "ÆíÁö º¸´Â ¹æ¹ýÀ» ¼³Á¤ÇÕ´Ï´Ù."
 
-#: config/prefs.php.dist:96
+#: config/prefs.php.dist:97
 msgid "Configure mail preview options."
 msgstr ""
 
-#: lib/Fetchmail/imap.php:237
+#: lib/IMAP/Client.php:370
+#, fuzzy
+msgid "Connection dropped by IMAP server."
+msgstr "¼¹ö ¿¬°á ½ÇÆÐ"
+
+#: lib/Fetchmail/imap.php:234
 msgid "Connection to server failed"
 msgstr "¼¹ö ¿¬°á ½ÇÆÐ"
 
-#: config/prefs.php.dist:135
+#: config/prefs.php.dist:143
 #, php-format
 msgid "Control PGP support for %s."
 msgstr ""
 
-#: config/prefs.php.dist:144
+#: config/prefs.php.dist:152
 #, php-format
 msgid "Control S/MIME support for %s."
 msgstr ""
 
-#: config/prefs.php.dist:88
+#: config/prefs.php.dist:121
+msgid "Control options relating to messages searching."
+msgstr ""
+
+#: config/prefs.php.dist:89
 msgid ""
 "Control when new mail will be checked for, and whether or not to notify you "
 "when it arrives."
 msgstr "»õ ÆíÁö µµÂø ¾Ë¸² »ç¿ë ¼³Á¤"
 
-#: config/prefs.php.dist:700
+#: config/prefs.php.dist:696
 msgid "Convert textual emoticons into graphical ones?"
 msgstr "¹®ÀÚ ÀÌ¸ðÆ¼ÄÜÀ» ±×¸²À¸·Î ¹Ù²Ü±î¿ä?"
 
@@ -898,51 +968,60 @@
 msgid "Copy"
 msgstr "º¹»ç"
 
-#: templates/message/navbar_navigate.inc:19
+#: templates/message/navbar_navigate.inc:19 templates/mailbox/navbar.inc:51
 msgid "Copy to folder"
 msgstr "ÆíÁöÇÔÀ¸·Î º¹»ç"
 
-#: templates/compose/spelling.inc:66
+#: templates/compose/spelling.inc:63
 msgid "Correct"
 msgstr "±³Á¤"
 
-#: templates/compose/spelling.inc:145
+#: templates/compose/spelling.inc:140
 msgid "Corrected Text"
 msgstr "±³Á¤µÈ º»¹®"
 
+#: lib/IMAP/Client.php:382
+#, php-format
+msgid "Could not complete request. Reason Given: %s"
+msgstr ""
+
 #: attachment.php:50
 #, php-format
 msgid "Could not create the VFS backend: %s"
 msgstr ""
 
-#: lib/Message.php:624
+#: lib/Message.php:640
+#, fuzzy, php-format
 msgid "Could not delete messages from %s. The server said: %s"
 msgstr "\"%s\"·ÎºÎÅÍ ÆíÁö Áö¿ì±â ½ÇÆÐ. ¼¹öÀÇ ¿À·ù: "
 
-#: lib/Session.php:294
+#: lib/Session.php:318
 #, fuzzy
 msgid "Could not execute maintenance operations."
 msgstr "ÆíÁöÇÔ ¿î¿ë "
 
-#: lib/MIME/Viewer/tnef.php:56
+#: lib/MIME/Viewer/tnef.php:54
 msgid "Could not extract the requested file from the MS-TNEF attachment."
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:61
+#: lib/MIME/Viewer/zip.php:58
 msgid "Could not extract the requested file from the Zip archive."
 msgstr ""
 
-#: search.php:356 templates/fetchmail/manage.inc:67
-#: templates/fetchmail/account_select.inc:26 templates/acl/acl.inc:39
-#: templates/acl/acl.inc:157
+#: lib/Session.php:273
+msgid "Could not retrieve namespace information from IMAP server."
+msgstr ""
+
+#: search.php:314 templates/fetchmail/manage.inc:67 templates/acl/acl.inc:39
+#: templates/acl/acl.inc:160
 msgid "Create"
 msgstr "¸¸µé±â"
 
-#: templates/folders/actions.inc:5
+#: templates/folders/actions.inc:6
 msgid "Create Folder"
 msgstr "»õ ÆíÁöÇÔ ¸¸µé±â"
 
-#: templates/pgp/pgp.inc:252
+#: templates/pgp/pgp.inc:137
 #, fuzzy
 msgid "Create Keys"
 msgstr "¸¸µé±â"
@@ -951,11 +1030,21 @@
 msgid "Create Virtual Folder"
 msgstr "°¡»ó ÆíÁöÇÔ ¸¸µé±â"
 
+#: templates/fetchmail/account_select.inc:26
+#, fuzzy
+msgid "Create a New Account"
+msgstr "´Ù¸¥ ¸ÞÀÏ °èÁ¤"
+
+#: templates/prefs/spamselect.inc:12 templates/prefs/spamselect.inc:24
+#, fuzzy
+msgid "Create a new Spam folder"
+msgstr "»õ Áö¿îÆíÁöÇÔ ¸¸µé±â"
+
 #: templates/prefs/folderselect.inc:12 templates/prefs/folderselect.inc:24
 msgid "Create a new drafts folder"
 msgstr "ÀÓ½Ãº¸°üÇÔ »õ·Î ¸¸µé±â"
 
-#: templates/prefs/sentmailselect.inc:27 templates/prefs/sentmailselect.inc:43
+#: templates/prefs/sentmailselect.inc:26 templates/prefs/sentmailselect.inc:42
 msgid "Create a new sent mail folder"
 msgstr "»õ º¸³½ÆíÁöÇÔ ¸¸µé±â"
 
@@ -963,18 +1052,27 @@
 msgid "Create a new trash folder"
 msgstr "»õ Áö¿îÆíÁöÇÔ ¸¸µé±â"
 
-#: config/prefs.php.dist:120
+#: config/prefs.php.dist:128
 msgid ""
 "Create filtering rules to organize your incoming mail, sort it into folders, "
 "and delete spam."
 msgstr "ÇÊÅÍ ±ÔÄ¢ ¸¸µé±â, ÆíÁöÇÔ Á¤·Ä¼ø¼, ½ºÆÔ Áö¿ì±â"
 
+#: templates/stationery/prefs.inc:14
+#, fuzzy
+msgid "Create new stationery"
+msgstr "»õ º¸³½ÆíÁöÇÔ ¸¸µé±â"
+
+#: config/prefs.php.dist:449
+msgid "Create stationery and form responses."
+msgstr ""
+
 #: templates/acl/acl.inc:95
 #, php-format
 msgid "Current access to %s"
 msgstr ""
 
-#: config/prefs.php.dist:104
+#: config/prefs.php.dist:105
 msgid "Customize accounts for fetching mail from other accounts."
 msgstr "´Ù¸¥ °èÁ¤À¸·ÎºÎÅÍ ¸ÞÀÏÀ» °¡Á®¿Àµµ·Ï ¼³Á¤ÇÕ´Ï´Ù."
 
@@ -983,59 +1081,82 @@
 msgstr "ÆíÁö º¸³»´Â ¹æ¹ý ¼³Á¤ÇÕ´Ï´Ù."
 
 #: config/prefs.php.dist:40
+#, fuzzy, php-format
 msgid "Customize tasks to run upon logon to %s."
 msgstr "À¥¸ÞÀÏ ·Î±×ÀÎ½Ã ½ÇÇàÇÒ ÀÛ¾÷À» ¼³Á¤ÇÕ´Ï´Ù."
 
-#: templates/mailbox/message_headers.inc:12
+#: templates/mailbox/message_headers.inc:17
 msgid "Dat_e"
 msgstr "³¯Â¥"
 
-#: message.php:253 thread.php:75
+#: message.php:262 thread.php:148
 msgid "Date"
 msgstr "³¯Â¥"
 
-#: lib/MIME/Viewer/itip.php:709
+#: lib/MIME/Viewer/itip.php:757
+#, fuzzy
 msgid "Declined"
-msgstr ""
+msgstr "Áö¿öÁü"
 
-#: lib/MIME/Viewer/itip.php:233
+#: lib/MIME/Viewer/itip.php:263
 msgid "Declined: "
 msgstr ""
 
-#: config/prefs.php.dist:894
+#: config/prefs.php.dist:537
+#, fuzzy
+msgid "Default"
+msgstr "Áö¿ì±â"
+
+#: templates/prefs/defaultsearchselect.inc:18
+msgid "Default Search Field"
+msgstr ""
+
+#: config/prefs.php.dist:923
 msgid "Default sorting criteria:"
 msgstr "±âº» Á¤·Ä Ç×¸ñ:"
 
-#: config/prefs.php.dist:904
+#: config/prefs.php.dist:933
 msgid "Default sorting direction:"
 msgstr "±âº» Á¤·Ä ¹æ¹ý"
 
-#: lib/MIME/Viewer/itip.php:717
+#: lib/MIME/Viewer/itip.php:765
+#, fuzzy
 msgid "Delegated"
-msgstr ""
+msgstr "Áö¿öÁü"
 
-#: folders.php:374 templates/fetchmail/manage.inc:68
+#: folders.php:419 templates/fetchmail/manage.inc:68
 #: templates/contacts/contacts.inc:244 templates/message/navbar_actions.inc:6
 #: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
-#: templates/smime/smime.inc:65 templates/compose/attachments.inc:28
-#: templates/pgp/pgp.inc:93
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
+#: templates/pgp/pgp.inc:27
 msgid "Delete"
 msgstr "Áö¿ì±â"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "Delete %s Public Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
-#: templates/smime/smime.inc:128 templates/pgp/pgp.inc:169
+#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:85
+#, fuzzy
 msgid "Delete Current Keys"
-msgstr ""
+msgstr "¸¸µé±â"
 
-#: templates/folders/actions.inc:7
+#: templates/folders/actions.inc:9
 msgid "Delete Folder(s)"
 msgstr "ÆíÁöÇÔ Áö¿ì±â"
 
-#: folders.php:374
+#: folders.php:285
+#, fuzzy
+msgid "Delete Selected Folders"
+msgstr "ÆíÁöÇÔ Áö¿ì±â"
+
+#: templates/stationery/prefs.inc:42
+#, fuzzy
+msgid "Delete Stationery"
+msgstr "°¡»ó ÆíÁöÇÔ Áö¿ì±â"
+
+#: folders.php:419
 msgid "Delete Virtual Folder"
 msgstr "°¡»ó ÆíÁöÇÔ Áö¿ì±â"
 
@@ -1043,23 +1164,24 @@
 msgid "Delete fetched messages from remote server?"
 msgstr "¿ÜºÎ¼¹ö¿¡¼ °¡Á®¿Â ÆíÁö¸¦ Áö¿ï±î¿ä?"
 
-#: lib/MIME/Viewer/itip.php:584
+#: lib/MIME/Viewer/itip.php:628
 msgid "Delete from my calendar"
 msgstr ""
 
-#: config/prefs.php.dist:362
+#: config/prefs.php.dist:368
 msgid "Delete old linked attachments at beginning of month?"
 msgstr "¸Å¿ùÃÊ ¿À·¡µÈ ¸µÅ© Ã·ºÎÆÄÀÏ Áö¿ì±â"
 
-#: config/prefs.php.dist:344
+#: config/prefs.php.dist:350
 msgid "Delete old sent-mail folders at beginning of month?"
 msgstr "¸Å¿ùÃÊ ¿À·¡µÈ º¸³½ÆíÁöÇÔ Áö¿ì±â"
 
-#: config/prefs.php.dist:621
-msgid "Delete spam messages after they have been reported as spam?"
-msgstr ""
+#: config/prefs.php.dist:617
+#, fuzzy
+msgid "Delete spam messages"
+msgstr "Áö¿öÁø ÆíÁö"
 
-#: message.php:493 mailbox.php:701 templates/mailbox/navbar.inc:20
+#: message.php:503 mailbox.php:740 templates/mailbox/navbar.inc:20
 #: templates/mailbox/navbar.inc:38 templates/mailbox/legend.inc:8
 msgid "Deleted"
 msgstr "Áö¿öÁü"
@@ -1068,7 +1190,8 @@
 msgid "Deleted messages"
 msgstr "Áö¿öÁø ÆíÁö"
 
-#: compose.php:292
+#: compose.php:307
+#, php-format
 msgid "Deleted the attachment \"%s\"."
 msgstr "Ã·ºÎÆÄÀÏ \"%s\" Áö¿öÁü"
 
@@ -1076,78 +1199,89 @@
 msgid "Deleting and Moving Messages"
 msgstr "ÆíÁö Áö¿ì±â ¹× ÀÌµ¿"
 
-#: lib/MIME/Viewer/itip.php:548
+#: lib/MIME/Viewer/itip.php:592
 msgid "Deny request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:497
+#: lib/MIME/Viewer/itip.php:540
+#, fuzzy
 msgid "Deny request for free/busy information"
-msgstr ""
+msgstr "ÆíÁö ¼¹ö Á¤º¸»çÇ×"
 
-#: config/prefs.php.dist:903
+#: config/prefs.php.dist:932
 msgid "Descending"
 msgstr "³»¸²Â÷¼ø"
 
-#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:623
+#: templates/compose/attachments.inc:21 lib/MIME/Viewer/itip.php:669
 msgid "Description"
 msgstr "Ã·ºÎ ¼³¸í:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/pgp/pgp.inc:27 templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 #, fuzzy
 msgid "Details"
 msgstr "ÀÏº°"
 
-#: config/prefs.php.dist:680
+#: config/prefs.php.dist:677
 msgid "Dim signatures?"
 msgstr "¼¸íÀ» Èå¸´ÇÏ°Ô Ç¥½Ã"
 
-#: templates/contacts/contacts.inc:237
+#: templates/contacts/contacts.inc:236
 msgid "Display"
 msgstr "Ç¥½Ã Çü½Ä"
 
-#: config/prefs.php.dist:470
+#: config/prefs.php.dist:479
 msgid "Display confirmation after sending a message?"
 msgstr "ÆíÁö¸¦ º¸³»°í ³ª¼ È®ÀÎ Ç¥½Ã¸¦ ÇÒ±î¿ä?"
 
-#: config/prefs.php.dist:689
+#: config/prefs.php.dist:686
 msgid "Display in Body of Message"
 msgstr "ÆíÁö º»¹®¿¡ º¸¿©ÁÖ±â"
 
-#: config/prefs.php.dist:768
+#: config/prefs.php.dist:792
 msgid "Display pop-up notification of new mail?"
 msgstr "»õ ÆíÁö µµÂø½Ã ÆË¾÷Ã¢À¸·Î ¾Ë¸²"
 
-#: config/prefs.php.dist:733
-msgid "Display the 'Empty Trash' link in the menubar?"
+#: config/prefs.php.dist:758
+#, fuzzy
+msgid "Display the \"Empty Spam\" link in the menubar?"
+msgstr "'Áö¿îÆíÁöÇÔ ºñ¿ò'À» ¸Þ´º¹Ù¿¡ º¸¿©ÁÙ±î¿ä?"
+
+#: config/prefs.php.dist:750
+#, fuzzy
+msgid "Display the \"Empty Trash\" link in the menubar?"
 msgstr "'Áö¿îÆíÁöÇÔ ºñ¿ò'À» ¸Þ´º¹Ù¿¡ º¸¿©ÁÙ±î¿ä?"
 
 #: templates/compose/attachments.inc:11
 msgid "Disposition"
 msgstr "¹èÄ¡"
 
-#: templates/search/fields.inc:25
+#: templates/search/fields.inc:26
 msgid "Do NOT match"
 msgstr "ÀÏÄ¡ÇÏÁö ¾Ê±â"
 
-#: templates/folders/actions.inc:14
+#: templates/folders/actions.inc:16
 msgid "Do Not Check Folder(s) for New Mail"
 msgstr "»õ ÆíÁö °Ë»çÇÏÁö ¾ÊÀ½"
 
-#: config/prefs.php.dist:923
+#: config/prefs.php.dist:952
 msgid "Do not generate a link in the From: column"
 msgstr "¹Þ´Â»ç¶÷ Ç×¸ñ¿¡ ¸µÅ©¸¦ ¸¸µéÁö ¾Ê½À´Ï´Ù."
 
-#: lib/IMP.php:1003
+#: lib/IMP.php:1075
 msgid "Do you want to open that folder?"
 msgstr "ÆíÁöÇÔÀ» ¿±î¿ä?"
 
-#: templates/compose/spelling.inc:133
+#: templates/login/login.inc:232
+msgid "Don't have an account? Sign up."
+msgstr ""
+
+#: templates/compose/spelling.inc:126
 msgid "Done"
 msgstr "¿Ï·á"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:192
+#, php-format
 msgid "Download %s in .zip Format"
 msgstr "%s¸¦ ¾ÐÃàÆÄÀÏ(zip)À¸·Î ³»·Á¹Þ±â"
 
@@ -1155,25 +1289,25 @@
 msgid "Download All Attachments (in .zip file)"
 msgstr "¾ÐÃàÆÄÀÏ(zip)·Î ÇÑ ¹ø¿¡ ³»·Á¹Þ±â"
 
-#: templates/folders/actions.inc:18
+#: templates/folders/actions.inc:20
 msgid "Download Folder(s)"
 msgstr "ÆíÁöÇÔ ³»·Á¹Þ±â"
 
-#: templates/folders/actions.inc:19
+#: templates/folders/actions.inc:21
 msgid "Download Folder(s) [.zip format]"
 msgstr "¾ÐÃàÆÄÀÏ(zip)·Î ÆíÁöÇÔ ³»·Á¹Þ±â"
 
-#: lib/MIME/Contents.php:204
+#: lib/MIME/Contents.php:192
 msgid "Download in .zip Format"
 msgstr "¾ÐÃàÆÄÀÏ(zip)·Î ³»·Á¹Þ±â"
 
-#: message.php:491 mailbox.php:682 templates/message/navbar_navigate.inc:11
+#: message.php:501 mailbox.php:719 templates/message/navbar_navigate.inc:11
 #: templates/mailbox/navbar.inc:22 templates/mailbox/navbar.inc:41
 #: templates/mailbox/legend.inc:9
 msgid "Draft"
 msgstr "ÀÓ½ÃÆíÁö"
 
-#: folders.php:354
+#: folders.php:392
 msgid "Draft folder"
 msgstr "ÀÓ½Ãº¸°üÇÔ:"
 
@@ -1181,120 +1315,143 @@
 msgid "Drafts folder:"
 msgstr "ÀÓ½Ãº¸°üÇÔ:"
 
-#: templates/pgp/pgp.inc:196
+#: templates/pgp/pgp.inc:108
 msgid "E-mail Address"
 msgstr "ÀÌ¸ÞÀÏ ÁÖ¼Ò:"
 
-#: lib/MIME/Viewer/status.php:77
+#: lib/Mailbox.php:309
+#, fuzzy
+msgid "END"
+msgstr "±×¸®°í"
+
+#: lib/MIME/Viewer/status.php:74
+#, fuzzy
 msgid "ERROR: Your message could not be delivered."
-msgstr ""
+msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î Àü¼ÛµÇ¾ú½À´Ï´Ù."
 
-#: folders.php:375
+#: folders.php:420 templates/stationery/prefs.inc:19
 msgid "Edit"
 msgstr "ÆíÁý"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit Blacklist"
 msgstr "¼ö½Å°ÅºÎ ¸ñ·Ï ¼öÁ¤"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit Filters"
 msgstr "ÇÊÅÍ ¼öÁ¤"
 
-#: folders.php:375 templates/search/header.inc:16
-#: templates/mailbox/header.inc:13
+#: folders.php:420 templates/search/header.inc:16
+#, fuzzy
 msgid "Edit Virtual Folder"
-msgstr ""
+msgstr "°¡»ó ÆíÁöÇÔ"
 
 #: templates/mailbox/header.inc:13
 #, fuzzy, php-format
 msgid "Edit Virtual Folder Definition for %s"
 msgstr "%s Á¤ÀÇ¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit Whitelist"
 msgstr "¼ö½Å½ÂÀÎ ¸ñ·Ï ¼öÁ¤"
 
-#: templates/filters/prefs.inc:21
+#: templates/filters/prefs.inc:18
 msgid "Edit your blacklist"
 msgstr "¼ö½Å°ÅºÎ ¸ñ·Ï ¼öÁ¤"
 
-#: templates/filters/prefs.inc:16
+#: templates/filters/prefs.inc:13
 msgid "Edit your filter rules"
 msgstr "ÇÊÅÍ ±ÔÄ¢ ¼öÁ¤"
 
-#: config/prefs.php.dist:830
+#: config/prefs.php.dist:861
 msgid "Edit your preferences for accessing other mail accounts."
 msgstr "¿ÜºÎ ¸ÞÀÏ °èÁ¤¿¡ Á¢±ÙÇÏ±â À§ÇÑ ¼±ÅÃ»çÇ× ¼öÁ¤ÇÏ±â"
 
-#: templates/filters/prefs.inc:26
+#: templates/filters/prefs.inc:23
 msgid "Edit your whitelist"
 msgstr "¼ö½Å½ÂÀÎ ¸ñ·Ï ¼öÁ¤"
 
-#: templates/contacts/contacts.inc:240
+#: templates/contacts/contacts.inc:239
 msgid "Email Address"
 msgstr "ÀÌ¸ÞÀÏ ÁÖ¼Ò"
 
-#: lib/Message.php:641
+#: lib/Message.php:657
 #, fuzzy, php-format
 msgid "Emptied all messages from %s."
 msgstr "%s·ÎºÎÅÍ Àü´ÞµÈ ÆíÁö"
 
-#: templates/folders/actions.inc:20
+#: templates/folders/actions.inc:22
 msgid "Empty Folder(s)"
 msgstr "ÆíÁöÇÔ ºñ¿ò"
 
+#: folders.php:286
+#, fuzzy
+msgid "Empty Selected Folders"
+msgstr "ÆíÁöÇÔ ºñ¿ò"
+
 #: templates/mailbox/actions.inc:39
 msgid "Empty Trash folder"
 msgstr "Áö¿îÆíÁöÇÔ ºñ¿ò"
 
-#: lib/IMP.php:901
+#: lib/IMP.php:973
+#, fuzzy
+msgid "Empty _Spam"
+msgstr "_tÁö¿îÆíÁöÇÔ ºñ¿ò"
+
+#: lib/IMP.php:966
 msgid "Empty _Trash"
 msgstr "_tÁö¿îÆíÁöÇÔ ºñ¿ò"
 
-#: templates/pgp/pgp.inc:20 templates/pgp/notactive.inc:16
+#: templates/pgp/pgp.inc:1 templates/pgp/notactive.inc:6
 msgid "Enable PGP functionality?"
 msgstr ""
 
-#: templates/smime/smime.inc:20 templates/smime/notactive.inc:16
+#: templates/smime/smime.inc:1 templates/smime/notactive.inc:6
 msgid "Enable S/MIME functionality?"
 msgstr ""
 
-#: config/prefs.php.dist:780
+#: config/prefs.php.dist:811
+#, fuzzy
 msgid "Enable message previews?"
-msgstr ""
+msgstr "%s·ÎºÎÅÍ Àü´ÞµÈ ÆíÁö"
 
-#: templates/compose/compose.inc:433
+#: templates/compose/compose.inc:442
 msgid "Encr_yption Options"
 msgstr "_y¾ÏÈ£È ¿É¼Ç"
 
-#: lib/MIME/Viewer/itip.php:474 lib/MIME/Viewer/itip.php:611
+#: lib/MIME/Viewer/itip.php:517 lib/MIME/Viewer/itip.php:657
+#, fuzzy
 msgid "End"
-msgstr ""
+msgstr "È®Àå"
 
-#: lib/Compose.php:331
+#: lib/Compose.php:384
 msgid "End forwarded message"
 msgstr "Àü´Þ ÆíÁö ³¡"
 
-#: lib/Compose.php:272
+#: lib/Compose.php:341
 #, fuzzy
 msgid "End message"
 msgstr "¿¾³¯ ÆíÁö"
 
-#: lib/Compose.php:270
+#: lib/Compose.php:339
 #, fuzzy, php-format
 msgid "End message from %s"
 msgstr "%s·ÎºÎÅÍ Àü´ÞµÈ ÆíÁö"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Enter Passphrase"
 msgstr ""
 
+#: templates/prefs/spamselect.inc:9
+#, fuzzy
+msgid "Enter the name for your new Spam folder"
+msgstr "»õ Áö¿îÆíÁöÇÔ ÀÌ¸§ ÀÔ·Â"
+
 #: templates/prefs/folderselect.inc:9
 msgid "Enter the name for your new drafts folder"
 msgstr "»õ ÀÓ½Ãº¸°üÇÔÀÇ ÀÌ¸§ ÀÔ·Â"
 
-#: templates/prefs/sentmailselect.inc:24
+#: templates/prefs/sentmailselect.inc:23
 msgid "Enter the name for your new sent mail folder"
 msgstr "»õ º¸³½ÆíÁöÇÔÀÇ ÀÌ¸§ ÀÔ·Â"
 
@@ -1302,83 +1459,100 @@
 msgid "Enter the name for your new trash folder"
 msgstr "»õ Áö¿îÆíÁöÇÔ ÀÌ¸§ ÀÔ·Â"
 
-#: message.php:185 compose.php:1054
+#: lib/Search.php:46
+#, fuzzy
+msgid "Entire Message"
+msgstr "ÆíÁö Àü´Þ"
+
+#: message.php:194 compose.php:1134 thread.php:71
+#, php-format
 msgid "Entry \"%s\" was successfully added to the address book"
 msgstr "\"%s\"°¡ ÁÖ¼Ò·Ï¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù."
 
-#: templates/smime/smime.inc:58 templates/pgp/pgp.inc:84
-#: lib/MIME/Viewer/pkcs7.php:370 lib/MIME/Viewer/pgp.php:392
-#: lib/MIME/Viewer/status.php:75 lib/MIME/Viewer/status.php:170
+#: templates/smime/smime.inc:18 templates/pgp/pgp.inc:21
+#: lib/MIME/Viewer/pkcs7.php:376 lib/MIME/Viewer/pgp.php:386
+#: lib/MIME/Viewer/status.php:72 lib/MIME/Viewer/status.php:163
 msgid "Error"
 msgstr "¿À·ù"
 
-#: lib/MIME/Viewer/itip.php:277 lib/MIME/Viewer/itip.php:370
+#: lib/IMAP/Client.php:454
+#, php-format
+msgid "Error connecting to IMAP server. %s : %s."
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:309 lib/MIME/Viewer/itip.php:407
 #, php-format
 msgid "Error sending reply: %s."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:92
+#: lib/MIME/Viewer/itip.php:101
+#, fuzzy
 msgid "Event successfully deleted."
-msgstr ""
+msgstr "¼±ÅÃ»çÇ×µéÀÌ ¼º°øÀûÀ¸·Î ÀúÀåµÇ¾ú½À´Ï´Ù."
 
-#: config/prefs.php.dist:758
+#: config/prefs.php.dist:782
 msgid "Every 15 minutes"
 msgstr "15ºÐ"
 
-#: config/prefs.php.dist:755
+#: config/prefs.php.dist:779
 msgid "Every 30 seconds"
 msgstr "30ÃÊ¸¶´Ù"
 
-#: config/prefs.php.dist:757
+#: config/prefs.php.dist:781
 msgid "Every 5 minutes"
 msgstr "5ºÐ¸¶´Ù"
 
-#: config/prefs.php.dist:759
+#: config/prefs.php.dist:783
 msgid "Every half hour"
 msgstr "30ºÐ¸¶´Ù"
 
-#: config/prefs.php.dist:756
+#: config/prefs.php.dist:780
 msgid "Every minute"
 msgstr "¸ÅºÐ¸¶´Ù"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand"
 msgstr "È®Àå"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All"
 msgstr "¸ðµÎ È®Àå"
 
-#: templates/folders/actions.inc:33
+#: templates/folders/actions.inc:38
 msgid "Expand All Folders"
 msgstr "¸ðµç ÆíÁöÇÔ È®ÀåÇÏ±â"
 
-#: folders.php:412
+#: folders.php:457
 msgid "Expand Folder"
 msgstr "ÆíÁöÇÔ È®Àå"
 
-#: templates/compose/compose.inc:331 templates/compose/redirect.inc:56
+#: templates/compose/compose.inc:340 templates/compose/redirect.inc:53
 msgid "Expand Names"
 msgstr "ÀÌ¸§ ¿Ï¼º"
 
-#: config/prefs.php.dist:1021
+#: config/prefs.php.dist:1063
 msgid "Expand names in the compose window automatically in the background?"
 msgstr "ÆíÁö ÀÛ¼ºÇÒ ¶§ ÀÌ¸§À» ÀÚµ¿À¸·Î ¿Ï¼º"
 
-#: config/prefs.php.dist:951
+#: config/prefs.php.dist:980
 msgid "Expand the entire folder tree by default in the folders view?"
 msgstr "ÆíÁöÇÔ ¸ñ·ÏÀ» º¼ ¶§ ±âº»À¸·Î ÀüÃ¼ ÆíÁöÇÔ È®ÀåÇÏ±â"
 
-#: templates/compose/compose.inc:155 templates/compose/compose.inc:205
-#: templates/compose/compose.inc:256 templates/compose/redirect.inc:104
+#: templates/compose/compose.inc:144 templates/compose/compose.inc:194
+#: templates/compose/compose.inc:245 templates/compose/redirect.inc:101
 msgid "Expanding"
 msgstr "ÀÚµ¿¿Ï¼º"
 
-#: templates/fetchmail/fetchmail.inc:29 config/prefs.php.dist:103
+#: lib/IMP.php:984 lib/IMP.php:986
+#, fuzzy
+msgid "F_etch Mail"
+msgstr "¿ÜºÎÆíÁö °¡Á®¿À±â"
+
+#: templates/fetchmail/fetchmail.inc:26 config/prefs.php.dist:104
 msgid "Fetch Mail"
 msgstr "¿ÜºÎÆíÁö °¡Á®¿À±â"
 
-#: config/prefs.php.dist:839
+#: config/prefs.php.dist:869
 msgid "Fetch Mail in a separate window?"
 msgstr "»õ Ã¢¿¡¼ ¿ÜºÎ ÆíÁö °¡Á®¿À±â"
 
@@ -1386,64 +1560,73 @@
 msgid "Fetch messages upon logging on?"
 msgstr "·Î±×ÀÎÇÒ ¶§ ¿ÜºÎ ÆíÁö °¡Á®¿À±â"
 
-#: lib/Fetchmail.php:306
-msgid "Fetched %d message(s) from %s"
+#: lib/Fetchmail.php:289
+#, fuzzy, php-format
+msgid "Fetched %d messages from %s"
+msgstr "%dÀÇ ÆíÁö¸¦ %s·ÎºÎÅÍ °¡Á®¿È"
+
+#: lib/Fetchmail.php:287
+#, fuzzy, php-format
+msgid "Fetched 1 message from %s"
 msgstr "%dÀÇ ÆíÁö¸¦ %s·ÎºÎÅÍ °¡Á®¿È"
 
-#: lib/Fetchmail.php:304 lib/Fetchmail.php:306
+#: lib/Fetchmail.php:285 lib/Fetchmail.php:287 lib/Fetchmail.php:289
+#, fuzzy
 msgid "Fetchmail: "
-msgstr ""
+msgstr "¿ÜºÎÆíÁö °¡Á®¿À±â"
 
-#: lib/Fetchmail.php:308
+#: lib/Fetchmail.php:291
 msgid "Fetchmail: no new messages."
 msgstr "ÆíÁö°¡Á®¿À±â: »õ ÆíÁö ¾øÀ½."
 
-#: lib/IMP.php:916
+#: lib/IMP.php:990
 msgid "Fi_lters"
 msgstr "_LÇÊÅÍ"
 
-#: templates/compose/compose.inc:492 templates/compose/attachments.js:83
+#: templates/compose/compose.inc:502 templates/compose/attachments.js:82
 msgid "File"
 msgstr "ÆÄÀÏ"
 
-#: templates/filters/prefs.inc:35
+#: templates/filters/prefs.inc:31
 msgid "Filter Options"
 msgstr "ÇÊÅÍ ¼±ÅÃ»çÇ×"
 
-#: templates/filters/prefs.inc:8
+#: templates/filters/prefs.inc:9
 msgid "Filter Settings"
 msgstr "ÇÊÅÍ ¼³Á¤"
 
-#: config/prefs.php.dist:603
+#: config/prefs.php.dist:600
 #, fuzzy
 msgid "Filter message content for profanity?"
 msgstr "ºñ¼Ó¾î°¡ µç ³»¿ëÀÇ ÆíÁö ÇÊÅÍ¸µ"
 
-#: templates/filters/notactive.inc:8
+#: templates/filters/notactive.inc:11
 msgid "Filter support is disabled on this system."
 msgstr ""
 
-#: config/prefs.php.dist:119
+#: config/prefs.php.dist:127
 msgid "Filters"
 msgstr "ÇÊÅÍ"
 
-#: templates/filters/notactive.inc:2
+#: templates/filters/notactive.inc:3
+#, fuzzy
 msgid "Filters NOT Active"
-msgstr ""
+msgstr "ÇÊÅÍ ¼±ÅÃ»çÇ×"
 
-#: lib/Filter.php:112
+#: lib/Filter.php:105
+#, fuzzy, php-format
 msgid "Filters: %s management page"
 msgstr "ÇÊÅÍ: % °ü¸® ÆäÀÌÁö"
 
-#: templates/contacts/contacts.inc:183
+#: templates/contacts/contacts.inc:186
 msgid "Find"
 msgstr "Ã£±â"
 
-#: config/prefs.php.dist:876
+#: config/prefs.php.dist:905
 msgid "First Mailbox Page"
 msgstr "Ã¹ÆäÀÌÁö"
 
-#: mailbox.php:334
+#: mailbox.php:345
 msgid "First Page"
 msgstr "Ã¹ÆäÀÌÁö"
 
@@ -1451,16 +1634,16 @@
 msgid "Fo_rward"
 msgstr "_rÀü´Þ"
 
-#: folders.php:259 templates/folders/head.inc:2
+#: folders.php:266 templates/folders/folders_confirm.html:5
+msgid "Folder Actions - Confirmation"
+msgstr ""
+
+#: folders.php:303 templates/folders/head.inc:9
 #: templates/prefs/initialpageselect.inc:6
 #: templates/prefs/initialpageselect.inc:10
 msgid "Folder Navigator"
 msgstr "ÆíÁöÇÔ Å½»ö±â"
 
-#: templates/login/login.inc:199
-msgid "Folder Prefix"
-msgstr "ÆíÁöÇÔ ½ÃÀÛÀ§Ä¡"
-
 #: lib/Block/summary.php:3
 msgid "Folder Summary"
 msgstr "ÆíÁöÇÔ ¿ä¾à"
@@ -1469,70 +1652,72 @@
 msgid "Folder sharing is not enabled."
 msgstr ""
 
-#: folders.php:52
+#: folders.php:62
 msgid "Folder use is not enabled."
 msgstr ""
 
-#: config/prefs.php.dist:940
+#: config/prefs.php.dist:969
 msgid "Format of message dates in the mailbox view for messages dated today"
 msgstr "¿À´Ã ³¯Â¥ ÆíÁö¿¡ ´ëÇÑ ³¯Â¥ Ç¥½Ã Çü½Ä"
 
-#: compose.php:714 templates/message/navbar_actions.inc:15
+#: compose.php:780 templates/message/navbar_actions.inc:15
 #: templates/mailbox/actions.inc:21
 msgid "Forward"
 msgstr "Àü´Þ"
 
-#: compose.php:699
+#: compose.php:765
 msgid "Forward:"
 msgstr "Àü´Þ:"
 
-#: lib/Compose.php:300
+#: lib/Compose.php:369
 msgid "Forwarded message"
 msgstr "Àü´ÞµÈ ÆíÁö"
 
-#: lib/Compose.php:298
+#: lib/Compose.php:367
+#, php-format
 msgid "Forwarded message from %s"
 msgstr "%s·ÎºÎÅÍ Àü´ÞµÈ ÆíÁö"
 
-#: lib/MIME/Viewer/itip.php:442
+#: lib/MIME/Viewer/itip.php:483
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "ÆíÁö ¼¹ö Á¤º¸»çÇ×"
 
-#: lib/MIME/Viewer/itip.php:453
+#: lib/MIME/Viewer/itip.php:494
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:447
+#: lib/MIME/Viewer/itip.php:488
 msgid "Free/Busy Request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:364
+#: lib/MIME/Viewer/itip.php:401
 msgid "Free/Busy Request Response"
 msgstr ""
 
-#: templates/mailbox/message_headers.inc:22
+#: templates/mailbox/message_headers.inc:27
 msgid "Fro_m"
 msgstr "_mº¸³½»ç¶÷"
 
-#: message.php:254 search.php:141 thread.php:76
-#: templates/compose/compose.inc:98
+#: message.php:263 thread.php:149 templates/compose/compose.inc:99
+#: lib/Search.php:22
 msgid "From"
 msgstr "º¸³½»ç¶÷"
 
-#: config/prefs.php.dist:889
+#: config/prefs.php.dist:918
 msgid "From Address"
 msgstr "º¸³½»ç¶÷ ÁÖ¼Ò"
 
-#: compose.php:711 compose.php:715
+#: compose.php:777 compose.php:781
 msgid "Fwd:"
 msgstr "Àü´Þ:"
 
-#: compose.php:1215
+#: compose.php:1294
 msgid "Fwd: "
 msgstr "Àü´Þ:"
 
-#: compose.php:1217
+#: compose.php:1296
+#, php-format
 msgid "Fwd: %u Forwarded Messages"
 msgstr "Àü´Þ: %u Àü´Þ ÆíÁö"
 
@@ -1545,29 +1730,39 @@
 msgid "Get only new messages? (IMAP only)"
 msgstr "»õ·Î¿î ¸ÞÀÏ¸¸ °¡Á®¿Ã±î¿ä? (IMAP Àü¿ë)"
 
-#: thread.php:68
+#: templates/folders/actions.inc:31
+msgid "Go"
+msgstr ""
+
+#: thread.php:136
 msgid "Go to Message"
 msgstr "ÆíÁö·Î °¡±â"
 
+#: lib/IMP.php:498
+#, fuzzy, php-format
+msgid "Go to address book entry of \"%s\""
+msgstr "\"%s\"¸¦ ÁÖ¼Ò·Ï¿¡ Ãß°¡"
+
 #: templates/acl/acl.inc:135
 msgid "Grant access"
 msgstr ""
 
-#: message.php:546 lib/Filter.php:112 lib/MIME/Viewer/images.php:98
-#: lib/MIME/Viewer/images.php:105 lib/MIME/Viewer/images.php:107
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/html.php:116
-#: lib/MIME/Viewer/notification.php:65 lib/MIME/Viewer/notification.php:71
-#: lib/MIME/Viewer/related.php:64 lib/MIME/Viewer/pkcs7.php:414
-#: lib/MIME/Viewer/appledouble.php:43 lib/MIME/Viewer/pgp.php:178
-#: lib/MIME/Viewer/status.php:123 lib/MIME/Viewer/status.php:130
+#: message.php:546 lib/Filter.php:105 lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:102 lib/MIME/Viewer/images.php:104
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/html.php:116
+#: lib/MIME/Viewer/notification.php:62 lib/MIME/Viewer/notification.php:68
+#: lib/MIME/Viewer/related.php:79 lib/MIME/Viewer/pkcs7.php:418
+#: lib/MIME/Viewer/appledouble.php:41 lib/MIME/Viewer/pgp.php:173
+#: lib/MIME/Viewer/status.php:120 lib/MIME/Viewer/status.php:127
 msgid "HERE"
 msgstr "¿©±â"
 
-#: lib/MIME/Viewer/html.php:117 lib/MIME/Viewer/related.php:65
+#: templates/stationery/prefs.inc:31 lib/MIME/Viewer/html.php:117
+#: lib/MIME/Viewer/related.php:80
 msgid "HTML"
 msgstr ""
 
-#: compose.php:243
+#: compose.php:256
 msgid "HTML Version of Message"
 msgstr "HTML Çü½Ä"
 
@@ -1579,101 +1774,121 @@
 msgid "Here is the message you were composing:"
 msgstr ""
 
-#: config/prefs.php.dist:671
+#: config/prefs.php.dist:668
 msgid "Hidden"
 msgstr "°¨Ãß±â"
 
-#: config/prefs.php.dist:670
+#: config/prefs.php.dist:667
 msgid "Hidden in Thread View"
 msgstr "´ñ±Ûº¸±â¿¡¼ °¨Ãß±â"
 
-#: mailbox.php:356
+#: mailbox.php:367
 msgid "Hide Deleted"
 msgstr "Áö¿öÁø ÆíÁö ¼û±â±â"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Hide Unsubscribed"
 msgstr "»ç¿ëÇÏÁö ¾Ê´Â ÆíÁöÇÔ ¼û±è"
 
-#: lib/MIME/Viewer/html.php:103
-msgid "Hide the Images"
-msgstr "±×¸² °¨Ãß±â"
-
-#: templates/compose/compose.inc:305
+#: templates/compose/compose.inc:294
 msgid "High"
 msgstr ""
 
-#: message.php:288 mailbox.php:687 templates/mailbox/legend.inc:12
+#: message.php:297 mailbox.php:724 templates/mailbox/legend.inc:12
+#, fuzzy
 msgid "High Priority"
-msgstr ""
+msgstr "¿ì¼±¼øÀ§"
 
-#: templates/compose/compose.inc:304
+#: templates/compose/compose.inc:293
 msgid "Highest"
 msgstr ""
 
-#: config/prefs.php.dist:691
+#: config/prefs.php.dist:688
 msgid "How do you want to display attachments?"
 msgstr "Ã·ºÎÆÄÀÏÀ» ¾î¶»°Ô Ç¥½ÃÇÏ±â¸¦ ¿øÇÏ½Ê´Ï±î?"
 
-#: config/prefs.php.dist:496
+#: config/prefs.php.dist:504
 msgid "How to attribute quoted lines in a reply"
 msgstr "´äÀå¿¡ »ç¿ëÇÒ ÀÎ¿ë¹®:"
 
-#: lib/Fetchmail/imap.php:137
+#: lib/Fetchmail/imap.php:134
 msgid "IMAP"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:132
+#: lib/Fetchmail/imap.php:129
 msgid "IMAP (Auto Detect Protocols)"
 msgstr "IMAP (Protocols ÀÚµ¿ °¨Áö)"
 
-#: templates/login/login.inc:174 lib/Fetchmail/imap.php:149
+#: lib/IMAP/Client.php:391
+#, php-format
+msgid "IMAP Server closed the connection. Server Responded: %s"
+msgstr ""
+
+#: templates/login/login.inc:166 lib/Fetchmail/imap.php:146
 msgid "IMAP over SSL"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:155
+#: lib/Fetchmail/imap.php:152
 msgid "IMAP over SSL (self-signed certificate)"
 msgstr ""
 
-#: templates/login/login.inc:175
+#: templates/login/login.inc:167
 msgid "IMAP over SSL (self-signed)"
 msgstr ""
 
-#: templates/login/login.inc:173 lib/Fetchmail/imap.php:143
+#: lib/IMAP/Client.php:368
+#, fuzzy
+msgid "IMAP server closed the connection."
+msgstr "Á¢¼ÓÇÒ ¸ÞÀÏ¼¹öÀÇ Á¾·ù:"
+
+#: templates/login/login.inc:165 lib/Fetchmail/imap.php:140
 msgid "IMAP, no TLS"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:50
+#: lib/Fetchmail/imap.php:49
 msgid "IMAP/POP3 Mail Servers"
 msgstr "IMAP/POP3 ¸ÞÀÏ ¼¹ö"
 
-#: folders.php:346
+#: lib/IMP.php:866
 msgid "INBOX"
 msgstr "¹ÞÀºÆíÁöÇÔ"
 
-#: templates/compose/spelling.inc:88
+#: lib/IMAP/Client.php:411
+msgid "If using SSL or TLS, you must have the PHP openssl extension loaded."
+msgstr ""
+
+#: templates/folders/folders_confirm.html:12
+#, fuzzy
+msgid "If you continue, all messages in the folder(s) will be lost!"
+msgstr "ÆíÁöÇÔÀÇ ¸ðµç ÆíÁö°¡ Áö¿öÁý´Ï´Ù!"
+
+#: templates/compose/spelling.inc:82
 msgid "Ignore"
 msgstr "¹«½Ã"
 
-#: templates/compose/spelling.inc:89
+#: templates/compose/spelling.inc:83
 msgid "Ignore All"
 msgstr "¸ðµÎ ¹«½Ã"
 
+#: templates/saveimage/saveimage.inc:8
+msgid "Image"
+msgstr ""
+
 #: templates/folders/import.inc:20
 msgid "Import"
 msgstr "°¡Á®¿À±â"
 
-#: templates/smime/import_key.inc:84 templates/pgp/import_key.inc:65
+#: templates/smime/import_key.inc:85 templates/pgp/import_key.inc:65
 #, fuzzy
 msgid "Import Key"
 msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®)"
 
-#: templates/pgp/pgp.inc:254
+#: templates/pgp/pgp.inc:139
 #, fuzzy
 msgid "Import Keypair"
 msgstr "Áß¿äÇÑ ÆíÁö"
 
-#: templates/folders/actions.inc:25
+#: templates/folders/actions.inc:27
 msgid "Import Messages"
 msgstr "ÆíÁö °¡Á®¿À±â"
 
@@ -1682,47 +1897,54 @@
 msgid "Import PGP Key"
 msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®)"
 
-#: templates/smime/smime.inc:148
-msgid "Import Personal Certificates"
+#: templates/smime/smime.inc:91
+msgid "Import Personal Certificate"
 msgstr ""
 
 #: templates/pgp/import_key.inc:14
+#, fuzzy
 msgid "Import Personal Private PGP Key"
-msgstr ""
+msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®)"
 
 #: templates/pgp/import_key.inc:9
+#, fuzzy
 msgid "Import Personal Public PGP Key"
-msgstr ""
+msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®)"
 
 #: templates/smime/import_key.inc:4
 msgid "Import Personal S/MIME Certificates"
 msgstr ""
 
-#: templates/smime/smime.inc:79 templates/pgp/pgp.inc:107
+#: templates/smime/smime.inc:40 templates/pgp/pgp.inc:42
+#, fuzzy
 msgid "Import Public Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: templates/pgp/import_key.inc:4
+#, fuzzy
 msgid "Import Public PGP Key"
-msgstr ""
+msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®)"
 
 #: templates/smime/import_key.inc:8
+#, fuzzy
 msgid "Import Public S/MIME Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: smime.php:16
+#, fuzzy
 msgid "Import S/MIME Key"
-msgstr ""
+msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®)"
 
 #: templates/folders/import.inc:9
 msgid "Import mbox File"
 msgstr "mbox ÆÄÀÏ °¡Á®¿À±â "
 
 #: templates/folders/import.inc:16
+#, php-format
 msgid "Import mbox file %s into folder %s."
 msgstr "%s mbox ÆÄÀÏÀ» %s·Î °¡Á®¿À±â"
 
-#: message.php:492 mailbox.php:695 templates/message/navbar_navigate.inc:7
+#: message.php:502 mailbox.php:734 templates/message/navbar_navigate.inc:7
 #: templates/mailbox/navbar.inc:16 templates/mailbox/navbar.inc:33
 #: templates/mailbox/legend.inc:7
 msgid "Important"
@@ -1732,45 +1954,47 @@
 msgid "Important messages"
 msgstr "Áß¿äÇÑ ÆíÁö"
 
-#: folders.php:157
+#: folders.php:167
+#, fuzzy, php-format
 msgid "Imported %d messages from %s."
 msgstr "%s¿¡¼ %d°³ ÆíÁö °¡Á®¿È"
 
-#: lib/MIME/Viewer/itip.php:725
+#: lib/MIME/Viewer/itip.php:773
 msgid "In Process"
 msgstr ""
 
-#: lib/Folder.php:248 lib/IMP.php:368
+#: folders.php:384 lib/Folder.php:86 lib/Folder.php:214 lib/IMP.php:313
+#: lib/IMAP/Tree.php:114 lib/IMAP/Tree.php:219
 msgid "Inbox"
 msgstr "¹ÞÀºÆíÁöÇÔ"
 
-#: config/prefs.php.dist:484
+#: config/prefs.php.dist:492
 msgid "Include a brief summary of the header in a reply?"
 msgstr "´äÀå¿¡ °£´ÜÇÑ ¸Ó¸´¸» ¿ä¾àÀ» Æ÷ÇÔÇÒ±î¿ä?"
 
-#: config/prefs.php.dist:478
+#: config/prefs.php.dist:487
 msgid "Include original message in a reply?"
 msgstr "´äÀå¿¡ ±âÁ¸ ÆíÁö¸¦ Æ÷ÇÔÇÒ±î¿ä?"
 
-#: lib/MIME/Viewer/notification.php:64 lib/MIME/Viewer/status.php:133
+#: lib/MIME/Viewer/notification.php:61 lib/MIME/Viewer/status.php:130
 msgid "Info"
 msgstr "Á¤º¸"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "Information on %s Public Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:77
 msgid "Information on Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
 msgid "Information on Personal Public Key"
 msgstr ""
 
-#: templates/compose/attachments.inc:15 templates/compose/compose.inc:497
-#: templates/compose/attachments.js:99
+#: templates/compose/attachments.inc:15 templates/compose/compose.inc:507
+#: templates/compose/attachments.js:98
 #, fuzzy
 msgid "Inline"
 msgstr "Àß¸øµÈ ÀÌ¸§."
@@ -1791,19 +2015,21 @@
 msgid "Insert Public PGP Key Here"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:375
+#: lib/MIME/Viewer/itip.php:412
 msgid "Invalid Action selected for this component."
 msgstr ""
 
-#: mailbox.php:555 mailbox.php:596
+#: mailbox.php:584 mailbox.php:626
 msgid "Invalid Address"
 msgstr "Àß¸øµÈ ÁÖ¼Ò"
 
-#: lib/Fetchmail/imap.php:312
+#: lib/Fetchmail/imap.php:307
+#, fuzzy
 msgid "Invalid Remote Mailbox"
-msgstr ""
+msgstr "¿ÜºÎ ÆíÁöÇÔ:"
 
-#: compose.php:132
+#: compose.php:158
+#, php-format
 msgid "Invalid character in e-mail address: %s."
 msgstr "Àß¸øµÈ ÀÌ¸ÞÀÏ ÁÖ¼Ò: %s"
 
@@ -1824,44 +2050,61 @@
 msgid "Invert"
 msgstr "¼±ÅÃ ¹ÝÀü"
 
-#: templates/compose/compose.inc:567
+#: templates/compose/compose.inc:577
 msgid "KB"
 msgstr ""
 
-#: templates/pgp/pgp.inc:201
+#: templates/pgp/pgp.inc:113
 msgid "Key Length"
 msgstr ""
 
+#: templates/pgp/pgp.inc:137
+msgid ""
+"Key generation may take a long time to complete.  Continue with key "
+"generation?"
+msgstr ""
+
+#: templates/smime/smime.inc:35 templates/pgp/pgp.inc:37
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+
+#: templates/smime/smime.inc:37 templates/pgp/pgp.inc:39
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+
 #: pgp.php:318
 msgid "Key successfully sent to the public keyserver."
 msgstr ""
 
-#: templates/login/login.inc:227
+#: templates/login/login.inc:216
 msgid "Language"
 msgstr "¾ð¾î"
 
-#: config/prefs.php.dist:877
+#: config/prefs.php.dist:906
 msgid "Last Mailbox Page"
 msgstr "¸¶Áö¸· ÆäÀÌÁö"
 
-#: mailbox.php:347
+#: mailbox.php:358
 msgid "Last Page"
 msgstr "¸¶Áö¸· ÆäÀÌÁö"
 
-#: templates/compose/compose.inc:380
+#: templates/compose/compose.inc:389
 msgid "Li_nk Attachments"
 msgstr "_nÃ·ºÎÆÄÀÏ ¸µÅ©ÇÏ±â"
 
-#: attachment.php:34 lib/Compose.php:999
+#: attachment.php:34 lib/Compose.php:1063
+#, fuzzy
 msgid "Linked attachments are forbidden."
-msgstr ""
+msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: lib/Compose.php:1016
+#: lib/Compose.php:1080
 #, php-format
 msgid "Links will expire on %s"
 msgstr ""
 
-#: config/prefs.php.dist:1040
+#: config/prefs.php.dist:1082
 msgid ""
 "List all contacts when loading the contacts screen? (if disabled, you will "
 "only see contacts that you search for explicitly)"
@@ -1869,7 +2112,7 @@
 "ÁÖ¼Ò·Ï È¸éÀ» Ãâ·ÂÇÒ¶§ ¸ðµç ÁÖ¼Ò¸¦ Ãâ·ÂÇÒ±î¿ä? (¼±ÅÃÇÏÁö ¾ÊÀ¸¸é, Á÷Á¢ °Ë»öÇÑ "
 "ÁÖ¼Ò¸¸ º¼ ¼ö ÀÖ½À´Ï´Ù.)"
 
-#: config/prefs.php.dist:688
+#: config/prefs.php.dist:685
 msgid "Listing in the Header"
 msgstr "¸Ó¸´¸»¿¡ ³ª¿ÇÏ±â"
 
@@ -1877,20 +2120,21 @@
 msgid "Local Mailbox:"
 msgstr "»ç¿ëÇÒ ¿ìÆíÇÔ:"
 
-#: lib/MIME/Viewer/itip.php:628
+#: lib/MIME/Viewer/itip.php:674
 #, fuzzy
 msgid "Location"
 msgstr "½ÇÇà"
 
-#: templates/login/login.inc:235
+#: templates/login/login.inc:225
 msgid "Log in"
 msgstr "·Î±×ÀÎ"
 
-#: lib/Block/summary.php:117
+#: lib/Block/summary.php:115
+#, php-format
 msgid "Log in to %s"
 msgstr "%s¿¡ ·Î±×ÀÎ"
 
-#: templates/login/login.inc:142
+#: templates/login/login.inc:137
 msgid "Login"
 msgstr "·Î±×ÀÎ"
 
@@ -1898,28 +2142,29 @@
 msgid "Login Tasks"
 msgstr "·Î±×ÀÎ ½ÃÀÛÀÛ¾÷"
 
-#: templates/compose/compose.inc:307
+#: templates/compose/compose.inc:296
 msgid "Low"
 msgstr ""
 
-#: message.php:290 mailbox.php:690 templates/mailbox/legend.inc:13
+#: message.php:299 mailbox.php:727 templates/mailbox/legend.inc:13
+#, fuzzy
 msgid "Low Priority"
-msgstr ""
+msgstr "¿ì¼±¼øÀ§"
 
-#: templates/compose/compose.inc:308
+#: templates/compose/compose.inc:297
 msgid "Lowest"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:46
+#: lib/MIME/Viewer/appledouble.php:44
 #, fuzzy
 msgid "Macintosh File"
 msgstr "ÆíÁö ÇÊÅÍ"
 
-#: smime.php:254 pgp.php:332 templates/smime/passphrase.inc:13
+#: templates/smime/passphrase.inc:13
 msgid "Mail"
 msgstr "¸ÞÀÏ"
 
-#: config/prefs.php.dist:95
+#: config/prefs.php.dist:96
 #, fuzzy
 msgid "Mail Previews"
 msgstr "ÆíÁö ÇÊÅÍ"
@@ -1928,19 +2173,19 @@
 msgid "Mail server type to connect to:"
 msgstr "Á¢¼ÓÇÒ ¸ÞÀÏ¼¹öÀÇ Á¾·ù:"
 
-#: folders.php:364
+#: folders.php:402
 msgid "Mailbox"
 msgstr "¿ìÆíÇÔ"
 
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:111
 msgid "Mailbox and Folder Display Options"
 msgstr "ÆíÁöÇÔ Ãâ·Â ¼³Á¤"
 
-#: templates/folders/actions.inc:16
+#: templates/folders/actions.inc:18
 msgid "Mark All Messages in Folder as Seen"
 msgstr "ÆíÁöÇÔÀÇ ¸ðµç ÆíÁö¸¦ ÀÐÀ½À¸·Î Ç¥½Ã"
 
-#: templates/folders/actions.inc:17
+#: templates/folders/actions.inc:19
 msgid "Mark All Messages in Folder as Unseen"
 msgstr "ÆíÁöÇÔÀÇ ¸ðµç ÆíÁö¸¦ ÀÐÁö ¾ÊÀ½À¸·Î Ç¥½Ã"
 
@@ -1948,7 +2193,7 @@
 msgid "Mark as:"
 msgstr "ÆíÁö Ç¥½Ã:"
 
-#: config/prefs.php.dist:653
+#: config/prefs.php.dist:650
 msgid "Mark different levels of quoting with different colors?"
 msgstr "ÀÎ¿ë ´Ü°è¸¶´Ù ´Ù¸¥ »öÀ¸·Î Ç¥½Ã¸¦ ÇÒ±î¿ä?"
 
@@ -1956,7 +2201,7 @@
 msgid "Mark messages as seen? (IMAP only)"
 msgstr "ÆíÁö¸¦ ÀÐÀ½À¸·Î Ç¥½ÃÇÒ±î¿ä? (IMAP Àü¿ë)"
 
-#: config/prefs.php.dist:661
+#: config/prefs.php.dist:658
 msgid "Mark simple markup?"
 msgstr "°£´ÜÇÑ markupÀ» Ç¥½ÃÇÒ±î¿ä?"
 
@@ -1968,85 +2213,91 @@
 msgid "Match Any Query"
 msgstr "°Ë»ö¾î ÇÏ³ª ÀÌ»ó ÀÏÄ¡"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "Maximum Attachment Size"
 msgstr "Ã·ºÎÆÄÀÏ ÃÖ´ë Å©±â"
 
-#: templates/compose/compose.inc:484
-msgid "Maximum number of attachments reached."
+#: lib/api.php:79
+msgid "Maximum Number of Folders"
 msgstr ""
 
-#: templates/compose/compose.inc:479
+#: templates/compose/compose.inc:494
+#, fuzzy
+msgid "Maximum number of attachments reached."
+msgstr "Ã·ºÎÆÄÀÏ ÃÖ´ë Å©±â"
+
+#: templates/compose/compose.inc:489
+#, fuzzy
 msgid "Maximum total attachment size reached."
-msgstr ""
+msgstr "Ã·ºÎÆÄÀÏ ÃÖ´ë Å©±â"
 
-#: lib/MIME/Viewer/itip.php:582
+#: lib/MIME/Viewer/itip.php:626
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:532
+#: lib/MIME/Viewer/itip.php:575
+#, fuzzy
 msgid "Meeting Information"
-msgstr ""
+msgstr "°³ÀÎ Á¤º¸"
 
-#: lib/MIME/Viewer/itip.php:542
+#: lib/MIME/Viewer/itip.php:585
+#, fuzzy
 msgid "Meeting Proposal"
-msgstr ""
+msgstr "½ÃÀÛÇÏ±â"
 
-#: lib/MIME/Viewer/itip.php:573
+#: lib/MIME/Viewer/itip.php:617
+#, fuzzy
 msgid "Meeting Reply"
-msgstr ""
+msgstr "½ÃÀÛÇÏ±â"
 
-#: lib/MIME/Viewer/itip.php:554
+#: lib/MIME/Viewer/itip.php:598
 #, fuzzy
 msgid "Meeting Update"
 msgstr "½ÃÀÛÇÏ±â"
 
-#: lib/MIME/Viewer/itip.php:559
+#: lib/MIME/Viewer/itip.php:603
+#, fuzzy
 msgid "Meeting Update Request"
-msgstr ""
+msgstr "½ÃÀÛÇÏ±â"
 
 #: lib/Block/tree_folders.php:3
 #, fuzzy
 msgid "Menu Folder List"
 msgstr "ÆíÁöÇÔ ¿±â"
 
-#: lib/Compose.php:247
+#: lib/Compose.php:331
 msgid "Message"
 msgstr "ÆíÁö"
 
-#: compose.php:519 compose.php:546 compose.php:578 config/prefs.php.dist:50
+#: compose.php:560 compose.php:587 compose.php:641 config/prefs.php.dist:50
 msgid "Message Composition"
 msgstr "ÆíÁö ÀÛ¼º"
 
-#: config/prefs.php.dist:888
+#: config/prefs.php.dist:917
 msgid "Message Date"
 msgstr "ÆíÁö ³¯Â¥"
 
-#: config/prefs.php.dist:49 config/prefs.php.dist:68 config/prefs.php.dist:78
-#: config/prefs.php.dist:86 config/prefs.php.dist:94 config/prefs.php.dist:102
+#: config/prefs.php.dist:49 config/prefs.php.dist:65 config/prefs.php.dist:78
+#: config/prefs.php.dist:87 config/prefs.php.dist:95 config/prefs.php.dist:103
 msgid "Message Options"
 msgstr "ÆíÁö ¼±ÅÃ»çÇ×"
 
-#: search.php:354
+#: search.php:312
 msgid "Message Search"
 msgstr "ÆíÁö Ã£±â"
 
-#: config/prefs.php.dist:892
+#: config/prefs.php.dist:921
 msgid "Message Size"
 msgstr "ÆíÁö Å©±â"
 
-#: message.php:375
+#: message.php:384
 msgid "Message Source"
 msgstr "ÆíÁö ¼Ò½ºº¸±â"
 
-#: config/prefs.php.dist:69
+#: config/prefs.php.dist:66
 msgid "Message Viewing"
 msgstr "ÆíÁö º¸±â"
 
-#: templates/search/header.inc:55
-msgid "Message fields"
-msgstr "ÆíÁö Ç×¸ñ"
-
 #: templates/search/main.inc:6
 msgid "Message flags"
 msgstr "ÆíÁö ±¸ºÐ"
@@ -2055,31 +2306,48 @@
 msgid "Message folders"
 msgstr "ÆíÁöÇÔ"
 
-#: lib/Compose.php:245
+#: lib/Compose.php:329
+#, php-format
 msgid "Message from %s"
 msgstr "%sÀÇ ÆíÁö"
 
+#: mailbox.php:667
+#, fuzzy
+msgid "Message has attachments"
+msgstr "ÆíÁö ÀÏÄ¡"
+
+#: mailbox.php:658
+#, fuzzy
+msgid "Message is encrypted"
+msgstr "ÆíÁö Ç×¸ñ"
+
+#: mailbox.php:653
+#, fuzzy
+msgid "Message is signed"
+msgstr "ÆíÁö Ç×¸ñ"
+
 #: templates/search/header.inc:33
 msgid "Message matches"
 msgstr "ÆíÁö ÀÏÄ¡"
 
-#: compose.php:758 compose.php:772
+#: compose.php:824 compose.php:838
 msgid "Message redirected successfully."
 msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î Àü´ÞµÇ¾ú½À´Ï´Ù."
 
-#: compose.php:1004
+#: compose.php:1084
+#, php-format
 msgid "Message sent successfully, but not saved to %s"
 msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î ¹ß¼ÛµÇ¾úÁö¸¸, %s¿¡ ÀúÀåµÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: compose.php:1063 compose.php:1078
+#: compose.php:1143 compose.php:1158
 msgid "Message sent successfully."
 msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î º¸³»Á³½À´Ï´Ù."
 
-#: config/prefs.php.dist:912
+#: config/prefs.php.dist:941
 msgid "Messages per page in the mailbox view."
 msgstr "ÆíÁöÇÔ ÆäÀÌÁö´ç ÆíÁö °¹¼ö"
 
-#: mailbox.php:311
+#: mailbox.php:322
 msgid "Messages to"
 msgstr "ÆíÁöÇÔ ¼±ÅÃ"
 
@@ -2088,7 +2356,8 @@
 msgstr "º¯°æ"
 
 #: templates/compose/expand.inc:12
-msgid "More than one address found for field '%s'."
+#, fuzzy, php-format
+msgid "More than one address found for field \"%s\"."
 msgstr "ÇÏ³ª ÀÌ»óÀÇ ÁÖ¼Ò°¡ ¹ß°ßµÇ¾ú½À´Ï´Ù: '%s'"
 
 #: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
@@ -2099,7 +2368,11 @@
 msgid "Move down"
 msgstr "¾Æ·¡·Î ÀÌµ¿"
 
-#: templates/message/navbar_navigate.inc:18
+#: config/prefs.php.dist:618
+msgid "Move spam messages to spam folder and innocent messages to INBOX"
+msgstr ""
+
+#: templates/message/navbar_navigate.inc:18 templates/mailbox/navbar.inc:50
 msgid "Move to folder"
 msgstr "ÆíÁöÇÔÀ¸·Î ÀÌµ¿"
 
@@ -2107,16 +2380,26 @@
 msgid "Move up"
 msgstr "À§·Î ÀÌµ¿"
 
-#: lib/MIME/Viewer/alternative.php:130
+#: lib/MIME/Viewer/alternative.php:127
 msgid "Multipart/alternative"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:24
-#: templates/pgp/pgp.inc:24
+#: thread.php:76 thread.php:152
+#, fuzzy
+msgid "Multiple Message View"
+msgstr "ÆíÁö º¸±â"
+
+#: templates/prefs/defaultsearchselect.inc:5
+#, fuzzy
+msgid "NONE"
+msgstr "ÁÖÀÇ"
+
+#: templates/fetchmail/manage.inc:48 templates/smime/smime.inc:2
+#: templates/pgp/pgp.inc:2
 msgid "NOTE"
 msgstr "ÁÖÀÇ"
 
-#: templates/contacts/contacts.inc:239 lib/MIME/Viewer/itip.php:640
+#: templates/contacts/contacts.inc:238 lib/MIME/Viewer/itip.php:688
 msgid "Name"
 msgstr "ÀÌ¸§"
 
@@ -2124,37 +2407,47 @@
 msgid "Name and/or email can not be empty"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:730
+#: lib/MIME/Viewer/itip.php:778
 #, fuzzy
 msgid "Needs Action"
 msgstr "½ÇÇà"
 
-#: config/prefs.php.dist:563 config/prefs.php.dist:584
-#: config/prefs.php.dist:754
+#: config/prefs.php.dist:570 config/prefs.php.dist:582
+#: config/prefs.php.dist:778
 msgid "Never"
 msgstr "»ç¿ëÇÏÁö ¾ÊÀ½"
 
-#: config/prefs.php.dist:553
+#: config/prefs.php.dist:560
 msgid "Never save attachments"
 msgstr "Ã·ºÎÆÄÀÏ ÀúÀå¾ÈÇÔ"
 
-#: templates/acl/acl.inc:126
+#: templates/acl/acl.inc:124
 msgid "New"
 msgstr "»õ ÆíÁö"
 
-#: lib/IMP.php:578
+#: lib/IMP.php:563
 msgid "New Folder"
 msgstr "»õ ÆíÁöÇÔ"
 
-#: config/prefs.php.dist:87
+#: config/prefs.php.dist:88
 msgid "New Mail"
 msgstr "»õ ÆíÁö"
 
+#: lib/Block/summary.php:19 lib/Block/tree_folders.php:33
+#, fuzzy
+msgid "New Message"
+msgstr "´ÙÀ½ ÆíÁö"
+
+#: mailbox.php:776 lib/MIME/Headers.php:192
+#, fuzzy, php-format
+msgid "New Message to %s"
+msgstr "»õ ÆíÁö"
+
 #: templates/search/main.inc:19
 msgid "New messages"
 msgstr "»õ ÆíÁö"
 
-#: templates/compose/spelling.inc:140
+#: templates/compose/spelling.inc:133
 msgid "Next"
 msgstr "´ÙÀ½"
 
@@ -2162,11 +2455,11 @@
 msgid "Next Message"
 msgstr "´ÙÀ½ ÆíÁö"
 
-#: mailbox.php:345
+#: mailbox.php:356
 msgid "Next Page"
 msgstr "´ÙÀ½ ÆäÀÌÁö"
 
-#: templates/compose/compose.inc:532 config/prefs.php.dist:948
+#: templates/compose/compose.inc:542 config/prefs.php.dist:977
 msgid "No"
 msgstr "¾Æ´Ï¿À"
 
@@ -2175,14 +2468,16 @@
 msgstr ""
 
 #: templates/compose/encrypt_list.inc:5
+#, fuzzy
 msgid "No Encryption"
-msgstr ""
+msgstr "_y¾ÏÈ£È ¿É¼Ç"
 
-#: templates/pgp/pgp.inc:80
+#: templates/pgp/pgp.inc:19
 msgid "No Keys in Keyring"
 msgstr ""
 
-#: mailbox.php:364
+#: mailbox.php:375
+#, php-format
 msgid "No Messages"
 msgstr "ÆíÁö ¾øÀ½"
 
@@ -2190,49 +2485,59 @@
 msgid "No PGP public key imported."
 msgstr ""
 
-#: templates/smime/smime.inc:140
+#: templates/smime/smime.inc:84
 msgid "No Personal Certificate Present"
 msgstr ""
 
-#: templates/smime/smime.inc:54
+#: lib/Mailbox.php:329
+#, fuzzy
+msgid "No Preview Text"
+msgstr "¹Ì¸®º¸±â"
+
+#: templates/smime/smime.inc:15
+#, fuzzy
 msgid "No Public Keys Found"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: smime.php:151
 msgid "No S/MIME public key imported."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:94
+#: lib/MIME/Viewer/tnef.php:90
 #, fuzzy
 msgid "No attachments found."
 msgstr "ÆÄÀÏ Ã·ºÎ"
 
+#: lib/Crypt/SMIME.php:140
+msgid "No email information located in the public key."
+msgstr ""
+
 #: acl.php:72 acl.php:98
 #, fuzzy
 msgid "No folder selected."
 msgstr "ÆíÁöÇÔ ¼±ÅÃ ¿À·ù"
 
-#: lib/Block/summary.php:130
+#: lib/Block/summary.php:141
 msgid "No folders are being checked for new mail."
 msgstr ""
 
-#: folders.php:207 lib/Folder.php:583 lib/Folder.php:634
+#: folders.php:218 lib/Folder.php:500 lib/Folder.php:550
 msgid "No folders were specified"
 msgstr "ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä"
 
-#: lib/Block/summary.php:136
+#: lib/Block/summary.php:147
 msgid "No folders with new messages"
 msgstr "»õ ÆíÁö°¡ ÀÖ´Â ÆíÁöÇÔ ¾øÀ½"
 
-#: lib/Block/summary.php:133
+#: lib/Block/summary.php:144
 msgid "No folders with unseen messages"
 msgstr "ÀÐÁö ¾ÊÀº ÆíÁö°¡ ÀÖ´Â ÆíÁöÇÔ ¾øÀ½"
 
-#: lib/Compose.php:241
+#: lib/Compose.php:325
 msgid "No message body text"
 msgstr "ÆíÁö º»¹® ¾øÀ½"
 
-#: lib/Mailbox.php:368
+#: lib/Mailbox.php:371
 msgid "No messages matched your search."
 msgstr "Ã£´Â ÆíÁö°¡ ¾ø½À´Ï´Ù."
 
@@ -2248,35 +2553,39 @@
 msgid "No personal S/MIME certificates imported."
 msgstr ""
 
-#: spelling.php:213
+#: spelling.php:220
 msgid "No spellchecking program configured."
 msgstr ""
 
-#: templates/compose/spelling.inc:50
+#: templates/compose/spelling.inc:48
 msgid "No spelling errors"
 msgstr "Ã¶ÀÚ ¿À·ù ¾øÀ½"
 
-#: templates/compose/spelling.inc:106
+#: templates/compose/spelling.inc:100
 #, fuzzy
 msgid "No suggestions"
 msgstr "Á¦¾È"
 
+#: lib/IMAP/Client.php:564
+msgid "No supported IMAP authentication method could be found."
+msgstr ""
+
 #: acl.php:68 acl.php:94
 #, fuzzy
 msgid "No user specified."
 msgstr "ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä"
 
-#: lib/MIME/Viewer/itip.php:661
+#: lib/MIME/Viewer/itip.php:709
 msgid "Non Participant"
 msgstr ""
 
-#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:41
-#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:5
-#: lib/MIME/Viewer/itip.php:618
+#: templates/mailbox/navbar.inc:11 templates/prefs/sentmailselect.inc:40
+#: templates/prefs/sourceselect.inc:35 templates/prefs/spamselect.inc:24
+#: lib/MIME/Viewer/itip.php:664
 msgid "None"
 msgstr "¸ðµÎ ¼±ÅÃ ¾ÈÇÔ"
 
-#: templates/compose/compose.inc:306
+#: templates/compose/compose.inc:295
 msgid "Normal"
 msgstr ""
 
@@ -2298,8 +2607,7 @@
 msgid "Not Personal"
 msgstr "°³ÀÎÆíÁö ¾Æ´Ô"
 
-#: lib/Crypt/PGP.php:154 lib/Crypt/SMIME.php:152 lib/Crypt/SMIME.php:158
-#: lib/Crypt/SMIME.php:167
+#: lib/Crypt/PGP.php:139 lib/Crypt/SMIME.php:134 lib/Crypt/SMIME.php:149
 msgid "Not a valid public key."
 msgstr ""
 
@@ -2311,24 +2619,29 @@
 msgid "Not important messages"
 msgstr "Áß¿äÇÏÁö ¾ÊÀº ÆíÁö"
 
-#: lib/Maintenance/Task/fetchmail_login.php:76
+#: lib/Maintenance/Task/fetchmail_login.php:71
 msgid "Note that this can take some time"
 msgstr ""
 
-#: config/prefs.php.dist:371
-msgid "Number of months to keep old linked attachments if deleting monthly."
+#: config/prefs.php.dist:616
+msgid "Nothing"
 msgstr ""
 
-#: config/prefs.php.dist:353
+#: config/prefs.php.dist:377
+#, fuzzy
+msgid "Number of months to keep old linked attachments if deleting monthly."
+msgstr "¸Å¿ù ÆíÁöÇÔÀ» Áö¿ï °æ¿ì º¸°üÇÒ ¿¹Àü º¸³½ ÆíÁöÇÔÀÇ °¹¼ö"
+
+#: config/prefs.php.dist:359
 msgid "Number of old sent-mail folders to keep if deleting monthly."
 msgstr "¸Å¿ù ÆíÁöÇÔÀ» Áö¿ï °æ¿ì º¸°üÇÒ ¿¹Àü º¸³½ ÆíÁöÇÔÀÇ °¹¼ö"
 
-#: templates/contacts/contacts.inc:252 lib/MIME/Viewer/itip.php:509
-#: lib/MIME/Viewer/itip.php:685
+#: templates/contacts/contacts.inc:254 lib/MIME/Viewer/itip.php:552
+#: lib/MIME/Viewer/itip.php:733
 msgid "OK"
 msgstr ""
 
-#: templates/search/fields.inc:5 templates/smime/import_key.inc:47
+#: templates/search/fields.inc:5 templates/smime/import_key.inc:49
 #: templates/pgp/import_key.inc:48
 msgid "OR"
 msgstr "È¤Àº"
@@ -2337,69 +2650,68 @@
 msgid "Old messages"
 msgstr "¿¾³¯ ÆíÁö"
 
-#: lib/Maintenance/Task/delete_sentmail_monthly.php:55
+#: lib/Maintenance/Task/delete_sentmail_monthly.php:52
 msgid "Old sent-mail folders being purged."
 msgstr "º¸³½ÆíÁöÇÔ(Sent)ÀÇ ¿À·¡µÈ ÆíÁö¸¦ Áö¿ì°í ÀÖ½À´Ï´Ù."
 
-#: lib/Block/summary.php:27
+#: lib/Block/summary.php:25
+#, fuzzy
 msgid "Only display folders with unread messages in them?"
-msgstr ""
+msgstr "ÀÐÁö ¾ÊÀº ÆíÁö°¡ ÀÖ´Â ÆíÁöÇÔ ¾øÀ½"
 
-#: templates/folders/javascript.inc:78
+#: templates/javascript/folders.js:79
 #, fuzzy
 msgid "Only one folder should be selected for this action."
 msgstr "½ÇÇàÇÒ ÇÏ³ªÀÇ ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä."
 
-#: templates/menu.inc:7 templates/menu.inc:27
-msgid "Ope_n Folder"
-msgstr "_nÆíÁöÇÔ ¿±â"
-
-#: templates/menu.inc:24
-msgid "Open Folder"
+#: templates/menu.inc:10 templates/menu.inc:30
+#, fuzzy
+msgid "Open Fo_lder"
 msgstr "ÆíÁöÇÔ ¿±â"
 
-#: folders.php:381
+#: folders.php:427
 msgid "Opened Folder"
 msgstr "¿¸° ÆíÁöÇÔ"
 
-#: lib/MIME/Viewer/itip.php:657
+#: lib/MIME/Viewer/itip.php:705
 msgid "Optional Participant"
 msgstr ""
 
-#: fetchmail.php:33 templates/fetchmail/top.inc:2
+#: fetchmail.php:33 templates/fetchmail/top.inc:3
 #: templates/fetchmail/fetchmail.inc:6
 msgid "Other Mail Accounts"
 msgstr "´Ù¸¥ ¸ÞÀÏ °èÁ¤"
 
-#: config/prefs.php.dist:109 config/prefs.php.dist:118
-#: config/prefs.php.dist:125 config/prefs.php.dist:133
-#: config/prefs.php.dist:142
+#: config/prefs.php.dist:110 config/prefs.php.dist:119
+#: config/prefs.php.dist:126 config/prefs.php.dist:133
+#: config/prefs.php.dist:141 config/prefs.php.dist:150
 msgid "Other Options"
 msgstr "±âÅ¸ ¼³Á¤"
 
-#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:170
-#: lib/MIME/Viewer/pgp.php:210 lib/MIME/Viewer/pgp.php:296
+#: templates/login/login.inc:201
+msgid "Outbound Server"
+msgstr ""
+
+#: templates/pgp/passphrase.inc:16 lib/MIME/Viewer/pgp.php:165
+#: lib/MIME/Viewer/pgp.php:204 lib/MIME/Viewer/pgp.php:290
 msgid "PGP"
 msgstr ""
 
 #: templates/compose/encrypt_list.inc:7
+#, fuzzy
 msgid "PGP Encrypt Message"
-msgstr ""
+msgstr "ÆíÁö·Î °¡±â"
 
-#: compose.php:343
+#: compose.php:358
 #, fuzzy
 msgid "PGP Error: "
 msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®) ¿À·ù: "
 
-#: compose.php:322
+#: compose.php:337
 msgid "PGP Error: Need passphrase for personal private key."
 msgstr ""
 
-#: templates/pgp/notactive.inc:6
-msgid "PGP NOT Active"
-msgstr ""
-
-#: templates/pgp/pgp.inc:6 config/prefs.php.dist:134
+#: config/prefs.php.dist:142
 #, fuzzy
 msgid "PGP Options"
 msgstr "È¯°æ ¼³Á¤"
@@ -2408,35 +2720,39 @@
 msgid "PGP Passphrase Input"
 msgstr ""
 
-#: templates/pgp/pgp.inc:128
+#: templates/pgp/pgp.inc:55
 msgid "PGP Personal Keypair support requires a secure web connection."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
+#, fuzzy
 msgid "PGP Public Key Text"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: pgp.php:149
-#, php-format
+#, fuzzy, php-format
 msgid "PGP Public Key for \"%s (%s)\" was successfully added."
-msgstr ""
+msgstr "ÆíÁöÇÔ \"%s\"ÀÌ »èÁ¦µÇ¾ú½À´Ï´Ù."
 
 #: pgp.php:245
-#, php-format
+#, fuzzy, php-format
 msgid "PGP Public Key for \"%s\" was successfully deleted."
-msgstr ""
+msgstr "ÆíÁöÇÔ \"%s\"ÀÌ »èÁ¦µÇ¾ú½À´Ï´Ù."
 
-#: templates/pgp/pgp.inc:72
+#: templates/pgp/pgp.inc:14
+#, fuzzy
 msgid "PGP Public Keyring"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: templates/compose/encrypt_list.inc:8
+#, fuzzy
 msgid "PGP Sign Message"
-msgstr ""
+msgstr "ÆíÁö Àü¼Û"
 
 #: templates/compose/encrypt_list.inc:9
+#, fuzzy
 msgid "PGP Sign/Encrypt Message"
-msgstr ""
+msgstr "ÆíÁö Àü¼Û"
 
 #: pgp.php:202
 #, fuzzy
@@ -2448,61 +2764,62 @@
 msgid "PGP public key successfully added."
 msgstr "%s ÆÄÀÏÀÌ ÀÓÆ÷Æ®µÇ¾ú½À´Ï´Ù."
 
-#: templates/pgp/notactive.inc:11
+#: templates/pgp/notactive.inc:4
 msgid "PGP support is disabled on this system."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:214
+#: lib/MIME/Viewer/pgp.php:208
 msgid ""
 "PGP support is not currently active so the digital signature is unable to be "
 "verified."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:301
+#: lib/MIME/Viewer/pgp.php:295
 msgid ""
 "PGP support is not currently active so the message is unable to be decrypted."
 msgstr ""
 
-#: templates/pgp/pgp.inc:24
+#: templates/pgp/pgp.inc:2
 msgid ""
 "PGP support requires popup windows to be used.  If your browser is currently "
 "set to disable popup windows, you must change this setting or else the PGP "
-"features will not work correctly"
+"features will not work correctly."
 msgstr ""
 
-#: lib/Fetchmail/imap.php:108
+#: lib/Fetchmail/imap.php:105
 msgid "POP3"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:103
+#: lib/Fetchmail/imap.php:100
 msgid "POP3 (Auto Detect Protocols)"
 msgstr "POP3 (Protocols ÀÚµ¿ °¨Áö)"
 
-#: lib/Fetchmail/imap.php:120
+#: lib/Fetchmail/imap.php:117
 msgid "POP3 over SSL"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:126
+#: lib/Fetchmail/imap.php:123
 msgid "POP3 over SSL (self-signed certificate)"
 msgstr ""
 
-#: templates/login/login.inc:177
+#: templates/login/login.inc:169
 msgid "POP3 over SSL (self-signed)"
 msgstr ""
 
-#: lib/Fetchmail/imap.php:114
+#: lib/Fetchmail/imap.php:111
 msgid "POP3, no TLS"
 msgstr ""
 
 #: templates/mailbox/header.inc:19
+#, php-format
 msgid "Page %d of %d"
 msgstr "%d / %d ÆäÀÌÁö"
 
-#: config/prefs.php.dist:874
+#: config/prefs.php.dist:903
 msgid "Page with the First Unseen Message"
 msgstr "ÀÐÁö ¾ÊÀº Ã¹¹øÂ° ÆíÁö°¡ ÀÖ´Â ÆäÀÌÁö"
 
-#: config/prefs.php.dist:875
+#: config/prefs.php.dist:904
 msgid "Page with the Last Unseen Message"
 msgstr "ÀÐÁö ¾ÊÀº ¸¶Áö¸· ÆíÁö°¡ ÀÖ´Â ÆäÀÌÁö"
 
@@ -2510,11 +2827,11 @@
 msgid "Part(s)"
 msgstr "ºÎºÐ"
 
-#: templates/pgp/pgp.inc:211
+#: templates/pgp/pgp.inc:123
 msgid "Passphrase"
 msgstr ""
 
-#: templates/pgp/pgp.inc:216
+#: templates/pgp/pgp.inc:128
 msgid "Passphrase (Again)"
 msgstr ""
 
@@ -2523,7 +2840,7 @@
 msgid "Passphrase successfully unloaded."
 msgstr "ÆíÁö°¡ ¹ß¼ÛµÇ¾úÁö¸¸, ÀúÀåµÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: templates/smime/passphrase.inc:19 templates/pgp/passphrase.inc:29
+#: templates/smime/passphrase.inc:18 templates/pgp/passphrase.inc:29
 msgid "Passphrase:"
 msgstr ""
 
@@ -2535,8 +2852,8 @@
 msgid "Passphrases do not match"
 msgstr ""
 
-#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:69
-#: templates/login/login.inc:221
+#: templates/fetchmail/manage.inc:20 templates/smime/import_key.inc:71
+#: templates/login/login.inc:192
 msgid "Password"
 msgstr "¾ÏÈ£"
 
@@ -2548,7 +2865,7 @@
 msgid "Permissions for this user can not be changed."
 msgstr ""
 
-#: message.php:483 mailbox.php:666 templates/mailbox/navbar.inc:24
+#: message.php:493 mailbox.php:703 templates/mailbox/navbar.inc:24
 #: templates/mailbox/legend.inc:10
 msgid "Personal"
 msgstr "°³ÀÎÆíÁö"
@@ -2558,38 +2875,48 @@
 msgstr "°³ÀÎ Á¤º¸"
 
 #: pgp.php:120
+#, fuzzy
 msgid "Personal PGP keypair generated successfully."
-msgstr ""
+msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î Àü´ÞµÇ¾ú½À´Ï´Ù."
 
 #: pgp.php:127
+#, fuzzy
 msgid "Personal PGP keys deleted successfully."
-msgstr ""
+msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î Àü´ÞµÇ¾ú½À´Ï´Ù."
 
 #: smime.php:207
 msgid "Personal S/MIME certificates NOT imported: "
 msgstr ""
 
 #: smime.php:132
+#, fuzzy
 msgid "Personal S/MIME keys deleted successfully."
-msgstr ""
+msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î Àü´ÞµÇ¾ú½À´Ï´Ù."
 
-#: config/prefs.php.dist:214
+#: config/prefs.php.dist:222
 msgid "Place your signature before replies and forwards?"
 msgstr "È¸½Å ¹× Àü´Þ ¾Õ¿¡ ¼¸íÀ» Ãß°¡ÇÕ´Ï´Ù."
 
-#: compose.php:241
+#: compose.php:254
 msgid "Plaintext Version of Message"
 msgstr "Æò¹®(Plaintext) Çü½Ä"
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: config/prefs.php.dist:799
+msgid ""
+"Play sound on new mail?  This requires your browser to support embedded "
+"sound files.  Almost all do on Windows and Mac, but other platforms will "
+"require a plugin."
+msgstr ""
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "Please enter a name for the new folder:"
 msgstr "»õ ÆíÁöÇÔÀÇ ÀÌ¸§À» ÀÔ·ÂÇÏ¼¼¿ä:"
 
-#: templates/folders/javascript.inc:101 templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:102 templates/javascript/folders.js:104
 msgid "Please enter the name of the new folder:"
 msgstr "»õ ÆíÁöÇÔÀÇ ÀÌ¸§À» ÀÔ·ÂÇÏ¼¼¿ä:"
 
-#: templates/folders/javascript.inc:146
+#: templates/javascript/folders.js:137
 msgid "Please enter the new name:"
 msgstr "»õ ÀÌ¸§À» ÀÔ·ÂÇÏ¼¼¿ä:"
 
@@ -2607,7 +2934,7 @@
 "to enter this passphrase once per %s session."
 msgstr ""
 
-#: recompose.php:88
+#: recompose.php:97
 msgid ""
 "Please log in again to resume composing your message. If you are NOT using "
 "cookies AND you are composing messages in popup windows, you will have to "
@@ -2615,31 +2942,32 @@
 "hijacking your session ID. We apologize for any inconvenience."
 msgstr ""
 
-#: templates/login/login.inc:81
+#: templates/login/login.inc:71
 #, fuzzy
 msgid "Please provide your password."
 msgstr "»ç¿ëÀÚ ÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ¼¼¿ä."
 
-#: templates/login/login.inc:77
+#: templates/login/login.inc:67
 #, fuzzy
 msgid "Please provide your username."
 msgstr "»ç¿ëÀÚ ÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ¼¼¿ä."
 
-#: compose.php:80 lib/IMP.php:519
+#: compose.php:106 lib/IMP.php:459
 msgid "Please resolve ambiguous or invalid addresses."
 msgstr "¸ÞÀÏ ÁÖ¼Ò°¡ ¸ðÈ£ÇÏ°Å³ª Àß¸øµÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:598
+#: lib/MIME/Viewer/itip.php:642
+#, fuzzy
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
-msgstr ""
+msgstr "°Ë»öÇÒ ÃÖ¼ÒÇÑ ÇÑ°³ÀÇ ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä."
 
-#: templates/folders/javascript.inc:56
+#: templates/javascript/folders.js:61
 msgid "Please select a folder before you perform any actions."
 msgstr "½ÇÇàÀü¿¡ ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä."
 
-#: lib/MIME/Viewer/itip.php:461
+#: lib/MIME/Viewer/itip.php:502
 #, fuzzy
 msgid "Please select an action from the menu below."
 msgstr "°Ë»öÇÒ ÃÖ¼ÒÇÑ ÇÑ°³ÀÇ ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä."
@@ -2648,25 +2976,20 @@
 msgid "Please select at least one folder to search."
 msgstr "°Ë»öÇÒ ÃÖ¼ÒÇÑ ÇÑ°³ÀÇ ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä."
 
-#: templates/folders/javascript.inc:4
+#: templates/javascript/folders.js:12
 msgid "Please select only one folder for this operation."
 msgstr "½ÇÇàÇÒ ÇÏ³ªÀÇ ÆíÁöÇÔÀ» ¼±ÅÃÇÏ¼¼¿ä."
 
-#: templates/compose/redirect.inc:76
+#: templates/compose/redirect.inc:73
 #, fuzzy
 msgid "Please select or edit in the box to the right:"
 msgstr "¼±ÅÃÇÏ°Å³ª ¿À¸¥ÂÊ ´ÙÀ½Ç×¸ñÀ» ¼öÁ¤ÇÏ¼¼¿ä:"
 
-#: templates/compose/compose.inc:127 templates/compose/compose.inc:177
-#: templates/compose/compose.inc:228
-msgid "Please select or edit right next:"
-msgstr "¼±ÅÃÇÏ°Å³ª ¿À¸¥ÂÊ ´ÙÀ½Ç×¸ñÀ» ¼öÁ¤ÇÏ¼¼¿ä:"
-
 #: config/motd.php.dist:41
 msgid "Powered by Horde"
 msgstr ""
 
-#: config/prefs.php.dist:206
+#: config/prefs.php.dist:214
 msgid "Precede your signature with dashes ('-- ')?"
 msgstr "¼¸íÀ» ('-- ')·Î ½ÃÀÛÇÕ´Ï´Ù(ÃßÃµÇÔ)."
 
@@ -2682,11 +3005,11 @@
 msgid "Previous Message"
 msgstr "ÀÌÀü ÆíÁö"
 
-#: mailbox.php:336
+#: mailbox.php:347
 msgid "Previous Page"
 msgstr "ÀÌÀü ÆäÀÌÁö"
 
-#: templates/message/navbar_actions.inc:31
+#: templates/message/navbar_actions.inc:33
 msgid "Print"
 msgstr "ÀÎ¼â"
 
@@ -2694,15 +3017,15 @@
 msgid "Priority"
 msgstr "¿ì¼±¼øÀ§"
 
-#: templates/smime/import_key.inc:74
+#: templates/smime/import_key.inc:76
 msgid "Private Key Password"
 msgstr ""
 
-#: config/prefs.php.dist:552
+#: config/prefs.php.dist:559
 msgid "Prompt every time an attachment is sent; default to NO"
 msgstr "Ã·ºÎÇÒ ¶§¸¶´Ù ¹°¾îº¸±â(±âº»°ª: ¾Æ´Ï¿À)"
 
-#: config/prefs.php.dist:551
+#: config/prefs.php.dist:558
 msgid "Prompt every time an attachment is sent; default to YES"
 msgstr "Ã·ºÎÇÒ ¶§¸¶´Ù ¹°¾îº¸±â(±âº»°ª: ¿¹)"
 
@@ -2710,7 +3033,7 @@
 msgid "Protocol:"
 msgstr "ÇÁ·ÎÅäÄÝ:"
 
-#: lib/Crypt/PGP.php:461
+#: lib/Crypt/PGP.php:429
 msgid "Public PGP keyserver support has been disabled."
 msgstr ""
 
@@ -2722,29 +3045,31 @@
 msgid "Purge Deleted"
 msgstr "Áö¿î ÆíÁö ºñ¿ì±â"
 
-#: templates/folders/actions.inc:22
+#: templates/folders/actions.inc:24
 msgid "Purge Folder(s)"
 msgstr "ÆíÁöÇÔ Áö¿ì±â"
 
-#: config/prefs.php.dist:390
+#: config/prefs.php.dist:396
 msgid "Purge Trash how often:"
 msgstr "Áö¿îÆíÁöÇÔ ºñ¿ì±â ½ÇÇàÁÖ±â:"
 
-#: config/prefs.php.dist:399
+#: config/prefs.php.dist:405
 msgid "Purge messages in Trash folder older than this amount of days."
 msgstr "ÁöÁ¤µÈ ÀÏ ¼öº¸´Ù ¿À·¡µÈ ¿À·¡µÈ ÆíÁö Áö¿îÆíÁöÇÔ¿¡¼ Áö¿ì±â"
 
-#: config/prefs.php.dist:380
+#: config/prefs.php.dist:386
 msgid "Purge old messages in the Trash folder?"
 msgstr "Áö¿îÆíÁöÇÔ¿¡¼ ¿À·¡µÈ ÆíÁö Áö¿ï±î¿ä?"
 
-#: lib/Maintenance/Task/purge_trash.php:67
-msgid "Purging %d message(s) from Trash folder."
+#: lib/Maintenance/Task/purge_trash.php:65
+#, fuzzy, php-format
+msgid "Purging %d messages from Trash folder."
 msgstr "Áö¿îÆíÁöÇÔ¿¡¼ %d°³ ÆíÁö¸¦ Áö¿ò"
 
-#: config/prefs.php.dist:421
-msgid "Put this after @ when sending mail and default address expansion:"
-msgstr ""
+#: lib/Maintenance/Task/purge_trash.php:63
+#, fuzzy
+msgid "Purging 1 message from Trash folder."
+msgstr "Áö¿îÆíÁöÇÔ¿¡¼ %d°³ ÆíÁö¸¦ Áö¿ò"
 
 #: templates/quota/quota.inc:17
 #, php-format
@@ -2761,23 +3086,24 @@
 msgid "Quota status: NO LIMIT"
 msgstr ""
 
-#: config/prefs.php.dist:492
+#: config/prefs.php.dist:500
+#, php-format
 msgid "Quoting %f:"
 msgstr "%f wrote:"
 
-#: templates/compose/compose.inc:377
+#: templates/compose/compose.inc:386
 msgid "Re_quest Delivery Confirmation"
 msgstr "_Q¼ö½Å È®ÀÎ ¿äÃ»"
 
-#: search.php:165
+#: lib/Search.php:50
 msgid "Received On"
 msgstr "¼ö½Å ³¯Â¥:"
 
-#: search.php:173
+#: lib/Search.php:58
 msgid "Received Since"
 msgstr "³¯Â¥ ½ÃÀÛ:"
 
-#: search.php:169
+#: lib/Search.php:54
 msgid "Received Until"
 msgstr "³¯Â¥ ³¡:"
 
@@ -2789,27 +3115,27 @@
 msgid "Redirect"
 msgstr "¹Ù·Î Àü´Þ"
 
-#: templates/compose/redirect.inc:115
+#: templates/compose/redirect.inc:110
 msgid "Redirect Message"
 msgstr "ÆíÁö Àü´Þ"
 
-#: compose.php:721
+#: compose.php:787
 msgid "Redirect this message"
 msgstr "ÆíÁö Àü´Þ"
 
-#: compose.php:781
+#: compose.php:847
 msgid "Redirecting failed."
 msgstr "ÆíÁö Àü´Þ ¿À·ù:"
 
-#: templates/compose/compose.inc:573
+#: templates/compose/compose.inc:583
 msgid "Refresh"
 msgstr "»õ·Î ÀÐ±â"
 
-#: config/prefs.php.dist:760
+#: config/prefs.php.dist:784
 msgid "Refresh Folder Views:"
 msgstr "ÆíÁöÇÔ »õ·Î ÀÐ±â:"
 
-#: templates/folders/head.inc:3 templates/mailbox/header.inc:4
+#: templates/folders/head.inc:9 templates/mailbox/header.inc:4
 msgid "Reload"
 msgstr "»õ·Î °íÄ§"
 
@@ -2817,11 +3143,12 @@
 msgid "Reload View"
 msgstr "»õ·Î °íÄ§"
 
-#: lib/MIME/Viewer/itip.php:483 lib/MIME/Viewer/itip.php:502
+#: lib/MIME/Viewer/itip.php:526 lib/MIME/Viewer/itip.php:545
+#, fuzzy
 msgid "Remember the free/busy information."
-msgstr ""
+msgstr "ÆíÁö ¼¹ö Á¤º¸»çÇ×"
 
-#: config/prefs.php.dist:950
+#: config/prefs.php.dist:979
 msgid "Remember the last view"
 msgstr "¸¶Áö¸· È¸é ±â¾ï"
 
@@ -2829,7 +3156,7 @@
 msgid "Remote Mailbox:"
 msgstr "¿ÜºÎ ÆíÁöÇÔ:"
 
-#: templates/search/fields.inc:40
+#: templates/search/fields.inc:41
 msgid "Remove Field From Search"
 msgstr ""
 
@@ -2837,15 +3164,16 @@
 msgid "Remove source"
 msgstr "¼Ò½º Áö¿ì±â"
 
-#: templates/folders/actions.inc:6
+#: templates/folders/actions.inc:8
 msgid "Rename Folder(s)"
 msgstr "ÆíÁöÇÔ ÀÌ¸§ º¯°æ"
 
-#: config/prefs.php.dist:335
+#: config/prefs.php.dist:341
 msgid "Rename sent-mail folder at beginning of month?"
 msgstr "º¸³½ÆíÁöÇÔ(Sent) ÀÌ¸§À» ¸Å¿ùÃÊ º¯°æÇÕ´Ï´Ù."
 
-#: lib/Folder.php:542
+#: lib/Folder.php:455
+#, php-format
 msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
 msgstr "\"%s\"¸¦ \"%s\"·Î ÀÌ¸§À» º¯°æÇÏÁö ¸øÇß½À´Ï´Ù. ¼¹ö ¿À·ù: "
 
@@ -2853,7 +3181,7 @@
 msgid "Repl_y to List"
 msgstr "_y¸®½ºÆ® È¸½Å"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "Replace with:"
 msgstr "¹Ù²Ü ¹®ÀÚ¿:"
 
@@ -2861,7 +3189,7 @@
 msgid "Reply"
 msgstr "È¸½Å"
 
-#: lib/MIME/Viewer/itip.php:279 lib/MIME/Viewer/itip.php:372
+#: lib/MIME/Viewer/itip.php:311 lib/MIME/Viewer/itip.php:409
 #, fuzzy
 msgid "Reply Sent."
 msgstr "È¸½Å:"
@@ -2870,7 +3198,7 @@
 msgid "Reply to All"
 msgstr "ÀüÃ¼ È¸½Å"
 
-#: compose.php:670
+#: compose.php:733
 msgid "Reply to All:"
 msgstr "ÀüÃ¼ È¸½Å:"
 
@@ -2878,7 +3206,7 @@
 msgid "Reply to List"
 msgstr "¸®½ºÆ® È¸½Å"
 
-#: compose.php:672
+#: compose.php:735
 msgid "Reply to List:"
 msgstr "¸®½ºÆ® È¸½Å:"
 
@@ -2886,127 +3214,127 @@
 msgid "Reply to _All"
 msgstr "_AÀüÃ¼ È¸½Å"
 
-#: lib/MIME/Viewer/itip.php:485 lib/MIME/Viewer/itip.php:494
-#: lib/MIME/Viewer/itip.php:504
+#: lib/MIME/Viewer/itip.php:528 lib/MIME/Viewer/itip.php:537
+#: lib/MIME/Viewer/itip.php:547
+#, fuzzy
 msgid "Reply with Not Supported Message"
-msgstr ""
+msgstr "ÀÐÁö ¾ÊÀº Ã¹¹øÂ° ÆíÁö°¡ ÀÖ´Â ÆäÀÌÁö"
 
-#: lib/MIME/Viewer/itip.php:492
+#: lib/MIME/Viewer/itip.php:535
 msgid "Reply with free/busy for next 2 months."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:491
+#: lib/MIME/Viewer/itip.php:534
+#, fuzzy
 msgid "Reply with requested free/busy information."
-msgstr ""
+msgstr "µ¥ÀÌÅ¸ ÀÓÆ÷Æ® ¿À·ù"
 
-#: message.php:258
+#: message.php:267
 msgid "Reply-To"
 msgstr "È¸½Å:"
 
-#: lib/Compose.php:260 lib/Compose.php:312
+#: lib/Compose.php:409
 msgid "Reply-To: "
 msgstr "È¸½Å:"
 
-#: compose.php:668
+#: compose.php:731
 msgid "Reply:"
 msgstr "È¸½Å:"
 
-#: templates/message/navbar_actions.inc:36 templates/mailbox/actions.inc:26
+#: templates/message/navbar_actions.inc:38 templates/mailbox/actions.inc:26
 #, fuzzy
 msgid "Report as Innocent"
 msgstr "½ºÆÔ °í¹ß"
 
-#: templates/message/navbar_actions.inc:33 templates/mailbox/actions.inc:24
+#: templates/message/navbar_actions.inc:35 templates/mailbox/actions.inc:23
 msgid "Report as Spam"
 msgstr "½ºÆÔ °í¹ß"
 
-#: templates/compose/compose.inc:374
+#: templates/compose/compose.inc:383
 msgid "Request a _Read Receipt"
 msgstr "_R´äÀå ¿äÃ»"
 
-#: config/prefs.php.dist:587
+#: config/prefs.php.dist:585
 msgid "Request delivery confirmation?"
 msgstr "¼ö½Å È®ÀÎ ¿äÃ»"
 
-#: config/prefs.php.dist:566
+#: config/prefs.php.dist:573
 msgid "Request read receipts?"
 msgstr "´äÀå ¿äÃ»"
 
-#: mailbox.php:197
+#: mailbox.php:189
 msgid "Requested message not found."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:649
+#: lib/MIME/Viewer/itip.php:697
+#, fuzzy
 msgid "Required Participant"
-msgstr ""
+msgstr "´äÀå ¿äÃ»"
 
 #: templates/search/main.inc:143 templates/search/header.inc:26
-#: templates/acl/acl.inc:158
+#: templates/acl/acl.inc:161
 msgid "Reset"
 msgstr "»õ·ÎÀÛ¼º"
 
-#: lib/MIME/Viewer/itip.php:106
+#: lib/MIME/Viewer/itip.php:115
 msgid "Respondent Status Updated."
 msgstr ""
 
-#: templates/message/navbar_actions.inc:28
+#: templates/message/navbar_actions.inc:30
 msgid "Resume"
 msgstr "ÀçÀÛ¼º"
 
-#: recompose.php:89
+#: recompose.php:98
 msgid "Resume your session"
 msgstr ""
 
+#: templates/stationery/prefs.inc:44
+#, fuzzy
+msgid "Return to \"Message Composition\""
+msgstr "ÆíÁö ÀÛ¼º"
+
 #: templates/fetchmail/driver_select.inc:31 templates/fetchmail/manage.inc:69
 #: templates/fetchmail/account_select.inc:32
 msgid "Return to Fetch Mail"
 msgstr "¿ÜºÎÆíÁö °¡Á®¿À±â·Î µ¹¾Æ°¡±â"
 
-#: templates/filters/prefs.inc:70 templates/filters/notactive.inc:13
-#: templates/smime/smime.inc:158 templates/pgp/pgp.inc:268
-msgid "Return to Main Preferences Screen"
-msgstr "Ã¹È¸éÀ¸·Î µ¹¾Æ°¡±â"
-
-#: templates/acl/acl.inc:159 templates/acl/acl.inc:169
+#: templates/filters/prefs.inc:60 templates/filters/notactive.inc:22
+#: templates/smime/smime.inc:101 templates/smime/notactive.inc:14
+#: templates/pgp/pgp.inc:149 templates/pgp/notactive.inc:15
+#: templates/acl/acl.inc:162 templates/acl/acl.inc:173
 msgid "Return to Options"
 msgstr "¼±ÅÃ»çÇ×À¸·Î µ¹¾Æ°¡±â"
 
-#: templates/smime/notactive.inc:33 templates/pgp/notactive.inc:33
-msgid "Return to Previous Screen"
-msgstr "ÀüÈ¸éÀ¸·Î µ¹¾Æ°¡±â"
-
-#: config/prefs.php.dist:714
+#: config/prefs.php.dist:718
 msgid ""
 "Return to the mailbox listing after deleting, moving, or copying a message?"
 msgstr "ÆíÁöÀÇ »èÁ¦, ÀÌµ¿, º¹»çÈÄ¿¡´Â ÆíÁöÇÔÀ¸·Î µ¹¾Æ°¡±â?"
 
-#: lib/MIME/Viewer/itip.php:640
+#: lib/MIME/Viewer/itip.php:688
 msgid "Role"
 msgstr "¿ªÇÒ"
 
-#: lib/MIME/Viewer/pkcs7.php:134 lib/MIME/Viewer/pkcs7.php:229
-#: lib/MIME/Viewer/pkcs7.php:415
+#: lib/MIME/Viewer/pkcs7.php:142 lib/MIME/Viewer/pkcs7.php:237
+#: lib/MIME/Viewer/pkcs7.php:419
+#, fuzzy
 msgid "S/MIME"
-msgstr ""
+msgstr "¿É¼Ç ÀúÀå"
 
 #: templates/compose/encrypt_list.inc:12
+#, fuzzy
 msgid "S/MIME Encrypt Message"
-msgstr ""
+msgstr "ÆíÁö Àü¼Û"
 
-#: compose.php:379
+#: compose.php:394
 #, fuzzy
 msgid "S/MIME Error: "
 msgstr "ÀÐ¾î¿À±â(ÀÓÆ÷Æ®) ¿À·ù: "
 
-#: compose.php:358
+#: compose.php:373
 msgid "S/MIME Error: Need passphrase for personal private key."
 msgstr ""
 
-#: templates/smime/notactive.inc:6
-msgid "S/MIME NOT Active"
-msgstr ""
-
-#: templates/smime/smime.inc:6 config/prefs.php.dist:143
+#: config/prefs.php.dist:151
 #, fuzzy
 msgid "S/MIME Options"
 msgstr "¿É¼Ç ÀúÀå"
@@ -3015,7 +3343,7 @@
 msgid "S/MIME Passphrase Input"
 msgstr ""
 
-#: templates/smime/smime.inc:100
+#: templates/smime/smime.inc:54
 msgid "S/MIME Personal Keypair support requires a secure web connection."
 msgstr ""
 
@@ -3025,16 +3353,19 @@
 msgstr "ÆíÁöÇÔ \"%s\"ÀÌ »èÁ¦µÇ¾ú½À´Ï´Ù."
 
 #: smime.php:162
+#, fuzzy
 msgid "S/MIME Public Key successfully added."
-msgstr ""
+msgstr "%s ÆÄÀÏÀÌ ÀÓÆ÷Æ®µÇ¾ú½À´Ï´Ù."
 
-#: templates/smime/smime.inc:45
+#: templates/smime/smime.inc:10
+#, fuzzy
 msgid "S/MIME Public Keyring"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: smime.php:211
+#, fuzzy
 msgid "S/MIME Public/Private Keypair successfully added."
-msgstr ""
+msgstr "¼¸íÀÌ º¯°æµÇ¾ú½À´Ï´Ù."
 
 #: templates/compose/encrypt_list.inc:13
 #, fuzzy
@@ -3042,81 +3373,100 @@
 msgstr "ÆíÁö Àü¼Û"
 
 #: templates/compose/encrypt_list.inc:14
+#, fuzzy
 msgid "S/MIME Sign/Encrypt Message"
-msgstr ""
+msgstr "ÆíÁö Àü¼Û"
 
-#: templates/smime/notactive.inc:11
+#: templates/smime/notactive.inc:4
 msgid "S/MIME support is disabled on this system."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:233
+#: lib/MIME/Viewer/pkcs7.php:241
 msgid ""
 "S/MIME support is not currently enabled so the message is unable to be "
 "decrypted."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:165
+#: lib/MIME/Viewer/pkcs7.php:173
 msgid ""
 "S/MIME support is not enabled so the contents of this signed message can not "
 "be displayed."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:138
+#: lib/MIME/Viewer/pkcs7.php:146
 msgid ""
 "S/MIME support is not enabled so the digital signature is unable to be "
 "verified."
 msgstr ""
 
-#: templates/smime/smime.inc:24
+#: templates/smime/smime.inc:2
 msgid ""
 "S/MIME support requires popup windows to be used.  If your browser is "
 "currently set to disable popup windows, you must change this setting or else "
-"the S/MIME features will not work correctly"
+"the S/MIME features will not work correctly."
 msgstr ""
 
-#: templates/compose/compose.inc:266
+#: templates/login/login.inc:205
+msgid "SMTP"
+msgstr ""
+
+#: templates/compose/compose.inc:255
 msgid "S_ubject"
 msgstr "_uÁ¦¸ñ"
 
-#: templates/compose/compose.inc:354
+#: templates/compose/compose.inc:363
 msgid "Sa_ve a copy in "
 msgstr "_v¿¡ º¹»çº» ÀúÀåÇÏ±â"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Sa_ve as"
 msgstr "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå"
 
-#: search.php:358 templates/fetchmail/manage.inc:67
+#: search.php:316 templates/fetchmail/manage.inc:67
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: templates/compose/compose.inc:528
+#: templates/compose/compose.inc:538
 msgid "Save Attachments with message in sent-mail folder?"
 msgstr "Ã·ºÎÆÄÀÏÀ» º¸³½ÆíÁöÇÔ¿¡ ÀúÀåÇÒ±î¿ä?"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save Draft"
 msgstr "ÀÓ½Ãº¸°üÇÔ¿¡ ÀúÀå"
 
-#: templates/filters/prefs.inc:69 templates/smime/smime.inc:37
-#: templates/smime/notactive.inc:23 templates/pgp/pgp.inc:64
-#: templates/pgp/notactive.inc:23
+#: saveimage.php:42
+#, fuzzy
+msgid "Save Image"
+msgstr "´Ù¸¥ÀÌ¸§À¸·Î ÀúÀå"
+
+#: lib/MIME/Contents.php:204
+msgid "Save Image in Gallery"
+msgstr ""
+
+#: templates/filters/prefs.inc:59 templates/smime/smime.inc:100
+#: templates/smime/notactive.inc:12 templates/pgp/pgp.inc:148
+#: templates/pgp/notactive.inc:13
 msgid "Save Options"
 msgstr "¼±ÅÃ»çÇ× ÀúÀå"
 
-#: templates/compose/compose.inc:68 templates/compose/compose.inc:424
+#: templates/stationery/prefs.inc:40
+#, fuzzy
+msgid "Save Stationery"
+msgstr "¼±ÅÃ»çÇ× ÀúÀå"
+
+#: templates/compose/compose.inc:69 templates/compose/compose.inc:433
 msgid "Save _Draft"
 msgstr "ÀÓ½Ãº¸°üÇÔ¿¡ ÀúÀå"
 
-#: templates/message/navbar_actions.inc:30
+#: templates/message/navbar_actions.inc:32
 msgid "Save as"
 msgstr "´Ù¸¥ÀÌ¸§À¸·Î ÀúÀå"
 
-#: config/prefs.php.dist:513
+#: config/prefs.php.dist:521
 msgid "Save drafts as unseen?"
 msgstr "ÀÓ½ÃÆíÁö¸¦ ÀÐÁö ¾ÊÀ½ »óÅÂ·Î ÀúÀå"
 
-#: config/prefs.php.dist:1030
+#: config/prefs.php.dist:1072
 msgid "Save recipients automatically to the default address book?"
 msgstr "¹Þ´Â»ç¶÷À» ÀÚµ¿À¸·Î ÁÖ¼Ò·Ï¿¡ Ãß°¡ÇÒ±î¿ä?"
 
@@ -3124,27 +3474,31 @@
 msgid "Save search as a virtual folder?"
 msgstr "°Ë»ö°á°ú´Â °¡»óÆíÁöÇÔ¿¡ ÀúÀåÇÒ±î¿ä?"
 
-#: config/prefs.php.dist:223
+#: config/prefs.php.dist:230
 msgid "Save sent mail?"
 msgstr "º¸³½ÆíÁöÇÔ¿¡ ÀúÀå"
 
-#: compose.php:1148
+#: compose.php:1227
+#, php-format
 msgid "Saving the draft failed. This is what the server said: %s"
 msgstr "ÀÓ½ÃÆíÁö ÀúÀå ¿À·ù. ¼¹öÀÇ ¿À·ù: %s"
 
-#: templates/contacts/contacts.inc:197 templates/mailbox/header.inc:11
+#: templates/contacts/contacts.inc:199 templates/mailbox/header.inc:11
+#: lib/Block/tree_folders.php:41
 msgid "Search"
 msgstr "Ã£±â"
 
 #: templates/search/header.inc:18 templates/mailbox/header.inc:11
+#, php-format
 msgid "Search %s"
 msgstr "%s °Ë»ö"
 
-#: lib/Block/tree_folders.php:169
-msgid "Search Mail"
-msgstr "ÆíÁö °Ë»ö"
+#: config/prefs.php.dist:120
+#, fuzzy
+msgid "Search Options"
+msgstr "¼±ÅÃ»çÇ× ÀúÀå"
 
-#: search.php:311
+#: search.php:265
 msgid "Search Results"
 msgstr "°Ë»ö °á°ú"
 
@@ -3160,7 +3514,7 @@
 msgid "Select Another Account"
 msgstr "´Ù¸¥ °èÁ¤ ¼±ÅÃ"
 
-#: templates/search/fields.inc:35
+#: templates/search/fields.inc:36
 msgid "Select a date"
 msgstr "³¯Â¥ ¼±ÅÃ"
 
@@ -3168,7 +3522,12 @@
 msgid "Select a field"
 msgstr "Ç×¸ñ ¼±ÅÃ"
 
-#: config/prefs.php.dist:127
+#: templates/compose/compose.inc:317
+#, fuzzy
+msgid "Select a stationery:"
+msgstr "³¯Â¥ ¼±ÅÃ"
+
+#: config/prefs.php.dist:135
 msgid "Select address book sources for adding and searching for addresses."
 msgstr "ÁÖ¼Ò °Ë»ö ¹× Ãß°¡¸¦ À§ÇÑ ÁÖ¼Ò·Ï ¼±ÅÃ"
 
@@ -3188,6 +3547,10 @@
 msgid "Select none"
 msgstr "¼±ÅÃ Ãë¼Ò"
 
+#: templates/saveimage/saveimage.inc:9
+msgid "Select the gallery to save the image in."
+msgstr ""
+
 #: templates/fetchmail/driver_select.inc:21
 msgid "Select the mail server type"
 msgstr "¸ÞÀÏ¼¹ö Á¾·ù ¼±ÅÃ:"
@@ -3196,33 +3559,34 @@
 msgid "Selected Address books:"
 msgstr "¼±ÅÃµÈ ÁÖ¼Ò·Ï:"
 
-#: templates/pgp/pgp.inc:147
+#: templates/pgp/pgp.inc:72
 msgid "Send Key to Public Keyserver"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:560
+#: lib/MIME/Viewer/itip.php:604
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "ÆíÁö ¼¹ö Á¤º¸»çÇ×"
 
-#: config/prefs.php.dist:575
-msgid "Send MDN when requested by the sender?"
-msgstr "ÀÛ¼ºÀÚ ¿äÃ»½Ã MDN(¸ÞÀÏÀü¼ÛÈ®ÀÎ) º¸³¾±î¿ä?"
-
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "Send Message"
 msgstr "ÆíÁö º¸³»±â"
 
-#: folders.php:359
+#: config/prefs.php.dist:703
+#, fuzzy
+msgid "Send read receipt when requested by the sender?"
+msgstr "ÀÛ¼ºÀÚ ¿äÃ»½Ã MDN(¸ÞÀÏÀü¼ÛÈ®ÀÎ) º¸³¾±î¿ä?"
+
+#: folders.php:397
 msgid "Sent mail folder"
 msgstr "º¸³½ÆíÁöÇÔ"
 
-#: templates/prefs/sentmailselect.inc:39
+#: templates/prefs/sentmailselect.inc:38
 msgid "Sent mail folder:"
 msgstr "º¸³½ÆíÁöÇÔ:"
 
-#: templates/login/login.inc:138 templates/login/login.inc:152
-#: templates/login/login.inc:159
+#: templates/login/login.inc:132 templates/login/login.inc:146
+#: templates/login/login.inc:153
 msgid "Server"
 msgstr "¼¹ö"
 
@@ -3238,7 +3602,7 @@
 msgid "Set preferences for what happens when you move and delete messages."
 msgstr "ÆíÁö »èÁ¦ ¹× ÀÌµ¿½Ã È¯°æ ¼³Á¤"
 
-#: config/prefs.php.dist:522
+#: config/prefs.php.dist:529
 msgid "Set the X-Priority header when composing messages?"
 msgstr ""
 
@@ -3252,10 +3616,11 @@
 msgstr "º¸³½ ÆíÁöÇÔ:"
 
 #: config/prefs.php.dist:32
+#, fuzzy
 msgid "Share your mail folders with other users."
-msgstr ""
+msgstr "º¸³½ ÆíÁöÇÔ:"
 
-#: config/prefs.php.dist:672
+#: config/prefs.php.dist:669
 msgid ""
 "Should large blocks of quoted text be shown or hidden by default? It can be "
 "toggled easily whichever you choose."
@@ -3263,15 +3628,15 @@
 "±ä ÀÎ¿ë±ÛÀÇ °æ¿ì ±âº»À¸·Î º¸¿©ÁÙ±î¿ä, ¾Æ´Ï¸é °¨Ãâ±î¿ä? ¾î¶² °ÍÀ» ¼±ÅÃÇÏ´õ¶ó"
 "µµ, °£´ÜÈ÷ ÀüÈ¯ÇÒ ¼ö ÀÖ½À´Ï´Ù."
 
-#: templates/pgp/pgp.inc:52
+#: templates/pgp/pgp.inc:7
 msgid "Should the body of text/plain messages be scanned for PGP data?"
 msgstr ""
 
-#: config/prefs.php.dist:505
+#: config/prefs.php.dist:513
 msgid "Should the compose window be closed after saving a draft?"
 msgstr "ÀÓ½Ãº¸°üÇÔ¿¡ ÀúÀå ÈÄ ÀÛ¼ºÃ¢À» ´ÝÀ»±î¿ä?"
 
-#: templates/pgp/pgp.inc:40
+#: templates/pgp/pgp.inc:4
 msgid "Should your PGP public key to be attached to your messages by default?"
 msgstr ""
 
@@ -3283,7 +3648,7 @@
 msgid "Show All Headers"
 msgstr "¸ðµç ¸Ó¸´±Û º¸±â"
 
-#: mailbox.php:354
+#: mailbox.php:365
 msgid "Show Deleted"
 msgstr "Áö¿öÁø ÆíÁö º¸±â"
 
@@ -3299,54 +3664,51 @@
 msgid "Show Only Subscribed Folders"
 msgstr "»ç¿ëÇÏ´Â ÆíÁöÇÔ¸¸ º¸±â"
 
-#: folders.php:254
+#: folders.php:298
 msgid "Show Unsubscribed"
 msgstr "»ç¿ëÇÏÁö ¾Ê´Â ÆíÁöÇÔ º¸±â"
 
-#: config/prefs.php.dist:612
+#: config/prefs.php.dist:608
 msgid "Show an icon to allow stripping of attachments from messages?"
 msgstr "ÆíÁö¿¡¼ Ã·ºÎÆÄÀÏ »èÁ¦ ¾ÆÀÌÄÜÀ» º¸¿©ÁÙ±î¿ä?"
 
-#: config/prefs.php.dist:974
+#: config/prefs.php.dist:1002
 msgid "Show legend in the mailbox view?"
 msgstr "ÆíÁöÇÔ º¸±â¿¡¼ ¹üÁÖ º¸±â"
 
-#: config/prefs.php.dist:809
+#: config/prefs.php.dist:840
 msgid "Show previews for unread messages only?"
 msgstr ""
 
-#: config/prefs.php.dist:817
+#: config/prefs.php.dist:848
 msgid "Show previews in tooltips?"
 msgstr ""
 
-#: config/prefs.php.dist:848
+#: config/prefs.php.dist:877
 msgid "Show the Fetch Mail icon on the menubar?"
 msgstr "°¡Á®¿À±â ¾ÆÀÌÄÜÀ» ¸Þ´º¹Ù¿¡ º¸¿©ÁÙ±î¿ä?"
 
-#: lib/MIME/Viewer/html.php:106
+#: lib/MIME/Viewer/html.php:95
+#, fuzzy
 msgid "Show the Images"
-msgstr ""
+msgstr "±×¸² º¸±â"
 
-#: templates/filters/prefs.inc:61
+#: templates/filters/prefs.inc:54
 msgid "Show the filter icon on the menubar?"
 msgstr "¸Þ´º¹Ù¿¡ ÇÊÅÍ ¾ÆÀÌÄÜÀ» º¸¿©ÁÙ±î¿ä?"
 
-#: lib/Block/summary.php:30
+#: lib/Block/summary.php:28
 msgid "Show total number of mails in folder?"
 msgstr "ÆíÁöÇÔ ÀüÃ¼ ÆíÁö °¹¼ö¸¦ Ç¥½ÃÇÒ±î¿ä?"
 
-#: config/prefs.php.dist:669
+#: config/prefs.php.dist:666
 msgid "Shown"
 msgstr "º¸¿©ÁÖ±â"
 
-#: templates/mailbox/message_headers.inc:37
+#: templates/mailbox/message_headers.inc:42
 msgid "Si_ze"
 msgstr "_zÅ©±â"
 
-#: templates/login/login.inc:241
-msgid "Sign up if not registered"
-msgstr ""
-
 #: templates/mailbox/legend.inc:17
 msgid "Signed"
 msgstr "¾ÏÈ£ÈµÊ"
@@ -3355,67 +3717,85 @@
 msgid "Size"
 msgstr "Å©±â"
 
-#: templates/mailbox/message_headers.inc:71
-msgid "Sort Direction"
-msgstr "Á¤·Ä ¹æ¹ý"
-
-#: templates/mailbox/message_headers.inc:6
+#: templates/mailbox/message_headers.inc:11
+#, fuzzy
 msgid "Sort by Arrival"
-msgstr ""
+msgstr "´ñ±Ûº¸±â Á¤·Ä"
 
-#: templates/mailbox/message_headers.inc:11
+#: templates/mailbox/message_headers.inc:16
+#, fuzzy
 msgid "Sort by Date"
-msgstr ""
+msgstr "´ñ±Ûº¸±â Á¤·Ä"
 
-#: templates/mailbox/message_headers.inc:21
+#: templates/mailbox/message_headers.inc:26
 msgid "Sort by From Address"
 msgstr "º¸³½»ç¶÷ Á¤·Ä"
 
-#: templates/mailbox/message_headers.inc:36
+#: templates/mailbox/message_headers.inc:41
 msgid "Sort by Message Size"
 msgstr "ÆíÁö Å©±â Á¤·Ä"
 
-#: templates/mailbox/message_headers.inc:31
+#: templates/mailbox/message_headers.inc:36
 msgid "Sort by Subject"
 msgstr "Á¦¸ñ Á¤·Ä"
 
-#: templates/mailbox/message_headers.inc:26
+#: templates/mailbox/message_headers.inc:31
 msgid "Sort by Thread"
 msgstr "´ñ±Ûº¸±â Á¤·Ä"
 
-#: templates/mailbox/message_headers.inc:16
+#: templates/mailbox/message_headers.inc:21
 msgid "Sort by To Address"
 msgstr "¹Þ´Â»ç¶÷ Á¤·Ä"
 
-#: templates/prefs/spamselect.inc:4
+#: templates/prefs/spamselect.inc:23
 msgid "Spam folder:"
 msgstr "½ºÆèÆíÁöÇÔ:"
 
-#: templates/compose/compose.inc:337
+#: templates/compose/compose.inc:346
 msgid "Special Characters"
 msgstr "Æ¯¼ö ¹®ÀÚ"
 
-#: templates/compose/compose.inc:334
+#: search.php:133
+msgid "Special Virtual Folders can not be edited."
+msgstr ""
+
+#: templates/compose/compose.inc:343
 msgid "Spell Check"
 msgstr "Ã¶ÀÚ °Ë»ç"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "Spell Checker"
 msgstr "Ã¶ÀÚ °Ë»ç±â"
 
-#: templates/compose/spelling.inc:50 templates/compose/spelling.inc:58
+#: templates/compose/spelling.inc:48 templates/compose/spelling.inc:56
 msgid "Spell check complete"
 msgstr "Ã¶ÀÚ °Ë»ç ¿Ï·á"
 
-#: config/prefs.php.dist:462
+#: config/prefs.php.dist:471
 msgid "Spelling errors per screen when spell checking."
 msgstr "Ã¶ÀÚ °Ë»ç½Ã ÇÑ È¸é¿¡ Ç¥½ÃÇÒ ¿À·ù°¹¼ö"
 
-#: lib/MIME/Viewer/itip.php:469 lib/MIME/Viewer/itip.php:606
+#: lib/MIME/Viewer/itip.php:512 lib/MIME/Viewer/itip.php:652
 msgid "Start"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:640
+#: templates/stationery/prefs.inc:9 templates/compose/compose.inc:311
+msgid "Stationery"
+msgstr ""
+
+#: templates/stationery/prefs.inc:26
+msgid "Stationery name:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:28
+msgid "Stationery type:"
+msgstr ""
+
+#: templates/stationery/prefs.inc:33
+msgid "Stationery:"
+msgstr ""
+
+#: lib/MIME/Viewer/itip.php:688
 msgid "Status"
 msgstr ""
 
@@ -3423,108 +3803,120 @@
 msgid "Strip Attachment"
 msgstr "Ã·ºÎÆÄÀÏ Á¦°Å"
 
-#: config/prefs.php.dist:801
+#: config/prefs.php.dist:832
 msgid "Strip linebreaks?"
 msgstr ""
 
-#: templates/mailbox/message_headers.inc:32
+#: templates/mailbox/message_headers.inc:37
 msgid "Sub_ject"
 msgstr "_JÁ¦¸ñ"
 
-#: message.php:259 search.php:157 templates/compose/recompose.inc:25
+#: message.php:268 thread.php:150 templates/compose/recompose.inc:25
+#: lib/Search.php:38
 msgid "Subject"
 msgstr "Á¦¸ñ"
 
-#: config/prefs.php.dist:891
+#: config/prefs.php.dist:920
 msgid "Subject Field"
 msgstr "Á¦¸ñ"
 
-#: search.php:360 templates/smime/passphrase.inc:21
-#: templates/pgp/passphrase.inc:31
+#: search.php:318 templates/saveimage/saveimage.inc:18
+#: templates/smime/passphrase.inc:20 templates/pgp/passphrase.inc:31
 msgid "Submit"
 msgstr "ÀÔ·Â"
 
-#: templates/folders/actions.inc:9
+#: templates/folders/actions.inc:11
 msgid "Subscribe to Folder(s)"
 msgstr "ÆíÁöÇÔ »ç¿ëÇÏ±â"
 
-#: lib/MIME/Viewer/pkcs7.php:374 lib/MIME/Viewer/pgp.php:395
-#: lib/MIME/Viewer/status.php:90
+#: lib/MIME/Viewer/pkcs7.php:380 lib/MIME/Viewer/pgp.php:389
+#: lib/MIME/Viewer/status.php:87
 msgid "Success"
 msgstr "¼º°ø"
 
-#: templates/compose/spelling.inc:92
+#: templates/compose/spelling.inc:86
 msgid "Suggestions"
 msgstr "Á¦¾È"
 
-#: lib/MIME/Viewer/itip.php:616 lib/MIME/Viewer/itip.php:618
+#: lib/MIME/Viewer/itip.php:662 lib/MIME/Viewer/itip.php:664
 #, fuzzy
 msgid "Summary"
 msgstr "³ªÀÇ ¿ä¾à:"
 
-#: templates/compose/compose.inc:391 templates/compose/compose.inc:394
+#: templates/compose/compose.inc:400 templates/compose/compose.inc:403
+#, fuzzy
 msgid "Switch Composition Method"
-msgstr ""
+msgstr "HTML ÀÛ¼º¸ðµå·Î ÀüÈ¯"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to HTML composition"
 msgstr "HTML ÀÛ¼º¸ðµå·Î ÀüÈ¯"
 
-#: templates/compose/compose.inc:395
+#: templates/compose/compose.inc:404
 msgid "Switch to plain text composition"
 msgstr "ÅØ½ºÆ® ÀÛ¼º¸ðµå·Î ÀüÈ¯"
 
-#: templates/compose/compose.inc:410
+#: templates/compose/compose.inc:419
 msgid "Te_xt"
 msgstr "_xº»¹®"
 
-#: lib/MIME/Viewer/itip.php:239
+#: lib/MIME/Viewer/itip.php:269
 msgid "Tentative: "
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:547
+#: lib/MIME/Viewer/itip.php:591
 msgid "Tentatively Accept request"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:713
+#: lib/MIME/Viewer/itip.php:761
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: lib/Maintenance/Task/tos_agreement.php:54
+#: lib/Maintenance/Task/tos_agreement.php:49
 #, php-format
 msgid "Terms of Service file not specified in conf.php"
 msgstr ""
 
-#: config/prefs.php.dist:925
+#: templates/stationery/prefs.inc:30
+#, fuzzy
+msgid "Text"
+msgstr "_xº»¹®"
+
+#: config/prefs.php.dist:954
 msgid "The From: column of the message should be linked:"
 msgstr "¹Þ´Â»ç¶÷ Ç×¸ñÀÌ ¿¬°áµÉ °÷ ¼±ÅÃÇÏ±â"
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/IMAP/Client.php:532
+msgid ""
+"The IMAP server does not appear to support the authentication method "
+"selected. Please contact your system administrator."
+msgstr ""
+
+#: lib/MIME/Viewer/appledouble.php:41
 msgid "The Macintosh resource fork"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:43
+#: lib/MIME/Viewer/appledouble.php:41
 #, php-format
 msgid "The Macintosh resource fork can be downloaded %s."
 msgstr ""
 
 #: fetchmailprefs.php:81
+#, php-format
 msgid "The account \"%s\" has been deleted."
 msgstr "°èÁ¤ \"%s\" °¡ Áö¿öÁ³½À´Ï´Ù."
 
 #: fetchmailprefs.php:74
+#, php-format
 msgid "The account \"%s\" has been saved."
 msgstr "°èÁ¤ \"%s\" °¡ ÀúÀåµÇ¾ú½À´Ï´Ù."
 
-#: lib/Filter.php:103
-msgid "The address \"%s\" has been added to %s."
-msgstr "ÁÖ¼Ò \"%s\"´Â %s¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù."
-
 #: attachment.php:43
+#, fuzzy
 msgid "The attachment was not found."
-msgstr ""
+msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: lib/MIME/Viewer/itip.php:61
+#: lib/MIME/Viewer/itip.php:69
 msgid "The calendar data is invalid"
 msgstr ""
 
@@ -3534,36 +3926,40 @@
 "block popup windows?"
 msgstr ""
 
-#: lib/MIME/Viewer/appledouble.php:44
+#: lib/MIME/Viewer/appledouble.php:42
 msgid "The contents of the Macintosh file are below."
 msgstr ""
 
-#: lib/Maintenance/Task/rename_sentmail_monthly.php:96
+#: lib/Maintenance/Task/rename_sentmail_monthly.php:87
+#, php-format
 msgid "The current folder(s) \"%s\" will be renamed to \"%s\"."
 msgstr "ÇöÀç ÆíÁöÇÔ \"%s\"¸¦ \"%s\"·Î º¯°æÇÕ´Ï´Ù."
 
-#: templates/acl/acl.inc:112
+#: templates/acl/acl.inc:107
 msgid ""
 "The current list of users with access to this folder could not be retrieved"
 msgstr ""
 
-#: compose.php:1157
+#: compose.php:1236
+#, php-format
 msgid "The draft has been saved to the \"%s\" folder."
 msgstr "ÀÛ¼º ÁßÀÎ ÆíÁö°¡ '%s' ÆíÁöÇÔ¿¡ ÀúÀåµÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:129
+#: lib/MIME/Viewer/itip.php:139
 msgid "The event was added to your calendar."
 msgstr ""
 
 #: templates/compose/expand.inc:9
-msgid "The field '%s' can't be expanded."
+#, fuzzy, php-format
+msgid "The field \"%s\" can't be expanded."
 msgstr "%s¸¦ ¿Ï¼ºÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: lib/Folder.php:426
+#: lib/Folder.php:337
+#, php-format
 msgid "The folder \"%s\" already exists"
 msgstr "\"%s\" ÆíÁöÇÔ´Â ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù."
 
-#: lib/Folder.php:192
+#: lib/Folder.php:163
 #, php-format
 msgid ""
 "The folder \"%s\" contains illegal characters in its name. It may cause "
@@ -3572,85 +3968,102 @@
 "ÆíÁöÇÔ \"%s\"´Â Àß¸øµÈ ¹®ÀÚ¸¦ Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù. ÀÌ°æ¿ì ¹®Á¦¸¦ ÀÏÀ¸Å°´Â °æ¿ì "
 "½Ã½ºÅÛ °ü¸®ÀÚ¿¡ ¹®ÀÇÇÏ½Ã±â ¹Ù¶ø´Ï´Ù."
 
-#: lib/Folder.php:445
+#: lib/Folder.php:356
 #, php-format
 msgid "The folder \"%s\" was created but you were not subscribed to it."
 msgstr "ÆíÁöÇÔ \"%s\"´Â »ý¼ºµÇ¾úÁö¸¸, »ç¿ëÁßÀÌÁö ¾Ê½À´Ï´Ù."
 
-#: lib/Folder.php:380
+#: lib/Folder.php:272
 #, php-format
 msgid "The folder \"%s\" was deleted but you were not unsubscribed from it."
 msgstr "ÆíÁöÇÔ \"%s\"´Â Áö¿öÁ³Áö¸¸, »ç¿ë»óÅÂ¸¦ ÇØÁ¦ÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
-#: lib/Folder.php:432
+#: lib/Folder.php:343
+#, php-format
 msgid "The folder \"%s\" was not created. This is what the server said"
 msgstr "ÆíÁöÇÔ \"%s\"°¡ ¸¸µé¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù. ¼¹ö ¿À·ù: "
 
-#: lib/Folder.php:373
+#: lib/Folder.php:265
+#, php-format
 msgid "The folder \"%s\" was not deleted. This is what the server said"
 msgstr "ÆíÁöÇÔ \"%s\"°¡ Áö¿öÁöÁö ¾Ê¾Ò½À´Ï´Ù. ¼¹ö ¿À·ù: "
 
-#: lib/Folder.php:448
+#: lib/Folder.php:359
+#, php-format
 msgid "The folder \"%s\" was successfully created."
 msgstr "ÆíÁöÇÔ \"%s\"°¡ ¸¸µé¾îÁ³½À´Ï´Ù."
 
-#: lib/Folder.php:383
+#: lib/Folder.php:275
+#, php-format
 msgid "The folder \"%s\" was successfully deleted."
 msgstr "ÆíÁöÇÔ \"%s\"°¡ Áö¿öÁ³½À´Ï´Ù."
 
-#: lib/Folder.php:540
+#: lib/Folder.php:453
+#, php-format
 msgid "The folder \"%s\" was successfully renamed to \"%s\"."
 msgstr "ÆíÁöÇÔ \"%s\"°¡ \"%s\"·Î ¹Ù²î¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/tnef.php:96
+#: lib/MIME/Viewer/tnef.php:92
 msgid "The following files were attached to this part:"
 msgstr ""
 
-#: lib/MIME/Viewer/html.php:95
+#: templates/javascript/open_saveimage_win.js:12
+msgid ""
+"The image save window can not be opened. Perhaps you have set your browser "
+"to block popup windows?"
+msgstr ""
+
+#: lib/MIME/Viewer/html.php:97
+#, fuzzy
 msgid ""
 "The images will be displayed because the sender is present in your "
 "addressbook."
 msgstr ""
+"º¸³½»ç¶÷ÀÌ ÁÖ¼Ò·Ï¿¡ µé¾îÀÖ´Â °æ¿ì HTML ÆíÁöÀÇ ÀÌ¹ÌÁö¸¦ ÀÚµ¿À¸·Î º¸¿©ÁÙ±î¿ä?"
 
-#: lib/MIME/Viewer/status.php:78
+#: lib/MIME/Viewer/status.php:75
+#, fuzzy
 msgid "The mail server generated the following error message:"
-msgstr ""
+msgstr "¸ÞÀÏ ¼¹ö¿Í ÆíÁöÇÔ Á¤º¸ º¯°æ"
 
-#: lib/MIME/Viewer/notification.php:54
+#: lib/MIME/Viewer/notification.php:51
 #, fuzzy
 msgid "The mail server generated the following informational message:"
 msgstr "¸ÞÀÏ ¼¹ö¿Í ÆíÁöÇÔ Á¤º¸ º¯°æ"
 
-#: lib/MIME/Viewer/status.php:93
+#: lib/MIME/Viewer/status.php:90
+#, fuzzy
 msgid "The mail server generated the following message:"
-msgstr ""
+msgstr "¸ÞÀÏ ¼¹ö¿Í ÆíÁöÇÔ Á¤º¸ º¯°æ"
 
-#: lib/Message.php:635
+#: lib/Message.php:651
+#, php-format
 msgid "The mailbox %s is already empty."
 msgstr "ÆíÁöÇÔ \"%s\"´Â ÀÌ¹Ì ºñ¾îÀÖÀ½."
 
-#: lib/Fetchmail.php:262
+#: lib/Fetchmail.php:245
 #, php-format
 msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
 msgstr ""
 
 #: templates/contacts/contacts.inc:103
+#, fuzzy
 msgid "The message being composed has been closed. Exiting."
-msgstr ""
+msgstr "ÆíÁö Áö¿öÁü"
 
-#: message.php:142
+#: message.php:148
 msgid "The message has been deleted."
 msgstr "ÆíÁö Áö¿öÁü"
 
-#: lib/MIME/Viewer/pgp.php:399
+#: lib/MIME/Viewer/pgp.php:393
 #, fuzzy
 msgid "The message has been verified."
 msgstr "½Äº°ÀÚ \"%s\" °¡ ÀúÀåµÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/pkcs7.php:378
-#, php-format
+#: lib/MIME/Viewer/pkcs7.php:384
+#, fuzzy, php-format
 msgid "The message has been verified. Sender: %s."
-msgstr ""
+msgstr "½Äº°ÀÚ \"%s\" °¡ ÀúÀåµÇ¾ú½À´Ï´Ù."
 
 #: templates/smime/open_smime_win.js:10 templates/pgp/open_pgp_win.js:10
 msgid ""
@@ -3658,16 +4071,16 @@
 "block popup windows?"
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:178
+#: lib/MIME/Viewer/pgp.php:173
 #, php-format
 msgid "The raw text of the PGP Public Key can be viewed %s."
 msgstr ""
 
-#: lib/MIME/Viewer/tnef.php:62
+#: lib/MIME/Viewer/tnef.php:60
 msgid "The requested file does not exist in the MS-TNEF attachment."
 msgstr ""
 
-#: lib/MIME/Viewer/zip.php:67
+#: lib/MIME/Viewer/zip.php:64
 msgid "The requested file does not exist in the Zip attachment."
 msgstr ""
 
@@ -3679,9 +4092,10 @@
 "notification message."
 msgstr ""
 
-#: lib/MIME/Viewer/images.php:72
+#: lib/MIME/Viewer/images.php:69
+#, fuzzy
 msgid "The server was not able to create a thumbnail of this image."
-msgstr ""
+msgstr "ÀÌ ±×¸²ÀÇ ½æ³×ÀÏÀ» º¸·Á¸é %s¸¦ ´©¸£¼¼¿ä."
 
 #: templates/compose/compose.js:104
 msgid "The signature could not be replaced."
@@ -3695,44 +4109,61 @@
 msgid "The specified file does not exist."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:159
+#: stationery.php:84
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been added."
+msgstr "°èÁ¤ \"%s\" °¡ ÀúÀåµÇ¾ú½À´Ï´Ù."
+
+#: stationery.php:63
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been deleted."
+msgstr "°èÁ¤ \"%s\" °¡ Áö¿öÁ³½À´Ï´Ù."
+
+#: stationery.php:87
+#, fuzzy, php-format
+msgid "The stationery \"%s\" has been updated."
+msgstr "°èÁ¤ \"%s\" °¡ Áö¿öÁ³½À´Ï´Ù."
+
+#: lib/MIME/Viewer/itip.php:169
+#, fuzzy
 msgid "The task has been added to your tasklist."
-msgstr ""
+msgstr "ÁÖ¼Ò \"%s\"´Â %s¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/status.php:98
+#: lib/MIME/Viewer/status.php:95
 msgid "The text of the message"
 msgstr "ÆíÁö ³»¿ë"
 
-#: lib/MIME/Viewer/status.php:97
-#, php-format
+#: lib/MIME/Viewer/status.php:94
+#, fuzzy, php-format
 msgid "The text of the message can be viewed %s."
-msgstr ""
+msgstr "ÆíÁö ³»¿ë"
 
-#: lib/MIME/Viewer/status.php:83
+#: lib/MIME/Viewer/status.php:80
+#, fuzzy
 msgid "The text of the returned message"
-msgstr ""
+msgstr "ÆíÁö Àü´Þ"
 
-#: lib/MIME/Viewer/status.php:82
-#, php-format
+#: lib/MIME/Viewer/status.php:79
+#, fuzzy, php-format
 msgid "The text of the returned message can be viewed %s."
-msgstr ""
+msgstr "ÆíÁö Àü´Þ"
 
-#: lib/MIME/Viewer/notification.php:71
+#: lib/MIME/Viewer/notification.php:68
 #, fuzzy
 msgid "The text of the sent message"
 msgstr "ÆíÁö Àü´Þ"
 
-#: lib/MIME/Viewer/notification.php:71
-#, php-format
+#: lib/MIME/Viewer/notification.php:68
+#, fuzzy, php-format
 msgid "The text of the sent message can be viewed %s."
-msgstr ""
+msgstr "ÆíÁö Àü´Þ"
 
-#: lib/MIME/Viewer/itip.php:144
+#: lib/MIME/Viewer/itip.php:154
 #, fuzzy
 msgid "The user's free/busy information was sucessfully stored."
 msgstr "¼¸íÀÌ º¯°æµÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/alternative.php:89
+#: lib/MIME/Viewer/alternative.php:86
 msgid "There are no alternative parts that can be displayed inline."
 msgstr ""
 
@@ -3740,184 +4171,198 @@
 msgid "There are no messages in this mailbox."
 msgstr "ÀÌ ÆíÁöÇÔ¿¡ ÆíÁö°¡ ¾ø½À´Ï´Ù."
 
-#: lib/Message.php:594
+#: thread.php:109
+msgid "There is no text that can be displayed inline."
+msgstr ""
+
+#: lib/Message.php:612
 #, php-format
 msgid "There was a problem expunging %s. This is what the server said"
 msgstr "%s »èÁ¦ ¿À·ù. ¼¹ö ¿À·ù: "
 
-#: lib/Message.php:637
+#: lib/Message.php:653
 #, fuzzy, php-format
 msgid "There was a problem expunging the mailbox. The server said: %s"
 msgstr "ÆíÁöÇÔ »èÁ¦ ¿À·ù. ¼¹ö ¿À·ù: "
 
-#: lib/Message.php:603
+#: lib/Message.php:621
 msgid "There was a problem expunging the mailbox. This is what the server said"
 msgstr "ÆíÁöÇÔ »èÁ¦ ¿À·ù. ¼¹ö ¿À·ù: "
 
-#: lib/Message.php:97
+#: lib/Message.php:90
 #, fuzzy, php-format
 msgid ""
 "There was an error copying messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "ÆíÁö¸¦ \"%s\"·Î º¹»ç ¿À·ù. ¼¹ö ¿À·ù: "
 
-#: lib/Message.php:207 lib/Message.php:222
+#: lib/Message.php:198 lib/Message.php:213
 #, php-format
 msgid ""
 "There was an error deleting messages from the folder \"%s\". This is what "
 "the server said"
 msgstr "ÆíÁöÇÔ \"%s\"·ÎºÎÅÍ ÆíÁö Áö¿ì±â ¿À·ù. ¼¹öÀÇ ¿À·ù: "
 
-#: lib/Message.php:286
+#: lib/Message.php:275
 #, php-format
 msgid ""
 "There was an error deleting messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "ÆíÁöÇÔ \"%s\"¿¡¼ ÆíÁö Áö¿ì±â ¿À·ù. ¼¹öÀÇ ¿À·ù: "
 
-#: lib/Message.php:220
+#: lib/Message.php:211
 #, fuzzy, php-format
 msgid "There was an error deleting messages. This is what the server said: %s"
 msgstr "ÆíÁö Áö¿ì±â ¿À·ù. ¼¹öÀÇ ¿À·ù: "
 
-#: lib/MIME/Viewer/itip.php:90
+#: lib/MIME/Viewer/itip.php:99
 #, fuzzy, php-format
 msgid "There was an error deleting the event: %s."
 msgstr "µ¥ÀÌÅ¸ ÀÓÆ÷Æ® ¿À·ù"
 
-#: lib/MIME/Viewer/plain.php:55 lib/MIME/Viewer/enriched.php:40
+#: lib/MIME/Viewer/plain.php:52 lib/MIME/Viewer/enriched.php:37
 msgid "There was an error displaying this message part"
 msgstr "ÆíÁö Ç¥½Ã ¿À·ù"
 
-#: lib/Message.php:523 lib/Message.php:565
+#: lib/Message.php:545 lib/Message.php:585
 #, php-format
 msgid ""
 "There was an error flagging messages in the folder \"%s\". This is what the "
 "server said"
 msgstr "ÆíÁöÇÔ \"%s\"¿¡¼ ÆíÁö Ç¥½Ã¿À·ù. ¼¹öÀÇ ¿À·ù: "
 
-#: folders.php:155
+#: folders.php:165
+#, php-format
 msgid "There was an error importing %s."
 msgstr "%s °¡Á®¿À±â ¿À·ù"
 
-#: lib/MIME/Viewer/itip.php:126
+#: lib/MIME/Viewer/itip.php:136
 #, fuzzy, php-format
 msgid "There was an error importing the event: %s."
 msgstr "µ¥ÀÌÅ¸ ÀÓÆ÷Æ® ¿À·ù"
 
-#: lib/MIME/Viewer/itip.php:156
+#: lib/MIME/Viewer/itip.php:166
+#, php-format
 msgid "There was an error importing the task: %s."
 msgstr "°¡Á®¿À±â ¿À·ù: %s"
 
-#: lib/MIME/Viewer/itip.php:142
+#: lib/MIME/Viewer/itip.php:152
 #, fuzzy, php-format
 msgid "There was an error importing user's free/busy information: %s."
 msgstr "µ¥ÀÌÅ¸ ÀÓÆ÷Æ® ¿À·ù"
 
-#: lib/Message.php:92
+#: lib/Message.php:85
+#, php-format
 msgid ""
 "There was an error moving messages from \"%s\" to \"%s\". This is what the "
 "server said"
 msgstr "\"%s\"¿¡¼ \"%s\"·Î ÀÌµ¿ ¿À·ù. ¼¹ö ¿À·ù: "
 
-#: compose.php:1165
+#: compose.php:1244
 msgid "There was an error saving this message as a draft."
 msgstr "ÀÓ½ÃÆíÁö ÀúÀå ¿À·ù"
 
-#: compose.php:927
+#: compose.php:1006
+#, php-format
 msgid "There was an error sending your message: %s"
 msgstr "ÆíÁö º¸³»±â ¿À·ù: %s"
 
-#: lib/MIME/Viewer/itip.php:104
+#: lib/MIME/Viewer/itip.php:113
 #, fuzzy, php-format
 msgid "There was an error updating the event: %s."
 msgstr "µ¥ÀÌÅ¸ ÀÓÆ÷Æ® ¿À·ù"
 
-#: lib/MIME/Viewer/plain.php:62
+#: lib/MIME/Viewer/plain.php:59
 msgid "There was no text in this message part"
 msgstr "³»¿ëÀÌ ¾ø½À´Ï´Ù."
 
-#: lib/MIME/Viewer/html.php:93
+#: lib/MIME/Viewer/html.php:97
 msgid "This HTML message has images embedded in it."
 msgstr "ÀÌ HTML ÆíÁö´Â ±×¸²ÀÌ µé¾îÀÖ½À´Ï´Ù."
 
-#: lib/MIME/Viewer/html.php:89
+#: lib/MIME/Viewer/html.php:90
 msgid ""
 "This HTML message has images embedded in it. Blocked images appear like "
 "this: "
 msgstr ""
 "ÀÌ HTML ÆíÁö´Â ±×¸²ÀÌ µé¾îÀÖ½À´Ï´Ù. º¸¾È»ó ±×¸²Àº ´ÙÀ½°ú °°ÀÌ Ç¥½ÃµË´Ï´Ù:"
 
-#: lib/MIME/Viewer/pgp.php:171
+#: lib/MIME/Viewer/pgp.php:166
+#, fuzzy
 msgid "This PGP Public Key was attached to the message."
-msgstr ""
+msgstr "%s¶ó´Â Å« ±×¸²ÀÌ ÆíÁö¿¡ Ã·ºÎµÇ¾ú½À´Ï´Ù."
 
-#: lib/MIME/Viewer/itip.php:95 lib/MIME/Viewer/itip.php:109
-#: lib/MIME/Viewer/itip.php:133 lib/MIME/Viewer/itip.php:147
-#: lib/MIME/Viewer/itip.php:163 lib/MIME/Viewer/itip.php:282
+#: lib/MIME/Viewer/itip.php:104 lib/MIME/Viewer/itip.php:118
+#: lib/MIME/Viewer/itip.php:143 lib/MIME/Viewer/itip.php:157
+#: lib/MIME/Viewer/itip.php:173 lib/MIME/Viewer/itip.php:314
 msgid "This action is not supported."
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:169 lib/MIME/Viewer/itip.php:382
+#: lib/MIME/Viewer/itip.php:179 lib/MIME/Viewer/itip.php:419
 msgid "This action is not yet implemented."
 msgstr ""
 
-#: templates/folders/javascript.inc:7
+#: templates/javascript/folders.js:14
 msgid "This may take some time. Are you sure you want to continue?"
 msgstr "ÀÌÀÛ¾÷Àº ¾à°£ÀÇ ½Ã°£ÀÌ ¼Ò¿äµË´Ï´Ù. °è¼ÓÁøÇàÇÏ½Ã°Ú½À´Ï±î?"
 
-#: lib/MIME/Viewer/appledouble.php:42
+#: lib/MIME/Viewer/appledouble.php:40
 msgid "This message contains a Macintosh file."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:406
+#: lib/MIME/Viewer/pkcs7.php:410
 msgid ""
 "This message contains an attachment that has been digitally signed via S/"
 "MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:410
+#: lib/MIME/Viewer/pkcs7.php:414
 msgid "This message contains an attachment that has been encrypted via S/MIME."
 msgstr ""
 
-#: lib/MIME/Viewer/status.php:167
+#: lib/MIME/Viewer/status.php:160
 msgid ""
 "This message contains mail delivery status information, but the format of "
 "this message is unknown."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:321
+#: lib/MIME/Viewer/pgp.php:315
+#, fuzzy
 msgid ""
 "This message does not appear to be a valid PGP encrypted message. Error: "
-msgstr ""
+msgstr "%s ´Â Á¤»óÀûÀÎ ÆíÁöÇÔÀ¸·Î º¸ÀÌÁö ¾Ê½À´Ï´Ù."
 
-#: lib/MIME/Viewer/pgp.php:246 lib/MIME/Viewer/pgp.php:356
+#: lib/MIME/Viewer/pgp.php:240 lib/MIME/Viewer/pgp.php:350
 msgid ""
 "This message does not appear to be in the correct PGP format (according to "
 "RFC 2015)."
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:162
+#: lib/MIME/Viewer/pkcs7.php:170
 msgid "This message does not appear to be in the correct S/MIME format."
 msgstr ""
 
-#: lib/MIME/Viewer/pgp.php:211 lib/MIME/Viewer/pgp.php:422
+#: lib/MIME/Viewer/pgp.php:205 lib/MIME/Viewer/pgp.php:416
+#, fuzzy
 msgid "This message has been digitally signed via PGP."
-msgstr ""
+msgstr "ÆíÁö Áö¿öÁü"
 
-#: lib/MIME/Viewer/pkcs7.php:135
+#: lib/MIME/Viewer/pkcs7.php:143
+#, fuzzy
 msgid "This message has been digitally signed via S/MIME."
-msgstr ""
+msgstr "ÆíÁö Áö¿öÁü"
 
-#: lib/MIME/Viewer/pkcs7.php:131 lib/MIME/Viewer/pkcs7.php:230
+#: lib/MIME/Viewer/pkcs7.php:139 lib/MIME/Viewer/pkcs7.php:238
+#, fuzzy
 msgid "This message has been encrypted via S/MIME."
-msgstr ""
+msgstr "ÆíÁö Áö¿öÁü"
 
-#: lib/MIME/Viewer/pgp.php:207 lib/MIME/Viewer/pgp.php:297
+#: lib/MIME/Viewer/pgp.php:201 lib/MIME/Viewer/pgp.php:291
+#, fuzzy
 msgid "This message has been encrypted with PGP."
-msgstr ""
+msgstr "ÆíÁö Áö¿öÁü"
 
-#: message.php:202
+#: message.php:211
 msgid "This message to"
 msgstr "ÆíÁö ÀÌµ¿ÇÏ±â"
 
@@ -3929,18 +4374,22 @@
 msgid "This window must be called from a compose window."
 msgstr ""
 
-#: thread.php:31 templates/thread/top.inc:3 config/prefs.php.dist:893
+#: thread.php:152
+#, fuzzy
+msgid "Thread Display"
+msgstr "Ç¥½Ã Çü½Ä"
+
+#: thread.php:76 config/prefs.php.dist:922
 msgid "Thread View"
 msgstr "´ñ±Û º¸±â"
 
-#: message.php:255 mailbox.php:576 search.php:145
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: message.php:264 mailbox.php:606 templates/contacts/contacts.inc:219
+#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
+#: templates/compose/recompose.inc:10 lib/Search.php:26
 msgid "To"
 msgstr "¹Þ´Â»ç¶÷"
 
-#: config/prefs.php.dist:890
+#: config/prefs.php.dist:919
 msgid "To Address"
 msgstr "¹Þ´Â»ç¶÷ ÁÖ¼Ò"
 
@@ -3950,11 +4399,17 @@
 "clicking."
 msgstr ""
 
-#: templates/compose/compose.inc:567
+#: lib/IMAP/Client.php:134
+msgid ""
+"To use a TLS connection, you must be running a version of PHP 5.0.6 or "
+"higher."
+msgstr ""
+
+#: templates/compose/compose.inc:577
 msgid "Total Attachments Size:"
 msgstr "ÀüÃ¼ Ã·ºÎÆÄÀÏ Å©±â"
 
-#: folders.php:350
+#: folders.php:388
 msgid "Trash folder"
 msgstr "Áö¿îÆíÁöÇÔ"
 
@@ -3962,8 +4417,8 @@
 msgid "Trash folder:"
 msgstr "Áö¿îÆíÁöÇÔ:"
 
-#: lib/Quota/cyrus.php:70 lib/Quota/mercury32.php:84 lib/Quota/command.php:77
-#: lib/Quota/logfile.php:93 lib/Quota/courier.php:54 lib/Quota/mdaemon.php:51
+#: lib/Quota/cyrus.php:65 lib/Quota/mercury32.php:79 lib/Quota/command.php:72
+#: lib/Quota/logfile.php:88 lib/Quota/courier.php:53 lib/Quota/mdaemon.php:48
 msgid "Unable to retrieve quota"
 msgstr ""
 
@@ -3980,28 +4435,35 @@
 msgid "Undelete"
 msgstr "º¹±¸"
 
-#: mailbox.php:560 mailbox.php:572 lib/MIME/Headers.php:218
+#: mailbox.php:589 mailbox.php:602 lib/MIME/Headers.php:212
 msgid "Undisclosed Recipients"
 msgstr "¾Ë¼ö ¾ø´Â ¼ö½ÅÀÎ"
 
-#: lib/MIME/Viewer/itip.php:408
+#: lib/MIME/Viewer/itip.php:447
 #, php-format
 msgid "Unhandled component of type: %s"
 msgstr ""
 
-#: mailbox.php:537
+#: mailbox.php:565
+#, fuzzy
 msgid "Unknown Date"
+msgstr "¾Ë ¼ö ¾ø´Â ¼ö½ÅÀÎ"
+
+#: lib/IMAP/Client.php:395
+#, php-format
+msgid "Unknown IMAP response from the server. Server Responded: %s"
 msgstr ""
 
-#: lib/MIME/Viewer/itip.php:591
+#: lib/MIME/Viewer/itip.php:635
+#, fuzzy
 msgid "Unknown Meeting"
-msgstr ""
+msgstr "¾Ë ¼ö ¾ø´Â ¼ö½ÅÀÎ"
 
-#: mailbox.php:588
+#: mailbox.php:618
 msgid "Unknown Recipient"
 msgstr "¾Ë ¼ö ¾ø´Â ¼ö½ÅÀÎ"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "Unload Passphrase"
 msgstr ""
 
@@ -4009,47 +4471,54 @@
 msgid "Unnamed"
 msgstr "ÀÌ¸§ ¾øÀ½"
 
-#: message.php:489 mailbox.php:671 templates/message/navbar_navigate.inc:6
+#: message.php:499 mailbox.php:708 templates/message/navbar_navigate.inc:6
 #: templates/mailbox/navbar.inc:15 templates/mailbox/navbar.inc:32
 #: templates/mailbox/legend.inc:5
 msgid "Unseen"
 msgstr "ÀÐÁö¾ÊÀ½"
 
-#: templates/folders/actions.inc:10
+#: templates/folders/actions.inc:12
 msgid "Unsubscribe from Folder(s)"
 msgstr "ÆíÁöÇÔ »ç¿ëÇÏÁö ¾ÊÀ½"
 
-#: templates/compose/compose.inc:574
+#: templates/compose/compose.inc:584
 msgid "Update Attachment Information"
 msgstr "Ã·ºÎÆÄÀÏ Á¤º¸ »õ·Î°íÄ§"
 
-#: lib/MIME/Viewer/itip.php:576
+#: lib/MIME/Viewer/itip.php:620
 msgid "Update respondent status"
 msgstr ""
 
-#: templates/smime/import_key.inc:56 templates/pgp/import_key.inc:56
+#: templates/smime/import_key.inc:58 templates/pgp/import_key.inc:56
+#, fuzzy
 msgid "Upload"
-msgstr ""
+msgstr "»õ·Î °íÄ§"
 
-#: templates/prefs/sentmailselect.inc:42
+#: templates/prefs/sentmailselect.inc:41
 msgid "Use Default Value"
 msgstr "±âº»°ª »ç¿ë"
 
-#: config/prefs.php.dist:250
+#: config/prefs.php.dist:256
 msgid "Use IMAP folder subscriptions?"
 msgstr "IMAP ÆíÁöÇÔ Subscription »ç¿ë"
 
-#: templates/acl/acl.inc:140
+#: config/prefs.php.dist:735
+#, fuzzy
+msgid "Use Virtual Trash Folder?"
+msgstr "°¡»ó ÆíÁöÇÔ"
+
+#: templates/acl/acl.inc:142
 #, fuzzy
 msgid "User"
 msgstr "»ç¿ëÀÚ¸í"
 
 #: acl.php:87
 #, php-format
-msgid "User '%s' successfully given the specified rights for the folder '%s'."
+msgid ""
+"User \"%s\" successfully given the specified rights for the folder \"%s\"."
 msgstr ""
 
-#: templates/login/login.inc:209
+#: templates/login/login.inc:177
 msgid "Username"
 msgstr "»ç¿ëÀÚ¸í"
 
@@ -4057,163 +4526,234 @@
 msgid "Username:"
 msgstr "»ç¿ëÀÚ¸í:"
 
-#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:93
-#: templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:25 templates/smime/smime.inc:68
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:27
+#: templates/pgp/pgp.inc:72 templates/pgp/pgp.inc:77
 msgid "View"
 msgstr "º¸±â"
 
-#: lib/MIME/Viewer/zip.php:95 lib/MIME/Viewer/tnef.php:112
+#: lib/MIME/Viewer/zip.php:92 lib/MIME/Viewer/tnef.php:108
+#, php-format
 msgid "View %s"
 msgstr "%s º¸±â"
 
-#: templates/smime/smime.inc:65 templates/pgp/pgp.inc:93
-#, php-format
+#: templates/smime/smime.inc:25 templates/pgp/pgp.inc:27
+#, fuzzy, php-format
 msgid "View %s Public Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
 #: lib/MIME/Viewer/html.php:116
 msgid "View HTML content in a separate window"
 msgstr "»õ Ã¢¿¡¼ HTML ³»¿ë º¸±â"
 
-#: templates/smime/smime.inc:117 templates/pgp/pgp.inc:151
+#: templates/mailbox/actions.inc:28
+#, fuzzy
+msgid "View Messages"
+msgstr "»õ ÆíÁö"
+
+#: templates/smime/smime.inc:72 templates/pgp/pgp.inc:77
 msgid "View Personal Private Key"
 msgstr ""
 
-#: templates/smime/smime.inc:113 templates/pgp/pgp.inc:147
+#: templates/smime/smime.inc:68 templates/pgp/pgp.inc:72
+#, fuzzy
 msgid "View Personal Public Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
+#, fuzzy
 msgid "View Thread"
-msgstr ""
+msgstr "_V´ñ±Ûº¸±â"
 
-#: lib/MIME/Viewer/images.php:160 lib/MIME/Viewer/images.php:162
+#: lib/MIME/Viewer/images.php:163 lib/MIME/Viewer/images.php:165
+#, fuzzy
 msgid "View Thumbnail"
-msgstr ""
+msgstr "_V´ñ±Ûº¸±â"
 
-#: lib/MIME/Viewer/pkcs7.php:414
+#: lib/MIME/Viewer/pkcs7.php:418
 msgid "View attachment in a separate window"
 msgstr "»õ Ã¢¿¡¼ Ã·ºÎ º¸±â"
 
-#: lib/MIME/Viewer/related.php:64
+#: lib/MIME/Viewer/related.php:79
 msgid "View content in a separate window"
 msgstr "»õ Ã¢¿¡¼ ³»¿ë º¸±â"
 
-#: lib/MIME/Viewer/itip.php:130
+#: lib/MIME/Viewer/itip.php:140
+#, fuzzy
 msgid "View event"
-msgstr ""
+msgstr "%s º¸±â"
 
-#: folders.php:342 mailbox.php:506
+#: folders.php:380 mailbox.php:534
+#, php-format
 msgid "View messages in %s"
 msgstr "%sÀÇ ÆíÁö º¸±â"
 
-#: templates/prefs/initialpageselect.inc:26
+#: templates/prefs/initialpageselect.inc:23
 msgid "View or mailbox to display after login:"
 msgstr "·Î±×ÀÎ ÈÄ º¸¿©ÁÙ °÷"
 
-#: lib/MIME/Viewer/itip.php:160
+#: lib/MIME/Viewer/itip.php:170
 #, fuzzy
 msgid "View task"
 msgstr "%s º¸±â"
 
-#: lib/MIME/Viewer/html.php:110
+#: lib/MIME/Viewer/html.php:101
 msgid "View the Images"
 msgstr "±×¸² º¸±â"
 
-#: search.php:309
+#: search.php:263
+#, php-format
 msgid "Virtual Folder \"%s\" created succesfully."
 msgstr "°¡»ó ÆíÁöÇÔ \"%s\"°¡ »ý¼ºµÇ¾ú½À´Ï´Ù."
 
-#: templates/search/main.inc:111 lib/IMAP/Tree.php:125 lib/IMAP/Tree.php:138
-#: lib/IMAP/Tree.php:140 lib/IMAP/Tree.php:144 lib/IMAP/Tree.php:145
-#: lib/IMAP/Tree.php:329 lib/IMAP/Tree.php:353 lib/IMAP/Tree.php:395
+#: templates/search/main.inc:111 lib/IMAP/Tree.php:138 lib/IMAP/Tree.php:151
+#: lib/IMAP/Tree.php:153 lib/IMAP/Tree.php:157 lib/IMAP/Tree.php:158
+#: lib/IMAP/Tree.php:369 lib/IMAP/Tree.php:393 lib/IMAP/Tree.php:433
 msgid "Virtual Folders"
 msgstr "°¡»ó ÆíÁöÇÔ"
 
-#: search.php:291
+#: search.php:245
 msgid "Virtual Folders require a label."
 msgstr "°¡ÀåÆíÁöÇÔÀº ÀÌ¸§ÀÌ ÇÊ¿äÇÕ´Ï´Ù."
 
+#: lib/VFolder.php:175 lib/VFolder.php:180
+msgid "Virtual INBOX"
+msgstr ""
+
+#: folders.php:416
+#, fuzzy
+msgid "Virtual INBOX Folder"
+msgstr "°¡»ó ÆíÁöÇÔ"
+
+#: mailbox.php:452 lib/VFolder.php:114 lib/VFolder.php:119
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "°¡»ó ÆíÁöÇÔ"
+
+#: folders.php:413
+#, fuzzy
+msgid "Virtual Trash Folder"
+msgstr "°¡»ó ÆíÁöÇÔ"
+
 #: templates/search/main.inc:133
 msgid "Virtual folder label"
 msgstr "°¡ÀåÆíÁöÇÔ ÀÌ¸§"
 
-#: lib/MIME/Viewer/pkcs7.php:368
+#: lib/MIME/Viewer/pkcs7.php:374
 msgid "Warning"
 msgstr "°æ°í"
 
-#: login.php:131
+#: login.php:138
+#, fuzzy, php-format
 msgid "Welcome to %s"
 msgstr "È¯¿µÇÕ´Ï´Ù."
 
-#: config/prefs.php.dist:724
+#: config/prefs.php.dist:619
+msgid ""
+"What should we do with spam messages after they have been reported as spam "
+"or innocent?"
+msgstr ""
+
+#: config/prefs.php.dist:727
 msgid ""
 "When deleting messages, move them to your Trash folder instead of marking "
 "them as deleted?"
 msgstr "ÆíÁö¸¦ Áö¿ì¸é, Áö¿ò Ç¥½Ã¸¦ ÇÏ´Â ´ë½Å Áö¿îÆíÁöÇÔÀ¸·Î ÀÌµ¿ÇÕ´Ï´Ù."
 
-#: config/prefs.php.dist:878
+#: config/prefs.php.dist:907
 msgid "When opening a new mailbox, which page do you want to start on?"
 msgstr "ÆíÁöÇÔÀ» ¿ ¶§, ¾î¶² ÆäÀÌÁö¿¡¼ ½ÃÀÛÇÏ±â¸¦ ¿øÇÏ½Ê´Ï±î?"
 
-#: config/prefs.php.dist:554
+#: config/prefs.php.dist:561
 msgid "When saving sent-mail, should we save attachment data?"
 msgstr "º¸³½ ÆíÁö¸¦ ÀúÀåÇÒ ¶§, Ã·ºÎÆÄÀÏÀ» ÀúÀåÇÒ±î¿ä?"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: config/prefs.php.dist:426
+msgid ""
+"When sending mail or expanding addresses, what domain should we append to "
+"unqualified addresses (email addresses without \"@\")?"
+msgstr ""
+
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "Whitelist"
 msgstr "¼ö½Å½ÂÀÎ"
 
-#: config/prefs.php.dist:437
-msgid "Wrap text at this many characters."
-msgstr "¹®ÀÚ¿ÀÌ ±ä °æ¿ì »õÁÙ»ç¿ë(Wrap)"
-
-#: templates/compose/compose.inc:531 config/prefs.php.dist:949
+#: templates/compose/compose.inc:541 config/prefs.php.dist:978
 msgid "Yes"
 msgstr "¿¹"
 
-#: lib/Maintenance/Task/fetchmail_login.php:63
+#: lib/Maintenance/Task/fetchmail_login.php:58
 #, fuzzy
 msgid "You are about to fetch email from the following account(s):"
 msgstr "¾Æ·¡ÀÇ ÆíÁö¸¦ »èÁ¦ÇÕ´Ï´Ù: "
 
-#: templates/folders/javascript.inc:8
-msgid "You are attempting to delete the following folders:"
+#: templates/folders/folders_confirm.html:10
+#, fuzzy
+msgid ""
+"You are attempting to delete all messages contained in the following folder"
+"(s)."
 msgstr "¾Æ·¡ÀÇ ÆíÁöÇÔÀ» Áö¿ì·Á°í ÇÕ´Ï´Ù: "
 
-#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:200
+#: templates/folders/folders_confirm.html:9
+#, fuzzy
+msgid "You are attempting to delete the following folder(s)."
+msgstr "¾Æ·¡ÀÇ ÆíÁöÇÔÀ» Áö¿ì·Á°í ÇÕ´Ï´Ù: "
+
+#: templates/message/javascript.inc:55 templates/mailbox/javascript.inc:192
 msgid "You are copying/moving to a new folder."
 msgstr "»õ Æú´õ·Î º¹»ç/ÀÌµ¿ ÇÏ·Á°í ÇÕ´Ï´Ù."
 
-#: templates/folders/javascript.inc:101
+#: templates/javascript/folders.js:102
 msgid "You are creating a sub-folder to "
 msgstr "ÇÏÀ§ ÆíÁöÇÔÀ» ¸¸µì´Ï´Ù. "
 
-#: templates/folders/javascript.inc:103
+#: templates/javascript/folders.js:104
 msgid "You are creating a top-level folder."
 msgstr "»óÀ§ ÆíÁöÇÔÀ» ¸¸µì´Ï´Ù. "
 
-#: templates/folders/javascript.inc:144
+#: lib/Folder.php:320
+#, fuzzy
+msgid "You are not allowed to create folders."
+msgstr "»óÀ§ ÆíÁöÇÔÀ» ¸¸µì´Ï´Ù. "
+
+#: lib/Folder.php:327
+#, php-format
+msgid "You are not allowed to create more than %d folders."
+msgstr ""
+
+#: templates/javascript/folders.js:135
 msgid "You are renaming the folder: "
 msgstr "ÆíÁöÇÔ ÀÌ¸§ º¯°æ: "
 
-#: lib/Maintenance/Task/tos_agreement.php:37
+#: lib/Folder.php:557
+#, fuzzy, php-format
+msgid "You can not unsubscribe from \"%s\"."
+msgstr "\"%s\" ÆíÁöÇÔÀ» »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù."
+
+#: templates/stationery/prefs.inc:35
+#, php-format
+msgid ""
+"You can use the following placeholders in the stationery text: %c for the "
+"current message content; %s for the signature."
+msgstr ""
+
+#: lib/Maintenance/Task/tos_agreement.php:34
 msgid ""
 "You did not agree to the Terms of Service agreement, so you were not allowed "
 "to login."
 msgstr ""
 
-#: templates/acl/acl.inc:165
+#: templates/acl/acl.inc:169
 msgid "You do not have permission to change access to this folder"
 msgstr ""
 
-#: lib/Maillog.php:132
-#, php-format
+#: lib/Maillog.php:129
+#, fuzzy, php-format
 msgid "You forwarded this message on %%s to the following recipients: %s."
-msgstr ""
+msgstr "ÆíÁö Àü´Þ"
 
 #: templates/mailbox/alert.inc:3
+#, php-format
 msgid "You have %s new messages."
 msgstr "%s°³ÀÇ »õ ÆíÁö°¡ ÀÖ½À´Ï´Ù."
 
@@ -4221,36 +4761,41 @@
 msgid "You have 1 new message."
 msgstr "1°³ÀÇ »õ ÆíÁö°¡ ÀÖ½À´Ï´Ù."
 
-#: templates/compose/attachments.js:116
+#: compose.php:494
+#, fuzzy
+msgid "You have already submitted this page."
+msgstr "1°³ÀÇ »õ ÆíÁö°¡ ÀÖ½À´Ï´Ù."
+
+#: templates/compose/attachments.js:115
 msgid ""
 "You have at least one attachment selected that you didn't upload yet. Are "
 "you sure you want to send this message without these attachments?"
 msgstr ""
 
-#: lib/IMP.php:1002
+#: lib/IMP.php:1074
 msgid "You have new mail in the following folder:"
 msgstr "´ÙÀ½ÀÇ ÆíÁöÇÔ¿¡ »õ ÆíÁö°¡ ÀÖ½À´Ï´Ù:"
 
-#: lib/IMP.php:1007
+#: lib/IMP.php:1079
 msgid "You have new mail in the following folders:"
 msgstr "´ÙÀ½ÀÇ ÆíÁöÇÔ¿¡ »õ ÆíÁö°¡ ÀÖ½À´Ï´Ù:"
 
-#: compose.php:127
+#: compose.php:153
 msgid "You must enter at least one recipient."
 msgstr "¹Þ´Â»ç¶÷À» ÀÔ·ÂÇÏ¼¼¿ä."
 
-#: lib/MIME/Viewer/pgp.php:308
+#: lib/MIME/Viewer/pgp.php:302
 msgid ""
 "You must enter the passphrase for your PGP private key to view this message"
 msgstr ""
 
-#: lib/MIME/Viewer/pkcs7.php:241
+#: lib/MIME/Viewer/pkcs7.php:249
 msgid ""
 "You must enter the passphrase for your S/MIME private key to view this "
 "message"
 msgstr ""
 
-#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:209
+#: templates/message/javascript.inc:64 templates/mailbox/javascript.inc:201
 msgid "You must select a target mailbox first."
 msgstr "´ë»ó ÆíÁöÇÔÀ» ¸ÕÀú ¼±ÅÃÇØ¾ß ÇÕ´Ï´Ù."
 
@@ -4263,8 +4808,8 @@
 msgid "You must select an address first."
 msgstr "ÁÖ¼Ò¸¦ ¸ÕÀú ¼±ÅÃÇØ¾ß ÇÕ´Ï´Ù."
 
-#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:216
-#: templates/mailbox/javascript.inc:271
+#: templates/mailbox/javascript.inc:62 templates/mailbox/javascript.inc:208
+#: templates/mailbox/javascript.inc:263
 msgid "You must select at least one message first."
 msgstr "ÆíÁö¸¦ ¸ÕÀú ¼±ÅÃÇÏ¼¼¿ä."
 
@@ -4277,57 +4822,66 @@
 msgstr "ÆÄÀÏ Ã·ºÎ¸¦ ¸ÕÀú ÀÔ·ÂÇØ¾ß ÇÕ´Ï´Ù."
 
 #: templates/fetchmail/manage.inc:48
-msgid "You need to have '%s' enabled in your maintenance options."
+#, fuzzy, php-format
+msgid "You need to have \"%s\" enabled in your maintenance options."
 msgstr "À¯Áö°ü¸® Ç×¸ñÀÇ '%s' ¼³Á¤À» ÄÑµÎ¾î¾ßÇÕ´Ï´Ù."
 
-#: lib/Maillog.php:140
+#: lib/Maillog.php:137
 #, fuzzy, php-format
 msgid "You redirected this message to %s on %%s."
 msgstr "ÆíÁö Àü´Þ"
 
-#: lib/Maillog.php:144
+#: lib/Maillog.php:141
+#, php-format
 msgid "You replied to this message on %s."
 msgstr "%s¿¡ ´äÀå º¸³¿."
 
-#: lib/Folder.php:590
+#: lib/Folder.php:507
+#, php-format
 msgid "You were not subscribed to \"%s\". Here is what the server said"
 msgstr "\"%s\" ÆíÁöÇÔ »ç¿ëÇÏ±â ¿À·ù. ¼¹öÀÇ ¿À·ù: "
 
-#: lib/Folder.php:641
+#: lib/Folder.php:559
+#, php-format
 msgid "You were not unsubscribed from \"%s\". Here is what the server said"
 msgstr "\"%s\" ÆíÁöÇÔ »ç¿ëÇÏÁö ¾ÊÀ½ ¿À·ù. ¼¹öÀÇ ¿À·ù: "
 
-#: lib/Folder.php:593
+#: lib/Folder.php:510
+#, php-format
 msgid "You were successfully subscribed to \"%s\""
 msgstr "\"%s\" ÆíÁöÇÔÀ» »ç¿ëÇÕ´Ï´Ù."
 
-#: lib/Folder.php:644
+#: lib/Folder.php:562
+#, php-format
 msgid "You were successfully unsubscribed from \"%s\""
 msgstr "\"%s\" ÆíÁöÇÔÀ» »ç¿ëÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: templates/pgp/pgp.inc:186
+#: templates/pgp/pgp.inc:98
 #, fuzzy
 msgid "Your Name"
 msgstr "ÀÌ¸§:"
 
-#: templates/pgp/pgp.inc:119
+#: templates/pgp/pgp.inc:50
+#, fuzzy
 msgid "Your PGP Public/Private Keys"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
-#: templates/smime/smime.inc:116 templates/pgp/pgp.inc:150
+#: templates/smime/smime.inc:71 templates/pgp/pgp.inc:76
+#, fuzzy
 msgid "Your Private Key"
-msgstr ""
+msgstr "ÀüÃ¼ ÀÌ¸§:"
 
-#: templates/smime/smime.inc:112 templates/pgp/pgp.inc:146
+#: templates/smime/smime.inc:67 templates/pgp/pgp.inc:71
 #, fuzzy
 msgid "Your Public Key"
 msgstr "ÀüÃ¼ ÀÌ¸§:"
 
-#: config/prefs.php.dist:157
-msgid "Your Reply-to: address: <i>(optional)</i>"
+#: config/prefs.php.dist:165
+#, fuzzy
+msgid "Your Reply-to: address: <em>(optional)</em>"
 msgstr "È¸½Å ÁÖ¼Ò: <i>(¼±ÅÃ»çÇ×)</i>"
 
-#: templates/smime/smime.inc:91
+#: templates/smime/smime.inc:49
 msgid "Your S/MIME Public/Private Certificates"
 msgstr ""
 
@@ -4335,93 +4889,91 @@
 msgid "Your accounts:"
 msgstr "°èÁ¤:"
 
-#: config/prefs.php.dist:165
+#: config/prefs.php.dist:173
+#, fuzzy
 msgid ""
-"Your alias addresses: <i>(optional, enter each address on a new line)</i>"
+"Your alias addresses: <em>(optional, enter each address on a new line)</em>"
 msgstr ""
+"¸ðµç ÆíÁö¿¡ Ãß°¡ÇÒ ¼ûÀºÂüÁ¶ ÁÖ¼Ò: <i>(¼±ÅÃ»çÇ×ÀÌ¸ç, ÇÑ ÁÙ¿¡ ÁÖ¼Ò ÇÏ³ª¾¿ ¾²¼¼"
+"¿ä.)</i>"
 
-#: lib/MIME/Viewer/images.php:95
+#: lib/MIME/Viewer/images.php:92
 msgid "Your browser does not support inline display of this image type."
 msgstr "ºê¶ó¿ìÁ®°¡ ÀÌ ±×¸² Çü½ÄÀ» Ç¥½ÃÇÏÁö ¸øÇÕ´Ï´Ù."
 
-#: templates/message/print.inc:27
-msgid ""
-"Your browser does not support this print option. Press Control/Option + P to "
-"print."
-msgstr ""
-"»ç¿ëÇÏ°í °è½Å ºê¶ó¿ìÀú´Â ÀÎ¼â ¿É¼ÇÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù. ÀÎ¼âÇÏ±â À§ÇØ¼´Â ÄÁ"
-"Æ®·Ñ/¿É¼ÇÅ°¿Í P¸¦ ´©¸£¼¼¿ä."
-
-#: config/prefs.php.dist:532
+#: config/prefs.php.dist:539
 msgid "Your default charset for sending messages:"
 msgstr "ÆíÁö º¸³¾ ¶§ »ç¿ëÇÒ ±âº» ¹®ÀÚ¼Â:"
 
 #: templates/prefs/encryptselect.inc:1
+#, fuzzy
 msgid "Your default encryption method for sending messages:"
-msgstr ""
+msgstr "ÆíÁö º¸³¾ ¶§ »ç¿ëÇÒ ±âº» ¹®ÀÚ¼Â:"
 
-#: lib/MIME/Viewer/status.php:92
+#: lib/MIME/Viewer/status.php:89
 msgid "Your message was successfully delivered."
 msgstr "ÆíÁö°¡ ¼º°øÀûÀ¸·Î Àü¼ÛµÇ¾ú½À´Ï´Ù."
 
-#: config/prefs.php.dist:198
+#: config/prefs.php.dist:206
 msgid "Your signature:"
 msgstr "¼¸í:"
 
-#: message.php:279 compose.php:1205 mailbox.php:521 lib/Compose.php:742
+#: message.php:288 compose.php:1284 mailbox.php:549 lib/Compose.php:818
 msgid "[No Subject]"
 msgstr "[Á¦¸ñ ¾øÀ½]"
 
-#: templates/compose/compose.inc:216
+#: templates/compose/compose.inc:205
 msgid "_Bcc"
 msgstr "_B¼ûÀºÂüÁ¶"
 
-#: templates/message/navbar_actions.inc:19 templates/mailbox/actions.inc:16
+#: templates/message/navbar_actions.inc:21 templates/mailbox/actions.inc:16
 msgid "_Blacklist"
 msgstr "_B¼ö½Å°ÅºÎ"
 
-#: templates/compose/compose.inc:165
+#: templates/compose/compose.inc:154
 msgid "_Cc"
 msgstr "_CÂüÁ¶"
 
-#: lib/IMP.php:903
-msgid "_Compose"
-msgstr "_CÀÛ¼ºÇÏ±â"
-
 #: templates/message/navbar_actions.inc:6 templates/mailbox/actions.inc:8
 #: templates/mailbox/actions.inc:10
 msgid "_Delete"
 msgstr "_DÁö¿ì±â"
 
-#: lib/IMP.php:905
+#: lib/IMP.php:979
 msgid "_Folders"
 msgstr "_FÆíÁöÇÔ"
 
-#: templates/compose/compose.inc:80
+#: templates/compose/compose.inc:81
 msgid "_Identity"
 msgstr "_I½Äº°ÀÚ"
 
-#: lib/IMP.php:896
+#: lib/IMP.php:961
 msgid "_Inbox"
 msgstr "_I¹ÞÀºÆíÁöÇÔ"
 
-#: lib/IMP.php:946
+#: lib/IMP.php:1020
 msgid "_Log out"
 msgstr "_L·Î±×¾Æ¿ô"
 
-#: message.php:375
+#: message.php:384
 msgid "_Message Source"
 msgstr "_MÆíÁö ¼Ò½ºº¸±â"
 
-#: templates/message/navbar_actions.inc:31
+#: lib/IMP.php:976
+#, fuzzy
+msgid "_New Message"
+msgstr "»õ ÆíÁö"
+
+#: templates/message/navbar_actions.inc:33
 msgid "_Print"
 msgstr "_PÀÎ¼â"
 
-#: templates/compose/compose.inc:283 templates/compose/compose.inc:300
+#: templates/compose/compose.inc:272 templates/compose/compose.inc:289
 msgid "_Priority"
 msgstr "_PÁß¿äµµ"
 
-#: mailbox.php:395
+#: mailbox.php:418
+#, fuzzy, php-format
 msgid "_Refresh %s"
 msgstr "_R»õ·Î ÀÐ±â"
 
@@ -4429,19 +4981,19 @@
 msgid "_Reply"
 msgstr "_R´äÀå"
 
-#: lib/IMP.php:907
+#: lib/IMP.php:981
 msgid "_Search"
 msgstr "_S°Ë»ö"
 
-#: templates/compose/compose.inc:66 templates/compose/compose.inc:422
+#: templates/compose/compose.inc:67 templates/compose/compose.inc:431
 msgid "_Send Message"
 msgstr "_SÆíÁö º¸³»±â"
 
-#: templates/mailbox/message_headers.inc:27
+#: templates/mailbox/message_headers.inc:32
 msgid "_Thread"
 msgstr "_T´ñ±Û¼ø"
 
-#: templates/compose/compose.inc:115
+#: templates/compose/compose.inc:116
 msgid "_To"
 msgstr "_T¹Þ´Â»ç¶÷"
 
@@ -4449,66 +5001,129 @@
 msgid "_Undelete"
 msgstr "_Uº¹±¸"
 
-#: templates/message/navbar_actions.inc:17
+#: templates/message/navbar_actions.inc:18
 msgid "_View Thread"
 msgstr "_V´ñ±Ûº¸±â"
 
-#: templates/message/navbar_actions.inc:22 templates/mailbox/actions.inc:19
+#: templates/message/navbar_actions.inc:24 templates/mailbox/actions.inc:19
 msgid "_Whitelist"
 msgstr "_W¼ö½Å½ÂÀÎ"
 
-#: lib/Compose.php:355
-msgid "attachment"
+#: lib/Compose.php:176
+msgid "addressee unknown"
 msgstr ""
 
-#: view.php:102
+#: lib/Compose.php:440
+#, fuzzy
+msgid "attachment"
+msgstr "ÆÄÀÏÃ·ºÎ"
+
+#: view.php:99
+#, fuzzy
 msgid "attachments.zip"
-msgstr ""
+msgstr "ÆÄÀÏ Ã·ºÎ"
 
-#: templates/compose/compose.inc:503
+#: templates/compose/compose.inc:513
 msgid "bytes"
 msgstr "¹ÙÀÌÆ®"
 
-#: templates/contacts/contacts.inc:187
+#: lib/Compose.php:200
+msgid "cannot create output file"
+msgstr ""
+
+#: lib/Compose.php:172
+msgid "cannot open input"
+msgstr ""
+
+#: lib/Compose.php:164
+msgid "command line usage error"
+msgstr ""
+
+#: lib/Compose.php:220
+msgid "configuration error"
+msgstr ""
+
+#: lib/Compose.php:196
+msgid "critical system file missing"
+msgstr ""
+
+#: lib/Compose.php:168
+msgid "data format error"
+msgstr ""
+
+#: lib/Compose.php:224
+msgid "entry not found"
+msgstr ""
+
+#: templates/contacts/contacts.inc:190
 msgid "from"
 msgstr "À§Ä¡"
 
+#: lib/Compose.php:180
+msgid "host name unknown"
+msgstr ""
+
+#: lib/Compose.php:204
+msgid "input/output error"
+msgstr ""
+
+#: lib/Compose.php:188
+msgid "internal software error"
+msgstr ""
+
 #: smime.php:29 pgp.php:69
 msgid "key"
 msgstr ""
 
-#: folders.php:151
+#: folders.php:161
 msgid "mailbox file"
 msgstr "¿ìÆíÇÔ ÆÄÀÏ"
 
-#: compose.php:987 lib/Message.php:442
+#: compose.php:1067 lib/Message.php:466
 msgid "name"
 msgstr "ÀÌ¸§"
 
-#: templates/compose/spelling.inc:80
+#: templates/compose/spelling.inc:76
 msgid "none"
 msgstr "¾øÀ½"
 
-#: templates/compose/spelling.inc:111
+#: templates/compose/spelling.inc:105
 msgid "or"
 msgstr "¶Ç´Â"
 
-#: templates/compose/spelling.inc:48
+#: lib/Compose.php:216
+msgid "permission denied"
+msgstr ""
+
+#: lib/Compose.php:212
+msgid "remote error in protocol"
+msgstr ""
+
+#: lib/Compose.php:184
+msgid "service unavailable"
+msgstr ""
+
+#: templates/compose/spelling.inc:46
 msgid "spelling error"
 msgstr "Ã¶ÀÚ ¿À·ù"
 
-#: templates/compose/spelling.inc:48
+#: templates/compose/spelling.inc:46
 msgid "spelling errors"
 msgstr "Ã¶ÀÚ ¿À·ù"
 
-#: lib/Filter.php:55
+#: lib/Compose.php:192
+#, fuzzy
+msgid "system error"
+msgstr "Ã¶ÀÚ ¿À·ù"
+
+#: lib/Compose.php:208
+msgid "temporary failure"
+msgstr ""
+
+#: lib/Filter.php:51
 msgid "your blacklist"
 msgstr "¼ö½Å°ÅºÎ¸ñ·Ï"
 
-#: lib/Filter.php:67
+#: lib/Filter.php:61
 msgid "your whitelist"
 msgstr "¼ö½Å½ÂÀÎ¸ñ·Ï"
-
-# custom
-msgid "Show the %s Menu on the left?"
-msgstr "%s ¿ÞÂÊ ¸Þ´º Ç¥½Ã"


